diff --git a/src/main/java/net/altimate/app/App.java b/src/main/java/net/altimate/app/App.java index 688bc08..b247a3b 100644 --- a/src/main/java/net/altimate/app/App.java +++ b/src/main/java/net/altimate/app/App.java @@ -38,7 +38,7 @@ public class App extends Application { Scene sceneCreate; Scene sceneList; - public static String filesDirectory = "/home/mic/files"; + public static String filesDirectory = System.getProperty("user.home") + "/files"; @@ -51,31 +51,20 @@ public class App extends Application { @Override public void start(Stage primaryStage) throws Exception { - //GridPane grid = new GridPane(); - //grid.setPadding(new Insets(10, 10, 10, 10)); - //grid.setVgap(5); - //grid.setHgap(5); - - //Start = new Scene(grid, 600, 300); setupSceneList(primaryStage); setupSceneHome(primaryStage); setupSceneCreate(primaryStage); - primaryStage.setTitle("Work out a S.M.A.R.T. Target "); primaryStage.setScene(sceneHome); primaryStage.show(); } - - - private void navigationButtons(Stage primaryStage, GridPane grid, Label label) { StartUpCheck.checkFilesDirectory(filesDirectory); - boolean reloadValue = false; Button home = new Button("Home"); @@ -128,14 +117,6 @@ public class App extends Application { navigationButtons(primaryStage, grid, label); - //Button button = new Button("Forward"); - //button.setOnAction(e -> primaryStage.setScene(sceneList)); - - //TextField text = new TextField(); - //text.setMaxWidth(100); - - //layout.getChildren().addAll(label1, button); - } public void setupSceneCreate(Stage primaryStage) throws Exception { @@ -250,16 +231,6 @@ public class App extends Application { }); - - - - //addTextfield(grid, "sinnesSpezifisch", "blash", 1, 1, 1); - //Button button = new Button("Home"); - //button.setOnAction(e -> primaryStage.setScene(sceneHome)); - //TextField text = new TextField(); - //text.setMaxWidth(100); - //layout.getChildren().addAll(label1, button); - } @@ -292,26 +263,8 @@ public class App extends Application { }); Filter filter = new Filter(); - //filter.getSmartTargetName(filesDirectory); - /* - int filesDirTmpLength = ListFilesInDir.listFilesInDir(filesDirectory).length; - String filesDirTmp[] = new String[filesDirTmpLength]; - filesDirTmp = ListFilesInDir.listFilesInDir(filesDirectory); - //String filesDir[][] = new String[filesDirTmpLength][filesDirTmpLength]; - String filesContent[] = new String[filesDirTmpLength]; - String filesShow[] = new String[filesDirTmpLength]; - - - for (int i = 0; i < filesDirTmpLength; ++i) { - filesContent[i] = ReadFile.readFile(filesDirectory + "/" + filesDirTmp[i]); - String regex = "\\|"; - String[] nameOfTarget = filesContent[i].replaceAll("^\\[", "").replaceAll("^\\]", "").split(regex); - filesShow[i] = nameOfTarget[0]; - } -*/ - ListView list1 = new ListView(); ObservableList items = FXCollections.observableArrayList( filter.filterRemoveWithRegex(".smart", filesDirectory )); //ObservableList items = FXCollections.observableArrayList(Filter.getSmartTargetName(filesDirectory)); diff --git a/src/main/java/net/altimate/app/Filter.java b/src/main/java/net/altimate/app/Filter.java index 0174408..96cc84c 100644 --- a/src/main/java/net/altimate/app/Filter.java +++ b/src/main/java/net/altimate/app/Filter.java @@ -22,44 +22,8 @@ public class Filter { String filesContent = ReadFile.readFile(filesDirectory + "/" + process[choosenFileNumber]); System.out.println(filesContent); - //for (int i = 0; i < ength; ++i) { - String regex = "\\|"; String[] nameOfTarget = filesContent.replaceAll("^\\[", "").replaceAll("^\\]", "").split(regex); - //filesShow[i] = nameOfTarget[0]; - //} return nameOfTarget; - - } - - -//public String[] getSmartTargetName(String filesDirectory) { - - - // public static String[] getSmartTargetName (String filesDirectory) { - - //System.out.println(listFilesInDir.listFilesInDir(filesDirectory).length); - //filterRemoveWithRegex(".*.smart", listFilesInDir.listFilesInDir(filesDirectory)); - - - //int filesDirTmpLength = ListFilesInDir.listFilesInDir(filesDirectory).length; - //String filesDirTmp[] = new String[filesDirTmpLength]; - //String[] filesDirTmp = ListFilesInDir.listFilesInDir(filesDirectory); - //String filesDir[][] = new String[filesDirTmpLength][filesDirTmpLength]; - //String filesContent[] = new String[filesDirTmpLength]; - //String filesShow[] = new String[filesDirTmpLength]; - - - //for (int i = 0; i < filesDirTmpLength; ++i) { - // filesContent[i] = ReadFile.readFile(filesDirectory + "/" + filesDirTmp[i]); - // String regex = "\\|"; - // String[] nameOfTarget = filesContent[i].replaceAll("^\\[", "").replaceAll("^\\]", "").split(regex); - // filesShow[i] = nameOfTarget[0]; - //} - - - // return listFilesInDir.listFilesInDir(filesDirectory); -//} - } diff --git a/target/classes/net/altimate/app/App$1.class b/target/classes/net/altimate/app/App$1.class index 2bbf66c..c969a02 100644 Binary files a/target/classes/net/altimate/app/App$1.class and b/target/classes/net/altimate/app/App$1.class differ diff --git a/target/classes/net/altimate/app/App$2.class b/target/classes/net/altimate/app/App$2.class index d96cd94..c2c8e0e 100644 Binary files a/target/classes/net/altimate/app/App$2.class and b/target/classes/net/altimate/app/App$2.class differ diff --git a/target/classes/net/altimate/app/App$3.class b/target/classes/net/altimate/app/App$3.class index c2369be..99205ec 100644 Binary files a/target/classes/net/altimate/app/App$3.class and b/target/classes/net/altimate/app/App$3.class differ diff --git a/target/classes/net/altimate/app/App$4.class b/target/classes/net/altimate/app/App$4.class index 3179b9e..7ee8c29 100644 Binary files a/target/classes/net/altimate/app/App$4.class and b/target/classes/net/altimate/app/App$4.class differ diff --git a/target/classes/net/altimate/app/App.class b/target/classes/net/altimate/app/App.class index 980dddd..1e697e9 100644 Binary files a/target/classes/net/altimate/app/App.class and b/target/classes/net/altimate/app/App.class differ diff --git a/target/classes/net/altimate/app/Filter.class b/target/classes/net/altimate/app/Filter.class index 13139f1..fa301df 100644 Binary files a/target/classes/net/altimate/app/Filter.class and b/target/classes/net/altimate/app/Filter.class differ