Various configuration improvements (#112)

* Configuration improvements 

- don't delete commented out lines in config when saving
- only save configuration if it actually changed

* Fix parsing integers in RVConfigure

* Fix config.txt indentation

* Use cloning for creating original configuration objects

And fix an error in an equals method.

* Only enable save button if there are changes

Server host and port are not using this feature yet.

* Store multiple team colors and servers in config file

Multiple team colors and servers can now be stored in the config file.

* Fix IntegerTextField

Should now work as expected

* Reduce size of diff for pull request

* Implement requested changes

* Undo eclipse import formatting

Author: hannesbraun

NOTICE.md

@@ -7,3 +7,4 @@ This product includes software developed by the following individuals:
 - Patrick MacAlpine
 - Philipp Strobel
 - Jannik Seiler
+- Hannes Braun

viewer/config.txt

@@ -1,4 +1,4 @@
-Graphics Settings:
+# Graphics Settings
 Bloom                : true
 Phong                : true
 Shadows              : true
@@ -19,26 +19,27 @@ Center Frame         : true
 Frame Maximized      : false
 Save Frame State     : true
 
-Overlay Default Visibility:
+# Overlay Default Visibility
 Server Speed         : true
 Foul Overlay         : true
 Field Overlay        : true
 Number of Players    : true
 Player IDs           : true
 
-Networking Settings:
+# Networking Settings
 Auto-Connect         : true
 Auto-Connect Delay   : 1000
-Server Hosts         : localhost
-Server Port          : 3200
+Default Server       : localhost:3200
 Drawing Port         : 32769
+# To store more servers, just insert more "Server" lines
+Server               : localhost:3200
 
-General Settings:
+# General Settings
 Record Logfiles      : false
 Logfile Directory    : 
+# Possible values for "Look and Feel" are: "system", "darcula", "intellij", "solarized_light" and "solarized_dark"
 Look and Feel        : system
 
-Team Colors:
-<Right>              : 0xff2626
-<Left>               : 0x2626ff
-
+# Team Colors
+Team Color           : <Right>:0xff2626
+Team Color           : <Left>:0x2626ff

viewer/src/main/java/config/GeneralPanel.java

@@ -10,6 +10,8 @@
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JTextField;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
 import rv.Configuration;
 import rv.util.swing.FileChooser;
 import rv.util.swing.SwingUtil;
@@ -23,12 +25,15 @@ public class GeneralPanel extends JPanel implements SaveListener
 	JTextField logDirectoryTF;
 	JButton openDirectoryButton;
 
+	private Runnable onChange;
+
 	public GeneralPanel(RVConfigure configProg)
 	{
 		super();
 		this.configProg = configProg;
 		this.config = configProg.config.general;
 		configProg.listeners.add(this);
+		onChange = configProg.updateSaveButtonState;
 		initGUI();
 	}
 
@@ -53,7 +58,33 @@ JPanel initLogfilesPanel()
 		c.ipadx = 10;
 
 		recordLogsCB = new JCheckBox("Record Logfiles", config.recordLogs);
+		recordLogsCB.addChangeListener(e -> {
+			config.recordLogs = recordLogsCB.isSelected();
+			onChange.run();
+		});
 		logDirectoryTF = new JTextField(config.logfileDirectory);
+		logDirectoryTF.getDocument().addDocumentListener(new DocumentListener() {
+			@Override
+			public void insertUpdate(DocumentEvent e)
+			{
+				config.logfileDirectory = logDirectoryTF.getText();
+				onChange.run();
+			}
+
+			@Override
+			public void removeUpdate(DocumentEvent e)
+			{
+				config.logfileDirectory = logDirectoryTF.getText();
+				onChange.run();
+			}
+
+			@Override
+			public void changedUpdate(DocumentEvent e)
+			{
+				config.logfileDirectory = logDirectoryTF.getText();
+				onChange.run();
+			}
+		});
 		SwingUtil.setPreferredWidth(logDirectoryTF, 150);
 		openDirectoryButton = new JButton("...");
 		openDirectoryButton.addActionListener(e -> {

viewer/src/main/java/config/GraphicsPanel.java

@@ -26,9 +26,10 @@
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JSpinner;
-import javax.swing.JTextField;
 import javax.swing.SpinnerNumberModel;
 import javax.swing.SwingConstants;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
 import rv.Configuration;
 import rv.util.swing.SwingUtil;
 
@@ -46,8 +47,8 @@ public class GraphicsPanel extends JPanel implements SaveListener
 	JCheckBox maximizedCB;
 	JCheckBox centerCB;
 	JCheckBox saveStateCB;
-	JTextField samplesTF;
-	JTextField shadowResTB;
+	IntegerTextField samplesTF;
+	IntegerTextField shadowResTB;
 	JSpinner fpsSpinner;
 	JSpinner fpFovSpinner;
 	JSpinner tpFovSpinner;
@@ -58,11 +59,14 @@ public class GraphicsPanel extends JPanel implements SaveListener
 	final JLabel shadowResLabel = new JLabel("Shadow Resolution: ", SwingConstants.RIGHT);
 	final JLabel samplesLabel = new JLabel("Samples: ", SwingConstants.RIGHT);
 
+	private Runnable onChange;
+
 	public GraphicsPanel(RVConfigure configProg)
 	{
 		config = configProg.config.graphics;
 		initGUI();
 		configProg.listeners.add(this);
+		onChange = configProg.updateSaveButtonState;
 	}
 
 	void initGUI()
@@ -106,8 +110,34 @@ JPanel initAAPanel()
 		c.ipadx = 10;
 
 		fsaaCB = new JCheckBox("Enabled", config.useFsaa);
-		fsaaCB.addChangeListener(e -> updateAAEnabled());
+		fsaaCB.addChangeListener(e -> {
+			updateAAEnabled();
+			config.useFsaa = fsaaCB.isSelected();
+			onChange.run();
+		});
 		samplesTF = new IntegerTextField(config.fsaaSamples, 1, Integer.MAX_VALUE);
+		samplesTF.getDocument().addDocumentListener(new DocumentListener() {
+			@Override
+			public void insertUpdate(DocumentEvent e)
+			{
+				updateFsaaSamplesConfig(false);
+				onChange.run();
+			}
+
+			@Override
+			public void removeUpdate(DocumentEvent e)
+			{
+				updateFsaaSamplesConfig(false);
+				onChange.run();
+			}
+
+			@Override
+			public void changedUpdate(DocumentEvent e)
+			{
+				updateFsaaSamplesConfig(false);
+				onChange.run();
+			}
+		});
 		updateAAEnabled();
 
 		addConstrained(fsaaCB, panel, c, 0, 0);
@@ -133,10 +163,30 @@ JPanel initGeneral()
 		c.ipadx = 10;
 
 		stereoCB = new JCheckBox("Stereo 3D", config.useStereo);
+		stereoCB.addChangeListener(e -> {
+			config.useStereo = stereoCB.isSelected();
+			onChange.run();
+		});
 		vsyncCB = new JCheckBox("V-Sync", config.useVsync);
+		vsyncCB.addChangeListener(e -> {
+			config.useVsync = vsyncCB.isSelected();
+			onChange.run();
+		});
 		fpsSpinner = createSpinner(config.targetFPS, 1, 60);
+		fpsSpinner.addChangeListener(e -> {
+			config.targetFPS = (Integer) fpsSpinner.getValue();
+			onChange.run();
+		});
 		fpFovSpinner = createSpinner(config.firstPersonFOV, 1, 300);
+		fpFovSpinner.addChangeListener(e -> {
+			config.firstPersonFOV = (Integer) fpFovSpinner.getValue();
+			onChange.run();
+		});
 		tpFovSpinner = createSpinner(config.thirdPersonFOV, 1, 300);
+		tpFovSpinner.addChangeListener(e -> {
+			config.thirdPersonFOV = (Integer) tpFovSpinner.getValue();
+			onChange.run();
+		});
 
 		int y = 0;
 		addConstrained(stereoCB, panel, c, 0, y);
@@ -171,14 +221,42 @@ JPanel initFramePanel()
 		c.ipadx = 10;
 
 		fxSpinner = createSpinner(config.frameX, -100, 10000);
+		fxSpinner.addChangeListener(e -> {
+			config.frameX = (Integer) fxSpinner.getValue();
+			onChange.run();
+		});
 		fySpinner = createSpinner(config.frameY, -100, 10000);
+		fySpinner.addChangeListener(e -> {
+			config.frameY = (Integer) fySpinner.getValue();
+			onChange.run();
+		});
 		fwSpinner = createSpinner(config.frameWidth, 1, 10000);
+		fwSpinner.addChangeListener(e -> {
+			config.frameWidth = (Integer) fwSpinner.getValue();
+			onChange.run();
+		});
 		fhSpinner = createSpinner(config.frameHeight, 1, 10000);
+		fhSpinner.addChangeListener(e -> {
+			config.frameHeight = (Integer) fhSpinner.getValue();
+			onChange.run();
+		});
 		maximizedCB = new JCheckBox("Maximized", config.isMaximized);
+		maximizedCB.addChangeListener(e -> {
+			config.isMaximized = maximizedCB.isSelected();
+			onChange.run();
+		});
 		centerCB = new JCheckBox("Center Position", config.centerFrame);
-		centerCB.addActionListener(e -> updateFramePositionEnabled());
+		centerCB.addChangeListener(e -> {
+			updateFramePositionEnabled();
+			config.centerFrame = centerCB.isSelected();
+			onChange.run();
+		});
 		updateFramePositionEnabled();
 		saveStateCB = new JCheckBox("Save Frame State", config.saveFrameState);
+		saveStateCB.addChangeListener(e -> {
+			config.saveFrameState = saveStateCB.isSelected();
+			onChange.run();
+		});
 
 		int y = 0;
 		addLabel("X: ", panel, c, 0, y);
@@ -224,12 +302,50 @@ JPanel initLightingPanel()
 		c.ipadx = 10;
 
 		bloomCB = new JCheckBox("Bloom", config.useBloom);
+		bloomCB.addChangeListener(e -> {
+			config.useBloom = bloomCB.isSelected();
+			onChange.run();
+		});
 		phongCB = new JCheckBox("Phong", config.usePhong);
+		phongCB.addChangeListener(e -> {
+			config.usePhong = phongCB.isSelected();
+			onChange.run();
+		});
 		shadowCB = new JCheckBox("Shadows", config.useShadows);
-		shadowCB.addChangeListener(arg0 -> updateShadowsEnabled());
+		shadowCB.addChangeListener(e -> {
+			updateShadowsEnabled();
+			config.useShadows = shadowCB.isSelected();
+			onChange.run();
+		});
 
 		softShadowCB = new JCheckBox("Soft Shadows", config.useSoftShadows);
+		softShadowCB.addChangeListener(e -> {
+			config.useSoftShadows = softShadowCB.isSelected();
+			onChange.run();
+		});
 		shadowResTB = new IntegerTextField(config.shadowResolution, 1, Integer.MAX_VALUE);
+		shadowResTB.getDocument().addDocumentListener(new DocumentListener() {
+			@Override
+			public void insertUpdate(DocumentEvent e)
+			{
+				updateShadowResolutionConfig(false);
+				onChange.run();
+			}
+
+			@Override
+			public void removeUpdate(DocumentEvent e)
+			{
+				updateShadowResolutionConfig(false);
+				onChange.run();
+			}
+
+			@Override
+			public void changedUpdate(DocumentEvent e)
+			{
+				updateShadowResolutionConfig(false);
+				onChange.run();
+			}
+		});
 		updateShadowsEnabled();
 
 		addConstrained(phongCB, panel, c, 0, 0);
@@ -250,6 +366,28 @@ void updateShadowsEnabled()
 		shadowResLabel.setEnabled(shadowCB.isSelected());
 	}
 
+	private void updateFsaaSamplesConfig(boolean resetOnError)
+	{
+		try {
+			config.fsaaSamples = samplesTF.getInt();
+		} catch (Exception e) {
+			if (resetOnError) {
+				samplesTF.setText(config.fsaaSamples + "");
+			}
+		}
+	}
+
+	private void updateShadowResolutionConfig(boolean resetOnError)
+	{
+		try {
+			config.shadowResolution = shadowResTB.getInt();
+		} catch (Exception e) {
+			if (resetOnError) {
+				shadowResTB.setText(config.shadowResolution + "");
+			}
+		}
+	}
+
 	@Override
 	public void configSaved(RVConfigure configProg)
 	{
@@ -261,17 +399,8 @@ public void configSaved(RVConfigure configProg)
 		config.useStereo = stereoCB.isSelected();
 		config.useVsync = vsyncCB.isSelected();
 
-		try {
-			config.fsaaSamples = Integer.parseInt(samplesTF.getText());
-		} catch (Exception e) {
-			samplesTF.setText(config.fsaaSamples + "");
-		}
-
-		try {
-			config.shadowResolution = Integer.parseInt(shadowResTB.getText());
-		} catch (Exception e) {
-			shadowResTB.setText(config.shadowResolution + "");
-		}
+		updateFsaaSamplesConfig(true);
+		updateShadowResolutionConfig(true);
 
 		config.targetFPS = (Integer) fpsSpinner.getValue();
 		config.firstPersonFOV = (Integer) fpFovSpinner.getValue();

viewer/src/main/java/config/IntegerTextField.java

@@ -1,20 +1,25 @@
 package config;
 
 import java.text.NumberFormat;
+import java.text.ParseException;
 import javax.swing.JFormattedTextField;
 import javax.swing.text.NumberFormatter;
 
 public class IntegerTextField extends JFormattedTextField
 {
 	public IntegerTextField(int value, int minValue, int maxValue)
 	{
-		super(value);
-		NumberFormat format = NumberFormat.getInstance();
-		NumberFormatter formatter = new NumberFormatter(format);
+		super(new NumberFormatter(NumberFormat.getNumberInstance()));
+		setValue(value);
+		NumberFormatter formatter = (NumberFormatter) getFormatter();
 		formatter.setValueClass(Integer.class);
 		formatter.setMinimum(minValue);
 		formatter.setMaximum(maxValue);
 		formatter.setAllowsInvalid(false);
-		setFormatter(formatter);
+	}
+
+	public int getInt() throws ParseException
+	{
+		return NumberFormat.getInstance().parse(getText()).intValue();
 	}
 }