Continues work on user friendly game settings panel

src/main/java/com/fathzer/jchess/swing/settings/GameSettings.java

@@ -29,15 +29,15 @@ public class GameSettings {
 	}
 
 	private static final Random RANDOM_GENERATOR = new Random();
-	private Variant variant = Variant.CHESS960;
+	private Variant variant = Variant.STANDARD;
 	private boolean tabletMode = true;
 	private boolean showPossibleMoves = true;
 	private boolean touchMove = false;
 	private boolean startClockAfterFirstMove = false;
 	private ClockSettings clock = null;
 	private PlayerSettings player1 = new PlayerSettings();
 	private ColorSetting player1Color = ColorSetting.RANDOM;
-	private PlayerSettings player2 = new PlayerSettings(null, new EngineSettings(), null);
+	private PlayerSettings player2 = new PlayerSettings();
 
 	@Getter
 	@AllArgsConstructor

src/main/java/com/fathzer/jchess/swing/settings/GameSettingsPanel.java

@@ -159,7 +159,19 @@ public GameSettingsPanel(GameSettings settings) {
 	}
 
 	private void setSettings(GameSettings settings) {
-		boolean hasClock = settings.getClock()!=null;
+		final boolean hasClock = settings.getClock()!=null;
 		this.timeControlCheckBox.setSelected(hasClock);
+		this.startAfterFirstMoveCheckBox.setSelected(settings.isStartClockAfterFirstMove());
+		this.timeDetailsPanel.setSettings(settings.getClock());
+
+		this.showMovesCheckBox.setSelected(settings.isShowPossibleMoves());
+		this.tabletModeCheckBox.setSelected(settings.isTabletMode());
+		this.touchMoveCheckBox.setSelected(settings.isTouchMove());
+
+		this.variantCombo.setSelectedItem(settings.getVariant());
+
+		this.player1Panel.setSettings(settings.getPlayer1());
+		this.player2Panel.setSettings(settings.getPlayer2());
+		this.player1Panel.setColor(settings.getPlayer1Color());
 	}
 }

src/main/java/com/fathzer/jchess/swing/settings/PlayerSelectionPanel.java

@@ -8,6 +8,8 @@
 import java.awt.GridBagConstraints;
 
 import com.fathzer.jchess.swing.settings.GameSettings.ColorSetting;
+import com.fathzer.jchess.swing.settings.GameSettings.EngineSettings;
+import com.fathzer.jchess.swing.settings.GameSettings.PlayerSettings;
 import com.fathzer.jchess.swing.settings.GameSettings.PlayerType;
 import com.fathzer.soft.ajlib.swing.widget.TextWidget;
 
@@ -118,6 +120,9 @@ public PlayerSelectionPanel() {
 		typeCombo.setSelectedIndex(0);
 	}
 
+	public void setColor(ColorSetting player1Color) {
+		colorComboBox.setSelectedItem(player1Color);
+	}
 	void setColorVisible(boolean visible) {
 		colorLabel.setVisible(visible);
 		colorComboBox.setVisible(visible);
@@ -130,4 +135,20 @@ private void setType(PlayerType type) {
 		engineLabel.setVisible(!isHuman);
 		engineCombo.setVisible(!isHuman);
 	}
+
+	public void setSettings(PlayerSettings settings) {
+		final EngineSettings engine = settings.getEngine();
+		if (engine==null) {
+			typeCombo.setSelectedItem(PlayerType.HUMAN);
+			nameTxt.setText(settings.getName());
+		} else {
+			typeCombo.setSelectedItem(PlayerType.ENGINE);
+			engineCombo.setSelectedItem(engine.getName());
+		}
+	}
+
+	public PlayerSettings getSettings() {
+		//TODO
+		throw new UnsupportedOperationException();
+	}
 }

src/main/java/com/fathzer/jchess/swing/settings/clock/ClockSettingsPanel.java

@@ -7,6 +7,7 @@
 import java.awt.Insets;
 import java.math.BigInteger;
 
+import com.fathzer.games.clock.ClockSettings;
 import com.fathzer.soft.ajlib.swing.widget.IntegerWidget;
 
 public class ClockSettingsPanel extends JPanel {
@@ -88,4 +89,21 @@ public void setEnabled(boolean enabled) {
 			this.getComponent(i).setEnabled(enabled);
 		}
 	}
+
+	public void setSettings(ClockSettings clock) {
+		if (clock==null) {
+			timeField.setValue((BigInteger)null);
+			incrementField.setValue((BigInteger)null);
+			movesBeforeIncrementField.setValue((BigInteger)null);
+		} else {
+			timeField.setValue(clock.getInitialTime());
+			incrementField.setValue(clock.getIncrement());
+			movesBeforeIncrementField.setValue(clock.getMovesNumberBeforeIncrement());
+		}
+	}
+
+	public ClockSettings getSettings() {
+		// TODO Auto-generated method stub
+		throw new UnsupportedOperationException();
+	}
 }