diff options
Diffstat (limited to 'plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui')
66 files changed, 420 insertions, 136 deletions
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/IWebUIContextIds.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/IWebUIContextIds.java index 5dfa81657..9988807af 100644 --- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/IWebUIContextIds.java +++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/IWebUIContextIds.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2003, 2006 IBM Corporation and others. + * Copyright (c) 2003, 2019 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 diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/CustomWebProjectReferenceWizardFragment.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/CustomWebProjectReferenceWizardFragment.java index 6b6e51d42..b34bb3feb 100644 --- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/CustomWebProjectReferenceWizardFragment.java +++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/CustomWebProjectReferenceWizardFragment.java @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2010, 2009 Red Hat and Others + * Copyright (c) 2010, 2019 Red Hat 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 diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/Messages.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/Messages.java index 189ab7260..5e949d3d5 100644 --- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/Messages.java +++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/Messages.java @@ -1,3 +1,15 @@ +/******************************************************************************* + * Copyright (c) 2010, 2023 IBM Corporation and others. + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * IBM Corporation - initial API and implementation + *******************************************************************************/ package org.eclipse.jst.servlet.ui.internal; import java.util.MissingResourceException; diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/WebDependencyPropertyPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/WebDependencyPropertyPage.java index 22b1a5bc6..14f3664dc 100644 --- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/WebDependencyPropertyPage.java +++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/WebDependencyPropertyPage.java @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2010 Red Hat and Others + * Copyright (c) 2010, 2019 Red Hat 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 diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/WebModuleDependencyPageProvider.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/WebModuleDependencyPageProvider.java index 4950374a6..ddc15aa45 100644 --- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/WebModuleDependencyPageProvider.java +++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/WebModuleDependencyPageProvider.java @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2010 Red Hat and Others + * Copyright (c) 2010, 2019 Red Hat 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 @@ -33,6 +33,7 @@ public class WebModuleDependencyPageProvider implements IDependencyPageProvider private IModuleDependenciesControl[] controls; + @Override public boolean canHandle(IFacetedProject project) { boolean isWeb = project.hasProjectFacet(ProjectFacetsManager.getProjectFacet(IModuleConstants.JST_WEB_MODULE)); isWeb |= project.hasProjectFacet(ProjectFacetsManager.getProjectFacet(IModuleConstants.WST_WEB_MODULE)); @@ -46,6 +47,7 @@ public class WebModuleDependencyPageProvider implements IDependencyPageProvider return JavaModuleComponentUtility.findParentProjects(project).length == 0; } + @Override public IModuleDependenciesControl[] createPages(IFacetedProject project, ModuleAssemblyRootPage parent) { @@ -59,6 +61,7 @@ public class WebModuleDependencyPageProvider implements IDependencyPageProvider }; } + @Override public Composite createRootControl(IFacetedProject project,IModuleDependenciesControl[] pages, Composite parent) { @@ -96,6 +99,7 @@ public class WebModuleDependencyPageProvider implements IDependencyPageProvider return composite; } + @Override public String getPageTitle(IProject project) { return Messages.WebDeploymentAssembly; } diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/actions/ConvertToWebModuleTypeAction.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/actions/ConvertToWebModuleTypeAction.java index 1ed43575f..ebbf55aa5 100644 --- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/actions/ConvertToWebModuleTypeAction.java +++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/actions/ConvertToWebModuleTypeAction.java @@ -1,7 +1,7 @@ package org.eclipse.jst.servlet.ui.internal.actions; /******************************************************************************* - * Copyright (c) 2003, 2008 IBM Corporation and others. + * Copyright (c) 2003, 2019 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 @@ -54,6 +54,7 @@ public class ConvertToWebModuleTypeAction extends Action implements IWorkbenchWi /** * selectionChanged method comment. */ + @Override public void selectionChanged(IAction action, ISelection selection) { boolean bEnable = false; if (selection instanceof IStructuredSelection) { @@ -80,14 +81,17 @@ public class ConvertToWebModuleTypeAction extends Action implements IWorkbenchWi return isValidProject(project); } + @Override public void dispose() { // Default } + @Override public void init(IWorkbenchWindow window) { // Default } + @Override public void run(IAction action) { try { IWorkbenchWindow window = PlatformUI.getWorkbench().getWorkbenchWindows()[0]; diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/actions/NewWebComponentAction.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/actions/NewWebComponentAction.java index f0a81d759..466209511 100644 --- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/actions/NewWebComponentAction.java +++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/actions/NewWebComponentAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2003, 2005 IBM Corporation and others. + * Copyright (c) 2003, 2019 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 diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/deployables/WebDeployableArtifactAdapterFactory.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/deployables/WebDeployableArtifactAdapterFactory.java index 7334d3f8c..49ce4a083 100644 --- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/deployables/WebDeployableArtifactAdapterFactory.java +++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/deployables/WebDeployableArtifactAdapterFactory.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2003, 2004 IBM Corporation and others. + * Copyright (c) 2003, 2019 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 @@ -18,10 +18,12 @@ import org.eclipse.wst.server.core.model.ModuleArtifactAdapterDelegate; public class WebDeployableArtifactAdapterFactory extends ModuleArtifactAdapterDelegate implements IAdapterFactory { + @Override public Object getAdapter(Object adaptableObject, Class adapterType) { return null; } + @Override public Class[] getAdapterList() { return new Class[]{ILaunchable.class}; } diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/messages.properties b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/messages.properties index f1299a6c7..5d11c4b7d 100644 --- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/messages.properties +++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/messages.properties @@ -1,3 +1,15 @@ +############################################################################### +# Copyright (c) 2010, 2023 IBM Corporation and others. +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which accompanies this distribution, and is available at +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 +# +# Contributors: +# IBM Corporation - initial API and implementation +############################################################################### DeploymentAssembly=Deplo&yment Assembly WebDeploymentAssembly=Web Deployment Assembly ManifestEntries=&Manifest Entries diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/CompressedJavaLibraries.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/CompressedJavaLibraries.java index a02c84211..a673e3ec6 100644 --- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/CompressedJavaLibraries.java +++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/CompressedJavaLibraries.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2003, 2006 IBM Corporation and others. + * Copyright (c) 2003, 2019 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 @@ -34,6 +34,7 @@ public class CompressedJavaLibraries implements ICompressedNode { this.compressedProject = compressedProject; } + @Override public Image getImage() { if(image == null) { image = JavaUI.getSharedImages().getImage(ISharedImages.IMG_OBJS_LIBRARY); @@ -41,10 +42,12 @@ public class CompressedJavaLibraries implements ICompressedNode { return image; } + @Override public String getLabel() { return WEBUIMessages.Compressed_Libraries; } + @Override public Object[] getChildren(ITreeContentProvider delegateContentProvider) { List classpathContainers = new ArrayList(); @@ -70,6 +73,7 @@ public class CompressedJavaLibraries implements ICompressedNode { return compressedProject; } + @Override public IJavaElement getJavaElement() { return null; } diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/CompressedJavaProject.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/CompressedJavaProject.java index 8cacb832d..cc669cfae 100644 --- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/CompressedJavaProject.java +++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/CompressedJavaProject.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2003, 2006 IBM Corporation and others. + * Copyright (c) 2003, 2019 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 @@ -43,12 +43,14 @@ public class CompressedJavaProject implements ICompressedNode, IAdaptable { } + @Override public Image getImage() { if(image == null) image = JavaUI.getSharedImages().getImage(ISharedImages.IMG_OBJS_PACKFRAG_ROOT); return image; } + @Override public String getLabel() { return determineLabel(); @@ -66,6 +68,7 @@ public class CompressedJavaProject implements ICompressedNode, IAdaptable { return project; } + @Override public Object[] getChildren(ITreeContentProvider delegateContentProvider) { List nonExternalSourceFolders = getNonExternalSourceFolders(); @@ -98,10 +101,12 @@ public class CompressedJavaProject implements ICompressedNode, IAdaptable { } + @Override public Object getAdapter(Class adapter) { return Platform.getAdapterManager().getAdapter(this, adapter); } + @Override public IJavaElement getJavaElement() { List nonExternalSourceFolders = getNonExternalSourceFolders(); if (nonExternalSourceFolders.size() == 1) { diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/CompressedJavaSorter.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/CompressedJavaSorter.java index cc33a7077..e437d54ba 100644 --- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/CompressedJavaSorter.java +++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/CompressedJavaSorter.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2003, 2006 IBM Corporation and others. + * Copyright (c) 2003, 2019 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 diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/CompressedNodeAdapterFactory.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/CompressedNodeAdapterFactory.java index e05ccb189..6e0a3c7b3 100644 --- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/CompressedNodeAdapterFactory.java +++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/CompressedNodeAdapterFactory.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2003, 2006 IBM Corporation and others. + * Copyright (c) 2003, 2019 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 @@ -22,6 +22,7 @@ public class CompressedNodeAdapterFactory implements IAdapterFactory { private static final Class[] ADAPTER_LIST = new Class[] { IJAVA_PROJECT_CLASS }; + @Override public Object getAdapter(Object adaptableObject, Class adapterType) { if(adaptableObject instanceof CompressedJavaProject) { if(adapterType == IJAVA_PROJECT_CLASS) { @@ -33,6 +34,7 @@ public class CompressedNodeAdapterFactory implements IAdapterFactory { return null; } + @Override public Class[] getAdapterList() { return ADAPTER_LIST; } diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/FacetedProjectPropertyTester.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/FacetedProjectPropertyTester.java index cbe833b2b..e35030ffd 100644 --- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/FacetedProjectPropertyTester.java +++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/FacetedProjectPropertyTester.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010 SAP AG and others. + * Copyright (c) 2010, 2019 SAP AG 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 @@ -18,7 +18,8 @@ import org.eclipse.wst.common.project.facet.core.FacetedProjectFramework; public class FacetedProjectPropertyTester extends PropertyTester { - public boolean test( final Object receiver, + @Override + public boolean test( final Object receiver, final String property, final Object[] args, final Object value ) diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/ICompressedNode.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/ICompressedNode.java index 592b7ce4d..1319a642a 100644 --- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/ICompressedNode.java +++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/ICompressedNode.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2003, 2006 IBM Corporation and others. + * Copyright (c) 2003, 2019 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 diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/WebJavaContentProvider.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/WebJavaContentProvider.java index c2eb03cbc..d095ee64f 100644 --- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/WebJavaContentProvider.java +++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/WebJavaContentProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2003, 2007 IBM Corporation and others. + * Copyright (c) 2003, 2019 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 @@ -63,6 +63,7 @@ public class WebJavaContentProvider implements IPipelinedTreeContentProvider { private ITreeContentProvider delegateContentProvider; private final Map compressedNodes = new HashMap(); + @Override public void getPipelinedChildren(Object aParent, Set theCurrentChildren) { try { if (aParent instanceof IProject && ((IProject)aParent).hasNature(JavaCore.NATURE_ID) && JavaEEProjectUtilities.isDynamicWebProject((IProject)aParent)) { @@ -97,10 +98,12 @@ public class WebJavaContentProvider implements IPipelinedTreeContentProvider { return result; } + @Override public void getPipelinedElements(Object anInput, Set theCurrentElements) { } + @Override public Object getPipelinedParent(Object anObject, Object aSuggestedParent) { try { @@ -127,6 +130,7 @@ public class WebJavaContentProvider implements IPipelinedTreeContentProvider { return null; } + @Override public PipelinedShapeModification interceptAdd(PipelinedShapeModification anAddModification) { Object parent = anAddModification.getParent(); @@ -144,6 +148,7 @@ public class WebJavaContentProvider implements IPipelinedTreeContentProvider { } + @Override public PipelinedShapeModification interceptRemove(PipelinedShapeModification aRemoveModification) { Object parent = aRemoveModification.getParent(); @@ -195,6 +200,7 @@ public class WebJavaContentProvider implements IPipelinedTreeContentProvider { return null; } + @Override public boolean interceptRefresh(PipelinedViewerUpdate aRefreshSynchronization) { Set refreshTargets = aRefreshSynchronization.getRefreshTargets(); @@ -218,6 +224,7 @@ public class WebJavaContentProvider implements IPipelinedTreeContentProvider { } + @Override public boolean interceptUpdate(PipelinedViewerUpdate anUpdateSynchronization) { Set refreshTargets = anUpdateSynchronization.getRefreshTargets(); for (Iterator iter = refreshTargets.iterator(); iter.hasNext();) { @@ -238,9 +245,11 @@ public class WebJavaContentProvider implements IPipelinedTreeContentProvider { return false; } + @Override public void init(ICommonContentExtensionSite aSite) { } + @Override public Object[] getChildren(Object parentElement) { if (delegateContentProvider != null) { if (parentElement instanceof CompressedJavaProject) { @@ -252,6 +261,7 @@ public class WebJavaContentProvider implements IPipelinedTreeContentProvider { return NO_CHILDREN; } + @Override public Object getParent(Object element) { if (element instanceof CompressedJavaProject) return ((CompressedJavaProject) element).getProject(); @@ -260,18 +270,22 @@ public class WebJavaContentProvider implements IPipelinedTreeContentProvider { return null; } + @Override public boolean hasChildren(Object element) { return (element instanceof CompressedJavaProject || element instanceof CompressedJavaLibraries); } + @Override public Object[] getElements(Object inputElement) { return NO_CHILDREN; } + @Override public void dispose() { compressedNodes.clear(); } + @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { if (viewer instanceof CommonViewer) { commonViewer = (CommonViewer) viewer; @@ -284,10 +298,12 @@ public class WebJavaContentProvider implements IPipelinedTreeContentProvider { } + @Override public void restoreState(IMemento aMemento) { } + @Override public void saveState(IMemento aMemento) { } diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/WebJavaLabelProvider.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/WebJavaLabelProvider.java index ca35bae53..efa47f006 100644 --- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/WebJavaLabelProvider.java +++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/WebJavaLabelProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2003, 2006 IBM Corporation and others. + * Copyright (c) 2003, 2019 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 @@ -21,6 +21,7 @@ public class WebJavaLabelProvider implements ILabelProvider { private ILabelDecorator decorator = new ProblemsLabelDecorator(); + @Override public Image getImage(Object element) { Image image = null; if(element instanceof ICompressedNode) @@ -33,6 +34,7 @@ public class WebJavaLabelProvider implements ILabelProvider { return image; } + @Override public String getText(Object element) { String text = null; if(element instanceof ICompressedNode) @@ -45,18 +47,22 @@ public class WebJavaLabelProvider implements ILabelProvider { return text; } + @Override public void addListener(ILabelProviderListener listener) { } + @Override public void dispose() { decorator.dispose(); } + @Override public boolean isLabelProperty(Object element, String property) { return false; } + @Override public void removeListener(ILabelProviderListener listener) { } diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/plugin/ServletUIPlugin.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/plugin/ServletUIPlugin.java index 1336333f7..b78fd8644 100644 --- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/plugin/ServletUIPlugin.java +++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/plugin/ServletUIPlugin.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2003, 2006 IBM Corporation and others. + * Copyright (c) 2003, 2019 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 diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/plugin/WEBUIMessages.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/plugin/WEBUIMessages.java index ab9072362..616bc5ad3 100644 --- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/plugin/WEBUIMessages.java +++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/plugin/WEBUIMessages.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2003, 2006 IBM Corporation and others. + * Copyright (c) 2003, 2019 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 diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddEditFilterMappingDialog.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddEditFilterMappingDialog.java index 76abebdad..43c2aaf7f 100644 --- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddEditFilterMappingDialog.java +++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddEditFilterMappingDialog.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2008 SAP AG and others. + * Copyright (c) 2007, 2019 SAP AG 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 @@ -341,7 +341,8 @@ public class AddEditFilterMappingDialog extends SelectionStatusDialog implements spec.verticalAlignment = GridData.BEGINNING; fURLText.setLayoutData(spec); Listener l = new Listener() { - public void handleEvent(Event evt) { + @Override + public void handleEvent(Event evt) { updateOkState(); } }; @@ -460,11 +461,13 @@ public class AddEditFilterMappingDialog extends SelectionStatusDialog implements // } // }); list.addListener(SWT.MouseDoubleClick, new Listener() { + @Override public void handleEvent(Event evt) { handleUpperDoubleClick(); } }); list.addDisposeListener(new DisposeListener() { + @Override public void widgetDisposed(DisposeEvent e) { fElementRenderer.dispose(); } @@ -588,6 +591,7 @@ public class AddEditFilterMappingDialog extends SelectionStatusDialog implements * * @param e an event containing information about the default selection */ + @Override public void widgetDefaultSelected(SelectionEvent e) { // Do nothing } @@ -601,6 +605,7 @@ public class AddEditFilterMappingDialog extends SelectionStatusDialog implements * * @param e an event containing information about the selection */ + @Override public void widgetSelected(SelectionEvent e) { if (e.widget == fURLPatternButton) { fSelection = URL_PATTERN; diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddFilterWizard.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddFilterWizard.java index 764d6293a..5157936b1 100644 --- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddFilterWizard.java +++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddFilterWizard.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2008 SAP AG and others. + * Copyright (c) 2007, 2019 SAP AG 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 diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddFilterWizardPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddFilterWizardPage.java index 9d0c9a403..bfd247be2 100644 --- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddFilterWizardPage.java +++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddFilterWizardPage.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2008 SAP AG and others. + * Copyright (c) 2007, 2019 SAP AG 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 diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddListenerWizard.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddListenerWizard.java index 74fec72f6..f86024de8 100644 --- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddListenerWizard.java +++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddListenerWizard.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2008 SAP AG and others. + * Copyright (c) 2007, 2019 SAP AG 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 diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddListenerWizardPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddListenerWizardPage.java index 1681b8afe..f99fbd529 100644 --- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddListenerWizardPage.java +++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddListenerWizardPage.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008 SAP AG and others. + * Copyright (c) 2008, 2022 SAP AG 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 @@ -15,22 +15,48 @@ import static org.eclipse.jst.j2ee.internal.web.operations.NewListenerClassDataM import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_HTTP_SESSION_ACTIVATION_LISTENER; import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_HTTP_SESSION_ATTRIBUTE_LISTENER; import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_HTTP_SESSION_BINDING_LISTENER; +import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_HTTP_SESSION_ID_LISTENER; import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_HTTP_SESSION_LISTENER; import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_SERVLET_CONTEXT_ATTRIBUTE_LISTENER; import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_SERVLET_CONTEXT_LISTENER; +import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_SERVLET_REQUEST_ASYNC_EVENT_LISTENER; import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_SERVLET_REQUEST_ATTRIBUTE_LISTENER; import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_SERVLET_REQUEST_LISTENER; -import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_HTTP_SESSION_ID_LISTENER; -import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_SERVLET_REQUEST_ASYNC_EVENT_LISTENER; -import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.*; +import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.ADD_LISTENER_WIZARD_ASYNC_EVENTS; +import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.ADD_LISTENER_WIZARD_CHANGES_TO_ATTRIBUTES_C; +import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.ADD_LISTENER_WIZARD_CHANGES_TO_ATTRIBUTES_G; +import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.ADD_LISTENER_WIZARD_CHANGES_TO_ATTRIBUTES_H; +import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.ADD_LISTENER_WIZARD_HTTP_SESSION_EVENTS; +import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.ADD_LISTENER_WIZARD_LIFECYCLE_I; +import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.ADD_LISTENER_WIZARD_LIFECYCLE_L; +import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.ADD_LISTENER_WIZARD_LIFECYCLE_Y; +import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.ADD_LISTENER_WIZARD_OBJECT_BINDING; +import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.ADD_LISTENER_WIZARD_OBJECT_SESSION_ID; +import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.ADD_LISTENER_WIZARD_PAGE_DESC; +import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.ADD_LISTENER_WIZARD_PAGE_TITLE; +import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.ADD_LISTENER_WIZARD_SERVLET_CONTEXT_EVENTS; +import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.ADD_LISTENER_WIZARD_SERVLET_REQUEST_EVENTS; +import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.ADD_LISTENER_WIZARD_SESSION_MIGRATION; +import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.CLEAR_BUTTON; +import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.SELECT_ALL_BUTTON; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.jdt.core.IJavaProject; +import org.eclipse.jdt.core.JavaCore; import org.eclipse.jdt.internal.ui.JavaPluginImages; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jst.j2ee.internal.web.operations.INewServletClassDataModelProperties; +import org.eclipse.jst.j2ee.internal.web.operations.NewListenerClassDataModelProvider; +import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin; +import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities; +import org.eclipse.jst.j2ee.web.IServletConstants; +import org.eclipse.jst.j2ee.web.project.facet.WebFacetUtils; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; @@ -41,9 +67,13 @@ import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Group; import org.eclipse.swt.widgets.Label; +import org.eclipse.wst.common.componentcore.internal.operation.IArtifactEditOperationDataModelProperties; +import org.eclipse.wst.common.componentcore.internal.util.FacetedProjectUtilities; import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent; import org.eclipse.wst.common.frameworks.datamodel.IDataModel; import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizardPage; +import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin; +import org.eclipse.wst.common.project.facet.core.FacetedProjectFramework; public class AddListenerWizardPage extends DataModelWizardPage { @@ -99,62 +129,68 @@ public class AddListenerWizardPage extends DataModelWizardPage { private void createServletContextEvents(Composite parent) { Group group = createGroup(parent, ADD_LISTENER_WIZARD_SERVLET_CONTEXT_EVENTS); + boolean useJakartaPackages = useJakartaPackages(); + createEventListenerRow(group, - ADD_LISTENER_WIZARD_LIFECYCLE_L, - QUALIFIED_SERVLET_CONTEXT_LISTENER, + ADD_LISTENER_WIZARD_LIFECYCLE_L, + useJakartaPackages ? IServletConstants.QUALIFIED_JAKARTA_SERVLET_CONTEXT_LISTENER : QUALIFIED_SERVLET_CONTEXT_LISTENER, INTERFACES); createEventListenerRow(group, - ADD_LISTENER_WIZARD_CHANGES_TO_ATTRIBUTES_C, - QUALIFIED_SERVLET_CONTEXT_ATTRIBUTE_LISTENER, + ADD_LISTENER_WIZARD_CHANGES_TO_ATTRIBUTES_C, + useJakartaPackages ? IServletConstants.QUALIFIED_JAKARTA_SERVLET_CONTEXT_ATTRIBUTE_LISTENER : QUALIFIED_SERVLET_CONTEXT_ATTRIBUTE_LISTENER, INTERFACES); } private void createHttpSessionEvents(Composite parent) { Group group = createGroup(parent, ADD_LISTENER_WIZARD_HTTP_SESSION_EVENTS); + boolean useJakartaPackages = useJakartaPackages(); + createEventListenerRow(group, - ADD_LISTENER_WIZARD_LIFECYCLE_I, - QUALIFIED_HTTP_SESSION_LISTENER, + ADD_LISTENER_WIZARD_LIFECYCLE_I, + useJakartaPackages ? IServletConstants.QUALIFIED_JAKARTA_HTTP_SESSION_LISTENER : QUALIFIED_HTTP_SESSION_LISTENER, INTERFACES); createEventListenerRow(group, - ADD_LISTENER_WIZARD_CHANGES_TO_ATTRIBUTES_H, - QUALIFIED_HTTP_SESSION_ATTRIBUTE_LISTENER, + ADD_LISTENER_WIZARD_CHANGES_TO_ATTRIBUTES_H, + useJakartaPackages ? IServletConstants.QUALIFIED_JAKARTA_HTTP_SESSION_ATTRIBUTE_LISTENER : QUALIFIED_HTTP_SESSION_ATTRIBUTE_LISTENER, INTERFACES); createEventListenerRow(group, - ADD_LISTENER_WIZARD_SESSION_MIGRATION, - QUALIFIED_HTTP_SESSION_ACTIVATION_LISTENER, + ADD_LISTENER_WIZARD_SESSION_MIGRATION, + useJakartaPackages ? IServletConstants.QUALIFIED_JAKARTA_HTTP_SESSION_ACTIVATION_LISTENER : QUALIFIED_HTTP_SESSION_ACTIVATION_LISTENER, INTERFACES); - createEventListenerRow(group, - ADD_LISTENER_WIZARD_OBJECT_BINDING, - QUALIFIED_HTTP_SESSION_BINDING_LISTENER, + createEventListenerRow(group, + ADD_LISTENER_WIZARD_OBJECT_BINDING, + useJakartaPackages ? IServletConstants.QUALIFIED_JAKARTA_HTTP_SESSION_BINDING_LISTENER : QUALIFIED_HTTP_SESSION_BINDING_LISTENER, INTERFACES); - createEventListenerRow(group, - ADD_LISTENER_WIZARD_OBJECT_SESSION_ID, - QUALIFIED_HTTP_SESSION_ID_LISTENER, - INTERFACES); + createEventListenerRow(group, + ADD_LISTENER_WIZARD_OBJECT_SESSION_ID, + useJakartaPackages ? IServletConstants.QUALIFIED_JAKARTA_HTTP_SESSION_ID_LISTENER : QUALIFIED_HTTP_SESSION_ID_LISTENER, + INTERFACES); } private void createServletRequestEvents(Composite parent) { Group group = createGroup(parent, ADD_LISTENER_WIZARD_SERVLET_REQUEST_EVENTS); - createEventListenerRow(group, - ADD_LISTENER_WIZARD_LIFECYCLE_Y, - QUALIFIED_SERVLET_REQUEST_LISTENER, + boolean useJakartaPackages = useJakartaPackages(); + + createEventListenerRow(group, + ADD_LISTENER_WIZARD_LIFECYCLE_Y, + useJakartaPackages ? IServletConstants.QUALIFIED_JAKARTA_SERVLET_REQUEST_LISTENER : QUALIFIED_SERVLET_REQUEST_LISTENER, INTERFACES); - createEventListenerRow(group, - ADD_LISTENER_WIZARD_CHANGES_TO_ATTRIBUTES_G, - QUALIFIED_SERVLET_REQUEST_ATTRIBUTE_LISTENER, + createEventListenerRow(group, + ADD_LISTENER_WIZARD_CHANGES_TO_ATTRIBUTES_G, + useJakartaPackages ? IServletConstants.QUALIFIED_JAKARTA_SERVLET_REQUEST_ATTRIBUTE_LISTENER : QUALIFIED_SERVLET_REQUEST_ATTRIBUTE_LISTENER, INTERFACES); - createEventListenerRow(group, - ADD_LISTENER_WIZARD_ASYNC_EVENTS, - QUALIFIED_SERVLET_REQUEST_ASYNC_EVENT_LISTENER, + createEventListenerRow(group, + ADD_LISTENER_WIZARD_ASYNC_EVENTS, + useJakartaPackages ? IServletConstants.QUALIFIED_JAKARTA_SERVLET_REQUEST_ASYNC_EVENT_LISTENER : QUALIFIED_SERVLET_REQUEST_ASYNC_EVENT_LISTENER, INTERFACES); } @@ -171,12 +207,12 @@ public class AddListenerWizardPage extends DataModelWizardPage { } private void createEventListenerRow(Composite parent, String event, String listener, String property) { - if (listener.equals(QUALIFIED_HTTP_SESSION_ID_LISTENER)){ + if (listener.equals(QUALIFIED_HTTP_SESSION_ID_LISTENER) || listener.equals(IServletConstants.QUALIFIED_JAKARTA_HTTP_SESSION_ID_LISTENER)){ changeSessionID = createCheckbox(parent, event, listener, property); changeSessionIDIconLabel = createInterfaceIcon(parent); changeSessionIDInterfaceLabel = createInterfaceLabel(parent, listener); } - else if (listener.equals(QUALIFIED_SERVLET_REQUEST_ASYNC_EVENT_LISTENER)){ + else if (listener.equals(QUALIFIED_SERVLET_REQUEST_ASYNC_EVENT_LISTENER) || listener.equals(IServletConstants.QUALIFIED_JAKARTA_SERVLET_REQUEST_ASYNC_EVENT_LISTENER)){ asyncListener = createCheckbox(parent, event, listener, property); asyncListenerIconLabel = createInterfaceIcon(parent); asyncListenerInterfaceLabel = createInterfaceLabel(parent, listener); @@ -247,10 +283,18 @@ public class AddListenerWizardPage extends DataModelWizardPage { interfaces = new ArrayList(); model.setProperty(INTERFACES, interfaces); } - - for (String iface : LISTENER_INTERFACES) { - if (!interfaces.contains(iface)) { - interfaces.add(iface); + if (useJakartaPackages()) { + for (String iface : NewListenerClassDataModelProvider.JAKARTA_LISTENER_INTERFACES) { + if (!interfaces.contains(iface)) { + interfaces.add(iface); + } + } + } + else { + for (String iface : LISTENER_INTERFACES) { + if (!interfaces.contains(iface)) { + interfaces.add(iface); + } } } @@ -266,7 +310,8 @@ public class AddListenerWizardPage extends DataModelWizardPage { } interfaces.removeAll(Arrays.asList(LISTENER_INTERFACES)); - + interfaces.removeAll(Arrays.asList(NewListenerClassDataModelProvider.JAKARTA_LISTENER_INTERFACES)); + synchHelper2.synchUIWithModel(INTERFACES, DataModelEvent.VALUE_CHG); model.notifyPropertyChange(INTERFACES, DataModelEvent.VALUE_CHG); } @@ -283,8 +328,65 @@ public class AddListenerWizardPage extends DataModelWizardPage { setServlet31ListenersVisible(false); } } - - + + private boolean useJakartaPackages() { + Object nameValue = model.getProperty(IArtifactEditOperationDataModelProperties.PROJECT_NAME); + if (nameValue != null) { + String projectName = nameValue.toString(); + + try { + IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName); + String id = null; + if(JavaEEProjectUtilities.isDynamicWebProject(project)){ + id = WebFacetUtils.WEB_FACET.getId(); + }else { + id = WebFacetUtils.WEBFRAGMENT_FACET.getId(); + } + String facetVersion = FacetedProjectUtilities.getProjectFacetVersion(project, id).getVersionString(); + if (facetVersion != null && facetVersion.length() > 0) { + float f = Float.parseFloat(facetVersion); + return f >= 5; + } + } + catch (NullPointerException e) { + // not a faceted project, then + } + catch (NumberFormatException e) { + // this should never happen + WTPCommonPlugin.logError(e); + } + + if (projectName != null && projectName.length() > 0) { + IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName); + if (project != null && project.isAccessible()) { + // the default when otherwise indeterminate should be Jakarta + try { + IJavaProject javaProject = JavaCore.create(project); + if (javaProject != null && javaProject.exists()) { + if (javaProject.findType(IServletConstants.QUALIFIED_JAKARTA_GENERIC_SERVLET) != null) { + return true; + } + } + } + catch (CoreException e) { + WTPCommonPlugin.logError(e); + } + try { + // check to see if it is Jakarta Servlet 5 or newer + if (FacetedProjectFramework.hasProjectFacet(project, WebFacetUtils.WEB_FACET.getId(), WebFacetUtils.WEB_50.getVersionString())) { + return true; + } + } + catch (CoreException e) { + WebPlugin.log(e); + } + } + } + return false; + } + return false; + } + private void setServlet31ListenersVisible(boolean visible){ changeSessionID.setVisible(visible); changeSessionIDIconLabel.setVisible(visible); diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddServletWizard.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddServletWizard.java index 7d0afa283..5f3cffb67 100644 --- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddServletWizard.java +++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddServletWizard.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2003, 2008 IBM Corporation and others. + * Copyright (c) 2003, 2019 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 diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddServletWizardPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddServletWizardPage.java index 877cd1392..792f84b3f 100644 --- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddServletWizardPage.java +++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddServletWizardPage.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2003, 2008 IBM Corporation and others. + * Copyright (c) 2003, 2021 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 @@ -166,6 +166,7 @@ public class AddServletWizardPage extends DataModelWizardPage { displayNameText = new Text(composite, SWT.SINGLE | SWT.BORDER); displayNameText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); displayNameText.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { String text = displayNameText.getText(); // Set default URL Pattern @@ -217,7 +218,7 @@ public class AddServletWizardPage extends DataModelWizardPage { public void setVisible(boolean visible) { super.setVisible(visible); String javaEEVersion = model.getStringProperty(INewServletClassDataModelProperties.JAVA_EE_VERSION); - if("3.0".equals(javaEEVersion) || "3.1".equals(javaEEVersion) || "4.0".equals(javaEEVersion)){ //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + if(Double.valueOf(javaEEVersion) >= 3.0) { asyncSupportCheckBox.setVisible(true); } else diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AvailableWebLibProvider.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AvailableWebLibProvider.java index 88f2d26fc..cb6ef19a6 100644 --- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AvailableWebLibProvider.java +++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AvailableWebLibProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2003, 2007 IBM Corporation and others. + * Copyright (c) 2003, 2019 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 @@ -26,10 +26,12 @@ public class AvailableWebLibProvider implements IStructuredContentProvider, ITab public AvailableWebLibProvider() { } + @Override public Object[] getElements(Object inputElement) { if (inputElement instanceof ArchiveWrapper) { Object[] array = ((ArchiveWrapper) inputElement).getWebLibs().toArray(); Arrays.sort(array, new Comparator() { + @Override public int compare(Object o1, Object o2) { return getColumnText(o1, 0).compareTo(getColumnText(o2, 0)); } @@ -40,28 +42,35 @@ public class AvailableWebLibProvider implements IStructuredContentProvider, ITab return new Object[0]; } + @Override public Image getColumnImage(Object element, int columnIndex) { return AvailableJarsProvider.getUtilImage(); } + @Override public String getColumnText(Object element, int columnIndex) { ArchiveWrapper wrapper = (ArchiveWrapper)element; return wrapper.getName(); } + @Override public void dispose() { } + @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { } + @Override public void addListener(ILabelProviderListener listener) { } + @Override public boolean isLabelProperty(Object element, String property) { return false; } + @Override public void removeListener(ILabelProviderListener listener) { } } diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/ConvertToWebModuleTypeDialog.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/ConvertToWebModuleTypeDialog.java index cb8365255..8d54c1cbb 100644 --- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/ConvertToWebModuleTypeDialog.java +++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/ConvertToWebModuleTypeDialog.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2003, 2006 IBM Corporation and others. + * Copyright (c) 2003, 2019 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 diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/FilterMappingsArrayTableWizardSection.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/FilterMappingsArrayTableWizardSection.java index 15f2be9ab..65edfcad8 100644 --- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/FilterMappingsArrayTableWizardSection.java +++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/FilterMappingsArrayTableWizardSection.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008 SAP AG and others. + * Copyright (c) 2008, 2019 SAP AG 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 @@ -60,15 +60,18 @@ public class FilterMappingsArrayTableWizardSection extends Composite implements public boolean isDeleted(Object element) { return false; } + @Override public Object[] getElements(Object element) { if (element instanceof List) { return ((List<FilterMappingItem>) element).toArray(); } return new Object[0]; } + @Override public void inputChanged(Viewer aViewer, Object oldInput, Object newInput) { //Default nothing } + @Override public void dispose() { //Default nothing } @@ -79,7 +82,8 @@ public class FilterMappingsArrayTableWizardSection extends Composite implements private final Image SERVLET_ICON = ImageDescriptor.createFromURL((URL) WebPlugin.getDefault().getImage("servlet")).createImage(); //$NON-NLS-1$ - public Image getColumnImage(Object element, int columnIndex) { + @Override + public Image getColumnImage(Object element, int columnIndex) { if (columnIndex == 0) { FilterMappingItem item = (FilterMappingItem) element; if (item.isServletNameType()) { @@ -92,6 +96,7 @@ public class FilterMappingsArrayTableWizardSection extends Composite implements return null; } + @Override public String getColumnText(Object element, int columnIndex) { if (columnIndex == 1) { return ((FilterMappingItem) element).getName(); @@ -151,10 +156,12 @@ public class FilterMappingsArrayTableWizardSection extends Composite implements addButton.setText(ADD_BUTTON_LABEL_D); addButton.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING | GridData.HORIZONTAL_ALIGN_FILL)); addButton.addSelectionListener(new SelectionListener() { - public void widgetSelected(SelectionEvent event) { + @Override + public void widgetSelected(SelectionEvent event) { handleAddButtonSelected(); } - public void widgetDefaultSelected(SelectionEvent event) { + @Override + public void widgetDefaultSelected(SelectionEvent event) { //Do nothing } }); @@ -163,10 +170,12 @@ public class FilterMappingsArrayTableWizardSection extends Composite implements editButton.setText(EDIT_BUTTON_LABEL_T); editButton.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING | GridData.HORIZONTAL_ALIGN_FILL)); editButton.addSelectionListener(new SelectionListener() { - public void widgetSelected(SelectionEvent event) { + @Override + public void widgetSelected(SelectionEvent event) { handleEditButtonSelected(); } - public void widgetDefaultSelected(SelectionEvent event) { + @Override + public void widgetDefaultSelected(SelectionEvent event) { //Do nothing } }); @@ -176,17 +185,20 @@ public class FilterMappingsArrayTableWizardSection extends Composite implements removeButton.setText(REMOVE_BUTTON_LABEL_V); removeButton.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING | GridData.HORIZONTAL_ALIGN_FILL)); removeButton.addSelectionListener(new SelectionListener() { - public void widgetSelected(SelectionEvent event) { + @Override + public void widgetSelected(SelectionEvent event) { handleRemoveButtonSelected(); } - public void widgetDefaultSelected(SelectionEvent event) { + @Override + public void widgetDefaultSelected(SelectionEvent event) { //Do nothing } }); removeButton.setEnabled(false); viewer.addSelectionChangedListener(new ISelectionChangedListener() { - public void selectionChanged(SelectionChangedEvent event) { + @Override + public void selectionChanged(SelectionChangedEvent event) { ISelection selection = event.getSelection(); if (editButton != null) { boolean enabled = ((IStructuredSelection) selection).size() == 1; @@ -198,6 +210,7 @@ public class FilterMappingsArrayTableWizardSection extends Composite implements if (editButton != null) { viewer.addDoubleClickListener(new IDoubleClickListener() { + @Override public void doubleClick(DoubleClickEvent event) { handleEditButtonSelected(); } @@ -341,6 +354,7 @@ public class FilterMappingsArrayTableWizardSection extends Composite implements return valueList; } + @Override public void propertyChanged(DataModelEvent event) { if (this.propertyName.equals(event.getPropertyName())) { viewer.setInput(event.getProperty()); diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/IWebWizardConstants.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/IWebWizardConstants.java index 3d128f6d3..8aae8b26a 100644 --- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/IWebWizardConstants.java +++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/IWebWizardConstants.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2003, 2006 IBM Corporation and others. + * Copyright (c) 2003, 2019 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 diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/MultiSelectFilteredFileSelectionDialog.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/MultiSelectFilteredFileSelectionDialog.java index 0eb81237d..375e95c71 100644 --- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/MultiSelectFilteredFileSelectionDialog.java +++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/MultiSelectFilteredFileSelectionDialog.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2003, 2008 IBM Corporation and others. + * Copyright (c) 2003, 2019 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 @@ -364,16 +364,19 @@ public class MultiSelectFilteredFileSelectionDialog extends Table list = new Table(parent, SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL); list.addListener(SWT.Selection, new Listener() { + @Override public void handleEvent(Event evt) { handleLowerSelectionChanged(); } }); list.addListener(SWT.MouseDoubleClick, new Listener() { + @Override public void handleEvent(Event evt) { handleLowerDoubleClick(); } }); list.addDisposeListener(new DisposeListener() { + @Override public void widgetDisposed(DisposeEvent e) { fQualifierRenderer.dispose(); } @@ -402,6 +405,7 @@ public class MultiSelectFilteredFileSelectionDialog extends spec.verticalAlignment = GridData.BEGINNING; text.setLayoutData(spec); Listener l = new Listener() { + @Override public void handleEvent(Event evt) { rematch(fText.getText()); } @@ -420,16 +424,19 @@ public class MultiSelectFilteredFileSelectionDialog extends Table list = new Table(parent, SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL); list.addListener(SWT.Selection, new Listener() { + @Override public void handleEvent(Event evt) { handleUpperSelectionChanged(); } }); list.addListener(SWT.MouseDoubleClick, new Listener() { + @Override public void handleEvent(Event evt) { handleUpperDoubleClick(); } }); list.addDisposeListener(new DisposeListener() { + @Override public void widgetDisposed(DisposeEvent e) { fElementRenderer.dispose(); } @@ -633,6 +640,7 @@ public class MultiSelectFilteredFileSelectionDialog extends * * @param e an event containing information about the default selection */ + @Override public void widgetDefaultSelected(SelectionEvent e) { // Do nothing } @@ -646,6 +654,7 @@ public class MultiSelectFilteredFileSelectionDialog extends * * @param e an event containing information about the selection */ + @Override public void widgetSelected(SelectionEvent e) { if (e.widget == fJSPButton) { fSelection = JSP; diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/MultiSelectFilteredFilterFileSelectionDialog.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/MultiSelectFilteredFilterFileSelectionDialog.java index 3e807a862..0120cb229 100644 --- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/MultiSelectFilteredFilterFileSelectionDialog.java +++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/MultiSelectFilteredFilterFileSelectionDialog.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2008 SAP AG and others. + * Copyright (c) 2007, 2019 SAP AG 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 @@ -329,16 +329,19 @@ public class MultiSelectFilteredFilterFileSelectionDialog extends Table list = new Table(parent, SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL); list.addListener(SWT.Selection, new Listener() { + @Override public void handleEvent(Event evt) { handleLowerSelectionChanged(); } }); list.addListener(SWT.MouseDoubleClick, new Listener() { + @Override public void handleEvent(Event evt) { handleLowerDoubleClick(); } }); list.addDisposeListener(new DisposeListener() { + @Override public void widgetDisposed(DisposeEvent e) { fQualifierRenderer.dispose(); } @@ -367,6 +370,7 @@ public class MultiSelectFilteredFilterFileSelectionDialog extends spec.verticalAlignment = GridData.BEGINNING; text.setLayoutData(spec); Listener l = new Listener() { + @Override public void handleEvent(Event evt) { rematch(fText.getText()); } @@ -385,16 +389,19 @@ public class MultiSelectFilteredFilterFileSelectionDialog extends Table list = new Table(parent, SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL); list.addListener(SWT.Selection, new Listener() { + @Override public void handleEvent(Event evt) { handleUpperSelectionChanged(); } }); list.addListener(SWT.MouseDoubleClick, new Listener() { + @Override public void handleEvent(Event evt) { handleUpperDoubleClick(); } }); list.addDisposeListener(new DisposeListener() { + @Override public void widgetDisposed(DisposeEvent e) { fElementRenderer.dispose(); } diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/MultiSelectFilteredListenerFileSelectionDialog.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/MultiSelectFilteredListenerFileSelectionDialog.java index ba224c134..08ca7c6af 100644 --- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/MultiSelectFilteredListenerFileSelectionDialog.java +++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/MultiSelectFilteredListenerFileSelectionDialog.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 IBM Corporation and others. + * Copyright (c) 2011, 2019 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 @@ -324,16 +324,19 @@ public class MultiSelectFilteredListenerFileSelectionDialog extends Table list = new Table(parent, SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL); list.addListener(SWT.Selection, new Listener() { + @Override public void handleEvent(Event evt) { handleLowerSelectionChanged(); } }); list.addListener(SWT.MouseDoubleClick, new Listener() { + @Override public void handleEvent(Event evt) { handleLowerDoubleClick(); } }); list.addDisposeListener(new DisposeListener() { + @Override public void widgetDisposed(DisposeEvent e) { fQualifierRenderer.dispose(); } @@ -362,6 +365,7 @@ public class MultiSelectFilteredListenerFileSelectionDialog extends spec.verticalAlignment = GridData.BEGINNING; text.setLayoutData(spec); Listener l = new Listener() { + @Override public void handleEvent(Event evt) { rematch(fText.getText()); } @@ -380,16 +384,19 @@ public class MultiSelectFilteredListenerFileSelectionDialog extends Table list = new Table(parent, SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL); list.addListener(SWT.Selection, new Listener() { + @Override public void handleEvent(Event evt) { handleUpperSelectionChanged(); } }); list.addListener(SWT.MouseDoubleClick, new Listener() { + @Override public void handleEvent(Event evt) { handleUpperDoubleClick(); } }); list.addDisposeListener(new DisposeListener() { + @Override public void widgetDisposed(DisposeEvent e) { fElementRenderer.dispose(); } diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewFilterClassOptionsWizardPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewFilterClassOptionsWizardPage.java index bbb7163cf..fd88cf917 100644 --- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewFilterClassOptionsWizardPage.java +++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewFilterClassOptionsWizardPage.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2008 SAP AG and others. + * Copyright (c) 2007, 2019 SAP AG 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 @@ -72,6 +72,7 @@ public class NewFilterClassOptionsWizardPage extends Dialog.applyDialogFont(parent); } + @Override public void selectionChanged(SelectionChangedEvent event) { StructuredSelection selection = (StructuredSelection) event.getSelection(); diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewFilterClassWizardPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewFilterClassWizardPage.java index 6f6b3b2ef..22b245ad3 100644 --- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewFilterClassWizardPage.java +++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewFilterClassWizardPage.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2008 SAP AG and others. + * Copyright (c) 2007, 2023 SAP AG 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 @@ -162,9 +162,11 @@ public class NewFilterClassWizardPage extends NewWebClassWizardPage { // get the version of the web facet IProjectFacetVersion facetVersion = JavaEEProjectUtilities.getProjectFacetVersion(project, IJ2EEFacetConstants.DYNAMIC_WEB); - if (facetVersion == null) - return false; - + if (facetVersion == null) { + // no facet, use generic validity + return result; + } + // convert the version to an integer int version = J2EEVersionUtil.convertVersionStringToInt(facetVersion.getVersionString()); diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewListenerClassOptionsWizardPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewListenerClassOptionsWizardPage.java index df72b2106..a1ea034a7 100644 --- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewListenerClassOptionsWizardPage.java +++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewListenerClassOptionsWizardPage.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2008 SAP AG and others. + * Copyright (c) 2007, 2019 SAP AG 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 diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewListenerClassWizardPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewListenerClassWizardPage.java index 2e57b8a10..11cf8007c 100644 --- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewListenerClassWizardPage.java +++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewListenerClassWizardPage.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2008 SAP AG and others. + * Copyright (c) 2007, 2019 SAP AG 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 diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewServletClassOptionsWizardPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewServletClassOptionsWizardPage.java index bc69c08fb..f7ae6d359 100644 --- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewServletClassOptionsWizardPage.java +++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewServletClassOptionsWizardPage.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2003, 2008 IBM Corporation and others. + * Copyright (c) 2003, 2019 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 @@ -76,12 +76,14 @@ public class NewServletClassOptionsWizardPage extends super.createStubsComposite(parent); inheritButton.addSelectionListener(new SelectionListener() { + @Override public void widgetSelected(SelectionEvent e) { boolean enable = inheritButton.getSelection(); enableGenericServletButtons(enable); enableHttpServletButtons(enable); } + @Override public void widgetDefaultSelected(SelectionEvent e) { //Do nothing } @@ -168,6 +170,7 @@ public class NewServletClassOptionsWizardPage extends Dialog.applyDialogFont(parent); } + @Override public void selectionChanged(SelectionChangedEvent event) { IStructuredSelection selection = (IStructuredSelection) event.getSelection(); removeButton.setEnabled(canRemoveSelectedInterfaces(selection)); @@ -177,9 +180,11 @@ public class NewServletClassOptionsWizardPage extends protected KeyListener getInterfaceKeyListener() { return new KeyListener() { + @Override public void keyPressed(KeyEvent e) { } + @Override public void keyReleased(KeyEvent e) { if (e.keyCode == SWT.DEL) { IStructuredSelection selection = (IStructuredSelection) interfaceViewer.getSelection(); diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewServletClassWizardPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewServletClassWizardPage.java index aa565f986..5176c945f 100644 --- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewServletClassWizardPage.java +++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewServletClassWizardPage.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2003, 2008 IBM Corporation and others. + * Copyright (c) 2003, 2021 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 diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewWebArtifactWizard.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewWebArtifactWizard.java index 3a55a9952..6e5655d86 100644 --- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewWebArtifactWizard.java +++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewWebArtifactWizard.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008 SAP AG and others. + * Copyright (c) 2008, 2019 SAP AG 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 @@ -136,6 +136,7 @@ public abstract class NewWebArtifactWizard extends NewWebWizard { if (getDataModel().getBooleanProperty(OPEN_IN_EDITOR)) { if (file != null) { getShell().getDisplay().asyncExec(new Runnable() { + @Override public void run() { try { IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage(); diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewWebClassOptionsWizardPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewWebClassOptionsWizardPage.java index 7cc1d25de..78298ab49 100644 --- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewWebClassOptionsWizardPage.java +++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewWebClassOptionsWizardPage.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2008 SAP AG and others. + * Copyright (c) 2007, 2019 SAP AG 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 diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewWebClassWizardPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewWebClassWizardPage.java index e47da0bd1..704576719 100644 --- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewWebClassWizardPage.java +++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewWebClassWizardPage.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2008 SAP AG and others. + * Copyright (c) 2007, 2023 SAP AG 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 @@ -28,8 +28,10 @@ import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jdt.core.IJavaElement; +import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.IType; import org.eclipse.jdt.core.ITypeHierarchy; +import org.eclipse.jdt.core.JavaCore; import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jem.util.emf.workbench.ProjectUtilities; import org.eclipse.jface.dialogs.Dialog; @@ -202,20 +204,26 @@ public abstract class NewWebClassWizardPage extends NewJavaClassWizardPage { return; } IVirtualComponent component = ComponentCore.createComponent(project); - if(component.getRootFolder() != null - && component.getRootFolder().getUnderlyingFolder() != null){ - IVirtualFile ddXmlFile = component.getRootFolder().getFile(new Path(J2EEConstants.WEBAPP_DD_URI)); - if (!ddXmlFile.exists()) - { - // add a flag into the model to create the DD at the beginning of the operation - model.setBooleanProperty(GENERATE_DD, Boolean.TRUE); - } - else - { - // don't create a DD, since one already exists. - model.setBooleanProperty(GENERATE_DD, Boolean.FALSE); + if (component != null && component.exists()) { + if (component.getRootFolder() != null + && component.getRootFolder().getUnderlyingFolder() != null){ + IVirtualFile ddXmlFile = component.getRootFolder().getFile(new Path(J2EEConstants.WEBAPP_DD_URI)); + if (!ddXmlFile.exists()) + { + // add a flag into the model to create the DD at the beginning of the operation + model.setBooleanProperty(GENERATE_DD, Boolean.TRUE); + } + else + { + // don't create a DD, since one already exists. + model.setBooleanProperty(GENERATE_DD, Boolean.FALSE); + } } } + else { + // Not a module core project, or there's no deployment descriptor + model.setBooleanProperty(GENERATE_DD, Boolean.FALSE); + } } protected Object getSelectedObject() { @@ -270,7 +278,7 @@ public abstract class NewWebClassWizardPage extends NewJavaClassWizardPage { if (obj instanceof org.eclipse.jst.j2ee.webapplication.Servlet) return true; - return isObjectSubclassOf(obj, IServletConstants.QUALIFIED_SERVLET); + return isObjectSubclassOf(obj, IServletConstants.QUALIFIED_JAKARTA_GENERIC_SERVLET) || isObjectSubclassOf(obj, IServletConstants.QUALIFIED_GENERIC_SERVLET); } protected boolean isFilter(Object obj) { @@ -280,7 +288,7 @@ public abstract class NewWebClassWizardPage extends NewJavaClassWizardPage { if (obj instanceof org.eclipse.jst.j2ee.webapplication.Filter) return true; - return isObjectSubclassOf(obj, IServletConstants.QUALIFIED_FILTER); + return isObjectSubclassOf(obj, IServletConstants.QUALIFIED_JAKARTA_FILTER) || isObjectSubclassOf(obj, IServletConstants.QUALIFIED_FILTER); } private String getJavaClass(Object obj) { @@ -437,11 +445,21 @@ public abstract class NewWebClassWizardPage extends NewJavaClassWizardPage { @Override protected boolean isProjectValid(IProject project) { + if (!project.isAccessible()) + return false; + boolean result; try { - result = project.isAccessible() && - project.hasNature(IModuleConstants.MODULE_NATURE_ID) && + result = project.hasNature(IModuleConstants.MODULE_NATURE_ID) && (JavaEEProjectUtilities.isDynamicWebProject(project) || JavaEEProjectUtilities.isWebFragmentProject(project)); + if (!result) { // fallback to heuristics + IJavaProject javaProject = JavaCore.create(project); + if (javaProject.exists()) { + if (javaProject.findType(IServletConstants.QUALIFIED_JAKARTA_GENERIC_SERVLET) != null || javaProject.findType(IServletConstants.QUALIFIED_GENERIC_SERVLET) != null) { + result = true; + } + } + } } catch (CoreException ce) { result = false; } diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewWebWizard.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewWebWizard.java index 46a8699d5..bc1b9636b 100644 --- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewWebWizard.java +++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewWebWizard.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2003, 2008 IBM Corporation and others. + * Copyright (c) 2003, 2019 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 @@ -39,6 +39,7 @@ public abstract class NewWebWizard extends DataModelWizard implements INewWizard super(); } + @Override public void init(IWorkbench workbench, IStructuredSelection selection) { getDataModel(); } diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/ServletDataModelSyncHelper.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/ServletDataModelSyncHelper.java index e54cb013a..fc222cb4c 100644 --- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/ServletDataModelSyncHelper.java +++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/ServletDataModelSyncHelper.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2009 SAP AG and others. + * Copyright (c) 2007, 2019 SAP AG 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 @@ -49,6 +49,7 @@ public class ServletDataModelSyncHelper extends DataModelSynchHelper { public void synchUIWithModel(final String propertyName, final int flag) { if (null != propertyToWidgetHash && propertyToWidgetHash.containsKey(propertyName)) { Display.getDefault().syncExec(new Runnable() { + @Override public void run() { try { Object obj = propertyToWidgetHash.get(propertyName); @@ -118,6 +119,7 @@ public class ServletDataModelSyncHelper extends DataModelSynchHelper { } private class MultipleCheckboxSelectionListener implements SelectionListener { + @Override public void widgetSelected(SelectionEvent e) { Button button = (Button) e.getSource(); if (currentWidget == button) @@ -150,6 +152,7 @@ public class ServletDataModelSyncHelper extends DataModelSynchHelper { + @Override public void widgetDefaultSelected(SelectionEvent e) { } } diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/ServletProjectConfigurator.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/ServletProjectConfigurator.java index ac1201b30..a82df514e 100644 --- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/ServletProjectConfigurator.java +++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/ServletProjectConfigurator.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2016 Red Hat Inc. + * Copyright (c) 2016, 2019 Red Hat Inc. * 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 @@ -46,6 +46,7 @@ import org.w3c.dom.Element; public class ServletProjectConfigurator implements ProjectConfigurator { + @Override public boolean canConfigure(IProject project, Set<IPath> ignoredDirectories, IProgressMonitor monitor) { try { RecursiveFileFinder finder = new RecursiveFileFinder(J2EEConstants.WEBAPP_DD_SHORT_NAME, ignoredDirectories); @@ -62,6 +63,7 @@ public class ServletProjectConfigurator implements ProjectConfigurator { return null; } + @Override public void configure(IProject project, Set<IPath> ignoredDirectories, IProgressMonitor monitor) { try { if (!ProjectFacetsManager.isProjectFacetDefined(project.getName())) { @@ -102,6 +104,7 @@ public class ServletProjectConfigurator implements ProjectConfigurator { } } + @Override public boolean shouldBeAnEclipseProject(IContainer container, IProgressMonitor monitor) { return false; // TODO: can we make sure a dir is a JEE project? } @@ -110,10 +113,12 @@ public class ServletProjectConfigurator implements ProjectConfigurator { return null; } + @Override public Set<File> findConfigurableLocations(File root, IProgressMonitor monitor) { return Collections.emptySet(); } + @Override public Set<IFolder> getFoldersToIgnore(IProject project, IProgressMonitor monitor) { return null; } diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/SimpleTypedElementSelectionValidator.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/SimpleTypedElementSelectionValidator.java index fcad682c6..9bffa5eff 100644 --- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/SimpleTypedElementSelectionValidator.java +++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/SimpleTypedElementSelectionValidator.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006 IBM Corporation and others. + * Copyright (c) 2006, 2019 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 @@ -43,6 +43,7 @@ public class SimpleTypedElementSelectionValidator implements ISelectionStatusVal /* * @see org.eclipse.ui.dialogs.ISelectionValidator#isValid(java.lang.Object) */ + @Override public IStatus validate(Object[] elements) { if (isValid(elements)) { return fgOKStatus; diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/StringArrayTableWizardSectionCallback.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/StringArrayTableWizardSectionCallback.java index c9b780946..d4e3ed5c7 100644 --- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/StringArrayTableWizardSectionCallback.java +++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/StringArrayTableWizardSectionCallback.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 SAP AG and others. + * Copyright (c) 2007, 2019 SAP AG 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 @@ -23,6 +23,7 @@ public class StringArrayTableWizardSectionCallback implements /** * The first text field should not be empty. */ + @Override public boolean validate(Text[] texts) { if (texts.length > 0) { return texts[0].getText().trim().length() > 0; @@ -33,6 +34,7 @@ public class StringArrayTableWizardSectionCallback implements /** * Trims the text values. */ + @Override public String[] retrieveResultStrings(Text[] texts) { int n = texts.length; String[] result = new String[n]; diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/StringMatcher.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/StringMatcher.java index 4284e499d..7728e83b4 100644 --- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/StringMatcher.java +++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/StringMatcher.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2006 IBM Corporation and others. + * Copyright (c) 2000, 2019 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 diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebAppLibrariesContainerPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebAppLibrariesContainerPage.java index 6544f99f1..4b4e61ac3 100644 --- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebAppLibrariesContainerPage.java +++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebAppLibrariesContainerPage.java @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2006 BEA Systems, Inc. + * Copyright (c) 2006, 2019 BEA Systems, Inc. * 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 @@ -60,7 +60,8 @@ public class WebAppLibrariesContainerPage setDescription( Resources.pageDescription ); } - public IClasspathEntry getSelection() + @Override + public IClasspathEntry getSelection() { IPath path = new Path( WebAppLibrariesContainer.CONTAINER_ID ); @@ -78,7 +79,8 @@ public class WebAppLibrariesContainerPage return JavaCore.newContainerEntry( path ); } - public void setSelection( final IClasspathEntry cpentry ) + @Override + public void setSelection( final IClasspathEntry cpentry ) { final IPath path = cpentry == null ? null : cpentry.getPath(); @@ -95,7 +97,8 @@ public class WebAppLibrariesContainerPage } } - public void createControl( final Composite parent ) + @Override + public void createControl( final Composite parent ) { final Composite composite = new Composite( parent, SWT.NONE ); composite.setLayout( new GridLayout( 2, false ) ); @@ -140,12 +143,14 @@ public class WebAppLibrariesContainerPage setControl( composite ); } - public boolean finish() + @Override + public boolean finish() { return true; } - public void initialize( final IJavaProject project, + @Override + public void initialize( final IJavaProject project, final IClasspathEntry[] currentEntries ) { this.ownerProject = ( project == null ? null : project.getProject() ); diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebAppLibrariesContainerPage.properties b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebAppLibrariesContainerPage.properties index e26ef0028..764925cbb 100644 --- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebAppLibrariesContainerPage.properties +++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebAppLibrariesContainerPage.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2005, 2006 IBM Corporation and others. +# Copyright (c) 2005, 2019 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 diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentExportPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentExportPage.java index 305e87908..eeed4a561 100644 --- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentExportPage.java +++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentExportPage.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2003, 2006 IBM Corporation and others. + * Copyright (c) 2003, 2019 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 diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentExportWizard.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentExportWizard.java index 545f30411..dcb97d3a3 100644 --- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentExportWizard.java +++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentExportWizard.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2003, 2005 IBM Corporation and others. + * Copyright (c) 2003, 2019 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 diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentImportPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentImportPage.java index 790af73a8..bf8ed704a 100644 --- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentImportPage.java +++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentImportPage.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2003, 2006 IBM Corporation and others. + * Copyright (c) 2003, 2019 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 diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentImportWebLibsPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentImportWebLibsPage.java index deee2ba5e..2dc39963e 100644 --- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentImportWebLibsPage.java +++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentImportWebLibsPage.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2003, 2007 IBM Corporation and others. + * Copyright (c) 2003, 2019 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 @@ -98,11 +98,13 @@ public class WebComponentImportWebLibsPage extends J2EEImportPage { availableJARsViewer.setContentProvider(libsProvider); availableJARsViewer.setLabelProvider(libsProvider); availableJARsViewer.addCheckStateListener(new ICheckStateListener() { + @Override public void checkStateChanged(CheckStateChangedEvent event) { availableJARCheckStateChanged(event); } }); availableJARsViewer.addSelectionChangedListener(new ISelectionChangedListener() { + @Override public void selectionChanged(SelectionChangedEvent event) { updateButtonEnablements(); } @@ -113,6 +115,7 @@ public class WebComponentImportWebLibsPage extends J2EEImportPage { availableJARsViewer.getTable().setLinesVisible(false); model.addListener(new IDataModelListener() { + @Override public void propertyChanged(DataModelEvent event) { if (event.getPropertyName().equals(IWebComponentImportDataModelProperties.WEB_LIB_ARCHIVES_SELECTED)) { availableJARsViewer.setCheckedElements(((List) model.getProperty(IWebComponentImportDataModelProperties.WEB_LIB_ARCHIVES_SELECTED)).toArray()); diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentImportWizard.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentImportWizard.java index c49d08fa0..dc321b621 100644 --- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentImportWizard.java +++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentImportWizard.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2003, 2006 IBM Corporation and others. + * Copyright (c) 2003, 2019 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 diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebAppSelectionPanel.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebAppSelectionPanel.java index a10f0ec39..d3c790d33 100644 --- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebAppSelectionPanel.java +++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebAppSelectionPanel.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010 IBM Corporation and others. + * Copyright (c) 2010, 2019 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 diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebAppSelectionPanel.properties b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebAppSelectionPanel.properties index 0aa70d8fd..d22a7f1ad 100644 --- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebAppSelectionPanel.properties +++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebAppSelectionPanel.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2010 IBM Corporation and others. +# Copyright (c) 2010, 2019 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 diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFacetInstallPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFacetInstallPage.java index 0a718b6b7..b56adedab 100644 --- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFacetInstallPage.java +++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFacetInstallPage.java @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2005, 2006 BEA Systems, Inc. and others. + * Copyright (c) 2005, 2019 BEA Systems, Inc. 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 diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFacetInstallPage.properties b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFacetInstallPage.properties index c40857709..7d74829db 100644 --- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFacetInstallPage.properties +++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFacetInstallPage.properties @@ -1,3 +1,15 @@ +############################################################################### +# Copyright (c) 2005, 2023 IBM Corporation and others. +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which accompanies this distribution, and is available at +# https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 +# +# Contributors: +# IBM Corporation - initial API and implementation +############################################################################### pageTitle = Web Module pageDescription = Configure web module settings. contextRootLabel = Context &root: diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFragmentProjectContentProvider.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFragmentProjectContentProvider.java index ff06f0e6f..e62ccfa59 100644 --- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFragmentProjectContentProvider.java +++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFragmentProjectContentProvider.java @@ -1,6 +1,6 @@ /******************************************************************************* - * Copyright (c) 2010 IBM Corporation and others. + * Copyright (c) 2010, 2019 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 @@ -26,14 +26,17 @@ import org.eclipse.wst.common.project.facet.core.FacetedProjectFramework; public class WebFragmentProjectContentProvider implements IStructuredContentProvider { + @Override public void dispose() { // Do nothing } + @Override public void inputChanged(Viewer arg0, Object arg1, Object arg2) { // Do nothing } + @Override public Object[] getElements(Object arg0) { if (arg0 instanceof IWorkspaceRoot) { IProject[] projects = ((IWorkspaceRoot) arg0).getProjects(); diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFragmentProjectFirstPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFragmentProjectFirstPage.java index f23d5900f..841947a00 100644 --- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFragmentProjectFirstPage.java +++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFragmentProjectFirstPage.java @@ -1,6 +1,6 @@ /******************************************************************************* - * Copyright (c) 2010 IBM Corporation and others. + * Copyright (c) 2010, 2019 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 diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFragmentProjectFirstPage.properties b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFragmentProjectFirstPage.properties index 540c6463d..78984ba86 100644 --- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFragmentProjectFirstPage.properties +++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFragmentProjectFirstPage.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2010 IBM Corporation and others. +# Copyright (c) 2010, 2019 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 diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFragmentProjectLabelProvider.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFragmentProjectLabelProvider.java index 166106e90..3f20d6d0c 100644 --- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFragmentProjectLabelProvider.java +++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFragmentProjectLabelProvider.java @@ -1,6 +1,6 @@ /******************************************************************************* - * Copyright (c) 2010 IBM Corporation and others. + * Copyright (c) 2010, 2019 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 diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFragmentProjectWizard.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFragmentProjectWizard.java index 4574c6970..df002e3ed 100644 --- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFragmentProjectWizard.java +++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFragmentProjectWizard.java @@ -1,6 +1,6 @@ /******************************************************************************* - * Copyright (c) 2010 IBM Corporation and others. + * Copyright (c) 2010, 2019 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 diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebProjectFirstPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebProjectFirstPage.java index 815e51187..72824cf59 100644 --- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebProjectFirstPage.java +++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebProjectFirstPage.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2003, 2006 IBM Corporation and others. + * Copyright (c) 2003, 2019 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 diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebProjectWizard.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebProjectWizard.java index db8e15bc0..bcc5f5560 100644 --- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebProjectWizard.java +++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebProjectWizard.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2003, 2006 IBM Corporation and others. + * Copyright (c) 2003, 2019 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 |