Changeset 1441 for trunk/src/org/expeditee/gui/management/ResourceManager.java

Timestamp:

11/07/19 12:22:50 (5 years ago)

Author:

bnemhaus

Message:

Copying images in Expeditee now duplicates the associated file on the filesystem.
Also changed USER_NAME back to USER.NAME on David's direction.

File:

• trunk/src/org/expeditee/gui/management/ResourceManager.java (modified) (2 diffs)

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

@@ -25 +25 @@
         private static boolean commonInvalidated = false;
         private static ResourceManager instance = new ResourceManager();
-        private static ResolvedDirectoryList frames = instance.new ResolvedDirectoryList(FolderSettings.FrameDirs);
-        private static ResolvedDirectoryList images = instance.new ResolvedDirectoryList(FolderSettings.ImageDirs);
-        private static ResolvedDirectoryList audio = instance.new ResolvedDirectoryList(FolderSettings.AudioDirs);
-        
-        /**
-         * Attempts to relativise a image path using the users the directories listed for images in their settings.
-         * @param path The path to attempt to relativise
-         * @param context The context to use.  Most likely the Frame that the image is on.
-         * @return Returns the most relativised path if one exists, otherwise returns a copy of the ref parameter passed in.
-         */
-        /*public static Path relativiseImagePath(Path path, Frame context) {
-                String pathStr = path.toString();
-                
-                // Consult the resolved images directory for a list of paths to relativise too. 
-                List<String> directories = images.getDirectories(context);
-                
-                // Find the longest match that can be used to relativise the path.
-                String longestMatch = "";
-                for (String dir: directories) {
-                        if (pathStr.startsWith(dir) && (dir.length() > longestMatch.length())) {
-                                longestMatch = dir;
-                        }
-                }
-                
-                return Paths.get(pathStr.replace(longestMatch, ""));
-        }*/
-        
-        public static Path relativiseImagePath(Path path, Frame context) {
-                Path expediteeHome = Paths.get(FrameIO.PARENT_FOLDER);
-                if (path.startsWith(expediteeHome)) {
-                        return expediteeHome.relativize(path);
-                } else {
-                        return path;
-                }
-        }
-                        
+        protected static ResolvedDirectoryList frames = instance.new ResolvedDirectoryList(FolderSettings.FrameDirs);
+        protected static ResolvedDirectoryList images = instance.new ResolvedDirectoryList(FolderSettings.ImageDirs);
+        protected static ResolvedDirectoryList audio = instance.new ResolvedDirectoryList(FolderSettings.AudioDirs);
+        
         /**
          * Creates a Frame object from an associated resour
@@ -256 +224 @@
         }
         
-        private class ResolvedDirectoryList {
+        protected class ResolvedDirectoryList {
                 private List<String> directories = null;
                 private String contextFramesetPath = null;