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

Timestamp:

10/02/18 10:26:22 (6 years ago)

Author:

bln4

Message:

org.expeditee.gui.Browser ->
org.expeditee.gui.DisplayController ->

Altered how the recently added callback system for refresh works. Several callbacks can now be queued up.

File:

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

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

@@ -1459 +1459 @@
          */
         public static synchronized void requestRefresh(boolean useInvalidation) {
-                requestRefresh(useInvalidation, () -> false);
+                requestRefresh(useInvalidation, null);
         }
         
@@ -1482 +1482 @@
                 private Boolean _requeueWithInvalidation = null;
                 private Object _lock = new Object();
-                private BooleanSupplier callback;
+                private List<BooleanSupplier> callbacks = new LinkedList<BooleanSupplier>();
                 
                 /** Enqueues a redraw on the GIO thread, or remembers to do so once the current redraw finishes. */
                 public void enqueue(final boolean useInvalidation, final BooleanSupplier callback)
                 {
+                        synchronized(callbacks) {
+                                if(callback != null) {
+                                        callbacks.add(callback);
+                                }
+                        }
                         synchronized (_lock) {
                                 if (!_enqueued) {
                                         _enqueued = true;
-                                        this.callback = callback;
                                         _useInvalidation = useInvalidation;
                                         EcosystemManager.getMiscManager().runOnGIOThread(this);
@@ -1503 +1507 @@
                 {
                         try {
-                                if(refresh(_useInvalidation) && callback != null) {
-                                        callback.getAsBoolean();
-                                        callback = null;
+                                if(refresh(_useInvalidation)) {
+                                        synchronized (callbacks) {
+                                                callbacks.forEach(cb -> cb.getAsBoolean());
+                                                callbacks.clear();
+                                        }
                                 }
                         } catch (Throwable e) {