add ability to load folders and list them

zocker-160 · zocker-160 · commit cd779a7f56ff · 2022-02-10T23:09:28.000+01:00
diff --git a/src/main/java/de/zocker160/adk/analyzer/binanalyzer/MainWindow.java b/src/main/java/de/zocker160/adk/analyzer/binanalyzer/MainWindow.java
@@ -52,6 +52,12 @@ protected static String openFile() {
 
         File file = fileChooser.showOpenDialog(stage);
 
+        return openFile(file);
+    }
+
+    protected static String openFile(File file) {
+        System.out.println("Loading file: "+file.getAbsolutePath());
+
         BinFile binFile = BinFile.loadFile(file);
         data = binFile;
 
@@ -73,6 +79,7 @@ protected static String openFile() {
         return file.getName();
     }
 
+
     protected static void saveToFile() {
         if (data == null) return;
         saveUiData();
diff --git a/src/main/java/de/zocker160/adk/analyzer/binanalyzer/MainWindowController.java b/src/main/java/de/zocker160/adk/analyzer/binanalyzer/MainWindowController.java
@@ -1,16 +1,22 @@
 package de.zocker160.adk.analyzer.binanalyzer;
 
+import de.zocker160.adk.analyzer.binanalyzer.utils.ListFile;
 import javafx.fxml.FXML;
 import javafx.scene.control.*;
 import javafx.scene.effect.ImageInput;
 import javafx.scene.layout.GridPane;
 import javafx.scene.layout.VBox;
+import javafx.stage.DirectoryChooser;
 import javafx.stage.FileChooser;
 
+import javax.swing.filechooser.FileFilter;
+import javax.swing.filechooser.FileNameExtensionFilter;
 import java.io.File;
+import java.io.FilenameFilter;
 
 public class MainWindowController {
     @FXML private Label filenameLabel;
+    @FXML private Label messageLabel;
 
     // Global ---
 
@@ -22,7 +28,9 @@ public class MainWindowController {
     @FXML protected TextField fogStart;
     @FXML protected TextField fogEnd;
 
-    @FXML private ListView<String> zonesList;
+    @FXML private ListView<ListFile> filesList;
+    @FXML private Label directoryLocation;
+
     @FXML private GridPane dataGrid;
     @FXML private Slider testSlider;
 
@@ -58,12 +66,61 @@ public class MainWindowController {
     @FXML protected TextField radiusEndZone;
 
     @FXML
-    protected void onOpenFile() {
+    protected void openFile() {
         try {
             String filename = MainWindow.openFile();
             filenameLabel.setText(filename);
+
             dataGrid.setDisable(false);
+            filesList.getItems().clear();
+            directoryLocation.setText("<no folder selected>");
+
+        } catch (NullPointerException ignore) {}
+    }
+
+    @FXML
+    protected void openFileFromList() {
+        ListFile file = filesList.getSelectionModel().getSelectedItem();
+
+        try {
+            String filename = MainWindow.openFile(file);
+            filenameLabel.setText(filename);
+            dataGrid.setDisable(false);
+
+        } catch (NullPointerException ignore) {}
+    }
+
+    @FXML
+    protected void openFolder() {
+        var dirChooser = new DirectoryChooser();
+        var filter = new FilenameFilter() {
+            @Override
+            public boolean accept(File dir, String name) {
+                return name.endsWith(".bin");
+            }
+        };
+
+        dirChooser.setTitle("Select directory containing BIN files");
+        File binDir = dirChooser.showDialog(MainWindow.getStage());
+
+        try {
+            filesList.getItems().clear();
+
+            for (File file : binDir.listFiles(filter)) {
+                System.out.println(file);
+                filesList.getItems().add(new ListFile(file));
+            }
+            directoryLocation.setText(binDir.getName());
 
+        } catch (NullPointerException ignore) {
+            return;
+        }
+    }
+
+    @FXML
+    protected void saveFile() {
+        try {
+            MainWindow.saveToFile();
         } catch (NullPointerException ignore) {}
     }
 
@@ -82,13 +139,6 @@ protected void saveFileAs() {
         } catch (NullPointerException ignore) {}
     }
 
-    @FXML
-    protected void saveFile() {
-        try {
-            MainWindow.saveToFile();
-        } catch (NullPointerException ignore) {}
-    }
-
     public void saveAndSetZone(int i) {
         MainWindow.saveZone(currentZone);
         setZone(i);
diff --git a/src/main/java/de/zocker160/adk/analyzer/binanalyzer/utils/ListFile.java b/src/main/java/de/zocker160/adk/analyzer/binanalyzer/utils/ListFile.java
@@ -0,0 +1,36 @@
+package de.zocker160.adk.analyzer.binanalyzer.utils;
+
+import java.io.File;
+import java.net.URI;
+
+public class ListFile extends File {
+
+    public ListFile(File file) {
+        super(file.getAbsolutePath());
+    }
+
+    public ListFile(String pathname) {
+        super(pathname);
+    }
+
+    public ListFile(String parent, String child) {
+        super(parent, child);
+    }
+
+    public ListFile(File parent, String child) {
+        super(parent, child);
+    }
+
+    public ListFile(URI uri) {
+        super(uri);
+    }
+
+    @Override
+    public String toString() {
+        return getName();
+    }
+
+    public String toFullString() {
+        return super.toString();
+    }
+}
diff --git a/src/main/resources/de/zocker160/adk/analyzer/binanalyzer/mainWindow.fxml b/src/main/resources/de/zocker160/adk/analyzer/binanalyzer/mainWindow.fxml
@@ -18,14 +18,15 @@
 <?import javafx.scene.paint.Color?>
 <?import javafx.scene.text.Font?>
 
-<SplitPane dividerPositions="0.26224328593996843" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="549.0" prefWidth="717.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.zocker160.adk.analyzer.binanalyzer.MainWindowController">
+<SplitPane dividerPositions="0.3" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="549.0" prefWidth="717.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.zocker160.adk.analyzer.binanalyzer.MainWindowController">
   <items>
     <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="160.0" prefWidth="100.0">
          <children>
             <VBox alignment="TOP_CENTER" prefHeight="392.0" prefWidth="76.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
                <children>
-                  <ListView />
-                  <Label fx:id="filenameLabel" alignment="CENTER" prefHeight="25.0" prefWidth="161.0" text="&lt;no file selected&gt;">
+                  <Label fx:id="directoryLocation" alignment="CENTER" contentDisplay="RIGHT" text="&lt;no directory selected&gt;" textAlignment="RIGHT" />
+                  <ListView fx:id="filesList" onMouseClicked="#openFileFromList" />
+                  <Label fx:id="filenameLabel" alignment="CENTER" prefHeight="25.0" text="&lt;no file selected&gt;" VBox.vgrow="ALWAYS">
                      <VBox.margin>
                         <Insets />
                      </VBox.margin>
@@ -35,15 +36,15 @@
                   </Label>
                   <HBox alignment="CENTER" spacing="10.0">
                      <children>
-                        <Button mnemonicParsing="false" onAction="#onOpenFile" prefHeight="25.0" prefWidth="80.0" text="Open..">
+                        <Button mnemonicParsing="false" onAction="#openFile" prefHeight="25.0" prefWidth="80.0" text="Open..">
                            <HBox.margin>
                               <Insets />
                            </HBox.margin>
                            <padding>
                               <Insets left="10.0" right="10.0" />
                            </padding>
                         </Button>
-                        <Button disable="true" mnemonicParsing="false" prefHeight="25.0" prefWidth="80.0" text="...">
+                        <Button mnemonicParsing="false" onAction="#openFolder" prefHeight="25.0" prefWidth="100.0" text="Open Dir..">
                            <HBox.margin>
                               <Insets />
                            </HBox.margin>
@@ -63,7 +64,7 @@
                               <Insets left="10.0" right="10.0" />
                            </padding>
                         </Button>
-                        <Button mnemonicParsing="false" onAction="#saveFileAs" prefHeight="25.0" prefWidth="80.0" text="Save as..">
+                        <Button mnemonicParsing="false" onAction="#saveFileAs" prefHeight="25.0" prefWidth="100.0" text="Save as..">
                            <HBox.margin>
                               <Insets />
                            </HBox.margin>
@@ -76,6 +77,22 @@
                         <Insets top="10.0" />
                      </padding>
                   </HBox>
+                  <Separator prefWidth="200.0">
+                     <opaqueInsets>
+                        <Insets />
+                     </opaqueInsets>
+                     <padding>
+                        <Insets top="5.0" />
+                     </padding>
+                  </Separator>
+                  <Label fx:id="messageLabel" text="ready">
+                     <padding>
+                        <Insets top="10.0" />
+                     </padding>
+                     <font>
+                        <Font size="11.0" />
+                     </font>
+                  </Label>
                </children>
             </VBox>
          </children>
@@ -91,7 +108,7 @@
                               <Font size="15.0" />
                            </font>
                         </Label>
-                        <GridPane fx:id="dataGrid" alignment="CENTER" vgap="1.0">
+                        <GridPane fx:id="dataGrid" alignment="CENTER" disable="true" vgap="1.0">
                           <columnConstraints>
                             <ColumnConstraints halignment="CENTER" hgrow="SOMETIMES" percentWidth="40.0" />
                             <ColumnConstraints halignment="CENTER" hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
@@ -160,7 +177,7 @@
                               <Button fx:id="nextZoneButton" mnemonicParsing="false" onAction="#selectNextZone" text="&gt;" />
                            </children>
                         </HBox>
-                        <GridPane fx:id="zoneGrid" alignment="CENTER" layoutX="10.0" layoutY="31.0" vgap="1.0">
+                        <GridPane fx:id="zoneGrid" alignment="CENTER" disable="true" layoutX="10.0" layoutY="31.0" vgap="1.0">
                            <columnConstraints>
                               <ColumnConstraints halignment="CENTER" hgrow="SOMETIMES" percentWidth="40.0" />
                               <ColumnConstraints halignment="CENTER" hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
