Changeset 8

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.

Location:

trunk/src/org/expeditee

Files:

• agents/CopyTree.java (modified) (1 diff)
• gui/Browser.java (modified) (8 diffs)
• gui/FrameIO.java (modified) (11 diffs)
• gui/FrameKeyboardActions.java (modified) (3 diffs)

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;
                 }
 

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

@@ -38 +38 @@
 
         public static Browser _theBrowser;
-        
+
         /**
          * Constructs a new Browser object, then launches it
@@ -51 +51 @@
                 // FrameGraphics.ForceRepaint();
         }
-        
+
         public void setSizes(Dimension size) {
                 setSize(size);
@@ -77 +77 @@
                 Frame profile = FrameIO.LoadProfile(UserSettings.Username);
                 if (profile == null) {
-                        try{
-                        profile = FrameIO.CreateNewProfile(UserSettings.Username);
-                        }catch(Exception e){
-                                //TODO fix this later
+                        try {
+                                profile = FrameIO.CreateNewProfile(UserSettings.Username);
+                        } catch (Exception e) {
+                                //TODO tell the user that there was a problem creating the profile frame and close nicely
+                                assert(false);
                         }
                 }
@@ -128 +129 @@
                 // Create the action handler for the
                 FrameMouseActions mouse = new FrameMouseActions();
-                
+
                 this.getContentPane().addMouseListener(mouse);
                 this.getContentPane().addMouseMotionListener(mouse);
@@ -156 +157 @@
                 super.paint(g);
                 FrameGraphics.Repaint();
-                //System.out.print('p');
+                // System.out.print('p');
         }
 
@@ -166 +167 @@
                 setupGraphics();
                 repaint();
-                //System.out.println("Resize");
+                // System.out.println("Resize");
         }
 
@@ -205 +206 @@
 
         public void windowActivated(WindowEvent e) {
-                //System.out.println("Activated");
+                // System.out.println("Activated");
         }
 
@@ -217 +218 @@
          */
         public void windowStateChanged(WindowEvent e) {
-                //FrameGraphics.Repaint();
-                //System.out.println('C');
+                // FrameGraphics.Repaint();
+                // System.out.println('C');
         }
 

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

@@ -11 +11 @@
 import java.util.HashMap;
 
+import org.expeditee.agents.ExistingFramesetException;
 import org.expeditee.io.Conversion;
 import org.expeditee.io.ExpReader;
@@ -418 +419 @@
                 int lastNumber = FrameIO.getLastNumber(DELETED_FRAMES);
                 String framePath;
-                try{
+                try {
                         // create the new frameset
                         Frame one = FrameIO.CreateFrameset(DELETED_FRAMES, toDelete.path);
                         framePath = one.path;
                         lastNumber = 0;
-                } catch(Exception e){
+                } catch (Exception e) {
                         Frame zero = FrameIO.LoadFrame(DELETED_FRAMES + "0");
                         framePath = zero.path;
@@ -565 +566 @@
          * @return The first Frame of the new Frameset (Frame.1)
          */
-        public static Frame CreateFrameset(String frameset, String path) throws Exception{
+        public static Frame CreateFrameset(String frameset, String path)
+                        throws Exception {
                 return CreateFrameset(frameset, path, false);
         }
@@ -585 +587 @@
 
                 // String must begin with a letter and end with a digit
-                if (!(Character.isLetter(frameName.charAt(0)) || Character.isDigit(frameName.charAt(0)))
+                if (!(Character.isLetter(frameName.charAt(0)) || Character
+                                .isDigit(frameName.charAt(0)))
                                 || !Character.isDigit(frameName.charAt(frameName.length() - 1)))
                         return false;
@@ -713 +716 @@
         }
 
-        public static Frame CreateNewProfile(String username) throws Exception{
+        public static Frame CreateNewProfile(String username) throws Exception {
                 Frame profile = CreateFrameset(username, PROFILE_PATH);
                 FrameUtils.CreateDefaultProfile(profile);
@@ -771 +774 @@
         }
 
-        private static String NameValidation(String toValidate) throws Exception{
+        private static String NameValidation(String toValidate) throws Exception {
                 String result = "";
 
@@ -780 +783 @@
                         // check for illegal characters
                         if (ILLEGAL_CHARS.contains("" + cur)) {
-                                throw new Exception("Frameset name contains illegal character '"
-                                                                + cur + "' at position " + (i + 1));
+                                throw new Exception(
+                                                "Frameset name contains illegal character '" + cur
+                                                                + "' at position " + (i + 1));
                         }
 
@@ -796 +800 @@
                                 if (result.length() >= MAX_NAME_LENGTH) {
                                         throw new Exception("Frameset name is too long (Max "
-                                                                        + MAX_NAME_LENGTH + " characters)");
+                                                        + MAX_NAME_LENGTH + " characters)");
                                 }
                         }
@@ -835 +839 @@
          *         frame)
          */
-        public static Frame CreateNewFrameset(String name) throws Exception{
+        public static Frame CreateNewFrameset(String name) throws Exception {
                 String path = DisplayIO.getCurrentFrame().path;
 
@@ -887 +891 @@
 
         public static Frame CreateFrameset(String frameset, String path,
-                        boolean recreate) throws Exception{
+                        boolean recreate) throws Exception {
                 String conversion = frameset + " --> ";
 
@@ -897 +901 @@
 
                 if (!recreate && FrameIO.DoesFramesetExist(frameset)) {
-                        throw new Exception("A frameset called " + frameset + " already exists.");
+                        throw new ExistingFramesetException(frameset);
                 }
 

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

@@ -8 +8 @@
 import java.awt.event.KeyEvent;
 import java.awt.event.KeyListener;
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.LinkedList;
@@ -16 +15 @@
 import org.expeditee.actions.Actions;
 import org.expeditee.actions.Simple;
+import org.expeditee.agents.ExistingFramesetException;
 import org.expeditee.io.Logger;
 import org.expeditee.items.Dot;
@@ -1330 +1330 @@
                         linkTo.moveMouseToDefaultLocation();
                         // this needs to be done if the user doesnt move the mouse before
-                        // doing
-                        // tdfc while the cursor is set to the text cursor
+                        // doing Tdfc while the cursor is set to the text cursor
                         DisplayIO.setCursor(Item.DEFAULT_CURSOR);
-                } catch (IOException ioe) {
-                        FrameGraphics
-                                        .ErrorMessage("An error occured when trying to create the new frameset");
+                } catch (ExistingFramesetException efe) {
+                        FrameGraphics.ErrorMessage(efe.getMessage());
                 } catch (Exception e) {
+                        FrameGraphics.ErrorMessage("Frameset could not be created: "
+                                        + e.getMessage());
                 }
         }