Merge feature/cloud with dev

brp14005 · Mar 1, 2016 · ed62764 · ed62764
1 parent db99d64
commit ed62764
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 31 deletions.
diff --git a/src/main/java/directory/FolderViewManager.java b/src/main/java/directory/FolderViewManager.java
@@ -5,6 +5,8 @@
 import javafx.scene.control.TreeView;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
+import utils.CmdExecutor;
+import utils.OSDetection;
 
 import java.io.BufferedReader;
 import java.io.IOException;

diff --git a/src/main/java/directory/IronFile.java b/src/main/java/directory/IronFile.java
@@ -1,5 +1,7 @@
 package directory;
 
+import utils.IronFileFilter;
+
 import java.io.File;
 
 /**

diff --git a/src/main/java/launcher/Controller.java b/src/main/java/launcher/Controller.java
@@ -10,6 +10,7 @@
 import directory.IronFile;
 import javafx.fxml.FXML;
 import javafx.scene.control.MenuItem;
+import javafx.scene.control.TreeItem;
 import javafx.scene.control.TreeView;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
@@ -61,12 +62,12 @@ public void handle(ActionEvent event) {
             }
         });
 
-        DropboxController dbManager = new DropboxController();
+       /* 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/CmdExecutor.java → src/main/java/utils/CmdExecutor.java b/src/main/java/CmdExecutor.java → src/main/java/utils/CmdExecutor.java
@@ -1,4 +1,4 @@
-package main.java;
+package utils;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -12,10 +12,7 @@ public class CmdExecutor {
     public CmdExecutor() { }
 
     public String run(String cmd) throws IOException {
-
         System.out.println("executing command: " + cmd);
-
-
         String[] args = new String[] {"sh", "-c", "cd / && " + cmd};
         Process process = Runtime.getRuntime().exec(args);
         BufferedReader outputReader = new BufferedReader(new InputStreamReader(process.getInputStream())); //efficiently reads chars
@@ -26,23 +23,17 @@ public String run(String cmd) throws IOException {
 
         System.out.println("Below is command output: \n ");
         while(line != null) {
-
             System.out.println("cmd output: " + line);
             line = outputReader.readLine();
-
         }
 
         while(error != null) {
-
             System.out.println("error output: " + error);
             error = errorReader.readLine();
 
         }
-
         outputReader.close();
         errorReader.close();
         return null;
-
     }
-
 }
diff --git a/src/main/java/IronFileFilter.java → src/main/java/utils/IronFileFilter.java b/src/main/java/IronFileFilter.java → src/main/java/utils/IronFileFilter.java
@@ -1,4 +1,4 @@
-package main.java;
+package utils;
 
 import java.io.FilenameFilter;
 import java.io.File;
@@ -10,26 +10,22 @@
 public class IronFileFilter implements FilenameFilter {
 
     public boolean accept(File file, String name) {
-
         boolean hidden = false;
         boolean isSymbolic = false;
         boolean isRegularFile = false;
 
         try {
-
             hidden = Files.isHidden(file.toPath());
             isSymbolic = Files.isSymbolicLink(file.toPath());
             isRegularFile = Files.isRegularFile(file.toPath());
+        } catch(Exception e) {
 
-        } catch(Exception e) { }
+        }
 
         if(hidden || isSymbolic || (!isRegularFile && !file.isDirectory())) {
             //System.out.println(name + " is hidden or a symbolic link, or just not a regular file");
             return false;
         }
-
         return true;
-
     }
-
 }
diff --git a/src/main/java/OSDetection.java → src/main/java/utils/OSDetection.java b/src/main/java/OSDetection.java → src/main/java/utils/OSDetection.java
@@ -1,4 +1,4 @@
-package main.java;
+package utils;
 
 /**
  * Created by kristopherguzman on 2/19/16.
@@ -13,30 +13,19 @@ public enum OS { WINDOWS, MAC, UNIX }
     public static OS OSType;
 
     public static void getOS() { //utility method to get OS
-
         String os = System.getProperty("os.name").toLowerCase();
 
         if(os.contains("win")) {
-
             OSType = OS.WINDOWS;
             System.out.println("OS: Windows");
-
         } else if(os.contains("nix") || os.contains("ux") || os.contains("aix")) {
-
             OSType = OS.UNIX;
             System.out.println("OS: Unix/Linux");
-
         } else if(os.contains("mac")) {
-
             OSType = OS.MAC;
             System.out.println("OS: Mac");
-
         } else {
-
             System.out.println("Could not detect OS");
-
         }
-
     }
-
 }