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

Timestamp:

01/07/09 13:25:13 (15 years ago)

Author:

ra33

Message:

 

File:

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

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

@@ -662 +662 @@
                 template.reset();
                 template.resetDateCreated();
-                
+
                 for (Item i : template.getItems()) {
                         if (ItemUtils.startsWithTag(i, ItemUtils.TAG_PARENT))
@@ -759 +759 @@
                 // or digits
                 for (int i = 1; i < lastCharIndex; i++) {
-                        if (!Character.isLetterOrDigit(frameName.charAt(i)))
+                        if (!isValidFrameNameChar(frameName.charAt(i)))
                                 return false;
                 }
                 return true;
+        }
+
+        private static boolean isValidFrameNameChar(char c) {
+                return Character.isLetterOrDigit(c) || c == '-';
         }
 
@@ -909 +913 @@
                                                         ItemUtils.TAG_BACKUP)) {
                                 SuspendCache();
+                                String oldFramesetName = toSave.getFramesetName() + "-old";
+
                                 Frame original = LoadFrame(toSave.getName());
                                 if (original == null)
                                         original = toSave;
                                 int orignum = original.getNumber();
-                                int nextnum = ReadINF(toSave.getPath(), toSave
-                                                .getFramesetName(), false) + 1;
-
-                                original.setFrameNumber(nextnum);
-                                original.setPermission(Permission.copy);
-                                original.change();
-                                SaveFrame(original, false, false);
+
+                                int nextnum = -1;
+                                try {
+                                        nextnum = ReadINF(toSave.getPath(), oldFramesetName, false) + 1;
+                                } catch (RuntimeException e) {
+                                        try {
+                                                CreateFrameset(oldFramesetName, toSave.getPath());
+                                                nextnum = 1;
+                                        } catch (Exception e1) {
+                                                e1.printStackTrace();
+                                        }
+                                        //e.printStackTrace();
+                                }
+                                
+                                if (nextnum > 0) {
+                                        original.setFrameset(oldFramesetName);
+                                        original.setFrameNumber(nextnum);
+                                        original.setPermission(Permission.copy);
+                                        original.change();
+                                        SaveFrame(original, false, false);
+                                }
 
                                 Item i = ItemUtils.FindExactTag(toSave.getItems(),
@@ -1272 +1292 @@
                 base.setPath(path);
                 base.change();
+                base.setOwner(UserSettings.UserName);
                 SaveFrame(base, false);
 
@@ -1279 +1300 @@
                 base.setTitle(frameset);
                 base.change();
+                base.setOwner(UserSettings.UserName);
                 SaveFrame(base, true);
 
@@ -1312 +1334 @@
 
                 for (int i = 1; i < lastCharIndex; i++) {
-                        if (!Character.isLetterOrDigit(frameset.charAt(i))) {
+                        if (!isValidFrameNameChar(frameset.charAt(i))) {
                                 return false;
                         }