Changeset 1143 for trunk/src/org/expeditee/items/Picture.java

Timestamp:

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

Author:

bln4

Message:

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

File:

• trunk/src/org/expeditee/items/Picture.java (modified) (18 diffs)

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