Changeset 1143 for trunk

Timestamp:

09/18/18 12:00:17 (6 years ago)

Author:

bln4

Message:

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

Location:

trunk/src/org/expeditee/items

Files:

• Circle.java (modified) (1 diff)
• Item.java (modified) (2 diffs)
• ItemUtils.java (modified) (1 diff)
• Line.java (modified) (6 diffs)
• Picture.java (modified) (18 diffs)
• Text.java (modified) (12 diffs)
• widgets/HeavyDutyInteractiveWidget.java (modified) (1 diff)
• widgets/SwingWidget.java (modified) (2 diffs)
• widgets/Widget.java (modified) (1 diff)
• widgets/charts/AbstractChart.java (modified) (1 diff)

trunk/src/org/expeditee/items/Circle.java

@@ -159 +159 @@
                 double radius = getRadius();
 
-                double distance = Math.sqrt(Math.pow(Math.abs(_center.getX() - p.x), 2)
-                                + Math.pow(Math.abs(_center.getY() - p.y), 2));
+                double distance = Math.sqrt(Math.pow(Math.abs(_center.getX() - p.getX()), 2)
+                                + Math.pow(Math.abs(_center.getY() - p.getY()), 2));
 
                 return Math.abs(distance - radius) < getGravity() * 2;

trunk/src/org/expeditee/items/Item.java

@@ -2149 +2149 @@
 
         public void setPosition(Point position) {
-                setPosition(position.x, position.y);
+                setPosition(position.getX(), position.getY());
         }
 
@@ -2881 +2881 @@
                 invalidateCommonTraitForAll(ItemAppearence.PreMoved);
 
-                _x = (float) (origin.x + ratio * (_x - origin.x));
-                _y = (float) (origin.y + ratio * (_y - origin.y));
+                _x = (float) (origin.getX() + ratio * (_x - origin.getX()));
+                _y = (float) (origin.getY() + ratio * (_y - origin.getY()));
                 invalidateBounds();
                 for (Line line : getLines())

trunk/src/org/expeditee/items/ItemUtils.java

@@ -971 +971 @@
         private static void scaleItem(Vector v, Item item) {
                 Float scale = v.Scale;
-                int originX = v.Origin.x;
-                int originY = v.Origin.y;
+                int originX = v.Origin.getX();
+                int originY = v.Origin.getY();
                 Colour defaultForeground = v.Foreground;
                 Colour defaultBackground = v.Background;

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

@@ -227 +227 @@
                          * else
                          */{
-                                _startOffset.x = 0;
-                                _startOffset.y = 0;
+                                _startOffset.setX(0);
+                                _startOffset.setY(0);
                         }
 
@@ -245 +245 @@
                          * end.getX(); _endOffset.y = _end.getY() - end.getY(); } else
                          */{
-                                _endOffset.x = 0;
-                                _endOffset.y = 0;
+                                _endOffset.setX(0);
+                                _endOffset.setY(0);
                         }
 
@@ -377 +377 @@
                         // Add all the x and y's to the array
                         for (int j = 0; j < pointPath.size(); j++) {
-                                path.addPoint(pointPath.get(j).x, pointPath.get(j).y);
+                                path.addPoint(pointPath.get(j).getX(), pointPath.get(j).getY());
                         }
                 }
@@ -447 +447 @@
                 int x0, x1, y0, y1;
 
-                x1 = withArrow.getX() + startOffset.x;
-                y1 = withArrow.getY() + startOffset.y;
-                x0 = getOppositeEnd(withArrow).getX() + endOffset.x;
-                y0 = getOppositeEnd(withArrow).getY() + endOffset.y;
+                x1 = withArrow.getX() + startOffset.getX();
+                y1 = withArrow.getY() + startOffset.getY();
+                x0 = getOppositeEnd(withArrow).getX() + endOffset.getX();
+                y0 = getOppositeEnd(withArrow).getY() + endOffset.getY();
 
                 float arrowLength   = withArrow.getArrowheadLength();
@@ -499 +499 @@
                 arrowhead = arrowhead.clone();
                 double rad = calcAngle((float) x0, (float) y0, (float) x1, (float) y1);
