Author: rob.stryker(a)jboss.com Date: 2009-07-30 16:06:55 -0400 (Thu, 30 Jul 2009) New Revision: 16916 Added: workspace/rstryker/wtpPropertyPageContrib/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/ModuleCoreUIPlugin.java Removed: workspace/rstryker/wtpPropertyPageContrib/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/ComponentCoreUIPlugin.java Modified: workspace/rstryker/wtpPropertyPageContrib/org.eclipse.wst.common.modulecore.ui/META-INF/MANIFEST.MF workspace/rstryker/wtpPropertyPageContrib/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/propertypage/AddModuleDependenciesPropertiesPage.java workspace/rstryker/wtpPropertyPageContrib/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/propertypage/internal/DependencyPageExtensionManager.java Log: renaming plugin class Modified: workspace/rstryker/wtpPropertyPageContrib/org.eclipse.wst.common.modulecore.ui/META-INF/MANIFEST.MF =================================================================== --- workspace/rstryker/wtpPropertyPageContrib/org.eclipse.wst.common.modulecore.ui/META-INF/MANIFEST.MF 2009-07-30 20:05:07 UTC (rev 16915) +++ workspace/rstryker/wtpPropertyPageContrib/org.eclipse.wst.common.modulecore.ui/META-INF/MANIFEST.MF 2009-07-30 20:06:55 UTC (rev 16916) @@ -3,7 +3,7 @@ Bundle-Name: WTP UI Overrides Bundle-SymbolicName: org.eclipse.wst.common.modulecore.ui;singleton:=true Bundle-Version: 1.0.0.qualifier -Bundle-Activator: org.eclipse.wst.common.componentcore.ui.ComponentCoreUIPlugin +Bundle-Activator: org.eclipse.wst.common.componentcore.ui.ModuleCoreUIPlugin Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.eclipse.core.resources;bundle-version="3.5.0", Deleted: workspace/rstryker/wtpPropertyPageContrib/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/ComponentCoreUIPlugin.java =================================================================== --- workspace/rstryker/wtpPropertyPageContrib/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/ComponentCoreUIPlugin.java 2009-07-30 20:05:07 UTC (rev 16915) +++ workspace/rstryker/wtpPropertyPageContrib/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/ComponentCoreUIPlugin.java 2009-07-30 20:06:55 UTC (rev 16916) @@ -1,97 +0,0 @@ -/****************************************************************************** - * Copyright (c) 2009 Red Hat - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Rob Stryker - initial implementation and ongoing maintenance - ******************************************************************************/ -package org.eclipse.wst.common.componentcore.ui; - -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Platform; -import org.eclipse.core.runtime.Status; -import org.eclipse.ui.plugin.AbstractUIPlugin; -import org.osgi.framework.BundleContext; - -/** - * The activator class controls the plug-in life cycle - */ -public class ComponentCoreUIPlugin extends AbstractUIPlugin { - - // The plug-in ID - public static final String PLUGIN_ID = "org.eclipse.wst.common.modulecore.ui"; //$NON-NLS-1$ - - // The shared instance - private static ComponentCoreUIPlugin plugin; - - /** - * The constructor - */ - public ComponentCoreUIPlugin() { - } - - /* - * (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) - */ - public void start(BundleContext context) throws Exception { - super.start(context); - plugin = this; - } - - /* - * (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) - */ - public void stop(BundleContext context) throws Exception { - plugin = null; - super.stop(context); - } - - /** - * Returns the shared instance - * - * @return the shared instance - */ - public static ComponentCoreUIPlugin getDefault() { - return plugin; - } - - public static void log(Exception e) { - log(e.getMessage(), e); - } - - public static void log(String message, Exception e) { - IStatus status = new Status(IStatus.ERROR, PLUGIN_ID, message, e); - getDefault().getLog().log(status); - } - public static IStatus createStatus(int severity, int aCode, - String aMessage, Throwable exception) { - return new Status(severity, PLUGIN_ID, aCode, - aMessage != null ? aMessage : "No message.", exception); //$NON-NLS-1$ - } - public static IStatus createErrorStatus(int aCode, String aMessage, - Throwable exception) { - return createStatus(IStatus.ERROR, aCode, aMessage, exception); - } - - public static IStatus createStatus(int severity, String message, Throwable exception) { - return new Status(severity, PLUGIN_ID, message, exception); - } - - public static IStatus createStatus(int severity, String message) { - return createStatus(severity, message, null); - } - public static void logError(Throwable exception) { - Platform.getLog(Platform.getBundle(PLUGIN_ID)).log( createStatus(IStatus.ERROR, exception.getMessage(), exception)); - } - - public static void logError(CoreException exception) { - Platform.getLog(Platform.getBundle(PLUGIN_ID)).log( exception.getStatus() ); - } - -} Copied: workspace/rstryker/wtpPropertyPageContrib/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/ModuleCoreUIPlugin.java (from rev 16914, workspace/rstryker/wtpPropertyPageContrib/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/ComponentCoreUIPlugin.java) =================================================================== --- workspace/rstryker/wtpPropertyPageContrib/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/ModuleCoreUIPlugin.java (rev 0) +++ workspace/rstryker/wtpPropertyPageContrib/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/ModuleCoreUIPlugin.java 2009-07-30 20:06:55 UTC (rev 16916) @@ -0,0 +1,97 @@ +/****************************************************************************** + * Copyright (c) 2009 Red Hat + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Rob Stryker - initial implementation and ongoing maintenance + ******************************************************************************/ +package org.eclipse.wst.common.componentcore.ui; + +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Platform; +import org.eclipse.core.runtime.Status; +import org.eclipse.ui.plugin.AbstractUIPlugin; +import org.osgi.framework.BundleContext; + +/** + * The activator class controls the plug-in life cycle + */ +public class ModuleCoreUIPlugin extends AbstractUIPlugin { + + // The plug-in ID + public static final String PLUGIN_ID = "org.eclipse.wst.common.modulecore.ui"; //$NON-NLS-1$ + + // The shared instance + private static ModuleCoreUIPlugin plugin; + + /** + * The constructor + */ + public ModuleCoreUIPlugin() { + } + + /* + * (non-Javadoc) + * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) + */ + public void start(BundleContext context) throws Exception { + super.start(context); + plugin = this; + } + + /* + * (non-Javadoc) + * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) + */ + public void stop(BundleContext context) throws Exception { + plugin = null; + super.stop(context); + } + + /** + * Returns the shared instance + * + * @return the shared instance + */ + public static ModuleCoreUIPlugin getDefault() { + return plugin; + } + + public static void log(Exception e) { + log(e.getMessage(), e); + } + + public static void log(String message, Exception e) { + IStatus status = new Status(IStatus.ERROR, PLUGIN_ID, message, e); + getDefault().getLog().log(status); + } + public static IStatus createStatus(int severity, int aCode, + String aMessage, Throwable exception) { + return new Status(severity, PLUGIN_ID, aCode, + aMessage != null ? aMessage : "No message.", exception); //$NON-NLS-1$ + } + public static IStatus createErrorStatus(int aCode, String aMessage, + Throwable exception) { + return createStatus(IStatus.ERROR, aCode, aMessage, exception); + } + + public static IStatus createStatus(int severity, String message, Throwable exception) { + return new Status(severity, PLUGIN_ID, message, exception); + } + + public static IStatus createStatus(int severity, String message) { + return createStatus(severity, message, null); + } + public static void logError(Throwable exception) { + Platform.getLog(Platform.getBundle(PLUGIN_ID)).log( createStatus(IStatus.ERROR, exception.getMessage(), exception)); + } + + public static void logError(CoreException exception) { + Platform.getLog(Platform.getBundle(PLUGIN_ID)).log( exception.getStatus() ); + } + +} Modified: workspace/rstryker/wtpPropertyPageContrib/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/propertypage/AddModuleDependenciesPropertiesPage.java =================================================================== --- workspace/rstryker/wtpPropertyPageContrib/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/propertypage/AddModuleDependenciesPropertiesPage.java 2009-07-30 20:05:07 UTC (rev 16915) +++ workspace/rstryker/wtpPropertyPageContrib/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/propertypage/AddModuleDependenciesPropertiesPage.java 2009-07-30 20:06:55 UTC (rev 16916) @@ -72,7 +72,7 @@ import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; import org.eclipse.wst.common.componentcore.resources.IVirtualFolder; import org.eclipse.wst.common.componentcore.resources.IVirtualReference; -import org.eclipse.wst.common.componentcore.ui.ComponentCoreUIPlugin; +import org.eclipse.wst.common.componentcore.ui.ModuleCoreUIPlugin; import org.eclipse.wst.common.componentcore.ui.Messages; import org.eclipse.wst.common.componentcore.ui.propertypage.internal.AddFolderDialog; import org.eclipse.wst.common.componentcore.ui.propertypage.internal.ComponentDependencyContentProvider; @@ -737,7 +737,7 @@ IDataModelOperation operation = getRemoveComponentOperation(component); operation.execute(null, null); } catch( ExecutionException e) { - ComponentCoreUIPlugin.logError(e); + ModuleCoreUIPlugin.logError(e); } } } @@ -795,7 +795,7 @@ try { ResourcesPlugin.getWorkspace().run(runnable, new NullProgressMonitor()); } catch( CoreException e ) { - ComponentCoreUIPlugin.logError(e); + ModuleCoreUIPlugin.logError(e); } } @@ -833,7 +833,7 @@ try { dm.getDefaultOperation().execute(new NullProgressMonitor(), null); } catch (ExecutionException e) { - ComponentCoreUIPlugin.logError(e); + ModuleCoreUIPlugin.logError(e); } } Modified: workspace/rstryker/wtpPropertyPageContrib/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/propertypage/internal/DependencyPageExtensionManager.java =================================================================== --- workspace/rstryker/wtpPropertyPageContrib/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/propertypage/internal/DependencyPageExtensionManager.java 2009-07-30 20:05:07 UTC (rev 16915) +++ workspace/rstryker/wtpPropertyPageContrib/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/propertypage/internal/DependencyPageExtensionManager.java 2009-07-30 20:06:55 UTC (rev 16916) @@ -23,7 +23,7 @@ import org.eclipse.ui.plugin.AbstractUIPlugin; import org.eclipse.wst.common.project.facet.core.IFacetedProject; import org.eclipse.wst.server.ui.wizard.WizardFragment; -import org.eclipse.wst.common.componentcore.ui.ComponentCoreUIPlugin; +import org.eclipse.wst.common.componentcore.ui.ModuleCoreUIPlugin; import org.eclipse.wst.common.componentcore.ui.propertypage.IDependencyPageProvider; public class DependencyPageExtensionManager { @@ -53,7 +53,7 @@ HashMap<String, IDependencyPageProvider> temp = new HashMap<String, IDependencyPageProvider>(); IExtensionRegistry registry = Platform.getExtensionRegistry(); IConfigurationElement[] cf = registry.getConfigurationElementsFor( - ComponentCoreUIPlugin.PLUGIN_ID, "moduleDependencyPropertyPage"); //$NON-NLS-1$ + ModuleCoreUIPlugin.PLUGIN_ID, "moduleDependencyPropertyPage"); //$NON-NLS-1$ for( int i = 0; i < cf.length; i++ ) { try { temp.put(cf[i].getAttribute("id"), //$NON-NLS-1$ @@ -66,7 +66,7 @@ public WizardFragment loadReferenceWizardFragment(String id) { IExtensionRegistry registry = Platform.getExtensionRegistry(); IConfigurationElement[] cf = registry.getConfigurationElementsFor( - ComponentCoreUIPlugin.PLUGIN_ID, "referenceWizardFragment"); //$NON-NLS-1$ + ModuleCoreUIPlugin.PLUGIN_ID, "referenceWizardFragment"); //$NON-NLS-1$ for( int i = 0; i < cf.length; i++ ) { if( cf[i].getAttribute("id").equals(id)) //$NON-NLS-1$ try { @@ -79,7 +79,7 @@ public ReferenceExtension[] getReferenceExtensions() { IExtensionRegistry registry = Platform.getExtensionRegistry(); IConfigurationElement[] cf = registry.getConfigurationElementsFor( - ComponentCoreUIPlugin.PLUGIN_ID, "referenceWizardFragment"); //$NON-NLS-1$ + ModuleCoreUIPlugin.PLUGIN_ID, "referenceWizardFragment"); //$NON-NLS-1$ ArrayList<ReferenceExtension> list = new ArrayList<ReferenceExtension>(); for( int i = 0; i < cf.length; i++ ) { list.add(new ReferenceExtension(cf[i]));