Merge pull request #228 from deadlocker8/v1_7_1

merge v1_7_1 into master
deadlocker8 · Nov 7, 2017 · e8ae4cd · e8ae4cd
2 parents 3959404 + 1dc14e6
commit e8ae4cd
Show file tree

Hide file tree

Showing 11 changed files with 28 additions and 32 deletions.
diff --git a/BudgetMasterClient/pom.xml b/BudgetMasterClient/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>de.deadlocker8</groupId>
 	<artifactId>BudgetMasterClient</artifactId>
-	<version>1.7.0</version>
+	<version>1.7.1</version>
 	<name>BudgetMasterClient</name>
 	<build>
 		<plugins>

diff --git a/...ent/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/SettingsController.java b/...ent/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/SettingsController.java
@@ -119,30 +119,26 @@ public void prefill()
 		{
 			textFieldURL.setText(controller.getSettings().getUrl());
 			textFieldSecret.setText("******");
-			textFieldCurrency.setText(controller.getSettings().getCurrency());
-			if(controller.getSettings().isRestActivated())
-			{
-				radioButtonRestActivated.setSelected(true);
-			}
-			else
-			{
-				radioButtonRestDeactivated.setSelected(true);
-			}
-			setTextAreaTrustedHosts(controller.getSettings().getTrustedHosts());
-
-			if(controller.getSettings().getLanguage() != null)
-			{
-				LanguageType language = controller.getSettings().getLanguage();
-				comboBoxLanguage.setValue(language);
-				previousLanguage = language;
-			}
-
-			checkboxEnableAutoUpdate.setSelected(controller.getSettings().isAutoUpdateCheckEnabled());
+			textFieldCurrency.setText(controller.getSettings().getCurrency());		
+		}
+
+		if(controller.getSettings().isRestActivated())
+		{
+			radioButtonRestActivated.setSelected(true);
 		}
 		else
 		{
 			radioButtonRestDeactivated.setSelected(true);
+		}		
+		setTextAreaTrustedHosts(controller.getSettings().getTrustedHosts());
+		if(controller.getSettings().getLanguage() != null)
+		{
+			LanguageType language = controller.getSettings().getLanguage();
+			comboBoxLanguage.setValue(language);
+			previousLanguage = language;
 		}
+
+		checkboxEnableAutoUpdate.setSelected(controller.getSettings().isAutoUpdateCheckEnabled());
 	}
 
 	private void refreshLabelsUpdate()

diff --git a/BudgetMasterClient/src/main/resources/de/deadlocker8/budgetmaster/languages/_de.properties b/BudgetMasterClient/src/main/resources/de/deadlocker8/budgetmaster/languages/_de.properties
@@ -1,8 +1,8 @@
 # DEFAULT
 app.name=BudgetMaster
-version.code=11
-version.name=1.7.0
-version.date=26.10.17
+version.code=12
+version.name=1.7.1
+version.date=07.11.17
 author=Robert Goldmann
 credits=Länderflaggen von Freepik auf https://www.flaticon.com\nVerwendete Schriftarten: OpenSans
 

diff --git a/BudgetMasterClient/src/main/resources/de/deadlocker8/budgetmaster/languages/_en.properties b/BudgetMasterClient/src/main/resources/de/deadlocker8/budgetmaster/languages/_en.properties
@@ -1,8 +1,8 @@
 # DEFAULT
 app.name=BudgetMaster
-version.code=11
-version.name=1.7.0
-version.date=26.10.17
+version.code=12
+version.name=1.7.1
+version.date=07.11.17
 author=Robert Goldmann
 credits=Flags by Freepik on https://www.flaticon.com\nFonts used: OpenSans
 

diff --git a/BudgetMasterCore/src/main/java/de/deadlocker8/budgetmaster/logic/Settings.java b/BudgetMasterCore/src/main/java/de/deadlocker8/budgetmaster/logic/Settings.java
@@ -22,10 +22,10 @@ public class Settings
 	private String url;
 	private String secret;
 	private String currency;
-	private boolean restActivated;
+	private boolean restActivated = true;
 	private ArrayList<String> trustedHosts;
-	private LanguageType language;
-	private boolean autoUpdateCheckEnabled;
+	private LanguageType language = LanguageType.ENGLISH;
+	private boolean autoUpdateCheckEnabled = true;
 
 	public Settings()
 	{

diff --git a/BudgetMasterCore/src/main/java/de/deadlocker8/budgetmaster/logic/utils/FileHelper.java b/BudgetMasterCore/src/main/java/de/deadlocker8/budgetmaster/logic/utils/FileHelper.java
@@ -34,7 +34,7 @@ public static Settings loadSettings()
 			reader.close();
 			return settings;
 		}
-		catch(IOException e)
+		catch(Exception e)
 		{
 			return null;
 		}

diff --git a/BudgetMasterServer/.classpath b/BudgetMasterServer/.classpath
@@ -22,7 +22,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>

diff --git a/BudgetMasterServer/pom.xml b/BudgetMasterServer/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>de.deadlocker8</groupId>
 	<artifactId>BudgetMasterServer</artifactId>
-	<version>1.7.0</version>
+	<version>1.7.1</version>
 	<name>BudgetMasterServer</name>
 	<build>
 		<plugins>

diff --git a/build/BudgetMaster.exe b/build/BudgetMaster.exe
diff --git a/build/BudgetMasterClient.jar b/build/BudgetMasterClient.jar
diff --git a/build/BudgetMasterServer.jar b/build/BudgetMasterServer.jar