From c533d85e7796e052efe148a28a6282f0eb1ccecc Mon Sep 17 00:00:00 2001
From: Brian Patino <brian.patino@uconn.edu>
Date: Sat, 6 Feb 2016 00:42:32 -0500
Subject: [PATCH] Update Source Directory Structure * update directory based
 off Maven * create sample directory viewer * update application theme * fix
 readme spelling

---
 .gitignore                            |  1 -
 README.md                             |  2 +-
 src/gui/Controller.java               | 30 -----------------------
 src/main/java/Controller.java         | 35 +++++++++++++++++++++++++++
 src/{gui => main/java}/Main.java      |  4 +--
 src/{gui => main/java}/StartPage.fxml |  6 ++---
 6 files changed, 41 insertions(+), 37 deletions(-)
 delete mode 100644 src/gui/Controller.java
 create mode 100644 src/main/java/Controller.java
 rename src/{gui => main/java}/Main.java (92%)
 rename src/{gui => main/java}/StartPage.fxml (86%)

diff --git a/.gitignore b/.gitignore
index d8b1515..bd64445 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
 # IntelliJ
 .idea/
 *.iml
-javafx_scenebuilder_kit_javadoc-2_0.zip
 out/
\ No newline at end of file
diff --git a/README.md b/README.md
index 65b64db..9bab13f 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Iron Gate
 
-Iron Gate is the code name given to a really convenient files and foldesr organization system. This is a cross-platform application built for Windows and Mac OSX. Some really great features:
+Iron Gate is the code name given to a really convenient files and folders organization system. This is a cross-platform application built for Windows and Mac OSX. Some really great features:
   
   - Tag files and folders for quick search up
   - Save folder structures frequently used
diff --git a/src/gui/Controller.java b/src/gui/Controller.java
deleted file mode 100644
index fc7a187..0000000
--- a/src/gui/Controller.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package gui;
-
-import javafx.fxml.FXML;
-import javafx.scene.control.MenuItem;
-
-import java.util.ResourceBundle;
-
-public class Controller{
-    @FXML
-    private MenuItem menuOpen;
-
-    @FXML private ResourceBundle resources;
-
-    /*@FXML
-    private void initialize() {
-        menuOpen.setOnAction(openMenu());
-    }
-
-    private EventHandler<ActionEvent> openMenu() {
-        EventHandler<ActionEvent> evenHand = new EventHandler<ActionEvent>() {
-            @Override
-            public void handle(ActionEvent event) {
-                menuOpen.setText("Somewhat right...");
-            }
-        };
-        return evenHand;
-    }*/
-
-}
-
diff --git a/src/main/java/Controller.java b/src/main/java/Controller.java
new file mode 100644
index 0000000..a3f7103
--- /dev/null
+++ b/src/main/java/Controller.java
@@ -0,0 +1,35 @@
+package main.java;
+
+import javafx.fxml.FXML;
+import javafx.scene.control.MenuItem;
+import javafx.scene.control.TreeItem;
+import javafx.scene.control.TreeView;
+
+import java.util.ResourceBundle;
+
+public class Controller{
+    @FXML private MenuItem fileOpen;
+    @FXML private MenuItem fileNew;
+    @FXML private MenuItem fileTag;
+    @FXML private MenuItem fileExit;
+    @FXML private MenuItem editPreferences;
+    @FXML private TreeView<String> dirTree;
+
+    @FXML private ResourceBundle resources;
+
+    @FXML
+    private void initialize() {
+        createTree();
+    }
+
+    // Create the directory Tree
+    private void createTree() {
+        TreeItem<String> root = new TreeItem<String>("Root");
+        TreeItem<String> itemChild = new TreeItem<String>("Child");
+        itemChild.setExpanded(false);
+        root.getChildren().add(itemChild);
+        dirTree.setRoot(root);
+    }
+
+}
+
diff --git a/src/gui/Main.java b/src/main/java/Main.java
similarity index 92%
rename from src/gui/Main.java
rename to src/main/java/Main.java
index 8af1710..f0379f8 100644
--- a/src/gui/Main.java
+++ b/src/main/java/Main.java
@@ -1,4 +1,4 @@
-package gui;
+package main.java;
 
 import javafx.application.Application;
 import javafx.fxml.FXMLLoader;
@@ -10,7 +10,7 @@ public class Main extends Application {
 
     @Override
     public void start(Stage primaryStage) throws Exception{
-//        setUserAgentStylesheet(STYLESHEET_CASPIAN);
+        setUserAgentStylesheet(STYLESHEET_CASPIAN);
        /* Button btn = new Button();
         btn.setText("This is a test");
         btn.setOnAction(new EventHandler<ActionEvent>() {
diff --git a/src/gui/StartPage.fxml b/src/main/java/StartPage.fxml
similarity index 86%
rename from src/gui/StartPage.fxml
rename to src/main/java/StartPage.fxml
index e920420..f1a4077 100644
--- a/src/gui/StartPage.fxml
+++ b/src/main/java/StartPage.fxml
@@ -4,7 +4,7 @@
 
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
-<AnchorPane xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="gui.Controller">
+<AnchorPane xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="main.java.Controller">
    <children>
        <MenuBar prefHeight="25.0" prefWidth="789.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
            <!--suppress JavaFxDefaultTag -->
@@ -12,7 +12,7 @@
                <Menu mnemonicParsing="false" text="File">
                    <!--suppress JavaFxDefaultTag -->
                    <items>
-                       <MenuItem fx:id="menuOpen" mnemonicParsing="false" text="Open" />
+                       <MenuItem fx:id="fileOpen" mnemonicParsing="false" text="Open" />
                    </items>
                </Menu>
                <Menu mnemonicParsing="false" text="Edit">
@@ -41,6 +41,6 @@
                </Menu>
            </menus>
        </MenuBar>
-      <TreeView layoutY="25.0" prefHeight="552.0" prefWidth="200.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="25.0" />
+      <TreeView fx:id="dirTree" layoutY="25.0" prefHeight="552.0" prefWidth="200.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="25.0" />
    </children>
 </AnchorPane>