Changeset 1490 for trunk

Timestamp:

12/04/19 17:10:37 (4 years ago)

Author:

bnemhaus

Message:

FrameDirectory Settings can now have paths included in them that are not valid directories.
The check for valid directories now happens in the ResourceManager when the load request is made.

Location:

trunk/src/org/expeditee/gui

Files:

• FrameUtils.java (modified) (2 diffs)
• management/ResourceManager.java (modified) (5 diffs)

trunk/src/org/expeditee/gui/FrameUtils.java

@@ -876 +876 @@
                         File filePath = Paths.get(FrameIO.PARENT_FOLDER).resolve(dirName).toFile();
                         boolean locationExists = filePath.exists() && filePath.isDirectory();
-                        if (isSpecialCase || locationExists) {
+                        //if (isSpecialCase || locationExists) {
                                 if (dirName.endsWith(File.separator)) {
                                         dirsToAdd.add(dirName);
@@ -882 +882 @@
                                         dirsToAdd.add(dirName + File.separator);
                                 }
-                        }
+                        //}
                 }
                 

trunk/src/org/expeditee/gui/management/ResourceManager.java

@@ -42 +42 @@
                 } else {
                         List<String> canditateDirectoriesForResource = frames.getDirectories();
-                        for (String path: canditateDirectoriesForResource) {
-                                loaded = FrameIO.LoadKnownPath(path, frameName);
-                                if (loaded != null) {
-                                        break;
+                        for (String directoryStr: canditateDirectoriesForResource) {
+                                File directory = new File(directoryStr);
+                                if (directory.exists()) {
+                                        loaded = FrameIO.LoadKnownPath(directoryStr, frameName);
+                                        if (loaded != null) {
+                                                break;
+                                        }
                                 }
                         }
@@ -112 +115 @@
                 // users settings frame.
                 File resourceFile = null;
-                for (String dir: canditateDirectoriesForResource) {
-                        resourceFile = new File(dir + path);
-                        if (resourceFile.exists() && !resourceFile.isDirectory()) {
-                                break;
+                for (String dirStr: canditateDirectoriesForResource) {
+                        File dir = new File(dirStr);
+                        if (dir.exists()) {
+                                File checkResourceFile = new File(dirStr + path);
+                                if (checkResourceFile.exists() && !checkResourceFile.isDirectory()) {
+                                        resourceFile = checkResourceFile;
+                                        break;
+                                }
                         }
                 }
@@ -128 +135 @@
                 //              These are of the format "/packageA/packageB/filename".  For
                 //              example: "/org/expeditee/gui.management/ResourceManager.java"
-                if (resourceFile == null || !resourceFile.exists() || resourceFile.isDirectory()) {
+                if (resourceFile == null/* || !resourceFile.exists() || resourceFile.isDirectory()*/) {
                         // Prepare for case a.
                         resourceFile = new File(path);
@@ -177 +184 @@
                 List<String> directories = audio.getDirectories(parentFrame);
                 directories.add(FrameIO.PARENT_FOLDER);
-                for (String directory: directories) {
-                        Path pathToFile = Paths.get(directory).resolve(localFileName);
-                        File file = pathToFile.toFile();
-                        if (file.exists() && !file.isDirectory()) {
-                                return file;
-                        }
+                for (String directoryStr: directories) {
+                        File directory = new File(directoryStr);
+                        if (directory.exists()) { 
+                                Path directoryPath = Paths.get(directoryStr);
+                                Path pathToFile = directoryPath.resolve(localFileName);
+                                File file = pathToFile.toFile();
+                                if (file.exists() && !file.isDirectory()) {
+                                        return file;
+                                }
+                        }                       
                 }
                 
@@ -260 +271 @@
                 }
                 
-                private void refresh(String context) {
-                        
+                private void refresh(String context) {                  
                         List<String> unresolved = source.getAbsoluteDirs();
                         directories = resolve(unresolved, context);