From 91d1ccf64a603c98c00a8f7f14481902c34a3d0e Mon Sep 17 00:00:00 2001 From: Martin Oberhuber < martin.oberhuber@windriver.com> Date: Wed, 4 Apr 2007 10:20:14 +0000 Subject: [PATCH] [180519] declaratively register rse.files.ui. adapter factories. Remove unnecessary dependencies. --- .../org.eclipse.rse.files.ui/plugin.xml | 77 +++++++++++++++++-- .../org/eclipse/rse/files/ui/Activator.java | 62 +-------------- .../rse/subsystems/files/core/Activator.java | 11 +++ .../META-INF/MANIFEST.MF | 1 - .../subsystems/files/dstore/Activator.java | 3 - .../META-INF/MANIFEST.MF | 1 - .../subsystems/files/ftp/Activator.java | 3 - .../META-INF/MANIFEST.MF | 1 - .../subsystems/files/local/Activator.java | 3 - .../META-INF/MANIFEST.MF | 3 +- .../subsystems/files/ssh/Activator.java | 6 +- 11 files changed, 89 insertions(+), 82 deletions(-) diff --git a/rse/plugins/org.eclipse.rse.files.ui/plugin.xml b/rse/plugins/org.eclipse.rse.files.ui/plugin.xml index 96388dc2ed1..4ec31c5236c 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/plugin.xml +++ b/rse/plugins/org.eclipse.rse.files.ui/plugin.xml @@ -12,13 +12,81 @@ Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. Contributors: -{Name} (company) - description of contribution. +Martin Oberhuber (Wind River) - declaratively register adapter factories --> + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - @@ -68,7 +135,7 @@ Contributors: --> diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/Activator.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/Activator.java index d775be9de79..935463494ee 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/Activator.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/Activator.java @@ -18,16 +18,10 @@ package org.eclipse.rse.files.ui; import org.eclipse.core.resources.IResourceChangeEvent; import org.eclipse.core.resources.IWorkspace; -import org.eclipse.core.runtime.IAdapterManager; -import org.eclipse.core.runtime.Platform; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.files.ui.resources.SystemUniversalTempFileListener; import org.eclipse.rse.internal.files.ui.resources.SystemRemoteEditManager; -import org.eclipse.rse.internal.files.ui.view.RemoteFileSubSystemConfigurationAdapterFactory; -import org.eclipse.rse.internal.files.ui.view.SystemViewFileAdapterFactory; -import org.eclipse.rse.internal.files.ui.view.SystemViewSearchResultAdapterFactory; -import org.eclipse.rse.internal.files.ui.view.SystemViewSearchResultSetAdapterFactory; import org.eclipse.ui.plugin.AbstractUIPlugin; import org.osgi.framework.BundleContext; @@ -43,10 +37,6 @@ public class Activator extends AbstractUIPlugin private static SystemUniversalTempFileListener _tempFileListener; - private SystemViewFileAdapterFactory svfaf; // for fastpath - private SystemViewSearchResultSetAdapterFactory svsaf; // for fastpath - private SystemViewSearchResultAdapterFactory svsraf; // for fastpath - /** * The constructor. */ @@ -63,33 +53,12 @@ public class Activator extends AbstractUIPlugin // refresh the remote edit project at plugin startup, to ensure // it's never closed SystemRemoteEditManager.getDefault().refreshRemoteEditProject(); - - int eventMask = IResourceChangeEvent.POST_CHANGE; - IWorkspace ws = SystemBasePlugin.getWorkspace(); - - - - - IAdapterManager manager = Platform.getAdapterManager(); - - svfaf = new SystemViewFileAdapterFactory(); - svfaf.registerWithManager(manager); - - - - svsaf = new SystemViewSearchResultSetAdapterFactory(); - svsaf.registerWithManager(manager); - - svsraf = new SystemViewSearchResultAdapterFactory(); - svsraf.registerWithManager(manager); - - RemoteFileSubSystemConfigurationAdapterFactory rfssfaf = new RemoteFileSubSystemConfigurationAdapterFactory(); - rfssfaf.registerWithManager(manager); - // universal temp file listener _tempFileListener = SystemUniversalTempFileListener.getListener(); // add listener for temp files + int eventMask = IResourceChangeEvent.POST_CHANGE; + IWorkspace ws = SystemBasePlugin.getWorkspace(); ws.addResourceChangeListener(_tempFileListener, eventMask); } @@ -104,9 +73,6 @@ public class Activator extends AbstractUIPlugin ws.removeResourceChangeListener(_tempFileListener); _tempFileListener = null; plugin = null; - - - } /** @@ -127,28 +93,4 @@ public class Activator extends AbstractUIPlugin return AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.rse.files.ui", path); //$NON-NLS-1$ } - /** - * For pathpath access to our adapters for remote universal file objects. Exploits the knowledge we use singleton adapters. - */ - public SystemViewFileAdapterFactory getSystemViewFileAdapterFactory() - { - return svfaf; - } - - /** - * For pathpath access to our adapters for searchable result output objects. Exploits the knowledge we use singleton adapters. - */ - public SystemViewSearchResultSetAdapterFactory getSystemViewSearchResultSetAdapterFactory() - { - return svsaf; - } - - /** - * For pathpath access to our adapters for searchable result output objects. Exploits the knowledge we use singleton adapters. - */ - public SystemViewSearchResultAdapterFactory getSystemViewSearchResultAdapterFactory() - { - return svsraf; - } - } \ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/Activator.java b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/Activator.java index eb61d214891..f3e098796ca 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/Activator.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/Activator.java @@ -17,7 +17,9 @@ package org.eclipse.rse.subsystems.files.core; +import org.eclipse.core.runtime.Platform; import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.rse.subsystems.files.core.subsystems.RemoteFileEmpty; import org.eclipse.ui.plugin.AbstractUIPlugin; import org.osgi.framework.BundleContext; @@ -41,6 +43,15 @@ public class Activator extends AbstractUIPlugin { */ public void start(BundleContext context) throws Exception { super.start(context); + + // 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$ + // Others (RemoteSearchResultSet, RemoteSearchResult, + // RemoteFileSystemConfigurationAdapter will be available + // automatically once the plugin is loaded + } /** diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.dstore/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.subsystems.files.dstore/META-INF/MANIFEST.MF index fe6de5ce7b5..a9a6c49d4ac 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.dstore/META-INF/MANIFEST.MF +++ b/rse/plugins/org.eclipse.rse.subsystems.files.dstore/META-INF/MANIFEST.MF @@ -12,7 +12,6 @@ Require-Bundle: org.eclipse.ui, org.eclipse.dstore.core, org.eclipse.rse.connectorservice.dstore, org.eclipse.dstore.extra, - org.eclipse.rse.files.ui, org.eclipse.rse.subsystems.files.core, org.eclipse.rse.core, org.eclipse.rse.ui diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/internal/subsystems/files/dstore/Activator.java b/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/internal/subsystems/files/dstore/Activator.java index 5c91521a5e9..0f8a31f29ca 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/internal/subsystems/files/dstore/Activator.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/internal/subsystems/files/dstore/Activator.java @@ -40,8 +40,6 @@ public class Activator extends SystemBasePlugin { */ public void start(BundleContext context) throws Exception { super.start(context); -// make sure files.ui is activated - org.eclipse.rse.files.ui.Activator.getDefault(); } /** @@ -62,7 +60,6 @@ public class Activator extends SystemBasePlugin { protected void initializeImageRegistry() { // TODO Auto-generated method stub - } diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.ftp/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.subsystems.files.ftp/META-INF/MANIFEST.MF index b77dd1b7903..57b521d33f4 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.ftp/META-INF/MANIFEST.MF +++ b/rse/plugins/org.eclipse.rse.subsystems.files.ftp/META-INF/MANIFEST.MF @@ -10,7 +10,6 @@ Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.eclipse.rse.services, org.eclipse.rse.services.files.ftp, - org.eclipse.rse.files.ui, org.eclipse.rse.subsystems.files.core, org.eclipse.rse.core, org.eclipse.rse.ui, diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.ftp/src/org/eclipse/rse/internal/subsystems/files/ftp/Activator.java b/rse/plugins/org.eclipse.rse.subsystems.files.ftp/src/org/eclipse/rse/internal/subsystems/files/ftp/Activator.java index 2e40db51b52..bb45ea7a940 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.ftp/src/org/eclipse/rse/internal/subsystems/files/ftp/Activator.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.ftp/src/org/eclipse/rse/internal/subsystems/files/ftp/Activator.java @@ -40,9 +40,6 @@ public class Activator extends AbstractUIPlugin { */ public void start(BundleContext context) throws Exception { super.start(context); - -// make sure files.ui is activated - org.eclipse.rse.files.ui.Activator.getDefault(); } /** diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.local/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.subsystems.files.local/META-INF/MANIFEST.MF index b5e1b704aa1..eb5338bb4cd 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.local/META-INF/MANIFEST.MF +++ b/rse/plugins/org.eclipse.rse.subsystems.files.local/META-INF/MANIFEST.MF @@ -10,7 +10,6 @@ Require-Bundle: org.eclipse.ui, org.eclipse.rse.services, org.eclipse.rse.services.local, org.eclipse.rse.connectorservice.local, - org.eclipse.rse.files.ui, org.eclipse.rse.subsystems.files.core, org.eclipse.rse.core, org.eclipse.rse.ui diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/internal/subsystems/files/local/Activator.java b/rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/internal/subsystems/files/local/Activator.java index 059d33b341b..f31a10d904f 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/internal/subsystems/files/local/Activator.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/internal/subsystems/files/local/Activator.java @@ -41,9 +41,6 @@ public class Activator extends AbstractUIPlugin { */ public void start(BundleContext context) throws Exception { super.start(context); - - // make sure files.ui is activated - org.eclipse.rse.files.ui.Activator.getDefault(); } /** diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.ssh/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.subsystems.files.ssh/META-INF/MANIFEST.MF index 1b1448f52f3..288e3b27dcf 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.ssh/META-INF/MANIFEST.MF +++ b/rse/plugins/org.eclipse.rse.subsystems.files.ssh/META-INF/MANIFEST.MF @@ -13,8 +13,7 @@ Require-Bundle: org.eclipse.ui, org.eclipse.rse.services.ssh, org.eclipse.rse.subsystems.files.core, org.eclipse.rse.core, - org.eclipse.rse.ui, - org.eclipse.rse.files.ui + org.eclipse.rse.ui Eclipse-LazyStart: true Export-Package: org.eclipse.rse.internal.subsystems.files.ssh;x-internal:=true, org.eclipse.rse.subsystems.files.ssh diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.ssh/src/org/eclipse/rse/internal/subsystems/files/ssh/Activator.java b/rse/plugins/org.eclipse.rse.subsystems.files.ssh/src/org/eclipse/rse/internal/subsystems/files/ssh/Activator.java index 60b7d36b12c..27b81849fff 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.ssh/src/org/eclipse/rse/internal/subsystems/files/ssh/Activator.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.ssh/src/org/eclipse/rse/internal/subsystems/files/ssh/Activator.java @@ -11,10 +11,13 @@ *******************************************************************************/ package org.eclipse.rse.internal.subsystems.files.ssh; +import org.eclipse.core.runtime.Platform; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.ui.plugin.AbstractUIPlugin; import org.osgi.framework.BundleContext; +import org.eclipse.rse.subsystems.files.core.subsystems.RemoteFileEmpty; + /** * The activator class controls the plug-in life cycle */ @@ -39,9 +42,6 @@ public class Activator extends AbstractUIPlugin { */ public void start(BundleContext context) throws Exception { super.start(context); - - // make sure files.ui is activated - org.eclipse.rse.files.ui.Activator.getDefault(); } /*