Changeset 1142 for trunk

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

Files:

• apollo/ApolloGestureActions.java (modified) (1 diff)
• apollo/audio/structure/AudioStructureModel.java (modified) (2 diffs)
• apollo/gui/FrameLayoutDaemon.java (modified) (1 diff)
• apollo/io/SampledAudioFileImporter.java (modified) (1 diff)
• apollo/items/EmulatedTextItem.java (modified) (10 diffs)
• apollo/widgets/LinkedTrack.java (modified) (1 diff)
• apollo/widgets/SampledTrack.java (modified) (1 diff)
• expeditee/actions/Debug.java (modified) (2 diffs)
• expeditee/actions/Misc.java (modified) (2 diffs)
• expeditee/actions/Simple.java (modified) (3 diffs)
• expeditee/agents/Sort.java (modified) (1 diff)
• expeditee/agents/SwitchyardTree.java (modified) (1 diff)
• expeditee/agents/mail/MailSession.java (modified) (1 diff)
• expeditee/core/Line.java (modified) (5 diffs)
• expeditee/core/Point.java (modified) (2 diffs)
• expeditee/core/bounds/AxisAlignedBoxBounds.java (modified) (7 diffs)
• expeditee/core/bounds/Bounds.java (modified) (1 diff)
• expeditee/core/bounds/EllipticalBounds.java (modified) (7 diffs)
• expeditee/core/bounds/PolygonBounds.java (modified) (6 diffs)
• expeditee/gio/DragAndDropManager.java (modified) (1 diff)
• expeditee/gio/GraphicsManager.java (modified) (1 diff)
• expeditee/gio/GraphicsSurfaceStack.java (modified) (5 diffs)
• expeditee/gio/TextLayoutManager.java (modified) (3 diffs)

trunk/src/org/apollo/ApolloGestureActions.java

@@ -170 +170 @@
                                 for (Item i : current.getItems()) {
                                         Point pos = i.getPosition();
-                                        pos.x %= windowSize.width;
-                                        pos.y %= windowSize.height;
+                                        pos.setX(pos.getX() % windowSize.width);
+                                        pos.setY(pos.getY() % windowSize.height);
                                         i.setPosition(pos);
                                 }

trunk/src/org/apollo/audio/structure/AudioStructureModel.java

@@ -347 +347 @@
                                                 if (localFileName != null) {
                                                         tracks.put(localFileName, new TrackModelData(
-                                                                        initiationTime, -1, name, result.position.y)); // pass -1 for running time to signify that must be read from audio file
+                                                                        initiationTime, -1, name, result.position.getY())); // pass -1 for running time to signify that must be read from audio file
                                                 }
                                                 
@@ -389 +389 @@
                                                         if (virtualFilename != null) {
                                                                 linkedTracks.put(virtualFilename, new LinkedTrackModelData(
-                                                                                initiationTime, result.explink, name, result.position.y)); // pass -1 for running time to signify that must be read from audio file
+                                                                                initiationTime, result.explink, name, result.position.getY())); // pass -1 for running time to signify that must be read from audio file
                                                         }
                                                 

trunk/src/org/apollo/gui/FrameLayoutDaemon.java

@@ -562 +562 @@
                                                         int offsetX = width / 2; 
                                                         int offsetY = freespaceTrackToFormat.getHeight() / 2;
-                                                        freespaceTrackToFormat.setPosition(containerPoint.x - offsetX, containerPoint.y - offsetY);
+                                                        freespaceTrackToFormat.setPosition(containerPoint.getX() - offsetX, containerPoint.getY() - offsetY);
                                                         StandardGestureActions.resetOffset();
                                                 }

trunk/src/org/apollo/io/SampledAudioFileImporter.java

@@ -25 +25 @@
                                 f,
                                 DisplayController.getCurrentFrame(), 
-                                location.x, 
-                                location.y);
+                                location.getX(), 
+                                location.getY());
                 
                 // Add the sampled track widget to the current frame

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();
                         

trunk/src/org/apollo/widgets/LinkedTrack.java

