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

Timestamp:

05/30/08 10:14:43 (16 years ago)

Author:

ra33

Message:

Added some more unit tests
Did a bunch of refactoring
AND added a few new features... @b @v were the most significant

File:

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

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

@@ -41 +41 @@
                 FRAME_PATH = PARENT_FOLDER + "framesets" + File.separator;
                 TRASH_PATH = PARENT_FOLDER + "trash" + File.separator;
-                IMAGES_PATH = PARENT_FOLDER + "images" + File.separator;
+                IMAGES_PATH = PARENT_FOLDER + IMAGES_FOLDER;
                 HELP_PATH = PARENT_FOLDER + "help" + File.separator;
                 PROFILE_PATH = PARENT_FOLDER + "profiles" + File.separator;
@@ -53 +53 @@
          * subdirectory in this directory.
          */
-
+        public static String IMAGES_FOLDER = "images" + File.separator;
+        
         public static String TRASH_PATH;
 
@@ -263 +264 @@
                                 _Cache.clear();
 
-                        if (frame.getFrameNumber() > 0 && isCacheOn())
+                        if (frame.getNumber() > 0 && isCacheOn())
                                 _Cache.put(frameName.toLowerCase(), frame);
 
@@ -286 +287 @@
                 _UseCache = false;
                 Frame fresh = FrameIO.LoadFrame(DisplayIO.getCurrentFrame()
-                                .getFrameName());
+                                .getName());
                 _UseCache = cache;
-                if (_Cache.containsKey(fresh.getFrameName().toLowerCase()))
-                        _Cache.put(fresh.getFrameName().toLowerCase(), fresh);
+                if (_Cache.containsKey(fresh.getName().toLowerCase()))
+                        _Cache.put(fresh.getName().toLowerCase(), fresh);
                 DisplayIO.setCurrentFrame(fresh);
         }
@@ -298 +299 @@
                 // the current name and number
                 String name = current.getFramesetName();
-                int num = current.getFrameNumber() - 1;
+                int num = current.getNumber() - 1;
 
                 // loop until a frame that exists is found
@@ -324 +325 @@
 
                 // the current name and number
-                int num = current.getFrameNumber() + 1;
+                int num = current.getNumber() + 1;
                 int max = num + 1;
                 String name = current.getFramesetName();
@@ -424 +425 @@
 
                 // Dont delete the zero frame
-                if (toDelete.getFrameNumber() == 0) {
+                if (toDelete.getNumber() == 0) {
                         FrameGraphics.ErrorMessage("Zero frame's can not be deleted");
                         return false;
@@ -447 +448 @@
                 // get the fill path to determine which file version it is
                 String source = getFrameFullPathName(toDelete.path, toDelete
-                                .getFrameName());
-
-                String oldFrameName = toDelete.getFrameName().toLowerCase();
+                                .getName());
+
+                String oldFrameName = toDelete.getName().toLowerCase();
                 // Now save the frame in the new location
                 toDelete.setFrameset(DELETED_FRAMES);
@@ -519 +520 @@
 
                 // set the number and title of the new frame
-                template.setFrameName(frameset, ++ next);
+                template.setName(frameset, ++ next);
                 template.setTitle(frameTitle);
 
                 Logger.Log(Logger.SYSTEM, Logger.TDFC, "Creating new frame: "
-                                + template.getFrameName() + " from TDFC");
+                                + template.getName() + " from TDFC");
 
                 // update INF file
@@ -536 +537 @@
                 template.resetDateCreated();
                 for (Item i : template.getItems()) {
-                        if (ItemUtils.isTag(i, ItemUtils.TAG_PARENT))
+                        if (ItemUtils.startsWithTag(i, ItemUtils.TAG_PARENT))
                                 i.setLink(null);
                 }
@@ -656 +657 @@
                 
                 //Dont save if the frame is protected
-                if (toSave.getFrameNameItem().Permission < Item.PERMISSION_TDFC)
+                if (toSave.getNameItem().Permission < Item.PERMISSION_TDFC)
                         return "";
 
@@ -665 +666 @@
                 // Exp format.
                 String fullPath = getFrameFullPathName(toSave.path, toSave
-                                .getFrameName());
+                                .getName());
 
                 // Check if the frame exists
@@ -691 +692 @@
                                 // 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());
+                                _Cache.remove(toSave.getName().toLowerCase());
                                 int nextnum = ReadINF(toSave.path, toSave.getFramesetName()) + 1;
                                 SuspendCache();
-                                Frame original = LoadFrame(toSave.getFrameName());
+                                Frame original = LoadFrame(toSave.getName());
                                 toSave.setFrameNumber(nextnum);
                                 ResumeCache();
                                 // Put the modified version in the cache
