From a52e8470fcc7a6ee3f024706191c15af2708a8d1 Mon Sep 17 00:00:00 2001
From: Brian Patino <brian.patino@uconn.edu>
Date: Fri, 12 Feb 2016 17:19:23 -0500
Subject: [PATCH] Merge Changes * remove uneeded code * convert to IronFile *
 code cleanup

---
 src/main/java/Controller.java                 |  55 +-----
 src/main/java/FolderViewManager.java          |  51 ++++--
 src/main/java/IronFile.java                   |   1 -
 src/main/java/IronFileVisitor.java            |  32 ++--
 src/main/java/Main.java                       |  28 ---
 .../Kris_StartPage(merge please).fxml         | 160 ------------------
 6 files changed, 51 insertions(+), 276 deletions(-)
 delete mode 100644 src/main/resources/Kris_StartPage(merge please).fxml

diff --git a/src/main/java/Controller.java b/src/main/java/Controller.java
index c87e978..28264de 100644
--- a/src/main/java/Controller.java
+++ b/src/main/java/Controller.java
@@ -27,61 +27,14 @@ public class Controller{
     @FXML private MenuItem fileTag;
     @FXML private MenuItem fileExit;
     @FXML private MenuItem editPreferences;
-    @FXML private TreeView<String> dirTree;
+    @FXML private TreeView<IronFile> dirTree;
     @FXML private ResourceBundle resources;
 
     @FXML private void initialize() {
         //createTree();
-        // FolderViewManager.java calls are done here
-
-        FolderViewManager.view = dirTree;
-        File homeDir = new File(System.getProperty("user.home"));
-        FolderViewManager.setRootDirectory(homeDir);
-    }
-
-    // Create the directory Tree
-   /* private void createTree() {
-        // Get the hard disk drives and 2 levels down
-        IronFile[] roots = IronFile.listRoots();
-        for (IronFile hdd : roots) {
-            TreeItem<IronFile> parentTreeItem = new TreeItem<>(hdd);
-            parentTreeItem.setGraphic(new ImageView(hddIcon));
-            setChildOfParent(hdd, parentTreeItem);
-            root.getChildren().add(parentTreeItem); // set hdd to root
-
-        }
-        dirTree.setRoot(root);
-        dirTree.setShowRoot(false);
-
-        /*dirTree.setCellFactory(new Callback<TreeView<File>, TreeCell<File>>() {
-            @Override
-            public TreeCell<File> call(TreeView<File> param) {
-                return new TreeFieldImpl();
-            }
-        });
-    }*/
-    /**
-     * Set the child of a given parent TreeItem
-     *
-     * @param parent file of the parent node
-     * @param parentTreeItem TreeItem of the parent node
-     * */
-    @SuppressWarnings("ConstantConditions")
-    private void setChildOfParent(final File parent, TreeItem<IronFile> parentTreeItem) {
-        for (final IronFile file : IronFile.convertFiles(parent.listFiles())) {
-            if (file.isDirectory()) {
-                System.out.println("This is a directory");
-            } else {
-                parentTreeItem.getChildren().add(new TreeItem<>(file));
-                System.out.println(file.getName());
-            }
-        }
-    }
-
-    private class TreeFieldImpl extends TreeCell<File> {
-        public TreeFieldImpl() {
-//            MenuItem
-        }
+        FolderViewManager manager = new FolderViewManager(root, dirTree);
+        IronFile homeDir = new IronFile(System.getProperty("user.home"));
+        manager.setRootDirectory(homeDir);
     }
 }
 
