Changeset 1102 for trunk/src/org/apollo/util/PopupReaper.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/apollo/util/PopupReaper.java (modified) (17 diffs)

trunk/src/org/apollo/util/PopupReaper.java

@@ -13 +13 @@
 import javax.swing.SwingUtilities;
 
-import org.expeditee.gui.MouseEventRouter;
+import org.expeditee.gio.swing.MouseEventRouter;
 import org.expeditee.gui.Popup;
 import org.expeditee.gui.PopupManager;
@@ -19 +19 @@
 
 /**
- * Yet another daemon .. whos job is to hide popups after their lifetimes have passed
+ * Yet another daemon .. whose job is to hide popups after their lifetimes have passed
  * 
  * @author Brook Novak
  */
 
-public class PopupReaper {
-        
+public class PopupReaper
+{
         private Map<Popup, TemporaryPopup> tempPopups = new HashMap<Popup, TemporaryPopup>();// SHARED RESOURCE - the locker
 
@@ -31 +31 @@
         
         private static PopupReaper instance = new PopupReaper();
-        private PopupReaper() {
-        }
-        public  static PopupReaper getInstance() {
+        
+        private PopupReaper()
+        {
+        }
+        
+        public  static PopupReaper getInstance()
+        {
                 return instance;
         }
@@ -62 +66 @@
          * 
          */
-        public void initPopupLifetime(Popup p, PopupAnimator hideAnimation, int lifetime) {
+        public void initPopupLifetime(Popup p, PopupAnimator hideAnimation, int lifetime)
+        {
                 if (p == null) throw new NullPointerException("p");
                 if (lifetime < 0) throw new IllegalArgumentException("lifetime < 0");
@@ -87 +92 @@
                                 reaper.interrupt();
                         }
-                        
-
-                        
-                }
-                
+                }
         }
         
@@ -115 +116 @@
          * 
          */
-        public boolean revivePopup(Popup p, int lifetime) {
+        public boolean revivePopup(Popup p, int lifetime)
+        {
                 if (p == null) throw new NullPointerException("p");
                 if (lifetime < 0) throw new IllegalArgumentException("lifetime < 0");
@@ -134 +136 @@
 
         
-        private class ReapDaemon extends Thread {
-                
-                ReapDaemon() {
+        private class ReapDaemon extends Thread
+        {
+                ReapDaemon()
+                {
                         super("Popup Reaper");
                         super.setPriority(Thread.MIN_PRIORITY);
@@ -142 +145 @@
                 }
         
-                public void run() {
-                        
+                public void run()
+                {
                         while (true) {
                         
@@ -166 +169 @@
                  *              A Positive wait time, or a negative for nothing to to wait on.
                  */
-                private long reap() {
-
+                private long reap()
+                {
                         Collection<TemporaryPopup> snapshot;
                         
@@ -226 +229 @@
          *
          */
-        private class DoHide implements Runnable {
-                
+        private class DoHide implements Runnable
+        {
                 private TemporaryPopup tempPopup;
                 public boolean didHide = false;
                 
-                public DoHide(TemporaryPopup tempPopup) {
+                public DoHide(TemporaryPopup tempPopup)
+                {
                         this.tempPopup = tempPopup;
                 }
@@ -244 +248 @@
                  *              True if screenPoint is over c.
                  */
-                private boolean isPointInComponant(Component c, Point screenPoint) {
+                private boolean isPointInComponant(Component c, Point screenPoint)
+                {
                         assert(c != null);
                         assert(screenPoint != null);
@@ -257 +262 @@
                 }
         
-                public void run() {
+                public void run()
+                {
                         assert(tempPopup != null);
                         
                         MouseEvent me = MouseEventRouter.getCurrentMouseEvent();
                         if (me != null) {
-                                
-                                if (isPointInComponant(tempPopup.popup, me.getLocationOnScreen()))
-                                        return;
+                                if (isPointInComponant(tempPopup.popup, me.getLocationOnScreen())) return;
                                 
                                 Component invoker = PopupManager.getInstance().getInvoker(tempPopup.popup);
-                                if (invoker != null && isPointInComponant(invoker, me.getLocationOnScreen()))
-                                        return;
-                                
+                                
+                                if (invoker != null && isPointInComponant(invoker, me.getLocationOnScreen())) return;
                         }
 
@@ -289 +292 @@
          *
          */
-        private class TemporaryPopup implements Comparable {
-
+        private class TemporaryPopup implements Comparable<TemporaryPopup>
+        {
                 private Popup popup;
                 private PopupAnimator hideAnim;
@@ -310 +313 @@
                  *
                  */
-                public TemporaryPopup(Popup popup, PopupAnimator anim, int lifetime) {
+                public TemporaryPopup(Popup popup, PopupAnimator anim, int lifetime)
+                {
                         assert(popup != null);
                         assert(lifetime >= 0);
@@ -320 +324 @@
                 }
 
-                public void setNewLifetime(int lifetime) {
+                public void setNewLifetime(int lifetime)
+                {
                         assert(lifetime >= 0);
                         this.lifetime = lifetime;
@@ -326 +331 @@
                 }
                 
-                public void resetLifetime() {
+                public void resetLifetime()
+                {
                         setNewLifetime(lifetime);
                 }
                 
-                public long getDelay() {
+                public long getDelay()
+                {
                         return destructionTime - System.currentTimeMillis();
                 }
@@ -337 +344 @@
                  * {@inheritDoc}
                  */
-                public int compareTo(Object o) {
-                        
-                        long dt2 = ((TemporaryPopup)o).destructionTime;
-                        
-                        if (destructionTime < dt2)
-                         return -1;
-                        
-                      if (destructionTime > dt2)
-                         return 1;
+                public int compareTo(TemporaryPopup o)
+                {
+                        long dt2 = o.destructionTime;
+                        
+                        if (destructionTime < dt2) return -1;
+                        
+                    if (destructionTime > dt2) return 1;
                       
                         return 0;