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

Timestamp:

05/01/08 15:12:45 (16 years ago)

Author:

ra33

Message:

Displaying better error messages when trying to create a frameset with a name that already exists.

File:

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

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

@@ -11 +11 @@
 import java.util.HashMap;
 
+import org.expeditee.agents.ExistingFramesetException;
 import org.expeditee.io.Conversion;
 import org.expeditee.io.ExpReader;
@@ -418 +419 @@
                 int lastNumber = FrameIO.getLastNumber(DELETED_FRAMES);
                 String framePath;
-                try{
+                try {
                         // create the new frameset
                         Frame one = FrameIO.CreateFrameset(DELETED_FRAMES, toDelete.path);
                         framePath = one.path;
                         lastNumber = 0;
-                } catch(Exception e){
+                } catch (Exception e) {
                         Frame zero = FrameIO.LoadFrame(DELETED_FRAMES + "0");
                         framePath = zero.path;
@@ -565 +566 @@
          * @return The first Frame of the new Frameset (Frame.1)
          */
-        public static Frame CreateFrameset(String frameset, String path) throws Exception{
+        public static Frame CreateFrameset(String frameset, String path)
+                        throws Exception {
                 return CreateFrameset(frameset, path, false);
         }
@@ -585 +587 @@
 
                 // String must begin with a letter and end with a digit
-                if (!(Character.isLetter(frameName.charAt(0)) || Character.isDigit(frameName.charAt(0)))
+                if (!(Character.isLetter(frameName.charAt(0)) || Character
+                                .isDigit(frameName.charAt(0)))
                                 || !Character.isDigit(frameName.charAt(frameName.length() - 1)))
                         return false;
@@ -713 +716 @@
         }
 
-        public static Frame CreateNewProfile(String username) throws Exception{
+        public static Frame CreateNewProfile(String username) throws Exception {
                 Frame profile = CreateFrameset(username, PROFILE_PATH);
                 FrameUtils.CreateDefaultProfile(profile);
@@ -771 +774 @@
         }
 
-        private static String NameValidation(String toValidate) throws Exception{
+        private static String NameValidation(String toValidate) throws Exception {
                 String result = "";
 
@@ -780 +783 @@
                         // check for illegal characters
                         if (ILLEGAL_CHARS.contains("" + cur)) {
-                                throw new Exception("Frameset name contains illegal character '"
-                                                                + cur + "' at position " + (i + 1));
+                                throw new Exception(
+                                                "Frameset name contains illegal character '" + cur
+                                                                + "' at position " + (i + 1));
                         }
 
@@ -796 +800 @@
                                 if (result.length() >= MAX_NAME_LENGTH) {
                                         throw new Exception("Frameset name is too long (Max "
-                                                                        + MAX_NAME_LENGTH + " characters)");
+                                                        + MAX_NAME_LENGTH + " characters)");
                                 }
                         }
@@ -835 +839 @@
          *         frame)
          */
-        public static Frame CreateNewFrameset(String name) throws Exception{
+        public static Frame CreateNewFrameset(String name) throws Exception {
                 String path = DisplayIO.getCurrentFrame().path;
 
@@ -887 +891 @@
 
         public static Frame CreateFrameset(String frameset, String path,
-                        boolean recreate) throws Exception{
+                        boolean recreate) throws Exception {
                 String conversion = frameset + " --> ";
 
@@ -897 +901 @@
 
                 if (!recreate && FrameIO.DoesFramesetExist(frameset)) {
-                        throw new Exception("A frameset called " + frameset + " already exists.");
+                        throw new ExistingFramesetException(frameset);
                 }