diff options
| author | cbridgha | 2005-01-24 21:39:01 +0000 |
|---|---|---|
| committer | cbridgha | 2005-01-24 21:39:01 +0000 |
| commit | 9fa4b6b7f189ac7f26d14ccc49a0213196a6a0b0 (patch) | |
| tree | 941c8b062c0d3cd4fc7999f8d148c9dcf952bac6 | |
| parent | 5a5f80259c177de943f5d25d15eef803a84ad42a (diff) | |
| download | webtools.javaee-9fa4b6b7f189ac7f26d14ccc49a0213196a6a0b0.tar.gz webtools.javaee-9fa4b6b7f189ac7f26d14ccc49a0213196a6a0b0.tar.xz webtools.javaee-9fa4b6b7f189ac7f26d14ccc49a0213196a6a0b0.zip | |
fixing the navigator
77 files changed, 1552 insertions, 1349 deletions
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/EMFRootObjectManager.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/EMFRootObjectManager.java index f9720e9f7..abd8ae19a 100644 --- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/EMFRootObjectManager.java +++ b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/EMFRootObjectManager.java @@ -7,13 +7,16 @@ * * Contributors: * IBM Corporation - initial API and implementation - *******************************************************************************/ + *******************************************************************************/ package org.eclipse.jst.j2ee.navigator.internal; +import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Map; import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IResourceChangeEvent; import org.eclipse.core.resources.IResourceChangeListener; import org.eclipse.core.resources.IResourceDelta; @@ -23,9 +26,13 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.emf.ecore.EObject; import org.eclipse.jst.j2ee.internal.J2EEEditModel; import org.eclipse.jst.j2ee.internal.project.J2EENature; +import org.eclipse.swt.SWTError; +import org.eclipse.swt.SWTException; import org.eclipse.wst.common.internal.emfworkbench.integration.EditModelEvent; import org.eclipse.wst.common.internal.emfworkbench.integration.EditModelListener; +import com.ibm.wtp.common.logger.proxy.Logger; + /** * <p> * The following class is experimental until fully documented. @@ -33,19 +40,27 @@ import org.eclipse.wst.common.internal.emfworkbench.integration.EditModelListene */ public class EMFRootObjectManager implements EditModelListener, IResourceChangeListener, IResourceDeltaVisitor { - + private final Map projectEditModels = new HashMap(); private final Map projectRootObjects = new HashMap(); - + + private final List listeners = new ArrayList(); + + public interface IRefreshHandlerListener { + void onRefresh(Object element); + } + /** - * + * */ public EMFRootObjectManager() { super(); ResourcesPlugin.getWorkspace().addResourceChangeListener(this); } + + public void dispose() { if (projectEditModels == null) return; @@ -65,7 +80,7 @@ public class EMFRootObjectManager implements EditModelListener, IResourceChangeL if (project == null || !project.isAccessible()) return null; - Object rootObject = null; + Object rootObject = null; synchronized (projectRootObjects) { rootObject = projectRootObjects.get(project); @@ -79,7 +94,7 @@ public class EMFRootObjectManager implements EditModelListener, IResourceChangeL } return rootObject; } - + protected J2EEEditModel getEditModelForProject(IProject project) { if (project == null) @@ -101,30 +116,131 @@ public class EMFRootObjectManager implements EditModelListener, IResourceChangeL } return editModel; } - + protected void addMapping(IProject project, J2EEEditModel editModel) { projectEditModels.put(project, editModel); } - - /* (non-Javadoc) + + /* + * (non-Javadoc) + * * @see org.eclipse.wst.common.internal.emfworkbench.integration.EditModelListener#editModelChanged(org.eclipse.wst.common.internal.emfworkbench.integration.EditModelEvent) */ - public void editModelChanged(EditModelEvent anEvent) { + public void editModelChanged(EditModelEvent anEvent) { + IProject affectedProject = anEvent.getEditModel().getProject(); + switch (anEvent.getEventCode()) { + case EditModelEvent.UNLOADED_RESOURCE : + case EditModelEvent.REMOVED_RESOURCE : { + Object oldRootObject = projectRootObjects.remove(affectedProject); + if (oldRootObject != null) + notifyListeners(affectedProject); + } + break; + case EditModelEvent.SAVE : { + Object oldRootObject = projectRootObjects.get(affectedProject); + if (oldRootObject == null) + notifyListeners(affectedProject); + } + break; + case EditModelEvent.PRE_DISPOSE : + disposeCache(affectedProject); + break; + default : + break; + } + } + + + /** + * @param aProject + */ + private void notifyListeners(IProject aProject) { + for (int x = 0; x < listeners.size(); ++x) { + IRefreshHandlerListener refreshHandler = (IRefreshHandlerListener) listeners.get(x); + refreshHandler.onRefresh(aProject); + } } - /* (non-Javadoc) + + + /* + * (non-Javadoc) + * * @see org.eclipse.core.resources.IResourceChangeListener#resourceChanged(org.eclipse.core.resources.IResourceChangeEvent) */ - public void resourceChanged(IResourceChangeEvent event) { + public void resourceChanged(IResourceChangeEvent event) { + final IResourceDelta delta = event.getDelta(); + if (delta != null) { + try { + delta.accept(EMFRootObjectManager.this); + } catch (CoreException e) { + Logger.getLogger().logError(e); + } catch (SWTException swte) { + Logger.getLogger().logError(swte); + } catch (SWTError swte) { + Logger.getLogger().logError(swte); + } + } } - /* (non-Javadoc) + /* + * (non-Javadoc) + * * @see org.eclipse.core.resources.IResourceDeltaVisitor#visit(org.eclipse.core.resources.IResourceDelta) */ - public boolean visit(IResourceDelta delta) throws CoreException { + public boolean visit(IResourceDelta delta) throws CoreException { + IResource resource = delta.getResource(); + if (resource != null) { + switch (resource.getType()) { + case IResource.ROOT : + return true; + case IResource.PROJECT : + boolean projectOpenStateChanged = ((delta.getFlags() & IResourceDelta.OPEN) != 0); + if (delta.getKind() == IResourceDelta.REMOVED || projectOpenStateChanged) + disposeCache((IProject) resource); + return false; + } + } return false; } + + protected void disposeCache(IProject affectedProject) { + synchronized (projectEditModels) { + projectRootObjects.remove(affectedProject); + //System.out.println("REMOVING edit model: " + affectedProject.getName()); + J2EEEditModel editModel = (J2EEEditModel) projectEditModels.remove(affectedProject); + //System.out.println("REMOVED edit model " + affectedProject.getName()); + if (editModel != null) { + editModel.removeListener(this); + editModel.releaseAccess(this); + //System.out.println("RELEASED edit model " + affectedProject.getName()); + } + } + } + + public void addRefreshHandlerListener(IRefreshHandlerListener aListener) { + synchronized (getListeners()) { + if (aListener != null && !getListeners().contains(aListener)) + getListeners().add(aListener); + } + } + + public void removeRefreshHandlerListener(IRefreshHandlerListener aListener) { + synchronized (listeners) { + listeners.remove(aListener); + } + } + + /** + * Insert the method's description here. Creation date: (4/11/2001 4:42:58 PM) + * + * @return java.util.List + */ + protected java.util.List getListeners() { + return listeners; + } + } diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/IJ2EEWizardConstants.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/IJ2EEWizardConstants.java index 187734861..7d0274251 100644 --- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/IJ2EEWizardConstants.java +++ b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/IJ2EEWizardConstants.java @@ -7,7 +7,7 @@ * * Contributors: * IBM Corporation - initial API and implementation - *******************************************************************************/ + *******************************************************************************/ package org.eclipse.jst.j2ee.navigator.internal; import org.eclipse.jst.ejb.ui.EJBModuleCreationWizard; @@ -32,12 +32,12 @@ import org.eclipse.jst.servlet.ui.WebModuleImportWizard; * The following class is experimental until fully documented. * </p> * <p> - * The Creation IDs are used for activity filtering and as such are declared on the - * individual wizards. All other IDs must be maintained to stay in sync with the - * values found in the plugin.xml files of the respective module UI plugins. + * The Creation IDs are used for activity filtering and as such are declared on the individual + * wizards. All other IDs must be maintained to stay in sync with the values found in the plugin.xml + * files of the respective module UI plugins. */ public interface IJ2EEWizardConstants { - + String NEW_EAR_PROJECT_WIZARD_ID = EnterpriseApplicationCreationWizard.WIZARD_ID; String NEW_APPCLIENT_PROJECT_WIZARD_ID = AppClientModuleCreationWizard.WIZARD_ID; @@ -49,7 +49,7 @@ public interface IJ2EEWizardConstants { String NEW_WEB_PROJECT_WIZARD_ID = WebModuleCreationWizard.WIZARD_ID; String NEW_ENTERPRISE_BEAN_WIZARD_ID = "org.eclipse.jst.j2ee.ejb.ui.util.createEJBWizard"; //$NON-NLS-1$ - + String IMPORT_EAR_WIZARD_ID = EnterpriseApplicationImportWizard.class.getName(); String IMPORT_APPCLIENT_WIZARD_ID = AppClientModuleImportWizard.class.getName(); diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EEContentProvider.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EEContentProvider.java index b401973f2..e77c651e8 100644 --- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EEContentProvider.java +++ b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EEContentProvider.java @@ -16,13 +16,20 @@ import java.util.List; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.IAdaptable; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider; import org.eclipse.jdt.core.IJavaProject; +import org.eclipse.jface.viewers.AbstractTreeViewer; import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.Viewer; import org.eclipse.jst.j2ee.internal.ejb.provider.BeanClassProviderHelper; import org.eclipse.jst.j2ee.internal.provider.MethodsProviderDelegate; +import org.eclipse.jst.j2ee.navigator.internal.EMFRootObjectManager.IRefreshHandlerListener; +import org.eclipse.swt.widgets.Display; +import org.eclipse.ui.progress.UIJob; import org.eclipse.wst.common.internal.emfworkbench.integration.DynamicAdapterFactory; import org.eclipse.wst.common.navigator.internal.views.CommonViewer; @@ -33,7 +40,7 @@ import com.ibm.wtp.emf.workbench.ProjectUtilities; * The following class is experimental until fully documented. * </p> */ -public class J2EEContentProvider implements ITreeContentProvider { +public class J2EEContentProvider implements ITreeContentProvider, IRefreshHandlerListener { private static final Class IPROJECT_CLASS = IProject.class; @@ -43,20 +50,23 @@ public class J2EEContentProvider implements ITreeContentProvider { private MethodsProviderDelegate delegateMethodsProvider; private String viewerId = null; + Viewer viewer; /** - * + * */ public J2EEContentProvider() { rootObjectManager = new EMFRootObjectManager(); + rootObjectManager.addRefreshHandlerListener(this); } /** - * + * */ public J2EEContentProvider(String aViewerId) { rootObjectManager = new EMFRootObjectManager(); updateContentProviders(aViewerId); + rootObjectManager.addRefreshHandlerListener(this); } @@ -109,9 +119,11 @@ public class J2EEContentProvider implements ITreeContentProvider { * @see org.eclipse.jface.viewers.IContentProvider#dispose() */ public void dispose() { + rootObjectManager.removeRefreshHandlerListener(this); delegateContentProvider.dispose(); rootObjectManager.dispose(); delegateMethodsProvider.dispose(); + } /* @@ -133,6 +145,7 @@ public class J2EEContentProvider implements ITreeContentProvider { */ public void inputChanged(Viewer aViewer, Object anOldInput, Object aNewInput) { String newViewerId = null; + viewer = aViewer; if (aViewer instanceof CommonViewer) newViewerId = ((CommonViewer) aViewer).getNavigatorContentService().getViewerId(); @@ -164,4 +177,25 @@ public class J2EEContentProvider implements ITreeContentProvider { } + /* + * (non-Javadoc) + * + * @see org.eclipse.jst.j2ee.navigator.internal.EMFRootObjectManager.IRefreshHandlerListener#onRefresh(java.lang.Object) + */ + public void onRefresh(final Object element) { + if (viewer instanceof AbstractTreeViewer) { + if (Display.getCurrent() != null) { + ((AbstractTreeViewer) viewer).refresh(element, true); + } else { + /* Create and schedule a UI Job to update the Navigator Content Viewer */ + new UIJob("Update the Navigator Content Viewer Job") { + public IStatus runInUIThread(IProgressMonitor monitor) { + ((AbstractTreeViewer) viewer).refresh(element, true); + return Status.OK_STATUS; + } + }.schedule(); + } + } + } + } diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EEEditActionGroup.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EEEditActionGroup.java index 72d16e137..7587508f4 100644 --- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EEEditActionGroup.java +++ b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EEEditActionGroup.java @@ -74,13 +74,13 @@ public class J2EEEditActionGroup extends CommonEditActionGroup implements ISelec protected static final String[] EAR_PROJECT_IDS = new String[]{NEW_APPCLIENT_PROJECT_WIZARD_ID, NEW_JCA_PROJECT_WIZARD_ID, NEW_EJB_PROJECT_WIZARD_ID, NEW_WEB_PROJECT_WIZARD_ID}; - protected static final String[] APPCLIENT_PROJECT_IDS = new String[]{ }; + protected static final String[] APPCLIENT_PROJECT_IDS = new String[]{}; - protected static final String[] JCA_PROJECT_IDS = new String[]{ }; + protected static final String[] JCA_PROJECT_IDS = new String[]{}; protected static final String[] EJB_PROJECT_IDS = new String[]{NEW_ENTERPRISE_BEAN_WIZARD_ID}; - protected static final String[] WEB_PROJECT_IDS = new String[]{ }; + protected static final String[] WEB_PROJECT_IDS = new String[]{}; protected static final String[] EAR_IMPORT_IDS = new String[]{IMPORT_APPCLIENT_WIZARD_ID, IMPORT_CONNECTOR_WIZARD_ID, IMPORT_ENTERPRISE_BEAN_WIZARD_ID, IMPORT_WEB_MODULE_WIZARD_ID, IMPORT_UTILITY_JAR_WIZARD_ID}; @@ -443,8 +443,8 @@ public class J2EEEditActionGroup extends CommonEditActionGroup implements ISelec public void delete(IStructuredSelection selection) { /* * // deleteEJBAction.selectionChanged(selection); - * deleteModuleAction.selectionChanged((ISelection)selection); - * // if(deleteEJBAction.isEnabled()) // deleteEJBAction.run(); // else + * deleteModuleAction.selectionChanged((ISelection)selection); // + * if(deleteEJBAction.isEnabled()) // deleteEJBAction.run(); // else * if(deleteModuleAction.isEnabled()) deleteModuleAction.run(); */ /* else */ diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EELabelProvider.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EELabelProvider.java index 57bb89b35..02ea1091e 100644 --- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EELabelProvider.java +++ b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EELabelProvider.java @@ -34,14 +34,14 @@ public class J2EELabelProvider implements ICommonLabelProvider { private AdapterFactoryLabelProvider delegateLabelProvider; /** - * + * */ public J2EELabelProvider() { super(); } /** - * + * */ public J2EELabelProvider(String aViewerId) { super(); @@ -81,7 +81,7 @@ public class J2EELabelProvider implements ICommonLabelProvider { } /** - * + * */ public void dispose() { if (delegateLabelProvider != null) @@ -100,7 +100,7 @@ public class J2EELabelProvider implements ICommonLabelProvider { } /** - * + * */ public void fireLabelProviderChanged() { if (delegateLabelProvider != null) diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/plugin/J2EENavigatorPlugin.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/plugin/J2EENavigatorPlugin.java index 4dc476cba..9a4d2310c 100644 --- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/plugin/J2EENavigatorPlugin.java +++ b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/plugin/J2EENavigatorPlugin.java @@ -23,14 +23,14 @@ import org.eclipse.ui.plugin.AbstractUIPlugin; */ public class J2EENavigatorPlugin extends AbstractUIPlugin { //The shared instance. - private static J2EENavigatorPlugin plugin; + private static J2EENavigatorPlugin plugin; /** * The constructor. */ public J2EENavigatorPlugin(IPluginDescriptor descriptor) { super(descriptor); - plugin = this; + plugin = this; } /** diff --git a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/creation/ApplicationClientNatureRuntime.java b/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/creation/ApplicationClientNatureRuntime.java index 5acfe4281..886a685c4 100644 --- a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/creation/ApplicationClientNatureRuntime.java +++ b/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/creation/ApplicationClientNatureRuntime.java @@ -271,10 +271,10 @@ public class ApplicationClientNatureRuntime extends J2EEModuleNature implements * releaseAccess()! */ // TODO WebServices for M3 -// public WebServiceEditModel getWebServiceEditModelForRead(Object accessorKey, Map params) { -// return (WebServiceEditModel) getEditModelForRead(WEB_SERVICE_EDIT_MODEL_ID, accessorKey, params); -// } - + // public WebServiceEditModel getWebServiceEditModelForRead(Object accessorKey, Map params) { + // return (WebServiceEditModel) getEditModelForRead(WEB_SERVICE_EDIT_MODEL_ID, accessorKey, + // params); + // } /** * Return an editing model used to edit web service resources. Important!!! Calling this method @@ -282,9 +282,9 @@ public class ApplicationClientNatureRuntime extends J2EEModuleNature implements * releaseAccess()! */ // TODO WebServices for M3 -// public WebServiceEditModel getWebServiceEditModelForWrite(Object accessorKey, Map params) { -// return (WebServiceEditModel) getEditModelForWrite(WEB_SERVICE_EDIT_MODEL_ID, accessorKey, params); -// } - + // public WebServiceEditModel getWebServiceEditModelForWrite(Object accessorKey, Map params) { + // return (WebServiceEditModel) getEditModelForWrite(WEB_SERVICE_EDIT_MODEL_ID, accessorKey, + // params); + // } }
\ No newline at end of file diff --git a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/creation/IApplicationClientNatureConstants.java b/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/creation/IApplicationClientNatureConstants.java index f1c9b2cae..88f88d1b2 100644 --- a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/creation/IApplicationClientNatureConstants.java +++ b/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/creation/IApplicationClientNatureConstants.java @@ -12,7 +12,6 @@ package org.eclipse.jst.j2ee.applicationclient.creation; - /** * Insert the type's description here. Creation date: (4/4/2001 10:04:11 AM) * diff --git a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/ApplicationItemProvider.java b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/ApplicationItemProvider.java index 23f067bde..1415123bb 100644 --- a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/ApplicationItemProvider.java +++ b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/ApplicationItemProvider.java @@ -37,7 +37,8 @@ import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin; /** - * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.application.Application}object. + * This is the item provider adpater for a + * {@link org.eclipse.jst.j2ee.internal.internal.application.Application}object. */ public class ApplicationItemProvider extends CompatibilityDescriptionGroupItemProvider implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider { /** @@ -48,7 +49,8 @@ public class ApplicationItemProvider extends CompatibilityDescriptionGroupItemPr } /** - * This creates a new child for {@link org.eclipse.jst.j2ee.internal.internal.application.command.CreateChildCommand}. + * This creates a new child for + * {@link org.eclipse.jst.j2ee.internal.internal.application.command.CreateChildCommand}. */ public Object createChild(Object object) { // TODO: check that this is what you want. @@ -85,7 +87,8 @@ public class ApplicationItemProvider extends CompatibilityDescriptionGroupItemPr /** - * This returns the image for {@link org.eclipse.jst.j2ee.internal.internal.application.command.CreateChildCommand}. + * This returns the image for + * {@link org.eclipse.jst.j2ee.internal.internal.application.command.CreateChildCommand}. */ public Object getCreateChildImage(Object object) { EObject refObject = (EObject) object; @@ -93,14 +96,16 @@ public class ApplicationItemProvider extends CompatibilityDescriptionGroupItemPr } /** - * This returns the label for {@link org.eclipse.jst.j2ee.internal.internal.application.command.CreateChildCommand}. + * This returns the label for + * {@link org.eclipse.jst.j2ee.internal.internal.application.command.CreateChildCommand}. */ public String getCreateChildText(Object object) { return ApplicationProvidersResourceHandler.getString("Create_Module_UI_"); //$NON-NLS-1$ } /** - * This returns the help text for {@link org.eclipse.jst.j2ee.internal.internal.application.command.CreateChildCommand}. + * This returns the help text for + * {@link org.eclipse.jst.j2ee.internal.internal.application.command.CreateChildCommand}. */ public String getCreateChildToolTipText(Object object) { EObject refObject = (EObject) object; diff --git a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/ApplicationItemProviderAdapter.java b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/ApplicationItemProviderAdapter.java index 6d7df3523..af47b5276 100644 --- a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/ApplicationItemProviderAdapter.java +++ b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/ApplicationItemProviderAdapter.java @@ -19,8 +19,8 @@ import org.eclipse.emf.edit.provider.ItemProviderAdapter; /** * This extended item provider supports the following commands: - * {@link org.eclipse.jst.j2ee.internal.internal.application.command.CreateChildCommand}. The commands are implemented - * uniformly on all our item adapters using this common base class. + * {@link org.eclipse.jst.j2ee.internal.internal.application.command.CreateChildCommand}. The + * commands are implemented uniformly on all our item adapters using this common base class. */ public class ApplicationItemProviderAdapter extends ItemProviderAdapter { /** diff --git a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/ApplicationItemProviderAdapterFactory.java b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/ApplicationItemProviderAdapterFactory.java index 80fa288a3..a612b4229 100644 --- a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/ApplicationItemProviderAdapterFactory.java +++ b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/ApplicationItemProviderAdapterFactory.java @@ -64,13 +64,13 @@ public class ApplicationItemProviderAdapterFactory extends ApplicationAdapterFac */ protected ApplicationItemProvider applicationItemProvider; /** - * This keeps track of the one adapter used for all {@link org.eclipse.jst.j2ee.internal.internal.application.Module} - * instances. + * This keeps track of the one adapter used for all + * {@link org.eclipse.jst.j2ee.internal.internal.application.Module}instances. */ protected ModuleItemProvider moduleItemProvider; /** - * This keeps track of the one adapter used for all {@link org.eclipse.jst.j2ee.internal.internal.application.WebModule} - * instances. + * This keeps track of the one adapter used for all + * {@link org.eclipse.jst.j2ee.internal.internal.application.WebModule}instances. */ protected WebModuleItemProvider webModuleItemProvider; /** @@ -84,8 +84,8 @@ public class ApplicationItemProviderAdapterFactory extends ApplicationAdapterFac */ protected ConnectorModuleItemProvider connectorModuleItemProvider; /** - * This keeps track of the one adapter used for all {@link org.eclipse.jst.j2ee.internal.internal.application.EjbModule} - * instances. + * This keeps track of the one adapter used for all + * {@link org.eclipse.jst.j2ee.internal.internal.application.EjbModule}instances. */ protected EjbModuleItemProvider ejbModuleItemProvider; protected Disposable disposable = new Disposable(); @@ -133,7 +133,8 @@ public class ApplicationItemProviderAdapterFactory extends ApplicationAdapterFac } /** - * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.application.Application}. + * This creates an adapter for a + * {@link org.eclipse.jst.j2ee.internal.internal.application.Application}. */ public Adapter createApplicationAdapter() { if (applicationItemProvider == null) { @@ -144,7 +145,8 @@ public class ApplicationItemProviderAdapterFactory extends ApplicationAdapterFac } /** - * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.application.EjbModule}. + * This creates an adapter for a + * {@link org.eclipse.jst.j2ee.internal.internal.application.EjbModule}. */ public Adapter createEjbModuleAdapter() { if (ejbModuleItemProvider == null) { @@ -155,7 +157,8 @@ public class ApplicationItemProviderAdapterFactory extends ApplicationAdapterFac } /** - * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.application.JavaClientModule}. + * This creates an adapter for a + * {@link org.eclipse.jst.j2ee.internal.internal.application.JavaClientModule}. */ public Adapter createJavaClientModuleAdapter() { if (javaClientModuleItemProvider == null) { @@ -179,7 +182,8 @@ public class ApplicationItemProviderAdapterFactory extends ApplicationAdapterFac }// createConnectorModuleAdapter /** - * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.application.Module}. + * This creates an adapter for a + * {@link org.eclipse.jst.j2ee.internal.internal.application.Module}. */ public Adapter createModuleAdapter() { if (moduleItemProvider == null) { @@ -190,7 +194,8 @@ public class ApplicationItemProviderAdapterFactory extends ApplicationAdapterFac } /** - * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.application.WebModule}. + * This creates an adapter for a + * {@link org.eclipse.jst.j2ee.internal.internal.application.WebModule}. */ public Adapter createWebModuleAdapter() { if (webModuleItemProvider == null) { diff --git a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/EjbModuleItemProvider.java b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/EjbModuleItemProvider.java index fab8f2bce..18905196d 100644 --- a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/EjbModuleItemProvider.java +++ b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/EjbModuleItemProvider.java @@ -28,9 +28,9 @@ import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin; - /** - * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.application.EjbModule}object. + * This is the item provider adpater for a + * {@link org.eclipse.jst.j2ee.internal.internal.application.EjbModule}object. */ public class EjbModuleItemProvider extends ModuleItemProvider implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider { /** diff --git a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/JavaClientModuleItemProvider.java b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/JavaClientModuleItemProvider.java index 28a01ff34..2a7b6ed8c 100644 --- a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/JavaClientModuleItemProvider.java +++ b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/JavaClientModuleItemProvider.java @@ -29,8 +29,8 @@ import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin; /** - * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.application.JavaClientModule} - * object. + * This is the item provider adpater for a + * {@link org.eclipse.jst.j2ee.internal.internal.application.JavaClientModule}object. */ public class JavaClientModuleItemProvider extends ModuleItemProvider implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider { /** diff --git a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/ModuleItemProvider.java b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/ModuleItemProvider.java index 90dbcee45..c0471939d 100644 --- a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/ModuleItemProvider.java +++ b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/ModuleItemProvider.java @@ -31,7 +31,8 @@ import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin; /** - * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.application.Module}object. + * This is the item provider adpater for a + * {@link org.eclipse.jst.j2ee.internal.internal.application.Module}object. */ public class ModuleItemProvider extends ApplicationItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider { /** diff --git a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/WebModuleItemProvider.java b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/WebModuleItemProvider.java index 26566d255..ca6b764f7 100644 --- a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/WebModuleItemProvider.java +++ b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/WebModuleItemProvider.java @@ -31,7 +31,8 @@ import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin; /** - * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.application.WebModule}object. + * This is the item provider adpater for a + * {@link org.eclipse.jst.j2ee.internal.internal.application.WebModule}object. */ public class WebModuleItemProvider extends ModuleItemProvider implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider { /** diff --git a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/ApplicationClientItemProvider.java b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/ApplicationClientItemProvider.java index 902415792..607a734d5 100644 --- a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/ApplicationClientItemProvider.java +++ b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/ApplicationClientItemProvider.java @@ -41,7 +41,8 @@ import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientFactory; import com.ibm.wtp.emf.workbench.ProjectUtilities; /** - * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.client.ApplicationClient}object. + * This is the item provider adpater for a + * {@link org.eclipse.jst.j2ee.internal.internal.client.ApplicationClient}object. */ public class ApplicationClientItemProvider extends CompatibilityDescriptionGroupItemProvider implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, IStructuredItemContentProvider, ITreeItemContentProvider { /** @@ -52,7 +53,8 @@ public class ApplicationClientItemProvider extends CompatibilityDescriptionGroup } /** - * This creates a new child for {@link org.eclipse.jst.j2ee.internal.internal.client.command.CreateChildCommand}. + * This creates a new child for + * {@link org.eclipse.jst.j2ee.internal.internal.client.command.CreateChildCommand}. */ public Object createChild(Object object) { // TODO: create some child object. @@ -89,7 +91,8 @@ public class ApplicationClientItemProvider extends CompatibilityDescriptionGroup /** - * This returns the image for {@link org.eclipse.jst.j2ee.internal.internal.client.command.CreateChildCommand}. + * This returns the image for + * {@link org.eclipse.jst.j2ee.internal.internal.client.command.CreateChildCommand}. */ public Object getCreateChildImage(Object object) { EObject refObject = (EObject) object; @@ -97,14 +100,16 @@ public class ApplicationClientItemProvider extends CompatibilityDescriptionGroup } /** - * This returns the label for {@link org.eclipse.jst.j2ee.internal.internal.client.command.CreateChildCommand}. + * This returns the label for + * {@link org.eclipse.jst.j2ee.internal.internal.client.command.CreateChildCommand}. */ public String getCreateChildText(Object object) { return ApplicationProvidersResourceHandler.getString("Create_Child_UI_"); //$NON-NLS-1$ } /** - * This returns the help text for {@link org.eclipse.jst.j2ee.internal.internal.client.command.CreateChildCommand}. + * This returns the help text for + * {@link org.eclipse.jst.j2ee.internal.internal.client.command.CreateChildCommand}. */ public String getCreateChildToolTipText(Object object) { EObject refObject = (EObject) object; @@ -256,8 +261,8 @@ public class ApplicationClientItemProvider extends CompatibilityDescriptionGroup ApplicationClient client = (ApplicationClient) object; Collection myChildren = super.getChildren(object); // TODO WebServices for M3 -// if (client.getVersionID() <= J2EEVersionConstants.J2EE_1_3_ID) -// myChildren.addAll(WebServicesManager.getInstance().get13ServiceRefs(client)); + // if (client.getVersionID() <= J2EEVersionConstants.J2EE_1_3_ID) + // myChildren.addAll(WebServicesManager.getInstance().get13ServiceRefs(client)); return myChildren; } }
\ No newline at end of file diff --git a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/ClientItemProviderAdapter.java b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/ClientItemProviderAdapter.java index bcbb8e57e..b9fc62e9c 100644 --- a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/ClientItemProviderAdapter.java +++ b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/ClientItemProviderAdapter.java @@ -22,11 +22,10 @@ import org.eclipse.jst.j2ee.internal.application.provider.ApplicationProvidersRe - /** * This extended item provider supports the following commands: - * {@link org.eclipse.jst.j2ee.internal.internal.client.command.CreateChildCommand}. The commands are implemented uniformly - * on all our item adapters using this common base class. + * {@link org.eclipse.jst.j2ee.internal.internal.client.command.CreateChildCommand}. The commands + * are implemented uniformly on all our item adapters using this common base class. */ public class ClientItemProviderAdapter extends ItemProviderAdapter implements org.eclipse.jst.j2ee.internal.application.common.CreateChildCommand.Helper { /** @@ -55,14 +54,16 @@ public class ClientItemProviderAdapter extends ItemProviderAdapter implements or } /** - * This returns the default image for {@link org.eclipse.jst.j2ee.internal.internal.client.command.CreateChildCommand}. + * This returns the default image for + * {@link org.eclipse.jst.j2ee.internal.internal.client.command.CreateChildCommand}. */ public Object getCreateChildImage(Object object) { return org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin.getPlugin().getImage("CreateChild"); //$NON-NLS-1$ } /** - * This returns the default label for {@link org.eclipse.jst.j2ee.internal.internal.client.command.CreateChildCommand}. + * This returns the default label for + * {@link org.eclipse.jst.j2ee.internal.internal.client.command.CreateChildCommand}. */ public String getCreateChildText(Object object) { return ApplicationProvidersResourceHandler.getString("Create_Child_UI_"); //$NON-NLS-1$ diff --git a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/ClientItemProviderAdapterFactory.java b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/ClientItemProviderAdapterFactory.java index 115456be9..3aa5487a4 100644 --- a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/ClientItemProviderAdapterFactory.java +++ b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/ClientItemProviderAdapterFactory.java @@ -111,7 +111,8 @@ public class ClientItemProviderAdapterFactory extends ClientAdapterFactory imple } /** - * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.client.ApplicationClient}. + * This creates an adapter for a + * {@link org.eclipse.jst.j2ee.internal.internal.client.ApplicationClient}. */ public Adapter createApplicationClientAdapter() { if (applicationClientItemProvider == null) { diff --git a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/EARProjectMapItemProvider.java b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/EARProjectMapItemProvider.java index 203e15dba..a8e8a5276 100644 --- a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/EARProjectMapItemProvider.java +++ b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/EARProjectMapItemProvider.java @@ -32,9 +32,9 @@ import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin; - /** - * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.internal.earcreation.modulemap.EARProjectMap} + * This is the item provider adpater for a + * {@link org.eclipse.jst.j2ee.internal.internal.internal.earcreation.modulemap.EARProjectMap} * object. */ public class EARProjectMapItemProvider extends ModulemapItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource { diff --git a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/ModuleMappingItemProvider.java b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/ModuleMappingItemProvider.java index 41b173a3e..fa4299780 100644 --- a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/ModuleMappingItemProvider.java +++ b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/ModuleMappingItemProvider.java @@ -33,9 +33,9 @@ import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin; - /** - * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.internal.earcreation.modulemap.ModuleMapping} + * This is the item provider adpater for a + * {@link org.eclipse.jst.j2ee.internal.internal.internal.earcreation.modulemap.ModuleMapping} * object. */ public class ModuleMappingItemProvider extends ModulemapItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource { diff --git a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/ModulemapItemProviderAdapter.java b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/ModulemapItemProviderAdapter.java index ef60eff77..3d9872356 100644 --- a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/ModulemapItemProviderAdapter.java +++ b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/ModulemapItemProviderAdapter.java @@ -29,7 +29,6 @@ import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin; - /** * This extended item provider supports the following commands: * <ul> diff --git a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/ModulemapItemProviderAdapterFactory.java b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/ModulemapItemProviderAdapterFactory.java index f00229772..30eeacbc2 100644 --- a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/ModulemapItemProviderAdapterFactory.java +++ b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/ModulemapItemProviderAdapterFactory.java @@ -72,12 +72,14 @@ public class ModulemapItemProviderAdapterFactory extends ModulemapAdapterFactory /** * This keeps track of the one adapter used for all - * {@link org.eclipse.jst.j2ee.internal.internal.internal.earcreation.modulemap.ModuleMapping}instances. + * {@link org.eclipse.jst.j2ee.internal.internal.internal.earcreation.modulemap.ModuleMapping} + * instances. */ protected ModuleMappingItemProvider moduleMappingItemProvider; /** - * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.internal.earcreation.modulemap.ModuleMapping}. + * This creates an adapter for a + * {@link org.eclipse.jst.j2ee.internal.internal.internal.earcreation.modulemap.ModuleMapping}. */ public Adapter createModuleMappingAdapter() { if (moduleMappingItemProvider == null) { @@ -89,12 +91,14 @@ public class ModulemapItemProviderAdapterFactory extends ModulemapAdapterFactory /** * This keeps track of the one adapter used for all - * {@link org.eclipse.jst.j2ee.internal.internal.internal.earcreation.modulemap.EARProjectMap}instances. + * {@link org.eclipse.jst.j2ee.internal.internal.internal.earcreation.modulemap.EARProjectMap} + * instances. */ protected EARProjectMapItemProvider earProjectMapItemProvider; /** - * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.internal.earcreation.modulemap.EARProjectMap}. + * This creates an adapter for a + * {@link org.eclipse.jst.j2ee.internal.internal.internal.earcreation.modulemap.EARProjectMap}. */ public Adapter createEARProjectMapAdapter() { if (earProjectMapItemProvider == null) { @@ -106,12 +110,14 @@ public class ModulemapItemProviderAdapterFactory extends ModulemapAdapterFactory /** * This keeps track of the one adapter used for all - * {@link org.eclipse.jst.j2ee.internal.internal.internal.earcreation.modulemap.UtilityJARMapping}instances. + * {@link org.eclipse.jst.j2ee.internal.internal.internal.earcreation.modulemap.UtilityJARMapping} + * instances. */ protected UtilityJARMappingItemProvider utilityJARMappingItemProvider; /** - * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.internal.earcreation.modulemap.UtilityJARMapping}. + * This creates an adapter for a + * {@link org.eclipse.jst.j2ee.internal.internal.internal.earcreation.modulemap.UtilityJARMapping}. */ public Adapter createUtilityJARMappingAdapter() { if (utilityJARMappingItemProvider == null) { diff --git a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/UtilityJARMappingItemProvider.java b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/UtilityJARMappingItemProvider.java index 960b8760f..b166a7c96 100644 --- a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/UtilityJARMappingItemProvider.java +++ b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/UtilityJARMappingItemProvider.java @@ -33,9 +33,9 @@ import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin; - /** - * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.internal.earcreation.modulemap.UtilityJARMapping} + * This is the item provider adpater for a + * {@link org.eclipse.jst.j2ee.internal.internal.internal.earcreation.modulemap.UtilityJARMapping} * object. */ public class UtilityJARMappingItemProvider extends ModulemapItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource { diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/ApplicationClientProjectLoadStrategy.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/ApplicationClientProjectLoadStrategy.java index e17e1f407..ab155cd3a 100644 --- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/ApplicationClientProjectLoadStrategy.java +++ b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/ApplicationClientProjectLoadStrategy.java @@ -10,6 +10,5 @@ package org.eclipse.jst.j2ee.internal.archive.operations; - public interface ApplicationClientProjectLoadStrategy extends J2EELoadStrategy { }
\ No newline at end of file diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/ApplicationClientProjectSaveStrategy.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/ApplicationClientProjectSaveStrategy.java index 3cd479d41..6154e0ffe 100644 --- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/ApplicationClientProjectSaveStrategy.java +++ b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/ApplicationClientProjectSaveStrategy.java @@ -12,7 +12,6 @@ package org.eclipse.jst.j2ee.internal.archive.operations; - /** * Insert the type's description here. Creation date: (4/4/2001 11:16:20 AM) * diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/EARProjectLoadStrategy.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/EARProjectLoadStrategy.java index 4ec13da0a..59119a687 100644 --- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/EARProjectLoadStrategy.java +++ b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/EARProjectLoadStrategy.java @@ -14,7 +14,6 @@ import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.LoadStrategy; - /** * Insert the type's description here. Creation date: (2/20/2001 1:02:01 PM) * diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/EARProjectSaveStrategy.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/EARProjectSaveStrategy.java index 2216e8502..c69cb5349 100644 --- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/EARProjectSaveStrategy.java +++ b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/EARProjectSaveStrategy.java @@ -14,7 +14,6 @@ import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.SaveStrategy; - /** * Insert the type's description here. Creation date: (2/20/2001 1:10:41 PM) * diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/EARProjectSaveStrategyImpl.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/EARProjectSaveStrategyImpl.java index 61ec71be9..5b92d3ddc 100644 --- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/EARProjectSaveStrategyImpl.java +++ b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/EARProjectSaveStrategyImpl.java @@ -74,7 +74,7 @@ public class EARProjectSaveStrategyImpl extends SaveStrategyImpl implements EARP project = dataModel.getProject(); setArchive(model.getEARFile()); includeProjectMetaFiles = model.getBooleanProperty(EnterpriseApplicationImportDataModel.PRESERVE_PROJECT_METADATA); - overwriteHandler = (IOverwriteHandler)model.getProperty(EnterpriseApplicationImportDataModel.OVERWRITE_HANDLER); + overwriteHandler = (IOverwriteHandler) model.getProperty(EnterpriseApplicationImportDataModel.OVERWRITE_HANDLER); if (null != overwriteHandler) { overwriteHandler.setEarSaveStrategy(this); } diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/IJ2EEImportExportConstants.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/IJ2EEImportExportConstants.java index d400a39be..0771f9949 100644 --- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/IJ2EEImportExportConstants.java +++ b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/IJ2EEImportExportConstants.java @@ -21,4 +21,3 @@ public interface IJ2EEImportExportConstants { public String PROJECT_RUNTIME_URI = ".runtime"; //$NON-NLS-1$ } - diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/J2EELoadStrategy.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/J2EELoadStrategy.java index e9148982a..314ee1f99 100644 --- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/J2EELoadStrategy.java +++ b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/J2EELoadStrategy.java @@ -14,7 +14,6 @@ import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.LoadStrategy; - /** * Insert the type's description here. Creation date: (5/10/2001 3:53:38 PM) * diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/J2EESaveStrategy.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/J2EESaveStrategy.java index 509b5b634..3dc99656f 100644 --- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/J2EESaveStrategy.java +++ b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/J2EESaveStrategy.java @@ -14,7 +14,6 @@ import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.SaveStrategy; - /** * Insert the type's description here. Creation date: (5/10/2001 5:54:02 PM) * diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/JavaModelUtil.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/JavaModelUtil.java index 04249ce03..e28cdfc86 100644 --- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/JavaModelUtil.java +++ b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/JavaModelUtil.java @@ -46,7 +46,8 @@ import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jdt.core.Signature; import org.eclipse.jdt.core.compiler.CharOperation; -//TODO this is a copy of the class in org.eclipse.jdt.ui and should be deleted once bugzilla 60567 is addressed +//TODO this is a copy of the class in org.eclipse.jdt.ui and should be deleted once bugzilla 60567 +// is addressed /** * * @author jsholl diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/CommonItemProviderAdapter.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/CommonItemProviderAdapter.java index 5bfe7e356..da8d268e1 100644 --- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/CommonItemProviderAdapter.java +++ b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/CommonItemProviderAdapter.java @@ -24,7 +24,6 @@ import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin; - /** * This extended item provider supports two addition features, (@link CreateChildCommand} and * {@link CreateChildrenCommand}. These two actions are implemented uniformly on all our item diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/CommonItemProviderAdapterFactory.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/CommonItemProviderAdapterFactory.java index 20d5ec51d..4b9eed932 100644 --- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/CommonItemProviderAdapterFactory.java +++ b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/CommonItemProviderAdapterFactory.java @@ -169,16 +169,17 @@ public class CommonItemProviderAdapterFactory extends CommonAdapterFactory imple /** * This keeps track of the one adapter used for all - * {@link org.eclipse.jst.j2ee.internal.internal.common.Description}instances. <!-- begin-user-doc --> <!-- - * end-user-doc --> + * {@link org.eclipse.jst.j2ee.internal.internal.common.Description}instances. <!-- + * begin-user-doc --> <!-- end-user-doc --> * * @generated */ protected DescriptionItemProvider descriptionItemProvider; /** - * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.common.Description}. <!-- - * begin-user-doc --> <!-- end-user-doc --> + * This creates an adapter for a + * {@link org.eclipse.jst.j2ee.internal.internal.common.Description}. <!-- begin-user-doc --> + * <!-- end-user-doc --> * * @generated */ @@ -191,16 +192,17 @@ public class CommonItemProviderAdapterFactory extends CommonAdapterFactory imple } /** - * This keeps track of the one adapter used for all {@link org.eclipse.jst.j2ee.internal.internal.common.QName} - * instances. <!-- begin-user-doc --> <!-- end-user-doc --> + * This keeps track of the one adapter used for all + * {@link org.eclipse.jst.j2ee.internal.internal.common.QName}instances. <!-- begin-user-doc + * --> <!-- end-user-doc --> * * @generated */ protected QNameItemProvider qNameItemProvider; /** - * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.common.QName}. <!-- begin-user-doc - * --> <!-- end-user-doc --> + * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.common.QName}. + * <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated */ @@ -213,16 +215,17 @@ public class CommonItemProviderAdapterFactory extends CommonAdapterFactory imple } /** - * This keeps track of the one adapter used for all {@link org.eclipse.jst.j2ee.internal.internal.common.Listener} - * instances. <!-- begin-user-doc --> <!-- end-user-doc --> + * This keeps track of the one adapter used for all + * {@link org.eclipse.jst.j2ee.internal.internal.common.Listener}instances. <!-- begin-user-doc + * --> <!-- end-user-doc --> * * @generated */ protected ListenerItemProvider listenerItemProvider; /** - * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.common.Listener}. <!-- - * begin-user-doc --> <!-- end-user-doc --> + * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.common.Listener}. + * <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated */ @@ -236,8 +239,8 @@ public class CommonItemProviderAdapterFactory extends CommonAdapterFactory imple /** * This keeps track of the one adapter used for all - * {@link org.eclipse.jst.j2ee.internal.internal.common.CompatibilityDescriptionGroup}instances. <!-- - * begin-user-doc --> <!-- end-user-doc --> + * {@link org.eclipse.jst.j2ee.internal.internal.common.CompatibilityDescriptionGroup} + * instances. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated */ @@ -245,8 +248,8 @@ public class CommonItemProviderAdapterFactory extends CommonAdapterFactory imple /** * This creates an adapter for a - * {@link org.eclipse.jst.j2ee.internal.internal.common.CompatibilityDescriptionGroup}. <!-- begin-user-doc --> - * <!-- end-user-doc --> + * {@link org.eclipse.jst.j2ee.internal.internal.common.CompatibilityDescriptionGroup}. <!-- + * begin-user-doc --> <!-- end-user-doc --> * * @generated */ @@ -293,16 +296,17 @@ public class CommonItemProviderAdapterFactory extends CommonAdapterFactory imple /** * This keeps track of the one adapter used for all - * {@link org.eclipse.jst.j2ee.internal.internal.common.EJBLocalRef}instances. <!-- begin-user-doc --> <!-- - * end-user-doc --> + * {@link org.eclipse.jst.j2ee.internal.internal.common.EJBLocalRef}instances. <!-- + * begin-user-doc --> <!-- end-user-doc --> * * @generated */ protected EJBLocalRefItemProvider ejbLocalRefItemProvider; /** - * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.common.EJBLocalRef}. <!-- - * begin-user-doc --> <!-- end-user-doc --> + * This creates an adapter for a + * {@link org.eclipse.jst.j2ee.internal.internal.common.EJBLocalRef}. <!-- begin-user-doc --> + * <!-- end-user-doc --> * * @generated */ @@ -339,16 +343,17 @@ public class CommonItemProviderAdapterFactory extends CommonAdapterFactory imple /** - * This keeps track of the one adapter used for all {@link org.eclipse.jst.j2ee.internal.internal.common.IconType} - * instances. <!-- begin-user-doc --> <!-- end-user-doc --> + * This keeps track of the one adapter used for all + * {@link org.eclipse.jst.j2ee.internal.internal.common.IconType}instances. <!-- begin-user-doc + * --> <!-- end-user-doc --> * * @generated */ protected IconTypeItemProvider iconTypeItemProvider; /** - * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.common.IconType}. <!-- - * begin-user-doc --> <!-- end-user-doc --> + * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.common.IconType}. + * <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated */ @@ -362,16 +367,17 @@ public class CommonItemProviderAdapterFactory extends CommonAdapterFactory imple /** * This keeps track of the one adapter used for all - * {@link org.eclipse.jst.j2ee.internal.internal.common.DisplayName}instances. <!-- begin-user-doc --> <!-- - * end-user-doc --> + * {@link org.eclipse.jst.j2ee.internal.internal.common.DisplayName}instances. <!-- + * begin-user-doc --> <!-- end-user-doc --> * * @generated */ protected DisplayNameItemProvider displayNameItemProvider; /** - * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.common.DisplayName}. <!-- - * begin-user-doc --> <!-- end-user-doc --> + * This creates an adapter for a + * {@link org.eclipse.jst.j2ee.internal.internal.common.DisplayName}. <!-- begin-user-doc --> + * <!-- end-user-doc --> * * @generated */ @@ -385,15 +391,16 @@ public class CommonItemProviderAdapterFactory extends CommonAdapterFactory imple /** * This keeps track of the one adapter used for all - * {@link org.eclipse.jst.j2ee.internal.internal.common.MessageDestinationRef}instances. <!-- begin-user-doc --> - * <!-- end-user-doc --> + * {@link org.eclipse.jst.j2ee.internal.internal.common.MessageDestinationRef}instances. <!-- + * begin-user-doc --> <!-- end-user-doc --> * * @generated */ protected MessageDestinationRefItemProvider messageDestinationRefItemProvider; /** - * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.common.MessageDestinationRef}. <!-- + * This creates an adapter for a + * {@link org.eclipse.jst.j2ee.internal.internal.common.MessageDestinationRef}. <!-- * begin-user-doc --> <!-- end-user-doc --> * * @generated @@ -408,15 +415,16 @@ public class CommonItemProviderAdapterFactory extends CommonAdapterFactory imple /** * This keeps track of the one adapter used for all - * {@link org.eclipse.jst.j2ee.internal.internal.common.MessageDestination}instances. <!-- begin-user-doc --> <!-- - * end-user-doc --> + * {@link org.eclipse.jst.j2ee.internal.internal.common.MessageDestination}instances. <!-- + * begin-user-doc --> <!-- end-user-doc --> * * @generated */ protected MessageDestinationItemProvider messageDestinationItemProvider; /** - * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.common.MessageDestination}. <!-- + * This creates an adapter for a + * {@link org.eclipse.jst.j2ee.internal.internal.common.MessageDestination}. <!-- * begin-user-doc --> <!-- end-user-doc --> * * @generated @@ -431,16 +439,17 @@ public class CommonItemProviderAdapterFactory extends CommonAdapterFactory imple /** * This keeps track of the one adapter used for all - * {@link org.eclipse.jst.j2ee.internal.internal.common.ParamValue}instances. <!-- begin-user-doc --> <!-- - * end-user-doc --> + * {@link org.eclipse.jst.j2ee.internal.internal.common.ParamValue}instances. <!-- + * begin-user-doc --> <!-- end-user-doc --> * * @generated */ protected ParamValueItemProvider paramValueItemProvider; /** - * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.common.ParamValue}. <!-- - * begin-user-doc --> <!-- end-user-doc --> + * This creates an adapter for a + * {@link org.eclipse.jst.j2ee.internal.internal.common.ParamValue}. <!-- begin-user-doc --> + * <!-- end-user-doc --> * * @generated */ @@ -454,16 +463,17 @@ public class CommonItemProviderAdapterFactory extends CommonAdapterFactory imple /** * This keeps track of the one adapter used for all - * {@link org.eclipse.jst.j2ee.internal.internal.common.DescriptionGroup}instances. <!-- begin-user-doc --> <!-- - * end-user-doc --> + * {@link org.eclipse.jst.j2ee.internal.internal.common.DescriptionGroup}instances. <!-- + * begin-user-doc --> <!-- end-user-doc --> * * @generated */ protected DescriptionGroupItemProvider descriptionGroupItemProvider; /** - * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.common.DescriptionGroup}. <!-- - * begin-user-doc --> <!-- end-user-doc --> + * This creates an adapter for a + * {@link org.eclipse.jst.j2ee.internal.internal.common.DescriptionGroup}. <!-- begin-user-doc + * --> <!-- end-user-doc --> * * @generated */ diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/CompatibilityDescriptionGroupItemProvider.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/CompatibilityDescriptionGroupItemProvider.java index db3356922..f48eb34b7 100644 --- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/CompatibilityDescriptionGroupItemProvider.java +++ b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/CompatibilityDescriptionGroupItemProvider.java @@ -32,8 +32,8 @@ import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin; /** * This is the item provider adpater for a - * {@link org.eclipse.jst.j2ee.internal.internal.common.CompatibilityDescriptionGroup}object. <!-- begin-user-doc --> - * <!-- end-user-doc --> + * {@link org.eclipse.jst.j2ee.internal.internal.common.CompatibilityDescriptionGroup}object. <!-- + * begin-user-doc --> <!-- end-user-doc --> * * @generated */ diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/DescriptionGroupItemProvider.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/DescriptionGroupItemProvider.java index df63979b2..2169a0b81 100644 --- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/DescriptionGroupItemProvider.java +++ b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/DescriptionGroupItemProvider.java @@ -32,8 +32,9 @@ import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory; /** - * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.common.DescriptionGroup} - * object. <!-- begin-user-doc --> <!-- end-user-doc --> + * This is the item provider adpater for a + * {@link org.eclipse.jst.j2ee.internal.internal.common.DescriptionGroup}object. <!-- + * begin-user-doc --> <!-- end-user-doc --> * * @generated */ diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/DescriptionItemProvider.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/DescriptionItemProvider.java index 53a12d489..6883faedd 100644 --- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/DescriptionItemProvider.java +++ b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/DescriptionItemProvider.java @@ -32,8 +32,9 @@ import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin; /** - * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.common.Description}object. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * This is the item provider adpater for a + * {@link org.eclipse.jst.j2ee.internal.internal.common.Description}object. <!-- begin-user-doc --> + * <!-- end-user-doc --> * * @generated */ diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/DisplayNameItemProvider.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/DisplayNameItemProvider.java index e534bc05f..ac5c56bcd 100644 --- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/DisplayNameItemProvider.java +++ b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/DisplayNameItemProvider.java @@ -30,8 +30,9 @@ import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin; /** - * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.common.DisplayName}object. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * This is the item provider adpater for a + * {@link org.eclipse.jst.j2ee.internal.internal.common.DisplayName}object. <!-- begin-user-doc --> + * <!-- end-user-doc --> * * @generated */ diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/EJBLocalRefItemProvider.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/EJBLocalRefItemProvider.java index 37553819b..765ba7631 100644 --- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/EJBLocalRefItemProvider.java +++ b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/EJBLocalRefItemProvider.java @@ -31,8 +31,9 @@ import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin; /** - * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.common.EJBLocalRef}object. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * This is the item provider adpater for a + * {@link org.eclipse.jst.j2ee.internal.internal.common.EJBLocalRef}object. <!-- begin-user-doc --> + * <!-- end-user-doc --> * * @generated */ diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/IconTypeItemProvider.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/IconTypeItemProvider.java index 456c71ed9..3f3e81d2f 100644 --- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/IconTypeItemProvider.java +++ b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/IconTypeItemProvider.java @@ -31,8 +31,9 @@ import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin; /** - * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.common.IconType}object. <!-- - * begin-user-doc --> <!-- end-user-doc --> + * This is the item provider adpater for a + * {@link org.eclipse.jst.j2ee.internal.internal.common.IconType}object. <!-- begin-user-doc --> + * <!-- end-user-doc --> * * @generated */ diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/IdentityItemProvider.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/IdentityItemProvider.java index c5317f415..ad1221f0d 100644 --- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/IdentityItemProvider.java +++ b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/IdentityItemProvider.java @@ -35,7 +35,6 @@ import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory; - /** * This is the item provider adpater for a {@link com.ibm.etools.common.Identity}object. */ diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/JNDIEnvRefsGroupItemProvider.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/JNDIEnvRefsGroupItemProvider.java index 53bf35567..90956fbed 100644 --- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/JNDIEnvRefsGroupItemProvider.java +++ b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/JNDIEnvRefsGroupItemProvider.java @@ -31,8 +31,9 @@ import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientFactory; /** - * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.common.JNDIEnvRefsGroup} - * object. <!-- begin-user-doc --> <!-- end-user-doc --> + * This is the item provider adpater for a + * {@link org.eclipse.jst.j2ee.internal.internal.common.JNDIEnvRefsGroup}object. <!-- + * begin-user-doc --> <!-- end-user-doc --> * * @generated */ diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/MessageDestinationItemProvider.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/MessageDestinationItemProvider.java index a7819b9e5..d774c4e45 100644 --- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/MessageDestinationItemProvider.java +++ b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/MessageDestinationItemProvider.java @@ -31,8 +31,9 @@ import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin; /** - * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.common.MessageDestination} - * object. <!-- begin-user-doc --> <!-- end-user-doc --> + * This is the item provider adpater for a + * {@link org.eclipse.jst.j2ee.internal.internal.common.MessageDestination}object. <!-- + * begin-user-doc --> <!-- end-user-doc --> * * @generated */ diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/MessageDestinationRefItemProvider.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/MessageDestinationRefItemProvider.java index bd2e54b27..14c32e598 100644 --- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/MessageDestinationRefItemProvider.java +++ b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/MessageDestinationRefItemProvider.java @@ -34,8 +34,9 @@ import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory; /** - * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.common.MessageDestinationRef} - * object. <!-- begin-user-doc --> <!-- end-user-doc --> + * This is the item provider adpater for a + * {@link org.eclipse.jst.j2ee.internal.internal.common.MessageDestinationRef}object. <!-- + * begin-user-doc --> <!-- end-user-doc --> * * @generated */ diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/ParamValueItemProvider.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/ParamValueItemProvider.java index f0f25f212..4687a1cd4 100644 --- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/ParamValueItemProvider.java +++ b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/ParamValueItemProvider.java @@ -34,8 +34,9 @@ import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory; /** - * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.common.ParamValue}object. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * This is the item provider adpater for a + * {@link org.eclipse.jst.j2ee.internal.internal.common.ParamValue}object. <!-- begin-user-doc --> + * <!-- end-user-doc --> * * @generated */ diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/QNameItemProvider.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/QNameItemProvider.java index 62e3ae907..8f0659c12 100644 --- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/QNameItemProvider.java +++ b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/QNameItemProvider.java @@ -32,8 +32,9 @@ import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin; /** - * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.common.QName}object. <!-- - * begin-user-doc --> <!-- end-user-doc --> + * This is the item provider adpater for a + * {@link org.eclipse.jst.j2ee.internal.internal.common.QName}object. <!-- begin-user-doc --> <!-- + * end-user-doc --> * * @generated */ diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/EnterpriseApplicationImportDataModel.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/EnterpriseApplicationImportDataModel.java index de34a8c8d..f57052631 100644 --- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/EnterpriseApplicationImportDataModel.java +++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/EnterpriseApplicationImportDataModel.java @@ -136,8 +136,8 @@ public final class EnterpriseApplicationImportDataModel extends J2EEArtifactImpo private Hashtable clientJarToEjbJarModels = new Hashtable(); /** - * Imports the specified Enterprise Application archive file into the specified Enterprise Application - * project. + * Imports the specified Enterprise Application archive file into the specified Enterprise + * Application project. * * @param earFileName * The path to the EAR file. diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/IAnnotationsDataModel.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/IAnnotationsDataModel.java index a83fa7984..27aa4726d 100644 --- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/IAnnotationsDataModel.java +++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/IAnnotationsDataModel.java @@ -14,7 +14,8 @@ package org.eclipse.jst.j2ee.application.operations; -//TODO this should be deleted and the required properties added to the various models that need them +//TODO this should be deleted and the required properties added to the various models that need +// them /** * @author jlanuti */ diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/J2EEArtifactImportDataModel.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/J2EEArtifactImportDataModel.java index d9d61e9fe..34913f3cb 100644 --- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/J2EEArtifactImportDataModel.java +++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/J2EEArtifactImportDataModel.java @@ -424,7 +424,7 @@ public abstract class J2EEArtifactImportDataModel extends WTPOperationDataModel public void extractHandled(List newList, boolean addModels) { } - protected WTPPropertyDescriptor [] doGetValidPropertyDescriptors(String propertyName) { + protected WTPPropertyDescriptor[] doGetValidPropertyDescriptors(String propertyName) { if (propertyName.equals(PROJECT_NAME)) { int j2eeVersion = getJ2EEVersion(); IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects(); diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/J2EEModuleCreationDataModel.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/J2EEModuleCreationDataModel.java index 7fdc0dcc7..efc4e7683 100644 --- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/J2EEModuleCreationDataModel.java +++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/J2EEModuleCreationDataModel.java @@ -147,7 +147,7 @@ public abstract class J2EEModuleCreationDataModel extends J2EEArtifactCreationDa } protected abstract Integer getDefaultJ2EEModuleVersion(); - + private String getDefaultEARName(String baseName) { return baseName + "EAR"; //TODO //$NON-NLS-1$ } @@ -319,10 +319,10 @@ public abstract class J2EEModuleCreationDataModel extends J2EEArtifactCreationDa } - protected final void setJ2EENatureID(String J2EENatureID){ + protected final void setJ2EENatureID(String J2EENatureID) { this.J2EENatureID = J2EENatureID; } - + public final String getJ2EENatureID() { return J2EENatureID; } diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/J2EEUtilityJarImportDataModel.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/J2EEUtilityJarImportDataModel.java index 0f0a129e4..34c9cff12 100644 --- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/J2EEUtilityJarImportDataModel.java +++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/J2EEUtilityJarImportDataModel.java @@ -38,6 +38,7 @@ public final class J2EEUtilityJarImportDataModel extends J2EEArtifactImportDataM public void initProjectModel() { setProjectDataModel(new JavaProjectCreationDataModel()); } + public WTPOperation getDefaultOperation() { return null; } diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/EARNatureRuntime.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/EARNatureRuntime.java index 1cd9f3654..52336cf96 100644 --- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/EARNatureRuntime.java +++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/EARNatureRuntime.java @@ -418,7 +418,7 @@ public class EARNatureRuntime extends J2EENature { EAREditModel model = (EAREditModel) getCacheEditModel(); ModuleMapping map = model.getModuleMapping(aModule); - if (map != null && map.getProjectName() != null && map.getProjectName().length() > 0 ) { + if (map != null && map.getProjectName() != null && map.getProjectName().length() > 0) { return J2EEPlugin.getWorkspace().getRoot().getProject(map.getProjectName()); } diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/IEARNatureConstants.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/IEARNatureConstants.java index af1ff6a87..1dfff694a 100644 --- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/IEARNatureConstants.java +++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/IEARNatureConstants.java @@ -10,7 +10,6 @@ package org.eclipse.jst.j2ee.internal.earcreation; - /* The Ear Nature constants are the constants for the web nature interface to the plugins */ public interface IEARNatureConstants { diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/J2EEModuleNature.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/J2EEModuleNature.java index ce9d497eb..d865a59a7 100644 --- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/J2EEModuleNature.java +++ b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/J2EEModuleNature.java @@ -305,38 +305,34 @@ public abstract class J2EEModuleNature extends J2EENature { * releaseAccess()! */ // TODO WebServices for M3 -// public WebServiceEditModel getWebServiceEditModelForRead(Object accessorKey) { -// return getWebServiceEditModelForRead(accessorKey, null); -// } - + // public WebServiceEditModel getWebServiceEditModelForRead(Object accessorKey) { + // return getWebServiceEditModelForRead(accessorKey, null); + // } /** * Return an editing model used to read web service resources. Important!!! Calling this method * increments the use count of this model. When you are done accessing the model, call * releaseAccess()! */ // TODO WebServices for M3 -// public WebServiceEditModel getWebServiceEditModelForRead(Object accessorKey, Map params) { -// return null; -// } - + // public WebServiceEditModel getWebServiceEditModelForRead(Object accessorKey, Map params) { + // return null; + // } /** * Return an editing model used to edit web service resources. Important!!! Calling this method * increments the use count of this model. When you are done accessing the model, call * releaseAccess()! */ // TODO WebServices for M3 -// public WebServiceEditModel getWebServiceEditModelForWrite(Object accessorKey) { -// return getWebServiceEditModelForWrite(accessorKey, null); -// } - + // public WebServiceEditModel getWebServiceEditModelForWrite(Object accessorKey) { + // return getWebServiceEditModelForWrite(accessorKey, null); + // } /** * Return an editing model used to edit web service resources. Important!!! Calling this method * increments the use count of this model. When you are done accessing the model, call * releaseAccess()! */ // TODO Webservices for M3 -// public WebServiceEditModel getWebServiceEditModelForWrite(Object accessorKey, Map params) { -// return null; -// } - + // public WebServiceEditModel getWebServiceEditModelForWrite(Object accessorKey, Map params) { + // return null; + // } }
\ No newline at end of file diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/J2EEProjectUtilities.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/J2EEProjectUtilities.java index bd44ba9b7..692b8dfe9 100644 --- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/J2EEProjectUtilities.java +++ b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/J2EEProjectUtilities.java @@ -448,6 +448,7 @@ public class J2EEProjectUtilities extends ProjectUtilities { } return null; } + public static IContainer getSourceFolderOrFirst(IProject p, String defaultSourceName) { try { IPath sourcePath = getSourcePathOrFirst(p, defaultSourceName); @@ -461,7 +462,7 @@ public class J2EEProjectUtilities extends ProjectUtilities { return null; } } - + public static IPath getSourcePathOrFirst(IProject p, String defaultSourceName) { IJavaProject javaProj = getJavaProject(p); if (javaProj == null) @@ -514,7 +515,7 @@ public class J2EEProjectUtilities extends ProjectUtilities { return firstSource.getPath().removeFirstSegments(1); return null; } - + public static boolean isSourceFolderAnInputContainer(IFolder sourceFolder) { IContainer parent = sourceFolder; while (true) { @@ -524,19 +525,16 @@ public class J2EEProjectUtilities extends ProjectUtilities { if (parent instanceof IProject) break; } - IProject project = (IProject)parent; + IProject project = (IProject) parent; try { IProjectDescription desc = project.getDescription(); if (desc.hasNature(IEJBNatureConstants.NATURE_ID)) { return sourceFolder.findMember(J2EEConstants.EJBJAR_DD_URI) != null; - } - else if (desc.hasNature(IApplicationClientNatureConstants.NATURE_ID)) { + } else if (desc.hasNature(IApplicationClientNatureConstants.NATURE_ID)) { return sourceFolder.findMember(J2EEConstants.APP_CLIENT_DD_URI) != null; - } - else if (desc.hasNature(IWebNatureConstants.J2EE_NATURE_ID)) { + } else if (desc.hasNature(IWebNatureConstants.J2EE_NATURE_ID)) { return sourceFolder.findMember(J2EEConstants.WEBAPP_DD_URI) != null; - } - else if (desc.hasNature(IConnectorNatureConstants.NATURE_ID)) { + } else if (desc.hasNature(IConnectorNatureConstants.NATURE_ID)) { return sourceFolder.findMember(J2EEConstants.RAR_DD_URI) != null; } } catch (CoreException e) { diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/J2EESettingsMigrator.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/J2EESettingsMigrator.java index b47711e65..a247abeb1 100644 --- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/J2EESettingsMigrator.java +++ b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/J2EESettingsMigrator.java @@ -13,8 +13,8 @@ package org.eclipse.jst.j2ee.internal.project; /* * Created on Apr 22, 2004 * - * To change the template for this generated file go to Window - Preferences - - * Java - Code Generation - Code and Comments + * To change the template for this generated file go to Window - Preferences - Java - Code + * Generation - Code and Comments */ diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/J2EEWorkbenchURIConverterImpl.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/J2EEWorkbenchURIConverterImpl.java index 52707fcb4..7b2cfd443 100644 --- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/J2EEWorkbenchURIConverterImpl.java +++ b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/J2EEWorkbenchURIConverterImpl.java @@ -167,13 +167,14 @@ public class J2EEWorkbenchURIConverterImpl extends CompatibilityWorkbenchURIConv */ public void projectClosed() { } + public IContainer getInputContainer() { List list = getInputContainers(); if (!list.isEmpty()) { for (int i = 0; i < list.size(); i++) { - IContainer container = (IContainer)list.get(i); + IContainer container = (IContainer) list.get(i); if (container instanceof IFolder) { - IFolder sourceFolder = (IFolder)container; + IFolder sourceFolder = (IFolder) container; if (J2EEProjectUtilities.isSourceFolderAnInputContainer(sourceFolder)) { return sourceFolder; } diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/reference/ReferenceDataModel.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/reference/ReferenceDataModel.java index 8689db59f..90097a329 100644 --- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/reference/ReferenceDataModel.java +++ b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/reference/ReferenceDataModel.java @@ -235,13 +235,13 @@ public abstract class ReferenceDataModel extends J2EEModelModifierOperationDataM return false; if (checkMessageDestRefExists(bean.getMessageDestinationRefs(), nameValue)) return false; - } + } // TODO WebServices for M3 -// else { -// Collection temp = WebServicesManager.getInstance().get13ServiceRefs(bean); -// if (temp != null && !temp.isEmpty() && checkServiceRefExists((List) temp, nameValue)) -// return false; -// } + // else { + // Collection temp = WebServicesManager.getInstance().get13ServiceRefs(bean); + // if (temp != null && !temp.isEmpty() && checkServiceRefExists((List) temp, nameValue)) + // return false; + // } } else if (ownerType == APP_CLIENT_TYPE) { ApplicationClient appClient = (ApplicationClient) getProperty(ReferenceDataModel.OWNER); if (checkResourceRefExists(appClient.getResourceRefs(), nameValue)) @@ -255,13 +255,13 @@ public abstract class ReferenceDataModel extends J2EEModelModifierOperationDataM return false; if (checkMessageDestRefExists(appClient.getMessageDestinationRefs(), nameValue)) return false; - } + } // TODO WebServices for M3 -// else { -// Collection temp = WebServicesManager.getInstance().get13ServiceRefs(appClient); -// if (temp != null && !temp.isEmpty() && checkServiceRefExists((List) temp, nameValue)) -// return false; -// } + // else { + // Collection temp = WebServicesManager.getInstance().get13ServiceRefs(appClient); + // if (temp != null && !temp.isEmpty() && checkServiceRefExists((List) temp, nameValue)) + // return false; + // } } else if (ownerType == WEB_TYPE) { WebApp webApp = (WebApp) getProperty(ReferenceDataModel.OWNER); if (checkResourceRefExists(webApp.getResourceRefs(), nameValue)) @@ -277,13 +277,13 @@ public abstract class ReferenceDataModel extends J2EEModelModifierOperationDataM return false; if (checkMessageDestRefExists(webApp.getMessageDestinationRefs(), nameValue)) return false; - } + } // TODO WebServices for M3 -// else { -// Collection temp = WebServicesManager.getInstance().get13ServiceRefs(webApp); -// if (temp != null && !temp.isEmpty() && checkServiceRefExists((List) temp, nameValue)) -// return false; -// } + // else { + // Collection temp = WebServicesManager.getInstance().get13ServiceRefs(webApp); + // if (temp != null && !temp.isEmpty() && checkServiceRefExists((List) temp, nameValue)) + // return false; + // } } return true; } diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/servertarget/ServerTargetHelper.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/servertarget/ServerTargetHelper.java index 9b52a47e6..12dab01c3 100644 --- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/servertarget/ServerTargetHelper.java +++ b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/servertarget/ServerTargetHelper.java @@ -49,446 +49,440 @@ import com.ibm.wtp.emf.workbench.ProjectUtilities; /** * @author vijayb * - * To change the template for this generated type comment go to - * Window>Preferences>Java>Code Generation>Code and Comments + * To change the template for this generated type comment go to Window>Preferences>Java>Code + * Generation>Code and Comments */ public class ServerTargetHelper { - public static final String JAVA_NATURE_ID = "org.eclipse.jdt.core.javanature"; //$NON-NLS-1$ + public static final String JAVA_NATURE_ID = "org.eclipse.jdt.core.javanature"; //$NON-NLS-1$ - public static final String SERVER_CONTAINER = "org.eclipse.jst.server.core.container"; //$NON-NLS-1$ + public static final String SERVER_CONTAINER = "org.eclipse.jst.server.core.container"; //$NON-NLS-1$ - /** - * - */ - public ServerTargetHelper() { - super(); - // TODO Auto-generated constructor stub - } + /** + * + */ + public ServerTargetHelper() { + super(); + // TODO Auto-generated constructor stub + } - public static void cleanUpNonServerTargetClasspath(IProject project) { - List existingClasspathEntries = ServerTargetHelper.getExistingNonServerTargetClasspath(project); - if (!existingClasspathEntries.isEmpty()) - ServerTargetHelper.removeNonSeverTargetClasspathEntries(project, existingClasspathEntries); - } + public static void cleanUpNonServerTargetClasspath(IProject project) { + List existingClasspathEntries = ServerTargetHelper.getExistingNonServerTargetClasspath(project); + if (!existingClasspathEntries.isEmpty()) + ServerTargetHelper.removeNonSeverTargetClasspathEntries(project, existingClasspathEntries); + } - /** - * @param existingClasspathEntries - */ - public static void removeNonSeverTargetClasspathEntries(IProject project, List existingClasspathEntries) { - try { - ProjectUtilities.removeFromJavaClassPath(project, existingClasspathEntries); - } catch (JavaModelException jme) { - Logger.getLogger().logError(jme); - } - } + /** + * @param existingClasspathEntries + */ + public static void removeNonSeverTargetClasspathEntries(IProject project, List existingClasspathEntries) { + try { + ProjectUtilities.removeFromJavaClassPath(project, existingClasspathEntries); + } catch (JavaModelException jme) { + Logger.getLogger().logError(jme); + } + } - /** - * @param project - */ - // public static void syncNoServerTargetForEARModules(IProject project) { - // removeServerTargetForEARModuleProjects(project); - // removeServerTargetForEARUtilsProject(project); - // } - /** - * @param project - */ - // public static void removeServerTargetForEAR(IProject project, boolean - // updateModules) { - // //We don't need to remove a server target anyomre as it need to be - // // there - // //ServerTargetManager.removeServerTarget(project, null); - // if (updateModules) { - // removeServerTargetForEARModuleProjects(project); - // removeServerTargetForEARUtilsProject(project); - // } - // } - /** - * @param project - */ - // private static void removeServerTargetForEARModuleProjects(IProject - // project) { - // List moduleProjects = - // ServerTargetHelper.getAllEarModuleProjects(project); - // if (!moduleProjects.isEmpty()) { - // for (int i = 0; i < moduleProjects.size(); i++) { - // IProject moduleProject = (IProject) moduleProjects.get(i); - // ServerTargetType tt = - // ServerTargetManager.getServerTargetType(moduleProject); - // if (tt != null) { - // J2EEJavaProjectInfo info = getNewJ2EEProjectInfo(moduleProject); - // if (info != null) { - // info.setProject(moduleProject); - // try { - // info.calculateServerClasspathEntries(); - // info.getJavaProject().setRawClasspath(info.getClasspathEntries(), null); - // } catch (JavaModelException jme) { - // Logger.getLogger().logTrace(jme); - // } - // } - // } - // } - // } - // } - /** - * @param project - */ - // private static void removeServerTargetForEARUtilsProject(IProject - // project) { - // EARNatureRuntime nature = EARNatureRuntime.getRuntime(project); - // EAREditModel editModel = null; - // Object key = new ServerTargetHelper(); - // try { - // editModel = nature.getEarEditModelForRead(key); - // List utilProjects = - // ServerTargetHelper.getAllEarUtilityProjects(editModel, project); - // if (!utilProjects.isEmpty()) { - // for (int i = 0; i < utilProjects.size(); i++) { - // IProject moduleProject = (IProject) utilProjects.get(i); - // //We don't need to remove a server target anyomre as it need to be there - // //ServerTargetType existingTargetType = - // // ServerTargetManager.getServerTargetType(moduleProject); - // //if (existingTargetType != null) { - // //if (!editModel.isEjbClientJarProject(moduleProject)) - // //We don't need to remove a server target anyomre as it - // // need to be there - // //ServerTargetManager.removeServerTarget(moduleProject,null); - // //else - // // removeServerTargetForEJBClientJar(moduleProject); - // } - // } - // } finally { - // editModel.releaseAccess(key); - // } - // } - /** - * @param moduleProject - */ - // public static void removeServerTargetForEJBClientJar(IProject - // ejbClientJarProject) { - // EjbModuleExtension ejbExt = EarModuleManager.getEJBModuleExtension(); - // J2EEJavaProjectInfo info = ejbExt.createProjectInfo(); - // if (info != null) { - // info.setProject(ejbClientJarProject); - // try { - // info.calculateServerClasspathEntries(); - // info.getJavaProject().setRawClasspath(info.getClasspathEntries(), null); - // } catch (JavaModelException jme) { - // Logger.getLogger().logTrace(jme); - // } - // } - // } - // public static void removeServerTargetOnProject(IProject project, String - // projectType) { - // setServerClassPathForJ2EEProject(project, projectType); - // } - /** - * @param project - */ - // public static void setServerClassPathForJ2EEProject(IProject project, - // String projectType) { - // try { - // J2EEJavaProjectInfo info = getNewJ2EEProjectInfo(project, projectType); - // if (info != null) { - // info.setProject(project); - // info.calculateServerClasspathEntries(); - // info.getJavaProject().setRawClasspath(info.getClasspathEntries(), null); - // } - // } catch (JavaModelException jme) { - // Logger.getLogger().logError(jme); - // } - // } - // public static J2EEJavaProjectInfo getNewJ2EEProjectInfo(IProject project, - // String projectType) - // { - // if (projectType.equals(IServerTargetConstants.APP_CLIENT_TYPE)) - // return new ApplicationClientProjectInfo(); - // else if (projectType.equals(IServerTargetConstants.WEB_TYPE)) { - // WebModuleExtension webExt = EarModuleManager.getWebModuleExtension(); - // J2EEJavaProjectInfo info = webExt.createProjectInfo(); - // String webNature = J2EENature.getRegisteredRuntimeID(project); - // info.setJ2EEVersion(webNature.equals(J2EEVersionConstants.VERSION_1_3_TEXT) - // ? - // J2EEVersionConstants.J2EE_1_3_ID : J2EEVersionConstants.J2EE_1_2_ID); - // return info; - // } else if (projectType.equals(IServerTargetConstants.EJB_TYPE)) { - // EjbModuleExtension ejbExt = EarModuleManager.getEJBModuleExtension(); - // return ejbExt.createProjectInfo(); - // } else if (projectType.equals(IServerTargetConstants.CONNECTOR_TYPE)) { - // JcaModuleExtension jcaExt = EarModuleManager.getJCAModuleExtension(); - // return jcaExt.createProjectInfo(); - // } - // return null; - // } - // public static J2EEJavaProjectInfo getNewJ2EEProjectInfo(IProject project) - // { - // if (J2EENature.hasRuntime(project, IEJBNatureConstants.EJB_NATURE_IDS)) { - // EjbModuleExtension ejbExt = EarModuleManager.getEJBModuleExtension(); - // return ejbExt.createProjectInfo(); - // } else if (J2EENature.hasRuntime(project, - // IWebNatureConstants.J2EE_NATURE_ID)) { - // WebModuleExtension webExt = EarModuleManager.getWebModuleExtension(); - // return webExt.createProjectInfo(); - // } else if (ApplicationClientNatureRuntime.hasRuntime(project)) - // return new ApplicationClientProjectInfo(); - // else if (J2EENature.hasRuntime(project, - // IConnectorNatureConstants.CONNECTOR_NATURE_ID)) { - // JcaModuleExtension jcaExt = EarModuleManager.getJCAModuleExtension(); - // return jcaExt.createProjectInfo(); - // } - // return null; - // } - public static void setNewServerTargetForEARModules(IRuntime newServerTarget, IProject project) { - List moduleProjects = ServerTargetHelper.getAllEarModuleProjects(project); - if (!moduleProjects.isEmpty()) { - for (int i = 0; i < moduleProjects.size(); i++) { - IProject moduleProject = (IProject) moduleProjects.get(i); - String[] projectAttr = ServerTargetHelper.getProjectTypeAndJ2EELevel(moduleProject); - if (projectAttr[0] != null && projectAttr[1] != null) { - IRuntime existingTargetType = ServerCore.getProjectProperties(moduleProject).getRuntimeTarget(); - if (existingTargetType != null) { - if (!existingTargetType.getId().equals(newServerTarget.getId())) - setServerTargetForModuleProject(newServerTarget, moduleProject, projectAttr); - // TODO Move the WLP sync to this method - } else - setServerTargetForModuleProject(newServerTarget, moduleProject, projectAttr); - } - } - } - } + /** + * @param project + */ + // public static void syncNoServerTargetForEARModules(IProject project) { + // removeServerTargetForEARModuleProjects(project); + // removeServerTargetForEARUtilsProject(project); + // } + /** + * @param project + */ + // public static void removeServerTargetForEAR(IProject project, boolean + // updateModules) { + // //We don't need to remove a server target anyomre as it need to be + // // there + // //ServerTargetManager.removeServerTarget(project, null); + // if (updateModules) { + // removeServerTargetForEARModuleProjects(project); + // removeServerTargetForEARUtilsProject(project); + // } + // } + /** + * @param project + */ + // private static void removeServerTargetForEARModuleProjects(IProject + // project) { + // List moduleProjects = + // ServerTargetHelper.getAllEarModuleProjects(project); + // if (!moduleProjects.isEmpty()) { + // for (int i = 0; i < moduleProjects.size(); i++) { + // IProject moduleProject = (IProject) moduleProjects.get(i); + // ServerTargetType tt = + // ServerTargetManager.getServerTargetType(moduleProject); + // if (tt != null) { + // J2EEJavaProjectInfo info = getNewJ2EEProjectInfo(moduleProject); + // if (info != null) { + // info.setProject(moduleProject); + // try { + // info.calculateServerClasspathEntries(); + // info.getJavaProject().setRawClasspath(info.getClasspathEntries(), null); + // } catch (JavaModelException jme) { + // Logger.getLogger().logTrace(jme); + // } + // } + // } + // } + // } + // } + /** + * @param project + */ + // private static void removeServerTargetForEARUtilsProject(IProject + // project) { + // EARNatureRuntime nature = EARNatureRuntime.getRuntime(project); + // EAREditModel editModel = null; + // Object key = new ServerTargetHelper(); + // try { + // editModel = nature.getEarEditModelForRead(key); + // List utilProjects = + // ServerTargetHelper.getAllEarUtilityProjects(editModel, project); + // if (!utilProjects.isEmpty()) { + // for (int i = 0; i < utilProjects.size(); i++) { + // IProject moduleProject = (IProject) utilProjects.get(i); + // //We don't need to remove a server target anyomre as it need to be there + // //ServerTargetType existingTargetType = + // // ServerTargetManager.getServerTargetType(moduleProject); + // //if (existingTargetType != null) { + // //if (!editModel.isEjbClientJarProject(moduleProject)) + // //We don't need to remove a server target anyomre as it + // // need to be there + // //ServerTargetManager.removeServerTarget(moduleProject,null); + // //else + // // removeServerTargetForEJBClientJar(moduleProject); + // } + // } + // } finally { + // editModel.releaseAccess(key); + // } + // } + /** + * @param moduleProject + */ + // public static void removeServerTargetForEJBClientJar(IProject + // ejbClientJarProject) { + // EjbModuleExtension ejbExt = EarModuleManager.getEJBModuleExtension(); + // J2EEJavaProjectInfo info = ejbExt.createProjectInfo(); + // if (info != null) { + // info.setProject(ejbClientJarProject); + // try { + // info.calculateServerClasspathEntries(); + // info.getJavaProject().setRawClasspath(info.getClasspathEntries(), null); + // } catch (JavaModelException jme) { + // Logger.getLogger().logTrace(jme); + // } + // } + // } + // public static void removeServerTargetOnProject(IProject project, String + // projectType) { + // setServerClassPathForJ2EEProject(project, projectType); + // } + /** + * @param project + */ + // public static void setServerClassPathForJ2EEProject(IProject project, + // String projectType) { + // try { + // J2EEJavaProjectInfo info = getNewJ2EEProjectInfo(project, projectType); + // if (info != null) { + // info.setProject(project); + // info.calculateServerClasspathEntries(); + // info.getJavaProject().setRawClasspath(info.getClasspathEntries(), null); + // } + // } catch (JavaModelException jme) { + // Logger.getLogger().logError(jme); + // } + // } + // public static J2EEJavaProjectInfo getNewJ2EEProjectInfo(IProject project, + // String projectType) + // { + // if (projectType.equals(IServerTargetConstants.APP_CLIENT_TYPE)) + // return new ApplicationClientProjectInfo(); + // else if (projectType.equals(IServerTargetConstants.WEB_TYPE)) { + // WebModuleExtension webExt = EarModuleManager.getWebModuleExtension(); + // J2EEJavaProjectInfo info = webExt.createProjectInfo(); + // String webNature = J2EENature.getRegisteredRuntimeID(project); + // info.setJ2EEVersion(webNature.equals(J2EEVersionConstants.VERSION_1_3_TEXT) + // ? + // J2EEVersionConstants.J2EE_1_3_ID : J2EEVersionConstants.J2EE_1_2_ID); + // return info; + // } else if (projectType.equals(IServerTargetConstants.EJB_TYPE)) { + // EjbModuleExtension ejbExt = EarModuleManager.getEJBModuleExtension(); + // return ejbExt.createProjectInfo(); + // } else if (projectType.equals(IServerTargetConstants.CONNECTOR_TYPE)) { + // JcaModuleExtension jcaExt = EarModuleManager.getJCAModuleExtension(); + // return jcaExt.createProjectInfo(); + // } + // return null; + // } + // public static J2EEJavaProjectInfo getNewJ2EEProjectInfo(IProject project) + // { + // if (J2EENature.hasRuntime(project, IEJBNatureConstants.EJB_NATURE_IDS)) { + // EjbModuleExtension ejbExt = EarModuleManager.getEJBModuleExtension(); + // return ejbExt.createProjectInfo(); + // } else if (J2EENature.hasRuntime(project, + // IWebNatureConstants.J2EE_NATURE_ID)) { + // WebModuleExtension webExt = EarModuleManager.getWebModuleExtension(); + // return webExt.createProjectInfo(); + // } else if (ApplicationClientNatureRuntime.hasRuntime(project)) + // return new ApplicationClientProjectInfo(); + // else if (J2EENature.hasRuntime(project, + // IConnectorNatureConstants.CONNECTOR_NATURE_ID)) { + // JcaModuleExtension jcaExt = EarModuleManager.getJCAModuleExtension(); + // return jcaExt.createProjectInfo(); + // } + // return null; + // } + public static void setNewServerTargetForEARModules(IRuntime newServerTarget, IProject project) { + List moduleProjects = ServerTargetHelper.getAllEarModuleProjects(project); + if (!moduleProjects.isEmpty()) { + for (int i = 0; i < moduleProjects.size(); i++) { + IProject moduleProject = (IProject) moduleProjects.get(i); + String[] projectAttr = ServerTargetHelper.getProjectTypeAndJ2EELevel(moduleProject); + if (projectAttr[0] != null && projectAttr[1] != null) { + IRuntime existingTargetType = ServerCore.getProjectProperties(moduleProject).getRuntimeTarget(); + if (existingTargetType != null) { + if (!existingTargetType.getId().equals(newServerTarget.getId())) + setServerTargetForModuleProject(newServerTarget, moduleProject, projectAttr); + // TODO Move the WLP sync to this method + } else + setServerTargetForModuleProject(newServerTarget, moduleProject, projectAttr); + } + } + } + } - public static void setServerTargetForModuleProject(IRuntime newServerTarget, IProject moduleProject, String[] projectAttr) { - ServerTargetHelper.cleanUpNonServerTargetClasspath(moduleProject); - setServerTarget(moduleProject, newServerTarget, null); - } + public static void setServerTargetForModuleProject(IRuntime newServerTarget, IProject moduleProject, String[] projectAttr) { + ServerTargetHelper.cleanUpNonServerTargetClasspath(moduleProject); + setServerTarget(moduleProject, newServerTarget, null); + } - public static List getWebProjectsInEAR(IProject earProject) { - List moduleProjects = ServerTargetHelper.getAllEarModuleProjects(earProject); - if (!moduleProjects.isEmpty()) { - List webProjects = new ArrayList(); - for (int i = 0; i < moduleProjects.size(); i++) { - IProject project = (IProject) moduleProjects.get(i); - WebModuleExtension webExt = EarModuleManager.getWebModuleExtension(); - if (webExt.hasRuntime(project)) - webProjects.add(project); - } - return webProjects; - } - return Collections.EMPTY_LIST; - } + public static List getWebProjectsInEAR(IProject earProject) { + List moduleProjects = ServerTargetHelper.getAllEarModuleProjects(earProject); + if (!moduleProjects.isEmpty()) { + List webProjects = new ArrayList(); + for (int i = 0; i < moduleProjects.size(); i++) { + IProject project = (IProject) moduleProjects.get(i); + WebModuleExtension webExt = EarModuleManager.getWebModuleExtension(); + if (webExt.hasRuntime(project)) + webProjects.add(project); + } + return webProjects; + } + return Collections.EMPTY_LIST; + } - /** - * @param newServerTarget - * @param tt - * @param project - */ - public static void setNewServerTargetForEARUtilityJars(IRuntime newServerTarget, IProject project) { - EARNatureRuntime nature = EARNatureRuntime.getRuntime(project); - EAREditModel editModel = null; - Object key = new ServerTargetHelper(); - try { - editModel = nature.getEarEditModelForRead(key); - List utilProjects = ServerTargetHelper.getAllEarUtilityProjects(editModel, project); - if (!utilProjects.isEmpty()) { - for (int i = 0; i < utilProjects.size(); i++) { - IProject moduleProject = (IProject) utilProjects.get(i); - IRuntime existingTargetType = ServerCore.getProjectProperties(moduleProject).getRuntimeTarget(); - if (existingTargetType != null) { - if (!existingTargetType.getId().equals(newServerTarget.getId())) { - setServerTargetForUtilProject(newServerTarget, moduleProject); - } - } else { - setServerTargetForUtilProject(newServerTarget, moduleProject); - } - } - } - } finally { - editModel.releaseAccess(key); - } - } + /** + * @param newServerTarget + * @param tt + * @param project + */ + public static void setNewServerTargetForEARUtilityJars(IRuntime newServerTarget, IProject project) { + EARNatureRuntime nature = EARNatureRuntime.getRuntime(project); + EAREditModel editModel = null; + Object key = new ServerTargetHelper(); + try { + editModel = nature.getEarEditModelForRead(key); + List utilProjects = ServerTargetHelper.getAllEarUtilityProjects(editModel, project); + if (!utilProjects.isEmpty()) { + for (int i = 0; i < utilProjects.size(); i++) { + IProject moduleProject = (IProject) utilProjects.get(i); + IRuntime existingTargetType = ServerCore.getProjectProperties(moduleProject).getRuntimeTarget(); + if (existingTargetType != null) { + if (!existingTargetType.getId().equals(newServerTarget.getId())) { + setServerTargetForUtilProject(newServerTarget, moduleProject); + } + } else { + setServerTargetForUtilProject(newServerTarget, moduleProject); + } + } + } + } finally { + editModel.releaseAccess(key); + } + } - public static void setServerTargetForUtilProject(IRuntime newServerTarget, IProject moduleProject) { - ServerTargetHelper.cleanUpNonServerTargetClasspath(moduleProject); - setServerTarget(moduleProject, newServerTarget, null); - } + public static void setServerTargetForUtilProject(IRuntime newServerTarget, IProject moduleProject) { + ServerTargetHelper.cleanUpNonServerTargetClasspath(moduleProject); + setServerTarget(moduleProject, newServerTarget, null); + } - public static void setServerTarget(IProject project, IRuntime runtime, IProgressMonitor monitor) { - try { - ServerCore.getProjectProperties(project).setRuntimeTarget(runtime, monitor); - } catch (CoreException ce) { - Logger.getLogger().logError(ce); - } - } + public static void setServerTarget(IProject project, IRuntime runtime, IProgressMonitor monitor) { + try { + ServerCore.getProjectProperties(project).setRuntimeTarget(runtime, monitor); + } catch (CoreException ce) { + Logger.getLogger().logError(ce); + } + } - /** - * @param earProject - */ - public static List getAllEarModuleProjects(IProject earProject) { - EARNatureRuntime nature = EARNatureRuntime.getRuntime(earProject); - EAREditModel editModel = null; - List moduleProjects = new ArrayList(); - Object key = new ServerTargetHelper(); - try { - editModel = nature.getEarEditModelForRead(key); - Set allModuleProjects = editModel.getModuleMappedModuleProjects(); - if (!allModuleProjects.isEmpty()) - moduleProjects.addAll(allModuleProjects); - return moduleProjects; - } finally { - if (editModel != null) - editModel.releaseAccess(key); - } - } + /** + * @param earProject + */ + public static List getAllEarModuleProjects(IProject earProject) { + EARNatureRuntime nature = EARNatureRuntime.getRuntime(earProject); + EAREditModel editModel = null; + List moduleProjects = new ArrayList(); + Object key = new ServerTargetHelper(); + try { + editModel = nature.getEarEditModelForRead(key); + Set allModuleProjects = editModel.getModuleMappedModuleProjects(); + if (!allModuleProjects.isEmpty()) + moduleProjects.addAll(allModuleProjects); + return moduleProjects; + } finally { + if (editModel != null) + editModel.releaseAccess(key); + } + } - public static String[] getProjectTypeAndJ2EELevel(IProject project) { - String[] projectAttr = new String[2]; - boolean isJ2EE13 = true; - if (EARNatureRuntime.hasRuntime(project)) { - projectAttr[0] = IServerTargetConstants.EAR_TYPE; - isJ2EE13 = EARNatureRuntime.getRuntime(project).isJ2EE1_3(); - } else if (J2EENature.hasRuntime(project, IEJBNatureConstants.EJB_NATURE_IDS)) { - projectAttr[0] = IServerTargetConstants.EJB_TYPE; - isJ2EE13 = J2EENature.getRuntime(project, IEJBNatureConstants.EJB_NATURE_IDS).isJ2EE1_3(); - } else if (J2EENature.hasRuntime(project, IWebNatureConstants.J2EE_NATURE_ID)) { - projectAttr[0] = IServerTargetConstants.WEB_TYPE; - isJ2EE13 = J2EENature.getRuntime(project, IWebNatureConstants.J2EE_NATURE_ID).isJ2EE1_3(); - } else if (ApplicationClientNatureRuntime.hasRuntime(project)) { - projectAttr[0] = IServerTargetConstants.APP_CLIENT_TYPE; - isJ2EE13 = ApplicationClientNatureRuntime.getRuntime(project).isJ2EE1_3(); - } else if (J2EENature.hasRuntime(project, IConnectorNatureConstants.NATURE_ID)) { - projectAttr[0] = IServerTargetConstants.CONNECTOR_TYPE; - isJ2EE13 = J2EENature.getRuntime(project, IConnectorNatureConstants.NATURE_ID).isJ2EE1_3(); - } else if (hasJavaNature(project)) - projectAttr[0] = null; - if (projectAttr[0] != null && projectAttr[0].length() > 0) { - if (isJ2EE13) - projectAttr[1] = IServerTargetConstants.J2EE_13; - else - projectAttr[1] = IServerTargetConstants.J2EE_12; - } - return projectAttr; - } + public static String[] getProjectTypeAndJ2EELevel(IProject project) { + String[] projectAttr = new String[2]; + boolean isJ2EE13 = true; + if (EARNatureRuntime.hasRuntime(project)) { + projectAttr[0] = IServerTargetConstants.EAR_TYPE; + isJ2EE13 = EARNatureRuntime.getRuntime(project).isJ2EE1_3(); + } else if (J2EENature.hasRuntime(project, IEJBNatureConstants.EJB_NATURE_IDS)) { + projectAttr[0] = IServerTargetConstants.EJB_TYPE; + isJ2EE13 = J2EENature.getRuntime(project, IEJBNatureConstants.EJB_NATURE_IDS).isJ2EE1_3(); + } else if (J2EENature.hasRuntime(project, IWebNatureConstants.J2EE_NATURE_ID)) { + projectAttr[0] = IServerTargetConstants.WEB_TYPE; + isJ2EE13 = J2EENature.getRuntime(project, IWebNatureConstants.J2EE_NATURE_ID).isJ2EE1_3(); + } else if (ApplicationClientNatureRuntime.hasRuntime(project)) { + projectAttr[0] = IServerTargetConstants.APP_CLIENT_TYPE; + isJ2EE13 = ApplicationClientNatureRuntime.getRuntime(project).isJ2EE1_3(); + } else if (J2EENature.hasRuntime(project, IConnectorNatureConstants.NATURE_ID)) { + projectAttr[0] = IServerTargetConstants.CONNECTOR_TYPE; + isJ2EE13 = J2EENature.getRuntime(project, IConnectorNatureConstants.NATURE_ID).isJ2EE1_3(); + } else if (hasJavaNature(project)) + projectAttr[0] = null; + if (projectAttr[0] != null && projectAttr[0].length() > 0) { + if (isJ2EE13) + projectAttr[1] = IServerTargetConstants.J2EE_13; + else + projectAttr[1] = IServerTargetConstants.J2EE_12; + } + return projectAttr; + } - /** - * @param project - * @return - */ - public static boolean hasJavaNature(IProject project) { - try { - return project.hasNature(JAVA_NATURE_ID); - } catch (CoreException ce) { - Logger.getLogger().logTrace(ce); - } - return false; - } + /** + * @param project + * @return + */ + public static boolean hasJavaNature(IProject project) { + try { + return project.hasNature(JAVA_NATURE_ID); + } catch (CoreException ce) { + Logger.getLogger().logTrace(ce); + } + return false; + } - /** - * @param earProject - */ - public static List getAllEarUtilityProjects(EAREditModel earEditModel, IProject earProject) { - List utilityProjects = new ArrayList(); - Set utilProjects = earEditModel.getModuleMappedUtilityJarProjects(); - if (!utilProjects.isEmpty()) - utilityProjects.addAll(utilProjects); - return utilityProjects; - } + /** + * @param earProject + */ + public static List getAllEarUtilityProjects(EAREditModel earEditModel, IProject earProject) { + List utilityProjects = new ArrayList(); + Set utilProjects = earEditModel.getModuleMappedUtilityJarProjects(); + if (!utilProjects.isEmpty()) + utilityProjects.addAll(utilProjects); + return utilityProjects; + } - public static int getExistingServerTargetIndex(List validServerTargets, IProject project) { - if (validServerTargets != null) { - IRuntime st = ServerCore.getProjectProperties(project).getRuntimeTarget(); - if (st != null) { - for (int i = 0; i < validServerTargets.size(); i++) { - if (((IRuntime) validServerTargets.get(i)).getId() == st.getId()) - return i; - } - } - } - return -1; - } + public static int getExistingServerTargetIndex(List validServerTargets, IProject project) { + if (validServerTargets != null) { + IRuntime st = ServerCore.getProjectProperties(project).getRuntimeTarget(); + if (st != null) { + for (int i = 0; i < validServerTargets.size(); i++) { + if (((IRuntime) validServerTargets.get(i)).getId() == st.getId()) + return i; + } + } + } + return -1; + } - public static List getExistingNonServerTargetClasspath(IProject project) { - IJavaProject javaProject = null; - List list = new ArrayList(); - try { - javaProject = (IJavaProject) project.getNature(JavaCore.NATURE_ID); - } catch (Exception e) { - } - if (javaProject != null) { - try { - IClasspathEntry[] cp = javaProject.getRawClasspath(); - int size = cp.length; - for (int i = 0; i < size; i++) { - int entryKind = cp[i].getEntryKind(); - if (entryKind != IClasspathEntry.CPE_SOURCE && entryKind != IClasspathEntry.CPE_LIBRARY && entryKind != IClasspathEntry.CPE_PROJECT - && (entryKind == IClasspathEntry.CPE_VARIABLE && isWASVariable(cp[i])) - && (entryKind != IClasspathEntry.CPE_CONTAINER || !cp[i].getPath().segment(0).equals(SERVER_CONTAINER))) { - list.add(cp[i]); - } - } - } catch (Exception e) { - } - return list; - } - return list; - } + public static List getExistingNonServerTargetClasspath(IProject project) { + IJavaProject javaProject = null; + List list = new ArrayList(); + try { + javaProject = (IJavaProject) project.getNature(JavaCore.NATURE_ID); + } catch (Exception e) { + } + if (javaProject != null) { + try { + IClasspathEntry[] cp = javaProject.getRawClasspath(); + int size = cp.length; + for (int i = 0; i < size; i++) { + int entryKind = cp[i].getEntryKind(); + if (entryKind != IClasspathEntry.CPE_SOURCE && entryKind != IClasspathEntry.CPE_LIBRARY && entryKind != IClasspathEntry.CPE_PROJECT && (entryKind == IClasspathEntry.CPE_VARIABLE && isWASVariable(cp[i])) && (entryKind != IClasspathEntry.CPE_CONTAINER || !cp[i].getPath().segment(0).equals(SERVER_CONTAINER))) { + list.add(cp[i]); + } + } + } catch (Exception e) { + } + return list; + } + return list; + } - /** - * @param entry - * @return - */ - private static boolean isWASVariable(IClasspathEntry entry) { - // TODO This is no longer valid in the base. - // IPath path = entry.getPath(); - // if (path != null && path.segmentCount() != 0) { - // String classpathVariable = path.segment(0); - // return - // classpathVariable.equals(IEJBNatureConstants.WAS_PLUGINDIR_VARIABLE) - // || - // classpathVariable.equals(IEJBNatureConstants.WAS_50_PLUGINDIR_VARIABLE) - // || - // classpathVariable.equals(IEJBNatureConstants.SERVERJDK_50_PLUGINDIR_VARIABLE) - // || - // classpathVariable.equals(IEJBNatureConstants.SERVERJDK_PLUGINDIR_VARIABLE) - // || classpathVariable.equals(J2EEPlugin.SOAP_PLUGINDIR_VARIABLE) - // || classpathVariable.equals(J2EEPlugin.SOAPSEC_PLUGINDIR_VARIABLE); - // //|| classpathVariable.equals(J2EEPlugin.XERCES_IMPL_VARIABLE) - // //|| classpathVariable.equals(J2EEPlugin.XERCES_PLUGINDIR_VARIABLE) - // //|| classpathVariable.equals(J2EEPlugin.WORF_PLUGINDIR_VARIABLE) - // //|| classpathVariable.equals(J2EEPlugin.MAIL_CLASSPATH_VARIABLE) - // //|| - // classpathVariable.equals(J2EEPlugin.ACTIVATION_CLASSPATH_VARIABLE); - // } - return false; - } + /** + * @param entry + * @return + */ + private static boolean isWASVariable(IClasspathEntry entry) { + // TODO This is no longer valid in the base. + // IPath path = entry.getPath(); + // if (path != null && path.segmentCount() != 0) { + // String classpathVariable = path.segment(0); + // return + // classpathVariable.equals(IEJBNatureConstants.WAS_PLUGINDIR_VARIABLE) + // || + // classpathVariable.equals(IEJBNatureConstants.WAS_50_PLUGINDIR_VARIABLE) + // || + // classpathVariable.equals(IEJBNatureConstants.SERVERJDK_50_PLUGINDIR_VARIABLE) + // || + // classpathVariable.equals(IEJBNatureConstants.SERVERJDK_PLUGINDIR_VARIABLE) + // || classpathVariable.equals(J2EEPlugin.SOAP_PLUGINDIR_VARIABLE) + // || classpathVariable.equals(J2EEPlugin.SOAPSEC_PLUGINDIR_VARIABLE); + // //|| classpathVariable.equals(J2EEPlugin.XERCES_IMPL_VARIABLE) + // //|| classpathVariable.equals(J2EEPlugin.XERCES_PLUGINDIR_VARIABLE) + // //|| classpathVariable.equals(J2EEPlugin.WORF_PLUGINDIR_VARIABLE) + // //|| classpathVariable.equals(J2EEPlugin.MAIL_CLASSPATH_VARIABLE) + // //|| + // classpathVariable.equals(J2EEPlugin.ACTIVATION_CLASSPATH_VARIABLE); + // } + return false; + } - /** - * @param earProject - * @param st - * @return - */ - public static boolean serverTargetValidForEAR(IProject earProject, IRuntime st) { - return !(J2EENature.hasRuntime(earProject, IEARNatureConstants.NATURE_ID) && st.getId().equals(IServerTargetConstants.aesV4ServerTargetId)); - } + /** + * @param earProject + * @param st + * @return + */ + public static boolean serverTargetValidForEAR(IProject earProject, IRuntime st) { + return !(J2EENature.hasRuntime(earProject, IEARNatureConstants.NATURE_ID) && st.getId().equals(IServerTargetConstants.aesV4ServerTargetId)); + } - public static List getServerTargets(String type, String version) { + public static List getServerTargets(String type, String version) { - List targets = Arrays.asList(ServerUtil.getRuntimes(type, version)); + List targets = Arrays.asList(ServerUtil.getRuntimes(type, version)); - return targets; - } - /* - * public static ITargetType getV50TargetType(IProject project, - * IServerTarget v50ServerTarget) { if (J2EENature.hasRuntime(project, - * IEARNatureConstants.NATURE_ID)) return - * ServerTargetManager.getTargetType(v50ServerTarget, - * IServerTargetConstants.EAR_TYPE); if (J2EENature.hasRuntime(project, - * IApplicationClientNatureConstants.NATURE_ID)) return - * ServerTargetManager.getTargetType(v50ServerTarget, - * IServerTargetConstants.EAR_TYPE); else if (J2EENature.hasRuntime(project, - * IEJBNatureConstants.NATURE_ID)) return - * ServerTargetManager.getTargetType(v50ServerTarget, - * IServerTargetConstants.EJB_TYPE); else if (J2EENature.hasRuntime(project, - * IWebNatureConstants.J2EE_NATURE_ID)) return - * ServerTargetManager.getTargetType(v50ServerTarget, - * IServerTargetConstants.WEB_TYPE); return null; } - */ + return targets; + } + /* + * public static ITargetType getV50TargetType(IProject project, IServerTarget v50ServerTarget) { + * if (J2EENature.hasRuntime(project, IEARNatureConstants.NATURE_ID)) return + * ServerTargetManager.getTargetType(v50ServerTarget, IServerTargetConstants.EAR_TYPE); if + * (J2EENature.hasRuntime(project, IApplicationClientNatureConstants.NATURE_ID)) return + * ServerTargetManager.getTargetType(v50ServerTarget, IServerTargetConstants.EAR_TYPE); else if + * (J2EENature.hasRuntime(project, IEJBNatureConstants.NATURE_ID)) return + * ServerTargetManager.getTargetType(v50ServerTarget, IServerTargetConstants.EJB_TYPE); else if + * (J2EENature.hasRuntime(project, IWebNatureConstants.J2EE_NATURE_ID)) return + * ServerTargetManager.getTargetType(v50ServerTarget, IServerTargetConstants.WEB_TYPE); return + * null; } + */ }
\ No newline at end of file diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/servertarget/ServerTargetOperation.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/servertarget/ServerTargetOperation.java index e5eb56e77..8dc97f99d 100644 --- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/servertarget/ServerTargetOperation.java +++ b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/servertarget/ServerTargetOperation.java @@ -33,20 +33,20 @@ import org.eclipse.wst.server.core.ServerCore; * Window>Preferences>Java>Code Generation>Code and Comments */ public class ServerTargetOperation extends WTPOperation { - public ServerTargetOperation(ServerTargetDataModel dataModel) { - super(dataModel); - } + public ServerTargetOperation(ServerTargetDataModel dataModel) { + super(dataModel); + } - protected void execute(IProgressMonitor monitor) throws CoreException, InvocationTargetException, InterruptedException { - ServerTargetDataModel dataModel = (ServerTargetDataModel) operationDataModel; - IRuntime runtime = dataModel.getRuntimeTarget(); - IProject project = dataModel.getProject(); - if (runtime != null) { - ServerCore.getProjectProperties(project).setRuntimeTarget(runtime, monitor); - if (dataModel.getBooleanProperty(ServerTargetDataModel.UPDATE_MODULES) && EARNatureRuntime.hasRuntime(project)) { - ServerTargetHelper.setNewServerTargetForEARModules(runtime, project); - ServerTargetHelper.setNewServerTargetForEARUtilityJars(runtime, project); - } - } - } + protected void execute(IProgressMonitor monitor) throws CoreException, InvocationTargetException, InterruptedException { + ServerTargetDataModel dataModel = (ServerTargetDataModel) operationDataModel; + IRuntime runtime = dataModel.getRuntimeTarget(); + IProject project = dataModel.getProject(); + if (runtime != null) { + ServerCore.getProjectProperties(project).setRuntimeTarget(runtime, monitor); + if (dataModel.getBooleanProperty(ServerTargetDataModel.UPDATE_MODULES) && EARNatureRuntime.hasRuntime(project)) { + ServerTargetHelper.setNewServerTargetForEARModules(runtime, project); + ServerTargetHelper.setNewServerTargetForEARUtilityJars(runtime, project); + } + } + } }
\ No newline at end of file diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/DelegateConfigurationElement.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/DelegateConfigurationElement.java index bae7e9a03..f19bcd66e 100644 --- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/DelegateConfigurationElement.java +++ b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/DelegateConfigurationElement.java @@ -53,7 +53,7 @@ public class DelegateConfigurationElement implements IConfigurationElement { * @throws org.eclipse.core.runtime.InvalidRegistryObjectException */ public String getAttribute(String name) throws InvalidRegistryObjectException { - if(delegateElement == null) + if (delegateElement == null) return null; return delegateElement.getAttribute(name); } @@ -64,7 +64,7 @@ public class DelegateConfigurationElement implements IConfigurationElement { * @throws org.eclipse.core.runtime.InvalidRegistryObjectException */ public String getAttributeAsIs(String name) throws InvalidRegistryObjectException { - if(delegateElement == null) + if (delegateElement == null) return null; return delegateElement.getAttributeAsIs(name); } @@ -74,7 +74,7 @@ public class DelegateConfigurationElement implements IConfigurationElement { * @throws org.eclipse.core.runtime.InvalidRegistryObjectException */ public String[] getAttributeNames() throws InvalidRegistryObjectException { - if(delegateElement == null) + if (delegateElement == null) return new String[0]; return delegateElement.getAttributeNames(); } @@ -84,7 +84,7 @@ public class DelegateConfigurationElement implements IConfigurationElement { * @throws org.eclipse.core.runtime.InvalidRegistryObjectException */ public IConfigurationElement[] getChildren() throws InvalidRegistryObjectException { - if(delegateElement == null) + if (delegateElement == null) return new IConfigurationElement[0]; return delegateElement.getChildren(); } @@ -95,7 +95,7 @@ public class DelegateConfigurationElement implements IConfigurationElement { * @throws org.eclipse.core.runtime.InvalidRegistryObjectException */ public IConfigurationElement[] getChildren(String name) throws InvalidRegistryObjectException { - if(delegateElement == null) + if (delegateElement == null) return new IConfigurationElement[0]; return delegateElement.getChildren(name); } @@ -105,7 +105,7 @@ public class DelegateConfigurationElement implements IConfigurationElement { * @throws org.eclipse.core.runtime.InvalidRegistryObjectException */ public IExtension getDeclaringExtension() throws InvalidRegistryObjectException { - if(delegateElement == null) + if (delegateElement == null) throw new InvalidRegistryObjectException(); return delegateElement.getDeclaringExtension(); } @@ -115,7 +115,7 @@ public class DelegateConfigurationElement implements IConfigurationElement { * @throws org.eclipse.core.runtime.InvalidRegistryObjectException */ public String getName() throws InvalidRegistryObjectException { - if(delegateElement == null) + if (delegateElement == null) return DELEGATE_NAME; return delegateElement.getName(); } @@ -125,7 +125,7 @@ public class DelegateConfigurationElement implements IConfigurationElement { * @throws org.eclipse.core.runtime.InvalidRegistryObjectException */ public String getNamespace() throws InvalidRegistryObjectException { - if(delegateElement == null) + if (delegateElement == null) return DELEGATE_NAMESPACE; return delegateElement.getNamespace(); } @@ -135,7 +135,7 @@ public class DelegateConfigurationElement implements IConfigurationElement { * @throws org.eclipse.core.runtime.InvalidRegistryObjectException */ public Object getParent() throws InvalidRegistryObjectException { - if(delegateElement == null) + if (delegateElement == null) return null; return delegateElement.getParent(); } @@ -145,7 +145,7 @@ public class DelegateConfigurationElement implements IConfigurationElement { * @throws org.eclipse.core.runtime.InvalidRegistryObjectException */ public String getValue() throws InvalidRegistryObjectException { - if(delegateElement == null) + if (delegateElement == null) return null; return delegateElement.getValue(); } @@ -155,7 +155,7 @@ public class DelegateConfigurationElement implements IConfigurationElement { * @throws org.eclipse.core.runtime.InvalidRegistryObjectException */ public String getValueAsIs() throws InvalidRegistryObjectException { - if(delegateElement == null) + if (delegateElement == null) return null; return delegateElement.getValueAsIs(); } @@ -166,7 +166,7 @@ public class DelegateConfigurationElement implements IConfigurationElement { * @see java.lang.Object#hashCode() */ public int hashCode() { - if(delegateElement == null) + if (delegateElement == null) return -1; return delegateElement.hashCode(); } @@ -176,7 +176,7 @@ public class DelegateConfigurationElement implements IConfigurationElement { */ public boolean isValid() { - if(delegateElement == null) + if (delegateElement == null) return false; return delegateElement.isValid(); } @@ -187,7 +187,7 @@ public class DelegateConfigurationElement implements IConfigurationElement { * @see java.lang.Object#toString() */ public String toString() { - if(delegateElement == null) + if (delegateElement == null) return DELEGATE_NULL_STRING; return delegateElement.toString(); } diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/J2EEEditModel.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/J2EEEditModel.java index f0509564e..b95e8b581 100644 --- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/J2EEEditModel.java +++ b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/J2EEEditModel.java @@ -55,7 +55,7 @@ import org.eclipse.wst.common.internal.emfworkbench.integration.EditModelListene public class J2EEEditModel extends EditModel { private WorkingCopyManager workingCopyManager = null; - + /** * J2EEEditModel constructor comment. */ @@ -149,7 +149,7 @@ public class J2EEEditModel extends EditModel { workingCopyManager = WorkingCopyManagerFactory.newRegisteredInstance(); return workingCopyManager; } - + /** * Reset the working copy manager because the ejb-jar.xml was removed without disposing. */ diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/ApplicationClientDeployable.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/ApplicationClientDeployable.java index 0fe608ef7..b17899dc2 100644 --- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/ApplicationClientDeployable.java +++ b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/ApplicationClientDeployable.java @@ -16,13 +16,15 @@ import org.eclipse.jst.j2ee.internal.project.J2EEModuleNature; import org.eclipse.jst.j2ee.internal.project.J2EENature; import org.eclipse.jst.server.j2ee.IApplicationClientModule; -public class ApplicationClientDeployable extends J2EEDeployable implements IApplicationClientModule {/* (non-Javadoc) - * @see org.eclipse.wst.server.core.IModule#validate(org.eclipse.core.runtime.IProgressMonitor) - */ -public IStatus validate(IProgressMonitor monitor) { - // TODO Auto-generated method stub - return null; -} +public class ApplicationClientDeployable extends J2EEDeployable implements IApplicationClientModule {/* + * (non-Javadoc) + * + * @see org.eclipse.wst.server.core.IModule#validate(org.eclipse.core.runtime.IProgressMonitor) + */ + public IStatus validate(IProgressMonitor monitor) { + // TODO Auto-generated method stub + return null; + } /** * Constructor for ApplicationClientDeployable. diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/ApplicationClientDeployableFactory.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/ApplicationClientDeployableFactory.java index 5ebe0ccf6..08240cae8 100644 --- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/ApplicationClientDeployableFactory.java +++ b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/ApplicationClientDeployableFactory.java @@ -21,51 +21,51 @@ import com.ibm.wtp.common.logger.proxy.Logger; * @author */ public class ApplicationClientDeployableFactory extends J2EEDeployableFactory { - private static final String ID = "com.ibm.wtp.server.j2ee.appclient"; //$NON-NLS-1$ + private static final String ID = "com.ibm.wtp.server.j2ee.appclient"; //$NON-NLS-1$ - /** - * Constructor for ApplicationClientDeployableFactory. - */ - public ApplicationClientDeployableFactory() { - super(); - } + /** + * Constructor for ApplicationClientDeployableFactory. + */ + public ApplicationClientDeployableFactory() { + super(); + } - /* - * @see DeployableProjectFactoryDelegate#getFactoryID() - */ - public String getFactoryId() { - return ID; - } + /* + * @see DeployableProjectFactoryDelegate#getFactoryID() + */ + public String getFactoryId() { + return ID; + } - /* - * @see J2EEDeployableFactory#getNatureID() - */ - public String getNatureID() { - return IApplicationClientNatureConstants.NATURE_ID; - } + /* + * @see J2EEDeployableFactory#getNatureID() + */ + public String getNatureID() { + return IApplicationClientNatureConstants.NATURE_ID; + } - /* - * @see J2EEDeployableFactory#createDeployable(J2EENature) - */ + /* + * @see J2EEDeployableFactory#createDeployable(J2EENature) + */ - public IModule createModule(J2EENature nature) { - if (nature == null) - return null; - ApplicationClientDeployable moduleDelegate = null; - IModule module = nature.getModule(); - if (module == null) { - try { - moduleDelegate = new ApplicationClientDeployable(nature, ID); - module = createModule(moduleDelegate.getId(), moduleDelegate.getName(), moduleDelegate.getType(), moduleDelegate.getVersion(), moduleDelegate.getProject()); - nature.setModule(module); - moduleDelegate.initialize(module); - } catch (Exception e) { - Logger.getLogger().write(e); - } finally { - moduleDelegates.add(moduleDelegate); - } - } - return module; - } + public IModule createModule(J2EENature nature) { + if (nature == null) + return null; + ApplicationClientDeployable moduleDelegate = null; + IModule module = nature.getModule(); + if (module == null) { + try { + moduleDelegate = new ApplicationClientDeployable(nature, ID); + module = createModule(moduleDelegate.getId(), moduleDelegate.getName(), moduleDelegate.getType(), moduleDelegate.getVersion(), moduleDelegate.getProject()); + nature.setModule(module); + moduleDelegate.initialize(module); + } catch (Exception e) { + Logger.getLogger().write(e); + } finally { + moduleDelegates.add(moduleDelegate); + } + } + return module; + } }
\ No newline at end of file diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/EnterpriseApplicationDeployable.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/EnterpriseApplicationDeployable.java index b061c83b4..48a340c08 100644 --- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/EnterpriseApplicationDeployable.java +++ b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/EnterpriseApplicationDeployable.java @@ -36,386 +36,390 @@ import org.eclipse.wst.server.core.model.ModuleFactoryDelegate; public class EnterpriseApplicationDeployable extends J2EEDeployable implements IEnterpriseApplication, ILooseArchiveSupport { - // cached children - protected IJ2EEModule[] containedModules; - - protected ILooseArchive[] containedArchives; - - // cached URIs - deployable to String - protected Map containedModuleURIs = new HashMap(4); - - protected Map containedArchiveURIs = new HashMap(4); - - /** - * Constructor for EnterpriseApplicationDeployable. - * - * @param aNature - * @param aFactoryId - */ - public EnterpriseApplicationDeployable(J2EENature aNature, String aFactoryId) { - super(aNature, aFactoryId); - - update(); - } - - /** - * @see IEnterpriseApplication#containsLooseModules() - */ - public boolean containsLooseModules() { - return true; - } - - /** - * @see IEnterpriseApplication#containsLooseArchives() - */ - public boolean containsLooseArchives() { - return true; - } - - /* - * @see IEnterpriseApplication#getModules() - */ - public IJ2EEModule[] getModules() { - return containedModules; - } - - /* - * @see IEnterpriseApplication#getVendorSupport() - */ - public String[] getVendorSupport() { - return null; - } - - protected EARNatureRuntime getEARNature() { - return (EARNatureRuntime) getNature(); - } - - protected static IModule getModule(J2EENature nature) { - IModule dep = nature.getModule(); - if (dep == null) { - ModuleFactoryDelegate fac = getModuleFactory(nature); - if (fac != null) { - if (fac instanceof J2EEDeployableFactory) { - dep = ((J2EEDeployableFactory) fac).getModuleProject(nature.getProject()); - } - } - } - return dep; - } - - protected static ModuleFactoryDelegate getModuleFactory(J2EENature nature) { - /* - * Iterator factories = ServerCore.getModuleFactories().iterator(); - * while (factories.hasNext()) { ModuleFactory deployableFactory = - * (ModuleFactory) factories.next(); if - * (!deployableFactory.getId().equals(EnterpriseApplicationDeployableFactory.ID)) { - * ModuleFactoryDelegate deployableFactoryDelegate = - * deployableFactory.getDelegate(); if (deployableFactoryDelegate - * instanceof J2EEDeployableFactory) { J2EEDeployableFactory fac = - * (J2EEDeployableFactory) deployableFactory.getDelegate(); if - * (fac.getNatureID().equals(nature.getNatureID())) { return fac; } } } } - */ - return null; - } - - protected static LooseArchiveDeployableFactory getLooseArchiveDeployableFactory() { - /* - * Iterator factories = ServerCore.getModuleFactories().iterator(); - * while (factories.hasNext()) { ModuleFactory deployableFactory = - * (ModuleFactory) factories.next(); if - * (!deployableFactory.getId().equals(EnterpriseApplicationDeployableFactory.ID)) { - * ModuleFactoryDelegate deployableFactoryDelegate = - * deployableFactory.getDelegate(); if (deployableFactoryDelegate - * instanceof LooseArchiveDeployableFactory) return - * (LooseArchiveDeployableFactory) deployableFactoryDelegate; } } - */ - return null; - } - - /* - * @see IEnterpriseApplication#getURI(IJ2EEModule) - */ - public String getURI(IJ2EEModule module) { - try { - return (String) containedModuleURIs.get(module); - } catch (Exception e) { - } - return null; - } - - public String getURI(ILooseArchive archive) { - try { - return (String) containedArchiveURIs.get(archive); - } catch (Exception e) { - } - return null; - } - - public ILooseArchive[] getLooseArchives() { - return containedArchives; - } - - protected ILooseArchive getArchiveDeployable(IProject aProject, LooseArchiveDeployableFactory fact) { - return (ILooseArchive) fact.getModuleProject(aProject); - } - - protected void update() { - IJ2EEModule[] oldModules = containedModules; - containedModules = getContainedModules(); - ILooseArchive[] oldArchives = containedArchives; - containedArchives = getContainedArchives(); - - // get add events - List add = new ArrayList(2); - addAddedObjects(add, oldModules, containedModules); - addAddedObjects(add, oldArchives, containedArchives); - - // get remove events - List remove = new ArrayList(2); - addRemovedObjects(remove, oldModules, containedModules); - addRemovedObjects(remove, oldArchives, containedArchives); - - // fire change events - int size = containedModules.length; - List change = new ArrayList(size); - for (int i = 0; i < size; i++) { - String newURI = getContainedURI(containedModules[i]); - String oldURI = getURI(containedModules[i]); - - if (oldURI != null && !oldURI.equals(newURI)) { - change.add(containedModules[i]); - } - containedModuleURIs.put(containedModules[i], newURI); - } - - size = containedArchives.length; - for (int i = 0; i < size; i++) { - String newURI = getContainedURI(containedArchives[i]); - String oldURI = getURI(containedArchives[i]); - - if (oldURI != null && !oldURI.equals(newURI)) { - change.add(containedArchives[i]); - } - containedArchiveURIs.put(containedArchives[i], newURI); - } - - if (!add.isEmpty() || !remove.isEmpty() || !change.isEmpty()) { - IModule[] added = new IModule[add.size()]; - getModulesFromDelegates(add).toArray(added); - IModule[] changed = new IModule[change.size()]; - getModulesFromDelegates(change).toArray(changed); - IModule[] removed = new IModule[remove.size()]; - getModulesFromDelegates(remove).toArray(removed); - fireModuleChangeEvent(true, added, changed, removed); - } - } - - protected List getModulesFromDelegates(List delegates) { - List result = new ArrayList(); - for (int i=0; i<delegates.size(); i++) { - Object delegate = delegates.get(i); - if (delegate != null && delegate instanceof J2EEDeployable) - result.add(((J2EEDeployable)delegate).getModule()); - } - return result; - } - - /** - * Return the objects that have been added between array a and array b. - * Assumes that there are no null objects in the array. - */ - protected static void addAddedObjects(List list, Object[] a, Object[] b) { - if (b == null) - return; - else if (a == null) { - int size = b.length; - for (int i = 0; i < size; i++) - list.add(b[i]); - return; - } - int size = b.length; - for (int i = 0; i < size; i++) { - Object obj = b[i]; - boolean found = false; - if (a != null) { - int size2 = a.length; - for (int j = 0; !found && j < size2; j++) { - if (obj.equals(a[j])) - found = true; - } - } - if (!found) - list.add(obj); - } - } - - /** - * Return the objects that have been removed between array a and array b. - * Assumes that there are no null objects in the array. - */ - protected static void addRemovedObjects(List list, Object[] a, Object[] b) { - if (a == null) - return; - else if (b == null) { - int size = a.length; - for (int i = 0; i < size; i++) - list.add(a[i]); - return; - } - int size = a.length; - for (int i = 0; i < size; i++) { - Object obj = a[i]; - boolean found = false; - if (b != null) { - int size2 = b.length; - for (int j = 0; !found && j < size2; j++) { - if (obj.equals(b[j])) - found = true; - } - } - if (!found) - list.add(obj); - } - } - - /** - * - */ - protected IJ2EEModule[] getContainedModules() { - Collection projects = getEARNature().getModuleProjects().values(); - List mods = new ArrayList(projects.size()); - Iterator it = projects.iterator(); - J2EENature nat = null; - while (it.hasNext()) { - nat = (J2EENature) it.next(); - if (nat != null) { - Object module = getModule(nat); - if (module != null && module instanceof IModule) { - Object moduleDelegate = ((IModule)module).getAdapter(ModuleDelegate.class); - if (moduleDelegate != null) - mods.add(moduleDelegate); - } - } - } - IJ2EEModule[] result = new IJ2EEModule[mods.size()]; - mods.toArray(result); - return result; - } - - /** - * - */ - protected ILooseArchive[] getContainedArchives() { - EAREditModel editModel = getEARNature().getEarEditModelForRead(this); - try { - List maps = editModel.getUtilityJARMappings(); - if (maps == null) - return new ILooseArchive[0]; - - LooseArchiveDeployableFactory fact = getLooseArchiveDeployableFactory(); - List arcs = new ArrayList(maps.size()); - for (int i = 0; i < maps.size(); i++) { - UtilityJARMapping map = (UtilityJARMapping) maps.get(i); - IProject proj = null; - if (map.getProjectName() != null) - proj = J2EEPlugin.getWorkspace().getRoot().getProject(map.getProjectName()); - if (proj != null && proj.exists()) { - ILooseArchive archive = getArchiveDeployable(proj, fact); - if (archive != null) - arcs.add(archive); - } - } - ILooseArchive[] result = new ILooseArchive[arcs.size()]; - arcs.toArray(result); - return result; - } finally { - if (editModel != null) - editModel.releaseAccess(this); - } - } - - /* - * @see IEnterpriseApplication#getURI(IJ2EEModule) - */ - protected String getContainedURI(ILooseArchive deployable) { - if (deployable instanceof LooseArchiveDeployable) { - LooseArchiveDeployable archive = (LooseArchiveDeployable) deployable; - EAREditModel editModel = getEARNature().getEarEditModelForRead(this); - try { - UtilityJARMapping map = editModel.getUtilityJARMapping(archive.getProject()); - if (map != null) - return map.getUri(); - return null; - } finally { - editModel.releaseAccess(this); - } - } - - return null; - } - - protected String getContainedURI(IJ2EEModule deployable) { - if (deployable instanceof J2EEDeployable) { - IProject aProject = ((J2EEDeployable) deployable).getProject(); - if (aProject != null) { - Module m = getEARNature().getModule(aProject); - if (m != null) - return m.getUri(); - } - } - return null; - } - - public String getType() { - return "j2ee.ear"; //$NON-NLS-1$ - } - - public String getVersion() { - return getNature().getJ2EEVersionText(); - } - - /* - * (non-Javadoc) - * - * @see org.eclipse.server.j2ee.IEnterpriseApplication#getLocation() - */ - public IPath getLocation() { - if (getProject() != null && getProject().isAccessible()) - return getProject().getLocation(); - return null; - } - - /** - * Returns the child modules of this module. - * - * @return org.eclipse.wst.server.core.model.IModule[] - */ - public IModule[] getChildModules() { - List list = new ArrayList(); - - if (containedModules != null) { - int size = containedModules.length; - for (int i = 0; i < size; i++) - list.add(containedModules[i]); - } - if (containedArchives != null) { - int size = containedArchives.length; - for (int i = 0; i < size; i++) - list.add(containedArchives[i]); - } - - IModule[] children = new IModule[list.size()]; - list.toArray(children); - return children; - } - - /* - * (non-Javadoc) - * - * @see org.eclipse.wst.server.core.IModule#validate(org.eclipse.core.runtime.IProgressMonitor) - */ - public IStatus validate(IProgressMonitor monitor) { - // TODO Auto-generated method stub - return null; - } + // cached children + protected IJ2EEModule[] containedModules; + + protected ILooseArchive[] containedArchives; + + // cached URIs - deployable to String + protected Map containedModuleURIs = new HashMap(4); + + protected Map containedArchiveURIs = new HashMap(4); + + /** + * Constructor for EnterpriseApplicationDeployable. + * + * @param aNature + * @param aFactoryId + */ + public EnterpriseApplicationDeployable(J2EENature aNature, String aFactoryId) { + super(aNature, aFactoryId); + + update(); + } + + /** + * @see IEnterpriseApplication#containsLooseModules() + */ + public boolean containsLooseModules() { + return true; + } + + /** + * @see IEnterpriseApplication#containsLooseArchives() + */ + public boolean containsLooseArchives() { + return true; + } + + /* + * @see IEnterpriseApplication#getModules() + */ + public IJ2EEModule[] getModules() { + return containedModules; + } + + /* + * @see IEnterpriseApplication#getVendorSupport() + */ + public String[] getVendorSupport() { + return null; + } + + protected EARNatureRuntime getEARNature() { + return (EARNatureRuntime) getNature(); + } + + protected static IModule getModule(J2EENature nature) { + IModule dep = nature.getModule(); + if (dep == null) { + ModuleFactoryDelegate fac = getModuleFactory(nature); + if (fac != null) { + if (fac instanceof J2EEDeployableFactory) { + dep = ((J2EEDeployableFactory) fac).getModuleProject(nature.getProject()); + } + } + } + return dep; + } + + protected static ModuleFactoryDelegate getModuleFactory(J2EENature nature) { + /* + * Iterator factories = ServerCore.getModuleFactories().iterator(); while + * (factories.hasNext()) { ModuleFactory deployableFactory = (ModuleFactory) + * factories.next(); if + * (!deployableFactory.getId().equals(EnterpriseApplicationDeployableFactory.ID)) { + * ModuleFactoryDelegate deployableFactoryDelegate = deployableFactory.getDelegate(); if + * (deployableFactoryDelegate instanceof J2EEDeployableFactory) { J2EEDeployableFactory fac = + * (J2EEDeployableFactory) deployableFactory.getDelegate(); if + * (fac.getNatureID().equals(nature.getNatureID())) { return fac; } } } } + */ + return null; + } + + protected static LooseArchiveDeployableFactory getLooseArchiveDeployableFactory() { + /* + * Iterator factories = ServerCore.getModuleFactories().iterator(); while + * (factories.hasNext()) { ModuleFactory deployableFactory = (ModuleFactory) + * factories.next(); if + * (!deployableFactory.getId().equals(EnterpriseApplicationDeployableFactory.ID)) { + * ModuleFactoryDelegate deployableFactoryDelegate = deployableFactory.getDelegate(); if + * (deployableFactoryDelegate instanceof LooseArchiveDeployableFactory) return + * (LooseArchiveDeployableFactory) deployableFactoryDelegate; } } + */ + return null; + } + + /* + * @see IEnterpriseApplication#getURI(IJ2EEModule) + */ + public String getURI(IJ2EEModule module) { + try { + return (String) containedModuleURIs.get(module); + } catch (Exception e) { + } + return null; + } + + public String getURI(ILooseArchive archive) { + try { + return (String) containedArchiveURIs.get(archive); + } catch (Exception e) { + } + return null; + } + + public ILooseArchive[] getLooseArchives() { + return containedArchives; + } + + protected ILooseArchive getArchiveDeployable(IProject aProject, LooseArchiveDeployableFactory fact) { + try { + return (ILooseArchive) fact.getModuleProject(aProject); + } catch (RuntimeException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + return null; + } + + protected void update() { + IJ2EEModule[] oldModules = containedModules; + containedModules = getContainedModules(); + ILooseArchive[] oldArchives = containedArchives; + containedArchives = getContainedArchives(); + + // get add events + List add = new ArrayList(2); + addAddedObjects(add, oldModules, containedModules); + addAddedObjects(add, oldArchives, containedArchives); + + // get remove events + List remove = new ArrayList(2); + addRemovedObjects(remove, oldModules, containedModules); + addRemovedObjects(remove, oldArchives, containedArchives); + + // fire change events + int size = containedModules.length; + List change = new ArrayList(size); + for (int i = 0; i < size; i++) { + String newURI = getContainedURI(containedModules[i]); + String oldURI = getURI(containedModules[i]); + + if (oldURI != null && !oldURI.equals(newURI)) { + change.add(containedModules[i]); + } + containedModuleURIs.put(containedModules[i], newURI); + } + + size = containedArchives.length; + for (int i = 0; i < size; i++) { + String newURI = getContainedURI(containedArchives[i]); + String oldURI = getURI(containedArchives[i]); + + if (oldURI != null && !oldURI.equals(newURI)) { + change.add(containedArchives[i]); + } + containedArchiveURIs.put(containedArchives[i], newURI); + } + + if (!add.isEmpty() || !remove.isEmpty() || !change.isEmpty()) { + IModule[] added = new IModule[add.size()]; + getModulesFromDelegates(add).toArray(added); + IModule[] changed = new IModule[change.size()]; + getModulesFromDelegates(change).toArray(changed); + IModule[] removed = new IModule[remove.size()]; + getModulesFromDelegates(remove).toArray(removed); + fireModuleChangeEvent(true, added, changed, removed); + } + } + + protected List getModulesFromDelegates(List delegates) { + List result = new ArrayList(); + for (int i = 0; i < delegates.size(); i++) { + Object delegate = delegates.get(i); + if (delegate != null && delegate instanceof J2EEDeployable) + result.add(((J2EEDeployable) delegate).getModule()); + } + return result; + } + + /** + * Return the objects that have been added between array a and array b. Assumes that there are + * no null objects in the array. + */ + protected static void addAddedObjects(List list, Object[] a, Object[] b) { + if (b == null) + return; + else if (a == null) { + int size = b.length; + for (int i = 0; i < size; i++) + list.add(b[i]); + return; + } + int size = b.length; + for (int i = 0; i < size; i++) { + Object obj = b[i]; + boolean found = false; + if (a != null) { + int size2 = a.length; + for (int j = 0; !found && j < size2; j++) { + if (obj.equals(a[j])) + found = true; + } + } + if (!found) + list.add(obj); + } + } + + /** + * Return the objects that have been removed between array a and array b. Assumes that there are + * no null objects in the array. + */ + protected static void addRemovedObjects(List list, Object[] a, Object[] b) { + if (a == null) + return; + else if (b == null) { + int size = a.length; + for (int i = 0; i < size; i++) + list.add(a[i]); + return; + } + int size = a.length; + for (int i = 0; i < size; i++) { + Object obj = a[i]; + boolean found = false; + if (b != null) { + int size2 = b.length; + for (int j = 0; !found && j < size2; j++) { + if (obj.equals(b[j])) + found = true; + } + } + if (!found) + list.add(obj); + } + } + + /** + * + */ + protected IJ2EEModule[] getContainedModules() { + Collection projects = getEARNature().getModuleProjects().values(); + List mods = new ArrayList(projects.size()); + Iterator it = projects.iterator(); + J2EENature nat = null; + while (it.hasNext()) { + nat = (J2EENature) it.next(); + if (nat != null) { + Object module = getModule(nat); + if (module != null && module instanceof IModule) { + Object moduleDelegate = ((IModule) module).getAdapter(ModuleDelegate.class); + if (moduleDelegate != null) + mods.add(moduleDelegate); + } + } + } + IJ2EEModule[] result = new IJ2EEModule[mods.size()]; + mods.toArray(result); + return result; + } + + /** + * + */ + protected ILooseArchive[] getContainedArchives() { + EAREditModel editModel = getEARNature().getEarEditModelForRead(this); + try { + List maps = editModel.getUtilityJARMappings(); + if (maps == null) + return new ILooseArchive[0]; + + LooseArchiveDeployableFactory fact = getLooseArchiveDeployableFactory(); + List arcs = new ArrayList(maps.size()); + for (int i = 0; i < maps.size(); i++) { + UtilityJARMapping map = (UtilityJARMapping) maps.get(i); + IProject proj = null; + if (map.getProjectName() != null) + proj = J2EEPlugin.getWorkspace().getRoot().getProject(map.getProjectName()); + if (proj != null && proj.exists()) { + ILooseArchive archive = getArchiveDeployable(proj, fact); + if (archive != null) + arcs.add(archive); + } + } + ILooseArchive[] result = new ILooseArchive[arcs.size()]; + arcs.toArray(result); + return result; + } finally { + if (editModel != null) + editModel.releaseAccess(this); + } + } + + /* + * @see IEnterpriseApplication#getURI(IJ2EEModule) + */ + protected String getContainedURI(ILooseArchive deployable) { + if (deployable instanceof LooseArchiveDeployable) { + LooseArchiveDeployable archive = (LooseArchiveDeployable) deployable; + EAREditModel editModel = getEARNature().getEarEditModelForRead(this); + try { + UtilityJARMapping map = editModel.getUtilityJARMapping(archive.getProject()); + if (map != null) + return map.getUri(); + return null; + } finally { + editModel.releaseAccess(this); + } + } + + return null; + } + + protected String getContainedURI(IJ2EEModule deployable) { + if (deployable instanceof J2EEDeployable) { + IProject aProject = ((J2EEDeployable) deployable).getProject(); + if (aProject != null) { + Module m = getEARNature().getModule(aProject); + if (m != null) + return m.getUri(); + } + } + return null; + } + + public String getType() { + return "j2ee.ear"; //$NON-NLS-1$ + } + + public String getVersion() { + return getNature().getJ2EEVersionText(); + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.server.j2ee.IEnterpriseApplication#getLocation() + */ + public IPath getLocation() { + if (getProject() != null && getProject().isAccessible()) + return getProject().getLocation(); + return null; + } + + /** + * Returns the child modules of this module. + * + * @return org.eclipse.wst.server.core.model.IModule[] + */ + public IModule[] getChildModules() { + List list = new ArrayList(); + + if (containedModules != null) { + int size = containedModules.length; + for (int i = 0; i < size; i++) + list.add(containedModules[i]); + } + if (containedArchives != null) { + int size = containedArchives.length; + for (int i = 0; i < size; i++) + list.add(containedArchives[i]); + } + + IModule[] children = new IModule[list.size()]; + list.toArray(children); + return children; + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.wst.server.core.IModule#validate(org.eclipse.core.runtime.IProgressMonitor) + */ + public IStatus validate(IProgressMonitor monitor) { + // TODO Auto-generated method stub + return null; + } }
\ No newline at end of file diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/EnterpriseApplicationDeployableFactory.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/EnterpriseApplicationDeployableFactory.java index 9002ccd66..68b5bceda 100644 --- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/EnterpriseApplicationDeployableFactory.java +++ b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/EnterpriseApplicationDeployableFactory.java @@ -22,12 +22,15 @@ import com.ibm.wtp.common.logger.proxy.Logger; * @version 1.0 * @author */ -public class EnterpriseApplicationDeployableFactory extends J2EEDeployableFactory {/* (non-Javadoc) - * @see org.eclipse.wst.server.core.model.ModuleFactoryDelegate#getModules() - */ -public IModule[] getModules() { - return null; -} +public class EnterpriseApplicationDeployableFactory extends J2EEDeployableFactory {/* + * (non-Javadoc) + * + * @see org.eclipse.wst.server.core.model.ModuleFactoryDelegate#getModules() + */ + public IModule[] getModules() { + return null; + } + protected static final String ID = "com.ibm.wtp.server.j2ee.application"; //$NON-NLS-1$ protected static final IPath[] PATHS = new IPath[]{new Path("META-INF/application.xml"), //$NON-NLS-1$ @@ -55,26 +58,26 @@ public IModule[] getModules() { return IEARNatureConstants.NATURE_ID; } - - public IModule createModule(J2EENature nature) { - if (nature == null) - return null; - EnterpriseApplicationDeployable moduleDelegate = null; - IModule module = nature.getModule(); - if (module == null) { - try { - moduleDelegate = new EnterpriseApplicationDeployable(nature, ID); - module = createModule(moduleDelegate.getId(), moduleDelegate.getName(), moduleDelegate.getType(), moduleDelegate.getVersion(), moduleDelegate.getProject()); - nature.setModule(module); - moduleDelegate.initialize(module); - } catch (Exception e) { - Logger.getLogger().write(e); - } finally { - moduleDelegates.add(moduleDelegate); - } - } - return module; - } + + public IModule createModule(J2EENature nature) { + if (nature == null) + return null; + EnterpriseApplicationDeployable moduleDelegate = null; + IModule module = nature.getModule(); + if (module == null) { + try { + moduleDelegate = new EnterpriseApplicationDeployable(nature, ID); + module = createModule(moduleDelegate.getId(), moduleDelegate.getName(), moduleDelegate.getType(), moduleDelegate.getVersion(), moduleDelegate.getProject()); + nature.setModule(module); + moduleDelegate.initialize(module); + } catch (Exception e) { + Logger.getLogger().write(e); + } finally { + moduleDelegates.add(moduleDelegate); + } + } + return module; + } /* * @see DeployableProjectFactoryDelegate#getListenerPaths() @@ -83,7 +86,6 @@ public IModule[] getModules() { return PATHS; } - }
\ No newline at end of file diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/EnterpriseApplicationDeployableObjectAdapter.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/EnterpriseApplicationDeployableObjectAdapter.java index da6db5e93..321bab576 100644 --- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/EnterpriseApplicationDeployableObjectAdapter.java +++ b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/EnterpriseApplicationDeployableObjectAdapter.java @@ -25,7 +25,7 @@ import com.ibm.wtp.emf.workbench.ProjectUtilities; /** * Creates the Object adapter for ear projects. */ -public class EnterpriseApplicationDeployableObjectAdapter { +public class EnterpriseApplicationDeployableObjectAdapter { /** * Constructor for EnterpriseApplicationDeployableObjectAdapter. @@ -135,35 +135,41 @@ public class EnterpriseApplicationDeployableObjectAdapter { * deployable - The current module object. */ protected IModuleArtifact createModuleObject(IModule module) { - /*if (module != null) { - return new NullModuleObject(module); - }*/// switch to NullModuleArtifact when released + /* + * if (module != null) { return new NullModuleObject(module); } + */// switch to NullModuleArtifact when released return null; }// createDeployableObject - /* (non-Javadoc) - * @see org.eclipse.wst.server.core.IModuleArtifactAdapter#getId() - */ - public String getId() { - // TODO Auto-generated method stub - return null; - } - - /* (non-Javadoc) - * @see org.eclipse.wst.server.core.IModuleArtifactAdapter#getObjectClassName() - */ - public String getObjectClassName() { - // TODO Auto-generated method stub - return null; - } - - /* (non-Javadoc) - * @see org.eclipse.wst.server.core.IModuleArtifactAdapter#isPluginActivated() - */ - public boolean isPluginActivated() { - // TODO Auto-generated method stub - return false; - } + /* + * (non-Javadoc) + * + * @see org.eclipse.wst.server.core.IModuleArtifactAdapter#getId() + */ + public String getId() { + // TODO Auto-generated method stub + return null; + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.wst.server.core.IModuleArtifactAdapter#getObjectClassName() + */ + public String getObjectClassName() { + // TODO Auto-generated method stub + return null; + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.wst.server.core.IModuleArtifactAdapter#isPluginActivated() + */ + public boolean isPluginActivated() { + // TODO Auto-generated method stub + return false; + } }// EnterpriseApplicationDeployableObjectAdapter diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/J2EEDeployable.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/J2EEDeployable.java index 3b9aeee2a..494d89633 100644 --- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/J2EEDeployable.java +++ b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/J2EEDeployable.java @@ -21,102 +21,103 @@ import org.eclipse.wst.server.core.util.ProjectModule; * J2EE deployable superclass. */ public abstract class J2EEDeployable extends ProjectModule implements IJ2EEModule { - private String factoryId; - - private J2EENature nature; - - /** - * Constructor for J2EEDeployable. - * - * @param project - */ - public J2EEDeployable(J2EENature aNature, String aFactoryId) { - super(aNature.getProject()); - factoryId = aFactoryId; - setNature(aNature); - } - - public String getJ2EESpecificationVersion() { - return getNature().getJ2EEVersionText(); - } - - /* - * @see IJ2EEModule#getLocation() - */ - public IPath getLocation() { - if (getNature() instanceof J2EEModuleNature) - return ((J2EEModuleNature) getNature()).computeModuleAbsoluteLocation(); - return null; - } - - /* - * @see IModule#getFactoryId() - */ - public String getFactoryId() { - return factoryId; - } - - /** - * Gets the nature. - * - * @return Returns a J2EENature - */ - public J2EENature getNature() { - return nature; - } - - /** - * Sets the nature. - * - * @param nature - * The nature to set - */ - protected void setNature(J2EENature nature) { - this.nature = nature; - nature.setModule(getModule()); - } - - /** - * @see com.ibm.etools.server.j2ee.IJ2EEModule#isBinary() - */ - public boolean isBinary() { - if (nature instanceof J2EEModuleNature) - return nature != null && ((J2EEModuleNature) nature).isBinaryProject(); - return false; - } - - public String getModuleTypeName() { - return getName(); - } - - public String getModuleTypeVersion() { - return getVersion(); - } - - public String getVersion() { - return "1.2"; //$NON-NLS-1$ - }; - - public String getType() { - return "j2ee.ear"; //$NON-NLS-1$ - } - - public IModuleType getModuleType() { - return new IModuleType(){ - - public String getId() { - return getType(); - } - - public String getName() { - return getModuleTypeName(); - } - - public String getVersion() { - return getModuleTypeVersion(); - }}; - - } - + private String factoryId; + + private J2EENature nature; + + /** + * Constructor for J2EEDeployable. + * + * @param project + */ + public J2EEDeployable(J2EENature aNature, String aFactoryId) { + super(aNature.getProject()); + factoryId = aFactoryId; + setNature(aNature); + } + + public String getJ2EESpecificationVersion() { + return getNature().getJ2EEVersionText(); + } + + /* + * @see IJ2EEModule#getLocation() + */ + public IPath getLocation() { + if (getNature() instanceof J2EEModuleNature) + return ((J2EEModuleNature) getNature()).computeModuleAbsoluteLocation(); + return null; + } + + /* + * @see IModule#getFactoryId() + */ + public String getFactoryId() { + return factoryId; + } + + /** + * Gets the nature. + * + * @return Returns a J2EENature + */ + public J2EENature getNature() { + return nature; + } + + /** + * Sets the nature. + * + * @param nature + * The nature to set + */ + protected void setNature(J2EENature nature) { + this.nature = nature; + nature.setModule(getModule()); + } + + /** + * @see com.ibm.etools.server.j2ee.IJ2EEModule#isBinary() + */ + public boolean isBinary() { + if (nature instanceof J2EEModuleNature) + return nature != null && ((J2EEModuleNature) nature).isBinaryProject(); + return false; + } + + public String getModuleTypeName() { + return getName(); + } + + public String getModuleTypeVersion() { + return getVersion(); + } + + public String getVersion() { + return "1.2"; //$NON-NLS-1$ + }; + + public String getType() { + return "j2ee.ear"; //$NON-NLS-1$ + } + + public IModuleType getModuleType() { + return new IModuleType() { + + public String getId() { + return getType(); + } + + public String getName() { + return getModuleTypeName(); + } + + public String getVersion() { + return getModuleTypeVersion(); + } + }; + + } + }
\ No newline at end of file diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/J2EEDeployableFactory.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/J2EEDeployableFactory.java index 0d54d086e..5531569b6 100644 --- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/J2EEDeployableFactory.java +++ b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/J2EEDeployableFactory.java @@ -24,8 +24,8 @@ import org.eclipse.wst.server.core.util.ProjectModuleFactoryDelegate; * J2EE deployable factory superclass. */ public abstract class J2EEDeployableFactory extends ProjectModuleFactoryDelegate { - - protected ArrayList moduleDelegates = new ArrayList(); + + protected ArrayList moduleDelegates = new ArrayList(); public J2EEDeployableFactory() { super(); @@ -78,36 +78,36 @@ public abstract class J2EEDeployableFactory extends ProjectModuleFactoryDelegate */ public abstract IModule createModule(J2EENature nature); - + protected void handleProjectChange(IProject project, IResourceDelta delta) { - if (projects == null) - cacheModules(); - super.handleProjectChange(project, delta); - } - - public ModuleDelegate getModuleDelegate(IModule module) { - for (Iterator iter = moduleDelegates.iterator(); iter.hasNext();) { - ModuleDelegate element = (ModuleDelegate) iter.next(); - if (module == element.getModule()) - return element; - } - return null; - } - - public IModule[] getModules() { - if (projects == null) - cacheModules(); - int i = 0; - Iterator modules = projects.values().iterator(); - IModule[] modulesArray = new IModule[projects.values().size()]; - while (modules.hasNext()) { - IModule element = (IModule) modules.next(); - modulesArray[i++] = element; - - } - // TODO Auto-generated method stub - return modulesArray; - } + if (projects == null) + cacheModules(); + super.handleProjectChange(project, delta); + } + + public ModuleDelegate getModuleDelegate(IModule module) { + for (Iterator iter = moduleDelegates.iterator(); iter.hasNext();) { + ModuleDelegate element = (ModuleDelegate) iter.next(); + if (module == element.getModule()) + return element; + } + return null; + } + + public IModule[] getModules() { + if (projects == null) + cacheModules(); + int i = 0; + Iterator modules = projects.values().iterator(); + IModule[] modulesArray = new IModule[projects.values().size()]; + while (modules.hasNext()) { + IModule element = (IModule) modules.next(); + modulesArray[i++] = element; + + } + // TODO Auto-generated method stub + return modulesArray; + } }
\ No newline at end of file diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/LooseArchiveDeployable.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/LooseArchiveDeployable.java index fb9417f65..92e6a1fca 100644 --- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/LooseArchiveDeployable.java +++ b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/LooseArchiveDeployable.java @@ -73,35 +73,43 @@ public class LooseArchiveDeployable extends ProjectModule implements ILooseArchi return "1.0"; //$NON-NLS-1$ } - /* (non-Javadoc) - * @see org.eclipse.wst.server.core.IModule#validate(org.eclipse.core.runtime.IProgressMonitor) - */ - public IStatus validate(IProgressMonitor monitor) { - // TODO Auto-generated method stub - return null; - } + /* + * (non-Javadoc) + * + * @see org.eclipse.wst.server.core.IModule#validate(org.eclipse.core.runtime.IProgressMonitor) + */ + public IStatus validate(IProgressMonitor monitor) { + // TODO Auto-generated method stub + return null; + } - /* (non-Javadoc) - * @see org.eclipse.wst.server.core.IModule#getModuleType() - */ - public IModuleType getModuleType() { - // TODO Auto-generated method stub - return null; - } + /* + * (non-Javadoc) + * + * @see org.eclipse.wst.server.core.IModule#getModuleType() + */ + public IModuleType getModuleType() { + // TODO Auto-generated method stub + return null; + } - /* (non-Javadoc) - * @see org.eclipse.wst.server.core.IModule#getChildModules(org.eclipse.core.runtime.IProgressMonitor) - */ - public IModule[] getChildModules(IProgressMonitor monitor) { - // TODO Auto-generated method stub - return null; - } + /* + * (non-Javadoc) + * + * @see org.eclipse.wst.server.core.IModule#getChildModules(org.eclipse.core.runtime.IProgressMonitor) + */ + public IModule[] getChildModules(IProgressMonitor monitor) { + // TODO Auto-generated method stub + return null; + } - /* (non-Javadoc) - * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) - */ - public Object getAdapter(Class adapter) { - // TODO Auto-generated method stub - return null; - } + /* + * (non-Javadoc) + * + * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) + */ + public Object getAdapter(Class adapter) { + // TODO Auto-generated method stub + return null; + } }
\ No newline at end of file diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/LooseArchiveDeployableFactory.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/LooseArchiveDeployableFactory.java index bdd829306..2a56450ab 100644 --- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/LooseArchiveDeployableFactory.java +++ b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/LooseArchiveDeployableFactory.java @@ -50,35 +50,42 @@ public class LooseArchiveDeployableFactory extends ProjectModuleFactoryDelegate * org.eclipse.core.resources.IProject * @return com.ibm.etools.server.core.model.IProjectModule */ - - /* (non-Javadoc) - * @see org.eclipse.wst.server.core.util.ProjectModuleFactoryDelegate#createModule(org.eclipse.core.resources.IProject) - */ - protected IModule createModule(IProject project) { - // TODO Auto-generated method stub - return new LooseArchiveDeployable(project, ID); - } - /* (non-Javadoc) - * @see org.eclipse.wst.server.core.model.ModuleFactoryDelegate#getModuleDelegate(org.eclipse.wst.server.core.IModule) - */ - public ModuleDelegate getModuleDelegate(IModule module) { - // TODO Auto-generated method stub - return null; - } + /* + * (non-Javadoc) + * + * @see org.eclipse.wst.server.core.util.ProjectModuleFactoryDelegate#createModule(org.eclipse.core.resources.IProject) + */ + protected IModule createModule(IProject project) { + // TODO Auto-generated method stub + return new LooseArchiveDeployable(project, ID); + } - /* (non-Javadoc) - * @see org.eclipse.wst.server.core.model.ModuleFactoryDelegate#getModules() - */ - public IModule[] getModules() { - // TODO Auto-generated method stub - return null; - } - protected void handleProjectChange(IProject project, IResourceDelta delta) { - if (projects == null) - cacheModules(); - super.handleProjectChange(project, delta); - } + /* + * (non-Javadoc) + * + * @see org.eclipse.wst.server.core.model.ModuleFactoryDelegate#getModuleDelegate(org.eclipse.wst.server.core.IModule) + */ + public ModuleDelegate getModuleDelegate(IModule module) { + // TODO Auto-generated method stub + return null; + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.wst.server.core.model.ModuleFactoryDelegate#getModules() + */ + public IModule[] getModules() { + // TODO Auto-generated method stub + return null; + } + + protected void handleProjectChange(IProject project, IResourceDelta delta) { + if (projects == null) + cacheModules(); + super.handleProjectChange(project, delta); + } }
\ No newline at end of file diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/AWorkbenchMOFHelper.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/AWorkbenchMOFHelper.java index 2c499e8e4..1af74c554 100644 --- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/AWorkbenchMOFHelper.java +++ b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/AWorkbenchMOFHelper.java @@ -62,7 +62,7 @@ public abstract class AWorkbenchMOFHelper extends AWorkbenchHelper { } catch (CoreException exc) { Logger logger = ValidationPlugin.getPlugin().getMsgLogger(); if (logger.isLoggingLevel(Level.FINE)) { - LogEntry entry =ValidationPlugin.getLogEntry(); + LogEntry entry = ValidationPlugin.getLogEntry(); entry.setSourceID("AWorkbenchHelper.getMOFNature(IProject)"); //$NON-NLS-1$ entry.setTargetException(exc); logger.write(Level.FINE, entry); diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/ManifestLineValidator.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/ManifestLineValidator.java index 0d47e65df..ddc79f15e 100644 --- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/ManifestLineValidator.java +++ b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/ManifestLineValidator.java @@ -101,4 +101,3 @@ public class ManifestLineValidator extends Object { return !endsWithLineBreak || (lineNumbers != null && !lineNumbers.isEmpty()); } } - diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/UIApplicationClientMessageConstants.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/UIApplicationClientMessageConstants.java index 0d46dfc7e..a2e9e3a41 100644 --- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/UIApplicationClientMessageConstants.java +++ b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/UIApplicationClientMessageConstants.java @@ -14,7 +14,6 @@ import org.eclipse.jst.j2ee.model.internal.validation.ApplicationClientMessageCo - /** * Messages for the WSAD application client validator */ diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/UIEarHelper.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/UIEarHelper.java index fb0d66ffe..eb56772cd 100644 --- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/UIEarHelper.java +++ b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/UIEarHelper.java @@ -12,7 +12,6 @@ package org.eclipse.jst.j2ee.internal.validation; - /** * Insert the type's description here. Creation date: (9/10/2001 2:12:47 PM) * diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/UIEarMessageConstants.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/UIEarMessageConstants.java index b336e0c65..309b9cdd1 100644 --- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/UIEarMessageConstants.java +++ b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/UIEarMessageConstants.java @@ -14,7 +14,6 @@ import org.eclipse.jst.j2ee.model.internal.validation.EARMessageConstants; - /** * Insert the type's description here. Creation date: (9/10/2001 3:30:22 PM) * diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/UIEarValidator.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/UIEarValidator.java index d62324391..ae54bcdbb 100644 --- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/UIEarValidator.java +++ b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/UIEarValidator.java @@ -594,7 +594,7 @@ public class UIEarValidator extends EarValidator implements UIEarMessageConstant IRuntime earRuntime = ServerCore.getProjectProperties(earProject).getRuntimeTarget(); if (earRuntime != null) { if (runtime != null) { - if (runtime.getId() != earRuntime.getId()) + if (runtime.getId() != earRuntime.getId()) unmatachedServerTargetOnModuleWarning(project, earProject); //validateModuleServerTargetJ2EESpecLevel(project, runtime); } else { @@ -622,7 +622,8 @@ public class UIEarValidator extends EarValidator implements UIEarMessageConstant /** * @param earProject - * TODO This validation is RAD specific hence needs to be moved to a the RAD layered plugin references to this method are commented out + * TODO This validation is RAD specific hence needs to be moved to a the RAD layered + * plugin references to this method are commented out */ private void validateEARServerTargetJ2EESpecLevel(EAREditModel editModel) { EARNatureRuntime nature = earEditModel.getEARNature(); @@ -642,7 +643,8 @@ public class UIEarValidator extends EarValidator implements UIEarMessageConstant /** * @param project - * TODO This validation is RAD specific hence needs to be moved to a the RAD layered plugin references to this method are commented out + * TODO This validation is RAD specific hence needs to be moved to a the RAD layered + * plugin references to this method are commented out */ private void validateModuleServerTargetJ2EESpecLevel(IProject project, IRuntime runtime) { boolean is14SpecLevelProject = false; |