fix pom, code improvements

shathor · shathor · commit ca45e208a7ac · 2018-10-13T22:58:45.000+02:00
diff --git a/pom.xml b/pom.xml
@@ -116,6 +116,11 @@
             <artifactId>jaxb-api</artifactId>
             <version>${version.jaxb}</version>
         </dependency>
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-core</artifactId>
+            <version>${version.jaxb}</version>
+        </dependency>
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-impl</artifactId>
diff --git a/src/main/java/ch/hsr/ogv/MainApp.java b/src/main/java/ch/hsr/ogv/MainApp.java
@@ -18,11 +18,9 @@ public class MainApp extends Application {
 
     private final static Logger logger = LoggerFactory.getLogger(MainApp.class);
 
-    private final static UncaughtExceptionHandler ueHandler = new UncaughtExceptionHandler() {
-        public void uncaughtException(Thread thread, final Throwable throwable) {
-            logger.debug("Error in thread " + thread + ": " + throwable.getMessage());
-            throwable.printStackTrace();
-        }
+    private final static UncaughtExceptionHandler ueHandler = (thread, throwable) -> {
+        logger.debug("Error in thread " + thread + ": " + throwable.getMessage());
+        throwable.printStackTrace();
     };
 
     public static void main(String[] args) {
diff --git a/src/main/java/ch/hsr/ogv/StageBuilder.java b/src/main/java/ch/hsr/ogv/StageBuilder.java
@@ -1,7 +1,7 @@
 package ch.hsr.ogv;
 
 import ch.hsr.ogv.controller.*;
-import ch.hsr.ogv.dataaccess.Persistancy;
+import ch.hsr.ogv.dataaccess.Persistence;
 import ch.hsr.ogv.dataaccess.UserPreferences;
 import ch.hsr.ogv.util.FXMLResourceUtil;
 import ch.hsr.ogv.util.ResourceLocator;
@@ -36,7 +36,7 @@ public class StageBuilder {
 
     private ModelViewConnector mvConnector;
     private ObjectGraph objectGraph;
-    private Persistancy persistancy;
+    private Persistence persistence;
 
     private ViewController viewController = new ViewController();
     private SelectionController selectionController = new SelectionController();
@@ -119,15 +119,15 @@ private void initObjectGraph() {
 
     private void initPersistancy() {
         UserPreferences.setOGVFilePath(null); // reset user preferences of file path
-        persistancy = new Persistancy(this.mvConnector.getModelManager());
+        persistence = new Persistence(this.mvConnector.getModelManager());
     }
 
     private void initViewController() {
         this.viewController.setPrimaryStage(this.primaryStage);
         this.viewController.setSubSceneAdapter(this.subSceneAdapter);
         this.viewController.setMVConnector(this.mvConnector);
         this.viewController.setObjectGraph(this.objectGraph);
-        this.viewController.setPersistancy(this.persistancy);
+        this.viewController.setPersistence(this.persistence);
         this.viewController.setSelectionController(this.selectionController);
         this.viewController.setCameraController(this.cameraController);
         this.viewController.setRelationCreationController(this.relationCreationController);
diff --git a/src/main/java/ch/hsr/ogv/controller/ViewController.java b/src/main/java/ch/hsr/ogv/controller/ViewController.java
@@ -35,7 +35,7 @@ public class ViewController implements Observer, Initializable {
     private SubSceneAdapter subSceneAdapter;
     private ModelViewConnector mvConnector;
     private ObjectGraph objectGraph;
-    private Persistancy persistancy;
+    private Persistence persistence;
     private SelectionController selectionController;
     private CameraController cameraController;
     private RelationCreationController relationCreationController;
@@ -60,8 +60,8 @@ public void setObjectGraph(ObjectGraph objectGraph) {
         this.objectGraph = objectGraph;
     }
 
-    public void setPersistancy(Persistancy persistancy) {
-        this.persistancy = persistancy;
+    public void setPersistence(Persistence persistence) {
+        this.persistence = persistence;
     }
 
     public void setSelectionController(SelectionController selectionController) {
@@ -116,7 +116,7 @@ private void handleOpen() {
         if (file != null) {
             UserPreferences.setOGVFilePath(file);
             MessageBar.setText("Loading file: \"" + file.getPath() + "\"...", MessageLevel.WARN);
-            persistancy.loadOGVDataAsync(file, new LoadCallback(this.primaryStage, this.appTitle, file));
+            persistence.loadOGVDataAsync(file, new LoadCallback(this.primaryStage, this.appTitle, file));
             exitObjectGraphMode();
         }
     }
@@ -141,7 +141,7 @@ private void handleImport() {
             UserPreferences.setXMIFilePath(file);
             UserPreferences.setOGVFilePath(null);
             MessageBar.setText("Importing file: \"" + file.getPath() + "\"...", MessageLevel.WARN);
-            persistancy.loadXMIDataAsync(file, new ImportCallback(this.primaryStage, this.appTitle, file));
+            persistence.loadXMIDataAsync(file, new ImportCallback(this.primaryStage, this.appTitle, file));
             exitObjectGraphMode();
         }
     }
@@ -154,7 +154,7 @@ private void handleSave() {
         File file = UserPreferences.getOGVFilePath();
         if (file != null) {
             MessageBar.setText("Saving file: \"" + file.getPath() + "\"...", MessageLevel.WARN);
-            persistancy.saveOGVDataAsync(file, new SaveCallback(this.primaryStage, this.appTitle, file));
+            persistence.saveOGVDataAsync(file, new SaveCallback(this.primaryStage, this.appTitle, file));
         }
         else {
             handleSaveAs();
@@ -185,7 +185,7 @@ private void handleSaveAs() {
             }
             UserPreferences.setOGVFilePath(file);
             MessageBar.setText("Saving file: \"" + file.getPath() + "\"...", MessageLevel.WARN);
-            persistancy.saveOGVDataAsync(file, new SaveCallback(this.primaryStage, this.appTitle, file));
+            persistence.saveOGVDataAsync(file, new SaveCallback(this.primaryStage, this.appTitle, file));
         }
         else {
             MessageBar.setText("Could not save data. No save file specified.", MessageLevel.ALERT);
diff --git a/src/main/java/ch/hsr/ogv/dataaccess/ImportCallback.java b/src/main/java/ch/hsr/ogv/dataaccess/ImportCallback.java
@@ -6,7 +6,7 @@
 
 import java.io.File;
 
-public class ImportCallback implements PersistencyCallback {
+public class ImportCallback implements PersistenceCallback {
 
     private Stage primaryStage;
     private String appTitle;
diff --git a/src/main/java/ch/hsr/ogv/dataaccess/LoadCallback.java b/src/main/java/ch/hsr/ogv/dataaccess/LoadCallback.java
@@ -6,7 +6,7 @@
 
 import java.io.File;
 
-public class LoadCallback implements PersistencyCallback {
+public class LoadCallback implements PersistenceCallback {
 
     private Stage primaryStage;
     private String appTitle;
diff --git a/src/main/java/ch/hsr/ogv/dataaccess/Persistence.java b/src/main/java/ch/hsr/ogv/dataaccess/Persistence.java
@@ -10,23 +10,22 @@
 import java.util.ArrayList;
 import java.util.LinkedHashSet;
 
-public class Persistancy {
-
+public class Persistence {
 
     private ModelManager modelManager;
 
-    public Persistancy(ModelManager modelManager) {
+    public Persistence(ModelManager modelManager) {
         this.modelManager = modelManager;
     }
 
-    public void saveOGVDataAsync(File file, PersistencyCallback callback) {
+    public void saveOGVDataAsync(File file, PersistenceCallback callback) {
         OGVSerialization ogvSerialization = new OGVSerialization();
         saveDataAsync(ogvSerialization, file, callback);
     }
 
-    private void saveDataAsync(SerializationStrategy serialStrategy, File file, PersistencyCallback callback) {
-        serialStrategy.setClasses(new LinkedHashSet<ModelClass>(modelManager.getClasses()));
-        serialStrategy.setRelations(new LinkedHashSet<Relation>(modelManager.getRelations()));
+    private void saveDataAsync(SerializationStrategy serialStrategy, File file, PersistenceCallback callback) {
+        serialStrategy.setClasses(new LinkedHashSet<>(modelManager.getClasses()));
+        serialStrategy.setRelations(new LinkedHashSet<>(modelManager.getRelations()));
         Task<Void> loadTask = new Task<Void>() {
             @Override
             public Void call() {
@@ -51,17 +50,17 @@ private boolean saveData(SerializationStrategy serialStrategy, File file) {
         return serialStrategy.serialize(file);
     }
 
-    public void loadOGVDataAsync(File file, PersistencyCallback callback) {
+    public void loadOGVDataAsync(File file, PersistenceCallback callback) {
         OGVSerialization ogvSerialization = new OGVSerialization();
         loadDataAsync(ogvSerialization, file, callback);
     }
 
-    public void loadXMIDataAsync(File file, PersistencyCallback callback) {
+    public void loadXMIDataAsync(File file, PersistenceCallback callback) {
         XMISerialization xmiSerialization = new XMISerialization();
         loadDataAsync(xmiSerialization, file, callback);
     }
 
-    private void loadDataAsync(SerializationStrategy serialStrategy, File file, PersistencyCallback callback) {
+    private void loadDataAsync(SerializationStrategy serialStrategy, File file, PersistenceCallback callback) {
         Task<Void> loadTask = new Task<Void>() {
             @Override
             public Void call() {
diff --git a/src/main/java/ch/hsr/ogv/dataaccess/PersistenceCallback.java b/src/main/java/ch/hsr/ogv/dataaccess/PersistenceCallback.java
@@ -1,6 +1,6 @@
 package ch.hsr.ogv.dataaccess;
 
 @FunctionalInterface
-public interface PersistencyCallback {
+public interface PersistenceCallback {
     void completed(boolean success);
 }
diff --git a/src/main/java/ch/hsr/ogv/dataaccess/SaveCallback.java b/src/main/java/ch/hsr/ogv/dataaccess/SaveCallback.java
@@ -6,7 +6,7 @@
 
 import java.io.File;
 
-public class SaveCallback implements PersistencyCallback {
+public class SaveCallback implements PersistenceCallback {
 
     private Stage primaryStage;
     private String appTitle;
diff --git a/src/main/java/ch/hsr/ogv/model/RelationType.java b/src/main/java/ch/hsr/ogv/model/RelationType.java
@@ -21,7 +21,7 @@ public enum RelationType {
     private final EndpointType endType;
     private final LineType lineType;
 
-    private RelationType(EndpointType startType, EndpointType endType, LineType lineType) {
+    RelationType(EndpointType startType, EndpointType endType, LineType lineType) {
         this.startType = startType;
         this.endType = endType;
         this.lineType = lineType;
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
diff --git a/src/main/resources/META-INF/MANIFEST.MF b/src/main/resources/META-INF/MANIFEST.MF
@@ -1,14 +1,3 @@
 Manifest-Version: 1.0
-Implementation-Title: ObjectGraphVisualizer
-Implementation-Version: 3.2
-Permissions: sandbox
-Class-Path: apiguardian-api-1.0.0.jar fxyzlib.jar javafx-base-11-win.j
- ar javafx-base-11.jar javafx-controls-11-win.jar javafx-controls-11.j
- ar javafx-fxml-11-win.jar javafx-fxml-11.jar javafx-graphics-11-win.j
- ar javafx-graphics-11.jar javax.activation-1.2.0.jar jaxb-api-2.3.0.j
- ar jaxb-impl-2.3.0.jar jimObjModelImporterJFX.jar junit-jupiter-api-5
- .3.1.jar junit-platform-commons-1.3.1.jar log4j-api-2.11.1.jar log4j-
- core-2.11.1.jar log4j-slf4j-impl-2.11.1.jar opentest4j-1.1.1.jar slf4
- j-api-1.7.25.jar
-Implementation-Vendor: hsr.ch
 Main-Class: ch.hsr.ogv.Main
+

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public class ViewController implements Observer, Initializable {`
`35`	`35`	`private SubSceneAdapter subSceneAdapter;`
`36`	`36`	`private ModelViewConnector mvConnector;`
`37`	`37`	`private ObjectGraph objectGraph;`
`38`		`- private Persistancy persistancy;`
	`38`	`+ private Persistence persistence;`
`39`	`39`	`private SelectionController selectionController;`
`40`	`40`	`private CameraController cameraController;`
`41`	`41`	`private RelationCreationController relationCreationController;`
`@@ -60,8 +60,8 @@ public void setObjectGraph(ObjectGraph objectGraph) {`
`60`	`60`	`this.objectGraph = objectGraph;`
`61`	`61`	`}`
`62`	`62`
`63`		`- public void setPersistancy(Persistancy persistancy) {`
`64`		`- this.persistancy = persistancy;`
	`63`	`+ public void setPersistence(Persistence persistence) {`
	`64`	`+ this.persistence = persistence;`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`public void setSelectionController(SelectionController selectionController) {`
`@@ -116,7 +116,7 @@ private void handleOpen() {`
`116`	`116`	`if (file != null) {`
`117`	`117`	`UserPreferences.setOGVFilePath(file);`
`118`	`118`	`MessageBar.setText("Loading file: \"" + file.getPath() + "\"...", MessageLevel.WARN);`
`119`		`- persistancy.loadOGVDataAsync(file, new LoadCallback(this.primaryStage, this.appTitle, file));`
	`119`	`+ persistence.loadOGVDataAsync(file, new LoadCallback(this.primaryStage, this.appTitle, file));`
`120`	`120`	`exitObjectGraphMode();`
`121`	`121`	`}`
`122`	`122`	`}`
`@@ -141,7 +141,7 @@ private void handleImport() {`
`141`	`141`	`UserPreferences.setXMIFilePath(file);`
`142`	`142`	`UserPreferences.setOGVFilePath(null);`
`143`	`143`	`MessageBar.setText("Importing file: \"" + file.getPath() + "\"...", MessageLevel.WARN);`
`144`		`- persistancy.loadXMIDataAsync(file, new ImportCallback(this.primaryStage, this.appTitle, file));`
	`144`	`+ persistence.loadXMIDataAsync(file, new ImportCallback(this.primaryStage, this.appTitle, file));`
`145`	`145`	`exitObjectGraphMode();`
`146`	`146`	`}`
`147`	`147`	`}`
`@@ -154,7 +154,7 @@ private void handleSave() {`
`154`	`154`	`File file = UserPreferences.getOGVFilePath();`
`155`	`155`	`if (file != null) {`
`156`	`156`	`MessageBar.setText("Saving file: \"" + file.getPath() + "\"...", MessageLevel.WARN);`
`157`		`- persistancy.saveOGVDataAsync(file, new SaveCallback(this.primaryStage, this.appTitle, file));`
	`157`	`+ persistence.saveOGVDataAsync(file, new SaveCallback(this.primaryStage, this.appTitle, file));`
`158`	`158`	`}`
`159`	`159`	`else {`
`160`	`160`	`handleSaveAs();`
`@@ -185,7 +185,7 @@ private void handleSaveAs() {`
`185`	`185`	`}`
`186`	`186`	`UserPreferences.setOGVFilePath(file);`
`187`	`187`	`MessageBar.setText("Saving file: \"" + file.getPath() + "\"...", MessageLevel.WARN);`
`188`		`- persistancy.saveOGVDataAsync(file, new SaveCallback(this.primaryStage, this.appTitle, file));`
	`188`	`+ persistence.saveOGVDataAsync(file, new SaveCallback(this.primaryStage, this.appTitle, file));`
`189`	`189`	`}`
`190`	`190`	`else {`
`191`	`191`	`MessageBar.setText("Could not save data. No save file specified.", MessageLevel.ALERT);`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`package ch.hsr.ogv.dataaccess;`
`2`	`2`
`3`	`3`	`@FunctionalInterface`
`4`		`-public interface PersistencyCallback {`
	`4`	`+public interface PersistenceCallback {`
`5`	`5`	`void completed(boolean success);`
`6`	`6`	`}`