[jboss-svn-commits] JBL Code SVN: r21215 - in labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools: src/org/guvnor/tools/utils and 1 other directories.

[jboss-svn-commits at lists.jboss.org]

Author: john.graham at jboss.org
Date: 2008-07-24 15:38:45 -0400 (Thu, 24 Jul 2008)
New Revision: 21215

Modified:
   labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/META-INF/MANIFEST.MF
   labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/PlatformUtils.java
   labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/wizards/AddResourceWizard.java
Log:
Fix invalid thread access when updating decorator after drag/drop

Modified: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/META-INF/MANIFEST.MF
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/META-INF/MANIFEST.MF	2008-07-24 15:45:01 UTC (rev 21214)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/META-INF/MANIFEST.MF	2008-07-24 19:38:45 UTC (rev 21215)
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %plugin.name
 Bundle-SymbolicName: org.guvnor.tools;singleton:=true
-Bundle-Version: 0.6.0.200807241144
+Bundle-Version: 0.6.0.200807241535
 Bundle-Activator: org.guvnor.tools.Activator
 Bundle-Vendor: %plugin.provider
 Bundle-Localization: plugin

Modified: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/PlatformUtils.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/PlatformUtils.java	2008-07-24 15:45:01 UTC (rev 21214)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/PlatformUtils.java	2008-07-24 19:38:45 UTC (rev 21215)
@@ -20,6 +20,7 @@
 import org.eclipse.ui.IDecoratorManager;
 import org.eclipse.ui.IEditorDescriptor;
 import org.eclipse.ui.IStorageEditorInput;
+import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.PlatformUI;
@@ -67,8 +68,15 @@
 	 * Causes the platform to update Guvnor decoration notions.
 	 */
 	public static void updateDecoration() {
-		IDecoratorManager manager = Activator.getDefault().getWorkbench().getDecoratorManager();
-		manager.update(GuvnorDecorator.DECORATOR_ID);
+		final IWorkbench workbench = Activator.getDefault().getWorkbench();
+		workbench.getDisplay().syncExec(new Runnable() {
+			public void run() {
+				IDecoratorManager manager = workbench.getDecoratorManager();
+				manager.update(GuvnorDecorator.DECORATOR_ID);
+			}
+		});
+//		IDecoratorManager manager = Activator.getDefault().getWorkbench().getDecoratorManager();
+//		manager.update(GuvnorDecorator.DECORATOR_ID);
 	}
 	
 	/**

Modified: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/wizards/AddResourceWizard.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/wizards/AddResourceWizard.java	2008-07-24 15:45:01 UTC (rev 21214)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/wizards/AddResourceWizard.java	2008-07-24 19:38:45 UTC (rev 21215)
@@ -97,6 +97,7 @@
 				WebDavServerCache.cacheWebDavClient(model.getRepLocation(), client);
 			}
 			try {
+//				res = client.createResource(fullPath, selectedFile.getContents(), false);
 				// Hack: When creating a file, if the actual contents are passed first,
 				// the client hangs for about 20 seconds when closing the InputStream.
 				// Don't know why...
@@ -115,6 +116,7 @@
 				boolean retry = PlatformUtils.getInstance().
 									authenticateForServer(model.getRepLocation(), client); 
 				if (retry) {
+//					res = client.createResource(fullPath, selectedFile.getContents(), false);
 					// See Hack note immediately above...
 					res = client.createResource(fullPath, new ByteArrayInputStream(new byte[0]), false);
 					if (!res) {