Changeset 1102 for trunk/src/org/expeditee/items/ItemUtils.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/ItemUtils.java (modified) (20 diffs)

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

@@ -19 +19 @@
 package org.expeditee.items;
 
-import java.awt.Color;
-import java.awt.Rectangle;
-import java.awt.image.ImageObserver;
 import java.io.File;
 import java.io.UnsupportedEncodingException;
@@ -34 +31 @@
 import java.util.Map;
 
-import org.expeditee.gui.DisplayIO;
+import org.expeditee.core.Colour;
+import org.expeditee.core.bounds.AxisAlignedBoxBounds;
+import org.expeditee.gui.DisplayController;
+import org.expeditee.gui.DisplayController.TwinFramesSide;
 import org.expeditee.gui.Frame;
 import org.expeditee.gui.FrameUtils;
@@ -40 +40 @@
 import org.expeditee.gui.Vector;
 import org.expeditee.items.Item.HighlightMode;
-import org.expeditee.items.widgets.InteractiveWidget;
+import org.expeditee.items.widgets.Widget;
 import org.expeditee.items.widgets.InteractiveWidgetInitialisationFailedException;
 import org.expeditee.items.widgets.InteractiveWidgetNotAvailableException;
@@ -360 +360 @@
          * 
          * @param source
-         *            The Text file containing the Picture infomation
+         *            The Text file containing the Picture information
          * @return The Picture object representing the file, or Null if the file is
          *         not found.
          */
