Fixed ..

DomAtTheShack · Jun 5, 2023 · b556327 · b556327
1 parent 8eec046
commit b556327
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 7 deletions.
diff --git a/out/production/Dom-s-FTP-Client/FileBrowserGUI$1.class b/out/production/Dom-s-FTP-Client/FileBrowserGUI$1.class
diff --git a/out/production/Dom-s-FTP-Client/FileBrowserGUI$2.class b/out/production/Dom-s-FTP-Client/FileBrowserGUI$2.class
diff --git a/out/production/Dom-s-FTP-Client/FileBrowserGUI.class b/out/production/Dom-s-FTP-Client/FileBrowserGUI.class
diff --git a/src/FileBrowserGUI.java b/src/FileBrowserGUI.java
@@ -117,12 +117,17 @@ public FileBrowserGUI() {
         fileList.addMouseListener(new MouseAdapter() {
             @Override
             public void mouseClicked(MouseEvent e) {
-                if (e.getSource() == fileList && e.getClickCount() == 2) {
+                if (e.getClickCount() == 2) {
                     int selectedIndex = fileList.getSelectedIndex();
                     if (selectedIndex != -1) {
                         String selectedFile = listModel.getElementAt(selectedIndex);
                         File file = new File(currentDirectory, selectedFile);
-                        if (file.isDirectory()) {
+                        if (selectedFile.equals("..")) {
+                            File parentDirectory = currentDirectory.getParentFile();
+                            if (parentDirectory != null) {
+                                navigateToDirectory(parentDirectory);
+                            }
+                        } else if (file.isDirectory()) {
                             navigateToDirectory(file);
                         }
                     }
@@ -137,24 +142,33 @@ public void valueChanged(ListSelectionEvent e) {
                     int selectedIndex = fileList.getSelectedIndex();
                     if (selectedIndex != -1) {
                         String selectedFile = listModel.getElementAt(selectedIndex);
-                        File file = new File(currentDirectory, selectedFile);
-                        selectedFileLabel.setText(file.getAbsolutePath());
+                        selectedFileLabel.setText(currentDirectory.getAbsolutePath() + File.separator + selectedFile);
                     } else {
                         selectedFileLabel.setText("");
                     }
                 }
             }
         });
 
+
+
+
         navigateToDirectory(new File(System.getProperty("user.home")));
         selectedFileLabel.setText(currentDirectory.getPath());
         setVisible(true);
     }
 
     private void navigateToDirectory(File directory) {
-        updateFileList(directory);
-        currentDirectory = directory;
-        selectedFileLabel.setText(currentDirectory.getAbsolutePath());
+        if (directory != null) {
+            updateFileList(directory);
+            currentDirectory = directory;
+
+            if (currentDirectory.getParentFile() != null) {
+                selectedFileLabel.setText(currentDirectory.getAbsolutePath());
+            } else {
+                selectedFileLabel.setText("");
+            }
+        }
     }
 
     private void updateFileList(File directory) {
@@ -174,6 +188,7 @@ private void updateFileList(File directory) {
         }
     }
 
+
     public void setLoadingBar(int x) {
         loadingBar.setValue(x);
     }