Changeset 1144 for trunk/src/org/expeditee/gio/gesture

Timestamp:

09/18/18 12:02:44 (6 years ago)

Author:

bln4

Message:

Used Eclipse refactoring to encapsulate Point.X and Point.Y

Location:

trunk/src/org/expeditee/gio/gesture

Files:

• ExpediteeKBMGestureTranslator.java (modified) (1 diff)
• StandardGestureActions.java (modified) (14 diffs)

trunk/src/org/expeditee/gio/gesture/ExpediteeKBMGestureTranslator.java

@@ -406 +406 @@
                                 // Calculate the new cursor position
                                 Point cursorPosition = EcosystemManager.getInputManager().getCursorPosition();
-                                if (kbmEvent.getKeyDown() == Key.UP_ARROW) cursorPosition.y -= distance;
-                                if (kbmEvent.getKeyDown() == Key.DOWN_ARROW) cursorPosition.y += distance;
-                                if (kbmEvent.getKeyDown() == Key.LEFT_ARROW) cursorPosition.x -= distance;
-                                if (kbmEvent.getKeyDown() == Key.RIGHT_ARROW) cursorPosition.x += distance;
+                                if (kbmEvent.getKeyDown() == Key.UP_ARROW) cursorPosition.setY(cursorPosition.getY() - distance);
+                                if (kbmEvent.getKeyDown() == Key.DOWN_ARROW) cursorPosition.setY(cursorPosition.getY() + distance);
+                                if (kbmEvent.getKeyDown() == Key.LEFT_ARROW) cursorPosition.setX(cursorPosition.getX() - distance);
+                                if (kbmEvent.getKeyDown() == Key.RIGHT_ARROW) cursorPosition.setX(cursorPosition.getX() + distance);
                                 
                                 // Create the MOVE_CURSOR gesture and return it

trunk/src/org/expeditee/gio/gesture/StandardGestureActions.java

@@ -607 +607 @@
                         public void exec(Gesture gesture) {
                                 PanGestureData data = (PanGestureData) gesture.getData();
-                                Misc.pan(DisplayController.getCurrentFrame(), data.getPanDelta().x, data.getPanDelta().y);
+                                Misc.pan(DisplayController.getCurrentFrame(), data.getPanDelta().getX(), data.getPanDelta().getY());
                         }
                 });
@@ -658 +658 @@
                                                         int width = cropped.getWidth();
                                                         int height = cropped.getHeight();
