diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/internal/subsystems/files/core/Activator.java b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/internal/subsystems/files/core/Activator.java index 240a703fcfd..fb943b6da7f 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/internal/subsystems/files/core/Activator.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/internal/subsystems/files/core/Activator.java @@ -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 @@ public class Activator extends AbstractUIPlugin { // 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 diff --git a/rse/plugins/org.eclipse.rse.subsystems.processes.core/src/org/eclipse/rse/internal/subsystems/processes/core/Activator.java b/rse/plugins/org.eclipse.rse.subsystems.processes.core/src/org/eclipse/rse/internal/subsystems/processes/core/Activator.java index 287d795ae95..4c752b5b772 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.processes.core/src/org/eclipse/rse/internal/subsystems/processes/core/Activator.java +++ b/rse/plugins/org.eclipse.rse.subsystems.processes.core/src/org/eclipse/rse/internal/subsystems/processes/core/Activator.java @@ -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 @@ public class Activator extends AbstractUIPlugin { // 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 } diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/internal/subsystems/shells/core/Activator.java b/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/internal/subsystems/shells/core/Activator.java index 14f243358e6..00377a0c3a2 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/internal/subsystems/shells/core/Activator.java +++ b/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/internal/subsystems/shells/core/Activator.java @@ -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 @@ public class Activator extends AbstractUIPlugin { // 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 }