From 7688899481ce34ab8d2afe290cd4e42408901002 Mon Sep 17 00:00:00 2001 From: Brian Paitno Date: Tue, 1 Mar 2016 14:53:00 -0500 Subject: [PATCH] Enable Multi-Select * select files with ctrl or shift keys * IronFile now holds tag variables --- src/main/java/directory/FileTreeItem.java | 4 +--- .../java/directory/FolderViewManager.java | 7 ++++--- src/main/java/directory/IronFile.java | 9 +++++++- src/main/java/launcher/Controller.java | 21 +++++++++++-------- src/main/java/webapp/DropboxController.java | 1 + src/main/resources/StartPage.fxml | 21 ------------------- 6 files changed, 26 insertions(+), 37 deletions(-) diff --git a/src/main/java/directory/FileTreeItem.java b/src/main/java/directory/FileTreeItem.java index bf8970f..1fc4fff 100644 --- a/src/main/java/directory/FileTreeItem.java +++ b/src/main/java/directory/FileTreeItem.java @@ -39,9 +39,7 @@ public boolean isLeaf() { } private ObservableList buildChildren(TreeItem ironTreeItem) { IronFile f = ironTreeItem.getValue(); - - System.out.println("file's parent: " + f.getParent()); - + System.out.println(f.getTag()); if (f != null && f.isDirectory()) { IronFile[] files = f.listFiles(); if (files != null) { diff --git a/src/main/java/directory/FolderViewManager.java b/src/main/java/directory/FolderViewManager.java index ed5396a..a92f1da 100644 --- a/src/main/java/directory/FolderViewManager.java +++ b/src/main/java/directory/FolderViewManager.java @@ -1,6 +1,7 @@ package directory; import javafx.collections.ObservableList; +import javafx.scene.control.SelectionMode; import javafx.scene.control.TreeItem; import javafx.scene.control.TreeView; import javafx.scene.image.Image; @@ -38,10 +39,10 @@ public class FolderViewManager { public FolderViewManager(TreeView dirTree) { /*ironVisitor = new directory.IronFileVisitor(); // save this for later ironVisitor.setRoot(new TreeItem<>());*/ // save this for later - - OSDetection.getOS(); +// OSDetection.getOS(); view = dirTree; - command = new CmdExecutor(); + view.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE); // enable multi-select +// command = new CmdExecutor(); } /** * Sets the root directory of the file browser to the specified folder. diff --git a/src/main/java/directory/IronFile.java b/src/main/java/directory/IronFile.java index 011eb9c..feaea72 100644 --- a/src/main/java/directory/IronFile.java +++ b/src/main/java/directory/IronFile.java @@ -8,9 +8,9 @@ * This class extends the java File class and returns the filename for toString() */ public class IronFile extends File { - private boolean isRoot = true; public IronFileFilter filter; + private String tag; public IronFile(String pathname) { super(pathname); @@ -60,4 +60,11 @@ public String toString() { return this.getName(); } } + + public String getTag() { + return tag; + } + public void setTag(String tag) { + this.tag = tag; + } } \ No newline at end of file diff --git a/src/main/java/launcher/Controller.java b/src/main/java/launcher/Controller.java index 461a438..525071d 100644 --- a/src/main/java/launcher/Controller.java +++ b/src/main/java/launcher/Controller.java @@ -39,7 +39,19 @@ public class Controller{ final FolderViewManager manager = new FolderViewManager(dirTree); // 2 statements in 1 line is best IronFile[] hardDrives = IronFile.listRoots(); // an array of hard drives manager.setRootDirectory(hardDrives); +// setEvents(manager); +// DropboxController dbManager = new DropboxController(); + /*try { + dbManager.test(); + } catch (DbxException e) { + e.printStackTrace(); + }*/ +// directory.IronFile homeDir = new directory.IronFile(System.getProperty("user.home")); // use this for specific directory +// manager.setRootDirectory(homeDir); + } + + private void setEvents(FolderViewManager manager) { dirTree.setOnMouseClicked(new EventHandler() { @Override public void handle(MouseEvent args) { @@ -61,15 +73,6 @@ public void handle(ActionEvent event) { manager.deleteFileAttrForSelected(); } }); - - /* DropboxController dbManager = new DropboxController(); - try { - dbManager.test(); - } catch (DbxException e) { - e.printStackTrace(); - }*/ -// directory.IronFile homeDir = new directory.IronFile(System.getProperty("user.home")); // use this for specific directory -// manager.setRootDirectory(homeDir); } } diff --git a/src/main/java/webapp/DropboxController.java b/src/main/java/webapp/DropboxController.java index 623a458..5d48e97 100644 --- a/src/main/java/webapp/DropboxController.java +++ b/src/main/java/webapp/DropboxController.java @@ -25,5 +25,6 @@ private void initialize() { public void test() throws DbxException{ FullAccount account = client.users.getCurrentAccount(); + System.out.println(account); } } diff --git a/src/main/resources/StartPage.fxml b/src/main/resources/StartPage.fxml index 6967c50..6fff806 100644 --- a/src/main/resources/StartPage.fxml +++ b/src/main/resources/StartPage.fxml @@ -104,27 +104,6 @@ - - -
- - - - -
- - - -
-