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

Timestamp:

05/06/08 12:10:11 (16 years ago)

Author:

ra33

Message:

Changes

File:

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

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

@@ -387 +387 @@
                 return null;
         }
-
+        
+        public static Frame LoadZero(String framesetName, String path) {
+                String adjustedName = FrameUtils.GetFramesetNameAdjusted(framesetName);
+                return LoadFrame(adjustedName + 0);
+        }
+
+        public static Frame LoadZero() {
+                Frame current = DisplayIO.getCurrentFrame();
+                return LoadZero(current.getFramesetName(), current.path);
+        }
+        
         public static Frame LoadLast() {
                 Frame current = DisplayIO.getCurrentFrame();
@@ -891 +901 @@
                 String conversion = frameset + " --> ";
 
-                // ensure the framename is valid
-                frameset = ConvertToValidFramesetName(frameset);
-
-                if (frameset == null)
+                if (! IsValidFramesetName(frameset)){
                         throw new Exception("Invalid frameset name");
-
+                }
+                
                 if (!recreate && FrameIO.DoesFramesetExist(frameset)) {
                         throw new ExistingFramesetException(frameset);
@@ -957 +965 @@
 
                 return base;
-        }
+        }private static boolean IsValidFramesetName(String frameset) {
+                for (int i = 0; i < frameset.length(); i++) {
+                        // capitalize all characters after spaces
+                        if (!Character.isLetterOrDigit(frameset.charAt(i))) {
+                                return false;
+                        }
+                }
+                return true;
+        }
+
+
 
         public static boolean DeleteFrameset(String framesetName) {