[125487] move to eclipse common navigator
diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee.jca.ui/META-INF/MANIFEST.MF index 7915a7e..12417dd 100644 --- a/plugins/org.eclipse.jst.j2ee.jca.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.jst.j2ee.jca.ui/META-INF/MANIFEST.MF
@@ -21,8 +21,8 @@ org.eclipse.jst.j2ee.jca, org.eclipse.jst.j2ee.core, org.eclipse.core.resources, - org.eclipse.wst.common.navigator.workbench, org.eclipse.wst.common.project.facet.core, org.eclipse.wst.common.project.facet.ui, - org.eclipse.wst.web.ui + org.eclipse.wst.web.ui, + org.eclipse.ui.navigator.resources Eclipse-AutoStart: true
diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/plugin.xml b/plugins/org.eclipse.jst.j2ee.jca.ui/plugin.xml index f4bcbfc..3ee0335 100644 --- a/plugins/org.eclipse.jst.j2ee.jca.ui/plugin.xml +++ b/plugins/org.eclipse.jst.j2ee.jca.ui/plugin.xml
@@ -56,7 +56,7 @@ name="%connector.jar.file_ui_" icon="icons/full/ctool16/import_rar.gif" class="org.eclipse.jst.j2ee.jca.ui.internal.wizard.ConnectorComponentImportWizard" - id="org.eclipse.jst.j2ee.jca.ui.ConnectorComponentImportWizard"> + id="org.eclipse.jst.j2ee.jca.ui.internal.wizard.ConnectorComponentImportWizard"> <description> %connector.import.description_ui_ </description> @@ -73,7 +73,7 @@ name="%connector.jar.file_ui_" icon="icons/full/ctool16/export_rar.gif" class="org.eclipse.jst.j2ee.jca.ui.internal.wizard.ConnectorComponentExportWizard" - id="org.eclipse.jst.j2ee.jca.ui.ConnectorComponentExportWizard"> + id="org.eclipse.jst.j2ee.jca.ui.internal.wizard.ConnectorComponentExportWizard"> <description> %connector.export.description_ui_ </description> @@ -82,192 +82,6 @@ </selection> </wizard> </extension> - -<!-- Navigator Object Contributions --> -<!-- Connector Group Contributions --> - <extension - point="org.eclipse.ui.popupMenus"> - <objectContribution - objectClass="org.eclipse.wst.common.navigator.internal.groups.NavigatorGroup" - id="org.eclipse.jst.j2ee.internal.ui.navigator.rarNewProjectActions"> - <action - label="%jca.module_ui_" - icon="icons/full/ctool16/newconnectionprj_wiz.gif" - class="org.eclipse.jst.j2ee.jca.ui.internal.actions.NewConnectorComponentAction" - menubarPath="org.eclipse.wst.common.frameworks.internal.navigator.new.menu/additions" - enablesFor="1" - id="org.eclipse.jst.j2ee.jca.ui.internal.actions.NewConnectorComponentAction"> - </action> - <visibility> - <objectState - name="projectNature" - value="org.eclipse.jst.j2ee.jca.ConnectorNature"> - </objectState> - </visibility> - </objectContribution> - - <objectContribution - objectClass="org.eclipse.wst.common.navigator.internal.groups.NavigatorGroup" - id="org.eclipse.jst.j2ee.internal.ui.navigator.rarProjectActions"> - <action - label="%connector.jar.file_ui_" - icon="icons/full/ctool16/import_rar.gif" - class="org.eclipse.jst.j2ee.jca.ui.internal.actions.ImportRARAction" - menubarPath="org.eclipse.wst.common.frameworks.internal.navigator.import.menu/additions" - enablesFor="1" - id="org.eclipse.jst.j2ee.jca.ui.internal.actions.ImportRARAction"> - </action> - <action - label="%connector.jar.file_ui_" - icon="icons/full/ctool16/export_rar.gif" - class="org.eclipse.jst.j2ee.jca.ui.internal.actions.ExportRARAction" - menubarPath="org.eclipse.wst.common.frameworks.internal.navigator.export.menu/additions" - enablesFor="1" - id="org.eclipse.jst.j2ee.jca.ui.internal.actions.ExportRARAction"> - </action> - <visibility> - <objectState - name="projectNature" - value="org.eclipse.jst.j2ee.jca.ConnectorNature"> - </objectState> - </visibility> - </objectContribution> - </extension> - - <extension - point="org.eclipse.wst.common.navigator.workbench.commonWizard"> - <!-- Connector New --> - <commonWizard - type="new" - wizardId="org.eclipse.jst.j2ee.jca.ui.internal.wizard.ConnectorProjectWizard"> - <enablement> - <or> - <objectClass - name="org.eclipse.core.resources.IWorkspaceRoot"> - </objectClass> - <and> - <objectClass - name="org.eclipse.core.resources.IProject"> - </objectClass> - <or> - <objectState - name="projectNature" - value="org.eclipse.wst.common.modulecore.ModuleCoreNature"> - </objectState> - </or> - </and> - <objectClass - name="org.eclipse.jst.j2ee.application.Application"> - </objectClass> - <objectClass - name="org.eclipse.jst.j2ee.internal.provider.ModulesItemProvider"> - </objectClass> - <objectClass - name="org.eclipse.jst.j2ee.application.Module"> - </objectClass> - </or> - </enablement> - </commonWizard> - <!-- Connector import --> - <commonWizard - type="import" - wizardId="org.eclipse.jst.j2ee.jca.ui.ConnectorModuleImportWizard"> - <enablement> - <or> - <objectClass - name="org.eclipse.core.resources.IWorkspaceRoot"> - </objectClass> - <and> - <objectClass - name="org.eclipse.wst.common.navigator.internal.groups.NavigatorGroup"> - </objectClass> - <objectState - name="projectNature" - value="org.eclipse.jst.j2ee.jca.ConnectorNature"> - </objectState> - </and> - <and> - <objectClass - name="org.eclipse.core.resources.IProject"> - </objectClass> - <or> - <objectState - name="projectNature" - value="org.eclipse.jst.j2ee.EARNature"> - </objectState> - <objectState - name="projectNature" - value="org.eclipse.jst.j2ee.jca.ConnectorNature"> - </objectState> - </or> - </and> - <objectClass - name="org.eclipse.jst.j2ee.jca.internal.impl.ConnectorImpl"> - </objectClass> - <objectClass - name="org.eclipse.jst.j2ee.application.internal.impl.ApplicationImpl"> - </objectClass> - <objectClass - name="org.eclipse.jst.j2ee.internal.provider.ModulesItemProvider"> - </objectClass> - <objectClass - name="org.eclipse.jst.j2ee.application.internal.impl.ModuleImpl"> - </objectClass> - <objectClass - name="org.eclipse.jst.j2ee.jca.internal.impl.ResourceAdapterImpl"> - </objectClass> - - - </or> - </enablement> - </commonWizard> - <!-- Connector Export --> - <commonWizard - type="export" - wizardId="org.eclipse.jst.j2ee.jca.ui.ConnectorModuleExportWizard"> - <enablement> - <or> - <and> - <or> - <objectClass - name="org.eclipse.wst.common.navigator.internal.groups.NavigatorGroup"> - </objectClass> - <objectClass - name="org.eclipse.core.resources.IProject"> - </objectClass> - </or> - <or> - <objectState - name="sNature" - value="org.eclipse.jst.j2ee.jca.ConnectorNature"> - </objectState> - </or> - </and> - <objectClass - name="org.eclipse.jst.j2ee.jca.internal.impl.ConnectorImpl"> - </objectClass> - <objectClass - name="org.eclipse.jst.j2ee.jca.internal.impl.ResourceAdapterImpl"> - </objectClass> - </or> - </enablement> - </commonWizard> - <!-- Import Classes Wizard --> - <commonWizard - type="import" - wizardId="org.eclipse.jst.j2ee.internal.wizard.ClassesImportWizard"> - <enablement> - <or> - <objectClass - name="org.eclipse.jst.j2ee.jca.internal.impl.ConnectorImpl"> - </objectClass> - <objectClass - name="org.eclipse.jst.j2ee.jca.internal.impl.ResourceAdapterImpl"> - </objectClass> - </or> - </enablement> - </commonWizard> - </extension> <extension point="org.eclipse.wst.common.project.facet.ui.wizard">
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee.navigator.ui/META-INF/MANIFEST.MF index dfe59e0..78801f8 100644 --- a/plugins/org.eclipse.jst.j2ee.navigator.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.jst.j2ee.navigator.ui/META-INF/MANIFEST.MF
@@ -8,13 +8,10 @@ Bundle-Localization: plugin Export-Package: org.eclipse.jst.j2ee.navigator.internal, org.eclipse.jst.j2ee.navigator.internal.dnd, - org.eclipse.jst.j2ee.navigator.internal.plugin, - org.eclipse.jst.j2ee.navigator.internal.workingsets + org.eclipse.jst.j2ee.navigator.internal.plugin Require-Bundle: org.eclipse.ui, org.eclipse.core.resources, org.eclipse.core.runtime, - org.eclipse.wst.common.navigator.views, - org.eclipse.wst.common.navigator.workbench, org.eclipse.jst.j2ee.core, org.eclipse.jst.j2ee.ui, org.eclipse.emf.edit, @@ -30,9 +27,11 @@ org.eclipse.jst.ejb.ui, org.eclipse.jst.servlet.ui, org.eclipse.jst.j2ee.jca.ui, - org.eclipse.jst.common.navigator.java, org.eclipse.wst.common.modulecore, org.eclipse.jem.util, org.eclipse.jst.common.frameworks, - org.eclipse.wst.common.project.facet.core + org.eclipse.wst.common.project.facet.core, + org.eclipse.ui.navigator, + org.eclipse.ui.navigator.resources, + org.eclipse.wst.common.emf Eclipse-AutoStart: true
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/IJ2EENavigatorConstants.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/IJ2EENavigatorConstants.java index 75cf8b1..6e7495a 100644 --- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/IJ2EENavigatorConstants.java +++ b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/IJ2EENavigatorConstants.java
@@ -25,5 +25,5 @@ */ public interface IJ2EENavigatorConstants { - String VIEWER_ID = "org.eclipse.wst.navigator.ui.WTPWorkingSetCommonNavigator";//$NON-NLS-1$ + String VIEWER_ID = "org.eclipse.wst.common.explorer.CommonProjectExplorer";//$NON-NLS-1$ }
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EEActionProvider.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EEActionProvider.java index 3ff311b..a8fb46b 100644 --- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EEActionProvider.java +++ b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EEActionProvider.java
@@ -14,26 +14,23 @@ import java.util.List; import org.eclipse.jface.action.IMenuManager; +import org.eclipse.jface.viewers.DoubleClickEvent; +import org.eclipse.jface.viewers.IDoubleClickListener; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.jface.viewers.StructuredViewer; -import org.eclipse.jst.j2ee.internal.actions.J2EERenameAction; import org.eclipse.jst.j2ee.internal.actions.OpenJ2EEResourceAction; import org.eclipse.jst.j2ee.internal.provider.J2EEUtilityJarItemProvider; import org.eclipse.ui.IActionBars; -import org.eclipse.ui.IViewPart; import org.eclipse.ui.actions.ActionContext; -import org.eclipse.wst.common.navigator.internal.provisional.views.ICommonActionProvider; -import org.eclipse.wst.common.navigator.internal.provisional.views.NavigatorContentService; -import org.eclipse.wst.common.navigator.internal.views.actions.CommonActionProvider; +import org.eclipse.ui.navigator.CommonActionProvider; +import org.eclipse.ui.navigator.CommonActionProviderConfig; +import org.eclipse.ui.navigator.ICommonMenuConstants; -public class J2EEActionProvider extends CommonActionProvider implements ICommonActionProvider { - - private IViewPart viewPart; +public class J2EEActionProvider extends CommonActionProvider implements IDoubleClickListener { private OpenJ2EEResourceAction openAction; - private J2EERenameAction renameAction; +// private J2EERenameAction renameAction; //private WTPOptionalOperationAction genericDelete; //TODO add back generic delete @@ -49,11 +46,11 @@ * org.eclipse.jface.viewers.StructuredViewer, * org.eclipse.wst.common.navigator.internal.views.extensions.NavigatorContentService) */ - public void init(IViewPart aViewPart, StructuredViewer aViewer, NavigatorContentService aContentService) { - viewPart = aViewPart; - - openAction = new OpenJ2EEResourceAction(); - renameAction = new J2EERenameAction(viewPart.getViewSite(), viewPart.getViewSite().getShell()); + public void init(CommonActionProviderConfig aConfig) { + + openAction = new OpenJ2EEResourceAction(); + aConfig.getStructuredViewer().addDoubleClickListener(this); +// renameAction = new J2EERenameAction(aConfig.getViewSite(), aConfig.getViewSite().getShell()); // // genericDelete = new WTPOptionalOperationAction(WTPGenericActionIds.DELETE, WorkbenchMessages.Workbench_delete); //$NON-NLS-1$ // ISharedImages sharedImages = PlatformUI.getWorkbench().getSharedImages(); @@ -68,12 +65,13 @@ * * @see org.eclipse.wst.common.navigator.internal.views.actions.ICommonActionProvider#setActionContext(org.eclipse.ui.actions.ActionContext) */ - public void setActionContext(ActionContext aContext) { - if (aContext.getSelection() instanceof IStructuredSelection) { + public void setContext(ActionContext aContext) { + + if (aContext != null && aContext.getSelection() instanceof IStructuredSelection) { IStructuredSelection selection = (IStructuredSelection) aContext.getSelection(); openAction.selectionChanged(selection); - renameAction.selectionChanged(selection); +// renameAction.selectionChanged(selection); Object[] array = selection.toArray(); if (isUtilityJars(array)) { @@ -95,10 +93,10 @@ * * @see org.eclipse.wst.common.navigator.internal.views.actions.ICommonActionProvider#fillActionBars(org.eclipse.ui.IActionBars) */ - public boolean fillActionBars(IActionBars theActionBars) { + public void fillActionBars(IActionBars theActionBars) { // if (genericDelete.isEnabled()) // theActionBars.setGlobalActionHandler(ActionFactory.DELETE.getId(), genericDelete); - return true; + return; } /* @@ -106,8 +104,10 @@ * * @see org.eclipse.wst.common.navigator.internal.views.actions.ICommonActionProvider#fillContextMenu(org.eclipse.jface.action.IMenuManager) */ - public boolean fillContextMenu(IMenuManager aMenu) { - boolean actionsAdded = false; + public void fillContextMenu(IMenuManager aMenu) { + if (openAction.isEnabled()) { + aMenu.appendToGroup(ICommonMenuConstants.GROUP_OPEN, openAction); + } /* if (renameAction.isEnabled()) { aMenu.appendToGroup(ICommonMenuConstants.COMMON_MENU_EDIT_ACTIONS, renameAction); actionsAdded = true; @@ -116,7 +116,7 @@ aMenu.appendToGroup(ICommonMenuConstants.COMMON_MENU_EDIT_ACTIONS, genericDelete); actionsAdded = true; }*/ - return actionsAdded; + return; } private boolean isUtilityJars(Object[] items) { @@ -129,5 +129,13 @@ } return false; } + public void updateActionBars() { + // TODO Auto-generated method stub + super.updateActionBars(); + } + public void doubleClick(DoubleClickEvent event) { + openAction.run(); + + } }
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 870b7f0..9edf8f4 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
@@ -28,15 +28,14 @@ import org.eclipse.jface.viewers.AbstractTreeViewer; import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.Viewer; -import org.eclipse.jst.common.navigator.internal.providers.CommonAdapterFactoryContentProvider; import org.eclipse.jst.j2ee.internal.ejb.provider.BeanClassProviderHelper; import org.eclipse.jst.j2ee.internal.provider.MethodsProviderDelegate; import org.eclipse.jst.j2ee.navigator.internal.EMFRootObjectProvider.IRefreshHandlerListener; import org.eclipse.swt.widgets.Display; +import org.eclipse.ui.internal.navigator.AdaptabilityUtility; +import org.eclipse.ui.navigator.CommonViewer; import org.eclipse.ui.progress.UIJob; import org.eclipse.wst.common.internal.emfworkbench.integration.DynamicAdapterFactory; -import org.eclipse.wst.common.navigator.internal.provisional.views.AdaptabilityUtility; -import org.eclipse.wst.common.navigator.internal.provisional.views.CommonViewer; /** * <p> @@ -176,7 +175,7 @@ /* Create new content providers using the new viewer id */ DynamicAdapterFactory adapterFactory = new DynamicAdapterFactory(aViewerId); - delegateContentProvider = new CommonAdapterFactoryContentProvider(adapterFactory); + delegateContentProvider = new AdapterFactoryContentProvider(adapterFactory); delegateMethodsProvider = new MethodsProviderDelegate(adapterFactory); /* Remember the viewer id */
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EEEMFAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EEEMFAdapterFactory.java new file mode 100644 index 0000000..cf4b18a --- /dev/null +++ b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EEEMFAdapterFactory.java
@@ -0,0 +1,67 @@ +/******************************************************************************* + * Copyright (c) 2003, 2005 IBM Corporation and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * IBM Corporation - initial API and implementation + *******************************************************************************/ +/* + * Created on Feb 25, 2004 + * + */ +package org.eclipse.jst.j2ee.navigator.internal; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.runtime.IAdapterFactory; +import org.eclipse.emf.ecore.EObject; +import org.eclipse.jem.util.emf.workbench.ProjectUtilities; +import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper; + +/** + * @author mdelder + * + */ +public class J2EEEMFAdapterFactory implements IAdapterFactory { + + protected static final Class IPROJECT_CLASS = IProject.class; + protected static final Class IRESOURCE_CLASS = IResource.class; + protected static final Class IFILE_CLASS = IFile.class; + protected static final Class EOBJECT_CLASS = EObject.class; + + /** + * + */ + public J2EEEMFAdapterFactory() { + super(); + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object, java.lang.Class) + */ + public Object getAdapter(Object adaptableObject, Class adapterType) { + if (adaptableObject instanceof EObject) { + if (adapterType == IFILE_CLASS || adapterType == IRESOURCE_CLASS) + return WorkbenchResourceHelper.getFile((EObject) adaptableObject); + else if (adapterType == IPROJECT_CLASS) + return ProjectUtilities.getProject((EObject) adaptableObject); + } + return null; + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList() + */ + public Class[] getAdapterList() { + return new Class[]{IPROJECT_CLASS, IRESOURCE_CLASS, IFILE_CLASS}; + } + +}
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 01b454c..b4e5cf6 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
@@ -18,11 +18,15 @@ import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider; import org.eclipse.jem.util.emf.workbench.ProjectUtilities; import org.eclipse.jface.viewers.ILabelProviderListener; +import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jst.j2ee.common.internal.util.CommonUtil; import org.eclipse.jst.j2ee.internal.ejb.provider.J2EEJavaClassProviderHelper; +import org.eclipse.jst.j2ee.internal.provider.J2EEAdapterFactoryLabelProvider; import org.eclipse.swt.graphics.Image; +import org.eclipse.ui.IMemento; +import org.eclipse.ui.navigator.ICommonLabelProvider; +import org.eclipse.ui.navigator.IExtensionStateModel; import org.eclipse.wst.common.internal.emfworkbench.integration.DynamicAdapterFactory; -import org.eclipse.wst.common.navigator.internal.provisional.views.ICommonLabelProvider; /** * <p> @@ -49,7 +53,7 @@ } public void initialize(String aViewerId) { - delegateLabelProvider = new AdapterFactoryLabelProvider(new DynamicAdapterFactory(aViewerId)); + delegateLabelProvider = new J2EEAdapterFactoryLabelProvider(new DynamicAdapterFactory(aViewerId)); } /* @@ -219,4 +223,19 @@ return delegateLabelProvider.toString(); return super.toString(); } + + public void init(IExtensionStateModel aStateModel, ITreeContentProvider aContentProvider) { + initialize(IJ2EENavigatorConstants.VIEWER_ID); + + } + + public void restoreState(IMemento aMemento) { + // TODO Auto-generated method stub + + } + + public void saveState(IMemento aMemento) { + // TODO Auto-generated method stub + + } }
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EEViewerSorter.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EEViewerSorter.java index 0ac695f..2b20c13 100644 --- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EEViewerSorter.java +++ b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EEViewerSorter.java
@@ -33,9 +33,9 @@ * @see ViewerSorter#compare(Viewer, Object, Object) */ public int compare(Viewer viewer, Object e1, Object e2) { - if (shouldSort(e1, e2)) + //if (shouldSort(e1, e2)) return super.compare(viewer, e1, e2); - return 0; + //return 0; } protected boolean isEnterpriseBean(Object o) {
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/dnd/AddExternalUtilityJarDropAction.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/dnd/AddExternalUtilityJarDropAction.java index 1a516b2..de5c95f 100644 --- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/dnd/AddExternalUtilityJarDropAction.java +++ b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/dnd/AddExternalUtilityJarDropAction.java
@@ -11,8 +11,8 @@ package org.eclipse.jst.j2ee.navigator.internal.dnd; import org.eclipse.swt.dnd.TransferData; -import org.eclipse.wst.common.navigator.internal.views.dnd.CommonNavigatorDropAdapter; -import org.eclipse.wst.common.navigator.internal.workbench.ResourceDropAction; +import org.eclipse.ui.navigator.ICommonDropAdapter; +import org.eclipse.ui.navigator.resources.internal.workbench.ResourceDropAction; /** * @author mdelder @@ -26,7 +26,7 @@ * @see org.eclipse.ui.workbench.navigator.dnd.ResourceDropAction#validateDrop(org.eclipse.wst.common.navigator.internal.views.navigator.dnd.CommonNavigatorDropAdapter, * java.lang.Object, int, org.eclipse.swt.dnd.TransferData) */ - public boolean validateDrop(CommonNavigatorDropAdapter dropAdapter, Object target, int operation, TransferData transferType) { + public boolean validateDrop(ICommonDropAdapter dropAdapter, Object target, int operation, TransferData transferType) { //TODO redo with components // if (FileTransfer.getInstance().isSupportedType(transferType)) { // IProject project = (IProject) AdaptabilityUtility.getAdapter(target, IProject.class);
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/dnd/AddModuleDropAction.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/dnd/AddModuleDropAction.java index fefcd70..d7f7766 100644 --- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/dnd/AddModuleDropAction.java +++ b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/dnd/AddModuleDropAction.java
@@ -11,6 +11,8 @@ package org.eclipse.jst.j2ee.navigator.internal.dnd; import org.eclipse.core.resources.IProject; +import org.eclipse.swt.dnd.TransferData; +import org.eclipse.ui.navigator.ICommonDropAdapter; import org.eclipse.wst.common.frameworks.datamodel.IDataModel; /** @@ -38,4 +40,14 @@ return null; } + public boolean validateDrop(ICommonDropAdapter dropAdapter, Object target, int operation, TransferData transferType) { + // TODO Auto-generated method stub + return false; + } + + public boolean run(ICommonDropAdapter dropAdapter, Object source, Object target) { + // TODO Auto-generated method stub + return false; + } + }
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/dnd/AddProjectToEarDropAction.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/dnd/AddProjectToEarDropAction.java index 3ed68ff..f2cd956 100644 --- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/dnd/AddProjectToEarDropAction.java +++ b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/dnd/AddProjectToEarDropAction.java
@@ -16,12 +16,12 @@ import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.swt.dnd.TransferData; +import org.eclipse.ui.internal.navigator.NavigatorPlugin; +import org.eclipse.ui.internal.navigator.dnd.CommonNavigatorDropAdapter; +import org.eclipse.ui.internal.navigator.dnd.IDropValidator; +import org.eclipse.ui.internal.navigator.dnd.NavigatorDropActionDelegate; import org.eclipse.wst.common.frameworks.datamodel.IDataModel; import org.eclipse.wst.common.frameworks.internal.AdaptabilityUtility; -import org.eclipse.wst.common.navigator.internal.views.NavigatorPlugin; -import org.eclipse.wst.common.navigator.internal.views.dnd.CommonNavigatorDropAdapter; -import org.eclipse.wst.common.navigator.internal.views.dnd.IDropValidator; -import org.eclipse.wst.common.navigator.internal.views.dnd.NavigatorDropActionDelegate; /** * @author jsholl
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/dnd/AddUtilityJarDropAction.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/dnd/AddUtilityJarDropAction.java index 11b7dbd..05aae66 100644 --- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/dnd/AddUtilityJarDropAction.java +++ b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/dnd/AddUtilityJarDropAction.java
@@ -20,6 +20,8 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.jdt.core.JavaCore; import org.eclipse.jst.j2ee.internal.wizard.ServerTargetUIHelper; +import org.eclipse.swt.dnd.TransferData; +import org.eclipse.ui.navigator.ICommonDropAdapter; import org.eclipse.wst.common.frameworks.datamodel.IDataModel; /** @@ -50,4 +52,14 @@ return dataModel; } + public boolean run(ICommonDropAdapter dropAdapter, Object source, Object target) { + // TODO Auto-generated method stub + return false; + } + + public boolean validateDrop(ICommonDropAdapter dropAdapter, Object target, int operation, TransferData transferType) { + // TODO Auto-generated method stub + return false; + } + }
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/dnd/J2EEImportDropAction.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/dnd/J2EEImportDropAction.java index edc7fbb..a78b52a 100644 --- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/dnd/J2EEImportDropAction.java +++ b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/dnd/J2EEImportDropAction.java
@@ -24,12 +24,12 @@ import org.eclipse.jst.j2ee.internal.wizard.ImportUtil; import org.eclipse.swt.dnd.FileTransfer; import org.eclipse.swt.dnd.TransferData; +import org.eclipse.ui.internal.navigator.dnd.IDropValidator; +import org.eclipse.ui.internal.navigator.dnd.NavigatorDropActionDelegate; +import org.eclipse.ui.navigator.ICommonDropAdapter; import org.eclipse.wst.common.frameworks.datamodel.IDataModel; import org.eclipse.wst.common.frameworks.internal.AdaptabilityUtility; import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizard; -import org.eclipse.wst.common.navigator.internal.views.dnd.CommonNavigatorDropAdapter; -import org.eclipse.wst.common.navigator.internal.views.dnd.IDropValidator; -import org.eclipse.wst.common.navigator.internal.views.dnd.NavigatorDropActionDelegate; /** * @author jsholl @@ -51,7 +51,7 @@ return false; } - public boolean validateDrop(CommonNavigatorDropAdapter dropAdapter, Object target, int operation, TransferData transferType) { + public boolean validateDrop(ICommonDropAdapter dropAdapter, Object target, int operation, TransferData transferType) { if (FileTransfer.getInstance().isSupportedType(transferType)) { String[] sourceNames = (String[]) FileTransfer.getInstance().nativeToJava(transferType); if (sourceNames == null || sourceNames.length != 1) { //only handle one file for now @@ -163,7 +163,7 @@ * @see org.eclipse.wst.common.navigator.internal.views.navigator.dnd.NavigatorDropActionDelegate#run(org.eclipse.wst.common.navigator.internal.views.navigator.dnd.CommonNavigatorDropAdapter, * java.lang.Object, java.lang.Object) */ - public boolean run(CommonNavigatorDropAdapter dropAdapter, Object source, Object target) { + public boolean run(ICommonDropAdapter dropAdapter, Object source, Object target) { TransferData currentTransfer = dropAdapter.getCurrentTransfer(); if (FileTransfer.getInstance().isSupportedType(currentTransfer)) { final String[] fileNames = (String[]) source;
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/dnd/ModuleIdentifierSerializer.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/dnd/ModuleIdentifierSerializer.java index 6e7477f..392a6d9 100644 --- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/dnd/ModuleIdentifierSerializer.java +++ b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/dnd/ModuleIdentifierSerializer.java
@@ -12,8 +12,8 @@ import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.ui.internal.navigator.dnd.ISerializer; import org.eclipse.wst.common.frameworks.internal.AdaptabilityUtility; -import org.eclipse.wst.common.navigator.internal.views.dnd.ISerializer;
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 d3d5680..fa5e147 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
@@ -12,7 +12,13 @@ import org.eclipse.core.resources.IWorkspace; import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.IAdapterManager; +import org.eclipse.core.runtime.Platform; +import org.eclipse.emf.ecore.EObject; +import org.eclipse.jst.j2ee.navigator.internal.J2EEEMFAdapterFactory; import org.eclipse.ui.plugin.AbstractUIPlugin; +import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper; +import org.osgi.framework.BundleContext; /** * The main plugin class to be used in the desktop. @@ -44,4 +50,11 @@ public static IWorkspace getWorkspace() { return ResourcesPlugin.getWorkspace(); } + + public void start(BundleContext context) throws Exception { + super.start(context); + WorkbenchResourceHelper.initializeFileAdapterFactory(); + IAdapterManager manager = Platform.getAdapterManager(); + manager.registerAdapters(new J2EEEMFAdapterFactory(), EObject.class); + } }
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/workingsets/ComponentWorkingSet.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/workingsets/ComponentWorkingSet.java deleted file mode 100644 index 88682db..0000000 --- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/workingsets/ComponentWorkingSet.java +++ /dev/null
@@ -1,386 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2005 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -/* - * Created on Mar 24, 2005 - * - * TODO To change the template for this generated file go to - * Window - Preferences - Java - Code Style - Code Templates - */ -package org.eclipse.jst.j2ee.navigator.internal.workingsets; - -import java.util.ArrayList; - -import org.eclipse.core.internal.runtime.InternalPlatform; -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.jface.util.Assert; -import org.eclipse.jst.common.navigator.internal.ui.workingsets.AbstractWorkingSetManager; -import org.eclipse.jst.common.navigator.internal.ui.workingsets.ICommonWorkingSet; -import org.eclipse.ui.IActionFilter; -import org.eclipse.ui.IMemento; -import org.eclipse.ui.IPersistableElement; -import org.eclipse.ui.IWorkingSet; -import org.eclipse.ui.IWorkingSetManager; -import org.eclipse.ui.internal.IWorkbenchConstants; -import org.eclipse.ui.internal.WorkbenchPlugin; -import org.eclipse.ui.internal.registry.WorkingSetDescriptor; -import org.eclipse.ui.internal.registry.WorkingSetRegistry; - -/** - * @author Admin - * - * TODO To change the template for this generated type comment go to - * Window - Preferences - Java - Code Style - Code Templates - */ -public class ComponentWorkingSet implements ICommonWorkingSet,IActionFilter{ - - static final String FACTORY_ID = "org.eclipse.jst.j2ee.navigator.internal.workingsets.ComponentWorkingSetFactory"; //$NON-NLS-1$ - - private static final String COMPONENT_TYPE_ID = "componentTypeId"; //$NON-NLS-1$ - - private static final String EDIT_PAGE_ID = "editPageId"; //$NON-NLS-1$ - - public static final String COMPONENT_WORKING_SET_ID = "org.eclipse.jst.j2ee.navigator.ui.ComponentWorkingSetPage"; - - private String name; - - private String label; - - private ArrayList elements; - - private String editPageId; - - private IMemento workingSetMemento; - - private IWorkingSetManager manager; - - private String typeId; - - public static final String TAG_TYPE_ID = "typeId"; //$NON-NLS-1$ - - - /** - * Creates a new working set. - * - * @param name the name of the new working set. Should not have - * leading or trailing whitespace. - * @param element the content of the new working set. - * May be empty but not <code>null</code>. - */ - public ComponentWorkingSet(String aName, IAdaptable[] elements) { - name = aName; - internalSetElements(elements); - - } - - /** - * Creates a new working set from a memento. - * - * @param name the name of the new working set. Should not have - * leading or trailing whitespace. - * @param memento persistence memento containing the elements of - * the working set. - */ - ComponentWorkingSet(String aName, String aTypeId, IMemento memento) { - name = aName; - typeId = aTypeId; - workingSetMemento = memento; - internalSetElements(new IAdaptable[0]); - } - - /** - * @param descriptor2 - */ - public ComponentWorkingSet(ComponentWorkingSetDescriptor aDescriptor) { - name = aDescriptor.getLabel(); - typeId = aDescriptor.getTypeId(); - editPageId = aDescriptor.getId(); - internalSetElements(new IAdaptable[0]); - } - - /** - * Tests the receiver and the object for equality - * - * @param object object to compare the receiver to - * @return true=the object equals the receiver, the name is the same. - * false otherwise - */ - public boolean equals(Object object) { - if (this == object) { - return true; - } - if (object instanceof ComponentWorkingSet) { - ComponentWorkingSet workingSet = (ComponentWorkingSet) object; - String objectPageId = workingSet.getId(); - String pageId = getId(); - boolean pageIdEqual = (objectPageId == null && pageId == null) - || (objectPageId != null && objectPageId.equals(pageId)); - String objectTypeId = workingSet.getTypeId(); - String typeId = getTypeId(); - boolean typeIdEqual = (objectTypeId == null && typeId == null) - || (objectTypeId != null && objectTypeId.equals(typeId)); - return workingSet.getName().equals(getName()) - && workingSet.getElementsArray().equals(getElementsArray()) - && pageIdEqual - && typeIdEqual; - } - return false; - } - - /** - * {@inheritDoc} - */ - public boolean isEditable() { - WorkingSetRegistry registry = WorkbenchPlugin.getDefault().getWorkingSetRegistry(); - String id= getId(); - if (id == null) - return false; - WorkingSetDescriptor descriptor= registry.getWorkingSetDescriptor(id); - if (descriptor == null) - return false; - return descriptor.isEditable(); - } -// - /** - * Returns the receiver if the requested type is either IWorkingSet - * or IPersistableElement. - * - * @param adapter the requested type - * @return the receiver if the requested type is either IWorkingSet - * or IPersistableElement. - */ - public Object getAdapter(Class adapter) { - if (adapter == IWorkingSet.class - || adapter == IPersistableElement.class) { - return this; - } - return InternalPlatform.getDefault().getAdapterManager().getAdapter(this, adapter); - } - - /* (non-Javadoc) - * @see org.eclipse.ui.IWorkingSet - */ - public IAdaptable[] getElements() { - ArrayList list = getElementsArray(); - return (IAdaptable[]) list.toArray(new IAdaptable[list.size()]); - } - - /** - * Returns the elements array list. Lazily restores the elements from - * persistence memento. - * - * @return the elements array list - */ - private ArrayList getElementsArray() { - if (elements == null) { - restoreWorkingSet(); - workingSetMemento = null; - } - return elements; - } - - /* (non-Javadoc) - * @see org.eclipse.ui.IPersistableElement - */ - public String getFactoryId() { - return FACTORY_ID; - } - - /* (non-Javadoc) - * @see org.eclipse.ui.IWorkingSet - */ - public String getId() { - if (editPageId == null) - editPageId = COMPONENT_WORKING_SET_ID; - return editPageId; - } - - - /* (non-Javadoc) - * @see org.eclipse.ui.IWorkingSet - */ - public String getName() { - return name; - } - - /** - * Returns the hash code. - * - * @return the hash code. - */ - public int hashCode() { - int hashCode = name.hashCode() & typeId.hashCode(); - - if (editPageId != null) { - hashCode &= editPageId.hashCode(); - } - return hashCode; - } - - /** - * Recreates the working set elements from the persistence memento. - */ - private void restoreWorkingSet() { - //updateElements(); - } - - /** - * Implements IPersistableElement. - * Persist the working set name and working set contents. - * The contents has to be either IPersistableElements or provide - * adapters for it to be persistent. - * - * @see org.eclipse.ui.IPersistableElement#saveState(IMemento) - */ - public void saveState(IMemento memento) { - if (workingSetMemento != null) { - // just re-save the previous memento if the working set has - // not been restored - memento.putMemento(workingSetMemento); - } else { - memento.putString(IWorkbenchConstants.TAG_NAME, getName()); - memento.putString(IWorkbenchConstants.TAG_EDIT_PAGE_ID, getId()); - memento.putString(TAG_TYPE_ID,typeId); - } - } - - /* (non-Javadoc) - * @see org.eclipse.ui.IWorkingSet - */ - public void setElements(IAdaptable[] newElements) { - internalSetElements(newElements); - fireWorkingSetChanged(IWorkingSetManager.CHANGE_WORKING_SET_CONTENT_CHANGE, null); - } - - /** - * Create a copy of the elements to store in the receiver. - * - * @param elements the elements to store a copy of in the - * receiver. - */ - private void internalSetElements(IAdaptable[] newElements) { - Assert.isNotNull(newElements, - "Working set elements array must not be null"); //$NON-NLS-1$ - - elements = new ArrayList(newElements.length); - for (int i = 0; i < newElements.length; i++) { - elements.add(newElements[i]); - } - } -// - /* (non-Javadoc) - * @see org.eclipse.ui.IWorkingSet - */ - public void setId(String pageId) { - editPageId = pageId; - } - - /* (non-Javadoc) - * @see org.eclipse.ui.IWorkingSet - */ - public void setName(String newName) { - Assert.isNotNull(newName, "Working set name must not be null"); //$NON-NLS-1$ - - name = newName; - fireWorkingSetChanged(IWorkingSetManager.CHANGE_WORKING_SET_NAME_CHANGE, null); - } - - public void connect(IWorkingSetManager manager) { - Assert.isTrue(this.manager == null, "A working set can only be connected to one manager"); //$NON-NLS-1$ - this.manager= manager; - } - - public void disconnect() { - this.manager= null; - - } - - - private void fireWorkingSetChanged(String property, Object oldValue) { - AbstractWorkingSetManager receiver= manager != null - ? (AbstractWorkingSetManager)manager - : (AbstractWorkingSetManager)WorkbenchPlugin.getDefault().getWorkingSetManager(); - receiver.workingSetChanged(this, property, oldValue); - } - - - - public ImageDescriptor getImage() { - ComponentWorkingSetRegistry registry = ComponentWorkingSetRegistry.getInstance(); - ComponentWorkingSetDescriptor descriptor = null; - - descriptor = registry.getWorkingSetDescriptor(getId(), typeId); - if (descriptor == null) { - return null; - } - return descriptor.getIcon(); - - } - - public String getTypeId() { - return typeId; - } - - - - - - public boolean testAttribute(Object target, String name, String value) { - if (COMPONENT_TYPE_ID.equals(name)) - return getTypeId().equals(value); - if (EDIT_PAGE_ID.equals(name)) - return getId().equals(value); - - return false; - - } - - public boolean isVisible() { - //TODO_32 This implementation put in WTP 1.0 to maintain compatibility with Eclipse 3.2 M3 - return true; - } - - public String getLabel() { - //TODO_32 This implementation put in WTP 1.0 to maintain compatibility with Eclipse 3.2 M3 - String result = label; - if (result == null) { - result = getName(); - } - return result; - } - - public void setLabel(String label) { - //TODO_32 This implementation put in WTP 1.0 to maintain compatibility with Eclipse 3.2 M3 - this.label = label; - - } - - public boolean isSelfUpdating() { - // TODO_32 this method was added to be compatible - // with 3.2. Please reimplenet it in the 32 stream if needed. - return false; - } - - public boolean isAggregateWorkingSet() { - // TODO_32 this method was added to be compatible - // with 3.2. Please reimplenet it in the 32 stream if needed. - return false; - } - - public boolean isEmpty() { - // TODO_32 this method was added to be compatible - // with 3.2. Please reimplenet it in the 32 stream if needed. - return false; - } - - - -}
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/workingsets/ComponentWorkingSetDescriptor.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/workingsets/ComponentWorkingSetDescriptor.java deleted file mode 100644 index 16097bb..0000000 --- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/workingsets/ComponentWorkingSetDescriptor.java +++ /dev/null
@@ -1,125 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2005 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -/* - * Created on Mar 23, 2005 - * - * TODO To change the template for this generated file go to - * Window - Preferences - Java - Code Style - Code Templates - */ -package org.eclipse.jst.j2ee.navigator.internal.workingsets; - -import org.eclipse.core.runtime.IConfigurationElement; -import org.eclipse.core.runtime.IExtension; -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.ui.WorkbenchException; -import org.eclipse.ui.plugin.AbstractUIPlugin; - -/** - * @author Admin - * - * TODO To change the template for this generated type comment go to - * Window - Preferences - Java - Code Style - Code Templates - */ -public class ComponentWorkingSetDescriptor { - - private IConfigurationElement configElement; - public static final String ATT_ID = "id"; //$NON-NLS-1$ - public static final String ATT_LABEL = "label"; //$NON-NLS-1$ - public static final String ATT_ICON = "icon"; //$NON-NLS-1$ - public static final String ATT_MODULE_TYPE = "typeId"; //$NON-NLS-1$ - - private String id ; - private String label ; - private String icon; - private String typeId; - - - /** - * @param anElement - */ - public ComponentWorkingSetDescriptor(IConfigurationElement aConfigElement) throws WorkbenchException{ - super(); - configElement = aConfigElement; - init(); - } - - void init() throws WorkbenchException { - label = configElement.getAttribute(ATT_LABEL); - id = configElement.getAttribute(ATT_ID); - typeId = configElement.getAttribute(ATT_MODULE_TYPE); - icon = configElement.getAttribute(ATT_ICON); - - if (id == null || id.length() == 0) { - throw new WorkbenchException("Missing attribute: " + //$NON-NLS-1$ - ATT_ID + " in common working set extension: " + //$NON-NLS-1$ - configElement.getDeclaringExtension().getUniqueIdentifier()); - } - - if (label == null || label.length() == 0) { - throw new WorkbenchException("Missing attribute: " + //$NON-NLS-1$ - ATT_LABEL + " in common working set extension: " + //$NON-NLS-1$ - configElement.getDeclaringExtension().getUniqueIdentifier()); - } - - if (typeId == null || typeId.length() == 0) { - throw new WorkbenchException("Missing attribute: " + //$NON-NLS-1$ - ATT_MODULE_TYPE + " in common working set extension: " + //$NON-NLS-1$ - configElement.getDeclaringExtension().getUniqueIdentifier()); - } - } - - /** - * @return - */ - public String getTypeId() { - // TODO Auto-generated method stub - return typeId; - } - - public String getId() { - // TODO Auto-generated method stub - return id; - } - - /** - * @return - */ - public String getLabel() { - // TODO Auto-generated method stub - return label; - } - - /** - * Returns the page's icon - * - * @return the page's icon - */ - public ImageDescriptor getIcon() { - if (icon == null) - return null; - - IExtension extension = configElement.getDeclaringExtension(); - String extendingPluginId = extension.getNamespace(); - return AbstractUIPlugin.imageDescriptorFromPlugin(extendingPluginId, - icon); - } - - /** - * @throws BundleException - * - */ -// public void start() throws BundleException { -// Bundle bundle= Platform.getBundle(configElement.getDeclaringExtension().getNamespace()); -// if ( bundle.getState() != Bundle.ACTIVE ) -// bundle.start(); -// -// } -}
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/workingsets/ComponentWorkingSetFactory.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/workingsets/ComponentWorkingSetFactory.java deleted file mode 100644 index 305412e..0000000 --- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/workingsets/ComponentWorkingSetFactory.java +++ /dev/null
@@ -1,63 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2005 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -/* - * Created on Mar 28, 2005 - * - * TODO To change the template for this generated file go to - * Window - Preferences - Java - Code Style - Code Templates - */ -package org.eclipse.jst.j2ee.navigator.internal.workingsets; - -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.ui.IElementFactory; -import org.eclipse.ui.IMemento; -import org.eclipse.ui.internal.IWorkbenchConstants; - -/** - * @author Admin - * - * TODO To change the template for this generated type comment go to - * Window - Preferences - Java - Code Style - Code Templates - */ -public class ComponentWorkingSetFactory implements IElementFactory { - - /** - * - */ - public ComponentWorkingSetFactory() { - super(); - // TODO Auto-generated constructor stub - } - - /* (non-Javadoc) - * @see org.eclipse.ui.IElementFactory - */ - public IAdaptable createElement(IMemento memento) { - String workingSetName = memento.getString(IWorkbenchConstants.TAG_NAME); - String typeId = memento.getString(ComponentWorkingSet.TAG_TYPE_ID); - String workingSetEditPageId = memento - .getString(IWorkbenchConstants.TAG_EDIT_PAGE_ID); - - if (workingSetName == null) - return null; - - ComponentWorkingSet workingSet = new ComponentWorkingSet(workingSetName, typeId, memento); - if (workingSetEditPageId != null) { - workingSet.setId(workingSetEditPageId); - } else { - // working sets created with builds 20020418 and 20020419 will not - // have an edit page id. fix this automatically. - workingSet.setId(ComponentWorkingSet.COMPONENT_WORKING_SET_ID); //$NON-NLS-1$ - } - return workingSet; - } - -}
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/workingsets/ComponentWorkingSetProvider.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/workingsets/ComponentWorkingSetProvider.java deleted file mode 100644 index 1346147..0000000 --- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/workingsets/ComponentWorkingSetProvider.java +++ /dev/null
@@ -1,74 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2005 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -/* - * Created on Mar 25, 2005 - * - * TODO To change the template for this generated file go to - * Window - Preferences - Java - Code Style - Code Templates - */ -package org.eclipse.jst.j2ee.navigator.internal.workingsets; - -import java.util.ArrayList; -import java.util.List; - -import org.eclipse.jst.common.navigator.internal.ui.workingsets.ICommonWorkingSetProvider; -import org.eclipse.ui.IWorkingSet; - -/** - * @author Admin - * - * TODO To change the template for this generated type comment go to - * Window - Preferences - Java - Code Style - Code Templates - */ -public class ComponentWorkingSetProvider implements ICommonWorkingSetProvider { - - private static final ComponentWorkingSetRegistry COMPONENT_WORKING_SET_REGISTRY = ComponentWorkingSetRegistry.getInstance(); - boolean bInitialized = false; - List workingSets = new ArrayList(); - /** - * - */ - public ComponentWorkingSetProvider() { - super(); - } - - /* (non-Javadoc) - * @see org.eclipse.jst.common.navigator.internal.ui.workingsets.IWorkingSetProvider#getWorkingSets() - */ - public IWorkingSet[] getWorkingSets() { - if (!bInitialized) { - //workingSets.clear(); - synchronized (workingSets) { - ComponentWorkingSetDescriptor[] set = COMPONENT_WORKING_SET_REGISTRY.getComponentWorkingSetDescriptors(); - ComponentWorkingSetDescriptor descriptor = null; - IWorkingSet workingSet = null; - for (int x=0; x<set.length;++ x) { - descriptor = set[x]; - workingSet= new ComponentWorkingSet(descriptor); - workingSets.add(workingSet); - bInitialized = true; - } - } - } - - IWorkingSet[] ws = new IWorkingSet[workingSets.size()]; - return (IWorkingSet[])workingSets.toArray(ws); - } - - /* (non-Javadoc) - * @see org.eclipse.jst.common.navigator.internal.ui.workingsets.IWorkingSetProvider#init(org.eclipse.jst.common.navigator.internal.ui.workingsets.WorkingSetModel) - */ -// public void init(WorkingSetModel workingSetModel) { -// // TODO Auto-generated method stub - -// } - -}
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/workingsets/ComponentWorkingSetRegistry.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/workingsets/ComponentWorkingSetRegistry.java deleted file mode 100644 index 7a97913..0000000 --- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/workingsets/ComponentWorkingSetRegistry.java +++ /dev/null
@@ -1,142 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2005 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -/* - * Created on Mar 23, 2005 - * - * TODO To change the template for this generated file go to - * Window - Preferences - Java - Code Style - Code Templates - */ -package org.eclipse.jst.j2ee.navigator.internal.workingsets; - -import java.util.ArrayList; -import java.util.List; - -import org.eclipse.core.runtime.IConfigurationElement; -import org.eclipse.jst.j2ee.navigator.internal.plugin.J2EENavigatorPlugin; -import org.eclipse.ui.WorkbenchException; -import org.eclipse.wst.common.navigator.internal.plugin.WorkbenchNavigatorPlugin; -import org.eclipse.wst.common.navigator.internal.views.extensions.RegistryReader; - -/** - * @author Admin - * - * TODO To change the template for this generated type comment go to - * Window - Preferences - Java - Code Style - Code Templates - */ -public class ComponentWorkingSetRegistry { - private static final ComponentWorkingSetRegistry INSTANCE = new ComponentWorkingSetRegistry(); - private static boolean isInitialized = false; - private static final String[] NO_DESCRIPTORS = new String[0]; - private List commonWorkingSetDescriptors = new ArrayList(); - - /** - * - */ - public ComponentWorkingSetRegistry() { - super(); - // TODO Auto-generated constructor stub - } - - public void init() { - new ComponentWorkingSetRegistryReader().readRegistry(); - } - - /** - * - */ - public static ComponentWorkingSetRegistry getInstance() { - if (isInitialized) - return INSTANCE; - synchronized (INSTANCE) { - if (!isInitialized) { - INSTANCE.init(); - isInitialized = true; - } - } - return INSTANCE; - } - - /** - * @param aDesc - */ - private void addCommonWorkingSetDescriptor(ComponentWorkingSetDescriptor aDesc) { - if (aDesc == null) - return; - synchronized (commonWorkingSetDescriptors) { - boolean bValue = commonWorkingSetDescriptors.contains(aDesc); - if (bValue == false) { - commonWorkingSetDescriptors.add(aDesc); - } - } - } - - public ComponentWorkingSetDescriptor[] getComponentWorkingSetDescriptors() { - ComponentWorkingSetDescriptor[] descriptors = new ComponentWorkingSetDescriptor[commonWorkingSetDescriptors.size()]; - return (ComponentWorkingSetDescriptor[])commonWorkingSetDescriptors.toArray(descriptors); - - } - - public boolean containsId(String id) { - ComponentWorkingSetDescriptor descriptor = null; - for (int x=0; x< commonWorkingSetDescriptors.size(); ++x) { - descriptor = (ComponentWorkingSetDescriptor)commonWorkingSetDescriptors.get(x); - if (descriptor.getId().equals(id)) - return true; - } - return false; - } - - class ComponentWorkingSetRegistryReader extends RegistryReader { - - private static final String COMPONENT_WORKING_SET = "componentWorkingSet"; //$NON-NLS-1$ - - - ComponentWorkingSetRegistryReader() { - super(J2EENavigatorPlugin.PLUGIN_ID, COMPONENT_WORKING_SET); - } - - /* - * (non-Javadoc) - * - * @see org.eclipse.wst.common.navigator.internal.views.extensions.RegistryReader#readElement(org.eclipse.core.runtime.IConfigurationElement) - */ - protected boolean readElement(IConfigurationElement anElement) { - if (COMPONENT_WORKING_SET.equals(anElement.getName())) { - try { - addCommonWorkingSetDescriptor(new ComponentWorkingSetDescriptor(anElement)); - return true; - } catch (WorkbenchException e) { - // log an error since its not safe to open a dialog here - WorkbenchNavigatorPlugin.log("Unable to create common working set descriptor.", e.getStatus());//$NON-NLS-1$ - } - } - return false; - } - } - - /** - * @param editPageId - * @param typeId - * @return - */ - public ComponentWorkingSetDescriptor getWorkingSetDescriptor(String editPageId, String typeId) { - ComponentWorkingSetDescriptor[] descriptors = getComponentWorkingSetDescriptors(); - ComponentWorkingSetDescriptor descriptor = null; - for (int x=0; x< descriptors.length ; ++x) { - descriptor = descriptors[x]; - if (descriptor.getId().equals(editPageId) - && descriptor.getTypeId().equals(typeId)) - return descriptor; - } - return null; - } - -}
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/workingsets/ComponentWorkingSetUpdater.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/workingsets/ComponentWorkingSetUpdater.java deleted file mode 100644 index 92e8647..0000000 --- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/workingsets/ComponentWorkingSetUpdater.java +++ /dev/null
@@ -1,306 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2005 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -/* - * Created on Mar 24, 2005 - * - * TODO To change the template for this generated file go to - * Window - Preferences - Java - Code Style - Code Templates - */ -package org.eclipse.jst.j2ee.navigator.internal.workingsets; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Set; - -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; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.jem.util.logger.proxy.Logger; -import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities; -import org.eclipse.ui.IWorkingSet; -import org.eclipse.ui.IWorkingSetUpdater; -import org.eclipse.wst.common.componentcore.internal.StructureEdit; - -/** - * @author Admin - * - * TODO To change the template for this generated type comment go to - * Window - Preferences - Java - Code Style - Code Templates - */ -public class ComponentWorkingSetUpdater implements IWorkingSetUpdater, - IResourceChangeListener/*, IResourceDeltaVisitor*/ { - - public static final String ID= "org.eclipse.jst.j2ee.navigator.ui.ComponentWorkingSetPage"; //$NON-NLS-1$ - - private List fWorkingSets; - - private HashMap projectStructureEdits; - - private static class WorkingSetDelta { - private IWorkingSet fWorkingSet; - private List fElements; - private boolean fChanged; - public WorkingSetDelta(IWorkingSet workingSet) { - fWorkingSet= workingSet; - fElements= new ArrayList(Arrays.asList(workingSet.getElements())); - } - - public IWorkingSet getWorkingSet() { - return fWorkingSet; - } - - public int indexOf(Object element) { - return fElements.indexOf(element); - } - - public void add( Object element) { - synchronized (fWorkingSet) { - if (indexOf(element) ==-1) { - fElements.add(element); - fChanged= true; - } - } - } - public void remove(int index) { - if (fElements.remove(index) != null) { - fChanged= true; - } - } - public void process() { - if (fChanged) { - fWorkingSet.setElements((IAdaptable[])fElements.toArray(new IAdaptable[fElements.size()])); - } - } - } - - /** - * - */ - public ComponentWorkingSetUpdater() { - super(); - fWorkingSets= new ArrayList(); - ResourcesPlugin.getWorkspace().addResourceChangeListener(this); - } - - /* (non-Javadoc) - * @see org.eclipse.ui.IWorkingSetUpdater#add(org.eclipse.ui.IWorkingSet) - */ - public void add(IWorkingSet workingSet) { - //checkElementExistence(workingSet); - synchronized (fWorkingSets) { - - updateElements(workingSet); - fWorkingSets.add(workingSet); - } - - } - - - /** - * @param project - * @param typeId - * @return - */ - private boolean containsModuleType(IProject project, String typeId) { - boolean bReturn = false; - if (project.isAccessible()) { - synchronized (this) { - return J2EEProjectUtilities.isProjectOfType(project,typeId); - } - } - return bReturn; - } - - /* (non-Javadoc) - * @see org.eclipse.ui.IWorkingSetUpdater#remove(org.eclipse.ui.IWorkingSet) - */ - public boolean remove(IWorkingSet workingSet) { - boolean result; - synchronized(fWorkingSets) { - result= fWorkingSets.remove(workingSet); - } - return result; - } - - /* (non-Javadoc) - * @see org.eclipse.ui.IWorkingSetUpdater#contains(org.eclipse.ui.IWorkingSet) - */ - public boolean contains(IWorkingSet workingSet) { - synchronized(fWorkingSets) { - return fWorkingSets.contains(workingSet); - } - } - - /* (non-Javadoc) - * @see org.eclipse.ui.IWorkingSetUpdater#dispose() - */ - public void dispose() { - synchronized(fWorkingSets) { - fWorkingSets.clear(); - } - disposeStructureEdits(); - ResourcesPlugin.getWorkspace().removeResourceChangeListener(this); - } - - - - - /* (non-Javadoc) - * @see org.eclipse.core.resources.IResourceChangeListener#resourceChanged(org.eclipse.core.resources.IResourceChangeEvent) - */ - public void resourceChanged(IResourceChangeEvent event) { - - IResourceDelta delta= event.getDelta(); - if (delta == null) return; - IResourceDelta[] affectedChildren= delta.getAffectedChildren(IResourceDelta.ADDED | IResourceDelta.REMOVED | IResourceDelta.CHANGED, IResource.PROJECT); - if (affectedChildren.length > 0) { - for (int i= 0; i < affectedChildren.length; i++) { - IResourceDelta projectDelta= affectedChildren[i]; - IProject project = (IProject)projectDelta.getResource(); - - IWorkingSet[] workingSets; - synchronized(fWorkingSets) { - workingSets= (IWorkingSet[])fWorkingSets.toArray(new IWorkingSet[fWorkingSets.size()]); - } - for (int w= 0; w < workingSets.length; w++) { - WorkingSetDelta workingSetDelta= new WorkingSetDelta(workingSets[w]); - processResourceDelta(workingSetDelta,projectDelta, project); - workingSetDelta.process(); - } - } - } - } - - - - - private void processResourceDelta(WorkingSetDelta result, IResourceDelta aDelta, IProject aProject) { - //IResource resource= aDelta.getResource(); - - int index= result.indexOf(aProject); - int kind= aDelta.getKind(); - int flags= aDelta.getFlags(); - - - switch (aDelta.getKind()) { - case IResourceDelta.REMOVED : - if (index != -1) { - result.remove(index) ; - } - disposeStructureEdits(aProject); - break; - case IResourceDelta.ADDED : { - ComponentWorkingSet workingSet = (ComponentWorkingSet) result.getWorkingSet(); - if (containsModuleType(aProject,workingSet.getTypeId())) { - if (index == -1) - result.add(aProject); - } - break; - } - - - case IResourceDelta.CHANGED : - // boolean natureMayHaveChanged = ((aDelta.getFlags() & IResourceDelta.DESCRIPTION) != 0) && ((aDelta.getFlags() & IResourceDelta.MARKERS) == 0); - boolean projectOpenStateChanged = ((aDelta.getFlags() & IResourceDelta.OPEN) != 0); - if (/*natureMayHaveChanged ||*/ projectOpenStateChanged) { - if (aProject.isOpen()) { - ComponentWorkingSet workingSet = (ComponentWorkingSet) result.getWorkingSet(); - if (containsModuleType(aProject,workingSet.getTypeId())) { - result.add(aProject); - } - } else { - if (index != -1) { - result.remove(index) ; - } - disposeStructureEdits(aProject); - } - - } else { - ComponentWorkingSet workingSet = (ComponentWorkingSet) result.getWorkingSet(); - if (containsModuleType(aProject,workingSet.getTypeId())) { - if (index == -1) - result.add(aProject); - } else { - if (index != -1) { - result.remove(index) ; - } - } - break; - } - break; - } - - } - - - private void updateElements(IWorkingSet workingSet) { - if (workingSet instanceof ComponentWorkingSet) { - ComponentWorkingSet componentWorkingSet = (ComponentWorkingSet) workingSet; - List result= new ArrayList(); - IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects(); - for (int i= 0; i < projects.length; i++) { - try { - if (containsModuleType(projects[i],componentWorkingSet.getTypeId())) { - result.add(projects[i]); - } - } catch (Exception ex) { - Logger.getLogger().logError(ex); - } - } - componentWorkingSet.setElements((IAdaptable[])result.toArray(new IAdaptable[result.size()])); - } - } - - - private void disposeStructureEdits() { - Set keys = getProjectStructureEdits().keySet(); - for (Iterator iter = keys.iterator(); iter.hasNext();) { - IProject proj = (IProject) iter.next(); - StructureEdit se =(StructureEdit)getProjectStructureEdits().get(proj); - if (se != null) - se.dispose(); - - } - } - - private void disposeStructureEdits(IProject aProject) { - StructureEdit se =(StructureEdit)getProjectStructureEdits().get(aProject); - if (se != null) - se.dispose(); - getProjectStructureEdits().remove(aProject); - } - - private HashMap getProjectStructureEdits() { - if (projectStructureEdits != null) - return projectStructureEdits; - - synchronized(this) { - if (projectStructureEdits == null) - projectStructureEdits = new HashMap(); - } - return projectStructureEdits; - - } - - public StructureEdit getStructureEdit(IProject aProject) { - if (getProjectStructureEdits().get(aProject) == null) - getProjectStructureEdits().put(aProject,StructureEdit.getStructureEditForRead(aProject)); - return (StructureEdit)getProjectStructureEdits().get(aProject); - } - -}
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/plugin.xml b/plugins/org.eclipse.jst.j2ee.navigator.ui/plugin.xml index b6f98a8..d20b686 100644 --- a/plugins/org.eclipse.jst.j2ee.navigator.ui/plugin.xml +++ b/plugins/org.eclipse.jst.j2ee.navigator.ui/plugin.xml
@@ -2,10 +2,694 @@ <?eclipse version="3.0"?> <plugin> - <extension-point id="componentWorkingSet" name="Component Working Set" schema="schema/componentWorkingSet.exsd"/> - -<!-- Drop Adapter for Adding Modules to EARs --> <extension + point="org.eclipse.ui.navigator.navigatorContent"> + <navigatorContent + name="%extension.j2ee.name" + priority="higher" + icon="icons/J2EEPerspective.gif" + activeByDefault="true" + contentProvider="org.eclipse.jst.j2ee.navigator.internal.J2EEContentProvider" + labelProvider="org.eclipse.jst.j2ee.navigator.internal.J2EELabelProvider" + id="org.eclipse.jst.navigator.j2ee.ui.J2EEContent"> + <enablement> + <or> + <instanceof value="org.eclipse.core.resources.IWorkspaceRoot" /> + <instanceof value="org.eclipse.core.resources.IProject" /> + <instanceof value="org.eclipse.core.resources.IResource" /> + <instanceof value="org.eclipse.core.resources.IFolder" /> + <instanceof value="org.eclipse.core.resources.IFile"/> + </or> + </enablement> + <!-- + <emfEnablement> + <package uri="org.eclipse.emf.ecore.resource" /> + <package uri="common.xmi" /> + <package uri="application.xmi" /> + <package uri="client.xmi" /> + <package uri="modulemap.xmi" /> + <package uri="ejb.xmi" /> + <package uri="jca.xmi" /> + <package uri="webapplication.xmi" /> + <package uri="jsp.xmi" /> + <package uri="commonext.xmi" /> + <package uri="localtran.xmi" /> + <package uri="ejbext.xmi" /> + <package uri="webappext.xmi" /> + <package uri="applicationext.xmi" /> + <package uri="applicationclientext.xmi" /> + <package uri="ejbbnd.xmi" /> + <package uri="webappbnd.xmi" /> + <package uri="commonbnd.xmi" /> + <package uri="j2cbnd.xmi" /> + <package uri="clientbnd.xmi" /> + <package uri="applicationbnd.xmi" /> + <package uri="ejbrdbmapping.xmi" /> + <package uri="http:///ejbrdbmapping.ecore " /> + </emfEnablement> --> + <commonSorter + class="org.eclipse.jst.j2ee.navigator.internal.J2EEViewerSorter" + id="org.eclipse.jst.navigator.j2ee.ui.J2EEContent"> + <parentExpression> + <or> + <instanceof + value="org.eclipse.jst.j2ee.internal.provider.J2EEItemProvider" /> + <instanceof + value="org.eclipse.emf.ecore.EObject" /> + <instanceof + value="org.eclipse.core.resources.IWorkspaceRoot" /> + </or> + </parentExpression> + </commonSorter> + <actionProvider + class="org.eclipse.jst.j2ee.navigator.internal.J2EEActionProvider" + id="org.eclipse.jst.j2ee.navigator.ui.J2EEActionProvider" + dependsOn="org.eclipse.ui.navigator.resources.OpenActions"> + <enablement> + <or> + <instanceof value="org.eclipse.emf.ecore.EObject" /> + </or> + </enablement> + </actionProvider> + <actionProvider + class="org.eclipse.ui.navigator.resources.internal.actions.NewActionProvider" + id="org.eclipse.jst.j2ee.navigator.ui.NewActionsJ2EE" + dependsOn="org.eclipse.ui.navigator.resources.NewActions"> + <enablement> + <or> + <instanceof value="org.eclipse.jst.j2ee.internal.provider.J2EEItemProvider"/> + </or> + </enablement> + </actionProvider> --> + </navigatorContent> + <!-- EJB New --> + <commonWizard + type="new" + wizardId="org.eclipse.jst.ejb.ui.project.facet.EjbProjectWizard"> + <enablement> + <or> + <instanceof value="org.eclipse.core.resources.IWorkspaceRoot"/> + <and> + <instanceof value="org.eclipse.core.resources.IProject"/> + <or> + <test property="org.eclipse.core.resources.projectNature" + value="org.eclipse.wst.common.modulecore.ModuleCoreNature"/> + </or> + </and> + <instanceof value="org.eclipse.jst.j2ee.application.Application"/> + <instanceof value="org.eclipse.jst.j2ee.internal.provider.ModulesItemProvider"/> + <instanceof value="org.eclipse.jst.j2ee.application.Module"/> + </or> + </enablement> + </commonWizard> + <!-- EJB Import --> + <commonWizard + type="import" + wizardId="org.eclipse.jst.ejb.ui.internal.wizard.EJBComponentImportWizard"> + <enablement> + <or> + <instanceof value="org.eclipse.core.resources.IWorkspaceRoot"/> + <and> + <instanceof value="org.eclipse.core.resources.IProject"/> + <or> + <test property="org.eclipse.core.resources.projectNature" + value="org.eclipse.wst.common.modulecore.ModuleCoreNature"/> + </or> + </and> + <instanceof value="org.eclipse.jst.j2ee.ejb.EJBJar"/> + <instanceof value="org.eclipse.jst.j2ee.internal.ejb.provider.GroupedEJBItemProvider"/> + <instanceof value="org.eclipse.jst.j2ee.application.Application"/> + <instanceof value="org.eclipse.jst.j2ee.internal.provider.ModulesItemProvider"/> + <instanceof value="org.eclipse.jst.j2ee.application.Module"/> + </or> + </enablement> + </commonWizard> + <!-- EJB Export --> + <commonWizard + type="export" + wizardId="org.eclipse.jst.ejb.ui.internal.wizard.EJBComponentExportWizard"> + <enablement> + <or> + <instanceof value="org.eclipse.core.resources.IWorkspaceRoot"/> + <and> + <instanceof value="org.eclipse.core.resources.IProject"/> + <or> + <test property="org.eclipse.wst.common.project.facet.core.projectFacet" + value="jst.ejb"/> + </or> + </and> + <instanceof value="org.eclipse.jst.j2ee.ejb.EJBJar"/> + <instanceof value="org.eclipse.jst.j2ee.internal.ejb.provider.GroupedEJBItemProvider"/> + </or> + </enablement> + </commonWizard> + <!-- Add Enterprise Bean --> + <commonWizard + type="new" + wizardId="org.eclipse.jst.j2ee.ejb.annotation.ui.internal.wizards.AddEjbWizard"> + <enablement> + <or> + <and> + <instanceof value="org.eclipse.core.resources.IProject"/> + <test property="org.eclipse.wst.common.project.facet.core.projectFacet" + value="jst.ejb"/> + </and> + <instanceof value="org.eclipse.jst.j2ee.ejb.EJBJar"/> + <instanceof value="org.eclipse.jst.j2ee.internal.ejb.provider.GroupedEJBItemProvider"/> + </or> + </enablement> + </commonWizard> + <!-- Connector New --> + <commonWizard + type="new" + wizardId="org.eclipse.jst.j2ee.jca.ui.internal.wizard.ConnectorProjectWizard"> + <enablement> + <or> + <instanceof value="org.eclipse.core.resources.IWorkspaceRoot"/> + <and> + <instanceof value="org.eclipse.core.resources.IProject"/> + <or> + <test property="org.eclipse.core.resources.projectNature" + value="org.eclipse.wst.common.modulecore.ModuleCoreNature"/> + </or> + </and> + <instanceof value="org.eclipse.jst.j2ee.application.Application"/> + <instanceof value="org.eclipse.jst.j2ee.internal.provider.ModulesItemProvider"/> + <instanceof value="org.eclipse.jst.j2ee.application.Module"/> + </or> + </enablement> + </commonWizard> + <!-- Connector import --> + <commonWizard + type="import" + wizardId="org.eclipse.jst.j2ee.jca.ui.internal.wizard.ConnectorComponentImportWizard"> + <enablement> + <or> + <instanceof value="org.eclipse.core.resources.IWorkspaceRoot"/> + <and> + <instanceof value="org.eclipse.core.resources.IProject"/> + <or> + <test property="org.eclipse.core.resources.projectNature" + value="org.eclipse.wst.common.modulecore.ModuleCoreNature"/> + </or> + </and> + <instanceof value="org.eclipse.jst.j2ee.jca.Connector"/> + <instanceof value="org.eclipse.jst.j2ee.application.Application"/> + <instanceof value="org.eclipse.jst.j2ee.internal.provider.ModulesItemProvider"/> + <instanceof value="org.eclipse.jst.j2ee.application.Module"/> + <instanceof value="org.eclipse.jst.j2ee.jca.internal.impl.ResourceAdapterImpl"/> + </or> + </enablement> + </commonWizard> + <!-- Connector Export --> + <commonWizard + type="export" + wizardId="org.eclipse.jst.j2ee.jca.ui.internal.wizard.ConnectorComponentExportWizard"> + <enablement> + <or> + <instanceof value="org.eclipse.core.resources.IWorkspaceRoot"/> + <and> + <instanceof value="org.eclipse.core.resources.IProject"/> + <or> + <test property="org.eclipse.wst.common.project.facet.core.projectFacet" + value="jst.connector"/> + </or> + </and> + <instanceof value="org.eclipse.jst.j2ee.jca.Connector"/> + <instanceof value="org.eclipse.jst.j2ee.jca.internal.impl.ResourceAdapterImpl"/> + </or> + </enablement> + </commonWizard> + <!-- Web New --> + <commonWizard + type="new" + wizardId="org.eclipse.jst.servlet.ui.project.facet.WebProjectWizard"> + <enablement> + <or> + <instanceof value="org.eclipse.core.resources.IWorkspaceRoot"/> + <and> + <instanceof value="org.eclipse.core.resources.IProject"/> + <or> + <test property="org.eclipse.core.resources.projectNature" + value="org.eclipse.wst.common.modulecore.ModuleCoreNature"/> + </or> + </and> + <instanceof value="org.eclipse.jst.j2ee.application.Application"/> + <instanceof value="org.eclipse.jst.j2ee.application.Module"/> + <instanceof value="org.eclipse.jst.j2ee.internal.provider.ModulesItemProvider"/> + </or> + </enablement> + </commonWizard> + <!-- New Servlet --> + <commonWizard + type="new" + wizardId="org.eclipse.jst.servlet.ui.internal.wizard.AddServletWizard"> + <enablement> + <or> + <instanceof value="org.eclipse.core.resources.IWorkspaceRoot"/> + <and> + <instanceof value="org.eclipse.core.resources.IProject"/> + <or> + <or> + <test property="org.eclipse.wst.common.project.facet.core.projectFacet" + value="jst.web"/> + </or> + </or> + </and> + <instanceof value="org.eclipse.jst.j2ee.application.Module"/> + <instanceof value="org.eclipse.jst.j2ee.internal.provider.ModulesItemProvider"/> + <instanceof value="org.eclipse.jst.j2ee.webapplication.WebApp"/> + <instanceof value="org.eclipse.jst.j2ee.internal.war.ui.util.WebServletGroupItemProvider"/> + </or> + </enablement> + </commonWizard> + <!-- Web Import --> + <commonWizard + type="import" + wizardId="org.eclipse.jst.servlet.ui.internal.wizard.WebComponentImportWizard"> + <enablement> + <or> + <instanceof value="org.eclipse.core.resources.IWorkspaceRoot"/> + <and> + <instanceof value="org.eclipse.core.resources.IProject"/> + <or> + <test property="org.eclipse.core.resources.projectNature" + value="org.eclipse.wst.common.modulecore.ModuleCoreNature"/> + </or> + </and> + <instanceof value="org.eclipse.jst.j2ee.application.Module"/> + <instanceof value="org.eclipse.jst.j2ee.internal.provider.ModulesItemProvider"/> + <instanceof value="org.eclipse.jst.j2ee.webapplication.WebApp"/> + <instanceof value="org.eclipse.jst.j2ee.application.Application"/> + <instanceof value="org.eclipse.jst.j2ee.internal.war.ui.util.WebGroupItemProvider"/> + </or> + </enablement> + </commonWizard> + <!-- Web Export --> + <commonWizard + type="export" + wizardId="org.eclipse.jst.servlet.ui.internal.wizard.WebComponentExportWizard"> + <enablement> + <or> + <instanceof value="org.eclipse.core.resources.IWorkspaceRoot"/> + <and> + <instanceof value="org.eclipse.core.resources.IProject"/> + <or> + <test property="org.eclipse.wst.common.project.facet.core.projectFacet" + value="jst.web"/> + </or> + </and> + <instanceof value="org.eclipse.jst.j2ee.webapplication.WebApp"/> + <instanceof value="org.eclipse.jst.j2ee.internal.war.ui.util.WebGroupItemProvider"/> + </or> + </enablement> + </commonWizard> + <!-- EAR New --> + <commonWizard + type="new" + wizardId="org.eclipse.jst.j2ee.ui.project.facet.EarProjectWizard"> + <enablement> + <or> + <instanceof value="org.eclipse.core.resources.IWorkspaceRoot"/> + <and> + <instanceof value="org.eclipse.core.resources.IProject"/> + <or> + <test property="org.eclipse.core.resources.projectNature" + value="org.eclipse.wst.common.modulecore.ModuleCoreNature"/> + </or> + </and> + </or> + </enablement> + </commonWizard> + <!-- AppClient New --> + <commonWizard + type="new" + wizardId="org.eclipse.jst.j2ee.ui.project.facet.appclient.AppClientProjectWizard"> + <enablement> + <or> + <instanceof value="org.eclipse.core.resources.IWorkspaceRoot"/> + <and> + <instanceof value="org.eclipse.core.resources.IProject"/> + <or> + <test property="org.eclipse.core.resources.projectNature" + value="org.eclipse.wst.common.modulecore.ModuleCoreNature"/> + </or> + </and> + <instanceof value="org.eclipse.jst.j2ee.application.Application"/> + <instanceof value="org.eclipse.jst.j2ee.internal.provider.ModulesItemProvider"/> + <instanceof value="org.eclipse.jst.j2ee.application.Module"/> + </or> + </enablement> + </commonWizard> + <!-- EAR Import --> + <commonWizard + type="import" + wizardId="org.eclipse.jst.j2ee.internal.wizard.EARComponentImportWizard"> + <enablement> + <or> + <instanceof value="org.eclipse.core.resources.IWorkspaceRoot"/> + <and> + <instanceof value="org.eclipse.core.resources.IProject"/> + <or> + <test property="org.eclipse.core.resources.projectNature" + value="org.eclipse.wst.common.modulecore.ModuleCoreNature"/> + </or> + </and> + </or> + </enablement> + </commonWizard> + <!-- App Client Import --> + <commonWizard + type="import" + wizardId="org.eclipse.jst.j2ee.internal.wizard.AppClientComponentImportWizard"> + <enablement> + <or> + <instanceof value="org.eclipse.core.resources.IWorkspaceRoot"/> + <and> + <instanceof value="org.eclipse.core.resources.IProject"/> + <or> + <test property="org.eclipse.core.resources.projectNature" + value="org.eclipse.wst.common.modulecore.ModuleCoreNature"/> + </or> + </and> + <instanceof value="org.eclipse.jst.j2ee.client.ApplicationClient"/> + <instanceof value="org.eclipse.jst.j2ee.application.Application"/> + <instanceof value="org.eclipse.jst.j2ee.internal.provider.ModulesItemProvider"/> + <instanceof value="org.eclipse.jst.j2ee.application.Module"/> + </or> + </enablement> + </commonWizard> + <!-- Utility Jar Import --> + <!-- <commonWizard + type="import" + wizardId="org.eclipse.jst.j2ee.ui.J2EEUtilityJarImportWizard"> + <enablement> + <or> + <objectClass + name="org.eclipse.jst.j2ee.internal.provider.J2EEUtilityJarItemProvider"> + </objectClass> + <objectClass + name="org.eclipse.jst.j2ee.internal.earcreation.modulemap.EARProjectMapImpl"> + </objectClass> + <objectClass + name="org.eclipse.core.resources.IWorkspaceRoot"> + </objectClass> + <and> + <objectClass + name="org.eclipse.core.resources.IProject"> + </objectClass> + <or> + <objectState + name="projectNature" + value="org.eclipse.jst.j2ee.EARNature"> + </objectState> + </or> + </and> + <objectClass + name="org.eclipse.jst.j2ee.internal.application.impl.ApplicationImpl"> + </objectClass> + <objectClass + name="org.eclipse.jst.j2ee.internal.provider.ModulesItemProvider"> + </objectClass> + <objectClass + name="org.eclipse.jst.j2ee.internal.application.impl.ModuleImpl"> + </objectClass> + </or> + </enablement> + </commonWizard> --> + <!-- EAR export --> + <commonWizard + type="export" + wizardId="org.eclipse.jst.j2ee.internal.wizard.EARComponentExportWizard"> + <enablement> + <or> + <instanceof value="org.eclipse.core.resources.IWorkspaceRoot"/> + <and> + <instanceof value="org.eclipse.core.resources.IProject"/> + <or> + <test property="org.eclipse.wst.common.project.facet.core.projectFacet" + value="jst.ear"/> + </or> + </and> + <instanceof value="org.eclipse.jst.j2ee.application.Application"/> + <instanceof value="org.eclipse.jst.j2ee.internal.provider.ModulesItemProvider"/> + <instanceof value="org.eclipse.jst.j2ee.application.Module"/> + </or> + </enablement> + </commonWizard> + <!-- App Client export --> + <commonWizard + type="export" + wizardId="org.eclipse.jst.j2ee.internal.wizard.AppClientComponentExportWizard"> + <enablement> + <or> + <instanceof value="org.eclipse.core.resources.IWorkspaceRoot"/> + <and> + <instanceof value="org.eclipse.core.resources.IProject"/> + <or> + <test property="org.eclipse.wst.common.project.facet.core.projectFacet" + value="jst.appclient"/> + </or> + </and> + <instanceof value="org.eclipse.jst.j2ee.client.ApplicationClient"/> + </or> + </enablement> + </commonWizard> + </extension> + + <extension + point = "org.eclipse.ui.navigator.viewer"> + <viewerContentBinding + viewerId="org.eclipse.wst.common.explorer.CommonProjectExplorer"> + <includes> + <contentExtension pattern="org.eclipse.jst.navigator.j2ee.ui.J2EEContent"/> + </includes> + </viewerContentBinding> + </extension> + + <extension + point="org.eclipse.core.runtime.adapters"> + <factory + class="org.eclipse.jst.j2ee.navigator.internal.J2EEEMFAdapterFactory" + adaptableType="org.eclipse.jst.j2ee.ejb.EJBJar"> + <adapter type="org.eclipse.core.resources.IFile"/> + </factory> + <factory + class="org.eclipse.jst.j2ee.navigator.internal.J2EEEMFAdapterFactory" + adaptableType="org.eclipse.jst.j2ee.webapplication.WebApp"> + <adapter type="org.eclipse.core.resources.IFile"/> + </factory> + <factory + class="org.eclipse.jst.j2ee.navigator.internal.J2EEEMFAdapterFactory" + adaptableType="org.eclipse.jst.j2ee.client.ApplicationClient"> + <adapter type="org.eclipse.core.resources.IFile"/> + </factory> + <factory + class="org.eclipse.jst.j2ee.navigator.internal.J2EEEMFAdapterFactory" + adaptableType="org.eclipse.jst.j2ee.jca.Connector"> + <adapter type="org.eclipse.core.resources.IFile"/> + </factory> + <factory + class="org.eclipse.jst.j2ee.navigator.internal.J2EEEMFAdapterFactory" + adaptableType="org.eclipse.jst.j2ee.application.Application"> + <adapter type="org.eclipse.core.resources.IFile"/> + </factory> + </extension> + +<!-- <extension + point="org.eclipse.wst.common.navigator.views.actionProvider"> + <actionProvider + class="org.eclipse.jst.common.navigator.internal.actions.OpenActionsExtension" > + <enablement> + <or> + <objectClass + adaptable="true" + name="org.eclipse.jst.j2ee.navigator.internal.workingsets.ComponentWorkingSet" /> + </or> + </enablement> + </actionProvider> + </extension> --> + <!-- =========================================================================== --> +<!-- Component Working Set --> +<!-- =========================================================================== --> +<!-- <extension + point="org.eclipse.ui.workingSets"> + <workingSet + name="Component" + updaterClass="org.eclipse.jst.j2ee.navigator.internal.workingsets.ComponentWorkingSetUpdater" + icon="icons/J2EEPerspective.gif" + id="org.eclipse.jst.j2ee.navigator.ui.ComponentWorkingSetPage"> + </workingSet> + </extension> + + <extension + point="org.eclipse.jst.j2ee.navigator.ui.componentWorkingSet"> + <componentWorkingSet + id = "org.eclipse.jst.j2ee.navigator.ui.ComponentWorkingSetPage" + typeId = "jst.ejb" + icon = "icons/ejbgroup_obj.gif" + label = "%EJB_Projects"> + </componentWorkingSet> + </extension> + <extension + point="org.eclipse.jst.j2ee.navigator.ui.componentWorkingSet"> + <componentWorkingSet + id = "org.eclipse.jst.j2ee.navigator.ui.ComponentWorkingSetPage" + typeId = "jst.web" + icon = "icons/webgroup_obj.gif" + label = "%Web_Projects"> + </componentWorkingSet> + </extension> + <extension + point="org.eclipse.jst.j2ee.navigator.ui.componentWorkingSet"> + <componentWorkingSet + id = "org.eclipse.jst.j2ee.navigator.ui.ComponentWorkingSetPage" + typeId = "jst.ear" + icon = "icons/eargroup_obj.gif" + label = "%Enterprise_Applications"> + </componentWorkingSet> + </extension> + + <extension + point="org.eclipse.jst.j2ee.navigator.ui.componentWorkingSet"> + <componentWorkingSet + id = "org.eclipse.jst.j2ee.navigator.ui.ComponentWorkingSetPage" + typeId = "jst.appclient" + icon = "icons/appclientgroup_obj.gif" + label = "%Application_Client_Projects"> + </componentWorkingSet> + </extension> + + <extension + point="org.eclipse.jst.j2ee.navigator.ui.componentWorkingSet"> + <componentWorkingSet + id = "org.eclipse.jst.j2ee.navigator.ui.ComponentWorkingSetPage" + typeId = "jst.connector" + icon = "icons/connectorgroup_obj.gif" + label = "%Connector_Projects"> + </componentWorkingSet> + </extension> + + <extension + point="org.eclipse.jst.common.navigator.java.workingSetProviders"> + <workingSetProviders + class="org.eclipse.jst.j2ee.navigator.internal.workingsets.ComponentWorkingSetProvider"> + </workingSetProviders> + </extension> + <extension + point="org.eclipse.ui.elementFactories"> + <factory + class="org.eclipse.jst.j2ee.navigator.internal.workingsets.ComponentWorkingSetFactory" + id="org.eclipse.jst.j2ee.navigator.internal.workingsets.ComponentWorkingSetFactory"/> + </extension> +--> +<!-- =========================================================================== --> +<!-- Adding the New to the Component Working Sets --> +<!-- =========================================================================== --> + +<!-- + <extension + point="org.eclipse.wst.common.navigator.workbench.commonWizard"> --> + <!-- EAR New --> + <!-- <commonWizard + type="new" + wizardId="org.eclipse.jst.j2ee.ui.project.facet.EarProjectWizard"> + <enablement> + <or> + <and> + <objectClass + name="org.eclipse.jst.j2ee.navigator.internal.workingsets.ComponentWorkingSet"> + </objectClass> + <objectState + name="componentTypeId" + value="jst.ear"> + </objectState> + + </and> + </or> + </enablement> + </commonWizard> --> + <!-- AppClient New --> + <!-- <commonWizard + type="new" + wizardId="org.eclipse.jst.j2ee.ui.project.facet.appclient.AppClientProjectWizard"> + <enablement> + <or> + <and> + <objectClass + name="org.eclipse.jst.j2ee.navigator.internal.workingsets.ComponentWorkingSet"> + </objectClass> + <objectState + name="componentTypeId" + value="jst.appclient"> + </objectState> + + </and> + </or> + </enablement> + </commonWizard> + <commonWizard + type="new" + wizardId="org.eclipse.jst.servlet.ui.project.facet.WebProjectWizard"> + <enablement> + <or> + <and> + <objectClass + name="org.eclipse.jst.j2ee.navigator.internal.workingsets.ComponentWorkingSet"> + </objectClass> + <objectState + name="componentTypeId" + value="jst.web"> + </objectState> + </and> + </or> + </enablement> + </commonWizard> --> + <!-- Connector New --> +<!-- <commonWizard + type="new" + wizardId="org.eclipse.jst.j2ee.jca.ui.internal.wizard.ConnectorProjectWizard"> + <enablement> + <or> + <and> + <objectClass + name="org.eclipse.jst.j2ee.navigator.internal.workingsets.ComponentWorkingSet"> + </objectClass> + <objectState + name="componentTypeId" + value="jst.connector"> + </objectState> + </and> + </or> + </enablement> + </commonWizard> --> + <!-- EJB New --> +<!-- <commonWizard + type="new" + wizardId="org.eclipse.jst.ejb.ui.project.facet.EjbProjectWizard"> + <enablement> + <or> + <and> + <objectClass + name="org.eclipse.jst.j2ee.navigator.internal.workingsets.ComponentWorkingSet"> + </objectClass> + <objectState + name="componentTypeId" + value="jst.ejb"> + </objectState> + </and> + </or> + </enablement> + </commonWizard> + + </extension> + + --> + + <!-- <extension-point id="componentWorkingSet" name="Component Working Set" schema="schema/componentWorkingSet.exsd"/> + --> +<!-- Drop Adapter for Adding Modules to EARs --> + <!-- <extension id="org.eclipse.jst.j2ee.internal.ui.navigator.addModule.dropHandler" point="org.eclipse.wst.common.navigator.views.dropHandler"> <dropHandler @@ -94,9 +778,9 @@ </serializer> </serializers> </dropHandler> - </extension> + </extension> --> <!-- Drop Adapter for Adding Utility Jars to EARs --> - <extension +<!-- <extension id="org.eclipse.jst.navigator.j2ee.dnd.addUtilityJar.dropHandler" point="org.eclipse.wst.common.navigator.views.dropHandler"> <dropHandler @@ -248,290 +932,7 @@ </dropEnablement> </dropHandler> </extension> - - <extension - point="org.eclipse.wst.common.navigator.views.navigatorContent"> - <navigatorContent - name="%extension.j2ee.name" - priority="higher" - icon="icons/J2EEPerspective.gif" - contentProvider="org.eclipse.jst.j2ee.navigator.internal.J2EEContentProvider" - labelProvider="org.eclipse.jst.j2ee.navigator.internal.J2EELabelProvider" - actionProvider="org.eclipse.jst.j2ee.navigator.internal.J2EEActionProvider" - openListener="org.eclipse.jst.j2ee.internal.actions.J2EEResourceOpenListener" - id="org.eclipse.jst.navigator.j2ee.ui.J2EEContent.experimental"> - <enables> - <or> - <and> - <objectClass - name="org.eclipse.core.resources.IProject"> - </objectClass> - <or> - <objectState - name="nature" - value="org.eclipse.wst.common.modulecore.ModuleCoreNature"> - </objectState> - - </or> - </and> - <objectClass name="org.eclipse.jst.j2ee.internal.ejb.provider.J2EEJavaClassProviderHelper" /> - </or> - </enables> - - <emfEnablement> - <package uri="org.eclipse.emf.ecore.resource" /> - <package uri="common.xmi" /> - <package uri="application.xmi" /> - <package uri="client.xmi" /> - <package uri="modulemap.xmi" /> - <package uri="ejb.xmi" /> - <package uri="jca.xmi" /> - <package uri="webapplication.xmi" /> - <package uri="jsp.xmi" /> - <package uri="commonext.xmi" /> - <package uri="localtran.xmi" /> - <package uri="ejbext.xmi" /> - <package uri="webappext.xmi" /> - <package uri="applicationext.xmi" /> - <package uri="applicationclientext.xmi" /> - <package uri="ejbbnd.xmi" /> - <package uri="webappbnd.xmi" /> - <package uri="commonbnd.xmi" /> - <package uri="j2cbnd.xmi" /> - <package uri="clientbnd.xmi" /> - <package uri="applicationbnd.xmi" /> - <package uri="ejbrdbmapping.xmi" /> - - </emfEnablement> - </navigatorContent> - </extension> - - <extension - point="org.eclipse.wst.common.navigator.views.actionProvider"> - <actionProvider - class="org.eclipse.jst.common.navigator.internal.actions.OpenActionsExtension" > - <enablement> - <or> - <objectClass - adaptable="true" - name="org.eclipse.emf.ecore.EObject" /> - <objectClass - adaptable="true" - name="org.eclipse.emf.edit.provider.ItemProvider" /> - </or> - </enablement> - </actionProvider> - </extension> - - <extension - point="org.eclipse.wst.common.navigator.views.actionProvider"> - <actionProvider - class="org.eclipse.wst.common.navigator.internal.actions.PortingActionExtension"> - <enablement> - <or> - <objectClass - adaptable="true" - name="org.eclipse.emf.ecore.EObject" /> - <objectClass - adaptable="true" - name="org.eclipse.emf.edit.provider.ItemProvider" /> - <objectClass - adaptable="true" - name="org.eclipse.jst.j2ee.navigator.internal.workingsets.ComponentWorkingSet" /> - </or> - </enablement> - </actionProvider> - </extension> - <!-- =========================================================================== --> -<!-- Component Working Set --> -<!-- =========================================================================== --> - <extension - point="org.eclipse.ui.workingSets"> - <workingSet - name="Component" - updaterClass="org.eclipse.jst.j2ee.navigator.internal.workingsets.ComponentWorkingSetUpdater" - icon="icons/J2EEPerspective.gif" - id="org.eclipse.jst.j2ee.navigator.ui.ComponentWorkingSetPage"> - </workingSet> - </extension> - - <extension - point="org.eclipse.jst.j2ee.navigator.ui.componentWorkingSet"> - <componentWorkingSet - id = "org.eclipse.jst.j2ee.navigator.ui.ComponentWorkingSetPage" - typeId = "jst.ejb" - icon = "icons/ejbgroup_obj.gif" - label = "%EJB_Projects"> - </componentWorkingSet> - </extension> - <extension - point="org.eclipse.jst.j2ee.navigator.ui.componentWorkingSet"> - <componentWorkingSet - id = "org.eclipse.jst.j2ee.navigator.ui.ComponentWorkingSetPage" - typeId = "jst.web" - icon = "icons/webgroup_obj.gif" - label = "%Web_Projects"> - </componentWorkingSet> - </extension> - <extension - point="org.eclipse.jst.j2ee.navigator.ui.componentWorkingSet"> - <componentWorkingSet - id = "org.eclipse.jst.j2ee.navigator.ui.ComponentWorkingSetPage" - typeId = "jst.ear" - icon = "icons/eargroup_obj.gif" - label = "%Enterprise_Applications"> - </componentWorkingSet> - </extension> - - <extension - point="org.eclipse.jst.j2ee.navigator.ui.componentWorkingSet"> - <componentWorkingSet - id = "org.eclipse.jst.j2ee.navigator.ui.ComponentWorkingSetPage" - typeId = "jst.appclient" - icon = "icons/appclientgroup_obj.gif" - label = "%Application_Client_Projects"> - </componentWorkingSet> - </extension> - - <extension - point="org.eclipse.jst.j2ee.navigator.ui.componentWorkingSet"> - <componentWorkingSet - id = "org.eclipse.jst.j2ee.navigator.ui.ComponentWorkingSetPage" - typeId = "jst.connector" - icon = "icons/connectorgroup_obj.gif" - label = "%Connector_Projects"> - </componentWorkingSet> - </extension> - - <extension - point="org.eclipse.jst.common.navigator.java.workingSetProviders"> - <workingSetProviders - class="org.eclipse.jst.j2ee.navigator.internal.workingsets.ComponentWorkingSetProvider"> - </workingSetProviders> - </extension> - <extension - point="org.eclipse.ui.elementFactories"> - <factory - class="org.eclipse.jst.j2ee.navigator.internal.workingsets.ComponentWorkingSetFactory" - id="org.eclipse.jst.j2ee.navigator.internal.workingsets.ComponentWorkingSetFactory"/> - </extension> - -<!-- =========================================================================== --> -<!-- Adding the New to the Component Working Sets --> -<!-- =========================================================================== --> - - <extension - point="org.eclipse.wst.common.navigator.views.actionProvider"> - <actionProvider - class="org.eclipse.jst.common.navigator.internal.actions.OpenActionsExtension" > - <enablement> - <or> - <objectClass - adaptable="true" - name="org.eclipse.jst.j2ee.navigator.internal.workingsets.ComponentWorkingSet" /> - </or> - </enablement> - </actionProvider> - </extension> - - - <extension - point="org.eclipse.wst.common.navigator.workbench.commonWizard"> - <!-- EAR New --> - <commonWizard - type="new" - wizardId="org.eclipse.jst.j2ee.ui.project.facet.EarProjectWizard"> - <enablement> - <or> - <and> - <objectClass - name="org.eclipse.jst.j2ee.navigator.internal.workingsets.ComponentWorkingSet"> - </objectClass> - <objectState - name="componentTypeId" - value="jst.ear"> - </objectState> - - </and> - </or> - </enablement> - </commonWizard> - <!-- AppClient New --> - <commonWizard - type="new" - wizardId="org.eclipse.jst.j2ee.ui.project.facet.appclient.AppClientProjectWizard"> - <enablement> - <or> - <and> - <objectClass - name="org.eclipse.jst.j2ee.navigator.internal.workingsets.ComponentWorkingSet"> - </objectClass> - <objectState - name="componentTypeId" - value="jst.appclient"> - </objectState> - - </and> - </or> - </enablement> - </commonWizard> - <commonWizard - type="new" - wizardId="org.eclipse.jst.servlet.ui.project.facet.WebProjectWizard"> - <enablement> - <or> - <and> - <objectClass - name="org.eclipse.jst.j2ee.navigator.internal.workingsets.ComponentWorkingSet"> - </objectClass> - <objectState - name="componentTypeId" - value="jst.web"> - </objectState> - </and> - </or> - </enablement> - </commonWizard> - <!-- Connector New --> - <commonWizard - type="new" - wizardId="org.eclipse.jst.j2ee.jca.ui.internal.wizard.ConnectorProjectWizard"> - <enablement> - <or> - <and> - <objectClass - name="org.eclipse.jst.j2ee.navigator.internal.workingsets.ComponentWorkingSet"> - </objectClass> - <objectState - name="componentTypeId" - value="jst.connector"> - </objectState> - </and> - </or> - </enablement> - </commonWizard> - <!-- EJB New --> - <commonWizard - type="new" - wizardId="org.eclipse.jst.ejb.ui.project.facet.EjbProjectWizard"> - <enablement> - <or> - <and> - <objectClass - name="org.eclipse.jst.j2ee.navigator.internal.workingsets.ComponentWorkingSet"> - </objectClass> - <objectState - name="componentTypeId" - value="jst.ejb"> - </objectState> - </and> - </or> - </enablement> - </commonWizard> - - </extension> - - + --> </plugin>
diff --git a/plugins/org.eclipse.jst.j2ee.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee.ui/META-INF/MANIFEST.MF index 4ade763..70a245a 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.jst.j2ee.ui/META-INF/MANIFEST.MF
@@ -51,7 +51,6 @@ org.eclipse.ltk.core.refactoring, org.eclipse.jface.text, org.eclipse.wst.web, - org.eclipse.wst.common.navigator.workbench, org.eclipse.debug.ui, org.eclipse.ui.editors, org.eclipse.ui.workbench.texteditor, @@ -65,5 +64,6 @@ org.eclipse.wst.common.project.facet.core, org.eclipse.wst.common.project.facet.ui, org.eclipse.jst.server.core, - org.eclipse.wst.web.ui + org.eclipse.wst.web.ui, + org.eclipse.ui.navigator.resources Eclipse-AutoStart: true
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/AbstractOpenAction.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/AbstractOpenAction.java index 249a671..f408521 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/AbstractOpenAction.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/AbstractOpenAction.java
@@ -41,9 +41,9 @@ protected void setAttributesFromDescriptor() { if (currentDescriptor == null) return; - setText(currentDescriptor.getLabel()); + //setText(currentDescriptor.getLabel()); setToolTipText(currentDescriptor.getLabel()); - setImageDescriptor(currentDescriptor.getImageDescriptor()); + //setImageDescriptor(currentDescriptor.getImageDescriptor()); } /**
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/OpenJ2EEResourceAction.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/OpenJ2EEResourceAction.java index e6f9ad9..d000a2e 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/OpenJ2EEResourceAction.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/OpenJ2EEResourceAction.java
@@ -61,7 +61,7 @@ * Create an instance of this class */ public OpenJ2EEResourceAction() { - super(""); //$NON-NLS-1$ + super("Open"); //$NON-NLS-1$ } /**
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/perspective/J2EEPerspective.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/perspective/J2EEPerspective.java index f9fc213..122cd56 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/perspective/J2EEPerspective.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/perspective/J2EEPerspective.java
@@ -30,8 +30,7 @@ public class J2EEPerspective implements org.eclipse.ui.IPerspectiveFactory { protected static String ID_SERVERS_VIEW = "org.eclipse.wst.server.ui.ServersView"; //$NON-NLS-1$ - //protected static String ID_J2EE_HIERARCHY_VIEW = "org.eclipse.wst.navigator.ui.WTPCommonNavigator"; //$NON-NLS-1$ - protected static String ID_J2EE_HIERARCHY_VIEW = "org.eclipse.wst.navigator.ui.WTPWorkingSetCommonNavigator"; //$NON-NLS-1$ + protected static String ID_J2EE_HIERARCHY_VIEW = "org.eclipse.wst.common.explorer.CommonProjectExplorer"; //$NON-NLS-1$ private static String ID_WST_SNIPPETS_VIEW = "org.eclipse.wst.common.snippets.internal.ui.SnippetsView"; //$NON-NLS-1$ private static String ID_EJB_PROJECT_WIZARD = "org.eclipse.jst.ejb.ui.EJBComponentCreationWizard"; //$NON-NLS-1$
diff --git a/plugins/org.eclipse.jst.j2ee.ui/plugin.xml b/plugins/org.eclipse.jst.j2ee.ui/plugin.xml index a10d97e..189dd23 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/plugin.xml +++ b/plugins/org.eclipse.jst.j2ee.ui/plugin.xml
@@ -121,7 +121,7 @@ name="%client.jar.file_ui_" icon="icons/full/ctool16/appclient_import_wiz.gif" class="org.eclipse.jst.j2ee.internal.wizard.AppClientComponentImportWizard" - id="org.eclipse.jst.j2ee.ui.AppClientModuleImportWizardNew"> + id="org.eclipse.jst.j2ee.internal.wizard.AppClientComponentImportWizard"> <description> %client.import.description_ui_ </description> @@ -133,7 +133,7 @@ name="%ear.file_ui_" icon="icons/full/ctool16/import_ear.gif" class="org.eclipse.jst.j2ee.internal.wizard.EARComponentImportWizard" - id="org.eclipse.jst.j2ee.ui.EnterpriseApplicationImportWizardNew"> + id="org.eclipse.jst.j2ee.internal.wizard.EARComponentImportWizard"> <description> %ear.import.description_ui_ </description> @@ -172,7 +172,7 @@ name="%client.jar.file_ui_" icon="icons/full/ctool16/appclient_export.gif" class="org.eclipse.jst.j2ee.internal.wizard.AppClientComponentExportWizard" - id="org.eclipse.jst.j2ee.ui.AppClientModuleExportWizard"> + id="org.eclipse.jst.j2ee.internal.wizard.AppClientComponentExportWizard"> <description> %client.export.description_ui_ </description> @@ -184,7 +184,7 @@ name="%ear.file_ui_" icon="icons/full/ctool16/export_ear.gif" class="org.eclipse.jst.j2ee.internal.wizard.EARComponentExportWizard" - id="org.eclipse.jst.j2ee.ui.EnterpriseApplicationExportWizard"> + id="org.eclipse.jst.j2ee.internal.wizard.EARComponentExportWizard"> <description> %ear.export.description_ui_ </description> @@ -225,56 +225,6 @@ id="org.eclipse.ui.webProjectNatureImage"> </image> </extension> - -<!-- Navigator Object Contributions --> -<!-- EAR Group Contributions - <extension - point="org.eclipse.ui.popupMenus"> - <objectContribution - objectClass="org.eclipse.wst.common.navigator.internal.groups.NavigatorGroup" - id="org.eclipse.jst.j2ee.internal.ui.navigator.earNewProjectActions"> - <action - label="%ear.project_ui_" - icon="icons/full/ctool16/newear_wiz.gif" - class="org.eclipse.jst.j2ee.internal.actions.NewEARProjectAction" - menubarPath="org.eclipse.wst.common.frameworks.internal.navigator.new.menu/additions" - enablesFor="1" - id="org.eclipse.jst.j2ee.internal.ui.navigator.newEARAction"> - </action> - <visibility> - <objectState - name="projectNature" - value="org.eclipse.jst.j2ee.EARNature"> - </objectState> - </visibility> - </objectContribution> - </extension> - --> -<!-- Navigator Object Contributions --> -<!-- Application Client Group Contributions - <extension - point="org.eclipse.ui.popupMenus"> - <objectContribution - objectClass="org.eclipse.wst.common.navigator.internal.groups.NavigatorGroup" - id="org.eclipse.jst.j2ee.internal.ui.navigator.appClientNewProjectActions"> - <action - label="%appclient.project_ui_" - icon="icons/full/ctool16/newappclient_wiz.gif" - class="org.eclipse.jst.j2ee.internal.actions.NewApplClientProjectAction" - menubarPath="org.eclipse.wst.common.frameworks.internal.navigator.new.menu/additions" - enablesFor="1" - id="org.eclipse.jst.j2ee.internal.ui.navigator.newAppClientAction"> - </action> - <visibility> - <objectState - name="projectNature" - value="org.eclipse.jst.j2ee.ApplicationClientNature"> - </objectState> - </visibility> - </objectContribution> - </extension> - --> -<!-- Navigator Object Contributions --> <extension point="org.eclipse.wst.common.frameworks.ui.wtpuiAction"> @@ -340,7 +290,7 @@ id="org.eclipse.wst.navigator.ui.WTPCommonNavigator"> </view> --> <view - id="org.eclipse.wst.navigator.ui.WTPWorkingSetCommonNavigator"> + id="org.eclipse.wst.common.explorer.CommonProjectExplorer"> </view> </adapterFactory> <adapterFactory @@ -351,7 +301,7 @@ id="org.eclipse.wst.navigator.ui.WTPCommonNavigator"> </view> --> <view - id="org.eclipse.wst.navigator.ui.WTPWorkingSetCommonNavigator"> + id="org.eclipse.wst.common.explorer.CommonProjectExplorer"> </view> </adapterFactory> <adapterFactory @@ -362,7 +312,7 @@ id="org.eclipse.wst.navigator.ui.WTPCommonNavigator"> </view> --> <view - id="org.eclipse.wst.navigator.ui.WTPWorkingSetCommonNavigator"> + id="org.eclipse.wst.common.explorer.CommonProjectExplorer"> </view> </adapterFactory> <adapterFactory @@ -373,7 +323,7 @@ id="org.eclipse.wst.navigator.ui.WTPCommonNavigator"> </view> --> <view - id="org.eclipse.wst.navigator.ui.WTPWorkingSetCommonNavigator"> + id="org.eclipse.wst.common.explorer.CommonProjectExplorer"> </view> </adapterFactory> </extension> @@ -597,271 +547,6 @@ <perspectiveShortcut id="org.eclipse.jst.j2ee.J2EEPerspective"/> </perspectiveExtension> </extension> - - <extension - point="org.eclipse.wst.common.navigator.workbench.commonWizard"> - <!-- EAR New --> - <commonWizard - type="new" - wizardId="org.eclipse.jst.j2ee.internal.wizard.EARComponentCreationWizard"> - <enablement> - <or> - <objectClass - name="org.eclipse.core.resources.IWorkspaceRoot"> - </objectClass> - <and> - <objectClass - name="org.eclipse.core.resources.IProject"> - </objectClass> - <or> - <objectState - name="projectNature" - value="org.eclipse.wst.common.modulecore.ModuleCoreNature"> - </objectState> - </or> - </and> - </or> - </enablement> - </commonWizard> - <!-- AppClient New --> - <commonWizard - type="new" - wizardId="org.eclipse.jst.j2ee.ui.project.facet.appclient.AppClientProjectWizard"> - <enablement> - <or> - <objectClass - name="org.eclipse.core.resources.IWorkspaceRoot"> - </objectClass> - <and> - <objectClass - name="org.eclipse.core.resources.IProject"> - </objectClass> - <or> - <objectState - name="projectNature" - value="org.eclipse.wst.common.modulecore.ModuleCoreNature"> - </objectState> - </or> - </and> - <objectClass - name="org.eclipse.jst.j2ee.application.Application"> - </objectClass> - <objectClass - name="org.eclipse.jst.j2ee.internal.provider.ModulesItemProvider"> - </objectClass> - <objectClass - name="org.eclipse.jst.j2ee.application.Module"> - </objectClass> - - </or> - </enablement> - </commonWizard> - <!-- EAR Import --> - <!-- <commonWizard - type="import" - wizardId="org.eclipse.jst.j2ee.ui.EnterpriseApplicationImportWizard"> - <enablement> - <or> - <objectClass - name="org.eclipse.core.resources.IWorkspaceRoot"> - </objectClass> - <and> - <objectClass - name="org.eclipse.wst.common.navigator.internal.groups.NavigatorGroup"> - </objectClass> - <objectState - name="projectNature" - value="org.eclipse.jst.j2ee.EARNature"> - </objectState> - </and> - - </or> - </enablement> - </commonWizard> --> - <!-- App Client Import --> - <!-- <commonWizard - type="import" - wizardId="org.eclipse.jst.j2ee.ui.AppClientModuleImportWizard"> - <enablement> - <or> - <objectClass - name="org.eclipse.core.resources.IWorkspaceRoot"> - </objectClass> - <and> - <objectClass - name="org.eclipse.wst.common.navigator.internal.groups.NavigatorGroup"> - </objectClass> - <objectState - name="projectNature" - value="org.eclipse.jst.j2ee.ApplicationClientNature"> - </objectState> - </and> - <and> - <objectClass - name="org.eclipse.core.resources.IProject"> - </objectClass> - <or> - <objectState - name="projectNature" - value="org.eclipse.jst.j2ee.EARNature"> - </objectState> - <objectState - name="projectNature" - value="org.eclipse.jst.j2ee.ApplicationClientNature"> - </objectState> - </or> - </and> - <objectClass - name="org.eclipse.jst.j2ee.internal.client.impl.ApplicationClientImpl"> - </objectClass> - <objectClass - name="org.eclipse.jst.j2ee.internal.application.impl.ApplicationImpl"> - </objectClass> - <objectClass - name="org.eclipse.jst.j2ee.internal.provider.ModulesItemProvider"> - </objectClass> - <objectClass - name="org.eclipse.jst.j2ee.internal.application.impl.ModuleImpl"> - </objectClass> - </or> - </enablement> - </commonWizard> --> - <!-- Utility Jar Import --> - <!-- <commonWizard - type="import" - wizardId="org.eclipse.jst.j2ee.ui.J2EEUtilityJarImportWizard"> - <enablement> - <or> - <objectClass - name="org.eclipse.jst.j2ee.internal.provider.J2EEUtilityJarItemProvider"> - </objectClass> - <objectClass - name="org.eclipse.jst.j2ee.internal.earcreation.modulemap.EARProjectMapImpl"> - </objectClass> - <objectClass - name="org.eclipse.core.resources.IWorkspaceRoot"> - </objectClass> - <and> - <objectClass - name="org.eclipse.core.resources.IProject"> - </objectClass> - <or> - <objectState - name="projectNature" - value="org.eclipse.jst.j2ee.EARNature"> - </objectState> - </or> - </and> - <objectClass - name="org.eclipse.jst.j2ee.internal.application.impl.ApplicationImpl"> - </objectClass> - <objectClass - name="org.eclipse.jst.j2ee.internal.provider.ModulesItemProvider"> - </objectClass> - <objectClass - name="org.eclipse.jst.j2ee.internal.application.impl.ModuleImpl"> - </objectClass> - </or> - </enablement> - </commonWizard> --> - <!-- EAR export --> - <!-- <commonWizard - type="export" - wizardId="org.eclipse.jst.j2ee.ui.EnterpriseApplicationExportWizard"> - <enablement> - <or> - <and> - <or> - <objectClass - name="org.eclipse.wst.common.navigator.internal.groups.NavigatorGroup"> - </objectClass> - <objectClass - name="org.eclipse.core.resources.IProject"> - </objectClass> - </or> - <or> - <objectState - name="projectNature" - value="org.eclipse.jst.j2ee.EARNature"> - </objectState> - </or> - </and> - <objectClass - name="org.eclipse.jst.j2ee.internal.application.impl.ApplicationImpl"> - </objectClass> - <objectClass - name="org.eclipse.jst.j2ee.internal.provider.ModulesItemProvider"> - </objectClass> - <objectClass - name="org.eclipse.jst.j2ee.internal.application.impl.ModuleImpl"> - </objectClass> - </or> - </enablement> - </commonWizard> --> - <!-- App Client export --> - <!-- <commonWizard - type="export" - wizardId="org.eclipse.jst.j2ee.ui.AppClientModuleExportWizard"> - <enablement> - <or> - <and> - <or> - <objectClass - name="org.eclipse.wst.common.navigator.internal.groups.NavigatorGroup"> - </objectClass> - <objectClass - name="org.eclipse.core.resources.IProject"> - </objectClass> - </or> - <or> - <objectState - name="projectNature" - value="org.eclipse.jst.j2ee.ApplicationClientNature"> - </objectState> - </or> - </and> - <objectClass - name="org.eclipse.jst.j2ee.internal.client.impl.ApplicationClientImpl"> - </objectClass> - </or> - </enablement> - </commonWizard> --> - <!-- Import Classes Wizard --> - <!-- <commonWizard - type="import" - wizardId="org.eclipse.jst.j2ee.internal.wizard.ClassesImportWizard"> - <enablement> - <or> - <and> - <objectClass - name="org.eclipse.core.resources.IProject"> - </objectClass> - <or> - <objectState - name="projectNature" - value="org.eclipse.jst.j2ee.ApplicationClientNature"> - </objectState> - <objectState - name="projectNature" - value="org.eclipse.jst.j2ee.jca.ConnectorNature"> - </objectState> - <objectState - name="projectNature" - value="org.eclipse.jst.j2ee.ejb.EJBNature"> - </objectState> - <objectState - name="projectNature" - value="org.eclipse.jst.j2ee.web.WebNature"> - </objectState> - </or> - </and> - <objectClass - name="org.eclipse.jst.j2ee.internal.client.impl.ApplicationClientImpl"> - </objectClass> - </or> - </enablement> - </commonWizard> --> - </extension> <extension point="org.eclipse.wst.common.frameworks.DataModelProviderExtension">
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee.webservice.ui/META-INF/MANIFEST.MF index 9febb0f..362b499 100644 --- a/plugins/org.eclipse.jst.j2ee.webservice.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.jst.j2ee.webservice.ui/META-INF/MANIFEST.MF
@@ -25,9 +25,10 @@ org.eclipse.wst.common.emf, org.eclipse.jst.j2ee.webservice, org.eclipse.wst.wsdl, - org.eclipse.jst.common.navigator.java, - org.eclipse.wst.common.navigator.views, org.eclipse.jem.util, org.wsdl4j, - org.eclipse.jst.common.frameworks + org.eclipse.jst.common.frameworks, + org.eclipse.ui.navigator, + org.eclipse.ui.navigator.resources, + org.eclipse.jst.j2ee.navigator.ui Eclipse-AutoStart: true
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/plugin.xml b/plugins/org.eclipse.jst.j2ee.webservice.ui/plugin.xml index da19dfa..64ec151 100644 --- a/plugins/org.eclipse.jst.j2ee.webservice.ui/plugin.xml +++ b/plugins/org.eclipse.jst.j2ee.webservice.ui/plugin.xml
@@ -2,32 +2,24 @@ <?eclipse version="3.0"?> <plugin> <extension - point="org.eclipse.wst.common.navigator.views.navigatorContent"> + point="org.eclipse.ui.navigator.navigatorContent"> <navigatorContent name="Web Services" priority="low" icon="icons/webgroup_obj.gif" contentProvider="org.eclipse.jst.j2ee.internal.webservice.WebServicesNavigatorContentProvider" labelProvider="org.eclipse.jst.j2ee.internal.webservice.WebServicesNavigatorLabelProvider" - openListener="org.eclipse.jst.j2ee.internal.webservice.WebServicesNavigatorGroupOpenListener" - id="org.eclipse.wst.common.frameworks.internal.navigator.webservice" - > - <enables> + sorter="org.eclipse.ui.navigator.resources.internal.workbench.ResourceSorter" + id="org.eclipse.wst.common.frameworks.internal.navigator.webservice"> + <enablement> <or> - <objectClass - name="org.eclipse.jst.j2ee.internal.webservice.WebServiceNavigatorGroup"> - </objectClass> - <objectClass - name="org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription"> - </objectClass> - <objectClass - name="org.eclipse.jst.j2ee.internal.webservice.WebServiceNavigatorGroupType"> - </objectClass> - <objectClass - name="org.eclipse.wst.wsdl.util.WSDLResourceImpl"> - </objectClass> + <instanceof value="org.eclipse.core.resources.IWorkspaceRoot"/> + <instanceof value="org.eclipse.jst.j2ee.internal.webservice.WebServiceNavigatorGroup"/> + <instanceof value="org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription"/> + <instanceof value="org.eclipse.jst.j2ee.internal.webservice.WebServiceNavigatorGroupType"/> + <instanceof value="org.eclipse.wst.wsdl.util.WSDLResourceImpl"/> </or> - </enables> + </enablement> <emfEnablement> <package uri="wsdd.xmi" /> <package uri="webservice_client.xmi" /> @@ -41,11 +33,13 @@ <!-- J2EE View Web Services contribution --> <extension - point="org.eclipse.wst.common.navigator.views.navigatorViewer"> - <navigatorViewer - rootContentExtensionId="org.eclipse.wst.common.frameworks.internal.navigator.webservice" - viewerId="org.eclipse.wst.navigator.ui.WTPWorkingSetCommonNavigator"> - </navigatorViewer> + point="org.eclipse.ui.navigator.viewer"> + <viewerContentBinding + viewerId="org.eclipse.wst.common.explorer.CommonProjectExplorer"> + <includes> + <contentExtension pattern="org.eclipse.wst.common.frameworks.internal.navigator.webservice"/> + </includes> + </viewerContentBinding> </extension> </plugin>
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceAdapterFactory.java index c3b8aab..5b2bf93 100644 --- a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceAdapterFactory.java +++ b/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceAdapterFactory.java
@@ -21,8 +21,8 @@ import org.eclipse.jst.j2ee.internal.webservice.helper.WebServicesManager; import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceExtManager; import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper; +import org.eclipse.jst.j2ee.navigator.internal.J2EEEMFAdapterFactory; import org.eclipse.jst.j2ee.webservice.wsdd.WsddResource; -import org.eclipse.wst.common.internal.emfworkbench.EMFAdapterFactory; import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper; /** @@ -31,7 +31,7 @@ * To change the template for this generated type comment go to Window - Preferences - Java - Code * Generation - Code and Comments */ -public class WebServiceAdapterFactory extends EMFAdapterFactory { +public class WebServiceAdapterFactory extends J2EEEMFAdapterFactory { /** * Default constructor @@ -51,11 +51,11 @@ if (serviceHelper.isService(adaptableObject)) res = WebServicesManager.getInstance().getWsddResource((EObject) adaptableObject); - if (res != null && adapterType == EMFAdapterFactory.IFILE_CLASS) + if (res != null && adapterType == J2EEEMFAdapterFactory.IFILE_CLASS) return WorkbenchResourceHelper.getFile(res); - else if (res != null && adapterType == EMFAdapterFactory.IRESOURCE_CLASS) + else if (res != null && adapterType == J2EEEMFAdapterFactory.IRESOURCE_CLASS) return WorkbenchResourceHelper.getFile(res); - else if (res != null && adapterType == EMFAdapterFactory.IPROJECT_CLASS) + else if (res != null && adapterType == J2EEEMFAdapterFactory.IPROJECT_CLASS) return ProjectUtilities.getProject(res); else return super.getAdapter(adaptableObject, adapterType);
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServicesNavigatorContentProvider.java b/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServicesNavigatorContentProvider.java index 5471539..9dff36c 100644 --- a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServicesNavigatorContentProvider.java +++ b/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServicesNavigatorContentProvider.java
@@ -26,20 +26,23 @@ import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.resource.Resource; +import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider; import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.jface.viewers.Viewer; -import org.eclipse.jst.common.navigator.internal.providers.CommonAdapterFactoryContentProvider; import org.eclipse.jst.j2ee.internal.webservice.helper.WebServiceEvent; import org.eclipse.jst.j2ee.internal.webservice.helper.WebServiceManagerListener; import org.eclipse.jst.j2ee.internal.webservice.helper.WebServicesManager; import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceExtManager; import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper; +import org.eclipse.jst.j2ee.navigator.internal.IJ2EENavigatorConstants; import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef; import org.eclipse.jst.j2ee.webservice.wsdd.Handler; import org.eclipse.jst.j2ee.webservice.wsdd.PortComponent; import org.eclipse.swt.widgets.Display; +import org.eclipse.ui.IMemento; +import org.eclipse.ui.navigator.ICommonContentProvider; +import org.eclipse.ui.navigator.IExtensionStateModel; import org.eclipse.wst.common.internal.emfworkbench.integration.DynamicAdapterFactory; -import org.eclipse.wst.common.navigator.internal.provisional.views.INavigatorContentProvider; /** * @author jlanuti @@ -47,7 +50,7 @@ * To change the template for this generated type comment go to Window - Preferences - Java - Code * Generation - Code and Comments */ -public class WebServicesNavigatorContentProvider extends CommonAdapterFactoryContentProvider implements INavigatorContentProvider, WebServiceManagerListener { +public class WebServicesNavigatorContentProvider extends AdapterFactoryContentProvider implements ICommonContentProvider, WebServiceManagerListener { private WebServicesManager webServicesManager = null; private boolean activityEnabled = false; @@ -55,8 +58,6 @@ private WebServiceNavigatorGroupType SERVICES = null; private WebServiceNavigatorGroupType CLIENTS = null; private HashMap HANDLERS = new HashMap(); - private final static String VIEWER_ID = "org.eclipse.wst.navigator.ui.WTPCommonNavigator";//$NON-NLS-1$ - private TreeViewer viewer = null; public WebServicesNavigatorContentProvider() { @@ -72,7 +73,7 @@ * Configure and return a composite adapter factory for our contents */ public static AdapterFactory createAdapterFactory() { - return new DynamicAdapterFactory(VIEWER_ID); + return new DynamicAdapterFactory(IJ2EENavigatorConstants.VIEWER_ID); } /* @@ -292,4 +293,19 @@ public TreeViewer getViewer() { return viewer; } + + public void restoreState(IMemento aMemento) { + // TODO Auto-generated method stub + + } + + public void saveState(IMemento aMemento) { + // TODO Auto-generated method stub + + } + + public void init(IExtensionStateModel aStateModel, IMemento aMemento) { + // TODO Auto-generated method stub + + } }
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServicesNavigatorSynchronizer.java b/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServicesNavigatorSynchronizer.java index 66be80f..2672c61 100644 --- a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServicesNavigatorSynchronizer.java +++ b/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServicesNavigatorSynchronizer.java
@@ -18,7 +18,7 @@ import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.Notifier; import org.eclipse.emf.ecore.EObject; -import org.eclipse.jst.common.navigator.internal.providers.CommonAdapterFactoryContentProvider; +import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider; import org.eclipse.jst.j2ee.internal.webservice.helper.WebServicesManager; import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef; import org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription; @@ -27,7 +27,7 @@ /** * @author jlanuti */ -public class WebServicesNavigatorSynchronizer extends CommonAdapterFactoryContentProvider implements Adapter { +public class WebServicesNavigatorSynchronizer extends AdapterFactoryContentProvider implements Adapter { private static WebServicesNavigatorSynchronizer INSTANCE = null;
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WsdlResourceAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WsdlResourceAdapterFactory.java index 06c866b..14238b0 100644 --- a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WsdlResourceAdapterFactory.java +++ b/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WsdlResourceAdapterFactory.java
@@ -20,7 +20,7 @@ import org.eclipse.jem.util.emf.workbench.ProjectUtilities; import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceExtManager; import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper; -import org.eclipse.wst.common.internal.emfworkbench.EMFAdapterFactory; +import org.eclipse.jst.j2ee.navigator.internal.J2EEEMFAdapterFactory; import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper; /** @@ -29,7 +29,7 @@ * To change the template for this generated type comment go to Window - Preferences - Java - Code * Generation - Code and Comments */ -public class WsdlResourceAdapterFactory extends EMFAdapterFactory { +public class WsdlResourceAdapterFactory extends J2EEEMFAdapterFactory { /** * Default constructor @@ -49,11 +49,11 @@ if (serviceHelper.isWSDLResource(adaptableObject)) res = (Resource) adaptableObject; - if (res != null && adapterType == EMFAdapterFactory.IFILE_CLASS) + if (res != null && adapterType == J2EEEMFAdapterFactory.IFILE_CLASS) return WorkbenchResourceHelper.getFile(res) != null ? WorkbenchResourceHelper.getFile(res) : null; - else if (res != null && adapterType == EMFAdapterFactory.IRESOURCE_CLASS) + else if (res != null && adapterType == J2EEEMFAdapterFactory.IRESOURCE_CLASS) return WorkbenchResourceHelper.getFile(res); - else if (res != null && adapterType == EMFAdapterFactory.IPROJECT_CLASS) + else if (res != null && adapterType == J2EEEMFAdapterFactory.IPROJECT_CLASS) return ProjectUtilities.getProject(res); else return super.getAdapter(adaptableObject, adapterType);
diff --git a/plugins/org.eclipse.jst.servlet.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.servlet.ui/META-INF/MANIFEST.MF index efd2ef1..d51f31c 100644 --- a/plugins/org.eclipse.jst.servlet.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.jst.servlet.ui/META-INF/MANIFEST.MF
@@ -24,7 +24,6 @@ org.eclipse.jst.j2ee.core, org.eclipse.jst.j2ee.web, org.eclipse.wst.web, - org.eclipse.wst.common.navigator.workbench, org.eclipse.jdt.core, org.eclipse.jdt.ui, org.eclipse.wst.common.modulecore, @@ -37,5 +36,6 @@ org.eclipse.jst.server.core, org.eclipse.wst.common.project.facet.core, org.eclipse.wst.common.project.facet.ui, - org.eclipse.wst.web.ui + org.eclipse.wst.web.ui, + org.eclipse.ui.navigator.resources Eclipse-AutoStart: true
diff --git a/plugins/org.eclipse.jst.servlet.ui/plugin.xml b/plugins/org.eclipse.jst.servlet.ui/plugin.xml index 1d33c4e..f4bd787 100644 --- a/plugins/org.eclipse.jst.servlet.ui/plugin.xml +++ b/plugins/org.eclipse.jst.servlet.ui/plugin.xml
@@ -72,7 +72,7 @@ name="%WarImportWizard.name" icon="icons/full/ctool16/importwar_wiz.gif" class="org.eclipse.jst.servlet.ui.internal.wizard.WebComponentImportWizard" - id="org.eclipse.jst.servlet.ui.WebComponentImportWizard"> + id="org.eclipse.jst.servlet.ui.internal.wizard.WebComponentImportWizard"> <description> %WarImportWizard.description </description> @@ -89,7 +89,7 @@ name="%WarexportWizard.name" icon="icons/full/ctool16/exportwar_wiz.gif" class="org.eclipse.jst.servlet.ui.internal.wizard.WebComponentExportWizard" - id="org.eclipse.jst.servlet.ui.WebComponentExportWizard"> + id="org.eclipse.jst.servlet.ui.internal.wizard.WebComponentExportWizard"> <description> %WarexportWizard.description </description> @@ -128,178 +128,6 @@ </action> </actionSet> </extension> --> - - <extension - point="org.eclipse.wst.common.navigator.workbench.commonWizard"> - <!-- Web New --> - <commonWizard - type="new" - wizardId="org.eclipse.jst.servlet.ui.project.facet.WebProjectWizard"> - <enablement> - <or> - <objectClass - name="org.eclipse.core.resources.IWorkspaceRoot"> - </objectClass> - <and> - <objectClass - name="org.eclipse.core.resources.IProject"> - </objectClass> - <or> - <objectState - name="projectNature" - value="org.eclipse.wst.common.modulecore.ModuleCoreNature"> - </objectState> - </or> - </and> - <objectClass - name="org.eclipse.jst.j2ee.application.Module"> - </objectClass> - <objectClass - name="org.eclipse.jst.j2ee.application.Application"> - </objectClass> - <objectClass - name="org.eclipse.jst.j2ee.internal.provider.ModulesItemProvider"> - </objectClass> - </or> - </enablement> - </commonWizard> - <!-- New Servlet --> - <commonWizard - type="new" - wizardId="org.eclipse.jst.servlet.ui.internal.wizard.AddServletWizard"> - <enablement> - <or> - <objectClass - name="org.eclipse.core.resources.IWorkspaceRoot"> - </objectClass> - <and> - <objectClass - name="org.eclipse.core.resources.IProject"> - </objectClass> - <or> - <objectState - name="projectNature" - value="org.eclipse.wst.common.modulecore.ModuleCoreNature"> - </objectState> - </or> - </and> - <objectClass - name="org.eclipse.jst.j2ee.application.Module"> - </objectClass> - <objectClass - name="org.eclipse.jst.j2ee.webapplication.WebApp"> - </objectClass> - <objectClass - name="org.eclipse.jst.j2ee.internal.provider.ModulesItemProvider"> - </objectClass> - <objectClass - name="org.eclipse.jst.j2ee.internal.war.ui.util.WebServletGroupItemProvider"> - </objectClass> - <objectClass - name="org.eclipse.jst.j2ee.webapplication.WebApp"> - </objectClass> - </or> - </enablement> - </commonWizard> - <!-- Web Import --> - <!-- <commonWizard - type="import" - wizardId="org.eclipse.jst.servlet.ui.WebModuleImportWizard"> - <enablement> - <or> - <objectClass - name="org.eclipse.core.resources.IWorkspaceRoot"> - </objectClass> - <and> - <objectClass - name="org.eclipse.wst.common.navigator.internal.groups.NavigatorGroup"> - </objectClass> - <objectState - name="projectNature" - value="org.eclipse.jst.j2ee.web.WebNature"> - </objectState> - </and> - <and> - <objectClass - name="org.eclipse.core.resources.IProject"> - </objectClass> - <or> - <objectState - name="projectNature" - value="org.eclipse.jst.j2ee.EARNature"> - </objectState> - <objectState - name="projectNature" - value="org.eclipse.jst.j2ee.web.WebNature"> - </objectState> - </or> - </and> - <objectClass - name="org.eclipse.jst.j2ee.internal.webapplication.impl.WebAppImpl"> - </objectClass> - <objectClass - name="org.eclipse.jst.j2ee.internal.war.ui.util.WebGroupItemProvider"> - </objectClass> - <objectClass - name="org.eclipse.jst.j2ee.internal.application.impl.ApplicationImpl"> - </objectClass> - <objectClass - name="org.eclipse.jst.j2ee.internal.provider.ModulesItemProvider"> - </objectClass> - <objectClass - name="org.eclipse.jst.j2ee.internal.application.impl.ModuleImpl"> - </objectClass> - </or> - </enablement> - </commonWizard> --> - <!-- Web Export --> - <!-- <commonWizard - type="export" - wizardId="org.eclipse.jst.servlet.ui.WebModuleExportWizard"> - <enablement> - <or> - <and> - <or> - <objectClass - name="org.eclipse.wst.common.navigator.internal.groups.NavigatorGroup"> - </objectClass> - <objectClass - name="org.eclipse.core.resources.IProject"> - </objectClass> - </or> - <or> - <objectState - name="projectNature" - value="org.eclipse.jst.j2ee.web.WebNature"> - </objectState> - </or> - </and> - <objectClass - name="org.eclipse.jst.j2ee.internal.webapplication.impl.WebAppImpl"> - </objectClass> - <objectClass - name="org.eclipse.jst.j2ee.internal.war.ui.util.WebGroupItemProvider"> - </objectClass> - - </or> - </enablement> - </commonWizard> --> - <!-- Import Classes Wizard --> - <!-- <commonWizard - type="import" - wizardId="org.eclipse.jst.j2ee.internal.wizard.ClassesImportWizard"> - <enablement> - <or> - <objectClass - name="org.eclipse.jst.j2ee.internal.webapplication.impl.WebAppImpl"> - </objectClass> - <objectClass - name="org.eclipse.jst.j2ee.internal.war.ui.util.WebGroupItemProvider"> - </objectClass> - </or> - </enablement> - </commonWizard> --> - </extension> <!-- ==================================================================== --> <!-- Extension point: org.eclipse.etools.server.core.moduleObjectAdapters -->
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/DelegateConfigurationElement.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/DelegateConfigurationElement.java index 0e8fd62..65fe17a 100644 --- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/DelegateConfigurationElement.java +++ b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/DelegateConfigurationElement.java
@@ -192,4 +192,9 @@ return delegateElement.toString(); } + public IConfigurationElement toEquinox() { + // TODO Auto-generated method stub + return null; + } + } \ No newline at end of file