Changeset 1172 for trunk/src/org/expeditee/gui/FrameGraphics.java

Timestamp:

09/28/18 10:16:45 (6 years ago)

Author:

bln4

Message:

 

File:

• trunk/src/org/expeditee/gui/FrameGraphics.java (modified) (17 diffs)

trunk/src/org/expeditee/gui/FrameGraphics.java

@@ -33 +33 @@
 import org.expeditee.core.bounds.PolygonBounds;
 import org.expeditee.gio.EcosystemManager;
+import org.expeditee.gio.input.KBMInputEvent.Key;
 import org.expeditee.gio.input.StandardInputEventListeners;
-import org.expeditee.gio.input.KBMInputEvent.Key;
 import org.expeditee.items.Circle;
 import org.expeditee.items.Dot;
 import org.expeditee.items.Item;
+import org.expeditee.items.Item.HighlightMode;
 import org.expeditee.items.Line;
 import org.expeditee.items.UserAppliedPermission;
 import org.expeditee.items.XRayable;
-import org.expeditee.items.Item.HighlightMode;
 import org.expeditee.items.widgets.Widget;
 import org.expeditee.items.widgets.WidgetEdge;
@@ -73 +73 @@
         public static Image getFrameImage(Frame toPaint, Clip clip, Dimension size, boolean isActualFrame, boolean createVolatile)
         {
-                if (toPaint == null) return null;
+                if (toPaint == null) {
+                        return null;
+                }
 
                 // the buffer is not valid, so it must be recreated
@@ -120 +122 @@
                 // Nicer looking lines, but may be too jerky while
                 // rubber-banding on older machines
-                if (UserSettings.AntiAlias.get()) EcosystemManager.getGraphicsManager().setAntialiasing(true);
+                if (UserSettings.AntiAlias.get()) {
+                        EcosystemManager.getGraphicsManager().setAntialiasing(true);
+                }
                 
                 // If we are doing @f etc... then have a clear background if its the default background color
@@ -130 +134 @@
                 } else {
                         backgroundColor = toPaint.getBackgroundColor();
-                        if (backgroundColor == null) backgroundColor = Item.TRANSPARENT;
+                        if (backgroundColor == null) {
+                                backgroundColor = Item.TRANSPARENT;
+                        }
                 }
 
@@ -204 +210 @@
                         // the box that is supposed to be underneath
                         Widget iw = widgetItor.previous();
-                        if (clip == null || clip.isNotClipped() || clip.getBounds().intersects(iw.getBounds())) {
+                        if (clip == null || clip.isNotClipped() || clip.getBounds().intersects(iw.getClip().getBounds())) {
                                 iw.paint();
                                 PaintItem(iw.getItems().get(4));
@@ -285 +291 @@
                         }
                         
-                        if (isActualFrame) PaintLines(lines);
+                        if (isActualFrame) {
+                                PaintLines(lines);
+                        }
                 } else {
-                        if (isActualFrame) PaintLines(freeItemsToPaint);
+                        if (isActualFrame) {
+                                PaintLines(freeItemsToPaint);
+                        }
                 }
 
@@ -310 +320 @@
                 if(!FreeItems.hasItemsAttachedToCursor()) {
                         Item current = FrameUtils.getCurrentItem();
-                        if(current != null) current.paintTooltip();
-                        if (_lastToolTippedItem != null) _lastToolTippedItem.clearTooltips();
+                        if(current != null) {
+                                current.paintTooltip();
+                        }
+                        if (_lastToolTippedItem != null) {
+                                _lastToolTippedItem.clearTooltips();
+                        }
                         _lastToolTippedItem = current;
                 }
@@ -347 +361 @@
                                         // When painting a line all connected lines are painted too
                                         done.addAll(l.getAllConnected());
-                                        if (l.getStartItem().getEnclosedArea() == 0) PaintItem(i);
+                                        if (l.getStartItem().getEnclosedArea() == 0) {
+                                                PaintItem(i);
+                                        }
                                 }
                         }
@@ -368 +384 @@
                         // Also ignore invisible items..
                         // TODO possibly ignore invisible items before coming to this method?
-                        if (done.contains(i)) continue;
+                        if (done.contains(i)) {
+                                continue;
+                        }
                         
                         if (i instanceof XRayable) {
@@ -375 +393 @@
                         } else if (i.hasEnclosures()) {
                                 for (Item enclosure : i.getEnclosures()) {
-                                        if (!toFill.contains(enclosure)) toFill.add(enclosure);
+                                        if (!toFill.contains(enclosure)) {
+                                                toFill.add(enclosure);
+                                        }
                                 }
                                 done.addAll(i.getConnected());
@@ -397 +417 @@
                 // Sort the items to fill
                 Collections.sort(toFill, new Comparator<Item>() {
+                        @Override
                         public int compare(Item a, Item b) {
                                 Double aArea = a.getEnclosedArea();
@@ -405 +426 @@
                                         PolygonBounds pA = a.getEnclosedShape();
                                         PolygonBounds pB = b.getEnclosedShape();
-                                        if (pA == null || pB == null) return 0;
+                                        if (pA == null || pB == null) {
+                                                return 0;
+                                        }
                                         return new Integer(pA.getMinX()).compareTo(pB.getMinX());
                                 }
@@ -419 +442 @@
                                 i.paintFill();
                                 List<Line> lines = i.getLines();
-                                if (lines.size() > 0) PaintItem(lines.get(0));
+                                if (lines.size() > 0) {
+                                        PaintItem(lines.get(0));
+                                }
                         }
                 }
@@ -427 +452 @@
         static void PaintItem(Item i)
         {
-                if (i == null) return;
+                if (i == null) {
+                        return;
+                }
 
                 // do not paint annotation items in audience mode
@@ -456 +483 @@
                         if (toDisconnect != null && !(i instanceof WidgetEdge)) {
                                 Item.HighlightMode newMode = toDisconnect.getHighlightMode();
-                                if (FreeItems.hasItemsAttachedToCursor())
+                                if (FreeItems.hasItemsAttachedToCursor()) {
                                         newMode = Item.HighlightMode.Normal;
+                                }
                                 // unhighlight all the other dots
                                 for (Item conn : toDisconnect.getAllConnected()) {
@@ -551 +579 @@
         public static void changeHighlightMode(Item item, Item.HighlightMode newMode, Item.HighlightMode connectedNewMode)
         {
-                if (item == null) return;
+                if (item == null) {
+                        return;
+                }
 
                 if (item.hasVector()) {
@@ -600 +630 @@
          */
         public static void addFrameRenderPass(FrameRenderPass pass) {
-                if (pass == null)
+                if (pass == null) {
                         throw new NullPointerException("pass");
-
-                if (!_frameRenderPasses.contains(pass))
+                }
+
+                if (!_frameRenderPasses.contains(pass)) {
                         _frameRenderPasses.add(pass);
+                }
         }