From 24a43f659dfcab8cc4618c153b789a7418fbb8f1 Mon Sep 17 00:00:00 2001
From: Alain Magloire <alain@qnx.com>
Date: Tue, 30 Mar 2004 14:34:45 +0000
Subject: [PATCH] Fix PR 56734

---
 core/org.eclipse.cdt.ui/ChangeLog             |  7 +++++
 core/org.eclipse.cdt.ui/plugin.xml            |  2 +-
 .../ui/buildconsole/BuildConsolePage.java     | 30 ++++++++++++-------
 3 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog
index 01500764c61..e104f76af55 100644
--- a/core/org.eclipse.cdt.ui/ChangeLog
+++ b/core/org.eclipse.cdt.ui/ChangeLog
@@ -1,3 +1,10 @@
+2004-03-30 Alain Magloire
+
+	Fix PR 56734
+
+	* src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsolePage.java
+	* puglin.xml
+
 2004-03-30 Alain Magloire
 
 	Show the import/export menu even when no selection.
diff --git a/core/org.eclipse.cdt.ui/plugin.xml b/core/org.eclipse.cdt.ui/plugin.xml
index 19cf5f2461e..e5beca4553b 100644
--- a/core/org.eclipse.cdt.ui/plugin.xml
+++ b/core/org.eclipse.cdt.ui/plugin.xml
@@ -70,7 +70,7 @@
             enabled="false"
             description="%HideObjectFiles.description"
             class="org.eclipse.cdt.internal.ui.filters.ObjectFilter"
-            id="org.eclipse.cdt.internal.ui.CView.ArchiveFilter">
+            id="org.eclipse.cdt.internal.ui.CView.ObjectFilter">
       </filter>
       <filter
             targetId="org.eclipse.cdt.ui.CView"
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsolePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsolePage.java
index 957bad6d733..8662638d053 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsolePage.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsolePage.java
@@ -197,18 +197,26 @@ public class BuildConsolePage extends Page implements ISelectionListener, IPrope
 	 * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent)
 	 */
 	public void propertyChange(PropertyChangeEvent event) {
-		Object source = event.getSource();
-		String property = event.getProperty();
-		if (BuildConsole.P_STREAM_COLOR.equals(property) && source instanceof BuildConsoleStream) {
-			BuildConsoleStream stream = (BuildConsoleStream) source;
-			if (stream.getConsole().equals(getConsole())) {
-				getViewer().getTextWidget().redraw();
+		final Object source = event.getSource();
+		final String property = event.getProperty();
+		Display display = getControl().getDisplay();
+		display.asyncExec(new Runnable() {
+			/* (non-Javadoc)
+			 * @see java.lang.Runnable#run()
+			 */
+			public void run() {
+				if (BuildConsole.P_STREAM_COLOR.equals(property) && source instanceof BuildConsoleStream) {
+					BuildConsoleStream stream = (BuildConsoleStream) source;
+					if (stream.getConsole().equals(getConsole())) {
+						getViewer().getTextWidget().redraw();
+					}
+				} else if (property.equals(BuildConsolePreferencePage.PREF_BUILDCONSOLE_FONT)) {
+					setFont(JFaceResources.getFont(BuildConsolePreferencePage.PREF_BUILDCONSOLE_FONT));
+				} else if (property.equals(BuildConsolePreferencePage.PREF_BUILDCONSOLE_TAB_WIDTH)) {
+					setTabs(CUIPlugin.getDefault().getPluginPreferences().getInt(BuildConsolePreferencePage.PREF_BUILDCONSOLE_TAB_WIDTH));
+				}
 			}
-		} else if (property.equals(BuildConsolePreferencePage.PREF_BUILDCONSOLE_FONT)) {
-			setFont(JFaceResources.getFont(BuildConsolePreferencePage.PREF_BUILDCONSOLE_FONT));
-		} else if (property.equals(BuildConsolePreferencePage.PREF_BUILDCONSOLE_TAB_WIDTH)) {
-			setTabs(CUIPlugin.getDefault().getPluginPreferences().getInt(BuildConsolePreferencePage.PREF_BUILDCONSOLE_TAB_WIDTH));
-		}
+		});
 
 	}