Revert "Merge pull request #378 from lmagyar/pr-virtual-config-file"

This reverts commit 7ab059a, reversing changes made to df86c45. # Conflicts: # primitiveFTPd/src/org/primftpd/filesystem/VirtualConfigFile.java # primitiveFTPd/src/org/primftpd/filesystem/VirtualFileSystemView.java # primitiveFTPd/src/org/primftpd/filesystem/VirtualFtpConfigFile.java # primitiveFTPd/src/org/primftpd/filesystem/VirtualFtpFileSystemView.java # primitiveFTPd/src/org/primftpd/filesystem/VirtualSshConfigFile.java # primitiveFTPd/src/org/primftpd/filesystem/VirtualSshFileSystemView.java
wolpi · Oct 13, 2024 · aaa92b9 · aaa92b9
1 parent bcc1e21
commit aaa92b9
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 159 deletions.
diff --git a/primitiveFTPd/src/org/primftpd/events/ClientActionEvent.java b/primitiveFTPd/src/org/primftpd/events/ClientActionEvent.java
@@ -10,8 +10,7 @@ public enum Storage {
         ROOT,
         SAF,
         ROSAF,
-        QUICKSHARE,
-        CONFIG
+        QUICKSHARE
     }
 
     public enum Protocol {

diff --git a/primitiveFTPd/src/org/primftpd/filesystem/VirtualConfigFile.java b/primitiveFTPd/src/org/primftpd/filesystem/VirtualConfigFile.java
diff --git a/primitiveFTPd/src/org/primftpd/filesystem/VirtualFileSystemView.java b/primitiveFTPd/src/org/primftpd/filesystem/VirtualFileSystemView.java
@@ -35,8 +35,6 @@ public VirtualFileSystemView(
     public abstract TMina createFile(String absPath, AbstractFile delegate);
     public abstract TMina createFile(String absPath, boolean exists);
 
-    public abstract VirtualConfigFile getConfigFile();
-
     protected abstract String absolute(String file);
 
     public TMina getFile(String file) {
@@ -64,10 +62,6 @@ public TMina getFile(String file) {
             logger.debug("Using ROSAF '{}' for '{}'", realPath, absoluteVirtualPath);
             AbstractFile delegate = roSafFileSystemView.getFile(realPath);
             return createFile(absoluteVirtualPath, delegate);
-        } else if (VirtualConfigFile.ABS_PATH.equals(absoluteVirtualPath)) {
-            logger.debug("Using VirtualFile for CONFIG path '{}'", absoluteVirtualPath);
-            AbstractFile delegate = getConfigFile();
-            return createFile(absoluteVirtualPath, delegate);
         } else{
             logger.debug("Using VirtualFile for unknown path '{}'", absoluteVirtualPath);
             return createFile(absoluteVirtualPath, false);

diff --git a/primitiveFTPd/src/org/primftpd/filesystem/VirtualFtpConfigFile.java b/primitiveFTPd/src/org/primftpd/filesystem/VirtualFtpConfigFile.java
diff --git a/primitiveFTPd/src/org/primftpd/filesystem/VirtualFtpFileSystemView.java b/primitiveFTPd/src/org/primftpd/filesystem/VirtualFtpFileSystemView.java
@@ -44,11 +44,6 @@ public FtpFile createFile(String absPath, boolean exists) {
         return new VirtualFtpFile(this, absPath, exists, user);
     }
 
-    @Override
-    public VirtualFtpConfigFile getConfigFile() {
-        return new VirtualFtpConfigFile(this, user);
-    }
-
     @Override
     protected String absolute(String file) {
         logger.trace("  finding abs path for '{}' with wd '{}'", file, (workingDir != null ? workingDir.getAbsolutePath() : "null"));

diff --git a/primitiveFTPd/src/org/primftpd/filesystem/VirtualSshConfigFile.java b/primitiveFTPd/src/org/primftpd/filesystem/VirtualSshConfigFile.java
diff --git a/primitiveFTPd/src/org/primftpd/filesystem/VirtualSshFileSystemView.java b/primitiveFTPd/src/org/primftpd/filesystem/VirtualSshFileSystemView.java
@@ -40,11 +40,6 @@ public SshFile createFile(String absPath, boolean exists) {
         return new VirtualSshFile(this, absPath, exists, session);
     }
 
-    @Override
-    public VirtualSshConfigFile getConfigFile() {
-        return new VirtualSshConfigFile(this, session);
-    }
-
     @Override
     protected String absolute(String file) {
         return Utils.absoluteOrHome(file, "/" + PREFIX_FS + homeDir.getAbsolutePath());