-                arrowhead.translate((x0 + length) - arrowhead.toArray()[0].x, y0 - arrowhead.toArray()[0].y);
+                arrowhead.translate((x0 + length) - arrowhead.toArray()[0].getX(), y0 - arrowhead.toArray()[0].getY());
                 arrowhead.rotate(rad, x0, y0);
                 
@@ -609 +609 @@
         public Item getEndPointToDisconnect(Point p)
         {
-                return getEndPointToDisconnect(p.x, p.y);
+                return getEndPointToDisconnect(p.getX(), p.getY());
         }
 

trunk/src/org/expeditee/items/Picture.java

@@ -207 +207 @@
                 String size = getImageSize();
 
-                if (_end.x != 0 || _end.y != 0)
+                if (_end.getX() != 0 || _end.getY() != 0)
                         return;
 
@@ -280 +280 @@
         public void setStartCrop(Point p)
         {
-                if (p != null) setStartCrop(p.x, p.y);
+                if (p != null) setStartCrop(p.getX(), p.getY());
         }
         
@@ -291 +291 @@
         public void setEndCrop(Point p)
         {
-                if (p != null) setEndCrop(p.x, p.y);
+                if (p != null) setEndCrop(p.getX(), p.getY());
         }
 
@@ -304 +304 @@
                         Point topLeft = getTopLeftCrop();
                         Point bottomRight = getBottomRightCrop();
