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

Timestamp:

05/19/08 12:03:18 (16 years ago)

Author:

ra33

Message:

Fixed a bunch of problems with rectangles and resizing the window, as well as adding some more unit tests etc.

File:

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

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

@@ -548 +548 @@
         }
 
+        public static void RefreshCasheImages() {
+                SuspendCache();
+                for (Frame f : _Cache.values())
+                        f.setBuffer(null);
+                ResumeCache();
+        }
+
         /**
          * Creates a new frameset using the given name. This includes creating a new
@@ -603 +610 @@
         }
 
+        public static String SaveFrame(Frame toSave, boolean inc) {
+                return SaveFrame(toSave, inc, true);
+        }
+
         /**
          * Saves the given Frame to disk in the corresponding frameset directory, if
@@ -613 +624 @@
          *            True if the saved frames counter should be incremented, false
          *            otherwise.
-         */
-        public static String SaveFrame(Frame toSave, boolean inc) {
+         * @param checkBackup
+         *            True if the frame should be checked for the back up tag
+         */
+        public static String SaveFrame(Frame toSave, boolean inc,
+                        boolean checkBackup) {
 
                 if (toSave == null)
@@ -630 +644 @@
                                 .getFrameName());
 
+                // Check if the frame exists
+                if (checkBackup && fullPath == null) {
+                        // The first time a frame with the backup tag is saved, dont back it
+                        // up
+                        checkBackup = false;
+                }
+
                 FrameWriter writer = null;
+                int savedVersion;
                 try {
                         // if its a new frame or an existing Exp frame...
                         if (fullPath == null || fullPath.endsWith(ExpReader.EXTENTION)) {
                                 writer = new ExpWriter();
+                                savedVersion = ExpReader.getVersion(fullPath);
                         } else {
                                 writer = new KMSWriter();
+                                savedVersion = KMSReader.getVersion(fullPath);
                         }
-
-                        if (toSave.getFrameNumber() > 0
+                        // Check if we are trying to save an out of date version
+                        if (savedVersion > toSave.getVersion(false)
+                                        && !toSave.getFramesetName().equalsIgnoreCase(
+                                                        FrameGraphics.MESSAGES_FRAMESET_NAME)) {
+                                // remove this frame from the cache if it is there
+                                // This will make sure links to the original are set correctly
+                                _Cache.remove(toSave.getFrameName().toLowerCase());
+                                int nextnum = ReadINF(toSave.path, toSave.getFramesetName()) + 1;
+                                SuspendCache();
+                                Frame original = LoadFrame(toSave.getFrameName());
+                                toSave.setFrameNumber(nextnum);
+                                ResumeCache();
+                                // Put the modified version in the cache
+                                _Cache.put(toSave.getFrameName().toLowerCase(), toSave);
+                                // Show the messages alerting the user
+                                Text originalMessage = new Text(-1);
+                                originalMessage.setColor(FrameGraphics.ERROR_COLOR);
+                                originalMessage.setText(original.getFrameName()
+                                                + " was updated by another user.");
+                                originalMessage.setLink(original.getFrameName());
+                                Text yourMessage = new Text(-1);
+                                yourMessage.setColor(FrameGraphics.ERROR_COLOR);
+                                yourMessage.setText("Your version was renamed "
+                                                + toSave.getFrameName());
+                                yourMessage.setLink(toSave.getFrameName());
+                                FrameGraphics.DisplayMessage(originalMessage);
+                                FrameGraphics.DisplayMessage(yourMessage);
+                        } else if (checkBackup
                                         && ItemUtils.ContainsTag(toSave.getItems(),
                                                         ItemUtils.TAG_BACKUP)) {
@@ -649 +699 @@
                                 int nextnum = ReadINF(toSave.path, toSave.getFramesetName()) + 1;
 
-                                original.setFrameNumber(-nextnum);
-                                SaveFrame(original, inc);
+                                // Give it a negative framenumber so that when it is saved the
+                                // backup tag will be ignored
+                                original.setFrameNumber(nextnum);
+                                original.change();
+                                SaveFrame(original, false, false);
 
                                 Item i = ItemUtils.FindTag(toSave.getItems(),
@@ -657 +710 @@
                                 toSave.setFrameNumber(orignum);
                                 ResumeCache();
-                        } else if (toSave.getFrameNumber() < 0) {
-                                toSave.setFrameNumber(-toSave.getFrameNumber());
                         }
 
@@ -1000 +1051 @@
                                 int copyNumber = 1;
                                 File dest = new File(destPath + File.separator);
-                                //Create the trash folder if it doesnt already exist
+                                // Create the trash folder if it doesnt already exist
                                 if (!dest.getParentFile().exists())
                                         dest.mkdirs();
@@ -1006 +1057 @@
                                 // a number to the end
                                 while (dest.exists()) {
-                                        dest = new File(destPath + ++copyNumber + File.separator );
+                                        dest = new File(destPath + ++copyNumber + File.separator);
                                 }
                                 return framesetDirectory.renameTo(dest);