Changeset 185

Timestamp:

08/04/08 12:42:11 (16 years ago)

Author:

ra33

Message:

 

Location:

trunk/src/org/expeditee

Files:

• actions/Actions.java (modified) (1 diff)
• actions/Simple.java (modified) (6 diffs)
• agents/Format.java (modified) (1 diff)
• agents/Sort.java (modified) (4 diffs)
• gui/Frame.java (modified) (1 diff)
• gui/FrameMouseActions.java (modified) (1 diff)
• items/Item.java (modified) (1 diff)
• items/Text.java (modified) (2 diffs)

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

@@ -470 +470 @@
                                 }
                         }
-
                 } catch (ClassNotFoundException cnf) {
                         _Agent = null;

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

@@ -325 +325 @@
         }
 
-        private static void RunFrame(Text current, boolean acceptKeyboardInput,
+        private static void RunFrame(Frame frame, Text current, boolean acceptKeyboardInput,
                         boolean step, int pause, Color color) {
                 try {
@@ -336 +336 @@
                         _step = step;
                         _consumeKeyboardInput = acceptKeyboardInput;
-                        FrameIO.SaveFrame(DisplayIO.getCurrentFrame(), true);
+                        FrameIO.SaveFrame(frame, true);
 
                         // an item without a link signals to run the current frame
@@ -342 +342 @@
                                 // Make a copy but hide it
                                 current = current.copy();
-                                current.setLink(DisplayIO.getCurrentFrame().getName());
+                                current.setLink(frame.getName());
                         }
 
@@ -354 +354 @@
         }
 
-        public static void RunFrame(Text current, boolean acceptKeyboardInput) {
-                RunFrame(current, acceptKeyboardInput, false, 0, null);
-        }
-
-        public static void RunFrame(Text current) {
-                RunFrame(current, false);
+        public static void RunFrame(Frame frame, Text current, boolean acceptKeyboardInput) {
+                RunFrame(frame, current, acceptKeyboardInput, false, 0, null);
+        }
+
+        public static void RunFrame(Frame frame, Text current) {
+                RunFrame(frame, current, false);
         }
 
@@ -368 +368 @@
          * @param pause
          */
-        public static void DebugFrame(Text current, float pause, Color color) {
+        public static void DebugFrame(Frame frame, Text current, float pause, Color color) {
                 if (isProgramRunning()) {
                         stop();
                 }
-                RunFrame(current, false, true, Math.round(pause * 1000), color);
+                RunFrame(frame, current, false, true, Math.round(pause * 1000), color);
         }
 
@@ -382 +382 @@
          *            the time to pause between
          */
-        public static void DebugFrame(Text current, float pause) {
-                DebugFrame(current, pause, null);
-        }
-
-        public static void DebugFrame(Text current) {
-                DebugFrame(current, -1.0F, null);
+        public static void DebugFrame(Frame frame, Text current, float pause) {
+                DebugFrame(frame, current, pause, null);
+        }
+
+        public static void DebugFrame(Frame frame, Text current) {
+                DebugFrame(frame, current, -1.0F, null);
         }
 

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

@@ -44 +44 @@
         @Override
         public Frame process(Frame start) {
+                //TODO What will happen if user runs the SIMPLE form of this...
+                //Does format box need to be disabled?!?!
                 //Check the position of the cursor and only format stuff inside the same box as the cursor
                 Collection<Text> itemsToFormat = FrameUtils.getCurrentTextItems();
                 if(itemsToFormat.size() < 1){
-                        itemsToFormat = start.getBodyTextItems(true);
+                        itemsToFormat = start.getBodyTextItems(false);
                 }
                 

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

@@ -3 +3 @@
 import java.awt.Point;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
@@ -8 +9 @@
 import org.expeditee.gui.Frame;
 import org.expeditee.gui.FrameGraphics;
-import org.expeditee.items.Item;
+import org.expeditee.gui.FrameUtils;
 import org.expeditee.items.Text;
 
@@ -18 +19 @@
          */
         public Frame process(Frame start) {
+                // Check the position of the cursor and only format stuff inside the
+                // same box as the cursor
+                Collection<Text> itemsToSort = FrameUtils.getCurrentTextItems();
+                if (itemsToSort.size() < 1) {
+                        itemsToSort = start.getBodyTextItems(false);
+                }
+
                 ArrayList<Text> textItems = new ArrayList<Text>();
-
-                for (Item i : start.getItems())
-                        if (i instanceof Text)
-                                // do not sort title and framename
-                                if (i.getID() > -1 && i != start.getTitleItem()
-                                                && !i.isAnnotation()) {
-                                        textItems.add((Text) i);
-                                }
+                textItems.addAll(itemsToSort);
 
                 // copy current positions of items
@@ -37 +38 @@
                 Collections.sort(textItems, new Comparator<Text>() {
                         public int compare(Text a, Text b) {
-                                return String.CASE_INSENSITIVE_ORDER.compare(a.getText(),
-                                                b.getText());
+                                return String.CASE_INSENSITIVE_ORDER.compare(a.getText(), b
+                                                .getText());
                         }
                 });

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

@@ -1553 +1553 @@
                                 if (t.getText().toLowerCase().startsWith("@start")
                                                 || t.getText().toLowerCase().equals("@start:")) {
-                                        t.stripFirstWord();
+                                        //Used to allow users the option of putting an initial bullet after the @start
+                                        //This was replaced by width
+                                        //t.stripFirstWord();
+                                        t.setText("");
 
                                         if (t.getText().equals(""))

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

@@ -506 +506 @@
 
                 // if the user is ranging-out text
-                if (lastRanged != null) {
-                        if (e.getButton() == MouseEvent.BUTTON1) {
-                                return;
-                        }
+                if (lastRanged != null && e.getButton() != MouseEvent.BUTTON1) {
 
                         Text ranged = lastRanged.copy();

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

@@ -1029 +1029 @@
                 // action
                 if (sourceFrame == null) {
-                        sourceFrame = getParentOrCurrentFrame();
+                        //For actions like format they rely on this being set to the current frame incase the item being activated is on an overlay
+                        sourceFrame = DisplayIO.getCurrentFrame();
                 }
 

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

@@ -176 +176 @@
         @Override
         public void setWidth(int width) {
+                invalidateAll();
                 // 0 is the default
                 if (width == 0)
@@ -182 +183 @@
                 _maxWidth = width;
                 rebuild(true);
+                invalidateAll();
         }