-                                                        if(cropped.getSource().getX() + width < data.getPosition().x) {
-                                                                cropped.getSource().setX(data.getPosition().x - width);
+                                                        if(cropped.getSource().getX() + width < data.getPosition().getX()) {
+                                                                cropped.getSource().setX(data.getPosition().getX() - width);
                                                         }
-                                                        if(cropped.getSource().getY() + height < data.getPosition().y) {
-                                                                cropped.getSource().setY(data.getPosition().y - height);
+                                                        if(cropped.getSource().getY() + height < data.getPosition().getY()) {
+                                                                cropped.getSource().setY(data.getPosition().getY() - height);
                                                         }
                                                         pickup(cropped);
@@ -1055 +1055 @@
                                 // class returns 0 for getX
                                 if (!(i instanceof Line) && !(i instanceof XRayable)) {
-                                        _offX = DisplayController.getMouseX() - i.getX() + i.getOffset().x;
-                                        _offY = DisplayController.getMouseY() - i.getY() + i.getOffset().y;
+                                        _offX = DisplayController.getMouseX() - i.getX() + i.getOffset().getX();
+                                        _offY = DisplayController.getMouseY() - i.getY() + i.getOffset().getY();
 
                                         // make the offset item the first item in the list (so
@@ -1071 +1071 @@
                 } else if (toGrab.size() == 1) {
                         Item soleItem = toGrab.iterator().next();
-                        _offX = DisplayController.getMouseX() - soleItem.getX() + soleItem.getOffset().x;
-                        _offY = DisplayController.getMouseY() - soleItem.getY() + soleItem.getOffset().y;
+                        _offX = DisplayController.getMouseX() - soleItem.getX() + soleItem.getOffset().getX();
+                        _offY = DisplayController.getMouseY() - soleItem.getY() + soleItem.getOffset().getY();
                         // Now call move so that if we are on a message in the message box
                         // It doesn't appear up the top of the screen!!
@@ -1230 +1230 @@
                 
                 // check if the user hit enter and the cursor is now on another text item
-                if (oldY < newMouse.y) {
+                if (oldY < newMouse.getY()) {
                         AxisAlignedBoxBounds rect = text.getBoundingBox();
 
@@ -1245 +1245 @@
                 }
 
-                DisplayController.setCursorPosition(newMouse.x, newMouse.y, false);
+                DisplayController.setCursorPosition(newMouse.getX(), newMouse.getY(), false);
                 return text;
         }
@@ -1263 +1263 @@
                 Item firstDot = toMove.iterator().next();
                 
-                int deltax = (to.x - (cursor ? 0 : _offX)) - firstDot.getX();
-                int deltay = (to.y - (cursor ? 0 : _offY)) - firstDot.getY();
+                int deltax = (to.getX() - (cursor ? 0 : _offX)) - firstDot.getX();
+                int deltay = (to.getY() - (cursor ? 0 : _offY)) - firstDot.getY();
                 
                 // Cache the position of all items before moving any as constraints
@@ -1275 +1275 @@
                 for (Item move : toMove) {
                         Point pos = preMovePositions.get(move);
-                        move.setPosition(pos.x + deltax, pos.y + deltay);
+                        move.setPosition(pos.getX() + deltax, pos.getY() + deltay);
 
                         if (!cursor && move instanceof Text) {
@@ -1365 +1365 @@
         public static void resetOffset() {
                 if (FreeItems.hasItemsAttachedToCursor()) {
-                        _offX = DisplayController.getMouseX() - FreeItems.getInstance().get(0).getX() + FreeItems.getInstance().get(0).getOffset().x;
-                        _offY = DisplayController.getMouseY() - FreeItems.getInstance().get(0).getY() + FreeItems.getInstance().get(0).getOffset().y;
+                        _offX = DisplayController.getMouseX() - FreeItems.getInstance().get(0).getX() + FreeItems.getInstance().get(0).getOffset().getX();
+                        _offY = DisplayController.getMouseY() - FreeItems.getInstance().get(0).getY() + FreeItems.getInstance().get(0).getOffset().getY();
                 }
         }
@@ -2016 +2016 @@
                 if (zoom_active) {
                         
-                        zoomFrame(DisplayController.getCurrentFrame(), scaleFactor, centreOfZoom.x, centreOfZoom.y);
+                        zoomFrame(DisplayController.getCurrentFrame(), scaleFactor, centreOfZoom.getX(), centreOfZoom.getY());
                         DisplayController.getCurrentFrame().refreshSize();
                         Refresh();
@@ -2233 +2233 @@
                 Point oldMousePosition = DisplayController.getMousePosition();
 
-                if (oldMousePosition.x == x && oldMousePosition.y == y) return;
+                if (oldMousePosition.getX() == x && oldMousePosition.getY() == y) return;
 
                 DisplayController.setCursorPosition(x, y);
@@ -2986 +2986 @@
 
                                 // update the offset since the text has changed
-                                _offX = DisplayController.getMouseX() - anchored.getX() + anchored.getOffset().x;
-                                _offY = DisplayController.getMouseY() - anchored.getY() + anchored.getOffset().y;
+                                _offX = DisplayController.getMouseX() - anchored.getX() + anchored.getOffset().getX();
+                                _offY = DisplayController.getMouseY() - anchored.getY() + anchored.getOffset().getY();
                         } else {
                                 // if shift is pressed delete the entire shape attached to the dot
@@ -4230 +4230 @@
                 if (clicked == null) {
                         // Check if the user is nearby another item...
-                        int mouseX = position.x;
-                        int mouseY = position.y;
+                        int mouseX = position.getX();
+                        int mouseY = position.getY();
                         // System.out.println(mouseX + "," + mouseY);
                         for (Item i : DisplayController.getCurrentFrame().getItems()) {
@@ -4303 +4303 @@
                 
                 if (clicked instanceof Picture) {
-                        int mouseX = position.x;
-                        int mouseY = position.y;
+                        int mouseX = position.getX();
+                        int mouseY = position.getY();
                         Picture clickedOnPicture = (Picture)clicked;
                         Frame current_frame = DisplayController.getCurrentFrame();