Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
View | Details | Raw Unified | Return to bug 219377
Collapse All | Expand All

(-)jca/org/eclipse/jst/j2ee/jca/project/facet/ConnectorFacetProjectCreationDataModelProvider.java (-6 / +1 lines)
Lines 14-32 Link Here
14
import java.util.Collection;
14
import java.util.Collection;
15
15
16
import org.eclipse.jst.common.project.facet.IJavaFacetInstallDataModelProperties;
16
import org.eclipse.jst.common.project.facet.IJavaFacetInstallDataModelProperties;
17
import org.eclipse.jst.common.project.facet.JavaFacetInstallDataModelProvider;
18
import org.eclipse.jst.common.project.facet.JavaFacetUtils;
17
import org.eclipse.jst.common.project.facet.JavaFacetUtils;
19
import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
20
import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetConstants;
18
import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetConstants;
21
import org.eclipse.jst.j2ee.project.facet.IJ2EEModuleFacetInstallDataModelProperties;
19
import org.eclipse.jst.j2ee.project.facet.IJ2EEModuleFacetInstallDataModelProperties;
22
import org.eclipse.jst.j2ee.project.facet.J2EEFacetProjectCreationDataModelProvider;
20
import org.eclipse.jst.j2ee.project.facet.J2EEFacetProjectCreationDataModelProvider;
23
import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
24
import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent;
21
import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent;
25
import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
26
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
22
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
27
import org.eclipse.wst.common.frameworks.datamodel.IDataModelListener;
23
import org.eclipse.wst.common.frameworks.datamodel.IDataModelListener;
28
import org.eclipse.wst.common.project.facet.core.IProjectFacet;
24
import org.eclipse.wst.common.project.facet.core.IProjectFacet;
29
import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
30
import org.eclipse.wst.project.facet.ProductManager;
25
import org.eclipse.wst.project.facet.ProductManager;
31
26
32
public class ConnectorFacetProjectCreationDataModelProvider extends J2EEFacetProjectCreationDataModelProvider {
27
public class ConnectorFacetProjectCreationDataModelProvider extends J2EEFacetProjectCreationDataModelProvider {
Lines 68-74 Link Here
68
	public boolean propertySet(String propertyName, Object propertyValue) {
63
	public boolean propertySet(String propertyName, Object propertyValue) {
69
		if( propertyName.equals( MODULE_URI )){
64
		if( propertyName.equals( MODULE_URI )){
70
			FacetDataModelMap map = (FacetDataModelMap) getProperty(FACET_DM_MAP);
65
			FacetDataModelMap map = (FacetDataModelMap) getProperty(FACET_DM_MAP);
71
			IDataModel rarFacet = map.getFacetDataModel( J2EEProjectUtilities.JCA );	
66
			IDataModel rarFacet = map.getFacetDataModel( IJ2EEFacetConstants.JCA );	
72
			rarFacet.setProperty( IJ2EEModuleFacetInstallDataModelProperties.MODULE_URI, propertyValue );
67
			rarFacet.setProperty( IJ2EEModuleFacetInstallDataModelProperties.MODULE_URI, propertyValue );
73
		}
68
		}
74
		return super.propertySet(propertyName, propertyValue);
69
		return super.propertySet(propertyName, propertyValue);
(-)jca/org/eclipse/jst/j2ee/jca/project/facet/ConnectorFacetPostInstallDelegate.java (-2 lines)
Lines 16-29 Link Here
16
import org.eclipse.core.runtime.CoreException;
16
import org.eclipse.core.runtime.CoreException;
17
import org.eclipse.core.runtime.IProgressMonitor;
17
import org.eclipse.core.runtime.IProgressMonitor;
18
import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
18
import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
19
import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetInstallDataModelProperties;
20
import org.eclipse.jst.j2ee.project.facet.IJ2EEModuleFacetInstallDataModelProperties;
19
import org.eclipse.jst.j2ee.project.facet.IJ2EEModuleFacetInstallDataModelProperties;
21
import org.eclipse.jst.j2ee.project.facet.J2EEFacetInstallDelegate;
20
import org.eclipse.jst.j2ee.project.facet.J2EEFacetInstallDelegate;
22
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
21
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
23
import org.eclipse.wst.common.project.facet.core.IDelegate;
22
import org.eclipse.wst.common.project.facet.core.IDelegate;
24
import org.eclipse.wst.common.project.facet.core.IFacetedProjectWorkingCopy;
23
import org.eclipse.wst.common.project.facet.core.IFacetedProjectWorkingCopy;
25
import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
24
import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
26
import org.eclipse.wst.common.project.facet.core.runtime.IRuntime;
27
25
28
public class ConnectorFacetPostInstallDelegate extends J2EEFacetInstallDelegate implements IDelegate {
26
public class ConnectorFacetPostInstallDelegate extends J2EEFacetInstallDelegate implements IDelegate {
29
27
(-).settings/org.eclipse.jdt.core.prefs (-1 / +56 lines)
Lines 1-7 Link Here
1
#Thu May 10 18:34:52 EDT 2007
1
#Mon Feb 18 15:57:09 EST 2008
2
eclipse.preferences.version=1
2
eclipse.preferences.version=1
3
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
3
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
4
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
5
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
4
org.eclipse.jdt.core.compiler.compliance=1.5
6
org.eclipse.jdt.core.compiler.compliance=1.5
7
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
8
org.eclipse.jdt.core.compiler.debug.localVariable=generate
9
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
10
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=ignore
5
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
11
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
12
org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
13
org.eclipse.jdt.core.compiler.problem.deprecation=warning
14
org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
15
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
16
org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
6
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
17
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
18
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
19
org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
20
org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
21
org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
22
org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
23
org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
24
org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error
25
org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
26
org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
27
org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
28
org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
29
org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
30
org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
31
org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
32
org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
33
org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error
34
org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
35
org.eclipse.jdt.core.compiler.problem.nullReference=ignore
36
org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
37
org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
38
org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
39
org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
40
org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
41
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
42
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
43
org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
44
org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
45
org.eclipse.jdt.core.compiler.problem.typeParameterHiding=error
46
org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
47
org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
48
org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=ignore
49
org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
50
org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
51
org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
52
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
53
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
54
org.eclipse.jdt.core.compiler.problem.unusedImport=error
55
org.eclipse.jdt.core.compiler.problem.unusedLabel=error
56
org.eclipse.jdt.core.compiler.problem.unusedLocal=ignore
57
org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
58
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
59
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
60
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
61
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=ignore
7
org.eclipse.jdt.core.compiler.source=1.5
62
org.eclipse.jdt.core.compiler.source=1.5
(-).settings/org.eclipse.jdt.core.prefs (-1 / +56 lines)
Lines 1-7 Link Here
1
#Thu May 10 18:33:32 EDT 2007
1
#Mon Feb 18 15:57:09 EST 2008
2
eclipse.preferences.version=1
2
eclipse.preferences.version=1
3
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
3
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
4
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
5
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
4
org.eclipse.jdt.core.compiler.compliance=1.5
6
org.eclipse.jdt.core.compiler.compliance=1.5
7
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
8
org.eclipse.jdt.core.compiler.debug.localVariable=generate
9
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
10
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=ignore
5
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
11
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
12
org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
13
org.eclipse.jdt.core.compiler.problem.deprecation=warning
14
org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
15
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
16
org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
6
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
17
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
18
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
19
org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
20
org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
21
org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
22
org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
23
org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
24
org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error
25
org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
26
org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
27
org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
28
org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
29
org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
30
org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
31
org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
32
org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
33
org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error
34
org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
35
org.eclipse.jdt.core.compiler.problem.nullReference=ignore
36
org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
37
org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
38
org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
39
org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
40
org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
41
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
42
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
43
org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
44
org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
45
org.eclipse.jdt.core.compiler.problem.typeParameterHiding=error
46
org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
47
org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
48
org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=ignore
49
org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
50
org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
51
org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
52
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
53
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
54
org.eclipse.jdt.core.compiler.problem.unusedImport=error
55
org.eclipse.jdt.core.compiler.problem.unusedLabel=error
56
org.eclipse.jdt.core.compiler.problem.unusedLocal=ignore
57
org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
58
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
59
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
60
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
61
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=ignore
7
org.eclipse.jdt.core.compiler.source=1.5
62
org.eclipse.jdt.core.compiler.source=1.5
(-)ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/AddMessageDrivenBeanWizardPage.java (-5 lines)
Lines 21-27 Link Here
21
import org.eclipse.jdt.internal.ui.dialogs.FilteredTypesSelectionDialog;
21
import org.eclipse.jdt.internal.ui.dialogs.FilteredTypesSelectionDialog;
22
import org.eclipse.jem.workbench.utility.JemProjectUtilities;
22
import org.eclipse.jem.workbench.utility.JemProjectUtilities;
23
import org.eclipse.jface.operation.IRunnableContext;
23
import org.eclipse.jface.operation.IRunnableContext;
24
import org.eclipse.jface.viewers.TableViewer;
25
import org.eclipse.jface.window.Window;
24
import org.eclipse.jface.window.Window;
26
import org.eclipse.jst.ejb.ui.internal.util.EJBUIMessages;
25
import org.eclipse.jst.ejb.ui.internal.util.EJBUIMessages;
27
import org.eclipse.jst.j2ee.ejb.internal.operations.INewMessageDrivenBeanClassDataModelProperties;
26
import org.eclipse.jst.j2ee.ejb.internal.operations.INewMessageDrivenBeanClassDataModelProperties;
Lines 32-38 Link Here
32
import org.eclipse.swt.SWT;
31
import org.eclipse.swt.SWT;
33
import org.eclipse.swt.layout.GridData;
32
import org.eclipse.swt.layout.GridData;
34
import org.eclipse.swt.layout.GridLayout;
33
import org.eclipse.swt.layout.GridLayout;
35
import org.eclipse.swt.widgets.Button;
36
import org.eclipse.swt.widgets.Combo;
34
import org.eclipse.swt.widgets.Combo;
37
import org.eclipse.swt.widgets.Composite;
35
import org.eclipse.swt.widgets.Composite;
38
import org.eclipse.swt.widgets.Label;
36
import org.eclipse.swt.widgets.Label;
Lines 46-54 Link Here
46
44
47
	private Text ejbNameText;
45
	private Text ejbNameText;
48
	private Combo transactionTypeCombo;
46
	private Combo transactionTypeCombo;
49
	private TableViewer businessnterfacesList;
50
	private Button addButton;
51
	private Button removeButton;
52
	
47
	
53
	public AddMessageDrivenBeanWizardPage(IDataModel model, String pageName) {
48
	public AddMessageDrivenBeanWizardPage(IDataModel model, String pageName) {
54
		super(model,pageName,
49
		super(model,pageName,
(-)ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/AddButtonListener.java (-4 lines)
Lines 17-24 Link Here
17
17
18
import org.eclipse.core.resources.IProject;
18
import org.eclipse.core.resources.IProject;
19
import org.eclipse.core.resources.ResourcesPlugin;
19
import org.eclipse.core.resources.ResourcesPlugin;
20
import org.eclipse.core.runtime.IStatus;
21
import org.eclipse.core.runtime.Status;
22
import org.eclipse.jdt.core.IJavaProject;
20
import org.eclipse.jdt.core.IJavaProject;
23
import org.eclipse.jdt.core.IPackageFragmentRoot;
21
import org.eclipse.jdt.core.IPackageFragmentRoot;
24
import org.eclipse.jdt.core.IType;
22
import org.eclipse.jdt.core.IType;
Lines 31-41 Link Here
31
import org.eclipse.jst.ejb.ui.internal.util.EJBUIMessages;
29
import org.eclipse.jst.ejb.ui.internal.util.EJBUIMessages;
32
import org.eclipse.jst.j2ee.ejb.internal.operations.INewSessionBeanClassDataModelProperties;
30
import org.eclipse.jst.j2ee.ejb.internal.operations.INewSessionBeanClassDataModelProperties;
33
import org.eclipse.jst.j2ee.ejb.internal.operations.BusinessInterface;
31
import org.eclipse.jst.j2ee.ejb.internal.operations.BusinessInterface;
34
import org.eclipse.jst.j2ee.ejb.internal.operations.BusinessInterface.BusinessInterfaceType;
35
import org.eclipse.swt.events.SelectionEvent;
32
import org.eclipse.swt.events.SelectionEvent;
36
import org.eclipse.swt.events.SelectionListener;
33
import org.eclipse.swt.events.SelectionListener;
37
import org.eclipse.swt.widgets.Shell;
34
import org.eclipse.swt.widgets.Shell;
38
import org.eclipse.ui.dialogs.ISelectionStatusValidator;
39
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
35
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
40
36
41
public class AddButtonListener implements SelectionListener {
37
public class AddButtonListener implements SelectionListener {
(-)ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/ComboIndexSynchHelper.java (-1 lines)
Lines 4-10 Link Here
4
import org.eclipse.swt.events.SelectionListener;
4
import org.eclipse.swt.events.SelectionListener;
5
import org.eclipse.swt.widgets.Combo;
5
import org.eclipse.swt.widgets.Combo;
6
import org.eclipse.swt.widgets.Control;
6
import org.eclipse.swt.widgets.Control;
7
import org.eclipse.wst.common.frameworks.datamodel.DataModelPropertyDescriptor;
8
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
7
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
9
import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelSynchHelper;
8
import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelSynchHelper;
10
9
(-).settings/org.eclipse.jdt.core.prefs (-1 / +63 lines)
Lines 1-7 Link Here
1
#Thu May 10 18:34:04 EDT 2007
1
#Mon Feb 18 15:57:09 EST 2008
2
eclipse.preferences.version=1
2
eclipse.preferences.version=1
3
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
3
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
4
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
5
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
4
org.eclipse.jdt.core.compiler.compliance=1.5
6
org.eclipse.jdt.core.compiler.compliance=1.5
7
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
8
org.eclipse.jdt.core.compiler.debug.localVariable=generate
9
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
10
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=ignore
5
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
11
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
12
org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
13
org.eclipse.jdt.core.compiler.problem.deprecation=warning
14
org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
15
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
16
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
17
org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
6
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
18
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
19
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
20
org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
21
org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
22
org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
23
org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
24
org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
25
org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
26
org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error
27
org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
28
org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
29
org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
30
org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
31
org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
32
org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
33
org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
34
org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
35
org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error
36
org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
37
org.eclipse.jdt.core.compiler.problem.nullReference=ignore
38
org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
39
org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
40
org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
41
org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
42
org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
43
org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
44
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
45
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
46
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
47
org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
48
org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
49
org.eclipse.jdt.core.compiler.problem.typeParameterHiding=error
50
org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
51
org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
52
org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=ignore
53
org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
54
org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
55
org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
56
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
57
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
58
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
59
org.eclipse.jdt.core.compiler.problem.unusedImport=error
60
org.eclipse.jdt.core.compiler.problem.unusedLabel=error
61
org.eclipse.jdt.core.compiler.problem.unusedLocal=ignore
62
org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
63
org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
64
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
65
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
66
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
67
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
68
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=ignore
7
org.eclipse.jdt.core.compiler.source=1.5
69
org.eclipse.jdt.core.compiler.source=1.5
(-)ejb/org/eclipse/jst/j2ee/ejb/internal/operations/SourceMethod.java (-2 lines)
Lines 10-22 Link Here
10
 *******************************************************************************/
10
 *******************************************************************************/
11
package org.eclipse.jst.j2ee.ejb.internal.operations;
11
package org.eclipse.jst.j2ee.ejb.internal.operations;
12
12
13
import java.lang.reflect.Constructor;
14
import java.util.ArrayList;
13
import java.util.ArrayList;
15
import java.util.Collection;
14
import java.util.Collection;
16
import java.util.Iterator;
15
import java.util.Iterator;
17
import java.util.List;
16
import java.util.List;
18
17
19
import org.eclipse.jdt.core.JavaModelException;
20
import org.eclipse.jdt.core.Signature;
18
import org.eclipse.jdt.core.Signature;
21
import org.eclipse.jdt.core.dom.ArrayType;
19
import org.eclipse.jdt.core.dom.ArrayType;
22
import org.eclipse.jdt.core.dom.ITypeBinding;
20
import org.eclipse.jdt.core.dom.ITypeBinding;
(-)ejb/org/eclipse/jst/j2ee/ejb/internal/operations/AddSessionBeanOperation.java (-3 lines)
Lines 12-26 Link Here
12
12
13
import org.eclipse.core.runtime.NullProgressMonitor;
13
import org.eclipse.core.runtime.NullProgressMonitor;
14
import org.eclipse.jem.util.logger.proxy.Logger;
14
import org.eclipse.jem.util.logger.proxy.Logger;
15
import org.eclipse.jst.j2ee.model.IModelProvider;
16
import org.eclipse.wst.common.componentcore.internal.operation.ArtifactEditProviderOperation;
15
import org.eclipse.wst.common.componentcore.internal.operation.ArtifactEditProviderOperation;
17
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
16
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
18
17
19
18
20
public class AddSessionBeanOperation extends AddEnterpriseBeanOperation {
19
public class AddSessionBeanOperation extends AddEnterpriseBeanOperation {
21
20
22
	private IModelProvider provider;
23
24
	/**
21
	/**
25
	 * This is the constructor which should be used when creating the operation.
22
	 * This is the constructor which should be used when creating the operation.
26
	 * It will not accept null parameter. It will not return null.
23
	 * It will not accept null parameter. It will not return null.
(-)ejbcreation/org/eclipse/jst/j2ee/internal/ejb/project/operations/EjbFacetProjectCreationDataModelProvider.java (-6 / +1 lines)
Lines 14-32 Link Here
14
import java.util.Collection;
14
import java.util.Collection;
15
15
16
import org.eclipse.jst.common.project.facet.IJavaFacetInstallDataModelProperties;
16
import org.eclipse.jst.common.project.facet.IJavaFacetInstallDataModelProperties;
17
import org.eclipse.jst.common.project.facet.JavaFacetInstallDataModelProvider;
18
import org.eclipse.jst.common.project.facet.JavaFacetUtils;
17
import org.eclipse.jst.common.project.facet.JavaFacetUtils;
19
import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
20
import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetConstants;
18
import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetConstants;
21
import org.eclipse.jst.j2ee.project.facet.IJ2EEModuleFacetInstallDataModelProperties;
19
import org.eclipse.jst.j2ee.project.facet.IJ2EEModuleFacetInstallDataModelProperties;
22
import org.eclipse.jst.j2ee.project.facet.J2EEFacetProjectCreationDataModelProvider;
20
import org.eclipse.jst.j2ee.project.facet.J2EEFacetProjectCreationDataModelProvider;
23
import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
24
import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent;
21
import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent;
25
import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
26
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
22
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
27
import org.eclipse.wst.common.frameworks.datamodel.IDataModelListener;
23
import org.eclipse.wst.common.frameworks.datamodel.IDataModelListener;
28
import org.eclipse.wst.common.project.facet.core.IProjectFacet;
24
import org.eclipse.wst.common.project.facet.core.IProjectFacet;
29
import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
30
import org.eclipse.wst.project.facet.ProductManager;
25
import org.eclipse.wst.project.facet.ProductManager;
31
26
32
public class EjbFacetProjectCreationDataModelProvider extends
27
public class EjbFacetProjectCreationDataModelProvider extends
Lines 69-75 Link Here
69
	public boolean propertySet(String propertyName, Object propertyValue) {
64
	public boolean propertySet(String propertyName, Object propertyValue) {
70
		if( propertyName.equals( MODULE_URI )){
65
		if( propertyName.equals( MODULE_URI )){
71
			FacetDataModelMap map = (FacetDataModelMap) getProperty(FACET_DM_MAP);
66
			FacetDataModelMap map = (FacetDataModelMap) getProperty(FACET_DM_MAP);
72
			IDataModel ejbFacet = map.getFacetDataModel( J2EEProjectUtilities.EJB );	
67
			IDataModel ejbFacet = map.getFacetDataModel( IJ2EEFacetConstants.EJB );	
73
			ejbFacet.setProperty( IJ2EEModuleFacetInstallDataModelProperties.MODULE_URI, propertyValue );
68
			ejbFacet.setProperty( IJ2EEModuleFacetInstallDataModelProperties.MODULE_URI, propertyValue );
74
		}
69
		}
75
		return super.propertySet(propertyName, propertyValue);
70
		return super.propertySet(propertyName, propertyValue);
(-)appclientcreation/org/eclipse/jst/j2ee/project/facet/AppClientFacetPostInstallDelegate.java (-3 lines)
Lines 17-30 Link Here
17
import org.eclipse.core.resources.IContainer;
17
import org.eclipse.core.resources.IContainer;
18
import org.eclipse.core.resources.IFile;
18
import org.eclipse.core.resources.IFile;
19
import org.eclipse.core.resources.IProject;
19
import org.eclipse.core.resources.IProject;
20
import org.eclipse.core.resources.IResource;
21
import org.eclipse.core.runtime.CoreException;
20
import org.eclipse.core.runtime.CoreException;
22
import org.eclipse.core.runtime.IPath;
21
import org.eclipse.core.runtime.IPath;
23
import org.eclipse.core.runtime.IProgressMonitor;
22
import org.eclipse.core.runtime.IProgressMonitor;
24
import org.eclipse.core.runtime.Path;
23
import org.eclipse.core.runtime.Path;
25
import org.eclipse.jdt.core.IJavaProject;
26
import org.eclipse.jem.util.logger.proxy.Logger;
24
import org.eclipse.jem.util.logger.proxy.Logger;
27
import org.eclipse.jem.workbench.utility.JemProjectUtilities;
28
import org.eclipse.jst.j2ee.application.internal.operations.UpdateManifestDataModelProperties;
25
import org.eclipse.jst.j2ee.application.internal.operations.UpdateManifestDataModelProperties;
29
import org.eclipse.jst.j2ee.application.internal.operations.UpdateManifestDataModelProvider;
26
import org.eclipse.jst.j2ee.application.internal.operations.UpdateManifestDataModelProvider;
30
import org.eclipse.jst.j2ee.internal.J2EEConstants;
27
import org.eclipse.jst.j2ee.internal.J2EEConstants;
(-)common/org/eclipse/jst/j2ee/internal/common/UpdateProjectClasspath.java (-15 lines)
Lines 86-105 Link Here
86
		catch (JavaModelException e) {
86
		catch (JavaModelException e) {
87
			Logger.getLogger().logError(e);
87
			Logger.getLogger().logError(e);
88
		}
88
		}
89
	}	
90
91
	private static IClasspathEntry[] getProjectDependency(IProject clientProj){
92
		IClasspathEntry projectEntry = JavaCore.newProjectEntry(clientProj.getFullPath(), true);
93
			return new IClasspathEntry[]{projectEntry};	
94
	}
89
	}
95
	
96
	private static boolean entryToChange(final IClasspathEntry entry, final IClasspathEntry[] entriesToChange) {
97
		for (int i = 0; i < entriesToChange.length; i++) {
98
			if (entriesToChange[i].equals(entry)) {
99
				return true;
100
			}
101
		}
102
		return false;
103
	}	
104
105
}
90
}
(-)archiveops/org/eclipse/jst/j2ee/internal/archive/JavaEEEMFArchiveAdapterHelper.java (-2 / +21 lines)
Lines 241-246 Link Here
241
		public SAXFactoryKey(URI uri, IContentDescription description) {
241
		public SAXFactoryKey(URI uri, IContentDescription description) {
242
			this.uri = uri;
242
			this.uri = uri;
243
			this.description = description;
243
			this.description = description;
244
			if(uri == null){
245
				throw new NullPointerException();
246
			}
247
			if(description == null){
248
				throw new NullPointerException();
249
			}
250
		}
251
		
252
		@Override
253
		public boolean equals(Object obj){
254
			if(obj == null || !(obj instanceof SAXFactoryKey)){
255
				return false;
256
			}
257
			SAXFactoryKey other = (SAXFactoryKey)obj;
258
			return uri.equals(other.uri) && description.equals(other.description);
259
		}
260
261
		@Override
262
		public int hashCode() {
263
			return uri.hashCode() + description.hashCode();
244
		}
264
		}
245
	}
265
	}
246
266
Lines 248-254 Link Here
248
268
249
	private static Resource.Factory getSAXResourceFactory(SAXFactoryKey key) {
269
	private static Resource.Factory getSAXResourceFactory(SAXFactoryKey key) {
250
		synchronized (localFactoryMap) {
270
		synchronized (localFactoryMap) {
251
			return localFactoryMap.get(localFactoryMap);
271
			return localFactoryMap.get(key);
252
		}
272
		}
253
	}
273
	}
254
274
Lines 257-261 Link Here
257
			localFactoryMap.put(key, resourceFactory);
277
			localFactoryMap.put(key, resourceFactory);
258
		}
278
		}
259
	}
279
	}
260
261
}
280
}
(-)j2eeplugin/org/eclipse/jst/j2ee/internal/validation/DependencyUtil.java (-6 / +5 lines)
Lines 23-29 Link Here
23
import org.eclipse.jem.util.logger.LogEntry;
23
import org.eclipse.jem.util.logger.LogEntry;
24
import org.eclipse.jem.util.logger.proxy.Logger;
24
import org.eclipse.jem.util.logger.proxy.Logger;
25
import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
25
import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
26
import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
27
26
28
/**
27
/**
29
 * This singleton keeps an internal record of project dependencies. That is, every IProject can
28
 * This singleton keeps an internal record of project dependencies. That is, every IProject can
Lines 112-118 Link Here
112
		} catch (CoreException exc) {
111
		} catch (CoreException exc) {
113
			Logger logger = J2EEPlugin.getDefault().getMsgLogger();
112
			Logger logger = J2EEPlugin.getDefault().getMsgLogger();
114
			if (logger.isLoggingLevel(Level.SEVERE)) {
113
			if (logger.isLoggingLevel(Level.SEVERE)) {
115
				LogEntry entry = J2EEPlugin.getDefault().getLogEntry();
114
				LogEntry entry = J2EEPlugin.getLogEntry();
116
				entry.setSourceID("DependencyCache::getRequiredProjects(" + project.getName() + ")"); //$NON-NLS-1$  //$NON-NLS-2$
115
				entry.setSourceID("DependencyCache::getRequiredProjects(" + project.getName() + ")"); //$NON-NLS-1$  //$NON-NLS-2$
117
				entry.setTargetException(exc);
116
				entry.setTargetException(exc);
118
				logger.write(Level.SEVERE, exc);
117
				logger.write(Level.SEVERE, exc);
Lines 151-157 Link Here
151
		} catch (JavaModelException exc) {
150
		} catch (JavaModelException exc) {
152
			Logger logger = J2EEPlugin.getDefault().getMsgLogger();
151
			Logger logger = J2EEPlugin.getDefault().getMsgLogger();
153
			if (logger.isLoggingLevel(Level.SEVERE)) {
152
			if (logger.isLoggingLevel(Level.SEVERE)) {
154
				LogEntry entry = J2EEPlugin.getDefault().getLogEntry();
153
				LogEntry entry = J2EEPlugin.getLogEntry();
155
				entry.setSourceID("DependencyCache::getDependentJavaProjects(" + javaproject.getProject().getName() + ")"); //$NON-NLS-1$  //$NON-NLS-2$
154
				entry.setSourceID("DependencyCache::getDependentJavaProjects(" + javaproject.getProject().getName() + ")"); //$NON-NLS-1$  //$NON-NLS-2$
156
				entry.setTargetException(exc);
155
				entry.setTargetException(exc);
157
				logger.write(Level.SEVERE, exc);
156
				logger.write(Level.SEVERE, exc);
Lines 174-180 Link Here
174
			if (jm == null) {
173
			if (jm == null) {
175
				Logger logger = J2EEPlugin.getDefault().getMsgLogger();
174
				Logger logger = J2EEPlugin.getDefault().getMsgLogger();
176
				if (logger.isLoggingLevel(Level.SEVERE)) {
175
				if (logger.isLoggingLevel(Level.SEVERE)) {
177
					LogEntry entry = J2EEPlugin.getDefault().getLogEntry();
176
					LogEntry entry = J2EEPlugin.getLogEntry();
178
					entry.setSourceID("DependencyCache::getRequiredJavaProjects(" + javaproject.getProject().getName() + ")"); //$NON-NLS-1$  //$NON-NLS-2$
177
					entry.setSourceID("DependencyCache::getRequiredJavaProjects(" + javaproject.getProject().getName() + ")"); //$NON-NLS-1$  //$NON-NLS-2$
179
					//entry.setText("IJavaModel == null"); //$NON-NLS-1$
178
					//entry.setText("IJavaModel == null"); //$NON-NLS-1$
180
					logger.write(Level.SEVERE, "IJavaModel == null"); //$NON-NLS-1$
179
					logger.write(Level.SEVERE, "IJavaModel == null"); //$NON-NLS-1$
Lines 208-214 Link Here
208
				} catch (CoreException exc) {
207
				} catch (CoreException exc) {
209
					Logger logger = J2EEPlugin.getDefault().getMsgLogger();
208
					Logger logger = J2EEPlugin.getDefault().getMsgLogger();
210
					if (logger.isLoggingLevel(Level.SEVERE)) {
209
					if (logger.isLoggingLevel(Level.SEVERE)) {
211
						LogEntry entry = J2EEPlugin.getDefault().getLogEntry();
210
						LogEntry entry = J2EEPlugin.getLogEntry();
212
						entry.setSourceID("DependencyCache::getRequiredJavaProjects(" + javaproject.getProject().getName() + ")"); //$NON-NLS-1$  //$NON-NLS-2$
211
						entry.setSourceID("DependencyCache::getRequiredJavaProjects(" + javaproject.getProject().getName() + ")"); //$NON-NLS-1$  //$NON-NLS-2$
213
						entry.setTargetException(exc);
212
						entry.setTargetException(exc);
214
						logger.write(Level.SEVERE, exc);
213
						logger.write(Level.SEVERE, exc);
Lines 231-237 Link Here
231
		} catch (JavaModelException exc) {
230
		} catch (JavaModelException exc) {
232
			Logger logger = J2EEPlugin.getDefault().getMsgLogger();
231
			Logger logger = J2EEPlugin.getDefault().getMsgLogger();
233
			if (logger.isLoggingLevel(Level.SEVERE)) {
232
			if (logger.isLoggingLevel(Level.SEVERE)) {
234
				LogEntry entry = J2EEPlugin.getDefault().getLogEntry();
233
				LogEntry entry = J2EEPlugin.getLogEntry();
235
				entry.setSourceID("DependencyCache::getRequiredJavaProjects(" + javaproject.getProject().getName() + ")"); //$NON-NLS-1$  //$NON-NLS-2$
234
				entry.setSourceID("DependencyCache::getRequiredJavaProjects(" + javaproject.getProject().getName() + ")"); //$NON-NLS-1$  //$NON-NLS-2$
236
				entry.setTargetException(exc);
235
				entry.setTargetException(exc);
237
				logger.write(Level.SEVERE, exc);
236
				logger.write(Level.SEVERE, exc);
(-)j2eeplugin/org/eclipse/jst/j2ee/internal/validation/AWorkbenchMOFHelper.java (-1 lines)
Lines 25-31 Link Here
25
import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
25
import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
26
import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper;
26
import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper;
27
import org.eclipse.wst.validation.internal.operations.WorkbenchContext;
27
import org.eclipse.wst.validation.internal.operations.WorkbenchContext;
28
import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
29
28
30
29
31
/**
30
/**
(-)j2eecreation/org/eclipse/jst/j2ee/project/EarUtilities.java (-1 lines)
Lines 17-23 Link Here
17
import java.util.List;
17
import java.util.List;
18
18
19
import org.eclipse.core.resources.IProject;
19
import org.eclipse.core.resources.IProject;
20
import org.eclipse.jst.j2ee.application.Application;
21
import org.eclipse.jst.j2ee.application.Module;
20
import org.eclipse.jst.j2ee.application.Module;
22
import org.eclipse.jst.j2ee.internal.plugin.IJ2EEModuleConstants;
21
import org.eclipse.jst.j2ee.internal.plugin.IJ2EEModuleConstants;
23
import org.eclipse.jst.j2ee.model.IEARModelProvider;
22
import org.eclipse.jst.j2ee.model.IEARModelProvider;
(-)j2eecreation/org/eclipse/jst/j2ee/internal/project/J2EEProjectUtilities.java (-12 lines)
Lines 64-89 Link Here
64
import org.eclipse.jst.j2ee.internal.archive.operations.JavaComponentLoadStrategyImpl;
64
import org.eclipse.jst.j2ee.internal.archive.operations.JavaComponentLoadStrategyImpl;
65
import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
65
import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
66
import org.eclipse.jst.j2ee.internal.common.classpath.J2EEComponentClasspathUpdater;
66
import org.eclipse.jst.j2ee.internal.common.classpath.J2EEComponentClasspathUpdater;
67
import org.eclipse.jst.j2ee.internal.componentcore.AppClientBinaryComponentHelper;
68
import org.eclipse.jst.j2ee.internal.componentcore.EJBBinaryComponentHelper;
69
import org.eclipse.jst.j2ee.internal.componentcore.JCABinaryComponentHelper;
70
import org.eclipse.jst.j2ee.internal.componentcore.WebBinaryComponentHelper;
71
import org.eclipse.jst.j2ee.internal.moduleextension.EarModuleManager;
67
import org.eclipse.jst.j2ee.internal.moduleextension.EarModuleManager;
72
import org.eclipse.jst.j2ee.internal.plugin.IJ2EEModuleConstants;
73
import org.eclipse.jst.j2ee.project.EarUtilities;
68
import org.eclipse.jst.j2ee.project.EarUtilities;
74
import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
69
import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
75
import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetConstants;
70
import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetConstants;
76
import org.eclipse.jst.j2ee.project.facet.IJavaProjectMigrationDataModelProperties;
71
import org.eclipse.jst.j2ee.project.facet.IJavaProjectMigrationDataModelProperties;
77
import org.eclipse.jst.j2ee.project.facet.JavaProjectMigrationDataModelProvider;
72
import org.eclipse.jst.j2ee.project.facet.JavaProjectMigrationDataModelProvider;
78
import org.eclipse.jst.j2ee.project.facet.JavaProjectMigrationOperation;
73
import org.eclipse.jst.j2ee.project.facet.JavaProjectMigrationOperation;
79
import org.eclipse.jst.jee.util.internal.JavaEEQuickPeek;
80
import org.eclipse.jst.server.core.FacetUtil;
74
import org.eclipse.jst.server.core.FacetUtil;
81
import org.eclipse.wst.common.componentcore.ComponentCore;
75
import org.eclipse.wst.common.componentcore.ComponentCore;
82
import org.eclipse.wst.common.componentcore.internal.impl.ModuleURIUtil;
76
import org.eclipse.wst.common.componentcore.internal.impl.ModuleURIUtil;
83
import org.eclipse.wst.common.componentcore.internal.util.ComponentUtilities;
77
import org.eclipse.wst.common.componentcore.internal.util.ComponentUtilities;
84
import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
78
import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
85
import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
79
import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
86
import org.eclipse.wst.common.componentcore.resources.IVirtualFile;
87
import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
80
import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
88
import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
81
import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
89
import org.eclipse.wst.common.componentcore.resources.IVirtualResource;
82
import org.eclipse.wst.common.componentcore.resources.IVirtualResource;
Lines 96-102 Link Here
96
import org.eclipse.wst.server.core.IRuntime;
89
import org.eclipse.wst.server.core.IRuntime;
97
90
98
public class J2EEProjectUtilities extends ProjectUtilities implements IJ2EEFacetConstants {
91
public class J2EEProjectUtilities extends ProjectUtilities implements IJ2EEFacetConstants {
99
	private static final IVirtualReference[] NO_REFERENCES = new IVirtualReference[0];
100
92
101
	/**
93
	/**
102
	 * Return the absolute path of a loose archive in a J2EE application or WAR file
94
	 * Return the absolute path of a loose archive in a J2EE application or WAR file
Lines 550-559 Link Here
550
		return isProjectOfType(project, DYNAMIC_WEB);
542
		return isProjectOfType(project, DYNAMIC_WEB);
551
	}
543
	}
552
544
553
	private static boolean isStaticWebProject(IFacetedProject project) {
554
		return isProjectOfType(project, STATIC_WEB);
555
	}
556
557
	private static boolean isEJBProject(IFacetedProject project) {
545
	private static boolean isEJBProject(IFacetedProject project) {
558
		return isProjectOfType(project, EJB);
546
		return isProjectOfType(project, EJB);
559
	}
547
	}
(-).settings/org.eclipse.jdt.core.prefs (-1 / +56 lines)
Lines 1-7 Link Here
1
#Thu May 03 00:58:38 EDT 2007
1
#Mon Feb 18 15:57:09 EST 2008
2
eclipse.preferences.version=1
2
eclipse.preferences.version=1
3
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
3
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
4
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
5
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
4
org.eclipse.jdt.core.compiler.compliance=1.5
6
org.eclipse.jdt.core.compiler.compliance=1.5
7
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
8
org.eclipse.jdt.core.compiler.debug.localVariable=generate
9
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
10
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=ignore
5
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
11
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
12
org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
13
org.eclipse.jdt.core.compiler.problem.deprecation=warning
14
org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
15
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
16
org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
6
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
17
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
18
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
19
org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
20
org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
21
org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
22
org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
23
org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
24
org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error
25
org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
26
org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
27
org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
28
org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
29
org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
30
org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
31
org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
32
org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
33
org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error
34
org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
35
org.eclipse.jdt.core.compiler.problem.nullReference=ignore
36
org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
37
org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
38
org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
39
org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
40
org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
41
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
42
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
43
org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
44
org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
45
org.eclipse.jdt.core.compiler.problem.typeParameterHiding=error
46
org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
47
org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
48
org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=ignore
49
org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
50
org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
51
org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
52
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
53
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
54
org.eclipse.jdt.core.compiler.problem.unusedImport=error
55
org.eclipse.jdt.core.compiler.problem.unusedLabel=error
56
org.eclipse.jdt.core.compiler.problem.unusedLocal=ignore
57
org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
58
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
59
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
60
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
61
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=ignore
7
org.eclipse.jdt.core.compiler.source=1.5
62
org.eclipse.jdt.core.compiler.source=1.5
(-).settings/org.eclipse.jdt.core.prefs (-1 / +56 lines)
Lines 1-7 Link Here
1
#Thu May 10 18:37:10 EDT 2007
1
#Mon Feb 18 15:57:09 EST 2008
2
eclipse.preferences.version=1
2
eclipse.preferences.version=1
3
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
3
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
4
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
5
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
4
org.eclipse.jdt.core.compiler.compliance=1.5
6
org.eclipse.jdt.core.compiler.compliance=1.5
7
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
8
org.eclipse.jdt.core.compiler.debug.localVariable=generate
9
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
10
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=ignore
5
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
11
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
12
org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
13
org.eclipse.jdt.core.compiler.problem.deprecation=warning
14
org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
15
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
16
org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
6
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
17
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
18
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
19
org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
20
org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
21
org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
22
org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
23
org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
24
org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error
25
org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
26
org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
27
org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
28
org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
29
org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
30
org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
31
org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
32
org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
33
org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error
34
org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
35
org.eclipse.jdt.core.compiler.problem.nullReference=ignore
36
org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
37
org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
38
org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
39
org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
40
org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
41
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
42
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
43
org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
44
org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
45
org.eclipse.jdt.core.compiler.problem.typeParameterHiding=error
46
org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
47
org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
48
org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=ignore
49
org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
50
org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
51
org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
52
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
53
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
54
org.eclipse.jdt.core.compiler.problem.unusedImport=error
55
org.eclipse.jdt.core.compiler.problem.unusedLabel=error
56
org.eclipse.jdt.core.compiler.problem.unusedLocal=ignore
57
org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
58
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
59
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
60
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
61
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=ignore
7
org.eclipse.jdt.core.compiler.source=1.5
62
org.eclipse.jdt.core.compiler.source=1.5
(-)servlet_ui/org/eclipse/jst/servlet/ui/internal/actions/ConvertToWebModuleTypeAction.java (-1 / +1 lines)
Lines 110-116 Link Here
110
			if (dialog.getReturnCode() == Window.CANCEL)
110
			if (dialog.getReturnCode() == Window.CANCEL)
111
				return;
111
				return;
112
			
112
			
113
			doConvert(dialog.getSelectedVersion());
113
			doConvert(ConvertToWebModuleTypeDialog.getSelectedVersion());
114
			
114
			
115
		} catch (Exception e) {
115
		} catch (Exception e) {
116
			Logger.logException(e);
116
			Logger.logException(e);
(-)servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/FilterMappingsArrayTableWizardSection.java (-6 lines)
Lines 284-295 Link Here
284
		setInput(valueList);
284
		setInput(valueList);
285
	}
285
	}
286
286
287
	private void removeFilterMapping(Object selectedFilterMapping) {
288
		List valueList = (List) viewer.getInput();
289
		valueList.remove(selectedFilterMapping);
290
		setInput(valueList);
291
	}
292
	
293
	private void removeFilterMappings(Collection selectedFilterMappings) {
287
	private void removeFilterMappings(Collection selectedFilterMappings) {
294
		List valueList = (List) viewer.getInput();
288
		List valueList = (List) viewer.getInput();
295
		valueList.removeAll(selectedFilterMappings);
289
		valueList.removeAll(selectedFilterMappings);
(-)servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewWebClassWizardPage.java (-3 lines)
Lines 14-21 Link Here
14
import org.eclipse.core.runtime.CoreException;
14
import org.eclipse.core.runtime.CoreException;
15
import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
15
import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
16
import org.eclipse.jface.dialogs.Dialog;
16
import org.eclipse.jface.dialogs.Dialog;
17
import org.eclipse.jst.j2ee.application.internal.operations.IAnnotationsDataModel;
18
import org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties;
19
import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
17
import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
20
import org.eclipse.jst.j2ee.internal.web.operations.INewWebClassDataModelProperties;
18
import org.eclipse.jst.j2ee.internal.web.operations.INewWebClassDataModelProperties;
21
import org.eclipse.jst.j2ee.internal.wizard.AnnotationsStandaloneGroup;
19
import org.eclipse.jst.j2ee.internal.wizard.AnnotationsStandaloneGroup;
Lines 31-37 Link Here
31
import org.eclipse.swt.widgets.Composite;
29
import org.eclipse.swt.widgets.Composite;
32
import org.eclipse.swt.widgets.Label;
30
import org.eclipse.swt.widgets.Label;
33
import org.eclipse.swt.widgets.Text;
31
import org.eclipse.swt.widgets.Text;
34
import org.eclipse.wst.common.componentcore.internal.operation.IArtifactEditOperationDataModelProperties;
35
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
32
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
36
import org.eclipse.wst.common.project.facet.core.IFacetedProject;
33
import org.eclipse.wst.common.project.facet.core.IFacetedProject;
37
import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
34
import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
(-)servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddEditFilterMappingDialog.java (-4 / +1 lines)
Lines 54-60 Link Here
54
import org.eclipse.swt.widgets.TableItem;
54
import org.eclipse.swt.widgets.TableItem;
55
import org.eclipse.swt.widgets.Text;
55
import org.eclipse.swt.widgets.Text;
56
import org.eclipse.ui.PlatformUI;
56
import org.eclipse.ui.PlatformUI;
57
import org.eclipse.ui.dialogs.ISelectionStatusValidator;
58
import org.eclipse.ui.dialogs.SelectionStatusDialog;
57
import org.eclipse.ui.dialogs.SelectionStatusDialog;
59
import org.eclipse.ui.internal.layout.CellLayout;
58
import org.eclipse.ui.internal.layout.CellLayout;
60
import org.eclipse.ui.part.PageBook;
59
import org.eclipse.ui.part.PageBook;
Lines 79-86 Link Here
79
78
80
	}
79
	}
81
	
80
	
82
	private ISelectionStatusValidator fValidator = null;
83
	
84
    public final static int SERVLET = 0;
81
    public final static int SERVLET = 0;
85
	public final static int URL_PATTERN = 1;
82
	public final static int URL_PATTERN = 1;
86
	protected Button fServletButton;
83
	protected Button fServletButton;
Lines 96-102 Link Here
96
	private Object[] fElements;
93
	private Object[] fElements;
97
	private boolean fIgnoreCase = true;
94
	private boolean fIgnoreCase = true;
98
	private String fUpperListLabel;
95
	private String fUpperListLabel;
99
	private String fLowerListLabel;
96
100
	// SWT widgets
97
	// SWT widgets
101
	private Table fUpperList;
98
	private Table fUpperList;
102
	protected Text fURLText;
99
	protected Text fURLText;
(-)servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewWebArtifactWizard.java (-1 lines)
Lines 21-27 Link Here
21
import org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties;
21
import org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties;
22
import org.eclipse.jst.j2ee.internal.plugin.J2EEEditorUtility;
22
import org.eclipse.jst.j2ee.internal.plugin.J2EEEditorUtility;
23
import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
23
import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
24
import org.eclipse.jst.j2ee.internal.web.operations.INewServletClassDataModelProperties;
25
import org.eclipse.jst.servlet.ui.internal.plugin.ServletUIPlugin;
24
import org.eclipse.jst.servlet.ui.internal.plugin.ServletUIPlugin;
26
import org.eclipse.ui.IWorkbenchPage;
25
import org.eclipse.ui.IWorkbenchPage;
27
import org.eclipse.ui.PartInitException;
26
import org.eclipse.ui.PartInitException;
(-)web/org/eclipse/jst/j2ee/internal/web/operations/CreateWebClassTemplateModel.java (-2 lines)
Lines 32-39 Link Here
32
import org.eclipse.jdt.core.dom.ITypeBinding;
32
import org.eclipse.jdt.core.dom.ITypeBinding;
33
import org.eclipse.jdt.core.dom.MethodDeclaration;
33
import org.eclipse.jdt.core.dom.MethodDeclaration;
34
import org.eclipse.jdt.core.dom.TypeDeclaration;
34
import org.eclipse.jdt.core.dom.TypeDeclaration;
35
import org.eclipse.jst.j2ee.application.internal.operations.IAnnotationsDataModel;
36
import org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties;
37
import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
35
import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
38
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
36
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
39
37
(-)web/org/eclipse/jst/j2ee/internal/web/operations/AddServletOperation.java (-3 lines)
Lines 20-31 Link Here
20
import org.eclipse.core.runtime.IProgressMonitor;
20
import org.eclipse.core.runtime.IProgressMonitor;
21
import org.eclipse.core.runtime.IStatus;
21
import org.eclipse.core.runtime.IStatus;
22
import org.eclipse.core.runtime.NullProgressMonitor;
22
import org.eclipse.core.runtime.NullProgressMonitor;
23
import org.eclipse.jst.j2ee.application.internal.operations.IAnnotationsDataModel;
24
import org.eclipse.jst.j2ee.common.CommonFactory;
23
import org.eclipse.jst.j2ee.common.CommonFactory;
25
import org.eclipse.jst.j2ee.common.Description;
24
import org.eclipse.jst.j2ee.common.Description;
26
import org.eclipse.jst.j2ee.common.ParamValue;
25
import org.eclipse.jst.j2ee.common.ParamValue;
27
import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
26
import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
28
import org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties;
29
import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
27
import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
30
import org.eclipse.jst.j2ee.model.ModelProviderManager;
28
import org.eclipse.jst.j2ee.model.ModelProviderManager;
31
import org.eclipse.jst.j2ee.webapplication.InitParam;
29
import org.eclipse.jst.j2ee.webapplication.InitParam;
Lines 40-46 Link Here
40
import org.eclipse.jst.javaee.core.UrlPatternType;
38
import org.eclipse.jst.javaee.core.UrlPatternType;
41
import org.eclipse.jst.javaee.web.WebFactory;
39
import org.eclipse.jst.javaee.web.WebFactory;
42
import org.eclipse.wst.common.componentcore.internal.operation.ArtifactEditProviderOperation;
40
import org.eclipse.wst.common.componentcore.internal.operation.ArtifactEditProviderOperation;
43
import org.eclipse.wst.common.componentcore.internal.operation.IArtifactEditOperationDataModelProperties;
44
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
41
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
45
42
46
/**
43
/**
(-)web/org/eclipse/jst/j2ee/internal/web/operations/AddFilterOperation.java (-3 lines)
Lines 20-28 Link Here
20
import org.eclipse.core.runtime.IStatus;
20
import org.eclipse.core.runtime.IStatus;
21
import org.eclipse.core.runtime.NullProgressMonitor;
21
import org.eclipse.core.runtime.NullProgressMonitor;
22
import org.eclipse.emf.common.util.EList;
22
import org.eclipse.emf.common.util.EList;
23
import org.eclipse.jst.j2ee.application.internal.operations.IAnnotationsDataModel;
24
import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
23
import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
25
import org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties;
26
import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
24
import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
27
import org.eclipse.jst.j2ee.model.ModelProviderManager;
25
import org.eclipse.jst.j2ee.model.ModelProviderManager;
28
import org.eclipse.jst.j2ee.webapplication.DispatcherType;
26
import org.eclipse.jst.j2ee.webapplication.DispatcherType;
Lines 37-43 Link Here
37
import org.eclipse.jst.javaee.core.UrlPatternType;
35
import org.eclipse.jst.javaee.core.UrlPatternType;
38
import org.eclipse.jst.javaee.web.WebFactory;
36
import org.eclipse.jst.javaee.web.WebFactory;
39
import org.eclipse.wst.common.componentcore.internal.operation.ArtifactEditProviderOperation;
37
import org.eclipse.wst.common.componentcore.internal.operation.ArtifactEditProviderOperation;
40
import org.eclipse.wst.common.componentcore.internal.operation.IArtifactEditOperationDataModelProperties;
41
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
38
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
42
39
43
/**
40
/**
(-)web/org/eclipse/jst/j2ee/internal/web/operations/NewListenerClassDataModelProvider.java (-5 lines)
Lines 66-76 Link Here
66
		QUALIFIED_SERVLET_REQUEST_LISTENER,
66
		QUALIFIED_SERVLET_REQUEST_LISTENER,
67
		QUALIFIED_SERVLET_REQUEST_ATTRIBUTE_LISTENER
67
		QUALIFIED_SERVLET_REQUEST_ATTRIBUTE_LISTENER
68
	};
68
	};
69
	
70
	/**
71
	 * The fully qualified default listener superclass.
72
	 */
73
	private final static String LISTENER_SUPERCLASS = ""; //$NON-NLS-1$ 
74
69
75
	/**
70
	/**
76
	 * Subclasses may extend this method to provide their own default operation
71
	 * Subclasses may extend this method to provide their own default operation
(-).settings/org.eclipse.jdt.core.prefs (-1 / +56 lines)
Lines 1-7 Link Here
1
#Thu May 10 18:35:56 EDT 2007
1
#Mon Feb 18 15:57:09 EST 2008
2
eclipse.preferences.version=1
2
eclipse.preferences.version=1
3
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
3
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
4
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
5
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
4
org.eclipse.jdt.core.compiler.compliance=1.5
6
org.eclipse.jdt.core.compiler.compliance=1.5
7
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
8
org.eclipse.jdt.core.compiler.debug.localVariable=generate
9
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
10
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=ignore
5
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
11
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
12
org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
13
org.eclipse.jdt.core.compiler.problem.deprecation=warning
14
org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
15
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
16
org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
6
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
17
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
18
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
19
org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
20
org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
21
org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
22
org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
23
org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
24
org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error
25
org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
26
org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
27
org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
28
org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
29
org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
30
org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
31
org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
32
org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
33
org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error
34
org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
35
org.eclipse.jdt.core.compiler.problem.nullReference=ignore
36
org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
37
org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
38
org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
39
org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
40
org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
41
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
42
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
43
org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
44
org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
45
org.eclipse.jdt.core.compiler.problem.typeParameterHiding=error
46
org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
47
org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
48
org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=ignore
49
org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
50
org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
51
org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
52
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
53
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
54
org.eclipse.jdt.core.compiler.problem.unusedImport=error
55
org.eclipse.jdt.core.compiler.problem.unusedLabel=error
56
org.eclipse.jdt.core.compiler.problem.unusedLocal=ignore
57
org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
58
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
59
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
60
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
61
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=ignore
7
org.eclipse.jdt.core.compiler.source=1.5
62
org.eclipse.jdt.core.compiler.source=1.5

Return to bug 219377