diff --git a/src/main/java/FolderViewManager.java b/src/main/java/FolderViewManager.java
index 8099ca2..885643c 100644
--- a/src/main/java/FolderViewManager.java
+++ b/src/main/java/FolderViewManager.java
@@ -21,37 +21,52 @@
     @author Brian Patino
  */
 public class FolderViewManager {
+    private TreeView<IronFile> view;
+    private TreeItem<IronFile> root;
+    private int NEST_COUNT = 0; //tracks number of nested calls when searching through files, TEMPORARY
 
-    public static TreeView<String> view;
-    private static TreeItem<String> root;
-    private static int NEST_COUNT = 0; //tracks number of nested calls when searching through files, TEMPORARY
-
-    private FolderViewManager() { }
-
-    public static void setRootDirectory(File file) {
+    public FolderViewManager(TreeItem<IronFile> root, TreeView<IronFile> dirTree) {
+        this.root = root;
+        this.view = dirTree;
+    }
 
-        root = new TreeItem<String>(file.getName());
+    public void setRootDirectory(IronFile file) {
+        root = new TreeItem<>(file);
         view.setRoot(root);
-
         createCellsFromRoot(file, root);
     }
 
-
-    private static void createCellsFromRoot(File rootFile, TreeItem<String> rootNode) {
-
+    private void createCellsFromRoot(File rootFile, TreeItem<IronFile> rootNode) {
         NEST_COUNT++;
-        if(NEST_COUNT > 6000) { //fixed value, TEMPORARY optimization
+        if(NEST_COUNT > 1000) { //fixed value, TEMPORARY optimization
             return;
         }
 
-        for(File f : rootFile.listFiles()) {
-            if(!f.getName().startsWith(".")) { //don't show system files that start with dot (ex: .filename .pythonfile)
-                TreeItem<String> fileNode = new TreeItem<String>(f.getName());
+        for(IronFile file : IronFile.convertFiles(rootFile.listFiles())) {
+            if(!file.getName().startsWith(".")) { //don't show system files that start with dot (ex: .filename .pythonfile)
+                TreeItem<IronFile> fileNode = new TreeItem<>(file);
                 rootNode.getChildren().add(fileNode);
-                if (f.isDirectory()) {
-                    createCellsFromRoot(f, fileNode);
+                if (file.isDirectory()) {
+                    createCellsFromRoot(file, fileNode);
                 }
             }
         }
     }
+    /**
+     * Set the child of a given parent TreeItem
+     *
+     * @param parent file of the parent node
+     * @param parentTreeItem TreeItem of the parent node
+     * */
+    /*@SuppressWarnings("ConstantConditions")
+    private void setChildOfParent(final File parent, TreeItem<IronFile> parentTreeItem) {
+        for (final IronFile file : IronFile.convertFiles(parent.listFiles())) {
+            if (file.isDirectory()) {
+                System.out.println("This is a directory");
+            } else {
+                parentTreeItem.getChildren().add(new TreeItem<>(file));
+                System.out.println(file.getName());
+            }
+        }
+    }*/
 }
diff --git a/src/main/java/IronFile.java b/src/main/java/IronFile.java
index c2cddbd..45c3037 100644
--- a/src/main/java/IronFile.java
+++ b/src/main/java/IronFile.java
@@ -12,7 +12,6 @@ public class IronFile extends File {
     public IronFile(String pathname) {
         super(pathname);
         isRoot = (getParent() == null);
-
     }
     public IronFile(File file) {
         super(file.getPath());
diff --git a/src/main/java/IronFileVisitor.java b/src/main/java/IronFileVisitor.java
index 065da7d..b8bbd0d 100644
--- a/src/main/java/IronFileVisitor.java
+++ b/src/main/java/IronFileVisitor.java
@@ -1,24 +1,31 @@
 package main.java;
 
+import javafx.scene.Scene;
 import javafx.scene.control.TreeItem;
+import javafx.scene.control.TreeView;
 
+import java.io.File;
 import java.io.IOException;
 import java.nio.file.FileVisitResult;
 import java.nio.file.Path;
 import java.nio.file.SimpleFileVisitor;
 import java.nio.file.attribute.BasicFileAttributes;
-import java.io.File;
 
 /**
- * Created by kristopherguzman on 2/11/16.
- */
-public class IronFileVisitor extends SimpleFileVisitor<Path> {
+ This class handles manipulation of the Folder View. This includes
+ directory searches, displaying directories, and all things directly changing
+ the Folder View.
 
-    private TreeItem<String> currentDirectory;
+ Additionally, this class extends SimpleFileVisitor which uses java 8.
+
+ @author kristopherguzman
+ @author Brian Patino
+ */
+public class IronFileVisitor extends SimpleFileVisitor<Path>{
 
     @Override
     public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
-
+//        System.out.printf("Visiting file %s\n", file);
         return FileVisitResult.CONTINUE;
     }
     /**
@@ -32,18 +39,7 @@ public FileVisitResult visitFileFailed(Path file, IOException e) throws IOExcept
     }
     @Override
     public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException {
-        System.out.printf("About to visit directory %s\n", dir);
-
-        currentDirectory = new TreeItem<String>(dir.getFileName().toString());
+//        System.out.printf("About to visit directory %s\n", dir);
         return FileVisitResult.CONTINUE;
     }
-
-    @Override
-    public FileVisitResult postVisitDirectory(Path dir, IOException e) throws IOException {
-        System.out.printf("About to visit directory %s\n", dir);
-
-
-        return FileVisitResult.CONTINUE;
-    }
-
 }
diff --git a/src/main/java/Main.java b/src/main/java/Main.java
index 83a91ce..151fb3b 100644
--- a/src/main/java/Main.java
+++ b/src/main/java/Main.java
@@ -17,41 +17,13 @@ public class Main extends Application {
 
     @Override
     public void start(Stage primaryStage) throws Exception{
-
 //        setUserAgentStylesheet(STYLESHEET_CASPIAN);
-       /* Button btn = new Button();
-        btn.setText("This is a test");
-        btn.setOnAction(new EventHandler<ActionEvent>() {
-            @Override
-            public void handle(ActionEvent event) {
-                System.out.print("Bingo you did something!");
-            }
-        });*/
         Parent root = FXMLLoader.load(getClass().getResource("/main/resources/StartPage.fxml"));
-//        Rectangle2D screenBounds = Screen.getPrimary().getVisualBounds();
-
         primaryStage.setTitle("Iron-gate!");
         primaryStage.setScene(new Scene(root, 990, 700));
-
         Scene scene = primaryStage.getScene(); // we get the scene from above
         scene.getStylesheets().clear(); // clear any styles
 //        scene.getStylesheets().add("/main/resources/mainStyle.css"); // absolute path
-
-        /**
-         * Temporally omitted, needs to be transfered to the Controller Class
-         */
-        /*try { //try to set the tree view in the FolderViewManager class
-
-            FolderViewManager.treeView = (TreeView<String>) scene.lookup("#folder-view-pane");
-            File homeDir = new File(System.getProperty("user.home"));
-
-            FolderViewManager.setRootDirectory(homeDir);
-            System.out.println(homeDir.getName() + " set as root directory.");
-
-        } catch (Exception e) {
-            e.printStackTrace();
-        }*/
-
         primaryStage.show();
     }
     public static void main(String[] args) {
diff --git a/src/main/resources/Kris_StartPage(merge please).fxml b/src/main/resources/Kris_StartPage(merge please).fxml
deleted file mode 100644
index f9a95e1..0000000
--- a/src/main/resources/Kris_StartPage(merge please).fxml	
+++ /dev/null
@@ -1,160 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--suppress JavaFxDefaultTag, JavaFxDefaultTag, JavaFxDefaultTag, JavaFxDefaultTag, JavaFxDefaultTag, JavaFxDefaultTag -->
-
-<?import javafx.scene.effect.*?>
-<?import javafx.geometry.*?>
-<?import javafx.scene.text.*?>
-<?import javafx.scene.shape.*?>
-<?import java.lang.*?>
-<?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
-
-<fx:root maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="480.0" prefWidth="640.0" type="BorderPane" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="main.java.Controller">
-   <top>
-      <MenuBar id="menubar-pane" BorderPane.alignment="CENTER">
-        <menus>
-          <Menu mnemonicParsing="false" text="File">
-            <items>
-              <MenuItem mnemonicParsing="false" text="Close" />
-            </items>
-          </Menu>
-          <Menu mnemonicParsing="false" text="Edit">
-            <items>
-              <MenuItem mnemonicParsing="false" text="Delete" />
-            </items>
-          </Menu>
-          <Menu mnemonicParsing="false" text="Help">
-            <items>
-              <MenuItem mnemonicParsing="false" text="About" />
-            </items>
-          </Menu>
-        </menus>
-      </MenuBar>
-   </top>
-   <center>
-      <TreeView id="folder-view-pane" fx:id="folderView" prefHeight="200.0" prefWidth="200.0" BorderPane.alignment="CENTER" />
-   </center>
-   <left>
-      <BorderPane prefHeight="200.0" prefWidth="300.0" styleClass="pane-general-style" BorderPane.alignment="CENTER">
-         <center>
-            <StackPane id="tool-inspector-pane" prefHeight="150.0" prefWidth="200.0" BorderPane.alignment="CENTER">
-               <children>
-                  <BorderPane prefHeight="200.0" prefWidth="200.0">
-                     <top>
-                        <Label alignment="CENTER" prefHeight="23.0" prefWidth="159.0" text="Tool: Search" BorderPane.alignment="CENTER">
-                           <font>
-                              <Font size="18.0" />
-                           </font>
-                        </Label>
-                     </top>
-                     <StackPane.margin>
-                        <Insets top="5.0" />
-                     </StackPane.margin>
-                     <bottom>
-                        <FlowPane alignment="CENTER" columnHalignment="CENTER" hgap="10.0" prefHeight="51.0" prefWidth="158.0" BorderPane.alignment="CENTER">
-                           <children>
-                              <Button mnemonicParsing="false" prefHeight="13.0" prefWidth="73.0" text="Remove" />
-                           </children>
-                           <BorderPane.margin>
-                              <Insets />
-                           </BorderPane.margin>
-                        </FlowPane>
-                     </bottom>
-                     <center>
-                        <BorderPane prefHeight="200.0" prefWidth="200.0" BorderPane.alignment="CENTER">
-                           <top>
-                              <HBox alignment="CENTER" maxHeight="-Infinity" minHeight="-Infinity" prefHeight="50.0" prefWidth="200.0" BorderPane.alignment="CENTER">
-                                 <children>
-                                    <TextField promptText="Include Tag..." />
-                                    <Button mnemonicParsing="false" text="Add">
-                                       <HBox.margin>
-                                          <Insets left="15.0" />
-                                       </HBox.margin>
-                                    </Button>
-                                 </children>
-                              </HBox>
-                           </top>
-                           <center>
-                              <ListView maxWidth="-Infinity" prefHeight="200.0" prefWidth="250.0" BorderPane.alignment="CENTER" />
-                           </center>
-                        </BorderPane>
-                     </center>
-                  </BorderPane>
-               </children>
-            </StackPane>
-         </center>
-         <top>
-            <BorderPane prefHeight="100.0" prefWidth="200.0" BorderPane.alignment="CENTER">
-               <center>
-                  <FlowPane id="tool-selector-pane" alignment="CENTER" columnHalignment="CENTER" hgap="10.0" prefHeight="125.0" prefWidth="400.0" prefWrapLength="300.0" vgap="10.0" BorderPane.alignment="CENTER">
-                     <children>
-                        <Label text="Search" underline="true" />
-                        <Label layoutX="215.0" layoutY="64.0" text="Delete Files" underline="true" />
-                        <Label layoutX="242.0" layoutY="64.0" text="Auto Manager" underline="true" />
-                        <Label layoutX="281.0" layoutY="64.0" text="Templates" underline="true" />
-                     </children>
-                  </FlowPane>
-               </center>
-               <top>
-                  <Label alignment="CENTER" prefHeight="25.0" prefWidth="300.0" styleClass="pane-title" text="Tools" BorderPane.alignment="CENTER">
-                     <font>
-                        <Font name="System Bold" size="14.0" />
-                     </font>
-                  </Label>
-               </top>
-            </BorderPane>
-         </top>
-      </BorderPane>
-   </left>
-   <right>
-      <BorderPane prefHeight="200.0" prefWidth="200.0" BorderPane.alignment="CENTER">
-         <center>
-            <Accordion maxWidth="-Infinity" prefWidth="250.0" BorderPane.alignment="CENTER">
-              <panes>
-                <TitledPane animated="false" text="Tags">
-                     <content>
-                        <BorderPane prefHeight="200.0" prefWidth="200.0">
-                           <center>
-                              <ListView prefHeight="200.0" prefWidth="200.0" BorderPane.alignment="CENTER">
-                                 <BorderPane.margin>
-                                    <Insets top="10.0" />
-                                 </BorderPane.margin>
-                              </ListView>
-                           </center>
-                           <bottom>
-                              <Button alignment="CENTER" contentDisplay="CENTER" mnemonicParsing="false" text="Remove" textAlignment="CENTER" BorderPane.alignment="CENTER">
-                                 <BorderPane.margin>
-                                    <Insets top="10.0" />
-                                 </BorderPane.margin>
-                              </Button>
-                           </bottom>
-                           <top>
-                              <HBox prefHeight="25.0" prefWidth="200.0" BorderPane.alignment="CENTER">
-                                 <children>
-                                    <TextField promptText="Add Tag..." />
-                                    <Button mnemonicParsing="false" prefWidth="75.0" text="Add" />
-                                 </children>
-                              </HBox>
-                           </top>
-                        </BorderPane>
-                     </content>
-                </TitledPane>
-                <TitledPane animated="false" text="Directory Info">
-                  <content>
-                    <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0" />
-                  </content>
-                </TitledPane>
-              </panes>
-            </Accordion>
-         </center>
-         <top>
-            <Label alignment="CENTER" prefHeight="25.0" prefWidth="205.0" styleClass="pane-title" text="Inspector" BorderPane.alignment="CENTER">
-               <font>
-                  <Font name="System Bold" size="13.0" />
-               </font>
-            </Label>
-         </top>
-      </BorderPane>
-   </right>
-</fx:root>