Changeset 6096

Timestamp:

2003-12-02T17:26:37+13:00 (20 years ago)

Author:

jmt12

Message:

Added and then removed some debug comments

File:

• trunk/gli/src/org/greenstone/gatherer/util/SynchronizedTreeModelTools.java (modified) (2 diffs)

trunk/gli/src/org/greenstone/gatherer/util/SynchronizedTreeModelTools.java

@@ -37 +37 @@
 public class SynchronizedTreeModelTools {
     /** Adds an insertNodeInto model update onto the AWT Event queue. This gets around the lack of synchronization illustrated above. */
-    static final public Runnable insertNodeInto(final DefaultTreeModel model, final MutableTreeNode parent, final MutableTreeNode target_node) {
+    static final public Runnable insertNodeInto(DefaultTreeModel model, MutableTreeNode parent, MutableTreeNode target_node) {
+    return insertNodeInto(model, parent, target_node, true);
+    }
+
+    static final public Runnable insertNodeInto(final DefaultTreeModel model, final MutableTreeNode parent, final MutableTreeNode target_node, boolean wait_allowed) {
     final Runnable doInsertNodeInto = new Runnable() {
         public void run() {
+            ///ystem.err.print("Running task... ");
             int index = -1;
             int pos = 0;
@@ -70 +75 @@
         }
         };
+    ///ystem.err.print("Queuing Task... ");
     try {
-                //SwingUtilities.invokeLater(doInsertNodeInto);
-        SwingUtilities.invokeAndWait(doInsertNodeInto);
+        if(wait_allowed && !SwingUtilities.isEventDispatchThread()) {
+        ///ystem.err.print("In another thread - invoke and wait... ");
+        SwingUtilities.invokeAndWait(doInsertNodeInto);
+        }
+        else {
+        ///ystem.err.print("In Event Thread or wait not allowed - invoke later... ");
+        SwingUtilities.invokeLater(doInsertNodeInto);
+        }
     }
     catch (Exception e) {
         e.printStackTrace();
     }
-    // If (and only if) we've thrown an error because we tried to invoke the runnable task and wait, when we are in the AWTEvent thread already, then try agin but with an invoke later.
-    catch (java.lang.Error error) {
-        if(error.toString().equals("java.lang.Error: Cannot call invokeAndWait from the event dispatcher thread")) {
-        SwingUtilities.invokeLater(doInsertNodeInto);
-        }
-    }
+    ///ystem.err.print("Added Task... ");
     return doInsertNodeInto;
     }