Little fix to make logging thread save.

Ruediger.Lunde · Ruediger.Lunde · commit 58dc3a83cc8f · 2009-09-27T14:38:27.000Z
diff --git a/src/aima/gui/applications/search/map/RoutePlanningAgentAppDemo.java b/src/aima/gui/applications/search/map/RoutePlanningAgentAppDemo.java
@@ -206,8 +206,7 @@ protected AdaptableHeuristicFunction createHeuristic(int heuIdx) {
 		@Override
 		protected void startAgent() {
 			if (destinations.size() != 1) {
-				frame
-						.logMessage("Error: This agent requires exact one destination.");
+				frame.logMessage("Error: This agent requires exact one destination.");
 				return;
 			}
 			frame.logMessage("<route-planning-simulation-protocol>");
diff --git a/src/aima/gui/framework/AgentAppFrame.java b/src/aima/gui/framework/AgentAppFrame.java
@@ -16,6 +16,7 @@
 import javax.swing.JSplitPane;
 import javax.swing.JTextArea;
 import javax.swing.JToolBar;
+import javax.swing.SwingUtilities;
 
 /**
  * <p>
@@ -165,14 +166,32 @@ public void modelChanged() {
 			e.printStackTrace();
 		}
 	}
-
+	
 	/** Prints a log message on the text area. */
 	public void logMessage(String message) {
-		int start = textArea.getDocument().getLength();
-		textArea.append(message + "\n");
-		int end = textArea.getDocument().getLength();
-		textArea.setSelectionStart(start);
-		textArea.setSelectionEnd(end);
+		MessageLogger ml = new MessageLogger();
+		ml.message = message;
+		if (SwingUtilities.isEventDispatchThread()) {
+			ml.run();
+		} else {
+		    try {
+		    	SwingUtilities.invokeAndWait(ml);
+		    } catch (Exception e) {
+		    	e.printStackTrace();
+		    }
+		}
+	}
+	
+	/** Helper class which makes logging thread save. */
+	private class MessageLogger implements Runnable {
+		String message;
+		public void run() {
+        	int start = textArea.getDocument().getLength();
+    		textArea.append(message + "\n");
+    		int end = textArea.getDocument().getLength();
+    		textArea.setSelectionStart(start);
+    		textArea.setSelectionEnd(end);
+        }
 	}
 
 	/** Assembles the inner structure of the frame. */
