Changeset 1102 for trunk/src/org/expeditee/io/flowlayout/XItem.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/io/flowlayout/XItem.java (modified) (5 diffs)

trunk/src/org/expeditee/io/flowlayout/XItem.java

@@ -19 +19 @@
 package org.expeditee.io.flowlayout;
 
-import java.awt.Point;
-import java.awt.Rectangle;
 
+import org.expeditee.core.Point;
+import org.expeditee.core.bounds.AxisAlignedBoxBounds;
 import org.expeditee.items.Item;
 
 public abstract class XItem 
 {
-        protected Rectangle bounding_rect;
+        protected AxisAlignedBoxBounds bounding_rect;
                 
         protected XItem()
@@ -33 +33 @@
         }
         
-        protected XItem(Rectangle imprint_bounding_rect)
+        protected XItem(AxisAlignedBoxBounds imprint_bounding_rect)
         {
                 this.bounding_rect = imprint_bounding_rect;
@@ -40 +40 @@
         public int getX()
         {
-                return bounding_rect.x;
+                return bounding_rect.getMinX();
         }
         
@@ -46 +46 @@
         {
                 // name alias for getX()
-                return bounding_rect.x;
+                return bounding_rect.getMinX();
         }
         
         public int getY()
         {
-                return bounding_rect.y;
+                return bounding_rect.getMinY();
         }
         
@@ -57 +57 @@
         {
                 // name alias for getY()
-                return bounding_rect.y;
+                return bounding_rect.getMinY();
         }
         
         public int getBoundingYBot()
         {
-                return bounding_rect.y + bounding_rect.height -1;
+                return bounding_rect.getMaxY();
         }
         
         public int getBoundingXRight()
         {
-                return bounding_rect.x + bounding_rect.width -1;
+                return bounding_rect.getMaxX();
         }
         
         public int getBoundingWidth()
         {
-                return bounding_rect.width;
+                return bounding_rect.getWidth();
         }
         
         public int getBoundingHeight()
         {
-                return bounding_rect.height;
+                return bounding_rect.getHeight();
         }
         
-        public Rectangle getBoundingRect()
+        public AxisAlignedBoxBounds getBoundingRect()
         {
                 return bounding_rect;
         }
         
-        public Rectangle setBoundingRect(Rectangle rect)
+        public AxisAlignedBoxBounds setBoundingRect(AxisAlignedBoxBounds rect)
         {
                 return bounding_rect = rect;