v1.3 界面优化

wpblank · wpblank · commit 6596b0a16e3b · 2019-12-08T15:33:10.000+08:00
diff --git a/src/sample/Controller.java b/src/sample/Controller.java
@@ -1,15 +1,14 @@
 package sample;
 
 import javafx.application.Platform;
+import javafx.beans.property.ReadOnlyStringWrapper;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.fxml.Initializable;
-import javafx.scene.control.Button;
-import javafx.scene.control.TextField;
-import javafx.scene.control.TreeItem;
-import javafx.scene.control.TreeView;
+import javafx.scene.control.*;
 import javafx.stage.DirectoryChooser;
 import javafx.stage.Window;
+import sample.domain.FileTreeItem;
 
 import java.io.File;
 import java.io.IOException;
@@ -36,23 +35,26 @@ public class Controller implements Initializable {
     public TextField ignoreFileSize;
 
     @FXML
-    private TreeView<String> myTreeView;
+    private TreeTableView<FileTreeItem> myTreeTableView;
+
+    TreeTableColumn<FileTreeItem, String> fileNameColumn;
+    TreeTableColumn<FileTreeItem, String> fileSizeColumn;
     private Window stage;
 
 
     @Override
     public void initialize(URL location, ResourceBundle resources) {
         // TODO (don't really need to do anything here).
-    }
-
-    /**
-     * 生成目录文件树；包含文件、目录大小
-     *
-     * @param path 路径
-     * @return TreeItem<String>
-     */
-    private TreeItem<String> initTreeView(String path) {
-        return initTreeView(path, 0);
+        System.out.println("初始化文件树窗口");
+        fileNameColumn = new TreeTableColumn<>("文件名");
+        fileNameColumn.setPrefWidth(530);
+        fileNameColumn.setCellValueFactory((TreeTableColumn.CellDataFeatures<FileTreeItem, String> param)
+                -> new ReadOnlyStringWrapper(param.getValue().getValue().getName()));
+        fileSizeColumn = new TreeTableColumn<>("文件大小");
+        fileSizeColumn.setPrefWidth(100);
+        fileSizeColumn.setCellValueFactory((TreeTableColumn.CellDataFeatures<FileTreeItem, String> param)
+                -> new ReadOnlyStringWrapper(param.getValue().getValue().getSize()));
+        myTreeTableView.getColumns().setAll(fileNameColumn, fileSizeColumn);
     }
 
     /**
@@ -62,27 +64,17 @@ private TreeItem<String> initTreeView(String path) {
      * @param size 过滤小于size字节的文件
      * @return TreeItem<String>
      */
-    private TreeItem<String> initTreeView(String path, long size) {
-
+    private TreeItem<FileTreeItem> initTreeView(String path, long size) {
         long size0;
         File file = new File(path);
         size0 = getDirSize(file);
-        TreeItem<String> item = new TreeItem<>(file.getName() + "\t" + sizeFormat(size0));
+        TreeItem<FileTreeItem> item = new TreeItem<>(new FileTreeItem(file.getName(), sizeFormat(size0)));
         item.setExpanded(false);
         if (file.exists()) {
             File[] files = file.listFiles();
             if (files != null && files.length != 0) {
-                //对文件和文件夹按名称进行排序
-                Arrays.sort(files, (o1, o2) -> {
-                    //将文件夹与文件分开排序
-                    if (o1.isDirectory() && o2.isFile())
-                        return -1;
-                    else if (o2.isDirectory() && o1.isFile())
-                        return 1;
-                    //对字符串大写处理，使返回的拼音为小写、英文为大写，从而将英文和中文分开排序。
-                    return GetPinYin.getPinYin(o1.getName().toUpperCase()).compareTo(GetPinYin.getPinYin(o2.getName().toUpperCase()));
-                });
-
+                // 对文件和文件夹按名称进行排序
+                sortFiles(files);
                 for (File file2 : files) {
                     if (file2.isDirectory()) {
                         size0 = getDirSize(file2);
@@ -92,7 +84,7 @@ else if (o2.isDirectory() && o1.isFile())
                     } else {
                         size0 = file2.length();
                         if (size == 0 || size0 > size) {
-                            TreeItem<String> i2 = new TreeItem<>(file2.getName() + "\t" + sizeFormat(size0));
+                            TreeItem<FileTreeItem> i2 = new TreeItem<>(new FileTreeItem(file2.getName(), sizeFormat(size0)));
                             item.getChildren().add(i2);
                         }
                     }
@@ -105,38 +97,50 @@ else if (o2.isDirectory() && o1.isFile())
         return item;
     }
 
-    //"生成文件树"按钮
+    /**
+     * "生成文件树"按钮
+     *
+     * @param event
+     */
     public void getDir(ActionEvent event) {
-        //多线程
         new Thread(() -> {
             String path = myText.getText();
-
             Platform.runLater(() -> myButton.setText("生成中..."));
             System.out.println(path);
             long size = Long.parseLong(ignoreFileSize.getText());
-            TreeItem<String> item = initTreeView(path, size * 1024);
+            TreeItem<FileTreeItem> item = initTreeView(path, size * 1024);
             item.setExpanded(true);
-            //等到Application Thread空闲的时候，Platform.runLater就会自动执行队列中修改界面的工作了
+
+            // 等到Application Thread空闲的时候，Platform.runLater就会自动执行队列中修改界面的工作了
             Platform.runLater(() -> {
-                myTreeView.setRoot(item);
+                myTreeTableView.setRoot(item);
+                myTreeTableView.getColumns().setAll(fileNameColumn, fileSizeColumn);
                 myButton.setText("生成文件树");
             });
         }).start();
     }
 
-    //"选择目录"按钮：获得想要制作文件树的路径
+    /**
+     * "选择目录"按钮：获得想要制作文件树的路径
+     *
+     * @param event
+     */
     public void openDir(ActionEvent event) {
         DirectoryChooser directoryChooser = new DirectoryChooser();
         File file = directoryChooser.showDialog(null);
-        if (file != null)
+        if (file != null) {
             myText.setText(file.getPath());
+        }
     }
 
 
-    //"保存文件树"按钮：将层级目录保存到本地
+    /**
+     * "保存文件树"按钮：将层级目录保存到本地
+     *
+     * @param event
+     */
     public void saveDir(ActionEvent event) {
-        //多线程
-        new Thread(() ->{
+        new Thread(() -> {
             Platform.runLater(() -> saveDir.setText("生成中..."));
             String path = myText.getText();
             long size = Long.parseLong(ignoreFileSize.getText());
diff --git a/src/sample/domain/FileTreeItem.java b/src/sample/domain/FileTreeItem.java
@@ -0,0 +1,34 @@
+package sample.domain;
+
+import javafx.beans.property.SimpleStringProperty;
+
+/**
+ * 文件数节点
+ *
+ * @author izumi
+ */
+public class FileTreeItem {
+    private SimpleStringProperty name;
+    private SimpleStringProperty size;
+
+    public FileTreeItem(String name, String size) {
+        this.name = new SimpleStringProperty(name);
+        this.size = new SimpleStringProperty(size);
+    }
+
+    public String getName() {
+        return name.get();
+    }
+
+    public void setName(String name) {
+        this.name.set(name);
+    }
+
+    public String getSize() {
+        return size.get();
+    }
+
+    public void setSize(String size) {
+        this.size.set(size);
+    }
+}
diff --git a/src/sample/fileTool.java b/src/sample/fileTool.java
@@ -48,16 +48,7 @@ private static void saveFileTree(String path, String name, long size, int level)
             if (files != null && bufw != null) {
                 if (files.length != 0) {
                     //对文件和文件夹进行排序
-                    Arrays.sort(files, (o1, o2) -> {
-                        //将文件夹与文件分开排序
-                        if (o1.isDirectory() && o2.isFile())
-                            return -1;
-                        else if (o2.isDirectory() && o1.isFile())
-                            return 1;
-                        //对字符串大写处理，使返回的拼音为小写、英文为大写，从而将英文和中文分开排序。
-                        return GetPinYin.getPinYin(o1.getName().toUpperCase()).compareTo(GetPinYin.getPinYin(o2.getName().toUpperCase()));
-                    });
-
+                    sortFiles(files);
                     long size0;
                     for (File file2 : files) {
 
@@ -114,6 +105,19 @@ else if (o2.isDirectory() && o1.isFile())
         }
     }
 
+    static void sortFiles(File[] files) {
+        Arrays.sort(files, (o1, o2) -> {
+            // 将文件夹与文件分开排序
+            if (o1.isDirectory() && o2.isFile()) {
+                return -1;
+            } else if (o2.isDirectory() && o1.isFile()) {
+                return 1;
+            }
+            // 对字符串大写处理，使返回的拼音为小写、英文为大写，从而将英文和中文分开排序。
+            return GetPinYin.getPinYin(o1.getName().toUpperCase()).compareTo(GetPinYin.getPinYin(o2.getName().toUpperCase()));
+        });
+    }
+
     //保存目录文件和文件夹名称和大小
     static void saveFileTree(String path, String name) {
         saveFileTree(path, name, 0, 0);
@@ -124,15 +128,20 @@ static void saveFileTree(String path, String name, long size) {
         saveFileTree(path, name, size, 0);
     }
 
-    //获取文件夹目录大小
+    /**
+     * 获取文件夹目录大小
+     *
+     * @param file
+     * @return
+     */
     static long getDirSize(File file) {
         long size = 0;
         if (file.exists()) {
             File[] files = file.listFiles();
             if (files != null) {
-                if (files.length == 0)
+                if (files.length == 0) {
                     return 0;
-                else {
+                } else {
                     for (File file1 : files) {
                         if (file1.isDirectory()) {
                             size = size + getDirSize(file1);
@@ -146,16 +155,24 @@ static long getDirSize(File file) {
         return size;
     }
 
-    //文件大小格式化
+    /**
+     * 文件大小格式化
+     *
+     * @param size 文件大小
+     * @return
+     */
     static String sizeFormat(long size) {
-        if (size < 1024)
-            return size + " B";
-        else if (size < 1024 * 1024)
-            return String.format("%.2f", size / 1024.0) + "KB";
-        else if (size < 1024 * 1024 * 1024)
-            return String.format("%.2f", size / (1024 * 1024.0)) + "MB";
-        else
-            return String.format("%.2f", size / (1024 * 1024 * 1024.0)) + "GB";
+        String sizeString;
+        if (size < 1024) {
+            sizeString = size + " B";
+        } else if (size < 1024 * 1024) {
+            sizeString = String.format("%.2f", size / 1024.0) + "KB";
+        } else if (size < 1024 * 1024 * 1024) {
+            sizeString = String.format("%.2f", size / (1024 * 1024.0)) + "MB";
+        } else {
+            sizeString = String.format("%.2f", size / (1024 * 1024 * 1024.0)) + "GB";
+        }
+        return sizeString;
     }
 
 }
diff --git a/src/sample/sample.fxml b/src/sample/sample.fxml
@@ -3,21 +3,18 @@
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 
-<AnchorPane prefHeight="691.0" prefWidth="682.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1"
-            fx:controller="sample.Controller">
-   <Button fx:id="myButton" layoutX="569.0" layoutY="64.0" mnemonicParsing="false" onAction="#getDir" prefHeight="30.0"
-           prefWidth="95.0" text="生成文件树" AnchorPane.rightAnchor="18.0" AnchorPane.topAnchor="64.0"/>
-   <TextField fx:id="myText" layoutX="38.0" layoutY="32.0" prefHeight="30.0" prefWidth="549.0"
-              AnchorPane.leftAnchor="18.0" AnchorPane.rightAnchor="116.0" AnchorPane.topAnchor="18.0"/>
-   <TreeView fx:id="myTreeView" layoutX="18.0" layoutY="107.0" prefHeight="566.0" prefWidth="646.0"
-             AnchorPane.bottomAnchor="18.0" AnchorPane.leftAnchor="18.0" AnchorPane.rightAnchor="18.0"
-             AnchorPane.topAnchor="107.0"/>
-   <Button fx:id="openDir" layoutX="584.0" layoutY="18.0" mnemonicParsing="false" onAction="#openDir" prefHeight="30.0"
-           prefWidth="80.0" text="选择目录" AnchorPane.rightAnchor="18.0" AnchorPane.topAnchor="18.0"/>
-   <TextField fx:id="ignoreFileSize" layoutX="322.0" layoutY="64.0" prefHeight="30.0" prefWidth="95.0" text="0"
-              AnchorPane.rightAnchor="265.0" AnchorPane.topAnchor="64.0"/>
-   <Label layoutX="217.0" layoutY="69.0" text="过滤过小文件：" AnchorPane.rightAnchor="360.0" AnchorPane.topAnchor="69.0"/>
-   <Label layoutX="420.0" layoutY="69.0" text="KB" AnchorPane.rightAnchor="243.0" AnchorPane.topAnchor="69.0"/>
-   <Button fx:id="saveDir" layoutX="448.0" layoutY="64.0" mnemonicParsing="false" onAction="#saveDir" prefHeight="30.0"
-           prefWidth="95.0" text="保存文件树" AnchorPane.rightAnchor="131.0" AnchorPane.topAnchor="64.0"/>
+<AnchorPane prefHeight="691.0" prefWidth="682.0" xmlns="http://javafx.com/javafx/10.0.2-internal" xmlns:fx="http://javafx.com/fxml/1" fx:controller="sample.Controller">
+   <Button fx:id="myButton" layoutX="569.0" layoutY="64.0" mnemonicParsing="false" onAction="#getDir" prefHeight="30.0" prefWidth="95.0" text="生成文件树" AnchorPane.rightAnchor="18.0" AnchorPane.topAnchor="64.0" />
+   <TextField fx:id="myText" layoutX="38.0" layoutY="32.0" prefHeight="30.0" prefWidth="549.0" AnchorPane.leftAnchor="18.0" AnchorPane.rightAnchor="116.0" AnchorPane.topAnchor="18.0" />
+   <Button fx:id="openDir" layoutX="584.0" layoutY="18.0" mnemonicParsing="false" onAction="#openDir" prefHeight="30.0" prefWidth="80.0" text="选择目录" AnchorPane.rightAnchor="18.0" AnchorPane.topAnchor="18.0" />
+   <TextField fx:id="ignoreFileSize" layoutX="322.0" layoutY="64.0" prefHeight="30.0" prefWidth="95.0" text="0" AnchorPane.rightAnchor="265.0" AnchorPane.topAnchor="64.0" />
+   <Label layoutX="217.0" layoutY="69.0" text="过滤过小文件：" AnchorPane.rightAnchor="360.0" AnchorPane.topAnchor="69.0" />
+   <Label layoutX="420.0" layoutY="69.0" text="KB" AnchorPane.rightAnchor="243.0" AnchorPane.topAnchor="69.0" />
+   <Button fx:id="saveDir" layoutX="448.0" layoutY="64.0" mnemonicParsing="false" onAction="#saveDir" prefHeight="30.0" prefWidth="95.0" text="保存文件树" AnchorPane.rightAnchor="131.0" AnchorPane.topAnchor="64.0" />
+   <TreeTableView fx:id="myTreeTableView" layoutX="18.0" layoutY="110.0" prefHeight="200.0" prefWidth="646.0" AnchorPane.bottomAnchor="18.0" AnchorPane.leftAnchor="18.0" AnchorPane.rightAnchor="18.0" AnchorPane.topAnchor="110.0">
+     <columns>
+       <TreeTableColumn prefWidth="-1.0" text="C1" />
+       <TreeTableColumn prefWidth="-1.0" text="C2" />
+     </columns>
+   </TreeTableView>
 </AnchorPane>
