Fixed default report bug (#529)

* Fixed default report bug

* Updated demo project

Author: bowring

common.gradle

@@ -6,7 +6,7 @@ apply plugin: 'java'
 apply plugin: 'maven'
 
 String mavenGroupId = 'org.cirdles'
-String mavenVersion = '1.6.3'
+String mavenVersion = '1.6.4'
 
 sourceCompatibility = '1.8'
 [compileJava, compileTestJava]*.options*.encoding = 'UTF-8'

squidApp/src/main/java/org/cirdles/squid/gui/squidReportTable/SquidReportSettingsController.java

@@ -179,6 +179,9 @@ public void initialize(URL url, ResourceBundle rb) {
 
         isRefMat = false;
         spotsChoiceBox.setVisible(true);
+        isEditing.set(false);
+        isDefault.set(false);
+        isDefaultLab.set(false);
 
         selectedRefMatReportModel = task.getSelectedRefMatReportModel();
         selectedUnknownReportModel = task.getSelectedUnknownReportModel();
@@ -228,7 +231,7 @@ private void processButtons() {
         } else if (isDefaultLab.getValue()) {
             Arrays.asList(makeDefaultButton, saveButton, restoreButton, deleteButton).
                     parallelStream().forEach(button -> button.setDisable(true));
-            Arrays.asList( unknownsRadioButton, refMatRadioButton, newButton, copyButton, exportButton, importButton).
+            Arrays.asList(unknownsRadioButton, refMatRadioButton, newButton, copyButton, exportButton, importButton).
                     parallelStream().forEach(button -> button.setDisable(false));
         } else {
             Arrays.asList(restoreButton, saveButton).forEach(button -> button.setDisable(true));
@@ -264,10 +267,13 @@ private void initDefault() {
         isDefault.setValue(false);
         isDefault.addListener(ob -> processButtons());
     }
-    
+
     private void initDefaultLab() {
         isDefaultLab.setValue(false);
-        isDefaultLab.addListener(ob -> processButtons());
+        try {
+            isDefaultLab.addListener(ob -> processButtons());
+        } catch (Exception e) {
+        }
     }
 
     private void initReportTableCB() {
@@ -291,11 +297,11 @@ public SquidReportTableInterface fromString(String string) {
                 if (isRefMat) {
                     selectedRefMatReportModel = reportTableCB.getSelectionModel().getSelectedItem();
                     task.setSelectedRefMatReportModel(selectedRefMatReportModel);
-                    makeDefaultButton.setDisable(isDefaultLab.get());//    selectedRefMatReportModel.isDefault() || selectedRefMatReportModel.amWeightedMeanPlotAndSortReport() || !saveButton.isDisabled());
+                    //makeDefaultButton.setDisable(isDefaultLab.get());//    selectedRefMatReportModel.isDefault() || selectedRefMatReportModel.amWeightedMeanPlotAndSortReport() || !saveButton.isDisabled());
                 } else {
                     selectedUnknownReportModel = reportTableCB.getSelectionModel().getSelectedItem();
                     task.setSelectedUnknownReportModel(selectedUnknownReportModel);
-                    makeDefaultButton.setDisable(isDefaultLab.get());//  selectedUnknownReportModel.isDefault() || selectedUnknownReportModel.amWeightedMeanPlotAndSortReport() || !saveButton.isDisabled());
+                   // makeDefaultButton.setDisable(isDefaultLab.get());//  selectedUnknownReportModel.isDefault() || selectedUnknownReportModel.amWeightedMeanPlotAndSortReport() || !saveButton.isDisabled());
                 }
 
             }
@@ -1091,9 +1097,11 @@ private List<SquidReportTableInterface> getTables() {
         // remove labdatadefault
         SquidReportTableInterface saveTable = null;
         for (SquidReportTableInterface table : tables) {
+            if (table.getReportTableName().compareTo(NAME_OF_WEIGHTEDMEAN_PLOT_SORT_REPORT) == 0) {
+                table.setIsLabDataDefault(false);
+            }
             if (table.isIsLabDataDefault()) {
                 saveTable = table;
-                break;
             }
         }
 
@@ -1107,6 +1115,8 @@ private List<SquidReportTableInterface> getTables() {
             if (defaultRT != null) {
                 if (saveTable.getReportTableName().compareToIgnoreCase(defaultRT.getReportTableName()) != 0) {
                     saveTable.setIsLabDataDefault(false);
+                    tables.remove(saveTable);
+                    tables.remove(defaultRT);
                     tables.add(defaultRT);
                 }
             }
@@ -1161,6 +1171,7 @@ private void newOnAction(ActionEvent event) {
                 SquidMessageDialog.showWarningDialog("A Squid Report Model with the name you entered already exists. Please try again.", primaryStageWindow);
             } else {
                 SquidReportTableInterface table = SquidReportTable.createEmptySquidReportTable(name);
+                table.setIsLabDataDefault(false);
                 getTables().add(table);
                 populateSquidReportTableChoiceBox();
                 reportTableCB.getSelectionModel().select(table);
@@ -1186,6 +1197,7 @@ private void copyOnAction(ActionEvent event) {
             } else {
                 SquidReportTableInterface copy = createCopyOfUpdatedSquidReportTable();
                 copy.setReportTableName(name);
+                copy.setIsLabDataDefault(false);
                 getTables().add(copy);
                 populateSquidReportTableChoiceBox();
                 reportTableCB.getSelectionModel().select(copy);
@@ -1419,8 +1431,8 @@ public void exportCSVOnAction(ActionEvent actionEvent) throws IOException {
     @FXML
     private void makeDefaultAction(ActionEvent event) {
         SquidReportTableInterface defaultReportTableSpec = reportTableCB.getSelectionModel().getSelectedItem();
-        if (!defaultReportTableSpec.isIsLabDataDefault()) {
-            defaultReportTableSpec.setIsLabDataDefault(true);
+        if (!defaultReportTableSpec.isIsLabDataDefault()
+                && !defaultReportTableSpec.isDefault()) {
 
             SquidReportTableInterface defaultReport;
             if (isRefMat) {
@@ -1432,7 +1444,7 @@ private void makeDefaultAction(ActionEvent event) {
             if ((defaultReport != null) && (!defaultReport.equals(defaultReportTableSpec))) {
                 defaultReport.setIsLabDataDefault(false);
             }
-
+            defaultReportTableSpec.setIsLabDataDefault(true);
             if (isRefMat) {
                 Task.squidLabData.setDefaultReportTableRM(defaultReportTableSpec);
             } else {

squidCore/src/main/java/org/cirdles/squid/squidReports/squidReportTables/SquidReportTable.java

@@ -407,6 +407,9 @@ public void setIsDefault(boolean isDefault) {
 
     @Override
     public boolean isDefault() {
+        if (isDefault) {
+            isLabDataDefault = false;
+        }
         return isDefault;
     }
 

squidCore/src/main/java/org/cirdles/squid/tasks/Task.java

@@ -2727,6 +2727,7 @@ private SquidReportTableInterface initSquidWeightedMeanPlotSortTable() {
         boolean containsFilterReport = false;
         for (SquidReportTableInterface table : squidReportTablesUnknown) {
             if (table.getReportTableName().matches(NAME_OF_WEIGHTEDMEAN_PLOT_SORT_REPORT)) {
+                table.setIsLabDataDefault(false);
                 squidWeightedMeanPlotSortTable = table;
                 containsFilterReport = true;
                 break;
@@ -2745,6 +2746,7 @@ private SquidReportTableInterface initSquidWeightedMeanPlotSortTable() {
                 squidWeightedMeanPlotSortTable
                         = SquidReportTable.createDefaultSquidReportTableUnknownSquidFilter(this, SquidReportTable.WEIGHTEDMEAN_PLOT_SORT_TABLE_VERSION);
                 squidWeightedMeanPlotSortTable.setIsDefault(false);
+                squidWeightedMeanPlotSortTable.setIsLabDataDefault(false);
                 squidLabData.setSpecialWMSortingReportTable(squidWeightedMeanPlotSortTable);
             }
             squidReportTablesUnknown.add(squidWeightedMeanPlotSortTable);