Changeset 64

Timestamp:

05/16/08 14:15:11 (16 years ago)

Author:

ra33

Message:

DeleteFrameset now moves frames into a trash directory... this is to pretect users from accidentally removing them!
They must be restored manually through the file system

Location:

trunk/src/org/expeditee

Files:

• actions/Simple.java (modified) (1 diff)
• gui/FrameIO.java (modified) (8 diffs)

trunk/src/org/expeditee/actions/Simple.java

@@ -218 +218 @@
                 if (testsFailed > 0)
                         FrameGraphics.DisplayMessage("Failed: " + testsFailed, Color.RED);
+                //Remove items from the cursor...
+                Frame.FreeItems.clear();
         }
 

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

@@ -40 +40 @@
                 PARENT_FOLDER = newFolder;
                 FRAME_PATH = PARENT_FOLDER + "framesets" + File.separator;
+                TRASH_PATH = PARENT_FOLDER + "trash" + File.separator;
                 IMAGES_PATH = PARENT_FOLDER + "images" + File.separator;
                 HELP_PATH = PARENT_FOLDER + "help" + File.separator;
@@ -52 +53 @@
          * subdirectory in this directory.
          */
+
+        public static String TRASH_PATH;
 
         public static String PARENT_FOLDER;
@@ -477 +480 @@
                 // disable caching of 0 frames
                 SuspendCache();
-                
+
                 Frame template = null;
                 if (templateFrame == null)
@@ -757 +760 @@
         }
 
-        
-        
         public static String ConvertToValidFramesetName(String toValidate) {
-                assert(toValidate != null && toValidate.length() > 0);
-                
+                assert (toValidate != null && toValidate.length() > 0);
+
                 StringBuffer result = new StringBuffer();
 
-                if (Character.isDigit(toValidate.charAt(0))){
+                if (Character.isDigit(toValidate.charAt(0))) {
                         result.append(FRAME_NAME_LAST_CHAR);
                 }
-                
+
                 boolean capital = false;
-                for (int i = 0; i < toValidate.length() && result.length() < MAX_NAME_LENGTH; i++) {
+                for (int i = 0; i < toValidate.length()
+                                && result.length() < MAX_NAME_LENGTH; i++) {
                         char cur = toValidate.charAt(i);
 
@@ -785 +787 @@
                 assert (result.length() > 0);
                 int lastCharIndex = result.length() - 1;
-                if (!Character.isLetter(result.charAt(lastCharIndex))){
-                        if (lastCharIndex ==  MAX_NAME_LENGTH - 1)
-                                result.setCharAt(lastCharIndex,FRAME_NAME_LAST_CHAR);
+                if (!Character.isLetter(result.charAt(lastCharIndex))) {
+                        if (lastCharIndex == MAX_NAME_LENGTH - 1)
+                                result.setCharAt(lastCharIndex, FRAME_NAME_LAST_CHAR);
                         else
                                 result.append(FRAME_NAME_LAST_CHAR);
                 }
-                
-                assert(IsValidFramesetName(result.toString()));
+
+                assert (IsValidFramesetName(result.toString()));
                 return result.toString();
         }
@@ -957 +959 @@
          * letter and contain only letters and digits in between.
          * 
-         * @param frameset the name to be tested
+         * @param frameset
+         *            the name to be tested
          * @return true if the frameset name is valid
          */
@@ -964 +967 @@
                         return false;
                 }
-                
+
                 int nameLength = frameset.length();
-                if( frameset.length() <= 0 || nameLength > MAX_NAME_LENGTH){
+                if (frameset.length() <= 0 || nameLength > MAX_NAME_LENGTH) {
                         return false;
                 }
-                
-                int lastCharIndex = nameLength- 1;
-                
-                if (!Character.isLetter(frameset.charAt(0)) ||
-                                !Character.isLetter(frameset.charAt(lastCharIndex)))
+
+                int lastCharIndex = nameLength - 1;
+
+                if (!Character.isLetter(frameset.charAt(0))
+                                || !Character.isLetter(frameset.charAt(lastCharIndex)))
                         return false;
 
@@ -987 +990 @@
                 if (!FrameIO.DoesFramesetExist(framesetName))
                         return false;
-
+                // Search all the available directories for the directory
                 for (String path : UserSettings.FrameDirs) {
                         String source = path + framesetName.toLowerCase() + File.separator;
                         File framesetDirectory = new File(source);
+                        // Once we have found the directory move it to the trash
                         if (framesetDirectory.exists()) {
-                                for (File f : framesetDirectory.listFiles())
-                                        f.delete();
-                                return framesetDirectory.delete();
+                                String destPath = FrameIO.TRASH_PATH
+                                                + framesetName.toLowerCase();
+                                int copyNumber = 1;
+                                File dest = new File(destPath + File.separator);
+                                //Create the trash folder if it doesnt already exist
+                                if (!dest.getParentFile().exists())
+                                        dest.mkdirs();
+                                // If a frameset with the same name is already in the trash add
+                                // a number to the end
+                                while (dest.exists()) {
+                                        dest = new File(destPath + ++copyNumber + File.separator );
+                                }
+                                return framesetDirectory.renameTo(dest);
                         }
                 }