Changeset 1142 for trunk/src/org/expeditee/actions

Timestamp:

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

Author:

bln4

Message:

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

Location:

trunk/src/org/expeditee/actions

Files:

• Debug.java (modified) (2 diffs)
• Misc.java (modified) (2 diffs)
• Simple.java (modified) (3 diffs)

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

@@ -19 +19 @@
 package org.expeditee.actions;
 
-import java.awt.AWTException;
+import java.awt.Graphics;
 import java.awt.Robot;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
+
+import javax.swing.JFrame;
+import javax.swing.JPanel;
 
 import org.expeditee.gio.swing.SwingGraphicsManager;
@@ -68 +71 @@
         }
         
+        @SuppressWarnings("serial")
+        public static void GraphicsTranslateTest() {
+                final JFrame f = new JFrame();
+                f.setContentPane(new JPanel() {
+                        public void paintComponent(Graphics g) {
+                                final int pos = 10;
+                                final int size = 100;
+                                int translate = 10;
+                                for(int i = 0; i < 5; i++) {
+                                        g.translate(translate, translate);
+                                        g.drawRect(pos, pos, size, size);
+                                        g.translate(-translate, -translate);
+                                }
+                        }
+                });
+                f.setSize(400, 400);
+                f.setVisible(true);
+        }
+        
         public static void RobotTest() {
                 try {

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

@@ -997 +997 @@
                                 if (text.isFloating()) {
                                         Point cursorPos = EcosystemManager.getInputManager().getCursorPosition();
-                                        text.setPosition(cursorPos.x, cursorPos.y);
+                                        text.setPosition(cursorPos.getX(), cursorPos.getY());
                                         StandardGestureActions.resetOffset();
                                 } else {
@@ -1084 +1084 @@
 
                 Point cursorPos = DisplayController.getMousePosition();
-                float curX = cursorPos.x;
-                float curY = cursorPos.y;
+                float curX = cursorPos.getX();
+                float curY = cursorPos.getY();
 
                 Collection<Item> newItems = new LinkedList<Item>();

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

@@ -1129 +1129 @@
                                         for (Text text : targetFrame.getTextItems()) {
                                                 Point startPoint = text.getPosition();
-                                                if (Math.abs(startPoint.y - endPoint.y) < 10
-                                                                && Math.abs(startPoint.x - endPoint.x) < 20) {
+                                                if (Math.abs(startPoint.getY() - endPoint.getY()) < 10
+                                                                && Math.abs(startPoint.getX() - endPoint.getX()) < 20) {
                                                         found = true;
                                                         valueItem = text;
@@ -1380 +1380 @@
                                                 for (Text text : targetFrame.getTextItems()) {
                                                         Point startPoint = text.getPosition();
-                                                        if (Math.abs(startPoint.y - endPoint.y) < 10
-                                                                        && Math.abs(startPoint.x - endPoint.x) < 20) {
+                                                        if (Math.abs(startPoint.getY() - endPoint.getY()) < 10
+                                                                        && Math.abs(startPoint.getX() - endPoint.getX()) < 20) {
                                                                 found = true;
                                                                 valueItem = text;
@@ -1591 +1591 @@
                                                 Point pos = ((Item) context.getPointers().getVariable(
                                                                 tokens[1]).getValue()).getPosition();
-                                                Integer x = pos.x;
-                                                Integer y = pos.y;
+                                                Integer x = pos.getX();
+                                                Integer y = pos.getY();
                                                 context.getPrimitives()
                                                                 .setValue(tokens[2], new SInteger(x));