#1118 change behaviour of defaults to be able to update default values

This also avoids unnecessary conversions from String to int and bool.

Author: hlg

BimServerJar/src/org/bimserver/starter/JarSettingsProperties.java

@@ -49,16 +49,16 @@ public static JarSettingsProperties readFromFile(Path path) {
 				try (InputStream inputStream = Files.newInputStream(path)) {
 					properties.load(inputStream);
 				}
-				jarSettingsProperties.setJvm(properties.getProperty("jvm", DEFAULT_JVM));
-				jarSettingsProperties.setStacksize(properties.getProperty("stacksize",DEFAULT_STACKSIZE));
+				jarSettingsProperties.setJvm(properties.getProperty("jvm"));
+				jarSettingsProperties.setStacksize(properties.getProperty("stacksize"));
 				jarSettingsProperties.setForceipv4(Boolean.parseBoolean(properties.getProperty("forceip4")));
-				jarSettingsProperties.setHomedir(properties.getProperty("homedir", DEFAULT_HOMEDIR));
-				jarSettingsProperties.setAddress(properties.getProperty("address", DEFAULT_ADDRESS));
+				jarSettingsProperties.setHomedir(properties.getProperty("homedir"));
+				jarSettingsProperties.setAddress(properties.getProperty("address"));
 				jarSettingsProperties.setUseProxy(Boolean.parseBoolean(properties.getProperty("useProxy")));
 				jarSettingsProperties.setProxyHost(properties.getProperty("proxyHost"));
-				jarSettingsProperties.setProxyPort(Integer.parseInt(properties.getProperty("proxyPort", String.valueOf(DEFAULT_PROXYPORT))));
-				jarSettingsProperties.setPort(Integer.parseInt(properties.getProperty("port", String.valueOf(DEFAULT_PORT))));
-				jarSettingsProperties.setHeapsize(properties.getProperty("heapsize", DEFAULT_HEAPSIZE));
+				jarSettingsProperties.setProxyPort(Integer.parseInt(properties.getProperty("proxyPort")));
+				jarSettingsProperties.setPort(Integer.parseInt(properties.getProperty("port")));
+				jarSettingsProperties.setHeapsize(properties.getProperty("heapsize"));
 			}
 		} catch (IOException e) {
 			e.printStackTrace();
@@ -87,29 +87,25 @@ public void save() {
 		}
 	}
 
-	public String getJvm() { return jvm; }
+	public String getJvm() { return jvm == null ? DEFAULT_JVM : jvm; }
 
 	public void setJvm(String jvm) { this.jvm = jvm; }
 
-	public String getStacksize() { return stacksize; }
+	public String getStacksize() { return stacksize == null ? DEFAULT_STACKSIZE : stacksize; }
 
 	public void setStacksize(String stacksize) { this.stacksize = stacksize; }
 
 	public boolean isForceipv4() { return forceipv4; }
 
 	public void setForceipv4(boolean forceipv4) { this.forceipv4 = forceipv4; }
 
-	public String getHomedir() {
-		return homedir;
-	}
+	public String getHomedir() { return homedir == null ? DEFAULT_HOMEDIR : homedir; }
 
 	public void setHomedir(String homedir) {
 		this.homedir = homedir;
 	}
 
-	public String getAddress() {
-		return address;
-	}
+	public String getAddress() { return address == null ? DEFAULT_ADDRESS : address; }
 
 	public void setAddress(String address) {
 		this.address = address;
@@ -132,7 +128,7 @@ public void setUseProxy(boolean useProxy) {
 	}
 
 	public int getProxyPort() {
-		return proxyPort;
+		return proxyPort == 0 ? DEFAULT_PORT : proxyPort;
 	}
 
 	public void setProxyPort(int proxyPort) {
@@ -148,7 +144,7 @@ public void setPort(int port) {
 	}
 
 	public String getHeapsize() {
-		return heapsize;
+		return heapsize == null ? DEFAULT_HEAPSIZE : heapsize;
 	}
 
 	public void setHeapsize(String heapsize) {