Attachment 90078 Details for Bug 219377 – Add the default compiler prefs & fixes

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Add the default compiler prefs & fixes

bug219377patch (text/plain), 64.15 KB, created by Carl Anderson

on 2008-02-19 11:19:43 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Carl Anderson

Created: 2008-02-19 11:19:43 EST

Size: 64.15 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jst.j2ee.jca
>Index: jca/org/eclipse/jst/j2ee/jca/project/facet/ConnectorFacetProjectCreationDataModelProvider.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/project/facet/ConnectorFacetProjectCreationDataModelProvider.java,v
>retrieving revision 1.10
>diff -u -r1.10 ConnectorFacetProjectCreationDataModelProvider.java
>--- jca/org/eclipse/jst/j2ee/jca/project/facet/ConnectorFacetProjectCreationDataModelProvider.java	10 Nov 2007 22:07:23 -0000	1.10
>+++ jca/org/eclipse/jst/j2ee/jca/project/facet/ConnectorFacetProjectCreationDataModelProvider.java	19 Feb 2008 16:14:43 -0000
>@@ -14,19 +14,14 @@
> import java.util.Collection;
> 
> import org.eclipse.jst.common.project.facet.IJavaFacetInstallDataModelProperties;
>-import org.eclipse.jst.common.project.facet.JavaFacetInstallDataModelProvider;
> import org.eclipse.jst.common.project.facet.JavaFacetUtils;
>-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
> import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetConstants;
> import org.eclipse.jst.j2ee.project.facet.IJ2EEModuleFacetInstallDataModelProperties;
> import org.eclipse.jst.j2ee.project.facet.J2EEFacetProjectCreationDataModelProvider;
>-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
> import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent;
>-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
> import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
> import org.eclipse.wst.common.frameworks.datamodel.IDataModelListener;
> import org.eclipse.wst.common.project.facet.core.IProjectFacet;
>-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
> import org.eclipse.wst.project.facet.ProductManager;
> 
> public class ConnectorFacetProjectCreationDataModelProvider extends J2EEFacetProjectCreationDataModelProvider {
>@@ -68,7 +63,7 @@
> 	public boolean propertySet(String propertyName, Object propertyValue) {
> 		if( propertyName.equals( MODULE_URI )){
> 			FacetDataModelMap map = (FacetDataModelMap) getProperty(FACET_DM_MAP);
>-			IDataModel rarFacet = map.getFacetDataModel( J2EEProjectUtilities.JCA );	
>+			IDataModel rarFacet = map.getFacetDataModel( IJ2EEFacetConstants.JCA );	
> 			rarFacet.setProperty( IJ2EEModuleFacetInstallDataModelProperties.MODULE_URI, propertyValue );
> 		}
> 		return super.propertySet(propertyName, propertyValue);
>Index: jca/org/eclipse/jst/j2ee/jca/project/facet/ConnectorFacetPostInstallDelegate.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/project/facet/ConnectorFacetPostInstallDelegate.java,v
>retrieving revision 1.4
>diff -u -r1.4 ConnectorFacetPostInstallDelegate.java
>--- jca/org/eclipse/jst/j2ee/jca/project/facet/ConnectorFacetPostInstallDelegate.java	10 Nov 2007 00:27:23 -0000	1.4
>+++ jca/org/eclipse/jst/j2ee/jca/project/facet/ConnectorFacetPostInstallDelegate.java	19 Feb 2008 16:14:43 -0000
>@@ -16,14 +16,12 @@
> import org.eclipse.core.runtime.CoreException;
> import org.eclipse.core.runtime.IProgressMonitor;
> import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
>-import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetInstallDataModelProperties;
> import org.eclipse.jst.j2ee.project.facet.IJ2EEModuleFacetInstallDataModelProperties;
> import org.eclipse.jst.j2ee.project.facet.J2EEFacetInstallDelegate;
> import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
> import org.eclipse.wst.common.project.facet.core.IDelegate;
> import org.eclipse.wst.common.project.facet.core.IFacetedProjectWorkingCopy;
> import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
>-import org.eclipse.wst.common.project.facet.core.runtime.IRuntime;
> 
> public class ConnectorFacetPostInstallDelegate extends J2EEFacetInstallDelegate implements IDelegate {
> 
>Index: .settings/org.eclipse.jdt.core.prefs
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.jca/.settings/org.eclipse.jdt.core.prefs,v
>retrieving revision 1.1
>diff -u -r1.1 org.eclipse.jdt.core.prefs
>--- .settings/org.eclipse.jdt.core.prefs	10 May 2007 22:55:12 -0000	1.1
>+++ .settings/org.eclipse.jdt.core.prefs	19 Feb 2008 16:14:43 -0000
>@@ -1,7 +1,62 @@
>-#Thu May 10 18:34:52 EDT 2007
>+#Mon Feb 18 15:57:09 EST 2008
> eclipse.preferences.version=1
>+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
> org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
>+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
> org.eclipse.jdt.core.compiler.compliance=1.5
>+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
>+org.eclipse.jdt.core.compiler.debug.localVariable=generate
>+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
>+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=ignore
> org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
>+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
>+org.eclipse.jdt.core.compiler.problem.deprecation=warning
>+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
>+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
>+org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
> org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
>+org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
>+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
>+org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
>+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
>+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
>+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
>+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error
>+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
>+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
>+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
>+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
>+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
>+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
>+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
>+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
>+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error
>+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
>+org.eclipse.jdt.core.compiler.problem.nullReference=ignore
>+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
>+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
>+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
>+org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
>+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
>+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
>+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
>+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
>+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
>+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=error
>+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
>+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
>+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=ignore
>+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
>+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
>+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
>+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
>+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
>+org.eclipse.jdt.core.compiler.problem.unusedImport=error
>+org.eclipse.jdt.core.compiler.problem.unusedLabel=error
>+org.eclipse.jdt.core.compiler.problem.unusedLocal=ignore
>+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
>+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
>+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
>+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
>+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=ignore
> org.eclipse.jdt.core.compiler.source=1.5
>#P org.eclipse.jst.ejb.ui
>Index: .settings/org.eclipse.jdt.core.prefs
>===================================================================
>RCS file: /cvsroot/webtools/ejbtools/plugins/org.eclipse.jst.ejb.ui/.settings/org.eclipse.jdt.core.prefs,v
>retrieving revision 1.1
>diff -u -r1.1 org.eclipse.jdt.core.prefs
>--- .settings/org.eclipse.jdt.core.prefs	10 May 2007 22:54:46 -0000	1.1
>+++ .settings/org.eclipse.jdt.core.prefs	19 Feb 2008 16:14:44 -0000
>@@ -1,7 +1,62 @@
>-#Thu May 10 18:33:32 EDT 2007
>+#Mon Feb 18 15:57:09 EST 2008
> eclipse.preferences.version=1
>+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
> org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
>+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
> org.eclipse.jdt.core.compiler.compliance=1.5
>+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
>+org.eclipse.jdt.core.compiler.debug.localVariable=generate
>+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
>+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=ignore
> org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
>+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
>+org.eclipse.jdt.core.compiler.problem.deprecation=warning
>+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
>+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
>+org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
> org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
>+org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
>+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
>+org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
>+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
>+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
>+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
>+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error
>+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
>+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
>+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
>+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
>+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
>+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
>+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
>+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
>+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error
>+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
>+org.eclipse.jdt.core.compiler.problem.nullReference=ignore
>+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
>+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
>+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
>+org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
>+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
>+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
>+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
>+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
>+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
>+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=error
>+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
>+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
>+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=ignore
>+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
>+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
>+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
>+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
>+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
>+org.eclipse.jdt.core.compiler.problem.unusedImport=error
>+org.eclipse.jdt.core.compiler.problem.unusedLabel=error
>+org.eclipse.jdt.core.compiler.problem.unusedLocal=ignore
>+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
>+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
>+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
>+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
>+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=ignore
> org.eclipse.jdt.core.compiler.source=1.5
>Index: ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/AddMessageDrivenBeanWizardPage.java
>===================================================================
>RCS file: /cvsroot/webtools/ejbtools/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/AddMessageDrivenBeanWizardPage.java,v
>retrieving revision 1.1
>diff -u -r1.1 AddMessageDrivenBeanWizardPage.java
>--- ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/AddMessageDrivenBeanWizardPage.java	15 Jan 2008 12:15:07 -0000	1.1
>+++ ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/AddMessageDrivenBeanWizardPage.java	19 Feb 2008 16:14:44 -0000
>@@ -21,7 +21,6 @@
> import org.eclipse.jdt.internal.ui.dialogs.FilteredTypesSelectionDialog;
> import org.eclipse.jem.workbench.utility.JemProjectUtilities;
> import org.eclipse.jface.operation.IRunnableContext;
>-import org.eclipse.jface.viewers.TableViewer;
> import org.eclipse.jface.window.Window;
> import org.eclipse.jst.ejb.ui.internal.util.EJBUIMessages;
> import org.eclipse.jst.j2ee.ejb.internal.operations.INewMessageDrivenBeanClassDataModelProperties;
>@@ -32,7 +31,6 @@
> import org.eclipse.swt.SWT;
> import org.eclipse.swt.layout.GridData;
> import org.eclipse.swt.layout.GridLayout;
>-import org.eclipse.swt.widgets.Button;
> import org.eclipse.swt.widgets.Combo;
> import org.eclipse.swt.widgets.Composite;
> import org.eclipse.swt.widgets.Label;
>@@ -46,9 +44,6 @@
> 
> 	private Text ejbNameText;
> 	private Combo transactionTypeCombo;
>-	private TableViewer businessnterfacesList;
>-	private Button addButton;
>-	private Button removeButton;
> 	
> 	public AddMessageDrivenBeanWizardPage(IDataModel model, String pageName) {
> 		super(model,pageName,
>Index: ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/AddButtonListener.java
>===================================================================
>RCS file: /cvsroot/webtools/ejbtools/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/AddButtonListener.java,v
>retrieving revision 1.3
>diff -u -r1.3 AddButtonListener.java
>--- ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/AddButtonListener.java	17 Dec 2007 16:08:13 -0000	1.3
>+++ ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/AddButtonListener.java	19 Feb 2008 16:14:44 -0000
>@@ -17,8 +17,6 @@
> 
> import org.eclipse.core.resources.IProject;
> import org.eclipse.core.resources.ResourcesPlugin;
>-import org.eclipse.core.runtime.IStatus;
>-import org.eclipse.core.runtime.Status;
> import org.eclipse.jdt.core.IJavaProject;
> import org.eclipse.jdt.core.IPackageFragmentRoot;
> import org.eclipse.jdt.core.IType;
>@@ -31,11 +29,9 @@
> import org.eclipse.jst.ejb.ui.internal.util.EJBUIMessages;
> import org.eclipse.jst.j2ee.ejb.internal.operations.INewSessionBeanClassDataModelProperties;
> import org.eclipse.jst.j2ee.ejb.internal.operations.BusinessInterface;
>-import org.eclipse.jst.j2ee.ejb.internal.operations.BusinessInterface.BusinessInterfaceType;
> import org.eclipse.swt.events.SelectionEvent;
> import org.eclipse.swt.events.SelectionListener;
> import org.eclipse.swt.widgets.Shell;
>-import org.eclipse.ui.dialogs.ISelectionStatusValidator;
> import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
> 
> public class AddButtonListener implements SelectionListener {
>Index: ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/ComboIndexSynchHelper.java
>===================================================================
>RCS file: /cvsroot/webtools/ejbtools/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/ComboIndexSynchHelper.java,v
>retrieving revision 1.1
>diff -u -r1.1 ComboIndexSynchHelper.java
>--- ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/ComboIndexSynchHelper.java	15 Dec 2007 15:17:05 -0000	1.1
>+++ ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/ComboIndexSynchHelper.java	19 Feb 2008 16:14:44 -0000
>@@ -4,7 +4,6 @@
> import org.eclipse.swt.events.SelectionListener;
> import org.eclipse.swt.widgets.Combo;
> import org.eclipse.swt.widgets.Control;
>-import org.eclipse.wst.common.frameworks.datamodel.DataModelPropertyDescriptor;
> import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
> import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelSynchHelper;
> 
>#P org.eclipse.jst.j2ee.ejb
>Index: .settings/org.eclipse.jdt.core.prefs
>===================================================================
>RCS file: /cvsroot/webtools/ejbtools/plugins/org.eclipse.jst.j2ee.ejb/.settings/org.eclipse.jdt.core.prefs,v
>retrieving revision 1.1
>diff -u -r1.1 org.eclipse.jdt.core.prefs
>--- .settings/org.eclipse.jdt.core.prefs	10 May 2007 22:55:00 -0000	1.1
>+++ .settings/org.eclipse.jdt.core.prefs	19 Feb 2008 16:14:46 -0000
>@@ -1,7 +1,69 @@
>-#Thu May 10 18:34:04 EDT 2007
>+#Mon Feb 18 15:57:09 EST 2008
> eclipse.preferences.version=1
>+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
> org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
>+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
> org.eclipse.jdt.core.compiler.compliance=1.5
>+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
>+org.eclipse.jdt.core.compiler.debug.localVariable=generate
>+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
>+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=ignore
> org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
>+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
>+org.eclipse.jdt.core.compiler.problem.deprecation=warning
>+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
>+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
>+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
>+org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
> org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
>+org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
>+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
>+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
>+org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
>+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
>+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
>+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
>+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error
>+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
>+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
>+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
>+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
>+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
>+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
>+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
>+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
>+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error
>+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
>+org.eclipse.jdt.core.compiler.problem.nullReference=ignore
>+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
>+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
>+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
>+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
>+org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
>+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
>+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
>+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
>+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
>+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
>+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
>+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=error
>+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
>+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
>+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=ignore
>+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
>+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
>+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
>+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
>+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
>+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
>+org.eclipse.jdt.core.compiler.problem.unusedImport=error
>+org.eclipse.jdt.core.compiler.problem.unusedLabel=error
>+org.eclipse.jdt.core.compiler.problem.unusedLocal=ignore
>+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
>+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
>+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
>+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
>+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
>+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
>+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=ignore
> org.eclipse.jdt.core.compiler.source=1.5
>Index: ejb/org/eclipse/jst/j2ee/ejb/internal/operations/SourceMethod.java
>===================================================================
>RCS file: /cvsroot/webtools/ejbtools/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/SourceMethod.java,v
>retrieving revision 1.1
>diff -u -r1.1 SourceMethod.java
>--- ejb/org/eclipse/jst/j2ee/ejb/internal/operations/SourceMethod.java	19 Dec 2007 18:10:58 -0000	1.1
>+++ ejb/org/eclipse/jst/j2ee/ejb/internal/operations/SourceMethod.java	19 Feb 2008 16:14:46 -0000
>@@ -10,13 +10,11 @@
>  *******************************************************************************/
> package org.eclipse.jst.j2ee.ejb.internal.operations;
> 
>-import java.lang.reflect.Constructor;
> import java.util.ArrayList;
> import java.util.Collection;
> import java.util.Iterator;
> import java.util.List;
> 
>-import org.eclipse.jdt.core.JavaModelException;
> import org.eclipse.jdt.core.Signature;
> import org.eclipse.jdt.core.dom.ArrayType;
> import org.eclipse.jdt.core.dom.ITypeBinding;
>Index: ejb/org/eclipse/jst/j2ee/ejb/internal/operations/AddSessionBeanOperation.java
>===================================================================
>RCS file: /cvsroot/webtools/ejbtools/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/AddSessionBeanOperation.java,v
>retrieving revision 1.3
>diff -u -r1.3 AddSessionBeanOperation.java
>--- ejb/org/eclipse/jst/j2ee/ejb/internal/operations/AddSessionBeanOperation.java	15 Jan 2008 12:14:36 -0000	1.3
>+++ ejb/org/eclipse/jst/j2ee/ejb/internal/operations/AddSessionBeanOperation.java	19 Feb 2008 16:14:46 -0000
>@@ -12,15 +12,12 @@
> 
> import org.eclipse.core.runtime.NullProgressMonitor;
> import org.eclipse.jem.util.logger.proxy.Logger;
>-import org.eclipse.jst.j2ee.model.IModelProvider;
> import org.eclipse.wst.common.componentcore.internal.operation.ArtifactEditProviderOperation;
> import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
> 
> 
> public class AddSessionBeanOperation extends AddEnterpriseBeanOperation {
> 
>-	private IModelProvider provider;
>-
> 	/**
> 	 * This is the constructor which should be used when creating the operation.
> 	 * It will not accept null parameter. It will not return null.
>Index: ejbcreation/org/eclipse/jst/j2ee/internal/ejb/project/operations/EjbFacetProjectCreationDataModelProvider.java
>===================================================================
>RCS file: /cvsroot/webtools/ejbtools/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/internal/ejb/project/operations/EjbFacetProjectCreationDataModelProvider.java,v
>retrieving revision 1.11
>diff -u -r1.11 EjbFacetProjectCreationDataModelProvider.java
>--- ejbcreation/org/eclipse/jst/j2ee/internal/ejb/project/operations/EjbFacetProjectCreationDataModelProvider.java	10 Nov 2007 22:07:43 -0000	1.11
>+++ ejbcreation/org/eclipse/jst/j2ee/internal/ejb/project/operations/EjbFacetProjectCreationDataModelProvider.java	19 Feb 2008 16:14:46 -0000
>@@ -14,19 +14,14 @@
> import java.util.Collection;
> 
> import org.eclipse.jst.common.project.facet.IJavaFacetInstallDataModelProperties;
>-import org.eclipse.jst.common.project.facet.JavaFacetInstallDataModelProvider;
> import org.eclipse.jst.common.project.facet.JavaFacetUtils;
>-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
> import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetConstants;
> import org.eclipse.jst.j2ee.project.facet.IJ2EEModuleFacetInstallDataModelProperties;
> import org.eclipse.jst.j2ee.project.facet.J2EEFacetProjectCreationDataModelProvider;
>-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
> import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent;
>-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
> import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
> import org.eclipse.wst.common.frameworks.datamodel.IDataModelListener;
> import org.eclipse.wst.common.project.facet.core.IProjectFacet;
>-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
> import org.eclipse.wst.project.facet.ProductManager;
> 
> public class EjbFacetProjectCreationDataModelProvider extends
>@@ -69,7 +64,7 @@
> 	public boolean propertySet(String propertyName, Object propertyValue) {
> 		if( propertyName.equals( MODULE_URI )){
> 			FacetDataModelMap map = (FacetDataModelMap) getProperty(FACET_DM_MAP);
>-			IDataModel ejbFacet = map.getFacetDataModel( J2EEProjectUtilities.EJB );	
>+			IDataModel ejbFacet = map.getFacetDataModel( IJ2EEFacetConstants.EJB );	
> 			ejbFacet.setProperty( IJ2EEModuleFacetInstallDataModelProperties.MODULE_URI, propertyValue );
> 		}
> 		return super.propertySet(propertyName, propertyValue);
>#P org.eclipse.jst.j2ee
>Index: appclientcreation/org/eclipse/jst/j2ee/project/facet/AppClientFacetPostInstallDelegate.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/project/facet/AppClientFacetPostInstallDelegate.java,v
>retrieving revision 1.6
>diff -u -r1.6 AppClientFacetPostInstallDelegate.java
>--- appclientcreation/org/eclipse/jst/j2ee/project/facet/AppClientFacetPostInstallDelegate.java	16 Jan 2008 14:47:24 -0000	1.6
>+++ appclientcreation/org/eclipse/jst/j2ee/project/facet/AppClientFacetPostInstallDelegate.java	19 Feb 2008 16:14:48 -0000
>@@ -17,14 +17,11 @@
> import org.eclipse.core.resources.IContainer;
> import org.eclipse.core.resources.IFile;
> import org.eclipse.core.resources.IProject;
>-import org.eclipse.core.resources.IResource;
> import org.eclipse.core.runtime.CoreException;
> import org.eclipse.core.runtime.IPath;
> import org.eclipse.core.runtime.IProgressMonitor;
> import org.eclipse.core.runtime.Path;
>-import org.eclipse.jdt.core.IJavaProject;
> import org.eclipse.jem.util.logger.proxy.Logger;
>-import org.eclipse.jem.workbench.utility.JemProjectUtilities;
> import org.eclipse.jst.j2ee.application.internal.operations.UpdateManifestDataModelProperties;
> import org.eclipse.jst.j2ee.application.internal.operations.UpdateManifestDataModelProvider;
> import org.eclipse.jst.j2ee.internal.J2EEConstants;
>Index: common/org/eclipse/jst/j2ee/internal/common/UpdateProjectClasspath.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/UpdateProjectClasspath.java,v
>retrieving revision 1.16
>diff -u -r1.16 UpdateProjectClasspath.java
>--- common/org/eclipse/jst/j2ee/internal/common/UpdateProjectClasspath.java	7 Jun 2007 19:28:17 -0000	1.16
>+++ common/org/eclipse/jst/j2ee/internal/common/UpdateProjectClasspath.java	19 Feb 2008 16:14:48 -0000
>@@ -86,20 +86,5 @@
> 		catch (JavaModelException e) {
> 			Logger.getLogger().logError(e);
> 		}
>-	}	
>-
>-	private static IClasspathEntry[] getProjectDependency(IProject clientProj){
>-		IClasspathEntry projectEntry = JavaCore.newProjectEntry(clientProj.getFullPath(), true);
>-			return new IClasspathEntry[]{projectEntry};	
> 	}
>-	
>-	private static boolean entryToChange(final IClasspathEntry entry, final IClasspathEntry[] entriesToChange) {
>-		for (int i = 0; i < entriesToChange.length; i++) {
>-			if (entriesToChange[i].equals(entry)) {
>-				return true;
>-			}
>-		}
>-		return false;
>-	}	
>-
> }
>Index: archiveops/org/eclipse/jst/j2ee/internal/archive/JavaEEEMFArchiveAdapterHelper.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/JavaEEEMFArchiveAdapterHelper.java,v
>retrieving revision 1.5
>diff -u -r1.5 JavaEEEMFArchiveAdapterHelper.java
>--- archiveops/org/eclipse/jst/j2ee/internal/archive/JavaEEEMFArchiveAdapterHelper.java	1 Feb 2008 01:04:30 -0000	1.5
>+++ archiveops/org/eclipse/jst/j2ee/internal/archive/JavaEEEMFArchiveAdapterHelper.java	19 Feb 2008 16:14:48 -0000
>@@ -241,6 +241,26 @@
> 		public SAXFactoryKey(URI uri, IContentDescription description) {
> 			this.uri = uri;
> 			this.description = description;
>+			if(uri == null){
>+				throw new NullPointerException();
>+			}
>+			if(description == null){
>+				throw new NullPointerException();
>+			}
>+		}
>+		
>+		@Override
>+		public boolean equals(Object obj){
>+			if(obj == null || !(obj instanceof SAXFactoryKey)){
>+				return false;
>+			}
>+			SAXFactoryKey other = (SAXFactoryKey)obj;
>+			return uri.equals(other.uri) && description.equals(other.description);
>+		}
>+
>+		@Override
>+		public int hashCode() {
>+			return uri.hashCode() + description.hashCode();
> 		}
> 	}
> 
>@@ -248,7 +268,7 @@
> 
> 	private static Resource.Factory getSAXResourceFactory(SAXFactoryKey key) {
> 		synchronized (localFactoryMap) {
>-			return localFactoryMap.get(localFactoryMap);
>+			return localFactoryMap.get(key);
> 		}
> 	}
> 
>@@ -257,5 +277,4 @@
> 			localFactoryMap.put(key, resourceFactory);
> 		}
> 	}
>-
> }
>Index: j2eeplugin/org/eclipse/jst/j2ee/internal/validation/DependencyUtil.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/DependencyUtil.java,v
>retrieving revision 1.7
>diff -u -r1.7 DependencyUtil.java
>--- j2eeplugin/org/eclipse/jst/j2ee/internal/validation/DependencyUtil.java	28 Jan 2008 00:48:12 -0000	1.7
>+++ j2eeplugin/org/eclipse/jst/j2ee/internal/validation/DependencyUtil.java	19 Feb 2008 16:14:49 -0000
>@@ -23,7 +23,6 @@
> import org.eclipse.jem.util.logger.LogEntry;
> import org.eclipse.jem.util.logger.proxy.Logger;
> import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
>-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
> 
> /**
>  * This singleton keeps an internal record of project dependencies. That is, every IProject can
>@@ -112,7 +111,7 @@
> 		} catch (CoreException exc) {
> 			Logger logger = J2EEPlugin.getDefault().getMsgLogger();
> 			if (logger.isLoggingLevel(Level.SEVERE)) {
>-				LogEntry entry = J2EEPlugin.getDefault().getLogEntry();
>+				LogEntry entry = J2EEPlugin.getLogEntry();
> 				entry.setSourceID("DependencyCache::getRequiredProjects(" + project.getName() + ")"); //$NON-NLS-1$  //$NON-NLS-2$
> 				entry.setTargetException(exc);
> 				logger.write(Level.SEVERE, exc);
>@@ -151,7 +150,7 @@
> 		} catch (JavaModelException exc) {
> 			Logger logger = J2EEPlugin.getDefault().getMsgLogger();
> 			if (logger.isLoggingLevel(Level.SEVERE)) {
>-				LogEntry entry = J2EEPlugin.getDefault().getLogEntry();
>+				LogEntry entry = J2EEPlugin.getLogEntry();
> 				entry.setSourceID("DependencyCache::getDependentJavaProjects(" + javaproject.getProject().getName() + ")"); //$NON-NLS-1$  //$NON-NLS-2$
> 				entry.setTargetException(exc);
> 				logger.write(Level.SEVERE, exc);
>@@ -174,7 +173,7 @@
> 			if (jm == null) {
> 				Logger logger = J2EEPlugin.getDefault().getMsgLogger();
> 				if (logger.isLoggingLevel(Level.SEVERE)) {
>-					LogEntry entry = J2EEPlugin.getDefault().getLogEntry();
>+					LogEntry entry = J2EEPlugin.getLogEntry();
> 					entry.setSourceID("DependencyCache::getRequiredJavaProjects(" + javaproject.getProject().getName() + ")"); //$NON-NLS-1$  //$NON-NLS-2$
> 					//entry.setText("IJavaModel == null"); //$NON-NLS-1$
> 					logger.write(Level.SEVERE, "IJavaModel == null"); //$NON-NLS-1$
>@@ -208,7 +207,7 @@
> 				} catch (CoreException exc) {
> 					Logger logger = J2EEPlugin.getDefault().getMsgLogger();
> 					if (logger.isLoggingLevel(Level.SEVERE)) {
>-						LogEntry entry = J2EEPlugin.getDefault().getLogEntry();
>+						LogEntry entry = J2EEPlugin.getLogEntry();
> 						entry.setSourceID("DependencyCache::getRequiredJavaProjects(" + javaproject.getProject().getName() + ")"); //$NON-NLS-1$  //$NON-NLS-2$
> 						entry.setTargetException(exc);
> 						logger.write(Level.SEVERE, exc);
>@@ -231,7 +230,7 @@
> 		} catch (JavaModelException exc) {
> 			Logger logger = J2EEPlugin.getDefault().getMsgLogger();
> 			if (logger.isLoggingLevel(Level.SEVERE)) {
>-				LogEntry entry = J2EEPlugin.getDefault().getLogEntry();
>+				LogEntry entry = J2EEPlugin.getLogEntry();
> 				entry.setSourceID("DependencyCache::getRequiredJavaProjects(" + javaproject.getProject().getName() + ")"); //$NON-NLS-1$  //$NON-NLS-2$
> 				entry.setTargetException(exc);
> 				logger.write(Level.SEVERE, exc);
>Index: j2eeplugin/org/eclipse/jst/j2ee/internal/validation/AWorkbenchMOFHelper.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/AWorkbenchMOFHelper.java,v
>retrieving revision 1.9
>diff -u -r1.9 AWorkbenchMOFHelper.java
>--- j2eeplugin/org/eclipse/jst/j2ee/internal/validation/AWorkbenchMOFHelper.java	28 Jan 2008 00:48:12 -0000	1.9
>+++ j2eeplugin/org/eclipse/jst/j2ee/internal/validation/AWorkbenchMOFHelper.java	19 Feb 2008 16:14:49 -0000
>@@ -25,7 +25,6 @@
> import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
> import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper;
> import org.eclipse.wst.validation.internal.operations.WorkbenchContext;
>-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
> 
> 
> /**
>Index: j2eecreation/org/eclipse/jst/j2ee/project/EarUtilities.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/EarUtilities.java,v
>retrieving revision 1.2
>diff -u -r1.2 EarUtilities.java
>--- j2eecreation/org/eclipse/jst/j2ee/project/EarUtilities.java	18 Dec 2007 21:56:36 -0000	1.2
>+++ j2eecreation/org/eclipse/jst/j2ee/project/EarUtilities.java	19 Feb 2008 16:14:49 -0000
>@@ -17,7 +17,6 @@
> import java.util.List;
> 
> import org.eclipse.core.resources.IProject;
>-import org.eclipse.jst.j2ee.application.Application;
> import org.eclipse.jst.j2ee.application.Module;
> import org.eclipse.jst.j2ee.internal.plugin.IJ2EEModuleConstants;
> import org.eclipse.jst.j2ee.model.IEARModelProvider;
>Index: j2eecreation/org/eclipse/jst/j2ee/internal/project/J2EEProjectUtilities.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/J2EEProjectUtilities.java,v
>retrieving revision 1.64
>diff -u -r1.64 J2EEProjectUtilities.java
>--- j2eecreation/org/eclipse/jst/j2ee/internal/project/J2EEProjectUtilities.java	18 Dec 2007 21:14:16 -0000	1.64
>+++ j2eecreation/org/eclipse/jst/j2ee/internal/project/J2EEProjectUtilities.java	19 Feb 2008 16:14:49 -0000
>@@ -64,26 +64,19 @@
> import org.eclipse.jst.j2ee.internal.archive.operations.JavaComponentLoadStrategyImpl;
> import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
> import org.eclipse.jst.j2ee.internal.common.classpath.J2EEComponentClasspathUpdater;
>-import org.eclipse.jst.j2ee.internal.componentcore.AppClientBinaryComponentHelper;
>-import org.eclipse.jst.j2ee.internal.componentcore.EJBBinaryComponentHelper;
>-import org.eclipse.jst.j2ee.internal.componentcore.JCABinaryComponentHelper;
>-import org.eclipse.jst.j2ee.internal.componentcore.WebBinaryComponentHelper;
> import org.eclipse.jst.j2ee.internal.moduleextension.EarModuleManager;
>-import org.eclipse.jst.j2ee.internal.plugin.IJ2EEModuleConstants;
> import org.eclipse.jst.j2ee.project.EarUtilities;
> import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
> import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetConstants;
> import org.eclipse.jst.j2ee.project.facet.IJavaProjectMigrationDataModelProperties;
> import org.eclipse.jst.j2ee.project.facet.JavaProjectMigrationDataModelProvider;
> import org.eclipse.jst.j2ee.project.facet.JavaProjectMigrationOperation;
>-import org.eclipse.jst.jee.util.internal.JavaEEQuickPeek;
> import org.eclipse.jst.server.core.FacetUtil;
> import org.eclipse.wst.common.componentcore.ComponentCore;
> import org.eclipse.wst.common.componentcore.internal.impl.ModuleURIUtil;
> import org.eclipse.wst.common.componentcore.internal.util.ComponentUtilities;
> import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
> import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
>-import org.eclipse.wst.common.componentcore.resources.IVirtualFile;
> import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
> import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
> import org.eclipse.wst.common.componentcore.resources.IVirtualResource;
>@@ -96,7 +89,6 @@
> import org.eclipse.wst.server.core.IRuntime;
> 
> public class J2EEProjectUtilities extends ProjectUtilities implements IJ2EEFacetConstants {
>-	private static final IVirtualReference[] NO_REFERENCES = new IVirtualReference[0];
> 
> 	/**
> 	 * Return the absolute path of a loose archive in a J2EE application or WAR file
>@@ -550,10 +542,6 @@
> 		return isProjectOfType(project, DYNAMIC_WEB);
> 	}
> 
>-	private static boolean isStaticWebProject(IFacetedProject project) {
>-		return isProjectOfType(project, STATIC_WEB);
>-	}
>-
> 	private static boolean isEJBProject(IFacetedProject project) {
> 		return isProjectOfType(project, EJB);
> 	}
>Index: .settings/org.eclipse.jdt.core.prefs
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee/.settings/org.eclipse.jdt.core.prefs,v
>retrieving revision 1.1
>diff -u -r1.1 org.eclipse.jdt.core.prefs
>--- .settings/org.eclipse.jdt.core.prefs	3 May 2007 05:03:43 -0000	1.1
>+++ .settings/org.eclipse.jdt.core.prefs	19 Feb 2008 16:14:48 -0000
>@@ -1,7 +1,62 @@
>-#Thu May 03 00:58:38 EDT 2007
>+#Mon Feb 18 15:57:09 EST 2008
> eclipse.preferences.version=1
>+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
> org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
>+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
> org.eclipse.jdt.core.compiler.compliance=1.5
>+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
>+org.eclipse.jdt.core.compiler.debug.localVariable=generate
>+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
>+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=ignore
> org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
>+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
>+org.eclipse.jdt.core.compiler.problem.deprecation=warning
>+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
>+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
>+org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
> org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
>+org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
>+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
>+org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
>+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
>+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
>+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
>+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error
>+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
>+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
>+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
>+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
>+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
>+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
>+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
>+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
>+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error
>+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
>+org.eclipse.jdt.core.compiler.problem.nullReference=ignore
>+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
>+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
>+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
>+org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
>+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
>+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
>+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
>+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
>+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
>+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=error
>+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
>+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
>+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=ignore
>+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
>+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
>+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
>+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
>+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
>+org.eclipse.jdt.core.compiler.problem.unusedImport=error
>+org.eclipse.jdt.core.compiler.problem.unusedLabel=error
>+org.eclipse.jdt.core.compiler.problem.unusedLocal=ignore
>+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
>+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
>+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
>+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
>+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=ignore
> org.eclipse.jdt.core.compiler.source=1.5
>#P org.eclipse.jst.servlet.ui
>Index: .settings/org.eclipse.jdt.core.prefs
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.servlet.ui/.settings/org.eclipse.jdt.core.prefs,v
>retrieving revision 1.1
>diff -u -r1.1 org.eclipse.jdt.core.prefs
>--- .settings/org.eclipse.jdt.core.prefs	10 May 2007 22:57:42 -0000	1.1
>+++ .settings/org.eclipse.jdt.core.prefs	19 Feb 2008 16:14:52 -0000
>@@ -1,7 +1,62 @@
>-#Thu May 10 18:37:10 EDT 2007
>+#Mon Feb 18 15:57:09 EST 2008
> eclipse.preferences.version=1
>+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
> org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
>+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
> org.eclipse.jdt.core.compiler.compliance=1.5
>+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
>+org.eclipse.jdt.core.compiler.debug.localVariable=generate
>+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
>+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=ignore
> org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
>+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
>+org.eclipse.jdt.core.compiler.problem.deprecation=warning
>+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
>+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
>+org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
> org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
>+org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
>+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
>+org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
>+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
>+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
>+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
>+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error
>+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
>+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
>+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
>+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
>+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
>+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
>+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
>+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
>+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error
>+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
>+org.eclipse.jdt.core.compiler.problem.nullReference=ignore
>+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
>+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
>+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
>+org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
>+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
>+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
>+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
>+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
>+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
>+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=error
>+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
>+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
>+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=ignore
>+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
>+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
>+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
>+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
>+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
>+org.eclipse.jdt.core.compiler.problem.unusedImport=error
>+org.eclipse.jdt.core.compiler.problem.unusedLabel=error
>+org.eclipse.jdt.core.compiler.problem.unusedLocal=ignore
>+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
>+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
>+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
>+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
>+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=ignore
> org.eclipse.jdt.core.compiler.source=1.5
>Index: servlet_ui/org/eclipse/jst/servlet/ui/internal/actions/ConvertToWebModuleTypeAction.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/actions/ConvertToWebModuleTypeAction.java,v
>retrieving revision 1.24
>diff -u -r1.24 ConvertToWebModuleTypeAction.java
>--- servlet_ui/org/eclipse/jst/servlet/ui/internal/actions/ConvertToWebModuleTypeAction.java	7 Jun 2007 19:31:47 -0000	1.24
>+++ servlet_ui/org/eclipse/jst/servlet/ui/internal/actions/ConvertToWebModuleTypeAction.java	19 Feb 2008 16:14:52 -0000
>@@ -110,7 +110,7 @@
> 			if (dialog.getReturnCode() == Window.CANCEL)
> 				return;
> 			
>-			doConvert(dialog.getSelectedVersion());
>+			doConvert(ConvertToWebModuleTypeDialog.getSelectedVersion());
> 			
> 		} catch (Exception e) {
> 			Logger.logException(e);
>Index: servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/FilterMappingsArrayTableWizardSection.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/FilterMappingsArrayTableWizardSection.java,v
>retrieving revision 1.3
>diff -u -r1.3 FilterMappingsArrayTableWizardSection.java
>--- servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/FilterMappingsArrayTableWizardSection.java	27 Nov 2007 15:57:31 -0000	1.3
>+++ servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/FilterMappingsArrayTableWizardSection.java	19 Feb 2008 16:14:52 -0000
>@@ -284,12 +284,6 @@
> 		setInput(valueList);
> 	}
> 
>-	private void removeFilterMapping(Object selectedFilterMapping) {
>-		List valueList = (List) viewer.getInput();
>-		valueList.remove(selectedFilterMapping);
>-		setInput(valueList);
>-	}
>-	
> 	private void removeFilterMappings(Collection selectedFilterMappings) {
> 		List valueList = (List) viewer.getInput();
> 		valueList.removeAll(selectedFilterMappings);
>Index: servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewWebClassWizardPage.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewWebClassWizardPage.java,v
>retrieving revision 1.2
>diff -u -r1.2 NewWebClassWizardPage.java
>--- servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewWebClassWizardPage.java	29 Jan 2008 07:46:27 -0000	1.2
>+++ servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewWebClassWizardPage.java	19 Feb 2008 16:14:52 -0000
>@@ -14,8 +14,6 @@
> import org.eclipse.core.runtime.CoreException;
> import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
> import org.eclipse.jface.dialogs.Dialog;
>-import org.eclipse.jst.j2ee.application.internal.operations.IAnnotationsDataModel;
>-import org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties;
> import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
> import org.eclipse.jst.j2ee.internal.web.operations.INewWebClassDataModelProperties;
> import org.eclipse.jst.j2ee.internal.wizard.AnnotationsStandaloneGroup;
>@@ -31,7 +29,6 @@
> import org.eclipse.swt.widgets.Composite;
> import org.eclipse.swt.widgets.Label;
> import org.eclipse.swt.widgets.Text;
>-import org.eclipse.wst.common.componentcore.internal.operation.IArtifactEditOperationDataModelProperties;
> import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
> import org.eclipse.wst.common.project.facet.core.IFacetedProject;
> import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
>Index: servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddEditFilterMappingDialog.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddEditFilterMappingDialog.java,v
>retrieving revision 1.5
>diff -u -r1.5 AddEditFilterMappingDialog.java
>--- servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddEditFilterMappingDialog.java	22 Jan 2008 10:46:21 -0000	1.5
>+++ servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddEditFilterMappingDialog.java	19 Feb 2008 16:14:52 -0000
>@@ -54,7 +54,6 @@
> import org.eclipse.swt.widgets.TableItem;
> import org.eclipse.swt.widgets.Text;
> import org.eclipse.ui.PlatformUI;
>-import org.eclipse.ui.dialogs.ISelectionStatusValidator;
> import org.eclipse.ui.dialogs.SelectionStatusDialog;
> import org.eclipse.ui.internal.layout.CellLayout;
> import org.eclipse.ui.part.PageBook;
>@@ -79,8 +78,6 @@
> 
> 	}
> 	
>-	private ISelectionStatusValidator fValidator = null;
>-	
>     public final static int SERVLET = 0;
> 	public final static int URL_PATTERN = 1;
> 	protected Button fServletButton;
>@@ -96,7 +93,7 @@
> 	private Object[] fElements;
> 	private boolean fIgnoreCase = true;
> 	private String fUpperListLabel;
>-	private String fLowerListLabel;
>+
> 	// SWT widgets
> 	private Table fUpperList;
> 	protected Text fURLText;
>Index: servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewWebArtifactWizard.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewWebArtifactWizard.java,v
>retrieving revision 1.1
>diff -u -r1.1 NewWebArtifactWizard.java
>--- servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewWebArtifactWizard.java	22 Jan 2008 10:46:21 -0000	1.1
>+++ servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewWebArtifactWizard.java	19 Feb 2008 16:14:52 -0000
>@@ -21,7 +21,6 @@
> import org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties;
> import org.eclipse.jst.j2ee.internal.plugin.J2EEEditorUtility;
> import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
>-import org.eclipse.jst.j2ee.internal.web.operations.INewServletClassDataModelProperties;
> import org.eclipse.jst.servlet.ui.internal.plugin.ServletUIPlugin;
> import org.eclipse.ui.IWorkbenchPage;
> import org.eclipse.ui.PartInitException;
>#P org.eclipse.jst.j2ee.web
>Index: web/org/eclipse/jst/j2ee/internal/web/operations/CreateWebClassTemplateModel.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/CreateWebClassTemplateModel.java,v
>retrieving revision 1.6
>diff -u -r1.6 CreateWebClassTemplateModel.java
>--- web/org/eclipse/jst/j2ee/internal/web/operations/CreateWebClassTemplateModel.java	24 Jan 2008 14:16:03 -0000	1.6
>+++ web/org/eclipse/jst/j2ee/internal/web/operations/CreateWebClassTemplateModel.java	19 Feb 2008 16:14:55 -0000
>@@ -32,8 +32,6 @@
> import org.eclipse.jdt.core.dom.ITypeBinding;
> import org.eclipse.jdt.core.dom.MethodDeclaration;
> import org.eclipse.jdt.core.dom.TypeDeclaration;
>-import org.eclipse.jst.j2ee.application.internal.operations.IAnnotationsDataModel;
>-import org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties;
> import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
> import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
> 
>Index: web/org/eclipse/jst/j2ee/internal/web/operations/AddServletOperation.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/AddServletOperation.java,v
>retrieving revision 1.22
>diff -u -r1.22 AddServletOperation.java
>--- web/org/eclipse/jst/j2ee/internal/web/operations/AddServletOperation.java	24 Jan 2008 14:16:03 -0000	1.22
>+++ web/org/eclipse/jst/j2ee/internal/web/operations/AddServletOperation.java	19 Feb 2008 16:14:55 -0000
>@@ -20,12 +20,10 @@
> import org.eclipse.core.runtime.IProgressMonitor;
> import org.eclipse.core.runtime.IStatus;
> import org.eclipse.core.runtime.NullProgressMonitor;
>-import org.eclipse.jst.j2ee.application.internal.operations.IAnnotationsDataModel;
> import org.eclipse.jst.j2ee.common.CommonFactory;
> import org.eclipse.jst.j2ee.common.Description;
> import org.eclipse.jst.j2ee.common.ParamValue;
> import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
>-import org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties;
> import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
> import org.eclipse.jst.j2ee.model.ModelProviderManager;
> import org.eclipse.jst.j2ee.webapplication.InitParam;
>@@ -40,7 +38,6 @@
> import org.eclipse.jst.javaee.core.UrlPatternType;
> import org.eclipse.jst.javaee.web.WebFactory;
> import org.eclipse.wst.common.componentcore.internal.operation.ArtifactEditProviderOperation;
>-import org.eclipse.wst.common.componentcore.internal.operation.IArtifactEditOperationDataModelProperties;
> import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
> 
> /**
>Index: web/org/eclipse/jst/j2ee/internal/web/operations/AddFilterOperation.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/AddFilterOperation.java,v
>retrieving revision 1.10
>diff -u -r1.10 AddFilterOperation.java
>--- web/org/eclipse/jst/j2ee/internal/web/operations/AddFilterOperation.java	24 Jan 2008 14:16:03 -0000	1.10
>+++ web/org/eclipse/jst/j2ee/internal/web/operations/AddFilterOperation.java	19 Feb 2008 16:14:54 -0000
>@@ -20,9 +20,7 @@
> import org.eclipse.core.runtime.IStatus;
> import org.eclipse.core.runtime.NullProgressMonitor;
> import org.eclipse.emf.common.util.EList;
>-import org.eclipse.jst.j2ee.application.internal.operations.IAnnotationsDataModel;
> import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
>-import org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties;
> import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
> import org.eclipse.jst.j2ee.model.ModelProviderManager;
> import org.eclipse.jst.j2ee.webapplication.DispatcherType;
>@@ -37,7 +35,6 @@
> import org.eclipse.jst.javaee.core.UrlPatternType;
> import org.eclipse.jst.javaee.web.WebFactory;
> import org.eclipse.wst.common.componentcore.internal.operation.ArtifactEditProviderOperation;
>-import org.eclipse.wst.common.componentcore.internal.operation.IArtifactEditOperationDataModelProperties;
> import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
> 
> /**
>Index: web/org/eclipse/jst/j2ee/internal/web/operations/NewListenerClassDataModelProvider.java
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/NewListenerClassDataModelProvider.java,v
>retrieving revision 1.6
>diff -u -r1.6 NewListenerClassDataModelProvider.java
>--- web/org/eclipse/jst/j2ee/internal/web/operations/NewListenerClassDataModelProvider.java	29 Jan 2008 12:36:15 -0000	1.6
>+++ web/org/eclipse/jst/j2ee/internal/web/operations/NewListenerClassDataModelProvider.java	19 Feb 2008 16:14:55 -0000
>@@ -66,11 +66,6 @@
> 		QUALIFIED_SERVLET_REQUEST_LISTENER,
> 		QUALIFIED_SERVLET_REQUEST_ATTRIBUTE_LISTENER
> 	};
>-	
>-	/**
>-	 * The fully qualified default listener superclass.
>-	 */
>-	private final static String LISTENER_SUPERCLASS = ""; //$NON-NLS-1$ 
> 
> 	/**
> 	 * Subclasses may extend this method to provide their own default operation
>Index: .settings/org.eclipse.jdt.core.prefs
>===================================================================
>RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.web/.settings/org.eclipse.jdt.core.prefs,v
>retrieving revision 1.1
>diff -u -r1.1 org.eclipse.jdt.core.prefs
>--- .settings/org.eclipse.jdt.core.prefs	10 May 2007 22:57:07 -0000	1.1
>+++ .settings/org.eclipse.jdt.core.prefs	19 Feb 2008 16:14:54 -0000
>@@ -1,7 +1,62 @@
>-#Thu May 10 18:35:56 EDT 2007
>+#Mon Feb 18 15:57:09 EST 2008
> eclipse.preferences.version=1
>+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
> org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
>+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
> org.eclipse.jdt.core.compiler.compliance=1.5
>+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
>+org.eclipse.jdt.core.compiler.debug.localVariable=generate
>+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
>+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=ignore
> org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
>+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
>+org.eclipse.jdt.core.compiler.problem.deprecation=warning
>+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
>+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
>+org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
> org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
>+org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
>+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
>+org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
>+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
>+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
>+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
>+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error
>+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
>+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
>+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
>+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
>+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
>+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
>+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
>+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
>+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error
>+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
>+org.eclipse.jdt.core.compiler.problem.nullReference=ignore
>+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
>+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
>+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
>+org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
>+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
>+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
>+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
>+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
>+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
>+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=error
>+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
>+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
>+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=ignore
>+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
>+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
>+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
>+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
>+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
>+org.eclipse.jdt.core.compiler.problem.unusedImport=error
>+org.eclipse.jdt.core.compiler.problem.unusedLabel=error
>+org.eclipse.jdt.core.compiler.problem.unusedLocal=ignore
>+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
>+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
>+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
>+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
>+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=ignore
> org.eclipse.jdt.core.compiler.source=1.5

Actions: View | Diff

Attachments on bug 219377: 90078