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

Timestamp:

06/05/08 10:11:18 (16 years ago)

Author:

ra33

Message:

Added DebugFrame action
Added GetCometStats
Lots of bug fixes

File:

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

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

@@ -54 +54 @@
          */
         public static String IMAGES_FOLDER = "images" + File.separator;
-        
+
         public static String TRASH_PATH;
 
@@ -79 +79 @@
         public static final int MAX_NAME_LENGTH = 64;
 
-        public static final int MAX_CACHE = 2000;
+        public static final int MAX_CACHE = 100;
 
         private static HashMap<String, Frame> _Cache = new HashMap<String, Frame>();
@@ -286 +286 @@
 
                 _UseCache = false;
-                Frame fresh = FrameIO.LoadFrame(DisplayIO.getCurrentFrame()
-                                .getName());
+                Frame fresh = FrameIO.LoadFrame(DisplayIO.getCurrentFrame().getName());
                 _UseCache = cache;
                 if (_Cache.containsKey(fresh.getName().toLowerCase()))
@@ -310 +309 @@
                 // if we did not find another Frame then this one must be the last one
                 // in the frameset
-                FrameGraphics.DisplayMessage("This is the first frame in the frameset");
+                FrameGraphics
+                                .DisplayMessageOnce("This is the first frame in the frameset");
                 return null;
         }
@@ -347 +347 @@
                 // if we did not find another Frame then this one must be the last one
                 // in the frameset
-                FrameGraphics.DisplayMessage("This is the last frame in the frameset");
+                FrameGraphics
+                                .DisplayMessageOnce("This is the last frame in the frameset");
                 return null;
         }
@@ -359 +360 @@
          * @param current
          */
-        private static void checkTDFC(Frame current) {
+        public static void checkTDFC(Frame current) {
                 if (FrameUtils.getTdfcItem() != null) {
                         FrameUtils.setTdfcItem(null);
@@ -447 +448 @@
 
                 // get the fill path to determine which file version it is
-                String source = getFrameFullPathName(toDelete.path, toDelete
-                                .getName());
+                String source = getFrameFullPathName(toDelete.path, toDelete.getName());
 
                 String oldFrameName = toDelete.getName().toLowerCase();
@@ -484 +484 @@
 
                 if (!FrameIO.isValidFramesetName(frameset)) {
-                        throw new RuntimeException(frameset + " is not a valid frameset name");
-                }
-                
+                        throw new RuntimeException(frameset
+                                        + " is not a valid frameset name");
+                }
+
                 int next = -1;
 
@@ -519 +520 @@
                 }
 
+                // Remove the old frame from the cashe then add the new one
+                // TODO figure out some way that we can put both in the cache
+                _Cache.remove(template.getName().toLowerCase());
                 // set the number and title of the new frame
-                template.setName(frameset, ++ next);
+                template.setName(frameset, ++next);
                 template.setTitle(frameTitle);
+                // _Cache.put(template.getName().toLowerCase(), template);
 
                 Logger.Log(Logger.SYSTEM, Logger.TDFC, "Creating new frame: "
@@ -655 +660 @@
                 if (!toSave.hasChanged() || toSave.isSaved())
                         return "";
-                
-                //Dont save if the frame is protected
-                if (toSave.getNameItem().Permission < Item.PERMISSION_TDFC)
-                        return "";
 
                 // Get the full path only to determine which format to use for saving
@@ -665 +666 @@
                 // Later this will be changed so that KMS frames will be updated to the
                 // Exp format.
-                String fullPath = getFrameFullPathName(toSave.path, toSave
-                                .getName());
+                String fullPath = getFrameFullPathName(toSave.path, toSave.getName());
+
+                // Dont save if the frame is protected and it exists
+                if (checkBackup
+                                && toSave.getNameItem().Permission < Item.PERMISSION_TDFC) {
+                        _Cache.remove(toSave.getName().toLowerCase());
+                        return "";
+                }
 
                 // Check if the frame exists
@@ -723 +730 @@
                                 int nextnum = ReadINF(toSave.path, toSave.getFramesetName()) + 1;
 
-                                // Give it a negative framenumber so that when it is saved the
-                                // backup tag will be ignored
                                 original.setFrameNumber(nextnum);
                                 original.setProtection("" + Item.PERMISSION_COPY);
@@ -748 +753 @@
                                 _Cache.put(toSave.getName().toLowerCase(), toSave);
 
-                        Logger.Log(Logger.SYSTEM, Logger.SAVE, "Saving "
-                                        + toSave.getName() + " to disk.");
+                        Logger.Log(Logger.SYSTEM, Logger.SAVE, "Saving " + toSave.getName()
+                                        + " to disk.");
 
                         // check that the INF file is not out of date
@@ -1123 +1128 @@
         /**
          * Copies a file from one location to another.
+         * 
          * @param existingFile
          * @param newFileName
@@ -1154 +1160 @@
 
         public static boolean isValidLink(String frameName) {
-                return frameName == null || isPositiveInteger(frameName) || isValidFrameName(frameName);
+                return frameName == null || isPositiveInteger(frameName)
+                                || isValidFrameName(frameName);
         }