diff options
-rw-r--r-- | core/org.eclipse.ptp.services.ui/META-INF/MANIFEST.MF | 2 | ||||
-rw-r--r-- | core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/ServiceConfigurationPropertyPage.java | 4 | ||||
-rw-r--r-- | core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/ServiceModelUIManager.java | 14 | ||||
-rw-r--r-- | core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/ServicesUIPlugin.java (renamed from core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/Activator.java) | 8 | ||||
-rw-r--r-- | core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/wizards/ServiceConfigurationWidget.java | 4 |
5 files changed, 16 insertions, 16 deletions
diff --git a/core/org.eclipse.ptp.services.ui/META-INF/MANIFEST.MF b/core/org.eclipse.ptp.services.ui/META-INF/MANIFEST.MF index 4f332406b..dbdd908e7 100644 --- a/core/org.eclipse.ptp.services.ui/META-INF/MANIFEST.MF +++ b/core/org.eclipse.ptp.services.ui/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.eclipse.ptp.services.ui;singleton:=true Bundle-Version: 1.0.0.qualifier -Bundle-Activator: org.eclipse.ptp.services.ui.Activator +Bundle-Activator: org.eclipse.ptp.services.ui.ServicesUIPlugin Bundle-Vendor: %Bundle-Vendor.0 Require-Bundle: org.eclipse.ui, org.eclipse.ui.ide, diff --git a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/ServiceConfigurationPropertyPage.java b/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/ServiceConfigurationPropertyPage.java index c39f49da6..e70c28bae 100644 --- a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/ServiceConfigurationPropertyPage.java +++ b/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/ServiceConfigurationPropertyPage.java @@ -293,7 +293,7 @@ public class ServiceConfigurationPropertyPage extends PropertyPage implements try { ServiceModelManager.getInstance().saveModelConfiguration(); } catch (IOException e) { - Activator.getDefault().log(e); + ServicesUIPlugin.getDefault().log(e); } return super.performOk(); } @@ -338,7 +338,7 @@ public class ServiceConfigurationPropertyPage extends PropertyPage implements try { natures = new HashSet<String>(Arrays.asList(project.getDescription().getNatureIds())); } catch (CoreException e) { - Activator.getDefault().log(e); + ServicesUIPlugin.getDefault().log(e); } } serviceModelWidget.setServiceConfiguration(selectedConfig, natures); diff --git a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/ServiceModelUIManager.java b/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/ServiceModelUIManager.java index 598538e95..194f85738 100644 --- a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/ServiceModelUIManager.java +++ b/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/ServiceModelUIManager.java @@ -54,7 +54,7 @@ public class ServiceModelUIManager { * @return class implementing IServiceContributor */ public IServiceContributor getServiceContributor(IService service) { - IExtensionPoint extensionPoint = Platform.getExtensionRegistry().getExtensionPoint(Activator.PLUGIN_ID, SERVICE_EXTENSION_ID); + IExtensionPoint extensionPoint = Platform.getExtensionRegistry().getExtensionPoint(ServicesUIPlugin.PLUGIN_ID, SERVICE_EXTENSION_ID); if (extensionPoint != null) { for (IExtension extension : extensionPoint.getExtensions()) { for (IConfigurationElement element : extension.getConfigurationElements()) { @@ -62,7 +62,7 @@ public class ServiceModelUIManager { try { return (IServiceContributor) element.createExecutableExtension(ATTR_CLASS); } catch (Exception e) { - Activator.getDefault().log(e); + ServicesUIPlugin.getDefault().log(e); return null; } } @@ -79,7 +79,7 @@ public class ServiceModelUIManager { * @return class implementing IServiceProviderContributor */ public IServiceProviderContributor getServiceProviderContributor(IServiceProviderDescriptor desc) { - IExtensionPoint extensionPoint = Platform.getExtensionRegistry().getExtensionPoint(Activator.PLUGIN_ID, PROVIDER_EXTENSION_ID); + IExtensionPoint extensionPoint = Platform.getExtensionRegistry().getExtensionPoint(ServicesUIPlugin.PLUGIN_ID, PROVIDER_EXTENSION_ID); if (extensionPoint != null) { for (IExtension extension : extensionPoint.getExtensions()) { for (IConfigurationElement element : extension.getConfigurationElements()) { @@ -88,7 +88,7 @@ public class ServiceModelUIManager { try { return (IServiceProviderContributor) element.createExecutableExtension(ATTR_CLASS); } catch (Exception e) { - Activator.getDefault().log(e); + ServicesUIPlugin.getDefault().log(e); return null; } } @@ -105,14 +105,14 @@ public class ServiceModelUIManager { * @return IWizard providing a wizard extension */ public IWizard getWizardExtensions() { - IExtensionPoint extensionPoint = Platform.getExtensionRegistry().getExtensionPoint(Activator.PLUGIN_ID, WIZARD_EXTENSION_ID); + IExtensionPoint extensionPoint = Platform.getExtensionRegistry().getExtensionPoint(ServicesUIPlugin.PLUGIN_ID, WIZARD_EXTENSION_ID); if (extensionPoint != null) { for (IExtension extension : extensionPoint.getExtensions()) { for (IConfigurationElement element : extension.getConfigurationElements()) { try { return (IWizard) element.createExecutableExtension(ATTR_CLASS); } catch (Exception e) { - Activator.getDefault().log(e); + ServicesUIPlugin.getDefault().log(e); return null; } } @@ -128,7 +128,7 @@ public class ServiceModelUIManager { */ public IServiceProviderConfiguration getServiceProviderConfigurationUI(IServiceProviderDescriptor desc) { IServiceProviderConfiguration config = null; - IExtensionPoint extensionPoint = Platform.getExtensionRegistry().getExtensionPoint(Activator.PLUGIN_ID, PROVIDER_EXTENSION_ID); + IExtensionPoint extensionPoint = Platform.getExtensionRegistry().getExtensionPoint(ServicesUIPlugin.PLUGIN_ID, PROVIDER_EXTENSION_ID); if (extensionPoint != null) { for (IExtension extension : extensionPoint.getExtensions()) { for (IConfigurationElement element : extension.getConfigurationElements()) { diff --git a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/Activator.java b/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/ServicesUIPlugin.java index 58a807018..2381041ab 100644 --- a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/Activator.java +++ b/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/ServicesUIPlugin.java @@ -14,18 +14,18 @@ import org.osgi.framework.BundleContext; * * The activator class controls the plug-in life cycle */ -public class Activator extends AbstractUIPlugin { +public class ServicesUIPlugin extends AbstractUIPlugin { // The plug-in ID public static final String PLUGIN_ID = "org.eclipse.ptp.services.ui"; //$NON-NLS-1$ // The shared instance - private static Activator plugin; + private static ServicesUIPlugin plugin; /** * The constructor */ - public Activator() { + public ServicesUIPlugin() { } @Override @@ -45,7 +45,7 @@ public class Activator extends AbstractUIPlugin { * * @return the shared instance */ - public static Activator getDefault() { + public static ServicesUIPlugin getDefault() { return plugin; } diff --git a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/wizards/ServiceConfigurationWidget.java b/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/wizards/ServiceConfigurationWidget.java index c4df84d0c..a4fbde13e 100644 --- a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/wizards/ServiceConfigurationWidget.java +++ b/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/wizards/ServiceConfigurationWidget.java @@ -36,7 +36,7 @@ import org.eclipse.ptp.services.core.IServiceModelManager; import org.eclipse.ptp.services.core.IServiceProvider; import org.eclipse.ptp.services.core.IServiceProviderDescriptor; import org.eclipse.ptp.services.core.ServiceModelManager; -import org.eclipse.ptp.services.ui.Activator; +import org.eclipse.ptp.services.ui.ServicesUIPlugin; import org.eclipse.ptp.services.ui.IServiceProviderContributor; import org.eclipse.ptp.services.ui.ServiceModelUIManager; import org.eclipse.ptp.services.ui.dialogs.ServicesDialog; @@ -85,7 +85,7 @@ public class ServiceConfigurationWidget extends Wizard implements INewWizard { // addTableRow(service, provider); getServiceConfiguration().setServiceProvider(service, provider); } else { - Activator.getDefault().log(NLS.bind(Messages.ServiceModelWidget_8, service.getId())); + ServicesUIPlugin.getDefault().log(NLS.bind(Messages.ServiceModelWidget_8, service.getId())); } } updateAddRemoveButtons(); |