Attachment 78209 Details for Bug 203105 – Patch decoupling plugin activation for UI adapters

[patch] Patch decoupling plugin activation for UI adapters

patch203105_decouple_pluginActivation.diff.txt (text/plain), 5.22 KB, created by Martin Oberhuber

on 2007-09-12 13:17:06 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Oberhuber

Created: 2007-09-12 13:17:06 EDT

Size: 5.22 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.rse.subsystems.shells.core
>Index: src/org/eclipse/rse/internal/subsystems/shells/core/Activator.java
>===================================================================
>RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/internal/subsystems/shells/core/Activator.java,v
>retrieving revision 1.2
>diff -u -r1.2 Activator.java
>--- src/org/eclipse/rse/internal/subsystems/shells/core/Activator.java	4 Apr 2007 11:37:39 -0000	1.2
>+++ src/org/eclipse/rse/internal/subsystems/shells/core/Activator.java	12 Sep 2007 17:11:13 -0000
>@@ -12,6 +12,7 @@
>  * 
>  * Contributors:
>  * Martin Oberhuber (Wind River) - [180519] declaratively register rse.shells.ui. adapter factories
>+ * Martin Oberhuber (wind River) - [203105] Decouple recursive plugin activation of UI adapters
>  ********************************************************************************/
> 
> package org.eclipse.rse.internal.subsystems.shells.core;
>@@ -46,7 +47,12 @@
> 		// make sure that required adapters factories are loaded 
> 		//(will typically activate org.eclipse.rse.shells.ui)
> 		//TODO Check that this does not fire up the UI if we want to be headless
>-		Platform.getAdapterManager().loadAdapter(new RemoteOutput(null,""), "org.eclipse.rse.ui.view.ISystemViewElementAdapter"); //$NON-NLS-1$ //$NON-NLS-2$
>+		//Decouple from the current Thread
>+		new Thread("shells.ui adapter loader") { //$NON-NLS-1$
>+			public void run() {
>+				Platform.getAdapterManager().loadAdapter(new RemoteOutput(null,""), "org.eclipse.rse.ui.view.ISystemViewElementAdapter"); //$NON-NLS-1$ //$NON-NLS-2$
>+			}
>+		}.start();
> 		// Others (IRemoteError, ShellServiceSubSystemConfigurationAdapter 
> 		// will be available automatically once the shells.ui plugin is loaded
> 	}
>#P org.eclipse.rse.subsystems.processes.core
>Index: src/org/eclipse/rse/internal/subsystems/processes/core/Activator.java
>===================================================================
>RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.processes.core/src/org/eclipse/rse/internal/subsystems/processes/core/Activator.java,v
>retrieving revision 1.2
>diff -u -r1.2 Activator.java
>--- src/org/eclipse/rse/internal/subsystems/processes/core/Activator.java	4 Apr 2007 12:10:00 -0000	1.2
>+++ src/org/eclipse/rse/internal/subsystems/processes/core/Activator.java	12 Sep 2007 17:11:14 -0000
>@@ -12,6 +12,7 @@
>  * 
>  * Contributors:
>  * Martin Oberhuber (Wind River) - [180519][api] declaratively register rse.processes.ui adapter factories
>+ * Martin Oberhuber (wind River) - [203105] Decouple recursive plugin activation of UI adapters
>  ********************************************************************************/
> 
> package org.eclipse.rse.internal.subsystems.processes.core;
>@@ -44,8 +45,13 @@
> 		// make sure that required adapters factories are loaded 
> 		//(will typically activate org.eclipse.rse.processes.ui)
> 		//TODO Check that this does not fire up the UI if we want to be headless
>-		Platform.getAdapterManager().loadAdapter(new RemoteProcessImpl(null,null), 
>+		//Decouple from the current Thread
>+		new Thread("processes.ui adapter loader") { //$NON-NLS-1$
>+			public void run() {
>+				Platform.getAdapterManager().loadAdapter(new RemoteProcessImpl(null,null), 
> 				"org.eclipse.rse.ui.view.ISystemViewElementAdapter"); //$NON-NLS-1$
>+			}
>+		}.start();
> 		//others will be loaded automatically when the processes.ui plugin is activated
> 	}
> 
>#P org.eclipse.rse.subsystems.files.core
>Index: src/org/eclipse/rse/internal/subsystems/files/core/Activator.java
>===================================================================
>RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/internal/subsystems/files/core/Activator.java,v
>retrieving revision 1.1
>diff -u -r1.1 Activator.java
>--- src/org/eclipse/rse/internal/subsystems/files/core/Activator.java	4 Apr 2007 12:32:26 -0000	1.1
>+++ src/org/eclipse/rse/internal/subsystems/files/core/Activator.java	12 Sep 2007 17:11:15 -0000
>@@ -13,6 +13,7 @@
>  * 
>  * Contributors:
>  * Martin Oberhuber (Wind River) - [180519][api] declaratively register adapter factories
>+ * Martin Oberhuber (wind River) - [203105] Decouple recursive plugin activation of UI adapters
>  *******************************************************************************/
> 
> package org.eclipse.rse.internal.subsystems.files.core;
>@@ -47,7 +48,12 @@
> 		// make sure that required adapters factories are loaded 
> 		//(will typically activate org.eclipse.rse.files.ui)
> 		//TODO Check that this does not fire up the UI if we want to be headless
>-		Platform.getAdapterManager().loadAdapter(new RemoteFileEmpty(), "org.eclipse.rse.ui.view.ISystemViewElementAdapter"); //$NON-NLS-1$
>+		//Decouple from the current Thread
>+		new Thread("files.ui adapter loader") { //$NON-NLS-1$
>+			public void run() {
>+				Platform.getAdapterManager().loadAdapter(new RemoteFileEmpty(), "org.eclipse.rse.ui.view.ISystemViewElementAdapter"); //$NON-NLS-1$
>+			}
>+		}.start();
> 		// Others (RemoteSearchResultSet, RemoteSearchResult, 
> 		// RemoteFileSystemConfigurationAdapter will be available
> 		// automatically once the plugin is loaded

Actions: View | Diff

Attachments on bug 203105: 78209