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

Timestamp:

06/10/08 10:03:03 (16 years ago)

Author:

ra33

Message:

Lots of changes!!

File:

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

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

@@ -138 +138 @@
 
         public static Frame LoadFrame(String frameName) {
-                // If the frame name is a positive integer add the frameset name
-                if (isPositiveInteger(frameName)) {
-                        assert (false);
-                        frameName = DisplayIO.getCurrentFrame().getFramesetName()
-                                        + frameName;
-                }
+                if (!isValidFrameName(frameName))
+                        return null;
 
                 // first try reading from cache
@@ -181 +177 @@
 
                 for (String path : UserSettings.FrameDirs) {
+                        File files = new File(path);
+                        if (!files.exists())
+                                continue;
                         for (File f : (new File(path)).listFiles()) {
                                 if (f.isDirectory()) {
@@ -203 +202 @@
          */
         public static String getFrameFullPathName(String path, String frameName) {
-                String source = path + Conversion.getFrameset(frameName)
+                String source = path + Conversion.getFramesetName(frameName)
                                 + File.separator;
 
@@ -219 +218 @@
 
                 // check for oldfile name format
-                fullPath = source + Conversion.getFrameset(frameName) + "."
+                fullPath = source + Conversion.getFramesetName(frameName) + "."
                                 + Conversion.getFrameNumber(frameName);
                 tester = new File(fullPath);
@@ -229 +228 @@
         }
 
-        public static boolean DoesFrameExist(String frameName) {
+        public static boolean canAccessFrame(String frameName) {
                 for (String path : UserSettings.FrameDirs) {
                         if (getFrameFullPathName(path, frameName) != null)
@@ -421 +420 @@
          * @return The result of File.delete()
          */
-        public static boolean DeleteFrame(Frame toDelete) throws IOException {
+        public static boolean DeleteFrame(Frame toDelete) throws IOException,
+                        SecurityException {
                 if (toDelete == null)
                         return false;
@@ -427 +427 @@
                 // Dont delete the zero frame
                 if (toDelete.getNumber() == 0) {
-                        FrameGraphics.ErrorMessage("Zero frame's can not be deleted");
-                        return false;
+                        throw new SecurityException("Deleting a zero frame is illegal");
                 }
 
                 SaveFrame(toDelete);
 
+                // Copy deleted frames to the DeletedFrames frameset
                 // get the last used frame in the destination frameset
                 final String DELETED_FRAMES = "DeletedFrames";
@@ -765 +765 @@
                         // re-parsing)
                         if (isProfileFrame(toSave)) {
-                                Frame profile = FrameIO.LoadFrame(toSave.getFramesetName()+ "1");
-                                assert(profile != null);
+                                Frame profile = FrameIO.LoadFrame(toSave.getFramesetName()
+                                                + "1");
+                                assert (profile != null);
                                 FrameUtils.ParseProfile(profile);
                         }
@@ -780 +781 @@
         /**
          * Checks if a frame is in the current user profile frameset.
-         * @param toCheck the frame to check
+         * 
+         * @param toCheck
+         *            the frame to check
          * @return true if the frame is in the current user profile frameset
          */
         public static boolean isProfileFrame(Frame toCheck) {
-                if(toCheck.getNumber() == 0)
+                if (toCheck.getNumber() == 0)
                         return false;
                 return toCheck.getFramesetName()
-                .equalsIgnoreCase(UserSettings.Username);
+                                .equalsIgnoreCase(UserSettings.Username);
         }
 
@@ -973 +976 @@
         }
 
-        public static Boolean DoesFramesetExist(String framesetName) {
-                String zeroFrame = framesetName + '0';
-                return FrameIO.DoesFrameExist(zeroFrame);
+        /**
+         * Checks if a given frameset is accessable.
+         * 
+         * @param framesetName
+         * @return
+         */
+        public static Boolean canAccessFrameset(String framesetName) {
+                framesetName = framesetName.toLowerCase();
+                for (String path : UserSettings.FrameDirs) {
+                        if ((new File(path + framesetName)).exists())
+                                return true;
+                }
+                return false;
         }
 
@@ -986 +999 @@
                 }
 
-                if (!recreate && FrameIO.DoesFramesetExist(frameset)) {
+                if (!recreate && FrameIO.canAccessFrameset(frameset)) {
                         throw new ExistingFramesetException(frameset);
                 }
@@ -1081 +1094 @@
 
         public static boolean DeleteFrameset(String framesetName) {
-                if (!FrameIO.DoesFramesetExist(framesetName))
+                if (!FrameIO.canAccessFrameset(framesetName))
                         return false;
                 // Search all the available directories for the directory
@@ -1109 +1122 @@
         public static boolean CopyFrameset(String framesetToCopy,
                         String copiedFrameset) throws Exception {
-                if (!FrameIO.DoesFramesetExist(framesetToCopy))
+                if (!FrameIO.canAccessFrameset(framesetToCopy))
                         return false;
-                if (FrameIO.DoesFramesetExist(copiedFrameset))
+                if (FrameIO.canAccessFrameset(copiedFrameset))
                         return false;
                 // search through all the directories to find the frameset we are
@@ -1127 +1140 @@
                                 // copy each of the frames
                                 for (File f : framesetDirectory.listFiles()) {
+                                        // Ignore hidden files
+                                        if (f.getName().charAt(0) == '.')
+                                                continue;
                                         String copyPath = copyFramesetDirectory.getAbsolutePath()
                                                         + File.separator + f.getName();