-                        int startX = getX() + topLeft.x - _highlightThickness;
-                        int startY = getY() + topLeft.y - _highlightThickness;
+                        int startX = getX() + topLeft.getX() - _highlightThickness;
+                        int startY = getY() + topLeft.getY() - _highlightThickness;
                         int border = 2 * _highlightThickness;
                         // TODO: Why invalidate specific area just before invalidateAll? cts16
                         invalidate(new AxisAlignedBoxBounds(startX, startY,
-                                        bottomRight.x - topLeft.x + 2 * border, bottomRight.y - topLeft.y + 2 * border));
+                                        bottomRight.getX() - topLeft.getX() + 2 * border, bottomRight.getY() - topLeft.getY() + 2 * border));
                         invalidateAll();
                 } else {
@@ -317 +317 @@
 
         public Point getTopLeftCrop() {
-                return new Point(Math.min(_cropStart.x, _cropEnd.x), Math.min(
-                                _cropStart.y, _cropEnd.y));
+                return new Point(Math.min(_cropStart.getX(), _cropEnd.getX()), Math.min(
+                                _cropStart.getY(), _cropEnd.getY()));
         }
 
         public Point getBottomRightCrop()
         {
-                return new Point(Math.max(_cropStart.x, _cropEnd.x), Math.max(_cropStart.y, _cropEnd.y));
+                return new Point(Math.max(_cropStart.getX(), _cropEnd.getX()), Math.max(_cropStart.getY(), _cropEnd.getY()));
         }
 
@@ -341 +341 @@
                 if (!isBeingCropped()) return true;
 
-                int cropWidth = Math.abs(_cropEnd.x - _cropStart.x);
-                int cropHeight = Math.abs(_cropEnd.y - _cropStart.y);
+                int cropWidth = Math.abs(_cropEnd.getX() - _cropStart.getX());
+                int cropHeight = Math.abs(_cropEnd.getY() - _cropStart.getY());
 
                 return cropWidth < MINIMUM_WIDTH || cropHeight < MINIMUM_WIDTH;
@@ -371 +371 @@
                         int height = getHeight();
                         
-                        centre.x = base_x + width / 2;
-                        centre.y = base_y + height / 2;
+                        centre.setX(base_x + width / 2);
+                        centre.setY(base_y + height / 2);
 
                         int xdiff = -MARGIN_RIGHT; // -getLeftMargin();
@@ -391 +391 @@
                         Point bottomRight = getBottomRightCrop();
                         
-                        centre.x = base_x + (bottomRight.x - topLeft.x) / 2;
-                        centre.y = base_y + (bottomRight.y - topLeft.y) / 2;
-                        
-                        AxisAlignedBoxBounds clip = new AxisAlignedBoxBounds(topLeft.x + base_x,
-                                        topLeft.y + base_y, bottomRight.x - topLeft.x,
-                                        bottomRight.y - topLeft.y);
+                        centre.setX(base_x + (bottomRight.getX() - topLeft.getX()) / 2);
+                        centre.setY(base_y + (bottomRight.getY() - topLeft.getY()) / 2);
+                        
+                        AxisAlignedBoxBounds clip = new AxisAlignedBoxBounds(topLeft.getX() + base_x,
+                                        topLeft.getY() + base_y, bottomRight.getX() - topLeft.getX(),
+                                        bottomRight.getY() - topLeft.getY());
 //                      _poly.addPoint((int) clip.getMinX() - 1, (int) clip.getMinY() - 1);
 //                      _poly.addPoint((int) clip.getMinX() - 1, (int) clip.getMaxY());
@@ -425 +425 @@
         @Override
         public void setWidth(Integer width) {
-                _scale = width * 1F / (_end.x - _start.x);
+                _scale = width * 1F / (_end.getX() - _start.getX());
         }
 
@@ -487 +487 @@
                 int offY = (tmp.getHeight() - getHeight()) / 2;
                 
-                int cropStartX = _start.x;
-                int cropEndX = _end.x;
+                int cropStartX = _start.getX();
+                int cropEndX = _end.getX();
         if(cropEndX > iw) {
                 cropEndX = iw;
@@ -503 +503 @@
                         }
                         
-                        int cropStartY = _start.y;
-                        int cropEndY = _end.y;
+                        int cropStartY = _start.getY();
+                        int cropEndY = _end.getY();
                 if(cropEndY > ih) {
                         cropEndY = ih;
@@ -569 +569 @@
                         int base_y = (_anchorTop != null) ? _anchorTop : _source.getY();
                         
-                        Clip clip = new Clip(new AxisAlignedBoxBounds(  base_x + topLeft.x,
-                                                                                                                                        base_y + topLeft.y,
-                                                                                                                                        bottomRight.x - topLeft.x,
-                                                                                                                                        bottomRight.y - topLeft.y));
+                        Clip clip = new Clip(new AxisAlignedBoxBounds(  base_x + topLeft.getX(),
+                                                                                                                                        base_y + topLeft.getY(),
+                                                                                                                                        bottomRight.getX() - topLeft.getX(),
+                                                                                                                                        bottomRight.getY() - topLeft.getY()));
                         EnforcedClipKey key = g.pushClip(clip);
                         paintImageTiling();
@@ -625 +625 @@
                         Point topLeft = getTopLeftCrop();
                         Point bottomRight = getBottomRightCrop();
-                        int startX = Math.round(topLeft.x / _scale) + _start.x;
-                        int startY = Math.round(topLeft.y / _scale) + _start.y;
-                        int endX = Math.round(bottomRight.x / _scale + _start.x);
-                        int endY = Math.round(bottomRight.y / _scale + _start.y);
+                        int startX = Math.round(topLeft.getX() / _scale) + _start.getX();
+                        int startY = Math.round(topLeft.getY() / _scale) + _start.getY();
+                        int endX = Math.round(bottomRight.getX() / _scale + _start.getX());
+                        int endY = Math.round(bottomRight.getY() / _scale + _start.getY());
                         int width = _image.getWidth();
                         int height = _image.getHeight();
@@ -649 +649 @@
                         int base_x = (_anchorLeft!=null) ? _anchorLeft : _source.getX();
                         int base_y = (_anchorTop!=null) ? _anchorTop : _source.getY();
-                        p._source.setPosition(topLeft.x + base_x, topLeft.y + base_y);
+                        p._source.setPosition(topLeft.getX() + base_x, topLeft.getY() + base_y);
                 } else {
                         p._start = new Point(_start);
@@ -678 +678 @@
                 int ih = _image.getHeight();
                 if(iw > 0 || ih > 0) {
-                        while(_start.x >= iw) {
-                        _start.x -= iw;
-                        _end.x -= iw;
+                        while(_start.getX() >= iw) {
+                        _start.setX(_start.getX() - iw);
+                        _end.setX(_end.getX() - iw);
                 }
-                while(_start.y >= ih) {
-                        _start.y -= ih;
-                        _end.y -= ih;
+                while(_start.getY() >= ih) {
+                        _start.setY(_start.getY() - ih);
+                        _end.setY(_end.getY() - ih);
                 }
-                while(_start.x < 0) {
-                        _start.x += iw;
-                        _end.x += iw;
+                while(_start.getX() < 0) {
+                        _start.setX(_start.getX() + iw);
+                        _end.setX(_end.getX() + iw);
                 }
-                while(_start.y < 0) {
-                        _start.y += ih;
-                        _end.y += ih;
+                while(_start.getY() < 0) {
+                        _start.setY(_start.getY() + ih);
+                        _end.setY(_end.getY() + ih);
                 }
                 }
@@ -749 +749 @@
                 }
                 
-                return Image.createImageAsCroppedCopy(_image, _start.x, _start.y, getUnscaledWidth(), getUnscaledHeight());
+                return Image.createImageAsCroppedCopy(_image, _start.getX(), _start.getY(), getUnscaledWidth(), getUnscaledHeight());
         }
 
         public int getUnscaledWidth() {
-                return _end.x - _start.x;
+                return _end.getX() - _start.getX();
         }
 
         public int getUnscaledHeight() {
-                return _end.y - _start.y;
+                return _end.getY() - _start.getY();
         }
 
@@ -764 +764 @@
          */
         public boolean isCropped() {
-                return (_end.x != 0 && _end.x != _image.getWidth()) || (_end.y != 0 && _end.y != _image.getHeight()) || _start.y != 0 || _start.x != 0;
+                return (_end.getX() != 0 && _end.getX() != _image.getWidth()) || (_end.getY() != 0 && _end.getY() != _image.getHeight()) || _start.getY() != 0 || _start.getX() != 0;
         }
 
@@ -888 +888 @@
                 // If the image is cropped add the position for the start and finish of
                 // the crop to the soure text
-                if (_start.x > 0 || _start.y > 0 || _end.x != _image.getWidth()
-                                || _end.y != _image.getHeight()) {
-                        newText.append(" ").append(_start.x).append(" ").append(_start.y);
-                        newText.append(" ").append(_end.x).append(" ").append(_end.y);
+                if (_start.getX() > 0 || _start.getY() > 0 || _end.getX() != _image.getWidth()
+                                || _end.getY() != _image.getHeight()) {
+                        newText.append(" ").append(_start.getX()).append(" ").append(_start.getY());
+                        newText.append(" ").append(_end.getX()).append(" ").append(_end.getY());
                 }
                 

trunk/src/org/expeditee/items/Text.java

@@ -727 +727 @@
         public void setSelectionStart(Point p)
         {
-                setSelectionStart(p.x, p.y);
+                setSelectionStart(p.getX(), p.getY());
         }
         
@@ -746 +746 @@
         public void setSelectionEnd(Point p)
         {
-                setSelectionEnd(p.x, p.y);
+                setSelectionEnd(p.getX(), p.getY());
         }
 
@@ -1158 +1158 @@
                 }
                 
-                if (setSelection) setSelectionEnd(resultPos.x, resultPos.y);
+                if (setSelection) setSelectionEnd(resultPos.getX(), resultPos.getY());
                 
                 return resultPos;
@@ -1178 +1178 @@
 
                 TextLayout layout = _textLayouts.get(line);
-                mouseX += getOffset().x;
+                mouseX += getOffset().getX();
                 mouseX -= getJustOffset(layout);
 
@@ -1195 +1195 @@
          */
         public int getLinePosition(float mouseY) {
-                mouseY += getOffset().y;
+                mouseY += getOffset().getY();
 
                 float y = getY();
@@ -1545 +1545 @@
         @Override
         public boolean contains(Point mousePosition) {
-                return contains(mousePosition.x, mousePosition.y, getGravity() * NEARBY_GRAVITY);
+                return contains(mousePosition.getX(), mousePosition.getY(), getGravity() * NEARBY_GRAVITY);
         }
         
@@ -1555 +1555 @@
         public boolean contains(int mouseX, int mouseY, int gravity)
         {
-                mouseX += getOffset().x;
-                mouseY += getOffset().y;
+                mouseX += getOffset().getX();
+                mouseY += getOffset().getY();
 
                 float textY = getY();
@@ -1869 +1869 @@
                         // return;
                 }
-
+                
                 // check if its a vector item and paint all the vector stuff too if this
                 // item is a free item
@@ -2051 +2051 @@
                                 newPoint.set(insertText("\b", mouseX, mouseY, 1));
                                 if (_text.length() > 0 && _text.charAt(0) == ' ')
-                                        newPoint.set(insertText("\b", newPoint.x, newPoint.y, 1));
+                                        newPoint.set(insertText("\b", newPoint.getX(), newPoint.getY(), 1));
                         } else {
                                 newPoint.set(insertText("@", mouseX, mouseY, 0));
@@ -2061 +2061 @@
                         if (!isLineEnd() && _text.charAt(0) == '@') {
                                 newPoint.set(insertText("\b", mouseX, mouseY, 1));
-                                newPoint.set(insertText(DEFAULT_BULLET_STRING, newPoint.x, newPoint.y, 0));
+                                newPoint.set(insertText(DEFAULT_BULLET_STRING, newPoint.getX(), newPoint.getY(), 0));
                         } else {
                                 newPoint.set(insertText("\b", mouseX, mouseY, 1));
@@ -2068 +2068 @@
                 FrameUtils.setLastEdited(this);
                 rebuild(true);
-                DisplayController.setCursorPosition(newPoint.x, newPoint.y, false);
+                DisplayController.setCursorPosition(newPoint.getX(), newPoint.getY(), false);
         }
 
@@ -2838 +2838 @@
 
                 Point newMouse = t.insertChar(start, DisplayController.getMouseX(), DisplayController.getMouseY());
-                DisplayController.setCursorPosition(newMouse.x, newMouse.y, false);
+                DisplayController.setCursorPosition(newMouse.getX(), newMouse.getY(), false);
 
                 return t;

trunk/src/org/expeditee/items/widgets/HeavyDutyInteractiveWidget.java

@@ -273 +273 @@
                 // Render shaded window over widget
                 g.setColor(SwingConversions.toSwingColor(backgroundColor));
-                g.fillRect(getX(), getY(), getWidth(), getHeight());
-                
+                final int x = getX();
+                final int y = getY();
+                final int width = getWidth();
+                final int height = getHeight();
+                g.fillRect(x, y, width, height);
+                                
                 // Center the bar
-                int barX = getX() + BAR_HOROZONTIAL_MARGIN;
-                int barY = getY() + (getHeight() >> 1) - (BAR_HEIGHT >> 1);
-                
-                int barWidth = getWidth() - (BAR_HOROZONTIAL_MARGIN * 2);
+                int barX = x + BAR_HOROZONTIAL_MARGIN;
+                int barY = y + (height >> 1) - (BAR_HEIGHT >> 1);
+                
+                int barWidth = width - (BAR_HOROZONTIAL_MARGIN * 2);
                 if (barWidth <= 0) barWidth = 10;
                 

trunk/src/org/expeditee/items/widgets/SwingWidget.java

@@ -4 +4 @@
 import java.awt.Container;
 import java.awt.Graphics2D;
+import java.awt.Point;
 
 import javax.swing.JComponent;
@@ -109 +110 @@
                 Graphics2D g = SwingMiscManager.getIfUsingSwingGraphicsManager().getCurrentSurface();
 
-                int x = getX();
-                int y = getY();
+                final Point location = _swingComponent.getLocation();
+                int x = location.x;
+                int y = location.y;
                 
                 g.translate(x, y);

trunk/src/org/expeditee/items/widgets/Widget.java

@@ -900 +900 @@
                 
                 _settingPositionFlag = true;
-
+                
                 invalidateLink();
 

trunk/src/org/expeditee/items/widgets/charts/AbstractChart.java

@@ -175 +175 @@
                                 Point origin = getOrigin();
                                 return new MouseEvent((Component) e.getSource(), e.getID(), e
-                                                .getWhen(), e.getModifiers(), origin.x + e.getX(),
-                                                origin.y + e.getY(), e.getXOnScreen(),
+                                                .getWhen(), e.getModifiers(), origin.getX() + e.getX(),
+                                                origin.getY() + e.getY(), e.getXOnScreen(),
                                                 e.getYOnScreen(), e.getClickCount(), false, e
                                                                 .getButton());