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

Timestamp:

08/31/20 16:26:59 (4 years ago)

Author:

bnemhaus

Message:

New feature: when creating a frameset, if the item being used is linked and you hold shift, it will use the items on the linked frame to populate the zero frame of the new frameset

File:

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

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

@@ -816 +816 @@
                         // create the new frameset
                         Frame one = FrameIO.CreateFrameset(DELETED_FRAMES, toDelete
-                                        .getPath());
+                                        .getPath(), null);
                         framePath = one.getPath();
                         lastNumber = 0;
@@ -1015 +1015 @@
          * @param frameset
          *            The name of the Frameset to create
+         * @param zeroFrameItems TODO
          * @return The first Frame of the new Frameset (Frame.1)
          */
-        public static Frame CreateFrameset(String frameset, String path)
+        public static Frame CreateFrameset(String frameset, String path, Collection<Item> zeroFrameItems)
                         throws Exception {
-                return CreateFrameset(frameset, path, false);
+                return CreateFrameset(frameset, path, false, zeroFrameItems);
         }
 
@@ -1257 +1258 @@
                                 } catch (RuntimeException e) {
                                         try {
-                                                CreateFrameset(oldFramesetName, toSave.getPath());
+                                                CreateFrameset(oldFramesetName, toSave.getPath(), null);
                                                 nextnum = 1;
                                         } catch (Exception e1) {
@@ -1584 +1585 @@
          * @param name
          *            The Frameset name to use
+         * @param zeroFrameItems TODO
          * @return The name of the first Frame in the newly created Frameset (the .1
          *         frame)
          */
-        public static Frame CreateNewFrameset(String name) throws Exception {
+        public static Frame CreateNewFrameset(String name, Collection<Item> zeroFrameItems) throws Exception {
                 String path = DisplayController.getCurrentFrame().getPath();
 
@@ -1595 +1597 @@
                 }
 
-                Frame newFrame = FrameIO.CreateFrameset(name, path);
+                Frame newFrame = FrameIO.CreateFrameset(name, path, zeroFrameItems);
 
                 if (newFrame == null) {
                         // Cant create directories if the path is readonly or there is no
                         // space available
-                        newFrame = FrameIO.CreateFrameset(name, FrameIO.FRAME_PATH);
+                        newFrame = FrameIO.CreateFrameset(name, FrameIO.FRAME_PATH, zeroFrameItems);
                 }
 
@@ -1610 +1612 @@
         }
         
-        public static Frame CreateNewGroup(String name) {
+        public static Frame CreateNewGroup(String name, Collection<Item> zeroFrameItems) {
                 try {
-                        Frame oneFrame = FrameIO.CreateFrameset(name, FrameIO.GROUP_PATH);
+                        Frame oneFrame = FrameIO.CreateFrameset(name, FrameIO.GROUP_PATH, zeroFrameItems);
                         oneFrame.setPermission(new PermissionTriple(UserAppliedPermission.full, UserAppliedPermission.none, UserAppliedPermission.none));
                         
@@ -1694 +1696 @@
         }
 
-        public static Frame CreateFrameset(String frameset, String path, boolean recreate) throws InvalidFramesetNameException, ExistingFramesetException {
+        public static Frame CreateFrameset(String frameset, String path, boolean recreate, Collection<Item> zeroFrameItems) throws InvalidFramesetNameException, ExistingFramesetException {
                 String conversion = frameset + " --> ";
 
@@ -1772 +1774 @@
                 base.setPath(path);
                 base.change();
+                if (zeroFrameItems != null) {
+                        base.addAllItems(zeroFrameItems);
+                }
                 SaveFrame(base, false);