@@ -1814 +1814 @@
                                 if (y < 0) {
                                         y = LinkedTrack.this.getY() + LinkedTrack.this.getHeight() + 2;
-                                        animationSource.getTopLeft().y = y - 2;
+                                        animationSource.getTopLeft().setY(y - 2);
                                 } 
 

trunk/src/org/apollo/widgets/SampledTrack.java

@@ -1274 +1274 @@
                                         ((Graphics2D)g).setStroke(EditableSampledTrackGraphView.GRAPH_BAR_STROKE);
                                         g.drawLine(
-                                                        containerPoint.x + me.getX(),
-                                                        containerPoint.y, 
-                                                        containerPoint.x + me.getX(),
-                                                        containerPoint.y + me.getComponent().getHeight());
+                                                        containerPoint.getX() + me.getX(),
+                                                        containerPoint.getY(), 
+                                                        containerPoint.getX() + me.getX(),
+                                                        containerPoint.getY() + me.getComponent().getHeight());
                                         
                                         DisplayController.invalidateArea(new AxisAlignedBoxBounds(
-                                                        containerPoint.x + me.getX(), 
-                                                        containerPoint.y, 
+                                                        containerPoint.getX() + me.getX(), 
+                                                        containerPoint.getY(), 
                                                         1,
-                                                        containerPoint.y + me.getComponent().getHeight() + 1));
+                                                        containerPoint.getY() + me.getComponent().getHeight() + 1));
                         
                                         // Restore clip

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));

trunk/src/org/expeditee/agents/Sort.java

@@ -64 +64 @@
                 for (int i = 0; i < positions.size(); i++)
                         textItems.get(i)
-                                        .setPosition(positions.get(i).x, positions.get(i).y);
+                                        .setPosition(positions.get(i).getX(), positions.get(i).getY());
 
                 // items will need to be resorted after this

trunk/src/org/expeditee/agents/SwitchyardTree.java

@@ -50 +50 @@
                                                                 Text itemCopy = childItem.copy();
                                                                 // add to the right of parent item
-                                                                lastItemEnd.set(lastItemEnd.x + 20, lastItemEnd.y);
-                                                                itemCopy.setPosition(lastItemEnd.x, lastItemEnd.y);
+                                                                lastItemEnd.set(lastItemEnd.getX() + 20, lastItemEnd.getY());
+                                                                itemCopy.setPosition(lastItemEnd.getX(), lastItemEnd.getY());
                                                                 lastItemEnd = itemCopy
                                                                                 .getParagraphEndPosition();

trunk/src/org/expeditee/agents/mail/MailSession.java

@@ -479 +479 @@
                                         if (newItem != null) {
                                                 mailItems.add(newItem);
-                                                point.y += newItem.getBoundsHeight();
+                                                point.setY(point.getY() + newItem.getBoundsHeight());
                                                 messagesRead++;
                                         } else {

trunk/src/org/expeditee/core/Line.java

@@ -55 +55 @@
         public int deltaX()
         {
-                return _p2.x - _p1.x;
+                return _p2.getX() - _p1.getX();
         }
         
@@ -61 +61 @@
         public int deltaY()
         {
-                return _p2.y - _p1.y;
+                return _p2.getY() - _p1.getY();
         }
         
@@ -89 +89 @@
                 } else {
                         double u = ((double) numerator) / denominator;
-                        return u >= 0 && u <= 1 && this.contains(new Point((int) (q.x + u * s.x), (int) (q.y + u * s.y)), error);
+                        return u >= 0 && u <= 1 && this.contains(new Point((int) (q.getX() + u * s.getX()), (int) (q.getY() + u * s.getY())), error);
                 }
         }
@@ -98 +98 @@
         private int crossLength(Point a, Point b)
         {
-                return a.x * b.y - a.y * b.x;
+                return a.getX() * b.getY() - a.getY() * b.getX();
         }
         
@@ -174 +174 @@
                 } else {
                         double scaleFactor = projectionLength / lineLength;
-                        return _p1.clone().add((_p2.x - _p1.x) * scaleFactor, (_p2.y - _p1.y) * scaleFactor);
+                        return _p1.clone().add((_p2.getX() - _p1.getX()) * scaleFactor, (_p2.getY() - _p1.getY()) * scaleFactor);
                 }
         }

