Changeset 1441 for trunk/src/org/expeditee/gui/management/ResourceUtil.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/ResourceUtil.java (modified) (2 diffs)

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;
+        }
         
         /**