-                                _Cache.put(toSave.getFrameName().toLowerCase(), toSave);
+                                _Cache.put(toSave.getName().toLowerCase(), toSave);
                                 // Show the messages alerting the user
                                 Text originalMessage = new Text(-1);
                                 originalMessage.setColor(FrameGraphics.ERROR_COLOR);
-                                originalMessage.setText(original.getFrameName()
+                                originalMessage.setText(original.getName()
                                                 + " was updated by another user.");
-                                originalMessage.setLink(original.getFrameName());
+                                originalMessage.setLink(original.getName());
                                 Text yourMessage = new Text(-1);
                                 yourMessage.setColor(FrameGraphics.ERROR_COLOR);
                                 yourMessage.setText("Your version was renamed "
-                                                + toSave.getFrameName());
-                                yourMessage.setLink(toSave.getFrameName());
+                                                + toSave.getName());
+                                yourMessage.setLink(toSave.getName());
                                 FrameGraphics.DisplayMessage(originalMessage);
                                 FrameGraphics.DisplayMessage(yourMessage);
@@ -716 +717 @@
                                                         ItemUtils.TAG_BACKUP)) {
                                 SuspendCache();
-                                Frame original = LoadFrame(toSave.getFrameName());
+                                Frame original = LoadFrame(toSave.getName());
                                 if (original == null)
                                         original = toSave;
-                                int orignum = original.getFrameNumber();
+                                int orignum = original.getNumber();
                                 int nextnum = ReadINF(toSave.path, toSave.getFramesetName()) + 1;
 
@@ -731 +732 @@
                                 Item i = ItemUtils.FindExactTag(toSave.getItems(),
                                                 ItemUtils.TAG_BACKUP);
-                                i.setLink(original.getFrameName());
+                                i.setLink(original.getName());
                                 toSave.setFrameNumber(orignum);
                                 ResumeCache();
@@ -741 +742 @@
                         toSave.setSaved();
                         if (inc)
-                                SessionStats.SavedFrame(toSave.getFrameName());
+                                SessionStats.SavedFrame(toSave.getName());
 
                         // avoid out-of-sync frames (when in TwinFrames mode)
-                        if (_Cache.containsKey(toSave.getFrameName().toLowerCase()))
-                                _Cache.put(toSave.getFrameName().toLowerCase(), toSave);
+                        if (_Cache.containsKey(toSave.getName().toLowerCase()))
+                                _Cache.put(toSave.getName().toLowerCase(), toSave);
 
                         Logger.Log(Logger.SYSTEM, Logger.SAVE, "Saving "
-                                        + toSave.getFrameName() + " to disk.");
+                                        + toSave.getName() + " to disk.");
 
                         // check that the INF file is not out of date
                         int last = ReadINF(toSave.path, toSave.getFramesetName());
-                        if (last <= toSave.getFrameNumber())
+                        if (last <= toSave.getNumber())
                                 WriteINF(toSave.path, toSave.getFramesetName(), toSave
-                                                .getFrameName());
+                                                .getName());
 
                         // check if this was the profile frame (and thus needs
@@ -874 +875 @@
 
         public static Frame CreateNewFrame(Item linker) throws RuntimeException {
-                String title = null;
-                if (linker instanceof Text)
-                        title = ((Text) linker).getFirstLine();
-
-                String templateLink = linker.getLinkTemplate();
-                String framesetLink = linker.getLinkFrameset();
+                String title = linker.getName();
+
+                String templateLink = linker.getAbsoluteLinkTemplate();
+                String framesetLink = linker.getAbsoluteLinkFrameset();
                 String frameset = (framesetLink != null ? framesetLink : DisplayIO
                                 .getCurrentFrame().getFramesetName());
@@ -886 +885 @@
 
                 // do auto shrinking of the title IF not in twin frames mode
-                Item titleItem = newFrame.getTitle();
+                Item titleItem = newFrame.getTitleItem();
 
                 if (!DisplayIO.isTwinFramesOn()) {
                         // BROOK: This had recursion!! Changed to avoid...
-                        if ((titleItem.getX() + 1) < newFrame.getFrameNameItem().getX()) {
+                        if ((titleItem.getX() + 1) < newFrame.getNameItem().getX()) {
                                 while (titleItem.getBoundsWidth() + titleItem.getX() > newFrame
-                                                .getFrameNameItem().getX()) {
+                                                .getNameItem().getX()) {
                                         titleItem.setSize(titleItem.getSize() - 1);
                                 }
@@ -1122 +1121 @@
         }
 
+        /**
+         * Copies a file from one location to another.
+         * @param existingFile
+         * @param newFileName
+         * @throws Exception
+         */
         public static void copyFile(String existingFile, String newFileName)
                         throws Exception {