Changeset 1144 for trunk/src/org/expeditee/gui

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/gui

Files:

• DisplayController.java (modified) (9 diffs)
• Frame.java (modified) (1 diff)
• FrameTransition.java (modified) (1 diff)
• FrameUtils.java (modified) (1 diff)
• PopupManager.java (modified) (1 diff)
• Vector.java (modified) (2 diffs)

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

@@ -235 +235 @@
                 //System.err.println("setTextCursor DisplayController:: " + DisplayController.getFloatMouseX() + "," + DisplayController.getFloatMouseY());
                 //System.err.println("setTextCursor Ecosystem:: " + EcosystemManager.getInputManager().getCursorPosition());
-                Point newMouse = text.moveCursor(cursorMovement, DisplayController.getFloatMouseX(), EcosystemManager.getInputManager().getCursorPosition().y, isShiftDown, isCtrlDown);
+                Point newMouse = text.moveCursor(cursorMovement, DisplayController.getFloatMouseX(), EcosystemManager.getInputManager().getCursorPosition().getY(), isShiftDown, isCtrlDown);
                 //System.err.println("setTextCursor New Cursor:: " + newMouse);
                                                 
                 if(             isCtrlDown ||
-                                (DisplayController.getFloatMouseX() <= newMouse.x && newMouse.x <= DisplayController.getFloatMouseX() + 1) ||
-                                (DisplayController.getFloatMouseX() > newMouse.x && cursorMovement == Text.RIGHT))
+                                (DisplayController.getFloatMouseX() <= newMouse.getX() && newMouse.getX() <= DisplayController.getFloatMouseX() + 1) ||
+                                (DisplayController.getFloatMouseX() > newMouse.getX() && cursorMovement == Text.RIGHT))
                 {
                         if(cursorMovement == Text.RIGHT && !MagneticConstraints.getInstance().rightBorderHit(text)) {
@@ -249 +249 @@
                                 }
                         }
-                        newMouse.x = (int) DisplayController.getFloatMouseX();
-                        newMouse.y = (int) DisplayController.getFloatMouseY();
+                        newMouse.setX((int) DisplayController.getFloatMouseX());
+                        newMouse.setY((int) DisplayController.getFloatMouseY());
                 } else if(cursorMovement == Text.UP && MagneticConstraints.getInstance().topBorderHit(text)) {
-                        newMouse.x = (int) DisplayController.getFloatMouseX();
-                        newMouse.y = (int) DisplayController.getFloatMouseY();
+                        newMouse.setX((int) DisplayController.getFloatMouseX());
+                        newMouse.setY((int) DisplayController.getFloatMouseY());
                 } else if(cursorMovement == Text.DOWN && MagneticConstraints.getInstance().bottomBorderHit(text)) {
-                        newMouse.x = (int) DisplayController.getFloatMouseX();
-                        newMouse.y = (int) DisplayController.getFloatMouseY();
+                        newMouse.setX((int) DisplayController.getFloatMouseX());
+                        newMouse.setY((int) DisplayController.getFloatMouseY());
                 }
 
