Changeset 8 for trunk/src/org/expeditee/agents

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/agents/CopyTree.java (modified) (1 diff)

trunk/src/org/expeditee/agents/CopyTree.java

@@ -33 +33 @@
                 _nameFrom = init.getFramesetName().toLowerCase();
 
-                // get the last used frame in the destination frameset
-                _lastNumber = FrameIO.getLastNumber(_nameTo);
+                // create the new frameset
+                try {
+                        // get the last used frame in the destination frameset
+                        _lastNumber = FrameIO.getLastNumber(_nameTo);
+                        Frame one = FrameIO.CreateFrameset(_nameTo, init.path);
 
-                if (_lastNumber < 0) {
-                        // create the new frameset
-                        try {
-                                Frame one = FrameIO.CreateFrameset(_nameTo, init.path);
+                        _framePath = one.path;
+                        _lastNumber = -1;
+                        _firstNumber = 1;
 
-                                _framePath = one.path;
-                                _lastNumber = -1;
-                                _firstNumber = 1;
-
-                                // copy the original .0 frame
-                                Frame zero = FrameIO.LoadFrame(init.getFramesetNameAdjusted()
-                                                + "0");
-                                processFrame(zero);
-                        } catch (Exception e) {
-                                // TODO fix this up later.
-                        }
-                } else {
+                        // copy the original .0 frame
+                        Frame zero = FrameIO
+                                        .LoadFrame(init.getFramesetNameAdjusted() + "0");
+                        processFrame(zero);
+                } catch (ExistingFramesetException efe) {
                         // get the frame path
                         Frame zero = FrameIO.LoadFrame(_nameTo + "0");
                         _framePath = zero.path;
                         _firstNumber = _lastNumber + 1;
+                } catch (Exception e) {
+                        return false;
                 }