Made UserData instance object.

mikkomaran · mikkomaran · commit 7351b87050eb · 2021-04-09T19:36:49.000+03:00
Moved theme persisting to initialize methods. Code view also closes when new analysis is started.
diff --git a/src/main/java/ee/ut/similaritydetector/ui/SimilarityDetectorLauncher.java b/src/main/java/ee/ut/similaritydetector/ui/SimilarityDetectorLauncher.java
@@ -46,7 +46,7 @@ public void loadMainView(Stage stage) throws IOException {
         // Icon from: https://icons-for-free.com/spy-131964785010048699/ [25.03.2021]
         stage.getIcons().add(new Image(getClass().getResourceAsStream("/ee/ut/similaritydetector/img/app_icon.png")));
         stage.show();
-        stage.setUserData(new UserData(true));
+        UserData.getInstance().setDarkMode(true);
         stage.setOnCloseRequest(this::showExitConfirmationAlert);
         MainViewController.stage = stage;
     }
@@ -74,7 +74,7 @@ private void showExitConfirmationAlert(WindowEvent windowEvent) {
         Stage stage = (Stage) alert.getDialogPane().getScene().getWindow();
         stage.getIcons().add(new Image(getClass().getResourceAsStream("/ee/ut/similaritydetector/img/app_icon.png")));
         // Dark mode
-        if (((UserData) MainViewController.stage.getUserData()).isDarkMode()) {
+        if (UserData.getInstance().isDarkMode()) {
             alert.getDialogPane().getStylesheets().add(String.valueOf(this.getClass().getResource(
                     "/ee/ut/similaritydetector/style/dark_mode.scss")));
         }
diff --git a/src/main/java/ee/ut/similaritydetector/ui/components/AccordionTableView.java b/src/main/java/ee/ut/similaritydetector/ui/components/AccordionTableView.java
@@ -76,7 +76,6 @@ public AccordionTableView(SimilarSolutionCluster cluster) {
                 lineText.append(word).append(" ");
                 Text text = new Text(lineText.toString());
                 if (text.getLayoutBounds().getWidth() > 400 - 50) {
-                    System.out.println(lineText);
                     headerText.append(System.lineSeparator());
                     lineText.delete(0, lineText.length());
                     lineText.append(word);
diff --git a/src/main/java/ee/ut/similaritydetector/ui/controllers/CodePaneController.java b/src/main/java/ee/ut/similaritydetector/ui/controllers/CodePaneController.java
@@ -55,8 +55,7 @@ private void onTabClosed() {
      */
     public void loadSolutionSourceCode() throws Exception {
         codeTab.setText(solution.getAuthor() + " - " + solution.getExerciseName());
-        UserData userData = (UserData) MainViewController.stage.getUserData();
-        if (userData.isDarkMode()) {
+        if (UserData.getInstance().isDarkMode()) {
             loadDarkThemeHTML();
         } else {
             loadLightThemeHTML();
diff --git a/src/main/java/ee/ut/similaritydetector/ui/controllers/CodeViewController.java b/src/main/java/ee/ut/similaritydetector/ui/controllers/CodeViewController.java
@@ -99,6 +99,9 @@ private void initialize() {
         arrowImg.setFitWidth(9);
         hideSideBarButton.setGraphic(arrowImg);
         hideSideBarButton.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
+
+        // Persists dark theme if it was activated before
+        Platform.runLater(menuBarController::persistCurrentTheme);
     }
 
     /**
diff --git a/src/main/java/ee/ut/similaritydetector/ui/controllers/MainViewController.java b/src/main/java/ee/ut/similaritydetector/ui/controllers/MainViewController.java
@@ -85,6 +85,9 @@ private void initialize() {
         toolTipManager.setDismissDelay(10000);
         toolTipManager.setInitialDelay(600);
         toolTipManager.setReshowDelay(300);
+
+        // Persists dark theme if it was activated before
+        Platform.runLater(menuBarController::persistCurrentTheme);
     }
 
     /**
@@ -238,9 +241,6 @@ private void openResultsView(Analyser analyser) throws IOException {
         stage.setScene(resultsViewScene);
         stage.setTitle("Source code similarity detector - Results - " + analyser.getZipDirectory().getName());
 
-        // Persists dark theme if it was activated before
-        Platform.runLater(() -> menuBarController.persistCurrentTheme());
-
         // Makes the "View clusters" button clickable if analysis found any clusters
         controller.toggleClusterButtonUsability();
 
diff --git a/src/main/java/ee/ut/similaritydetector/ui/controllers/MenuBarController.java b/src/main/java/ee/ut/similaritydetector/ui/controllers/MenuBarController.java
@@ -46,12 +46,11 @@ public MenuItem getCloseAllTabsMenuItem() {
 
     @FXML
     private void initialize() {
-        lightTheme.setOnAction(event -> Platform.runLater(this::activateClassicTheme));
+        lightTheme.setOnAction(event -> Platform.runLater(this::activateLightTheme));
         darkTheme.setOnAction(event -> Platform.runLater(this::activateDarkTheme));
         // When scenes are switched then persists theme
         if (MainViewController.stage != null) {
-            UserData userData = (UserData) MainViewController.stage.getUserData();
-            if (userData.isDarkMode()) {
+            if (UserData.getInstance().isDarkMode()) {
                 darkTheme.setSelected(true);
             } else {
                 lightTheme.setSelected(true);
@@ -72,9 +71,7 @@ private void exitMenuItemClicked() {
      * Activates dark theme on every currently opened window by adding a css stylesheet to the scenes.
      */
     private void activateDarkTheme() {
-        UserData userData = (UserData) MainViewController.stage.getUserData();
-        userData.setDarkMode(true);
-        MainViewController.stage.setUserData(userData);
+        UserData.getInstance().setDarkMode(true);
         Stage.getWindows().forEach(window -> {
             ObservableList<String> stylesheets = window.getScene().getStylesheets();
             if (! stylesheets.contains(String.valueOf(this.getClass().getResource(darkThemeStylesheetPath)))) {
@@ -89,10 +86,8 @@ private void activateDarkTheme() {
     /**
      * Activates light theme on every currently opened window by adding a css stylesheet to the scenes.
      */
-    private void activateClassicTheme() {
-        UserData userData = (UserData) MainViewController.stage.getUserData();
-        userData.setDarkMode(false);
-        MainViewController.stage.setUserData(userData);
+    private void activateLightTheme() {
+        UserData.getInstance().setDarkMode(false);
         Stage.getWindows().forEach(window -> window.getScene().getStylesheets().remove(String.valueOf(this.getClass().getResource(darkThemeStylesheetPath))));
         if (CodeViewController.getInstance() != null){
             CodeViewController.getInstance().getOpenCodePanes().forEach(CodePaneController::loadLightThemeHTML);
@@ -106,7 +101,7 @@ public void persistCurrentTheme() {
         if (darkTheme.isSelected()) {
             activateDarkTheme();
         } else {
-            activateClassicTheme();
+            activateLightTheme();
         }
     }
 
diff --git a/src/main/java/ee/ut/similaritydetector/ui/controllers/ResultsViewController.java b/src/main/java/ee/ut/similaritydetector/ui/controllers/ResultsViewController.java
@@ -22,6 +22,7 @@ public class ResultsViewController {
 
     private Analyser analyser;
     private MainViewController mainViewController;
+    private Stage codeViewStage;
 
     @FXML
     private MenuBarController menuBarController;
@@ -70,6 +71,8 @@ public void setMainViewController(MainViewController mainViewController) {
 
     @FXML
     private void initialize() {
+        // Persists dark theme if it was activated before
+        Platform.runLater(menuBarController::persistCurrentTheme);
     }
 
     /**
@@ -148,10 +151,8 @@ private void openCodeView() throws IOException {
         // Icon from: https://icons-for-free.com/spy-131964785010048699/ [25.03.2021]
         newWindow.getIcons().add(new Image(getClass().getResourceAsStream("/ee/ut/similaritydetector/img/app_icon.png")));
 
-        // Persists dark theme if it was activated before
-        Platform.runLater(menuBarController::persistCurrentTheme);
-
         newWindow.show();
+        codeViewStage = newWindow;
 
         // Resize cluster table columns
         Platform.runLater(controller::resizeClusterTableColumns);
@@ -160,6 +161,11 @@ private void openCodeView() throws IOException {
     @FXML
     private void runNewAnalysis() {
         try {
+            // Close code view if open
+            if (codeViewStage != null) {
+                codeViewStage.close();
+                codeViewStage = null;
+            }
             openMainView();
         } catch (IOException e) {
             e.printStackTrace();
@@ -177,9 +183,6 @@ private void openMainView() throws IOException {
         // Icon from: https://icons-for-free.com/spy-131964785010048699/ [25.03.2021]
         MainViewController.stage.getIcons().add(new Image(getClass().getResourceAsStream("/ee/ut/similaritydetector/img/app_icon.png")));
 
-        // Persists dark theme if it was activated before
-        Platform.runLater(menuBarController::persistCurrentTheme);
-
         mainViewController.openOptions();
         MainViewController.stage.show();
     }
diff --git a/src/main/java/ee/ut/similaritydetector/ui/utils/AlertUtils.java b/src/main/java/ee/ut/similaritydetector/ui/utils/AlertUtils.java
@@ -23,7 +23,7 @@ public static Alert createAlert(String errorMessage, String contextMessage, Aler
         stage.setTitle("");
         stage.getIcons().add(new Image(AlertUtils.class.getResourceAsStream("/ee/ut/similaritydetector/img/app_icon.png")));
         // Dark mode
-        if (((UserData) MainViewController.stage.getUserData()).isDarkMode()) {
+        if (UserData.getInstance().isDarkMode()) {
             alert.getDialogPane().getStylesheets().add(String.valueOf(AlertUtils.class.getResource(
                     "/ee/ut/similaritydetector/style/dark_mode.scss")));
         }
diff --git a/src/main/java/ee/ut/similaritydetector/ui/utils/UserData.java b/src/main/java/ee/ut/similaritydetector/ui/utils/UserData.java
@@ -14,6 +14,9 @@ public UserData(boolean isDarkMode) {
     }
 
     public static UserData getInstance() {
+        if (instance == null) {
+            instance = new UserData(true);
+        }
         return instance;
     }
 
diff --git a/src/main/resources/ee/ut/similaritydetector/style/code_view_style.scss b/src/main/resources/ee/ut/similaritydetector/style/code_view_style.scss
@@ -30,7 +30,7 @@
 
 #hideSideBarButton {
   -fx-background-radius: 1000;
-  -fx-opacity: 0.85;
+  -fx-opacity: 0.9;
 }
 
 #hideSideBarButton:focused {

Original file line number	Diff line number	Diff line change
`@@ -99,6 +99,9 @@ private void initialize() {`
`99`	`99`	`arrowImg.setFitWidth(9);`
`100`	`100`	`hideSideBarButton.setGraphic(arrowImg);`
`101`	`101`	`hideSideBarButton.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);`
	`102`	`+`
	`103`	`+ // Persists dark theme if it was activated before`
	`104`	`+ Platform.runLater(menuBarController::persistCurrentTheme);`
`102`	`105`	`}`
`103`	`106`
`104`	`107`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public static Alert createAlert(String errorMessage, String contextMessage, Aler`
`23`	`23`	`stage.setTitle("");`
`24`	`24`	`stage.getIcons().add(new Image(AlertUtils.class.getResourceAsStream("/ee/ut/similaritydetector/img/app_icon.png")));`
`25`	`25`	`// Dark mode`
`26`		`- if (((UserData) MainViewController.stage.getUserData()).isDarkMode()) {`
	`26`	`+ if (UserData.getInstance().isDarkMode()) {`
`27`	`27`	`alert.getDialogPane().getStylesheets().add(String.valueOf(AlertUtils.class.getResource(`
`28`	`28`	`"/ee/ut/similaritydetector/style/dark_mode.scss")));`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,9 @@ public UserData(boolean isDarkMode) {`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`public static UserData getInstance() {`
	`17`	`+ if (instance == null) {`
	`18`	`+ instance = new UserData(true);`
	`19`	`+ }`
`17`	`20`	`return instance;`
`18`	`21`	`}`
`19`	`22`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@`
`30`	`30`
`31`	`31`	`#hideSideBarButton {`
`32`	`32`	`-fx-background-radius: 1000;`
`33`		`- -fx-opacity: 0.85;`
	`33`	`+ -fx-opacity: 0.9;`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`#hideSideBarButton:focused {`