Changeset 1102 for trunk/src/org/expeditee/gui/FrameIO.java

Timestamp:

05/10/18 16:04:51 (6 years ago)

Author:

davidb

Message:

Reworking of the code-base to separate logic from graphics. This version of Expeditee now supports a JFX graphics as an alternative to SWING

File:

• trunk/src/org/expeditee/gui/FrameIO.java (modified) (13 diffs)

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

@@ -195 +195 @@
         }
 
-        public static Frame LoadFrame(String frameName, String path,
-                        boolean ignoreAnnotations) {
-                if (!isValidFrameName(frameName))
-                        return null;
+        public static Frame LoadFrame(String frameName, String path, boolean ignoreAnnotations)
+        {
+                if (!isValidFrameName(frameName)) return null;
 
                 String frameNameLower = frameName.toLowerCase();
                 // first try reading from cache
                 if (isCacheOn() && _Cache.containsKey(frameNameLower)) {
-                        Logger.Log(Logger.SYSTEM, Logger.LOAD, "Loading " + frameName
-                                        + " from cache.");
+                        Logger.Log(Logger.SYSTEM, Logger.LOAD, "Loading " + frameName + " from cache.");
                         Frame frame = _Cache.get(frameNameLower);
                         return frame;
@@ -389 +387 @@
 
         public static boolean canAccessFrame(String frameName) {
-                Frame current = DisplayIO.getCurrentFrame();
+                Frame current = DisplayController.getCurrentFrame();
                 // Just in case the current frame is not yet saved...
                 if (frameName.equals(current.getName())) {
@@ -490 +488 @@
 
                 _UseCache = false;
-                Frame fresh = FrameIO.LoadFrame(DisplayIO.getCurrentFrame().getName());
+                Frame fresh = FrameIO.LoadFrame(DisplayController.getCurrentFrame().getName());
                 _UseCache = cache;
                 if (_Cache.containsKey(fresh.getName().toLowerCase()))
                         addToCache(fresh);
-                DisplayIO.setCurrentFrame(fresh, false);
+                DisplayController.setCurrentFrame(fresh, false);
         }
 
@@ -599 +597 @@
 
         public static Frame LoadZero() {
-                Frame current = DisplayIO.getCurrentFrame();
+                Frame current = DisplayController.getCurrentFrame();
                 return LoadZero(current.getFramesetName(), current.getPath());
         }
 
         public static Frame LoadLast() {
-                Frame current = DisplayIO.getCurrentFrame();
+                Frame current = DisplayController.getCurrentFrame();
                 return LoadLast(current.getFramesetName(), current.getPath());
         }
 
         public static Frame LoadNext() {
-                return LoadNext(DisplayIO.getCurrentFrame());
+                return LoadNext(DisplayController.getCurrentFrame());
         }
 
         public static Frame LoadPrevious() {
-                return LoadPrevious(DisplayIO.getCurrentFrame());
+                return LoadPrevious(DisplayController.getCurrentFrame());
         }
 
@@ -747 +745 @@
                 }
 
-                // Remove the old frame from the cashe then add the new one
+                // Remove the old frame from the cache then add the new one
                 // TODO figure out some way that we can put both in the cache
                 _Cache.remove(template.getName().toLowerCase());
@@ -770 +768 @@
                 Item titleItem = template.getTitleItem();
 
-                if (!DisplayIO.isTwinFramesOn() && !Justification.center.equals(((Text)titleItem).getJustification())) {
+                if (!DisplayController.isTwinFramesOn() && !Justification.center.equals(((Text)titleItem).getJustification())) {
                         if ((titleItem.getX() + 1) < template.getNameItem().getX()) {
                                 while (titleItem.getSize() > Text.MINIMUM_FONT_SIZE
@@ -811 +809 @@
         }
 
-        public static void RefreshCasheImages() {
+        public static void RefreshCacheImages()
+        {
                 SuspendCache();
-                for (Frame f : _Cache.values())
-                        f.setBuffer(null);
+                for (Frame frame : _Cache.values()) frame.setBuffer(null);
                 ResumeCache();
         }
@@ -1152 +1150 @@
          * @return true if the frame is in the current user profile frameset
          */
-        public static boolean isProfileFrame(Frame toCheck) {
-                if (toCheck.getNumber() == 0)
-                        return false;
+        public static boolean isProfileFrame(Frame toCheck)
+        {
+                if (toCheck.getNumber() == 0) return false;
+                
                 return toCheck.getPath().equals(PROFILE_PATH);
                 // return toCheck.getFramesetName()
@@ -1160 +1159 @@
         }
 
-        public static Frame LoadProfile(String userName) {
+        public static Frame LoadProfile(String userName)
+        {
                 return LoadFrame(userName + "1");
         }
@@ -1299 +1299 @@
                 String templateLink = linker.getAbsoluteLinkTemplate();
                 String framesetLink = linker.getAbsoluteLinkFrameset();
-                String frameset = (framesetLink != null ? framesetLink : DisplayIO
+                String frameset = (framesetLink != null ? framesetLink : DisplayController
                                 .getCurrentFrame().getFramesetName());
 
@@ -1322 +1322 @@
          */
         public static Frame CreateNewFrameset(String name) throws Exception {
-                String path = DisplayIO.getCurrentFrame().getPath();
+                String path = DisplayController.getCurrentFrame().getPath();
 
                 // if current frameset is profile directory change it to framesets
@@ -1394 +1394 @@
         }
 
-        public static Frame CreateFrameset(String frameset, String path,
-                        boolean recreate) throws Exception {
+        public static Frame CreateFrameset(String frameset, String path, boolean recreate) throws Exception
+        {
                 String conversion = frameset + " --> ";
 
-                if (!isValidFramesetName(frameset)) {
-                        throw new Exception("Invalid frameset name");
-                }
+                if (!isValidFramesetName(frameset)) throw new Exception("Invalid frameset name");
 
                 if (!recreate && FrameIO.canAccessFrameset(frameset)) {
@@ -1474 +1472 @@
                 SaveFrame(base, true);
 
-                Logger.Log(Logger.SYSTEM, Logger.NEW_FRAMESET, "Created new frameset: "
-                                + frameset);
+                Logger.Log(Logger.SYSTEM, Logger.NEW_FRAMESET, "Created new frameset: " + frameset);
 
                 return base;