From 9e7cf267bda713c3210d50392ad0d91ed0cde965 Mon Sep 17 00:00:00 2001
From: AckerMen <835340812@qq.com>
Date: Tue, 21 Nov 2023 18:06:15 +0800
Subject: [PATCH] =?UTF-8?q?pathText=20=E8=B7=9F=E9=9A=8F=20fileExplorer?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=20=E5=8A=A8=E6=80=81=E5=8F=98=E5=8C=96=20bug?=
 =?UTF-8?q?=20=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Disk.sfs                                  | Bin 330 -> 855 bytes
 main/resources/Main-view.fxml             |   4 ++--
 main/src/controller/MainController.java   |  22 ++++++++++++++++------
 main/src/controller/RenameController.java |   7 ++++++-
 main/src/util/TreeViewIterator.java       |   4 ++--
 5 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/Disk.sfs b/Disk.sfs
index 2a47ee3d4a385d68c12a275acaca7a5ed8bee723..7d810a561e06f5ee7f3d1cefbf15f818abe7c0e0 100644
GIT binary patch
literal 855
zcmcIgJxc>I7=G_sYt<@h-9*7Z&<>)YPJ$Fp&ngxNZwqZ~Q}3=ZN$u4^aB_7L9NZio
zoCNg;xH~%AZjSEeO<U1|bTV*UlIJ7O^WJ^HkQ6YoK@`d4m`{WG%eMvRvu4A%1E~^|
zM+HTM%GU!Al1%1meu)YXQcUJ+A|O6$JV-FP!)fTjD3g1Xly*YDX-I{pR5U=60|}po
zWmRz?F4-w{Ayup}za(ggu!2dqN=`_&u9%;7nN({o3>RymqM=eS-2r_Pma_#VSXkC@
z@=y!&B%sG|2DS?cPPCh5kGa?<i@ur`=R{S$FL(7}E#jb;)%|b}dJ1U_kih_%bs<O-
zQ$**lbJs8ACI(hFxY62;xYpPbUpC7^v)(e-34MwgT5J%_GBoSIXr^c{8&?1drrKBc
zt>>rq)y4bs!{)NA2H0eRM+TkwiMDPZ_sB{mkAxJD@RwH5PvIUX8;Fg5Q__7d`<yK!
zBgqF91v3x$>#eP&YJ>GV4JsM!FK%~5J>OqL&^7CeXgc&G-fvSxXZvPHn!-8g$U3vL
Ii>sV}0ek52X#fBK

delta 26
gcmcc4c8Y0(1)~r{IST_2RFp6<lrS(QTNM-l09RcF{{R30

diff --git a/main/resources/Main-view.fxml b/main/resources/Main-view.fxml
index df882df..4b17c23 100644
--- a/main/resources/Main-view.fxml
+++ b/main/resources/Main-view.fxml
@@ -141,7 +141,7 @@
                     <items>
                         <Label prefHeight="20.0" prefWidth="67.0" text="文件属性" />
                         <Separator orientation="VERTICAL" prefHeight="19.0" prefWidth="14.0" />
-                        <Label fx:id="nameLabel" prefHeight="20.0" prefWidth="365.0" text="文件名称: " />
+                        <Label fx:id="nameLabel" prefHeight="20.0" prefWidth="310.0" text="文件名称: " />
                         <Separator orientation="VERTICAL" prefHeight="19.0" prefWidth="9.0" />
                         <Label fx:id="sizeLabel" prefHeight="15.0" prefWidth="103.0" text="大小" />
                         <Separator orientation="VERTICAL" prefHeight="0.0" prefWidth="12.0" />
@@ -149,7 +149,7 @@
                         <Separator orientation="VERTICAL" prefHeight="11.0" prefWidth="13.0" />
                   <AnchorPane prefHeight="32.0" prefWidth="511.0">
                      <children>
-                              <Label fx:id="pathLabel" layoutY="6.0" prefHeight="15.0" prefWidth="543.0" text="绝对路径" />
+                              <Label fx:id="pathLabel" layoutY="6.0" prefHeight="15.0" prefWidth="598.0" text="绝对路径" />
                      </children>
                   </AnchorPane>
                   <Separator orientation="VERTICAL" prefHeight="11.0" prefWidth="13.0" />
diff --git a/main/src/controller/MainController.java b/main/src/controller/MainController.java
index 7ddb7e3..fdbb7f8 100644
--- a/main/src/controller/MainController.java
+++ b/main/src/controller/MainController.java
@@ -39,6 +39,7 @@ import static controller.RenameController.sentParam;
 import static operations.renameOperations.renameFile;
 import static util.FileRW.readDisk;
 import static util.FileRW.writeDisk;
+import static util.GetFileAbsolutePath.getAbsPath;
 
 public class MainController {
 
@@ -188,7 +189,7 @@ public class MainController {
         }
         //        writeDisk();
         TreeViewIterator.tmpFileExplorer = fileExplorer;
-        TreeViewIterator.tmpPathtext = pathText;
+        TreeViewIterator.tmpPathText = pathText;
     }
 
     private void contextMenuInit() {
@@ -307,8 +308,12 @@ public class MainController {
     @FXML
     void upperFolder(MouseEvent event) {
         if (currentFile != rootFile) {
-            recentNode = treeMap.get(currentFile);
-            recentNode.setExpanded(false);
+            if(currentFile.isFolder()){
+                recentNode = treeMap.get(currentFile);
+                recentNode.setExpanded(false);
+                String pathName = getAbsPath(currentFile.getParent());
+                pathText.setText(pathName);
+            }
             currentFile = currentFile.getParent();
             openOperations.openFolder(fileExplorer, currentFile, icons);
         }
@@ -376,9 +381,8 @@ public class MainController {
                     actionContextMenu.getItems().get(2).setOnAction(ActionEvent -> {
                         currentFile = FindLabelToFile.findFile(icons, src);
                         try {
-                            sentParam(fileView);
+                            sentParam(fileView,pathText);
                             renameFile();
-
                         } catch (Exception e) {
                             throw new RuntimeException(e);
                         }
@@ -405,6 +409,8 @@ public class MainController {
                             System.out.println(1);
                             System.out.println(src);
                             openOperations.openFolder(fileExplorer, currentFile, icons);
+                            String pathName = getAbsPath(currentFile);
+                            pathText.setText(pathName);
                         } else {
                             try {
                                 openOperations.openFile();
@@ -459,6 +465,8 @@ public class MainController {
                                 recentNode = treeMap.get(currentFile);
                                 rootNode.setExpanded(true);
                                 recentNode.setExpanded(true);
+                                String pathName = getAbsPath(currentFile);
+                                pathText.setText(pathName);
                             } else {
                                 try {
                                     openOperations.openFile();
@@ -493,7 +501,7 @@ public class MainController {
                     actionContextMenu.getItems().get(2).setOnAction(ActionEvent -> {
                         currentFile = FindLabelToFile.findFile(icons, src);
                         try {
-                            sentParam(fileView);
+                            sentParam(fileView,pathText);
                             renameFile();
                         } catch (Exception e) {
                             throw new RuntimeException(e);
@@ -522,6 +530,8 @@ public class MainController {
                         recentNode = treeMap.get(currentFile);
                         rootNode.setExpanded(true);
                         recentNode.setExpanded(true);
+                        String pathName = getAbsPath(currentFile);
+                        pathText.setText(pathName);
                     } else {
                         try {
                             openOperations.openFile();
diff --git a/main/src/controller/RenameController.java b/main/src/controller/RenameController.java
index 1a0b314..a6877c2 100644
--- a/main/src/controller/RenameController.java
+++ b/main/src/controller/RenameController.java
@@ -18,6 +18,7 @@ import java.io.IOException;
 import static controller.MainController.*;
 import static operations.renameOperations.isAbleToRename;
 import static util.FileRW.writeDisk;
+import static util.GetFileAbsolutePath.getAbsPath;
 
 
 public class RenameController {
@@ -31,6 +32,7 @@ public class RenameController {
     private TextField renameField;
 
     private static TreeView<String> tmpFileView;
+    private static TextField tmpPathText;
 
     @FXML
     void initialize() {
@@ -57,6 +59,8 @@ public class RenameController {
             TreeViewIterator treeViewIterator = new TreeViewIterator();
             treeViewIterator.Clear();
             treeViewIterator.iterator(tmpFileView);
+//            String pathName = getAbsPath(currentFile);
+//            tmpPathText.setText(pathName);
             Stage stage = (Stage) renameField.getScene().getWindow();
             stage.close();
             writeDisk();
@@ -75,7 +79,8 @@ public class RenameController {
         }
     }
 
-    public static void sentParam(TreeView<String> fileView){
+    public static void sentParam(TreeView<String> fileView, TextField pathText){
         tmpFileView = fileView;
+        tmpPathText = pathText;
     }
 }
diff --git a/main/src/util/TreeViewIterator.java b/main/src/util/TreeViewIterator.java
index f2c9f7a..0aa0594 100644
--- a/main/src/util/TreeViewIterator.java
+++ b/main/src/util/TreeViewIterator.java
@@ -26,7 +26,7 @@ import static util.GetFileAbsolutePath.getAbsPath;
 public class TreeViewIterator {
 
     public static FlowPane tmpFileExplorer;
-    public static TextField tmpPathtext;
+    public static TextField tmpPathText;
 
     void addSearch(File file, TreeItem<String> recentNode) {
         if (file.isFolder()) {
@@ -75,7 +75,7 @@ public class TreeViewIterator {
                             recentNode = getTreeItem();
                             currentFile = Objects.requireNonNull(FindTreeItemToFile.findFile(treeMap, recentNode));
                             openOperations.openFolder(tmpFileExplorer, currentFile, icons);
-                            tmpPathtext.setText(pathName);
+                            tmpPathText.setText(pathName);
                             System.out.println(pathName);
                         }
                     }
-- 
Gitee