Changeset 1438 for trunk

Timestamp:

11/06/19 13:55:33 (4 years ago)

Author:

bnemhaus

Message:

Relativisation of image paths now only relativies back to expeditee home.
Also, when loading images and audio, paths can now be relative to expeditee home, even if it is not listed in the users settings. It is always tried last.

File:

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

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

@@ -35 +35 @@
          * @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) {
+        /*public static Path relativiseImagePath(Path path, Frame context) {
                 String pathStr = path.toString();
                 
@@ -50 +50 @@
                 
                 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;
+                }
         }
                         
@@ -130 +139 @@
                 // by this Expeditee Text Item.
                 List<String> canditateDirectoriesForResource = images.getDirectories(source);
+                canditateDirectoriesForResource.add(FrameIO.PARENT_FOLDER);
                 
                 // First try finding the resource in the directories specified by the 
@@ -150 +160 @@
                 //              These are of the format "/packageA/packageB/filename".  For
                 //              example: "/org/expeditee/gui.management/ResourceManager.java"
-                //
-                // Bryce: Do we want to allow for the option of 
-                // it being a path relative to expeditee.home?
                 if (resourceFile == null || !resourceFile.exists() || resourceFile.isDirectory()) {
                         // Prepare for case a.
@@ -201 +208 @@
         public static File getAudioResource(String localFileName, Frame parentFrame) {
                 List<String> directories = audio.getDirectories(parentFrame);
+                directories.add(FrameIO.PARENT_FOLDER);
                 for (String directory: directories) {
                         Path pathToFile = Paths.get(directory).resolve(localFileName);
@@ -220 +228 @@
         public static List<File> gatherAudioResources(Predicate<File> includeFile, Frame parentFrame) {
                 List<String> directories = audio.getDirectories(parentFrame);
+                directories.add(FrameIO.PARENT_FOLDER);
                 List<File> results = new ArrayList<File>();
                 for (String directory: directories) {