Changeset 13

Timestamp:

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

Author:

ra33

Message:

Changes

Location:

trunk/src/org/expeditee

Files:

• actions/NavigationActions.java (modified) (1 diff)
• gui/DisplayIO.java (modified) (1 diff)
• gui/Frame.java (modified) (1 diff)
• gui/FrameGraphics.java (modified) (2 diffs)
• gui/FrameIO.java (modified) (3 diffs)
• gui/FrameKeyboardActions.java (modified) (6 diffs)
• items/Text.java (modified) (5 diffs)

trunk/src/org/expeditee/actions/NavigationActions.java

@@ -124 +124 @@
                 Frame last = FrameIO.LoadLast();
                 FrameUtils.DisplayFrame(last, true);
+        }
+        
+        public static void ZeroFrame() {
+                Frame zeroFrame = FrameIO.LoadZero();
+                FrameUtils.DisplayFrame(zeroFrame, true);
         }
         

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

@@ -59 +59 @@
          * The title to display in the Title bar.
          */
-        public static final String TITLE = "Exp01May2008A";
+        public static final String TITLE = "Exp01May2008B";
 
         private DisplayIO() {

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

@@ -476 +476 @@
                 }
                 _frameName = new Text(id);
+                _frameName.setParent(this);
                 _frameName.setMaxSize(FrameGraphics.getMaxFrameSize());
                 _frameName.setText(getFramesetNameAdjusted() + _number);

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

@@ -567 +567 @@
 
         public static void DisplayMessageAlways(String message) {
-                _lastMessage = null;
+                //_lastMessage = null;
                 displayMessage(message, null, Color.BLACK);
                 Misc.Beep();
@@ -577 +577 @@
         }
 
-        private static String _lastMessage = null;
+        //private static String _lastMessage = null;
 
         private static void displayMessage(String message, String link, Color color) {
                 // add timestamp to message
-                if (message.equals(_lastMessage))
-                        return;
-                _lastMessage = message;
+                //if (message.equals(_lastMessage))
+                //      return;
+                //_lastMessage = message;
 
                 // message += _formatter.format(Calendar.getInstance().getTime());

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) {

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

@@ -250 +250 @@
 
                 if (ip == null) {
-                        Frame next = (direction == Text.RIGHT) ? FrameIO.LoadNext()
-                                        : FrameIO.LoadPrevious();
-                        FrameUtils.DisplayFrame(next, true);
+                        navigateFrame(direction);
                         return;
                 }
@@ -261 +259 @@
                         // positions over the the frame name navigation occurs
                         if (on.isFrameName()) {
-                                Frame next = (direction == Text.RIGHT) ? FrameIO.LoadNext()
-                                                : FrameIO.LoadPrevious();
-                                FrameUtils.DisplayFrame(next, true);
+                                navigateFrame(direction);
                                 return;
                         } else {
@@ -275 +271 @@
         }
 
+        private void navigateFrame(int direction) {
+                Frame next = null;
+                switch(direction){
+                case Text.RIGHT:
+                case Text.PAGE_UP:
+                        next = FrameIO.LoadNext();
+                        break;
+                case Text.LEFT:
+                case Text.PAGE_DOWN:
+                        next = FrameIO.LoadPrevious();
+                        break;
+                case Text.HOME:
+                        next = FrameIO.LoadZero();
+                        break;
+                case Text.END:
+                        next = FrameIO.LoadLast();
+                        break;
+                }
+                FrameUtils.DisplayFrame(next, true);
+        }
+
         /**
          * Receives and processes any Function, Control, and Escape key presses
@@ -314 +331 @@
                 case KeyEvent.VK_RIGHT:
                         move(Text.RIGHT);
+                        break;
+                case KeyEvent.VK_PAGE_DOWN:
+                        navigateFrame(Text.PAGE_DOWN);
+                        break;
+                case KeyEvent.VK_PAGE_UP:
+                        navigateFrame(Text.PAGE_UP);
                         break;
                 case KeyEvent.VK_UP:
@@ -784 +807 @@
                         if (Frame.itemAttachedToCursor()) {
                                 DisplayIO.setCursorPosition(dummyItem.getX(), dummyItem.getY());
-                                Frame.getItemAttachedToCursor().setPosition(dummyItem.getX(),
-                                                dummyItem.getY());
+                                Item firstItem = Frame.getItemAttachedToCursor();
+                                int deltaX = firstItem.getX() - dummyItem.getX();
+                                int deltaY = firstItem.getY() - dummyItem.getY();
+                                
+                                for(Item i: Frame.FreeItems) {
+                                        i.setPosition(i.getX()-deltaX,
+                                                i.getY() - deltaY);
+                                }
                         } else {
                                 DisplayIO
@@ -1330 +1359 @@
                         // doing Tdfc while the cursor is set to the text cursor
                         DisplayIO.setCursor(Item.DEFAULT_CURSOR);
-                } catch (ExistingFramesetException efe) {
-                        FrameGraphics.ErrorMessage(efe.getMessage());
                 } catch (Exception e) {
-                        FrameGraphics.ErrorMessage("Frameset could not be created: "
-                                        + e.getMessage());
+                        FrameGraphics.ErrorMessage(e.getMessage());
                 }
         }

trunk/src/org/expeditee/items/Text.java

@@ -68 +68 @@
         public static final int END = 5;
 
+        public static final int PAGE_DOWN = 6;
+
+        public static final int PAGE_UP = 7;
+
         private int _maxWidth = -1;
 
@@ -560 +564 @@
                                                 x,
                                                 (getX() - Item.MARGIN_RIGHT - (2 * getGravity()) + getBoundsWidth()));
-                return new Point(x, getY() + y
-                                + (int) caret[1]);
+                return new Point(x, getY() + y + (int) caret[1]);
         }
 
@@ -1401 +1404 @@
                                 return;
 
-                        // Remove 'a: ' from the begining if it is there
-                        if (_text.length() > 3 && _text.charAt(0) == 'a'
-                                        && _text.charAt(1) == ':') {
-                                _text.delete(0, 2);
-                                while (_text.charAt(0) == ' ')
-                                        _text.delete(0, 1);
-                        }
+                        /*
+                         * // Remove 'a: ' from the begining if it is there if
+                         * (_text.length() > 3 && _text.charAt(0) == 'a' && _text.charAt(1) ==
+                         * ':') { _text.delete(0, 2); while (_text.charAt(0) == ' ')
+                         * _text.delete(0, 1); }
+                         */
                         _text.insert(0, "@");
 
@@ -1558 +1560 @@
                                 Rectangle textOutline = text.getLogicalHighlightShape(0,
                                                 text.getCharacterCount()).getBounds();
-                                
+
                                 // check if the cursor is within the top, bottom and within the
                                 // gravity of right
                                 if (y - textY > textOutline.y - NEAR_DISTANCE
-                                                && y - textY < textOutline.y + textOutline.height + NEAR_DISTANCE
+                                                && y - textY < textOutline.y + textOutline.height
+                                                                + NEAR_DISTANCE
                                                 && x - textX < textOutline.width + NEAR_DISTANCE)
                                         return true;
@@ -1570 +1573 @@
                 return false;
         }
-        
+
         @Override
         public void delete() {