Changeset 1524 for trunk

Timestamp:

03/24/20 09:40:55 (4 years ago)

Author:

bnemhaus

Message:

Added ability to have ${EXPEDITEE.HOME} used in @File annotations.

Location:

trunk/src/org/expeditee/gui

Files:

• Frame.java (modified) (2 diffs)
• management/ResourceManager.java (modified) (1 diff)
• management/ResourceUtil.java (modified) (2 diffs)

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

@@ -61 +61 @@
 import org.expeditee.gio.input.KBMInputEvent.Key;
 import org.expeditee.gio.input.StandardInputEventListeners;
+import org.expeditee.gui.management.ResourceUtil;
 import org.expeditee.io.Conversion;
 import org.expeditee.io.ExpReader;
@@ -2930 +2931 @@
         }
 
-        public String getExportFileTagValue()
-        {
-                return getAnnotationValue("file");
+        public String getExportFileTagValue() {
+                String annotationValue = getAnnotationValue("file");
+                Path exportPath = ResourceUtil.resolveResourcePath(annotationValue, DisplayController.getCurrentFrame());
+                return exportPath.toString();
         }
 

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

@@ -312 +312 @@
                         for (String s: unresolved) {
                                 String local = ResourceUtil.substitute(s, ResourceUtil.CURRENT_FRAMESET_FLAG, p.toString());
+                                local = ResourceUtil.substitute(local, ResourceUtil.EXPEDITEE_HOME, expediteeHome.toString());
                                 resolved.add(local);
                         }

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

@@ -22 +22 @@
         public static final String CURRENT_FRAMESET_FLAG = "${CURRENT_FRAMESET}";
         public static final String CURRENT_USER = "${CURRENT_USER}";
+        public static final String EXPEDITEE_HOME = "${EXPEDITEE_HOME}";
         
         /**
@@ -67 +68 @@
                 Text item = DisplayController.getCurrentFrame().createNewText("@i: " + out.getName());
                 return item;
+        }
+        
+        public static Path resolveResourcePath(String unresolved, Frame context) {
+                Path expediteeHome = Paths.get(FrameIO.PARENT_FOLDER).toAbsolutePath();
+                Path absolutePath = Paths.get(context.getFramesetPath()).toAbsolutePath();
+                Path p = expediteeHome.relativize(absolutePath);
+                String resolved = ResourceUtil.substitute(unresolved, CURRENT_FRAMESET_FLAG, p.toString());
+                resolved = ResourceUtil.substitute(resolved, EXPEDITEE_HOME, expediteeHome.toString());
+                return Paths.get(resolved).toAbsolutePath();
         }