Changeset 1140 for trunk/src/org/expeditee/gui/DisplayController.java

Timestamp:

09/17/18 11:36:12 (6 years ago)

Author:

bln4

Message:

org.expeditee.gui.DisplayController ->

requestRefresh now optionally takes a callback function that is call once the refresh is actually completed.

org.expeditee.gui.Browser ->

Instead of pushing delayed messages to MessageBay once execution of Browser constructor being finished, they are now delayed until the first refresh is completed. This removes a possible race condition on startup but may not be the ideal solution.

File:

• trunk/src/org/expeditee/gui/DisplayController.java (modified) (8 diffs)

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

@@ -26 +26 @@
 import java.util.List;
 import java.util.Stack;
+import java.util.function.BooleanSupplier;
 
 import org.expeditee.core.Clip;
@@ -1225 +1226 @@
          * requestRefresh(boolean) to ensure no infinite refresh call loops are created.
          */
-        private static void refresh(boolean useInvalidation)
+        private static boolean refresh(boolean useInvalidation)
         {
                 Frame currentFrame = getCurrentFrame();
                 if(currentFrame == null) {
-                        return;
-                }
+                        return false;
+                }
+                //For Monday; at this point, the DisplayController is ready to do something
+                //RequestRefesh could have a callback method
                 
                 // Always get the clip as it clears at the same time
@@ -1236 +1239 @@
                 
                 // No damaged areas
-                if (useInvalidation && clip.isFullyClipped()) return;
+                if (useInvalidation && clip.isFullyClipped()) return true;
                 
                 GraphicsManager g = EcosystemManager.getGraphicsManager();
@@ -1306 +1309 @@
                 g.popDrawingSurface();
                 g.drawImage(_refreshBuffer, Point.ORIGIN);
+                return true;
         }
         
@@ -1371 +1375 @@
         /** Runnable which ensures overlapping refresh requests are joined. */
         private static RenderRequestMarsheller _requestMarsheller = new RenderRequestMarsheller();
-
+        
         /**
          * If wanting to refresh from another thread - other than the main thread
@@ -1377 +1381 @@
          * Use this method for thread safety.
          */
-        public static synchronized void requestRefresh(boolean useInvalidation)
-        {
+        public static synchronized void requestRefresh(boolean useInvalidation) {
+                requestRefresh(useInvalidation, () -> false);
+        }
+        
+        public static synchronized void requestRefresh(final boolean useInvalidation, final BooleanSupplier callback) {
                 try {
-                        _requestMarsheller.enqueue(useInvalidation);
+                        _requestMarsheller.enqueue(useInvalidation, callback);
                 } catch (Throwable e) {
                         e.printStackTrace();
@@ -1398 +1405 @@
                 private Boolean _requeueWithInvalidation = null;
                 private Object _lock = new Object();
+                private BooleanSupplier callback;
                 
                 /** Enqueues a redraw on the GIO thread, or remembers to do so once the current redraw finishes. */
-                public void enqueue(boolean useInvalidation)
+                public void enqueue(final boolean useInvalidation, final BooleanSupplier callback)
                 {
                         synchronized (_lock) {
                                 if (!_enqueued) {
                                         _enqueued = true;
+                                        this.callback = callback;
                                         _useInvalidation = useInvalidation;
                                         EcosystemManager.getMiscManager().runOnGIOThread(this);
@@ -1416 +1425 @@
                 {
                         try {
-                                refresh(_useInvalidation);
+                                if(refresh(_useInvalidation) && callback != null) {
+                                        callback.getAsBoolean();
+                                        callback = null;
+                                }
                         } catch (Throwable e) {
                                 e.printStackTrace();