diff --git a/BudgetMasterClient/pom.xml b/BudgetMasterClient/pom.xml index af6a7b9b51d7d95d772343d8e69cb3194db948b4..4670c84085b337379957f991b1dc51f714b4a9cb 100644 --- a/BudgetMasterClient/pom.xml +++ b/BudgetMasterClient/pom.xml @@ -105,7 +105,7 @@ <dependency> <groupId>de.deadlocker8</groupId> <artifactId>tools</artifactId> - <version>0.0.1-SNAPSHOT</version> + <version>1.0.0</version> </dependency> </dependencies> </project> \ No newline at end of file diff --git a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/ReportController.java b/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/ReportController.java index a99a28ee7b3f6ae657f70273fcabfbf49deee779..a4fec0e9a02c9ecfa4c41037e704d40b4f9025ea 100644 --- a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/ReportController.java +++ b/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/ReportController.java @@ -28,7 +28,6 @@ import de.deadlocker8.budgetmaster.logic.report.ReportSorting; import de.deadlocker8.budgetmaster.logic.serverconnection.ExceptionHandler; import de.deadlocker8.budgetmaster.logic.tag.TagHandler; import de.deadlocker8.budgetmaster.logic.utils.Colors; -import de.deadlocker8.budgetmaster.logic.utils.FileHelper; import de.deadlocker8.budgetmaster.logic.utils.Helpers; import de.deadlocker8.budgetmaster.logic.utils.Strings; import de.deadlocker8.budgetmasterclient.ui.Refreshable; @@ -67,6 +66,7 @@ import logger.Logger; import tools.AlertGenerator; import tools.ConvertTo; import tools.Localization; +import tools.ObjectJSONHandler; import tools.Worker; public class ReportController implements Refreshable, Styleable @@ -196,9 +196,9 @@ public class ReportController implements Refreshable, Styleable private void applyReportPreferences() { - tableView.getColumns().clear(); + tableView.getColumns().clear(); - Object loadedObject = FileHelper.loadObjectFromJSON("reportPreferences", new ReportPreferences()); + Object loadedObject = ObjectJSONHandler.loadObjectFromJSON(Localization.getString(Strings.FOLDER), "reportPreferences", new ReportPreferences()); if(loadedObject != null) { reportPreferences = (ReportPreferences)loadedObject; @@ -613,7 +613,7 @@ public class ReportController implements Refreshable, Styleable { try { - FileHelper.saveObjectToJSON("reportPreferences", reportPreferences); + ObjectJSONHandler.saveObjectToJSON(Localization.getString(Strings.FOLDER), "reportPreferences", reportPreferences); } catch(IOException e) { diff --git a/BudgetMasterClient/src/main/resources/de/deadlocker8/budgetmaster/languages/_de.properties b/BudgetMasterClient/src/main/resources/de/deadlocker8/budgetmaster/languages/_de.properties index c3d0c4bffec321ef09689f6a6eead51adbe6df56..a153dcf11e586d631e2d65c8784783234b11a934 100644 --- a/BudgetMasterClient/src/main/resources/de/deadlocker8/budgetmaster/languages/_de.properties +++ b/BudgetMasterClient/src/main/resources/de/deadlocker8/budgetmaster/languages/_de.properties @@ -325,7 +325,7 @@ about= about.roadmap.link=Roadmap �ffnen about.version=Version: about.date=Datum: -about.author=Author: +about.author=Autor: about.roadmap=Roadmap: about.sourcecode=Quellcode: about.credits=Credits: diff --git a/BudgetMasterCore/pom.xml b/BudgetMasterCore/pom.xml index 378e55ce7636d2d06a38be2dacd30be6a3d3dae1..73e1ad26d5b81d6e1d7e7a5b67b9a7826db301e6 100644 --- a/BudgetMasterCore/pom.xml +++ b/BudgetMasterCore/pom.xml @@ -37,7 +37,7 @@ <dependency> <groupId>de.deadlocker8</groupId> <artifactId>tools</artifactId> - <version>1.0</version> + <version>1.0.0</version> <scope>system</scope> <systemPath>${basedir}/../lib/Tools.jar</systemPath> </dependency> 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 index 1f4353564f28e2e27f1c16258354effeff16df5e..be49946656293efec9d25e6fa7ddc9e07c3bdb96 100644 --- a/BudgetMasterCore/src/main/java/de/deadlocker8/budgetmaster/logic/utils/FileHelper.java +++ b/BudgetMasterCore/src/main/java/de/deadlocker8/budgetmaster/logic/utils/FileHelper.java @@ -102,31 +102,5 @@ public class FileHelper Writer writer = Files.newBufferedWriter(Paths.get(file.getAbsolutePath()), Charset.forName("UTF-8")); writer.write(databaseJSON); writer.close(); - } - - public static Object loadObjectFromJSON(String fileName, Object objectype) - { - try - { - Gson gson = new Gson(); - Reader reader = Files.newBufferedReader(Paths.get(PathUtils.getOSindependentPath() + Localization.getString(Strings.FOLDER) + "/" + fileName + ".json"), Charset.forName("UTF-8")); - Object preferences = gson.fromJson(reader, objectype.getClass()); - reader.close(); - return preferences; - } - catch(IOException e) - { - return null; - } - } - - public static void saveObjectToJSON(String fileName, Object objectToSave) throws IOException - { - Gson gson = new Gson(); - String jsonString = gson.toJson(objectToSave); - PathUtils.checkFolder(new File(PathUtils.getOSindependentPath() + Localization.getString(Strings.FOLDER))); - Writer writer = Files.newBufferedWriter(Paths.get(PathUtils.getOSindependentPath() + Localization.getString(Strings.FOLDER) + "/" + fileName + ".json"), Charset.forName("UTF-8")); - writer.write(jsonString); - writer.close(); - } + } } \ No newline at end of file diff --git a/BudgetMasterServer/.classpath b/BudgetMasterServer/.classpath index fae1a2b37d5e3386c9651caedb78b9bd107715bd..8e795b1c7e0c65a33e55e6a4fe23c4a11dd9e703 100644 --- 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 index 2fc7fb5012dc2f62790b97613796747d7a2b9e89..d6804dc29c70e0dd5bfaa9a7ada52eb63ff2dfc5 100644 --- a/BudgetMasterServer/pom.xml +++ b/BudgetMasterServer/pom.xml @@ -73,7 +73,7 @@ <dependency> <groupId>de.deadlocker8</groupId> <artifactId>tools</artifactId> - <version>0.0.1-SNAPSHOT</version> + <version>1.0.0</version> </dependency> <dependency> <groupId>de.deadlocker8</groupId>