-        public static Picture CreatePicture(Text source, ImageObserver observer, boolean tryRemote) {
+        public static Picture CreatePicture(Text source, boolean tryRemote) {
                 String text = source.getText();
                 String path = "";
@@ -424 +424 @@
                                 // call CreatePicture again, but with tryRemote set to false so we won't get into an infinite loop
                                 // if something goes wrong with finding the downloaded image
-                                return CreatePicture(source, observer, false);
+                                return CreatePicture(source, false);
                         }
                                 return null;
@@ -434 +434 @@
 
                 try {
-                        Picture pic = new Picture(source, fileName, path, size, observer);
+                        Picture pic = new Picture(source, fileName, path, size);
 
                         return pic;
@@ -444 +444 @@
         }
         
-        public static Picture CreatePicture(Text source, ImageObserver observer) {
-                return CreatePicture(source, observer, true);
+        public static Picture CreatePicture(Text source) {
+                return CreatePicture(source, true);
         }
 
@@ -483 +483 @@
 
                 // Widgets are super special
-                List<InteractiveWidget> widgets = new ArrayList<InteractiveWidget>();
+                List<Widget> widgets = new ArrayList<Widget>();
 
                 for (Item i : toCopy) {
@@ -596 +596 @@
                         Item start = lineEndMap.get(c.getStart());
                         Item end = lineEndMap.get(c.getEnd());
-                        int id = DisplayIO.getCurrentFrame().getNextItemID();
+                        int id = DisplayController.getCurrentFrame().getNextItemID();
                         if (start != null && end != null) {
                                 new Constraint(start, end, id, c.getType());
@@ -603 +603 @@
 
                 // BROOK
-                for (InteractiveWidget iw : widgets) {
+                for (Widget iw : widgets) {
                         try {
 
-                                InteractiveWidget icopy = iw.copy();
+                                Widget icopy = iw.copy();
                                 copies.addAll(icopy.getItems());
 
@@ -680 +680 @@
                 Item copy = origEnd.copy();
                 origEnd.setHighlightMode(HighlightMode.None);
+                origEnd.setHighlightColorToDefault();
                 copy.removeAllLines();
                 copy.removeAllConstraints();
@@ -688 +689 @@
 
                 // create a new line
-                Frame currentFrame = DisplayIO.getCurrentFrame();
+                Frame currentFrame = DisplayController.getCurrentFrame();
                 Line line = new Line(origEnd, copy, currentFrame.getNextItemID());
                 // if the previous line was constrained then make the new line
@@ -694 +695 @@
                 // TODO add later a diagonal constraint if getLines() == 3 or 4
                 Collection<Constraint> constraints = origEnd.getConstraints();
-                if (constrain && constraints.size() > 0
-                                && origEnd.getLines().size() == 2) {
+                if (constrain && constraints.size() > 0 && origEnd.getLines().size() == 2) {
                         Integer type = null;
                         for (Constraint c : constraints) {
@@ -710 +710 @@
                         }
                         if (type != null) {
-                                new Constraint(origEnd, copy, currentFrame.getNextItemID(),
-                                                type);
+                                new Constraint(origEnd, copy, currentFrame.getNextItemID(), type);
                         }
                 }
@@ -726 +725 @@
 
         public static void New() {
-                EnclosedCheck(DisplayIO.getCurrentFrame().getItems());
+                EnclosedCheck(DisplayController.getCurrentFrame().getItems());
         }
 
         public static void Old() {
-                OldEnclosedCheck(DisplayIO.getCurrentFrame().getItems());
+                OldEnclosedCheck(DisplayController.getCurrentFrame().getItems());
         }
 
@@ -902 +901 @@
          */
         public static boolean isVisible(Item i) {
-                if (DisplayIO.isTwinFramesOn()) {
-                        if (!isVisible(DisplayIO.getFrames()[0], i)) {
-                                return isVisible(DisplayIO.getFrames()[1], i);
+                if (DisplayController.isTwinFramesOn()) {
+                        if (!isVisible(DisplayController.getFrameOnSide(TwinFramesSide.LEFT), i)) {
+                                return isVisible(DisplayController.getFrameOnSide(TwinFramesSide.RIGHT), i);
                         } else {
                                 return true;
                         }
                 } else {
-                        return isVisible(DisplayIO.getCurrentFrame(), i);
+                        return isVisible(DisplayController.getCurrentFrame(), i);
                 }
         }
@@ -923 +922 @@
          * @return True if visible/free from given frame.
          */
-        public static boolean isVisible(Frame fromFrame, Item i) {
-                if (fromFrame == null)
-                        return false;
+        public static boolean isVisible(Frame fromFrame, Item i)
+        {
+                if (fromFrame == null) return false;
 
                 Frame parent = i.getParent();
 
-                if (parent == fromFrame)
+                if (parent == fromFrame) {
                         return true;
+                } else if (parent == null) {
+                        return FreeItems.getInstance().contains(i) || FreeItems.getCursor().contains(i);
+                }
                 
-                else if (parent == null)
-                        return FreeItems.getInstance().contains(i)
-                                        || FreeItems.getCursor().contains(i);
-
                 return fromFrame.getAllItems().contains(i) && i.isVisible();
         }
 
-        public static Rectangle expandRectangle(Rectangle r, int n) {
-                return new Rectangle(r.x - (n >> 1), r.y - (n >> 1), r.width + n,
-                                r.height + n);
+        public static AxisAlignedBoxBounds expandRectangle(AxisAlignedBoxBounds r, int n)
+        {
+                if (r == null) return null;
+                
+                return new AxisAlignedBoxBounds(r.getMinX() - (n >> 1), r.getMinY() - (n >> 1), r.getWidth() + n, r.getHeight() + n);
         }
 
@@ -973 +973 @@
                 int originX = v.Origin.x;
                 int originY = v.Origin.y;
-                Color defaultForeground = v.Foreground;
-                Color defaultBackground = v.Background;
+                Colour defaultForeground = v.Foreground;
+                Colour defaultBackground = v.Background;
                 UserAppliedPermission permission = v.permission;
                 // TODO should this be checking if the frame has the
@@ -1014 +1014 @@
          * @return List of (unique)widgets in items. Never null.
          */
-        public static List<InteractiveWidget> extractWidgets(List<Item> items) {
+        public static List<Widget> extractWidgets(List<Item> items) {
                 assert (items != null);
 
-                List<InteractiveWidget> iWidgets = new LinkedList<InteractiveWidget>();
+                List<Widget> iWidgets = new LinkedList<Widget>();
 
                 for (Item i : items) {
@@ -1053 +1053 @@
          * @param frame
          */
-        public static void Justify(Frame frame) {
+        public static void Justify(Frame frame)
+        {
+                if (frame == null) return;
                 EnclosedCheck(frame.getItems());
                 Justify(frame.getItems());