Refactor (#695)

Author: bowring

squidApp/src/main/java/org/cirdles/squid/gui/TaskEditorController.java

@@ -294,18 +294,6 @@ public void initialize(URL url, ResourceBundle rb) {
                     SquidPersistentState.getExistingPersistentState().setTaskDesign(new TaskDesignBlank());
                     taskEditor = SquidPersistentState.getExistingPersistentState().getTaskDesign();
                     break;
-                case EDIT_DEFAULT_9_MASS:
-                    SquidPersistentState.getExistingPersistentState().setTaskDesign(new TaskDesign9Mass());
-                    taskEditor = SquidPersistentState.getExistingPersistentState().getTaskDesign();
-                    break;
-                case EDIT_DEFAULT_10_MASS:
-                    SquidPersistentState.getExistingPersistentState().setTaskDesign(new TaskDesign10Mass());
-                    taskEditor = SquidPersistentState.getExistingPersistentState().getTaskDesign();
-                    break;
-                case EDIT_DEFAULT_11_MASS:
-                    SquidPersistentState.getExistingPersistentState().setTaskDesign(new TaskDesign11Mass());
-                    taskEditor = SquidPersistentState.getExistingPersistentState().getTaskDesign();
-                    break;
                 case EDIT_EXISTING_TASK:
                     existingTaskToEdit.updateTaskDesignFromTask(taskEditor, true);
                     break;
@@ -382,9 +370,9 @@ private void initTaskDesign() throws SquidException {
             }
         });
 
-        SpinnerValueFactory<Integer> valueFactoryTh
-                = new SpinnerValueFactory.IntegerSpinnerValueFactory(0, 25, squidProject.getTask().getIndexOfBackgroundSpecies() + 1, 1);
-        backgroundIndexSpinner.setValueFactory(valueFactoryTh);
+        SpinnerValueFactory<Integer> valueFactoryBackgroundIndex
+                = new SpinnerValueFactory.IntegerSpinnerValueFactory(0, 25, taskEditor.getIndexOfBackgroundSpecies() + 1, 1);
+        backgroundIndexSpinner.setValueFactory(valueFactoryBackgroundIndex);
         backgroundIndexSpinner.valueProperty().addListener((ObservableValue<? extends Integer> observable,
                                                             Integer oldValue, Integer newValue) -> {
 
@@ -498,8 +486,8 @@ private void populateRatios() {
     }
 
     private void updateDirectiveButtons() {
-        taskManagerGridPane.lookup("#232").setDisable(squidProject.getTask().getSelectedIndexIsotope().compareTo(Squid3Constants.IndexIsoptopesEnum.PB_208) == 0);
-        taskManagerGridPane.lookup("#direct").setDisable(squidProject.getTask().getSelectedIndexIsotope().compareTo(Squid3Constants.IndexIsoptopesEnum.PB_208) == 0);
+        taskManagerGridPane.lookup("#232").setDisable(taskEditor.getSelectedIndexIsotope().compareTo(Squid3Constants.IndexIsoptopesEnum.PB_208) == 0);
+        taskManagerGridPane.lookup("#direct").setDisable(taskEditor.getSelectedIndexIsotope().compareTo(Squid3Constants.IndexIsoptopesEnum.PB_208) == 0);
     }
 
     private void populateDirectives() {

squidCore/src/main/java/org/cirdles/squid/constants/Squid3Constants.java

@@ -405,9 +405,6 @@ public enum TaskEditTypeEnum {
         EDIT_COPY_CURRENT("EDIT_COPY_CURRENT"),
         EDIT_COPY_CURRENT_NO_EXP("EDIT_COPY_CURRENT_NO_EXP"),
         EDIT_EMPTY("EDIT_EMPTY"),
-        EDIT_DEFAULT_9_MASS("EDIT_DEFAULT_9_MASS"),
-        EDIT_DEFAULT_10_MASS("EDIT_DEFAULT_10_MASS"),
-        EDIT_DEFAULT_11_MASS("EDIT_DEFAULT_11_MASS"),
         EDIT_EXISTING_TASK("EDIT_EXISTING_TASK");
 
         private final String name;