Code tabs automatically resize when new ones are opened. Changed some node label texts.

Author: mikkomaran

src/main/java/ee/ut/similaritydetector/backend/Analyser.java

@@ -121,12 +121,12 @@ private void analyseSolutions() {
         for (Exercise exercise : exercises) {
             // Finds the average solution length for this exercise
             exercise.findAverageSolutionSourceCodeLength();
-            System.out.println(exercise.getName() + " - " + exercise.getAverageSolutionSourceCodeLength() + " source codes");
+            System.out.println("\n" + exercise.getName() + " - Average length of source codes: " + exercise.getAverageSolutionSourceCodeLength() );
             if (preprocessSourceCode){
                 exercise.findAverageSolutionPreprocessedCodeLength();
-                System.out.println(exercise.getName() + " - " + exercise.getAverageSolutionPreprocessedCodeLength() + " preprocessed codes");
-                System.out.println("Preprocessing removed on average " + Math.round(exercise.getAverageSolutionSourceCodeLength()
-                        - exercise.getAverageSolutionPreprocessedCodeLength()) + " characters per solution for exercise " + exercise.getName());
+                System.out.println(exercise.getName() + " - Average length of preprocessed codes: " + exercise.getAverageSolutionPreprocessedCodeLength());
+                System.out.println(exercise.getName() + " - Preprocessing removed on average " + Math.round(exercise.getAverageSolutionSourceCodeLength()
+                        - exercise.getAverageSolutionPreprocessedCodeLength()) + " characters per solution");
             }
 
             // If user chose a custom similarity threshold then it is used, otherwise it is calculated
@@ -147,6 +147,7 @@ private void analyseSolutions() {
      * @param exercise the {@code Exercise} on which the comparison is performed
      */
     private void compareSolutions(Exercise exercise) {
+        System.out.println("\nSimilar pairs for " + exercise.getName() + ":");
         List<Solution> solutions = exercise.getSolutions();
         for (int i = 0, solutionCount = solutions.size(); i < solutionCount; i++) {
             Solution solution1 = solutions.get(i);
@@ -157,8 +158,8 @@ private void compareSolutions(Exercise exercise) {
                     solution1.addSimilarSolution(solution2);
                     solution2.addSimilarSolution(solution1);
                     similarSolutionPairs.add(new SimilarSolutionPair(similarity, solution1, solution2));
-                    System.out.println(solution1.getExerciseName() + ": " + solution1.getAuthor() + ", " +
-                            solution2.getAuthor() + " - " + String.format("%.1f%%", similarity * 100));
+                    System.out.println("\t" + String.format("%.1f%%", similarity * 100) + "\t" +
+                            solution1.getAuthor() + ", " + solution2.getAuthor() );
                 }
                 analysedSolutionPairsCount++;
                 updateAnalysingProgress();

src/main/java/ee/ut/similaritydetector/backend/Exercise.java

@@ -79,7 +79,7 @@ public void calculateSimilarityThreshold() {
             lengthMultiplier = averageSolutionLength / 100;
 
         similarityThreshold = Math.pow(0.985, lengthMultiplier);
-        System.out.println(similarityThreshold);
+        System.out.println(name + " - Used similarity threshold: " +similarityThreshold);
     }
 
 }

src/main/java/ee/ut/similaritydetector/ui/components/AccordionTableView.java

@@ -1,10 +1,7 @@
 package ee.ut.similaritydetector.ui.components;
 
 import javafx.beans.binding.Bindings;
-import javafx.scene.control.SelectionMode;
-import javafx.scene.control.TableColumn;
-import javafx.scene.control.TableView;
-import javafx.scene.control.TitledPane;
+import javafx.scene.control.*;
 import javafx.scene.control.cell.PropertyValueFactory;
 import javafx.scene.layout.AnchorPane;
 import ee.ut.similaritydetector.backend.SimilarSolutionCluster;
@@ -65,10 +62,12 @@ public AccordionTableView(SimilarSolutionCluster cluster) {
         // To remove empty rows from the bottom of the table we have to set fixed cell size
         tableView.setFixedCellSize(cellSize);
         tableView.prefHeightProperty().bind(Bindings.size(tableView.getItems()).multiply(tableView.getFixedCellSize()).add(1));
-        tableView.minHeight(cellSize + 2);
+        tableView.minHeight(cellSize + 1);
 
-        // TitledPane header and content
+        // TitledPane header
         this.setText(cluster.getName());
+
+        // TitledPane's content
         this.setContent(anchorPane);
 
         // TitledPane restrictions

src/main/java/ee/ut/similaritydetector/ui/controllers/CodeViewController.java

@@ -1,5 +1,6 @@
 package ee.ut.similaritydetector.ui.controllers;
 
+import ee.ut.similaritydetector.backend.Analyser;
 import javafx.application.Platform;
 import javafx.beans.binding.Bindings;
 import javafx.fxml.FXML;
@@ -23,6 +24,7 @@ public class CodeViewController {
 
     private final List<AccordionTableView> clusterPanes;
     private final List<TableView<SimilarSolutionPair>> clusterTables;
+    private Analyser analyser;
 
     private static CodeViewController instance;
 
@@ -36,8 +38,6 @@ public class CodeViewController {
     @FXML
     private MenuItem closeAllTabsMenuItem;
 
-    private List<SimilarSolutionCluster> clusters;
-
     private final List<CodePaneController> openCodePanes;
 
 
@@ -52,18 +52,18 @@ public static CodeViewController getInstance() {
         return instance;
     }
 
-    public void setClusters(List<SimilarSolutionCluster> clusters) {
-        this.clusters = clusters;
+    public void setAnalyser(Analyser analyser) {
+        this.analyser = analyser;
     }
 
     public void addCodePane(CodePaneController codePaneController) {
-        openCodePanes.add(codePaneController);
-        codeSplitPane.getItems().add(codePaneController.getRoot());
+        Platform.runLater(() -> openCodePanes.add(codePaneController));
+        Platform.runLater(() -> codeSplitPane.getItems().add(codePaneController.getRoot()));
     }
 
     public void removeCodePane(CodePaneController codePaneController) {
-        openCodePanes.remove(codePaneController);
-        codeSplitPane.getItems().remove(codePaneController.getRoot());
+        Platform.runLater(() -> openCodePanes.remove(codePaneController));
+        Platform.runLater(() -> codeSplitPane.getItems().remove(codePaneController.getRoot()));
     }
 
     public List<CodePaneController> getOpenCodePanes() {
@@ -89,7 +89,7 @@ private void initialize() {
      * Creates the {@code AccordionTableView} elements from each {@code SimilarSolutionCluster} and adds to the view.
      */
     public void createClusterItems() {
-        for (SimilarSolutionCluster cluster : clusters) {
+        for (SimilarSolutionCluster cluster : analyser.getSimilarSolutionClusters()) {
             AccordionTableView solutionClusterItem = new AccordionTableView(cluster);
             VBox.setVgrow(solutionClusterItem, Priority.NEVER);
             clusterPanes.add(solutionClusterItem);
@@ -136,6 +136,14 @@ private void addCustomListener(TableView<SimilarSolutionPair> tableView) {
             row.setOnMouseClicked(event -> {
                 if (event.getClickCount() == 2 && !row.isEmpty()) {
                     SimilarSolutionPair solutionPair = row.getItem();
+                    // Closes opened tabs that are from a different cluster than this solution pair
+                    SimilarSolutionCluster currentCluster = analyser.getSimilarSolutionClusters().stream().filter(cluster ->
+                            cluster.getSolutionPairs().contains(solutionPair)).findAny().get();
+                    for (CodePaneController codeTab : openCodePanes) {
+                        if (! currentCluster.containsSolution(codeTab.getSolution())) {
+                            closeCodeTab(codeTab);
+                        }
+                    }
                     // First solution
                     try {
                         createNewCodePane(solutionPair.getFirstSolution());
@@ -150,6 +158,8 @@ private void addCustomListener(TableView<SimilarSolutionPair> tableView) {
                         e.printStackTrace();
                         showSolutionCodeReadingErrorAlert(solutionPair.getFirstSolution());
                     }
+                    // Resize code panes equally
+                    Platform.runLater(this::resizeCodePanes);
                 }
             });
             return row;
@@ -219,9 +229,14 @@ public void resizeClusterTableColumns() {
      * @param table the {@code TableView} to be resized
      */
     private void resizeTableColumns(TableView<?> table) {
+        table.applyCss();
+        table.layout();
         double columnsWidth = table.getColumns().stream().mapToDouble(TableColumnBase::getWidth).sum();
         double tableWidth = table.getWidth();
-        System.out.println(columnsWidth + " - " + tableWidth);
+        if (tableWidth == 0) {
+            table.setColumnResizePolicy(TableView.CONSTRAINED_RESIZE_POLICY);
+            return;
+        }
         if (tableWidth > columnsWidth) {
             tableWidth -= 4; // So random horizontal scroll doesn't happen
             TableColumn<?, ?> col1 = table.getColumns().get(0);
@@ -247,23 +262,32 @@ private void resizeTableColumns(TableView<?> table) {
         }
     }
 
+    private void resizeCodePanes() {
+        int nrPanes = openCodePanes.size();
+        double[] dividerPositions = new double[nrPanes];
+        double dividerSize = 1.0 / nrPanes;
+        for (int i = 0; i < nrPanes; i++) {
+            dividerPositions[i] = dividerSize * (i + 1);
+        }
+        Platform.runLater(() -> codeSplitPane.setDividerPositions(dividerPositions));
+    }
+
     /**
      * Closes the given code tab
      *
      * @param codePaneController {@link CodePaneController}
      */
     public void closeCodeTab(CodePaneController codePaneController) {
         removeCodePane(codePaneController);
-        codeSplitPane.getItems().remove(codePaneController.getRoot());
     }
 
     /**
      * Closes all code tabs that are currently open.
      */
     @FXML
     private void closeAllCodeTabs() {
-        openCodePanes.clear();
-        codeSplitPane.getItems().clear();
+        Platform.runLater(openCodePanes::clear);
+        Platform.runLater(() -> codeSplitPane.getItems().clear());
     }
 
 }

src/main/java/ee/ut/similaritydetector/ui/controllers/ResultsViewController.java

@@ -132,7 +132,7 @@ private void openCodeView() throws IOException {
                 "/ee/ut/similaritydetector/fxml/code_view.fxml"));
         Parent root = loader.load();
         CodeViewController controller = loader.getController();
-        controller.setClusters(analyser.getSimilarSolutionClusters());
+        controller.setAnalyser(analyser);
         Platform.runLater(controller::createClusterItems);
         double width = MainViewController.stage.getScene().getWidth() > 1200 ?
                 MainViewController.stage.getScene().getWidth() : 1200;

src/main/resources/ee/ut/similaritydetector/fxml/main_view.fxml

@@ -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="Choose the solutions ZIP" />
+                                       <Button fx:id="fileChooseButton" alignment="CENTER" mnemonicParsing="false" onAction="#chooseFile" prefHeight="60.0" prefWidth="175.0" text="Choose 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" />

src/main/resources/ee/ut/similaritydetector/fxml/results_view.fxml

@@ -61,7 +61,7 @@
                         <TableColumn fx:id="suspiciousSolutionsColumn" editable="false" prefWidth="100.0" sortType="DESCENDING" styleClass="number-column, column-header-alignment-center" text="Suspicious&#10;solutions" />
                         <TableColumn fx:id="similarPairsColumn" editable="false" prefWidth="100.0" sortType="DESCENDING" styleClass="number-column" text="Similar pairs " />
                         <TableColumn fx:id="similarClustersColumn" editable="false" prefWidth="100.0" sortType="DESCENDING" styleClass="number-column" text="Similar clusters" />
-                        <TableColumn fx:id="similarityThresholdColumn" editable="false" prefWidth="100.0" sortType="DESCENDING" styleClass="number-column, column-header-alignment-center" text="Similarity &#10;threshold&#10;" />
+                        <TableColumn fx:id="similarityThresholdColumn" editable="false" prefWidth="100.0" sortType="DESCENDING" styleClass="number-column, column-header-alignment-center" text="Used similarity &#10;threshold" />
                     </columns>
                      <VBox.margin>
                         <Insets left="75.0" right="75.0" />

src/main/resources/ee/ut/similaritydetector/style/code_view_style.scss

@@ -28,12 +28,12 @@
   -fx-opacity: 0;
 }
 
-.titledPane>.title {
-  -fx-pref-height: 50; /* increase available area */
+.titledPane-multiline > .title {
+  -fx-pref-height: 40; /* increase available area */
   -fx-alignment: top-center;
   -fx-padding: 4 4 4 30; /* increase left padding to align text */
 }
 
-#titledPane>.title>.arrow-button {
+.titledPane-multiline > .title > .arrow-button {
   -fx-translate-x: -20; /* move back arrow, which is also subject to the padding */
 }