Changeset 1142 for trunk/src/org/apollo/items

Timestamp:

09/18/18 11:57:32 (6 years ago)

Author:

bln4

Message:

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

File:

• trunk/src/org/apollo/items/EmulatedTextItem.java (modified) (10 diffs)

trunk/src/org/apollo/items/EmulatedTextItem.java

@@ -97 +97 @@
                 Point p = EcosystemManager.getInputManager().getCursorPosition();
                 
-                return isOnEmulatedText(p.x, p.y);
+                return isOnEmulatedText(p.getX(), p.getY());
         }
         
@@ -134 +134 @@
 
                 // If so and the event really comes from its parent ...
-                if (isOnEmulatedText(p.x, p.y)) {
+                if (isOnEmulatedText(p.getX(), p.getY())) {
                         
                         int yOffset = -6;
@@ -154 +154 @@
                         {
                                 // Insert the text according to the current mouse position
-                                Point newMouse = emulatedSource.insertChar(e.getKeyChar(), p.x, p.y);
+                                Point newMouse = emulatedSource.insertChar(e.getKeyChar(), p.getX(), p.getY());
                                 
                                 List<String> lines = emulatedSource.getTextList();
@@ -166 +166 @@
                                 // Move "cursored mouse"
                                 if (newMouse != null) {
-                                        EcosystemManager.getInputManager().setCursorPosition(new Point((int) newMouse.x, (int) newMouse.y + yOffset));
+                                        EcosystemManager.getInputManager().setCursorPosition(new Point((int) newMouse.getX(), (int) newMouse.getY() + yOffset));
                                 }
                         }
@@ -193 +193 @@
 
                 // If so and the event really comes from its parent ...
-                if (isOnEmulatedText(p.x, p.y)) {
+                if (isOnEmulatedText(p.getX(), p.getY())) {
                         
                         int yOffset = -6;
@@ -207 +207 @@
                                 
                                 if (newMouse != null) {
-                                        EcosystemManager.getInputManager().setCursorPosition(new Point((int) newMouse.x, (int) newMouse.y + yOffset));
+                                        EcosystemManager.getInputManager().setCursorPosition(new Point((int) newMouse.getX(), (int) newMouse.getY() + yOffset));
                                 }
 
@@ -241 +241 @@
 
                 // If so and the event really comes from its parent ...
-                if (isOnEmulatedText(p.x, p.y)) {
+                if (isOnEmulatedText(p.getX(), p.getY())) {
                         
                         String toMoveIntoFreespace = null;
@@ -267 +267 @@
                                 if (target != null) {
                                         Text selectionCopy = new Text(target.getNextItemID(), toMoveIntoFreespace);
-                                        selectionCopy.setPosition(p.x, p.y);
+                                        selectionCopy.setPosition(p.getX(), p.getY());
                                         selectionCopy.setSize(emulatedSource.getSize());
                                         StandardGestureActions.pickup(selectionCopy);
@@ -290 +290 @@
 
                 // If so and the event really comes from its parent ...
-                if (isOnEmulatedText(p.x, p.y)) {
+                if (isOnEmulatedText(p.getX(), p.getY())) {
                         
                         emulatedSource.clearSelection();
-                        emulatedSource.setSelectionStart(p.x, p.y, e.getButton());
+                        emulatedSource.setSelectionStart(p.getX(), p.getY(), e.getButton());
 
                         repaint();
@@ -313 +313 @@
 
                 // If so and the event really comes from its parent ...
-                if (isOnEmulatedText(p.x, p.y)) {
+                if (isOnEmulatedText(p.getX(), p.getY())) {
 
                         EcosystemManager.getGraphicsManager().setCursor(new Cursor(Cursor.CursorType.TEXT));
                         
-                        emulatedSource.setSelectionEnd(p.x, p.y);
+                        emulatedSource.setSelectionEnd(p.getX(), p.getY());
                         repaint();