Changed results table texts. All open windows close when application restarts. Minimum window size is 900x600 now instead of 800x600.

mikkomaran · mikkomaran · commit 6e584c75ad20 · 2021-04-12T18:19:36.000+03:00
diff --git a/src/main/java/ee/ut/similaritydetector/ui/SimilarityDetectorLauncher.java b/src/main/java/ee/ut/similaritydetector/ui/SimilarityDetectorLauncher.java
@@ -42,10 +42,10 @@ public void loadMainView(Stage stage) throws IOException {
         FXMLLoader loader = new FXMLLoader(getClass().getResource("/ee/ut/similaritydetector/fxml/main_view.fxml"));
         loader.setResources(langBundle);
         Parent root = loader.load();
-        stage.setMinWidth(800);
+        stage.setMinWidth(900);
         stage.setMinHeight(600);
         stage.setTitle(langBundle.getString("app_name"));
-        Scene scene = new Scene(root, 800, 600);
+        Scene scene = new Scene(root, 900, 600);
         stage.setScene(scene);
         // 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")));
diff --git a/src/main/java/ee/ut/similaritydetector/ui/controllers/MainViewController.java b/src/main/java/ee/ut/similaritydetector/ui/controllers/MainViewController.java
@@ -25,7 +25,6 @@
 import java.util.ResourceBundle;
 
 import static ee.ut.similaritydetector.ui.utils.AlertUtils.showAlert;
-import static ee.ut.similaritydetector.ui.utils.AlertUtils.showAndWaitAlert;
 
 public class MainViewController {
 
@@ -175,7 +174,7 @@ private void startAnalysis() {
 
         analyser.setOnFailed(event -> {
             analyser.getException().printStackTrace();
-            showAndWaitAlert(langBundle.getString("error_msg3"),
+            showAlert(langBundle.getString("error_msg3"),
                     langBundle.getString("context_msg2"),
                     Alert.AlertType.ERROR);
             resetMainView();
diff --git a/src/main/java/ee/ut/similaritydetector/ui/controllers/MenuBarController.java b/src/main/java/ee/ut/similaritydetector/ui/controllers/MenuBarController.java
@@ -16,6 +16,7 @@
 import java.util.Optional;
 import java.util.ResourceBundle;
 
+import static ee.ut.similaritydetector.ui.controllers.ResultsViewController.codeViewStage;
 import static ee.ut.similaritydetector.ui.utils.AlertUtils.showAlert;
 
 public class MenuBarController {
@@ -158,6 +159,10 @@ private void changeLanguage(String langTag) {
         Optional<ButtonType> buttonType = alert.showAndWait();
         if (buttonType.isPresent() && buttonType.get() == restartButtonType) {
             UserPreferences.getInstance().setLocale(langTag);
+            if (codeViewStage != null) {
+                codeViewStage.close();
+                codeViewStage = null;
+            }
             MainViewController.stage.close();
             Platform.runLater( () -> {
                 try {
@@ -166,7 +171,6 @@ private void changeLanguage(String langTag) {
                     e.printStackTrace();
                 }
             });
-            //Platform.exit();
         } else {
             if (newLocale.equals(Locale.forLanguageTag("et_EE"))) {
                 englishLang.setSelected(true);
diff --git a/src/main/java/ee/ut/similaritydetector/ui/controllers/ResultsViewController.java b/src/main/java/ee/ut/similaritydetector/ui/controllers/ResultsViewController.java
@@ -27,7 +27,7 @@ public class ResultsViewController {
 
     private Analyser analyser;
     private MainViewController mainViewController;
-    private Stage codeViewStage;
+    public static Stage codeViewStage;
 
     @FXML
     private MenuBarController menuBarController;
@@ -96,7 +96,7 @@ public void readStatistics() {
         int cellSize = 30;
         exerciseStatisticsTable.setFixedCellSize(cellSize);
         exerciseStatisticsTable.prefHeightProperty().bind(Bindings.size(exerciseStatisticsTable.getItems()).
-                multiply(exerciseStatisticsTable.getFixedCellSize()).add(cellSize + 6));
+                multiply(exerciseStatisticsTable.getFixedCellSize()).add(cellSize + 23));
     }
 
     private void fillExerciseStatisticsTable() {
diff --git a/src/main/resources/ee/ut/similaritydetector/fxml/main_view.fxml b/src/main/resources/ee/ut/similaritydetector/fxml/main_view.fxml
@@ -22,7 +22,7 @@
        <fx:include fx:id="menuBar" source="menu_bar.fxml" />
       <HBox VBox.vgrow="ALWAYS">
          <children>
-            <AnchorPane fx:id="optionsPane" minWidth="200.0" HBox.hgrow="NEVER">
+            <AnchorPane fx:id="optionsPane" minWidth="210.0" HBox.hgrow="NEVER">
                <children>
                   <TitledPane animated="false" collapsible="false" text="%options" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
                     <content>
@@ -69,7 +69,7 @@
                               <AnchorPane VBox.vgrow="ALWAYS">
                                  <children>
                                     <StackPane prefHeight="150.0" prefWidth="200.0" AnchorPane.bottomAnchor="-125.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-                                       <Button fx:id="fileChooseButton" alignment="CENTER" mnemonicParsing="false" onAction="#chooseFile" prefHeight="60.0" prefWidth="175.0" text="%solutions_zip" />
+                                       <Button fx:id="fileChooseButton" alignment="CENTER" mnemonicParsing="false" onAction="#chooseFile" prefHeight="75.0" prefWidth="175.0" text="%solutions_zip" />
                                        <VBox fx:id="fileArea" alignment="CENTER" prefHeight="200.0" prefWidth="100.0" StackPane.alignment="BOTTOM_CENTER" spacing="-10">
                                           <ImageView id="zipImg" fx:id="zipImg" fitHeight="125.0" fitWidth="80.0" onMouseClicked="#chooseFile" pickOnBounds="true" preserveRatio="true">
                                              <Image url="/ee/ut/similaritydetector/img/zip_icon.png" />
@@ -85,7 +85,7 @@
                                        <opaqueInsets>
                                           <Insets />
                                        </opaqueInsets>
-                                       <Button fx:id="startButton" minWidth="100.0" mnemonicParsing="false" onAction="#startAnalysis" prefHeight="50.0" prefWidth="125.0" text="%start_analysis" />
+                                       <Button fx:id="startButton" minWidth="100.0" mnemonicParsing="false" onAction="#startAnalysis" prefHeight="60.0" prefWidth="125.0" text="%start_analysis" />
                                     </VBox>
                                  </children>
                               </AnchorPane>
diff --git a/src/main/resources/ee/ut/similaritydetector/fxml/results_view.fxml b/src/main/resources/ee/ut/similaritydetector/fxml/results_view.fxml
@@ -56,7 +56,7 @@
                <children>
                   <TableView fx:id="exerciseStatisticsTable" focusTraversable="false" maxWidth="800.0">
                     <columns>
-                      <TableColumn fx:id="exerciseNameColumn" editable="false" prefWidth="125.0" text="%exercise_name" />
+                      <TableColumn fx:id="exerciseNameColumn" editable="false" prefWidth="100.0" text="%exercise_name" />
                       <TableColumn fx:id="totalSolutionsColumn" editable="false" prefWidth="100.0" sortType="DESCENDING" styleClass="number-column, column-header-alignment-center" text="%total_solutions"/>
                         <TableColumn fx:id="suspiciousSolutionsColumn" editable="false" prefWidth="100.0" sortType="DESCENDING" styleClass="number-column, column-header-alignment-center" text="%suspicious_solutions" />
                         <TableColumn fx:id="similarPairsColumn" editable="false" prefWidth="100.0" sortType="DESCENDING" styleClass="number-column, column-header-alignment-center" text="%similar_pairs" />
diff --git a/src/main/resources/ee/ut/similaritydetector/language/main_view.properties b/src/main/resources/ee/ut/similaritydetector/language/main_view.properties
@@ -12,7 +12,7 @@ preprocess_source_code=Eeltöötle lähtekoodid
 preprocess_source_code.tooltip=Eeltöötleb lahenduste lähtekoodid, eemaldades kommentaarid \
 ning tühjad read. Soovitatav täpsemate tulemuste saamiseks.
 processing_solutions=Töötlen lahendusfaile...
-solutions_zip=Vali lahenduste fail
+solutions_zip=Vali lahenduste ZIP-fail
 start_analysis=Alusta analüüsi
 starting_analysis=Alustan analüüsi...
 error_msg1=Sarnaseid töid ei leitud
diff --git a/src/main/resources/ee/ut/similaritydetector/language/main_view_EN.properties b/src/main/resources/ee/ut/similaritydetector/language/main_view_EN.properties
@@ -10,7 +10,7 @@ preparing_results=Preparing results...
 preprocess_source_code=Preprocess source code
 preprocess_source_code.tooltip=If selected, preprocesses the source code by removing comments and empty lines. Recommended for more accurate analysis results.
 processing_solutions=Processing solutions...
-solutions_zip=Choose solutions ZIP
+solutions_zip=Choose solutions ZIP-file
 start_analysis=Start analysis
 starting_analysis=Starting analysis...
 error_msg1=No similar solutions were detected
diff --git a/src/main/resources/ee/ut/similaritydetector/language/results_view.properties b/src/main/resources/ee/ut/similaritydetector/language/results_view.properties
@@ -1,7 +1,7 @@
 app_name=Lähtekoodi sarnasuse kontrollija
 
 analysis_duration=Analüüsi kestus:
-avg_solution_length=Keskmine\nlahenduse pikkus
+avg_solution_length=Keskmine\nlahenduse pikkus\n(tähemärki)
 exercise_name=Ülesande nimi
 results=Tulemused
 similar_clusters=Sarnaseid\nklastreid
diff --git a/src/main/resources/ee/ut/similaritydetector/language/results_view_EN.properties b/src/main/resources/ee/ut/similaritydetector/language/results_view_EN.properties
@@ -1,7 +1,7 @@
 app_name=Source code similarity detector
 
 analysis_duration=Analysis duration:
-avg_solution_length=Average\nsolution length
+avg_solution_length=Average\nsolution length\n(characters)
 exercise_name=Exercise name
 results=Results
 similar_clusters=Similar clusters
