Changeset 1441 for trunk/src/org/expeditee/gui/management

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.

Location:

trunk/src/org/expeditee/gui/management

Files:

• ProfileManager.java (modified) (2 diffs)
• ResourceManager.java (modified) (2 diffs)
• ResourceUtil.java (modified) (2 diffs)

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

@@ -28 +28 @@
 public class ProfileManager {
 
-        private static final String USER_NAME_PATTERN_INTERNAL = "USER_NAME";
         private static final String DEFAULT = UserSettings.DEFAULT_PROFILE_NAME;
         private static final String[] startPages = { "exploratorysearch", "webbrowser" };
-        public static final String USER_NAME_PATTERN = "${" + USER_NAME_PATTERN_INTERNAL + "}";
+        public static final String USER_NAME_FLAG = "${" + "USER.NAME" + "}";
 
         public static Frame createProfile(String profileFor, Map<String, Setting> specifiedSettings,
@@ -85 +84 @@
                                         if (item instanceof Text) {
                                                 String content = item.getText();
-                                                item.setText(ResourceUtil.substitute(content, ProfileManager.USER_NAME_PATTERN, profileFor));
+                                                item.setText(ResourceUtil.substitute(content, ProfileManager.USER_NAME_FLAG, profileFor));
                                         }
                                 }

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;

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

@@ -1 +1 @@
 package org.expeditee.gui.management;
+
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.List;
+
+import org.expeditee.gui.Frame;
+import org.expeditee.gui.FrameIO;
 
 public class ResourceUtil {
@@ -10 +17 @@
         public static final String CURRENT_FRAMESET_FLAG = "${CURRENT_FRAMESET}";
         public static final String CURRENT_USER = "${CURRENT_USER}";
+        
+        /**
+         * Attempts to relativise a image path using expeditee.home (FrameIO.PARENT_FOLDER).
+         * @param path The path to attempt to relativise
+         * @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) {
+                Path expediteeHome = Paths.get(FrameIO.PARENT_FOLDER);
+                if (path.startsWith(expediteeHome)) {
+                        return expediteeHome.relativize(path);
+                } else {
+                        return path;
+                }
+        }
+        
+        public static Path resolveImagePath(Path path, Frame context) {
+                List<String> directories = ResourceManager.images.getDirectories(context);
+                directories.add(FrameIO.PARENT_FOLDER);
+                
+                for (String dir: directories) {
+                        Path canditate = Paths.get(dir).resolve(path);
+                        if (canditate.toFile().exists()) {
+                                return canditate;
+                        }
+                }
+                
+                return null;
+        }
         
         /**