Changeset 1102 for trunk/src/org/expeditee/items/MagneticConstraint/Utilities/Line.java

Timestamp:

05/10/18 16:04:51 (6 years ago)

Author:

davidb

Message:

Reworking of the code-base to separate logic from graphics. This version of Expeditee now supports a JFX graphics as an alternative to SWING

File:

• trunk/src/org/expeditee/items/MagneticConstraint/Utilities/Line.java (modified) (4 diffs)

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

@@ -1 +1 @@
 package org.expeditee.items.MagneticConstraint.Utilities;
 
-import java.awt.Rectangle;
 import java.util.LinkedList;
 
+import org.expeditee.core.bounds.AxisAlignedBoxBounds;
 import org.expeditee.items.Item;
 
@@ -18 +18 @@
         
         public Line prependLine(final Line line) {
-                final int x = this.getBoundingBox().x;
-                final int width = line.getBoundingBox().width;
+                final int x = this.getBoundingBox().getMinX();
+                final int width = line.getBoundingBox().getWidth();
                 this.deltaX(width);
                 line.setX(x);
@@ -27 +27 @@
         
         public Line appendLine(final Line line) {
-                final int x = this.getBoundingBox().x;
-                final int width = this.getBoundingBox().width;
+                final int x = this.getBoundingBox().getMinX();
+                final int width = this.getBoundingBox().getWidth();
                 line.setX(x + width);
                 line.setY(this.getFirst().getY());
@@ -83 +83 @@
         }
         
-        public Rectangle getBoundingBox() {
+        public AxisAlignedBoxBounds getBoundingBox() {
 //              final Rectangle rect = new Rectangle(this.getFirst().getX(), this.getFirst().getY(), this.getFirst().getBoundsWidth(), this.getFirst().getBoundsHeight());
 //              for(final Item token : this) 
 //                      rect.add(new Rectangle(token.getX(), token.getY(), token.getBoundsWidth(), token.getBoundsHeight()));
 //              return rect;
-                final Rectangle rect = this.getFirst().getArea().getBounds();
+                final AxisAlignedBoxBounds rect = this.getFirst().getBoundingBox();
                 for(final Item token : this)
-                        rect.add(token.getArea().getBounds());
+                        rect.combineWith(token.getBoundingBox());
                 return rect;
         }