@@ -384 +384 @@
                 if (FreeItems.hasItemsAttachedToCursor()) {
                         Point mousePos = EcosystemManager.getInputManager().getCursorPosition();
-                        float deltax = x - mousePos.x;
-                        float deltay = y - mousePos.y;
+                        float deltax = x - mousePos.getX();
+                        float deltay = y - mousePos.getY();
                         List<Item> toMove = FreeItems.getInstance();
                         for (Item move : toMove) {
@@ -409 +409 @@
         public static void setCursorPosition(Point pos)
         {
-                setCursorPosition(pos.x, pos.y);
+                setCursorPosition(pos.getX(), pos.getY());
         }
 
         public static void setCursorPosition(Point pos, boolean forceArrow)
         {
-                setCursorPosition(pos.x, pos.y, forceArrow);
+                setCursorPosition(pos.getX(), pos.getY(), forceArrow);
         }
 
@@ -683 +683 @@
                 // we are on the right side.
                 if(isTwinFramesOn()) {
-                        int mouseX = EcosystemManager.getInputManager().getCursorPosition().x;
+                        int mouseX = EcosystemManager.getInputManager().getCursorPosition().getX();
                         if(mouseX >= getTwinFramesSeparatorX() && sideHasFrame(RIGHT)) {
                                 return RIGHT;
@@ -794 +794 @@
         public static int getMouseX()
         {
-                return getMousePosition().x;
+                return getMousePosition().getX();
         }
 
@@ -809 +809 @@
                 
                 if (isTwinFramesOn() && getRightFramePaintArea().contains(mousePos)) {
-                        mousePos.x -= getRightFramePaintArea().getMinX();
+                        mousePos.setX(mousePos.getX() - getRightFramePaintArea().getMinX());
                 }
 
@@ -834 +834 @@
         public static int getMouseY()
         {
-                return getMousePosition().y;
+                return getMousePosition().getY();
         }
         
@@ -1308 +1308 @@
                 
                 g.popDrawingSurface();
+                //System.err.println("DisplayController refresh.  Point.ORIGIN=" + Point.ORIGIN);
+                //System.err.println("DisplayController refresh.  Graphic=" + g);
                 g.drawImage(_refreshBuffer, Point.ORIGIN);
                 return true;

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

@@ -1934 +1934 @@
                         if (isNormalTextItem(it)) itemsFound++;
                         if (itemsFound > index) {
-                                DisplayController.setCursorPosition(((Text) it).getParagraphEndPosition().x, it.getY());
+                                DisplayController.setCursorPosition(((Text) it).getParagraphEndPosition().getX(), it.getY());
                                 DisplayController.resetCursorOffset();
                                 DisplayController.requestRefresh(true);

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

@@ -244 +244 @@
                 Point shadowTopLeft = drawTopLeft.clone().add(0, area.getHeight());
                 Dimension shadowSize = new Dimension(area.getWidth(), SHADOW_HEIGHT);
-                GradientFill shadowFill = new GradientFill(SHADOW_COLOUR, new Point(0, shadowTopLeft.y), Colour.TRANSPARENT, new Point(0, shadowTopLeft.y + SHADOW_HEIGHT));
+                GradientFill shadowFill = new GradientFill(SHADOW_COLOUR, new Point(0, shadowTopLeft.getY()), Colour.TRANSPARENT, new Point(0, shadowTopLeft.getY() + SHADOW_HEIGHT));
                 
                 EcosystemManager.getGraphicsManager().drawRectangle(drawTopLeft, area.getSize(), 0.0, new Fill(Item.DEFAULT_BACKGROUND), null, null, null);

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

@@ -1423 +1423 @@
 
                                         for (int i = 0; i < p1.getPointCount(); i++) {
-                                                int diff = Math.abs(p1.getPoint(i).x - mouseX) + Math.abs(p1.getPoint(i).y - mouseY);
+                                                int diff = Math.abs(p1.getPoint(i).getX() - mouseX) + Math.abs(p1.getPoint(i).getY() - mouseY);
                                                 int diff2 = Integer.MAX_VALUE;
 
                                                 if (i < p2.getPointCount())
-                                                        diff2 = Math.abs(p2.getPoint(i).x - mouseX)  + Math.abs(p2.getPoint(i).y - mouseY);
+                                                        diff2 = Math.abs(p2.getPoint(i).getX() - mouseX)  + Math.abs(p2.getPoint(i).getY() - mouseY);
 
                                                 if (diff < Math.abs(closest)) {

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

@@ -324 +324 @@
                         if (_initialBounds == null) {
                                 setInitialBounds(fullBounds.clone());
-                                _initialBounds.getTopLeft().y += _initialBounds.getSize().height; 
+                                _initialBounds.getTopLeft().setY(_initialBounds.getTopLeft().getY() + _initialBounds.getSize().height); 
                                 _initialBounds.getSize().height = 0;
                         }

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

@@ -86 +86 @@
         public float getX(int x)
         {
-                return (x - Origin.x) / Scale;
+                return (x - Origin.getY()) / Scale;
         }
 
@@ -92 +92 @@
         public float getY(int y)
         {
-                return (y - Origin.y) / Scale;
+                return (y - Origin.getY()) / Scale;
         }