Changeset 949

Timestamp:

04/07/15 12:31:01 (9 years ago)

Author:

bln4

Message:

 

Location:

trunk

Files:

• META-INF/MANIFEST.MF (modified) (1 diff)
• src/org/expeditee/gui/FrameKeyboardActions.java (modified) (1 diff)
• src/org/expeditee/gui/FrameMouseActions.java (modified) (1 diff)
• src/org/expeditee/gui/indirect/keyboard/KeyboardAction.java (modified) (1 diff)
• src/org/expeditee/gui/indirect/keyboard/KeyboardInfo.java (added)
• src/org/expeditee/gui/indirect/mouse/MouseAction.java (modified) (2 diffs)
• src/org/expeditee/gui/indirect/mouse/MouseInfo.java (added)

trunk/META-INF/MANIFEST.MF

@@ -175 +175 @@
  org.expeditee.greenstone,
  org.expeditee.gui,
+ org.expeditee.gui.indirect.keyboard,
  org.expeditee.gui.indirect.mouse,
  org.expeditee.importer,

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

@@ -39 +39 @@
 import org.expeditee.gui.indirect.keyboard.IndirectKeyboardActions;
 import org.expeditee.gui.indirect.keyboard.KeyboardAction;
-import org.expeditee.gui.indirect.keyboard.KeyboardAction.KeyboardInfo;
+import org.expeditee.gui.indirect.keyboard.KeyboardInfo;
 import org.expeditee.io.ItemSelection;
 import org.expeditee.items.Circle;

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

@@ -52 +52 @@
 import org.expeditee.gui.indirect.mouse.IndirectMouseActions;
 import org.expeditee.gui.indirect.mouse.MouseAction;
-import org.expeditee.gui.indirect.mouse.MouseAction.MouseInfo;
+import org.expeditee.gui.indirect.mouse.MouseInfo;
 import org.expeditee.io.ExpClipReader;
 import org.expeditee.io.ItemSelection;

trunk/src/org/expeditee/gui/indirect/keyboard/KeyboardAction.java

@@ -1 +1 @@
 package org.expeditee.gui.indirect.keyboard;
 
-import java.util.Collection;
-
-import org.expeditee.gui.FunctionKey;
-import org.expeditee.items.Item;
 import org.expeditee.items.Text;
 
 public interface KeyboardAction {
         public Text exec(final KeyboardInfo info, char c);
-
-        public class KeyboardInfo {
-                public FunctionKey key;
-                public int repeat;
-                public boolean isShiftDown;
-                public boolean isControlDown;
-                public Collection<Item> enclosed;
-                public Item firstConnected;
-                public Collection<Item> connected;
-                public Collection<Item> lineEnds;
-
-                public KeyboardInfo(final FunctionKey key, final int repeat,
-                                final boolean isShiftDown, final boolean isControlDown, final Collection<Item> enclosed, 
-                                final Item firstConnected, Collection<Item> connected, Collection<Item> lineEnds) {
-                        this.key = key;
-                        this.repeat = repeat;
-                        this.isShiftDown = isShiftDown;
-                        this.isControlDown = isControlDown;
-                        this.enclosed = enclosed;
-                        this.firstConnected = firstConnected;
-                        this.connected = connected;
-                        this.lineEnds = lineEnds;
-                }
-
-        }
 }

trunk/src/org/expeditee/gui/indirect/mouse/MouseAction.java

@@ -1 +1 @@
 package org.expeditee.gui.indirect.mouse;
 
-import java.util.Collection;
 import java.util.List;
 
@@ -9 +8 @@
         
         public List<Item> exec(MouseInfo info);
-        
-        
-        public class MouseInfo {
-                public Item clicked;
-                public Collection<Item> clickedIn;
-                public boolean isShiftDown;
-                public boolean isControlDown;
-
-                public MouseInfo(final Item clicked, final Collection<Item> clickedIn, final boolean isShiftDown, final boolean isControldown) {
-                        this.clicked = clicked;
-                        this.clickedIn = clickedIn;
-                        this.isShiftDown = isShiftDown;
-                        this.isControlDown = isControldown;                     
-                }
-        }
 }