Changeset 41

Timestamp:

05/14/08 12:34:46 (16 years ago)

Author:

ra33

Message:

Yellow highlighting for deleting text ranges wasnt working.

Fixed a couple things for the left and right mouse button shortcut for formatting

Location:

trunk/src/org/expeditee

Files:

• actions/Actions.java (modified) (4 diffs)
• gui/FrameMouseActions.java (modified) (8 diffs)
• gui/MouseEventRouter.java (modified) (2 diffs)
• items/Text.java (modified) (1 diff)

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

@@ -244 +244 @@
          */
         public static void PerformAction(Frame source, Item launcher, String command) {
-                FrameIO.SaveFrame(source, false);
+                if (!command.equalsIgnoreCase("Restore"))
+                        FrameIO.SaveFrame(source, false);
                 
                 // separate method name and parameter names
@@ -426 +427 @@
                         // while (_Agent.isRunning())
                         // ;
-
                         // FrameGraphics.DisplayMessage("Agent Stopped.");
                 }
@@ -436 +436 @@
                 }
         }
-
-        /**
-         * Takes a list of Methods and finds one that accepts the given list of
-         * objects as parameters
-         * 
-         * @param possibleMethods
-         *            The list of Methods to search through
-         * @param parameters
-         *            The array of parameters that the Method should accept
-         * @return The Method found if one was found, otherwise null
-         */
-        /*
-         * private static Method FindCompatibleMethods(List<Method>
-         * possibleMethods, Object[] parameters){ Method toRun = null;
-         * 
-         * for(Method m : possibleMethods){ //the number of parameters must be the
-         * same if(parameters.length == m.getParameterTypes().length){ //if no
-         * methods are required, there is nothing else to check if(parameters.length ==
-         * 0) toRun = m; else //check that the list of parameters are of the right
-         * types for(int i = 0; i < parameters.length; i++){
-         * if(m.getParameterTypes()[i].isInstance(parameters[i])) toRun = m; else
-         * toRun = null; }
-         * 
-         * //if a method has been found already, there is no need to keep searching
-         * if(toRun != null) break; } }
-         * 
-         * return toRun; }
-         */
 
         /**
@@ -527 +499 @@
 
                 return objects;
-
-                // strip off the first parameter
-
-                /*
-                 * //the list of objects to return List<Object> returnParams = new
-                 * ArrayList<Object>(); if(launcher != null)
-                 * returnParams.add(launcher);
-                 * 
-                 * while(param != null){ /* //the parameter is a String
-                 * if(param.charAt(0) == '"') returnParams.add(param.substring(1,
-                 * param.length() - 1)); else{ //try to parse an int try{ int val =
-                 * Integer.parseInt(param); returnParams.add(val);
-                 * }catch(NumberFormatException nfe){ System.out.println("Type not found
-                 * for: " + param); } }
-                 * 
-                 * if(param.length() < values.length()) values =
-                 * values.substring(param.length() + 1); else values = "";
-                 */
-
-                // returnParams.add(KMSConversion.Convert(type, value))
-                // get the next value
-                /*
-                 * param = ParseValue(values); }
-                 * 
-                 * return returnParams.toArray();
-                 */
         }
 

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

@@ -13 +13 @@
 import java.util.List;
 
+import javax.swing.SwingUtilities;
 import javax.swing.Timer;
 
@@ -32 +33 @@
 public class FrameMouseActions implements MouseListener, MouseMotionListener,
                 MouseWheelListener {
+
+        private static int _lastMouseClickModifiers = 0;
 
         private FrameMouseActions() {
@@ -211 +214 @@
 
         public void ProccessMousePressedEvent(MouseEvent e, int modifiersEx) {
+                // System.out.println(modifiersEx);
 
                 _mouseDown += e.getButton();
@@ -231 +235 @@
                 }
 
+                // Mike says...
+                // For somereason the modifiers for e are different from modifiersEx
+                // The SwingUtilities.convertMouseEvent method changes the modifiers
                 _lastMouseClick = e;
+                _lastMouseClickModifiers = modifiersEx;
 
                 // Only start the timer when in free space when the user double clicks
@@ -352 +360 @@
                 setPulse(false);
 
-                if (Actions.isAgentRunning()) {
-                        Actions.stopAgent();
-                        return;
-                }
-
                 // if the last action was a delete, then ignore the next mouseup
                 if (_wasDouble) {
                         _wasDouble = false;
+                        return;
+                }
+
+                // This code must come after the _wasDouble code...
+                // Otherwise get Stopping Agent method after doing the left+right format
+                // shortcut
+                if (Actions.isAgentRunning()) {
+                        Actions.stopAgent();
                         return;
                 }
@@ -428 +439 @@
                 if (_isAttribute) {
                         if (clickedOn == null) {
-                                new Format().process(DisplayIO.getCurrentFrame());
+                                // First look for the @NoFormat tag
+                                Frame current = DisplayIO.getCurrentFrame();
+                                Actions.PerformAction(current, null, "Format");
+                                /*
+                                 * if (ItemUtils.ContainsTag(current.getItems(), "@NoFormat")) {
+                                 * FrameGraphics .DisplayMessage("Frame is protected by
+                                 * @NoFormat tag."); } else { new Format().process(current); }
+                                 */
                         } else {
                                 extractAttributes(clickedOn);
@@ -1879 +1897 @@
                         }
                         Frame.FreeItems.add(i);
-                        
+
                         if (i instanceof Dot)
                                 ((Dot) i).setFloating(true);
@@ -2108 +2126 @@
                 if (_lastMouseClick == null)
                         return false;
-                return isDelete(_lastMouseClick.getModifiersEx());
+                return isDelete(_lastMouseClickModifiers);
         }
 

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

@@ -110 +110 @@
                                                 .getCurrentFrame(), containerPoint.x, containerPoint.y) != null);
                         }
-
+                        
                         if (forwardToExpiditee) {
 
@@ -125 +125 @@
                                 MouseEvent expediteeEvent = SwingUtilities.convertMouseEvent(e
                                                 .getComponent(), e, _contentPane);
-
+                                
                                 switch (e.getID()) {
                                 case MouseEvent.MOUSE_MOVED:

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

@@ -1222 +1222 @@
                 int red = 160;
                 int blue = 160;
+                
                 if (FrameMouseActions.wasDeleteClicked()) {
                         green = 235;