Changeset 1175 for trunk

Timestamp:

09/28/18 10:23:49 (6 years ago)

Author:

bln4

Message:

org.expeditee.gui.PopupManager ->

Temporarily comments out the code to paint popups while that system is not functional.

File:

• trunk/src/org/expeditee/gui/PopupManager.java (modified) (11 diffs)

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

@@ -43 +43 @@
         {
                 // Only valid for Swing ecosystems
-                if (EcosystemManager.getType() != Ecosystem.Swing) return null;
+                if (EcosystemManager.getType() != Ecosystem.Swing) {
+                        return null;
+                }
                 
                 // Construct the instance
-                if (_instance == null) _instance = new PopupManager();
+                if (_instance == null) {
+                        _instance = new PopupManager();
+                }
                 
                 return _instance;
@@ -65 +69 @@
         public void add(Popup p)
         {
-                if (p == null) return;
-
-                synchronized(_popups) {
-                        if (!_popups.contains(p)) _popups.add(p);
-                }
+                if (p == null) {
+                        return;
+                }
+
+                 synchronized(_popups) {
+                         if (!_popups.contains(p)) {
+                                _popups.add(p);
+                        }
+                 }
         }
         
         public void remove(Popup p)
         {
-                if (p == null) return;
-
-                synchronized(_popups) {
-                        if (_popups.contains(p)) _popups.remove(p);
+                if (p == null) {
+                        return;
+                }
+
+                synchronized(_popups) {
+                        if (_popups.contains(p)) {
+                                _popups.remove(p);
+                        }
                 }
         }
@@ -100 +112 @@
         public boolean isPointOverPopup(Point p)
         {
-                if (p == null) throw new NullPointerException("p");
+                if (p == null) {
+                        throw new NullPointerException("p");
+                }
 
                 synchronized(_popups) {
                         for (Popup popup : _popups) {
-                                if (popup.getBounds().contains(p)) return true;
+                                if (popup.getBounds().contains(p)) {
+                                        return true;
+                                }
                         }
                 }
@@ -124 +140 @@
         public boolean isShowing(Popup p)
         {
-                if (p == null) throw new NullPointerException("p");
+                if (p == null) {
+                        throw new NullPointerException("p");
+                }
 
                 synchronized(_popups) {
@@ -146 +164 @@
                 synchronized(_popups) {
                         for (Popup p : _popups) {
-                                if (p.doesAutoHide()) p.hide();
+                                if (p.doesAutoHide()) {
+                                        p.hide();
+                                }
                         }
                 }
@@ -160 +180 @@
                 synchronized(_popups) {
                         for (Popup p : _popups) {
-                                if (p.shouldConsumeBackClick()) return true;
+                                if (p.shouldConsumeBackClick()) {
+                                        return true;
+                                }
                         }
                 }
@@ -167 +189 @@
         }
         
+        @Override
         public void frameChanged()
         {
@@ -176 +199 @@
         public void paint()
         {
-                synchronized (_popups) {
-                        for (Popup popup : _popups) {
-                                popup.update();
-                                popup.paint();
-                        }
-                }
+                //Bryce: popups temporarly disabled due to them not working and interfering in things.
+//              synchronized (_popups) {
+//                      for (Popup popup : _popups) {
+//                              popup.update();
+//                              popup.paint();
+//                      }
+//              }
         }
         
@@ -235 +259 @@
                 public void hide()
                 {
-                        if (!_showing) return;
+                        if (!_showing) {
+                                return;
+                        }
                         
                         _showing = false;
@@ -243 +269 @@
                 public void show()
                 {
-                        if (_showing) return;
+                        if (_showing) {
+                                return;
+                        }
                         
                         _showing = true;
@@ -329 +357 @@
                         
                         float percentShown = getProgress();
-                        if (!isShowing()) percentShown = 1 - percentShown;
+                        if (!isShowing()) {
+                                percentShown = 1 - percentShown;
+                        }
                         
                         return AxisAlignedBoxBounds.lerp(_initialBounds, fullBounds, percentShown);