Changeset 12

Timestamp:

05/01/08 17:55:18 (16 years ago)

Author:

ra33

Message:

Remove non alpha numeric chars from frameset names

Location:

trunk/src/org/expeditee/gui

Files:

• Browser.java (modified) (1 diff)
• FrameIO.java (modified) (5 diffs)
• FrameKeyboardActions.java (modified) (1 diff)

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

@@ -78 +78 @@
                 UserSettings.Init();
                 UserSettings.Username = System.getProperty("user.name");
-                Frame profile = FrameIO.LoadProfile(UserSettings.Username);
+                String userName = FrameIO.ConvertToValidFramesetName(UserSettings.Username);
+                Frame profile = FrameIO.LoadProfile(userName);
                 if (profile == null) {
                         try {
-                                profile = FrameIO.CreateNewProfile(UserSettings.Username);
+                                profile = FrameIO.CreateNewProfile(userName);
                         } catch (Exception e) {
                                 //TODO tell the user that there was a problem creating the profile frame and close nicely

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

@@ -774 +774 @@
         }
 
-        private static String NameValidation(String toValidate) throws Exception {
+        public static String ConvertToValidFramesetName(String toValidate) {
                 String result = "";
 
@@ -781 +781 @@
                         char cur = toValidate.charAt(i);
 
-                        // check for illegal characters
-                        if (ILLEGAL_CHARS.contains("" + cur)) {
-                                throw new Exception(
-                                                "Frameset name contains illegal character '" + cur
-                                                                + "' at position " + (i + 1));
-                        }
-
                         // capitalize all characters after spaces
-                        if (cur == ' ') {
-                                capital = true;
-                        } else {
+                        if (Character.isLetterOrDigit(cur)) {
                                 if (capital) {
                                         capital = false;
@@ -799 +790 @@
 
                                 if (result.length() >= MAX_NAME_LENGTH) {
-                                        throw new Exception("Frameset name is too long (Max "
-                                                        + MAX_NAME_LENGTH + " characters)");
+                                        result = result.substring(0,MAX_NAME_LENGTH);
                                 }
-                        }
-                }
-
+                        } else {
+                                capital = true;
+                        }
+                }
+                
                 return result;
         }
@@ -900 +892 @@
 
                 // ensure the framename is valid
-                frameset = NameValidation(frameset);
+                frameset = ConvertToValidFramesetName(frameset);
 
                 if (frameset == null)
@@ -970 +962 @@
                 if (!FrameIO.DoesFramesetExist(framesetName))
                         return false;
-                
+
                 for (String path : UserSettings.FrameDirs) {
                         String source = path + framesetName.toLowerCase() + File.separator;

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

@@ -1323 +1323 @@
                         Frame linkTo = FrameIO.CreateNewFrameset(text.getFirstLine());
                         DisplayIO.setCursor(Item.DEFAULT_CURSOR);
-
                         text.setLink(linkTo.getFrameName());
-
                         text.getParent().setChanged(true);
                         FrameUtils.DisplayFrame(linkTo, true);