Changeset 1439 for trunk


Ignore:
Timestamp:
11/06/19 14:29:18 (4 years ago)
Author:
bnemhaus
Message:

Fixed a bug causing ${CURRENT_FRAMESET} flag not to work.

Location:
trunk/src/org/expeditee/gui/management
Files:
2 edited

Legend:

Unmodified
Added
Removed

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

    r1438 r1439  
    311311                        }
    312312                       
     313                        Path expediteeHome = Paths.get(FrameIO.PARENT_FOLDER).toAbsolutePath();
     314                        Path p = expediteeHome.relativize(Paths.get(context).toAbsolutePath());
    313315                        for (String s: unresolved) {
    314                                 String local = ResourceUtil.substitute(s, ResourceUtil.CURRENT_FRAMESET_FLAG, context);
     316                                String local = ResourceUtil.substitute(s, ResourceUtil.CURRENT_FRAMESET_FLAG, p.toString());
    315317                                resolved.add(local);
    316318                        }

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

    r1434 r1439  
    4646                        } else if (inPattern && endingPattern) {
    4747                                String patternFound = patternSB.toString();
    48                                 if (patternFound.equals(pattern)) {
     48                                if (("${" + patternFound + "}").equals(pattern)) {
    4949                                        outputSB.append(replacement);
    5050                                } else {
Note: See TracChangeset for help on using the changeset viewer.