Changeset 1471 for trunk

Timestamp:

11/29/19 18:48:00 (4 years ago)

Author:

bnemhaus

Message:

Fixed bug where Paths.get("") returns current path rather than actually a empty string like I origionaly assumed.

Also collapsed some boolean logic.

File:

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

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

@@ -243 +243 @@
                 
                 public List<String> getDirectories() {
-                        return getDirectories("");
+                        return getDirectories((String) null);
                 }
                 
@@ -249 +249 @@
                         if (commonInvalidated) {
                                 ResourceManager.refreshAll();
-                        } else { 
-                                boolean isInitialSet = contextFramesetPath == null && context != null;
-                                boolean settingToNull = context == null && contextFramesetPath != null;
-                                boolean requiresRefresh = isInitialSet || settingToNull || !contextFramesetPath.equals(context); 
+                        } else {        
+                                boolean requiresRefresh = context == null || contextFramesetPath == null || !contextFramesetPath.equals(context);
+                                
                                 if (requiresRefresh) {
                                         refresh(context);
@@ -280 +279 @@
                         
                         Path expediteeHome = Paths.get(FrameIO.PARENT_FOLDER).toAbsolutePath();
-                        Path p = expediteeHome.relativize(Paths.get(context).toAbsolutePath());
+                        Path absolutePath = Paths.get(context).toAbsolutePath();
+                        Path p = expediteeHome.relativize(absolutePath);
                         for (String s: unresolved) {
                                 String local = ResourceUtil.substitute(s, ResourceUtil.CURRENT_FRAMESET_FLAG, p.toString());