trunk/src/org/expeditee/core/Point.java

@@ -2 +2 @@
 
 /**
- * Represents a (x,y)-coordinate in 2-dimensional space.
- * Coordinates are integral.
+ * Represents a (x,y)-coordinate in 2-dimensional space. Coordinates are
+ * integral.
  * 
  * @author cts16
  */
 public class Point {
-        
+
         /** The origin of the coordinate system. */
         public static final Point ORIGIN = new Point(0, 0);
-        
+
         /** The x-coordinate of this point. */
-        public int x;
+        private int x;
         /** The y-coordinate of this point. */
-        public int y;
-        
+        private int y;
+
         /** Default constructor creates a point at the origin. */
-        public Point()
-        {
+        public Point() {
                 this(0, 0);
         }
-        
+
         /** Standard constructor. */
-        public Point(int x, int y)
-        {
+        public Point(int x, int y) {
                 set(x, y);
         }
-        
+
         /** Convenience constructor automatically casts floats to ints. */
-        public Point(float x, float y)
-        {
+        public Point(float x, float y) {
                 this((int) x, (int) y);
         }
-        
+
         /** Copy constructor. */
-        public Point(Point other)
-        {
+        public Point(Point other) {
                 this();
                 set(other);
         }
-        
+
         /** Sets the position of the point. */
-        public Point set(int x, int y)
-        {
-                this.x = x;
-                this.y = y;
-                return this;
-        }
-        
-        /** Sets the position of this point to be the same as the given point.
-            If p is null, no change is made. */
-        public Point set(Point p)
-        {
-                if (p != null) set(p.x, p.y);
-                return this;
-        }
-        
+        public Point set(int x, int y) {
+                this.setX(x);
+                this.setY(y);
+                return this;
+        }
+
+        /**
+         * Sets the position of this point to be the same as the given point. If p is
+         * null, no change is made.
+         */
+        public Point set(Point p) {
+                if (p != null)
+                        set(p.getX(), p.getY());
+                return this;
+        }
+
         /** Moves the point by the given amount in each dimension. */
-        public Point add(int x, int y)
-        {
-                this.x += x;
-                this.y += y;
-                return this;
-        }
-        
-        /** Moves the point by the given amount in each dimension.
-            Doubles are automatically cast to ints. */
-        public Point add(double x, double y)
-        {
+        public Point add(int x, int y) {
+                this.setX(this.getX() + x);
+                this.setY(this.getY() + y);
+                return this;
+        }
+
+        /**
+         * Moves the point by the given amount in each dimension. Doubles are
+         * automatically cast to ints.
+         */
+        public Point add(double x, double y) {
                 return add((int) x, (int) y);
         }
-        
-        /** Adds the coordinates of the given point to this point's coordinates
-            (treating points as vectors). */
-        public Point add(Point p)
-        {
-                 if (p != null) add(p.x, p.y);
-                 return this;
-        }
-        
+
+        /**
+         * Adds the coordinates of the given point to this point's coordinates (treating
+         * points as vectors).
+         */
+        public Point add(Point p) {
+                if (p != null)
+                        add(p.getX(), p.getY());
+                return this;
+        }
+
         /**
          * Rotates this point around another point.
          * 
          * @param angle
-         *              The angle to rotate through (clockwise, in radians).
+         *            The angle to rotate through (clockwise, in radians).
          * 
          * @param x
-         *              The x-coordinate of the centre of rotation.
+         *            The x-coordinate of the centre of rotation.
          * 
          * @param y
-         *              The y-coordinate of the centre of rotation.
-         */
-        public Point rotate(double angle, int x, int y)
-        {
+         *            The y-coordinate of the centre of rotation.
+         */
+        public Point rotate(double angle, int x, int y) {
                 // Find the distance from this point to the centre of rotation
                 // (should stay the same during rotation)
-                double length = Point.distanceBetween(x, y, this.x, this.y);
-                
+                double length = Point.distanceBetween(x, y, this.getX(), this.getY());
+
                 // Find the starting elevation angle of this point relative to
                 // the centre of rotation.
-                double startingAngle = Math.atan2(this.y - y, this.x - x);
-                
-                // Increase/decrease the elevation angle by the given amount 
+                double startingAngle = Math.atan2(this.getY() - y, this.getX() - x);
+
+                // Increase/decrease the elevation angle by the given amount
                 double finalAngle = startingAngle + angle;
-                
+
                 // Calculate the point at the same distance from the centre of rotation
                 // elevated at the new angle.
-                this.x = (int) (x + length * Math.cos(finalAngle));
-                this.y = (int) (y + length * Math.sin(finalAngle));
-                
-                return this;
-        }
-        
+                this.setX((int) (x + length * Math.cos(finalAngle)));
+                this.setY((int) (y + length * Math.sin(finalAngle)));
+
+                return this;
+        }
+
         /**
          * Rotates this point around another point.
          * 
          * @param angle
-         *              The angle to rotate through (clockwise, in radians).
+         *            The angle to rotate through (clockwise, in radians).
          * 
          * @param cor
-         *              The centre of rotation.
-         */
-        public Point rotate(double angle, Point cor)
-        {
-                if (cor != null) rotate(angle, cor.x, cor.y);
-                return this;
-        }
-        
+         *            The centre of rotation.
+         */
+        public Point rotate(double angle, Point cor) {
+                if (cor != null)
+                        rotate(angle, cor.getX(), cor.getY());
+                return this;
+        }
+
         /** Gets the distance from this point to another point. */
-        public double getDistanceTo(Point other)
-        {
+        public double getDistanceTo(Point other) {
                 return distanceBetween(this, other);
         }
-        
+
         /** Gets the distance between two points. */
-        public static double distanceBetween(Point p1, Point p2)
-        {
-                if (p1 == null || p2 == null) return 0.0;
-                
-                return distanceBetween(p1.x, p1.y, p2.x, p2.y);
+        public static double distanceBetween(Point p1, Point p2) {
+                if (p1 == null || p2 == null)
+                        return 0.0;
+
+                return distanceBetween(p1.getX(), p1.getY(), p2.getX(), p2.getY());
         }
 
         /** Gets the distance between two points specified by their coordinates. */
-        public static double distanceBetween(int x1, int y1, int x2, int y2)
-        {
+        public static double distanceBetween(int x1, int y1, int x2, int y2) {
                 double x = x1 - x2;
                 double y = y1 - y2;
                 return Math.sqrt(x * x + y * y);
         }
-        
+
         @Override
-        public boolean equals(Object other)
-        {
+        public boolean equals(Object other) {
                 if (other instanceof Point) {
                         Point p = (Point) other;
-                        return this.x == p.x && this.y == p.y;
+                        return this.getX() == p.getX() && this.getY() == p.getY();
                 }
                 return false;
@@ -162 +157 @@
 
         /** Gets the x-coordinate of this point. */
-        public int getX()
-        {
+        public int getX() {
                 return x;
         }
-        
+
         /** Gets the y-coordinate of this point. */
-        public int getY()
-        {
+        public int getY() {
                 return y;
         }
-        
+
         @Override
-        public Point clone()
-        {
+        public Point clone() {
                 return new Point(this);
         }
-        
-        /** Gets a point representing the difference between the two given points
-            (returned point should be treated as a vector). */
-        public static Point difference(Point p1, Point p2)
-        {
-                if (p1 == null || p2 == null) return null;
-                return new Point(p1.x - p2.x, p1.y - p2.y);
-        }
-        
+
+        /**
+         * Gets a point representing the difference between the two given points
+         * (returned point should be treated as a vector).
+         */
+        public static Point difference(Point p1, Point p2) {
+                if (p1 == null || p2 == null)
+                        return null;
+                return new Point(p1.getX() - p2.getX(), p1.getY() - p2.getY());
+        }
+
         /** Calculates the dot-product between two lines that share a common point. */
-        public static double dotProduct(Point commonPoint, Point lineEnd1, Point lineEnd2)
-        {
-                if (commonPoint == null || lineEnd1 == null || lineEnd2 == null) return 0.0;
-                
-                Point p1 = new Point(lineEnd1.x - commonPoint.x, lineEnd1.y - commonPoint.y);
-                Point p2 = new Point(lineEnd2.x - commonPoint.x, lineEnd2.y - commonPoint.y);
-                return p1.x * p2.x + p1.y * p2.y;
-        }
-        
+        public static double dotProduct(Point commonPoint, Point lineEnd1, Point lineEnd2) {
+                if (commonPoint == null || lineEnd1 == null || lineEnd2 == null)
+                        return 0.0;
+
+                Point p1 = new Point(lineEnd1.getX() - commonPoint.getX(), lineEnd1.getY() - commonPoint.getY());
+                Point p2 = new Point(lineEnd2.getX() - commonPoint.getX(), lineEnd2.getY() - commonPoint.getY());
+                return p1.getX() * p2.getX() + p1.getY() * p2.getY();
+        }
+
         @Override
-        public String toString()
-        {
-                return "(" + x + ", " + y + ")";
+        public String toString() {
+                return "(" + getX() + ", " + getY() + ")";
+        }
+
+        public void setY(int y) {
+                this.y = y;
+        }
+
+        public void setX(int x) {
+                this.x = x;
         }
 }

trunk/src/org/expeditee/core/bounds/AxisAlignedBoxBounds.java

@@ -107 +107 @@
         public int getCentreX()
         {
-                return _topLeft.x + _size.width / 2;
+                return _topLeft.getX() + _size.width / 2;
         }
 
@@ -113 +113 @@
         public int getCentreY()
         {
-                return _topLeft.y + _size.height / 2;
+                return _topLeft.getY() + _size.height / 2;
         }
 
@@ -167 +167 @@
         public boolean contains(int x, int y)
         {
-                return (x >= _topLeft.x &&
-                                x < (_topLeft.x + _size.width) &&
-                                y >= _topLeft.y &&
-                                y < (_topLeft.y + _size.height));
+                return (x >= _topLeft.getX() &&
+                                x < (_topLeft.getX() + _size.width) &&
+                                y >= _topLeft.getY() &&
+                                y < (_topLeft.getY() + _size.height));
         }
 
@@ -176 +176 @@
         public int getMaxX()
         {
-                return _topLeft.x + _size.width - 1;
+                return _topLeft.getX() + _size.width - 1;
         }
 
@@ -182 +182 @@
         public int getMinX()
         {
-                return _topLeft.x;
+                return _topLeft.getX();
         }
 
@@ -188 +188 @@
         public int getMaxY()
         {
-                return _topLeft.y + _size.height - 1;
+                return _topLeft.getY() + _size.height - 1;
         }
 
@@ -194 +194 @@
         public int getMinY()
         {
-                return _topLeft.y;
+                return _topLeft.getY();
         }
         

trunk/src/org/expeditee/core/bounds/Bounds.java

@@ -26 +26 @@
         public boolean contains(Point p)
         {
-                return contains(p.x, p.y);
+                return contains(p.getX(), p.getY());
         }
         

trunk/src/org/expeditee/core/bounds/EllipticalBounds.java

@@ -76 +76 @@
                 
                 // Get the position of the given coordinates with respect to the ellipse centre 
-                Point pRel = new Point(x - _centre.x, y - _centre.y);
+                Point pRel = new Point(x - _centre.getX(), y - _centre.getY());
                 
                 // x^2 / r_x^2 + y^2 / r_y^2 must be <= 1
                 // (using diameters instead of radii hence the 4.0f value)
-                float xNorm = (((float) pRel.x) * pRel.x) / (((float) _diameters.width) * _diameters.width);
-                float yNorm = (((float) pRel.y) * pRel.y) / (((float) _diameters.height) * _diameters.height);
+                float xNorm = (((float) pRel.getX()) * pRel.getX()) / (((float) _diameters.width) * _diameters.width);
+                float yNorm = (((float) pRel.getY()) * pRel.getY()) / (((float) _diameters.height) * _diameters.height);
                 return (xNorm + yNorm <= 4.0f);
         }
@@ -88 +88 @@
         public int getMaxX()
         {
-                return _centre.x + (_diameters.width / 2 + _diameters.width % 2);
+                return _centre.getX() + (_diameters.width / 2 + _diameters.width % 2);
         }
 
@@ -94 +94 @@
         public int getMinX()
         {
-                return _centre.x -(_diameters.width / 2 + _diameters.width % 2);
+                return _centre.getX() -(_diameters.width / 2 + _diameters.width % 2);
         }
 
@@ -100 +100 @@
         public int getMaxY()
         {
-                return _centre.y + (_diameters.height / 2 + _diameters.height % 2);
+                return _centre.getY() + (_diameters.height / 2 + _diameters.height % 2);
         }
 
@@ -106 +106 @@
         public int getMinY()
         {
-                return _centre.y - (_diameters.height / 2 + _diameters.height % 2);
+                return _centre.getY() - (_diameters.height / 2 + _diameters.height % 2);
         }
 
@@ -256 +256 @@
                 
                 Point pRel = Point.difference(p, _centre);
-                return Math.atan2(pRel.y, pRel.x);
+                return Math.atan2(pRel.getY(), pRel.getX());
         }
         
@@ -269 +269 @@
                 double r_y = _diameters.height / 2.0;
                 Point lineStartRel = Point.difference(line.getFirstEnd(), _centre);
-                double x_0 = lineStartRel.x;
-                double y_0 = lineStartRel.y;
+                double x_0 = lineStartRel.getX();
+                double y_0 = lineStartRel.getY();
                 double x_d = line.deltaX();
                 double y_d = line.deltaY();

trunk/src/org/expeditee/core/bounds/PolygonBounds.java

@@ -61 +61 @@
         public void addPoint(Point p)
         {
-                addPoint(p.x, p.y);
+                addPoint(p.getX(), p.getY());
         }
         
@@ -142 +142 @@
         public void rotate(double angle, Point cor)
         {
-                rotate(angle, cor.x, cor.y);
+                rotate(angle, cor.getX(), cor.getY());
         }
         
@@ -159 +159 @@
         int hits = 0;
 
-        int lastx = _points.get(npoints - 1).x;
-        int lasty = _points.get(npoints - 1).y;
+        int lastx = _points.get(npoints - 1).getX();
+        int lasty = _points.get(npoints - 1).getY();
         int curx, cury;
 
         // Walk the edges of the polygon
         for (int i = 0; i < npoints; lastx = curx, lasty = cury, i++) {
-            curx = _points.get(i).x;
-            cury = _points.get(i).y;
+            curx = _points.get(i).getX();
+            cury = _points.get(i).getY();
 
             if (cury == lasty) {
@@ -379 +379 @@
                         Point p1 = _points.get(i);
                         Point p2 = _points.get((i + 1) % _points.size());
-                        area += p1.x * p2.y - p2.x * p1.y;
+                        area += p1.getX() * p2.getY() - p2.getX() * p1.getY();
                 }
                 
@@ -500 +500 @@
                 if (ellipse == null || nSegments < 3) return null;
                 
-                int centreX = ellipse.getCentre().x;
-                int centreY = ellipse.getCentre().y;
+                int centreX = ellipse.getCentre().getX();
+                int centreY = ellipse.getCentre().getY();
                 double xRadius = ellipse.getDiameters().width / 2.0;
                 double yRadius = ellipse.getDiameters().height / 2.0;
@@ -532 +532 @@
                 
                 for (Point p : _points) {
-                        if (_maxX == null || p.x > _maxX.intValue()) _maxX = new Integer(p.x);
-                        if (_minX == null || p.x < _minX.intValue()) _minX = new Integer(p.x);
-                        if (_maxY == null || p.y > _maxY.intValue()) _maxY = new Integer(p.y);
-                        if (_minY == null || p.y < _minY.intValue()) _minY = new Integer(p.y);
+                        if (_maxX == null || p.getX() > _maxX.intValue()) _maxX = new Integer(p.getX());
+                        if (_minX == null || p.getX() < _minX.intValue()) _minX = new Integer(p.getX());
+                        if (_maxY == null || p.getY() > _maxY.intValue()) _maxY = new Integer(p.getY());
+                        if (_minY == null || p.getY() < _minY.intValue()) _minY = new Integer(p.getY());
                 }
         }

trunk/src/org/expeditee/gio/DragAndDropManager.java

@@ -109 +109 @@
 
                         if (lastItem == null) {
-                                currentPoint.y += 30;
+                                currentPoint.setY(currentPoint.getY() + 30);
                         } else {
-                                currentPoint.y += lastItem.getBoundsHeight();
+                                currentPoint.setY(currentPoint.getY() + lastItem.getBoundsHeight());
                         }
                         // of the item that was created

trunk/src/org/expeditee/gio/GraphicsManager.java

@@ -240 +240 @@
                 if (p1 == null || p2 == null) return;
                 
-                drawLine(p1.x, p1.y, p2.x, p2.y, colour, stroke);
+                drawLine(p1.getX(), p1.getY(), p2.getX(), p2.getY(), colour, stroke);
         }
         

trunk/src/org/expeditee/gio/GraphicsSurfaceStack.java

@@ -10 +10 @@
 /**
  * Helper-class for the graphics manager to maintain a stack of drawing
- * surfaces. Should be sub-typed by the platform-specific graphics manager
- * to use the appropriate surface class.
+ * surfaces. Should be sub-typed by the platform-specific graphics manager to
+ * use the appropriate surface class.
  */
 public abstract class GraphicsSurfaceStack<T> {
@@ -31 +31 @@
         /** The clip-stack for each drawing surface. */
         private Stack<EnforcedClipStack> _clipStackStack;
-        
+
         /** Constructor specifying no root surface. */
-        public GraphicsSurfaceStack()
-        {
+        public GraphicsSurfaceStack() {
                 this(null);
         }
-        
+
         /** Constructor specifying the root surface. */
-        public GraphicsSurfaceStack(T rootSurface)
-        {
+        public GraphicsSurfaceStack(T rootSurface) {
                 setRootSurface(rootSurface);
                 _currentImage = null;
@@ -48 +46 @@
                 _clipStackStack = new Stack<EnforcedClipStack>();
         }
-        
-        /** Should be overridden by sub-types to allow a drawing surface to be extracted from an image. */
+
+        /**
+         * Should be overridden by sub-types to allow a drawing surface to be extracted
+         * from an image.
+         */
         public abstract T getSurfaceFromImage(Image image);
-        
-        /** Should be overridden by sub-types to set the actual clip on a given surface. */
+
+        /**
+         * Should be overridden by sub-types to set the actual clip on a given surface.
+         */
         public abstract void setSurfaceClip(T surface, Clip clip);
-        
-        /** Pushes a new image onto the stack, and sets it as the current drawing surface. */
-        public void push(Image image)
-        {
-                if (image == null) return;
-                
+
+        /**
+         * Pushes a new image onto the stack, and sets it as the current drawing
+         * surface.
+         */
+        public void push(Image image) {
+                if (image == null)
+                        return;
+
                 _currentSurface = getSurfaceFromImage(image);
                 _currentImage = image;
@@ -67 +73 @@
                 _clipStackStack.push(_currentClipStack);
         }
-        
-        /** Removes an image from the stack. The removed image is returned, or null if the root surface was current. */
-        public Image pop()
-        {
-                if (_surfaceStack.isEmpty()) return null;
-                
+
+        /**
+         * Removes an image from the stack. The removed image is returned, or null if
+         * the root surface was current.
+         */
+        public Image pop() {
+                if (_surfaceStack.isEmpty())
+                        return null;
+
                 Image oldTop = _imageStack.pop();
                 _surfaceStack.pop();
                 _clipStackStack.pop();
-                
+
                 if (!_surfaceStack.isEmpty()) {
                         _currentSurface = _surfaceStack.peek();
@@ -86 +95 @@
                         _currentClipStack = _rootClipStack;
                 }
-                
+
                 return oldTop;
         }
-        
+
         /** Gets a reference to the current drawing surface. */
-        public T getCurrentSurface()
-        {
+        public T getCurrentSurface() {
                 return _currentSurface;
         }
-        
+
         /** Gets a reference to the top image on the stack. */
-        public Image getCurrentImage()
-        {
+        public Image getCurrentImage() {
                 return _currentImage;
         }
-        
-        /** Pushes a new clip onto the stack, ensuring that it is a sub-area of the top of the stack. */
-        public EnforcedClipKey pushClip(Clip clip)
-        {
+
+        /**
+         * Pushes a new clip onto the stack, ensuring that it is a sub-area of the top
+         * of the stack.
+         */
+        public EnforcedClipKey pushClip(Clip clip) {
                 EnforcedClipKey key = _currentClipStack.push(clip);
-                if (key != null) ensureClip();
+                if (key != null)
+                        ensureClip();
                 return key;
         }
-        
-        /** Pops the top of the current clip-stack if there given key corresponds to it. */
-        public Clip popClip(EnforcedClipKey key)
-        {
+
+        /**
+         * Pops the top of the current clip-stack if there given key corresponds to it.
+         */
+        public Clip popClip(EnforcedClipKey key) {
                 Clip clip = _currentClipStack.pop(key);
-                if (clip != null) ensureClip();
+                if (clip != null)
+                        ensureClip();
                 return clip;
         }
-        
+
         /** Returns a copy of the top of the current clip-stack. */
-        public Clip peekClip()
-        {
+        public Clip peekClip() {
                 return _currentClipStack.peek();
         }
-        
+
         /** Ensures the current clip is applied to the underlying surface. */
-        public void ensureClip()
-        {
+        public void ensureClip() {
                 setSurfaceClip(_currentSurface, _currentClipStack.peek());
         }
-        
+
         /** Updates the root surface. Does not affect any stacked image surfaces. */
-        public void setRootSurface(T rootSurface)
-        {
-                if (_currentSurface == _rootSurface) _currentSurface = rootSurface;
+        public void setRootSurface(T rootSurface) {
+                if (_currentSurface == _rootSurface)
+                        _currentSurface = rootSurface;
                 _rootSurface = rootSurface;
-                
+
         }
 }

trunk/src/org/expeditee/gio/TextLayoutManager.java

@@ -17 +17 @@
         public List<TextLayout> layoutStringRelative(String string, Font font, int widthLimit, int lineSpacing, boolean dontBreakWords, boolean fullJustify)
         {
-                return layoutString(string, font, Point.ORIGIN, null, widthLimit, lineSpacing, dontBreakWords, fullJustify);
+                return layoutString(string, font, Point.ORIGIN.clone(), null, widthLimit, lineSpacing, dontBreakWords, fullJustify);
         }
         
@@ -71 +71 @@
                 for(Line l : lines) {
                         // check for lines that cross over our y
-                        if((l.getFirstEnd().y >= p.y && l.getSecondEnd().y <= p.y) || (l.getFirstEnd().y <= p.y && l.getSecondEnd().y >= p.y)) {
-                                float dX = l.getFirstEnd().x - l.getSecondEnd().x;
-                                float dY = l.getFirstEnd().y - l.getSecondEnd().y;
+                        if((l.getFirstEnd().getY() >= p.getY() && l.getSecondEnd().getY() <= p.getY()) || (l.getFirstEnd().getY() <= p.getY() && l.getSecondEnd().getY() >= p.getY())) {
+                                float dX = l.getFirstEnd().getX() - l.getSecondEnd().getX();
+                                float dY = l.getFirstEnd().getY() - l.getSecondEnd().getY();
                                 float newWidth;
                                 if(dX == 0) {
-                                        newWidth = l.getFirstEnd().x;
+                                        newWidth = l.getFirstEnd().getX();
                                 } else if(dY == 0) {
-                                        newWidth = Math.min(l.getFirstEnd().x, l.getSecondEnd().x);
+                                        newWidth = Math.min(l.getFirstEnd().getX(), l.getSecondEnd().getX());
                                 } else {
-                                        newWidth = l.getFirstEnd().x + (p.y - l.getFirstEnd().y) * dX / dY;
+                                        newWidth = l.getFirstEnd().getX() + (p.getY() - l.getFirstEnd().getY()) * dX / dY;
                                 }
-                                if(newWidth < p.x) {
+                                if(newWidth < p.getX()) {
                                         continue;
                                 }
@@ -90 +90 @@
                         }
                 }
-                return width - p.x;
+                return width - p.getX();
         }