Renamed AbstractDataSharingController -> DataSharingController, created better Instructions.

Author: CodeGat

src/controller/Controller.java

@@ -162,12 +162,12 @@ public final class Controller implements Initializable {
      * @param title the title of the new window.
      * @param data the parameters passed to the Controller.
      * @param <C> a Controller that can pass data to and recieve data from this method (extending
-     *           AbstractDataSharingController).
+     *           DataSharingController).
      * @param <T> the type of data passed to and from the Controller.
      * @return the data after it has been modified by the Controller.
      */
     @FXML @SuppressWarnings("unchecked")
-    private <C extends AbstractDataSharingController<T>, T> ArrayList<T> showWindow(String fxml, String title, ArrayList<T> data){
+    private <C extends DataSharingController<T>, T> ArrayList<T> showWindow(String fxml, String title, ArrayList<T> data){
         try {
             FXMLLoader loader = new FXMLLoader(getClass().getResource(fxml));
             Parent parent = loader.load();
@@ -739,20 +739,7 @@ private File showLoadFileDialog(String title, ExtensionFilter extFilter){
      * Creates an instructional alert.
      */
     private void showInstructionsAlert() {
-        Alert instrAlert = new Alert(Alert.AlertType.INFORMATION);
-        instrAlert.setTitle("Instructions on using Drawing Turtles");
-        instrAlert.setHeaderText(null);
-        instrAlert.setContentText(
-                "How to use Drawing Turtles:\nClick once on the button corresponding to the graph element you want to" +
-                        " add to the canvas, then click somewhere on the canvas. Add a name (even in .ttl syntax!) an" +
-                        "d the item will be created in that position. \nIn regards to the Property button, you must c" +
-                        "lick on a valid (already existing) element in the graph as the subject, and then another as " +
-                        "the object. If you click on something that is not a Class or Literal, you will need toclick " +
-                        "the subject-object pair again.\nFeel free to add elements near the edge of the graph, it aut" +
-                        "omatically resizes! "
-        );
-
-        instrAlert.showAndWait();
+        showWindow("/view/instructions.fxml", "Instructions for Drawing Turtles", null);
     }
 
     /**

src/controller/CorrelateDialogController.java

@@ -22,7 +22,7 @@
 /**
  * The controller for view.correlateDialog.fxml.
  */
-public class CorrelateDialogController extends AbstractDataSharingController<DataIntegrator> implements Initializable {
+public class CorrelateDialogController extends DataSharingController<DataIntegrator> implements Initializable {
     @FXML Button addManualCorrBtn, addHeaderBtn, commitBtn, cancelBtn;
     @FXML ListView<String> csvHeaderList;
     @FXML ListView<String> csvTtlCorrelationList;
@@ -114,7 +114,7 @@ public class CorrelateDialogController extends AbstractDataSharingController<Dat
     /**
      * Close the Window and mark the modified DataIntegrator for commital.
      */
-    @FXML void commitCorrelationBtn() {
+    @FXML void commitCorrelationAction() {
         dataIntegrator.setCorrelations(correlations);
         dataIntegrator.setUncorrelated(new Pair<>(uncorrelatedCsvHeaders, uncorrelatedTtlClasses));
         Stage stage = (Stage) commitBtn.getScene().getWindow();
@@ -124,7 +124,7 @@ public class CorrelateDialogController extends AbstractDataSharingController<Dat
     /**
      * Close the Window.
      */
-    @FXML void cancelCorrelationBtn() {
+    @FXML void cancelCorrelationAction() {
         Stage stage = (Stage) cancelBtn.getScene().getWindow();
         stage.close();
     }

…oller/AbstractDataSharingController.java src/controller/DataSharingController.javasrc/controller/AbstractDataSharingController.java renamed to src/controller/DataSharingController.java src/controller/AbstractDataSharingController.java renamed to src/controller/DataSharingController.java

@@ -6,7 +6,7 @@
  * An abstract Controller that faciliitates the passing of data to and from the Controller class.
  * @param <T> the type of data passed between the two controllers.
  */
-abstract class AbstractDataSharingController<T> {
+abstract class DataSharingController<T> {
 
     /**
      * The method that passes data from the Caller to the Callee.

src/controller/InstructionsController.java

@@ -0,0 +1,18 @@
+package controller;
+
+import javafx.fxml.FXML;
+import javafx.scene.control.Button;
+import javafx.stage.Stage;
+
+import java.util.ArrayList;
+
+public class InstructionsController extends DataSharingController<String> {
+    @FXML Button closeBtn;
+
+
+
+    @FXML void closeAction() { ((Stage) closeBtn.getScene().getWindow()).close(); }
+
+    @Override public void setData(ArrayList<String> data) {}
+    @Override public ArrayList<String> getData() { return null; }
+}

src/controller/NewClassDialogController.java

@@ -18,7 +18,7 @@
 /**
  * The controller for view.newClassDialog.fxml.
  */
-public class NewClassDialogController extends AbstractDataSharingController<String> implements Initializable {
+public class NewClassDialogController extends DataSharingController<String> implements Initializable {
     private final BooleanProperty isClasslike = new SimpleBooleanProperty(false);
     private final BooleanProperty isLiterallike = new SimpleBooleanProperty(false);
 

src/controller/OntologyClassDialogController.java

@@ -17,7 +17,7 @@
 /**
  * The controller for ontologyClassDialog.fxml.
  */
-public class OntologyClassDialogController extends AbstractDataSharingController<String> implements Initializable {
+public class OntologyClassDialogController extends DataSharingController<String> implements Initializable {
     @FXML Button cmtBtn, cancelBtn;
     @FXML TextField typeTfd, nameTfd, labelTfd;
     @FXML TextArea commentTxa;

src/controller/OptionsMenuController.java

@@ -10,7 +10,7 @@
 /**
  * Controller for view.optionsmenu.fxml.
  */
-public class OptionsMenuController extends AbstractDataSharingController<Boolean> {
+public class OptionsMenuController extends DataSharingController<Boolean> {
     @FXML Button cancelBtn, commitBtn;
     @FXML CheckBox collectionsCbx, blankCbx, ontologyCbx;
 

src/controller/PrefixMenuController.java

@@ -31,7 +31,7 @@
 /**
  * Controller for view.prefixmenu.fxml.
  */
-public class PrefixMenuController extends AbstractDataSharingController<Map<String, String>> implements Initializable {
+public class PrefixMenuController extends DataSharingController<Map<String, String>> implements Initializable {
 
     private static final Logger LOGGER = Logger.getLogger(PrefixMenuController.class.getName());
 

src/view/correlateDialog.fxml

@@ -19,8 +19,8 @@
             <Button fx:id="addManualCorrBtn" maxWidth="Infinity" disable="true" onMouseClicked="#addManualCorrelationAction" text="Add Correlation"/>
             <Button fx:id="addHeaderBtn" maxWidth="Infinity" disable="true" onMouseClicked="#addHeaderAction" text="Add .csv Attribute"/>
             <Separator/>
-            <Button fx:id="commitBtn" maxWidth="Infinity" disable="true" onMouseClicked="#commitCorrelationBtn" text="Commit Correlations"/>
-            <Button fx:id="cancelBtn" maxWidth="Infinity" onMouseClicked="#cancelCorrelationBtn" text="Cancel Correlations"/>
+            <Button fx:id="commitBtn" maxWidth="Infinity" disable="true" onMouseClicked="#commitCorrelationAction" text="Commit Correlations"/>
+            <Button fx:id="cancelBtn" maxWidth="Infinity" onMouseClicked="#cancelCorrelationAction" text="Cancel Correlations"/>
             <Separator/>
         </ToolBar>
         <Text GridPane.rowIndex="2" GridPane.columnIndex="0" GridPane.columnSpan="2" text="Manually Correlated Attributes and Classes"/>