Attachment #181428 for bug #324151

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 324151
Collapse All | Expand All




#Thu Oct 21 11:04:21 PDT 2010
eclipse.preferences.version=1
instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
org.eclipse.jdt.core.compiler.problem.unnecessaryElse=error
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=error
org.eclipse.jdt.core.compiler.problem.unusedLocal=error
org.eclipse.jdt.core.compiler.problem.emptyStatement=error
org.eclipse.jdt.core.compiler.problem.unusedLabel=error
org.eclipse.jdt.core.compiler.problem.unusedParameter=warning
org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
org.eclipse.jdt.core.incompatibleJDKLevel=ignore
org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
org.eclipse.jdt.core.builder.cleanOutputFolder=clean
org.eclipse.jdt.core.builder.duplicateResourceTask=warning
org.eclipse.jdt.core.builder.invalidClasspath=abort
org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=enabled
org.eclipse.jdt.core.compiler.problem.deprecation=warning
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=error
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
org.eclipse.jdt.core.compiler.problem.redundantNullCheck=error
org.eclipse.jdt.core.compiler.problem.unusedImport=error
org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
org.eclipse.jdt.core.circularClasspath=error
org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
org.eclipse.jdt.core.compiler.problem.typeParameterHiding=error
org.eclipse.jdt.core.builder.invalidClasspath=abort
org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=error
org.eclipse.jdt.core.codeComplete.argumentSuffixes=
org.eclipse.jdt.core.codeComplete.argumentPrefixes=
org.eclipse.jdt.core.codeComplete.argumentSuffixes=
org.eclipse.jdt.core.codeComplete.fieldPrefixes=
org.eclipse.jdt.core.codeComplete.fieldSuffixes=
org.eclipse.jdt.core.codeComplete.localPrefixes=
org.eclipse.jdt.core.codeComplete.localSuffixes=
org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
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.maxProblemPerUnit=100
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.autoboxing=warning
org.eclipse.jdt.core.compiler.problem.comparingIdentical=error
org.eclipse.jdt.core.compiler.problem.deadCode=error
org.eclipse.jdt.core.compiler.problem.deprecation=warning
org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=enabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.fallthroughCase=error
org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=error
org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
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.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=error
org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
org.eclipse.jdt.core.compiler.problem.deadCode=error
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeUncheckedExceptions=disabled
org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=error
org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=error
org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
org.eclipse.jdt.core.compiler.problem.missingSerialVersion=error
org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=error
org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error
org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=error
org.eclipse.jdt.core.compiler.problem.nullReference=error
org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
org.eclipse.jdt.core.compiler.problem.parameterAssignment=error
org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
org.eclipse.jdt.core.compiler.problem.potentialNullReference=error
org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
org.eclipse.jdt.core.compiler.problem.redundantNullCheck=error
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=error
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
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.assertIdentifier=error
org.eclipse.jdt.core.compiler.compliance=1.5
org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
org.eclipse.jdt.core.compiler.problem.unnecessaryElse=error
org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeUncheckedExceptions=disabled
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=error
org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
org.eclipse.jdt.core.compiler.problem.unusedParameter=warning
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=error
org.eclipse.jdt.core.compiler.source=1.5
org.eclipse.jdt.core.incompatibleJDKLevel=ignore
org.eclipse.jdt.core.incompleteClasspath=error




/******************************************************************************
 * Copyright (c) 2010, 2009 Red Hat and Others
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

 *    Chuck Bridgham - Ongoing improvements
 *    Konstantin Komissarchik - misc. UI cleanup
 ******************************************************************************/

package org.eclipse.jst.servlet.ui.internal;

import org.eclipse.core.resources.IProject;

import org.eclipse.jst.j2ee.internal.J2EEConstants;
import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.SelectionListener;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
import org.eclipse.wst.common.componentcore.ui.internal.propertypage.ProjectReferenceWizardFragment;
import org.eclipse.wst.common.componentcore.ui.internal.taskwizard.IWizardHandle;
import org.eclipse.wst.common.componentcore.ui.propertypage.IReferenceWizardConstants;

public class CustomWebProjectReferenceWizardFragment extends ProjectReferenceWizardFragment {
	
	public CustomWebProjectReferenceWizardFragment() {
		super();
	}

	private boolean isWebLib = true;
	private Button button;
	
	@Override
	public Composite createComposite(Composite parent, IWizardHandle handle) {
		
		Composite c = new Composite(parent, SWT.NONE);
		
		final GridLayout gl = new GridLayout();
		gl.marginWidth = 0;
		gl.marginHeight = 0;
		
		c.setLayout(gl);
		
		Composite tableComp = super.createComposite(c, handle);
		tableComp.setLayoutData(new GridData(GridData.FILL_BOTH));
		
		// make button
		button = new Button(c, SWT.CHECK);
		button.setText(Messages.CustomWebProjectReferenceWizardFragment); 

		final GridData gd = new GridData();
		gd.horizontalIndent = 5;
		button.setLayoutData(gd);
		
		button.addSelectionListener(new SelectionListener() {
			public void widgetDefaultSelected(SelectionEvent e) {
			}
			public void widgetSelected(SelectionEvent e) {
				handleEdit();
			}
		});
		button.setSelection(true);

		return c;
	}
	
	public Composite createTableColumnComposite(Composite parent) {
		Composite aButtonColumn = new Composite(parent, SWT.NONE);
	
		GridLayout layout = new GridLayout();
		layout.numColumns = 1;
		layout.marginHeight = 0;
		layout.marginWidth = 0;
		aButtonColumn.setLayout(layout);
		GridData data = new GridData(GridData.FILL_BOTH);
		//data.minimumHeight = 500;
		//data.minimumWidth = 400;
		aButtonColumn.setLayoutData(data);
		return aButtonColumn;
	}

	protected void handleEdit() {
		isWebLib = button.getSelection();
	}

	@Override
	protected String getArchiveName(IProject proj, IVirtualComponent comp) {
		return super.getArchiveName(proj, comp);
	}

	@Override
	public void performFinish(IProgressMonitor monitor) throws CoreException {
		for (int i = 0; i < selected.length; i++) {

			if(JavaEEProjectUtilities.getJ2EEProjectType(proj).equals("")) //$NON-NLS-1$
				J2EEProjectUtilities.createFlexJavaProjectForProjectOperation(proj).execute(monitor, null);
		}
		getTaskModel().putObject(IReferenceWizardConstants.DEFAULT_LIBRARY_LOCATION, "/" + J2EEConstants.WEB_INF_LIB); //$NON-NLS-1$
		if(isWebLib) location += J2EEConstants.WEB_INF_LIB;
		getTaskModel().putObject(IReferenceWizardConstants.DEFAULT_LIBRARY_LOCATION, location);
		super.performFinish(monitor);
	}
	

Lines 10-16 Link Here

(-)servlet_ui/org/eclipse/jst/servlet/ui/internal/Messages.java (-1 lines)
10	public static String DeploymentAssembly;	10	public static String DeploymentAssembly;
11	public static String WebDeploymentAssembly;	11	public static String WebDeploymentAssembly;
12	public static String ManifestEntries;	12	public static String ManifestEntries;
13	public static String CustomWebProjectReferenceWizardFragment;
14		13
15	static {	14	static {
16	// initialize resource bundle	15	// initialize resource bundle

Lines 1-4 Link Here

(-)servlet_ui/org/eclipse/jst/servlet/ui/internal/messages.properties (-1 lines)
1	CustomWebProjectReferenceWizardFragment=Assemble projects into the &WEB-INF/lib folder of the web application
2	DeploymentAssembly=Deployment Assembly	1	DeploymentAssembly=Deployment Assembly
3	WebDeploymentAssembly=Web Deployment Assembly	2	WebDeploymentAssembly=Web Deployment Assembly
4	ManifestEntries=Manifest Entries	3	ManifestEntries=Manifest Entries

Return to bug 324151

Lines 1-95 Link Here

(-).settings/org.eclipse.jdt.core.prefs (-80 / +83 lines)
1	#Mon Jun 08 15:35:45 EDT 2009	1	#Thu Oct 21 11:04:21 PDT 2010
2	org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled	2	eclipse.preferences.version=1
3	org.eclipse.jdt.core.compiler.problem.comparingIdentical=error	3	instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
4	org.eclipse.jdt.core.compiler.problem.unnecessaryElse=error
5	org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=error
6	org.eclipse.jdt.core.compiler.problem.unusedLocal=error
7	org.eclipse.jdt.core.compiler.problem.emptyStatement=error
8	org.eclipse.jdt.core.compiler.problem.unusedLabel=error
9	org.eclipse.jdt.core.compiler.problem.unusedParameter=warning
10	org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
11	org.eclipse.jdt.core.incompatibleJDKLevel=ignore
12	org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error
13	org.eclipse.jdt.core.compiler.debug.lineNumber=generate
14	org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
15	org.eclipse.jdt.core.builder.cleanOutputFolder=clean	4	org.eclipse.jdt.core.builder.cleanOutputFolder=clean
16	org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning	5	org.eclipse.jdt.core.builder.duplicateResourceTask=warning
17	org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error	6	org.eclipse.jdt.core.builder.invalidClasspath=abort
18	org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=enabled
19	org.eclipse.jdt.core.compiler.problem.deprecation=warning
20	org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
21	org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=error
22	org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
23	org.eclipse.jdt.core.compiler.problem.redundantNullCheck=error
24	org.eclipse.jdt.core.compiler.problem.unusedImport=error
25	org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore	7	org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
26	org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch	8	org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
		9	org.eclipse.jdt.core.circularClasspath=error
		10	org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
27	org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled	11	org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
28	org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
29	org.eclipse.jdt.core.compiler.problem.typeParameterHiding=error
30	org.eclipse.jdt.core.builder.invalidClasspath=abort
31	org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
32	org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
33	org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=error
34	org.eclipse.jdt.core.codeComplete.argumentSuffixes=
35	org.eclipse.jdt.core.codeComplete.argumentPrefixes=	12	org.eclipse.jdt.core.codeComplete.argumentPrefixes=
36	org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore	13	org.eclipse.jdt.core.codeComplete.argumentSuffixes=
37	org.eclipse.jdt.core.compiler.problem.potentialNullReference=error	14	org.eclipse.jdt.core.codeComplete.fieldPrefixes=
		15	org.eclipse.jdt.core.codeComplete.fieldSuffixes=
		16	org.eclipse.jdt.core.codeComplete.localPrefixes=
		17	org.eclipse.jdt.core.codeComplete.localSuffixes=
		18	org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
		19	org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
38	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled	20	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
39	org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning	21	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
40	org.eclipse.jdt.core.compiler.problem.missingSerialVersion=error	22	org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
41	org.eclipse.jdt.core.compiler.problem.nullReference=error	23	org.eclipse.jdt.core.compiler.compliance=1.5
42	org.eclipse.jdt.core.compiler.source=1.5	24	org.eclipse.jdt.core.compiler.debug.lineNumber=generate
		25	org.eclipse.jdt.core.compiler.debug.localVariable=generate
		26	org.eclipse.jdt.core.compiler.debug.sourceFile=generate
		27	org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
		28	org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
		29	org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
		30	org.eclipse.jdt.core.compiler.problem.autoboxing=warning
		31	org.eclipse.jdt.core.compiler.problem.comparingIdentical=error
		32	org.eclipse.jdt.core.compiler.problem.deadCode=error
		33	org.eclipse.jdt.core.compiler.problem.deprecation=warning
		34	org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=enabled
		35	org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
		36	org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
		37	org.eclipse.jdt.core.compiler.problem.emptyStatement=error
43	org.eclipse.jdt.core.compiler.problem.enumIdentifier=error	38	org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
44	org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore	39	org.eclipse.jdt.core.compiler.problem.fallthroughCase=error
45	org.eclipse.jdt.core.builder.duplicateResourceTask=warning	40	org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
46	org.eclipse.jdt.core.compiler.problem.fieldHiding=error	41	org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
47	org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled	42	org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
48	org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=error
49	org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
50	org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
51	org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error	43	org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
52	org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning	44	org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
53	org.eclipse.jdt.core.classpath.exclusionPatterns=enabled	45	org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
54	org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error	46	org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error
55	org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
56	org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
57	org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=error	47	org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=error
58	eclipse.preferences.version=1	48	org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
59	org.eclipse.jdt.core.incompleteClasspath=error	49	org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
60	org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error	50	org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
61	org.eclipse.jdt.core.compiler.problem.deadCode=error
62	org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
63	org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
64	org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
65	org.eclipse.jdt.core.compiler.debug.sourceFile=generate
66	org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeUncheckedExceptions=disabled
67	org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning	51	org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
68	org.eclipse.jdt.core.codeComplete.fieldPrefixes=	52	org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=error
69	org.eclipse.jdt.core.compiler.problem.fallthroughCase=error	53	org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=error
70	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5	54	org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
71	org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error	55	org.eclipse.jdt.core.compiler.problem.missingSerialVersion=error
72	org.eclipse.jdt.core.compiler.problem.autoboxing=warning	56	org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=error
73	org.eclipse.jdt.core.circularClasspath=error	57	org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
74	org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning	58	org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error
75	org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=error	59	org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=error
76	org.eclipse.jdt.core.codeComplete.fieldSuffixes=	60	org.eclipse.jdt.core.compiler.problem.nullReference=error
77	org.eclipse.jdt.core.codeComplete.localSuffixes=	61	org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
78	org.eclipse.jdt.core.compiler.problem.parameterAssignment=error	62	org.eclipse.jdt.core.compiler.problem.parameterAssignment=error
		63	org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
		64	org.eclipse.jdt.core.compiler.problem.potentialNullReference=error
		65	org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
		66	org.eclipse.jdt.core.compiler.problem.redundantNullCheck=error
		67	org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=error
		68	org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
79	org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error	69	org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
80	org.eclipse.jdt.core.codeComplete.localPrefixes=	70	org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
81	org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled	71	org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
82	org.eclipse.jdt.core.compiler.maxProblemPerUnit=100	72	org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
83	org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error	73	org.eclipse.jdt.core.compiler.problem.typeParameterHiding=error
84	org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
85	org.eclipse.jdt.core.compiler.compliance=1.5
86	org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
87	org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
88	org.eclipse.jdt.core.compiler.debug.localVariable=generate
89	org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
90	instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
91	org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
92	org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
93	org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning	74	org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
		75	org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
		76	org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
		77	org.eclipse.jdt.core.compiler.problem.unnecessaryElse=error
		78	org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
		79	org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
		80	org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
		81	org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
		82	org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
		83	org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeUncheckedExceptions=disabled
94	org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled	84	org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
95	org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=	85	org.eclipse.jdt.core.compiler.problem.unusedImport=error
		86	org.eclipse.jdt.core.compiler.problem.unusedLabel=error
		87	org.eclipse.jdt.core.compiler.problem.unusedLocal=error
		88	org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
		89	org.eclipse.jdt.core.compiler.problem.unusedParameter=warning
		90	org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
		91	org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
		92	org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
		93	org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
		94	org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
		95	org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error
		96	org.eclipse.jdt.core.compiler.source=1.5
		97	org.eclipse.jdt.core.incompatibleJDKLevel=ignore
		98	org.eclipse.jdt.core.incompleteClasspath=error

Lines 1-5 Link Here

(-)servlet_ui/org/eclipse/jst/servlet/ui/internal/CustomWebProjectReferenceWizardFragment.java (-78 / +3 lines)
1	/******************************************************************************	1	/******************************************************************************
2	* Copyright (c) 2009 Red Hat and Others	2	* Copyright (c) 2010, 2009 Red Hat and Others
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 10-15 Link Here
10	* Chuck Bridgham - Ongoing improvements	10	* Chuck Bridgham - Ongoing improvements
11	* Konstantin Komissarchik - misc. UI cleanup	11	* Konstantin Komissarchik - misc. UI cleanup
12	******************************************************************************/	12	******************************************************************************/
		13
13	package org.eclipse.jst.servlet.ui.internal;	14	package org.eclipse.jst.servlet.ui.internal;
14		15
15	import org.eclipse.core.resources.IProject;	16	import org.eclipse.core.resources.IProject;
Lines 18-102 Link Here
18	import org.eclipse.jst.j2ee.internal.J2EEConstants;	19	import org.eclipse.jst.j2ee.internal.J2EEConstants;
19	import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;	20	import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
20	import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;	21	import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
21	import org.eclipse.swt.SWT;
22	import org.eclipse.swt.events.SelectionEvent;
23	import org.eclipse.swt.events.SelectionListener;
24	import org.eclipse.swt.layout.GridData;
25	import org.eclipse.swt.layout.GridLayout;
26	import org.eclipse.swt.widgets.Button;
27	import org.eclipse.swt.widgets.Composite;
28	import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
29	import org.eclipse.wst.common.componentcore.ui.internal.propertypage.ProjectReferenceWizardFragment;	22	import org.eclipse.wst.common.componentcore.ui.internal.propertypage.ProjectReferenceWizardFragment;
30	import org.eclipse.wst.common.componentcore.ui.internal.taskwizard.IWizardHandle;
31	import org.eclipse.wst.common.componentcore.ui.propertypage.IReferenceWizardConstants;	23	import org.eclipse.wst.common.componentcore.ui.propertypage.IReferenceWizardConstants;
32		24
33	public class CustomWebProjectReferenceWizardFragment extends ProjectReferenceWizardFragment {	25	public class CustomWebProjectReferenceWizardFragment extends ProjectReferenceWizardFragment {
34		26
35	public CustomWebProjectReferenceWizardFragment() {
36	super();
37	}
38
39	private boolean isWebLib = true;
40	private Button button;
41
42	@Override
43	public Composite createComposite(Composite parent, IWizardHandle handle) {
44
45	Composite c = new Composite(parent, SWT.NONE);
46
47	final GridLayout gl = new GridLayout();
48	gl.marginWidth = 0;
49	gl.marginHeight = 0;
50
51	c.setLayout(gl);
52
53	Composite tableComp = super.createComposite(c, handle);
54	tableComp.setLayoutData(new GridData(GridData.FILL_BOTH));
55
56	// make button
57	button = new Button(c, SWT.CHECK);
58	button.setText(Messages.CustomWebProjectReferenceWizardFragment);
59
60	final GridData gd = new GridData();
61	gd.horizontalIndent = 5;
62	button.setLayoutData(gd);
63
64	button.addSelectionListener(new SelectionListener() {
65	public void widgetDefaultSelected(SelectionEvent e) {
66	}
67	public void widgetSelected(SelectionEvent e) {
68	handleEdit();
69	}
70	});
71	button.setSelection(true);
72
73	return c;
74	}
75
76	public Composite createTableColumnComposite(Composite parent) {
77	Composite aButtonColumn = new Composite(parent, SWT.NONE);
78
79	GridLayout layout = new GridLayout();
80	layout.numColumns = 1;
81	layout.marginHeight = 0;
82	layout.marginWidth = 0;
83	aButtonColumn.setLayout(layout);
84	GridData data = new GridData(GridData.FILL_BOTH);
85	//data.minimumHeight = 500;
86	//data.minimumWidth = 400;
87	aButtonColumn.setLayoutData(data);
88	return aButtonColumn;
89	}
90
91	protected void handleEdit() {
92	isWebLib = button.getSelection();
93	}
94
95	@Override
96	protected String getArchiveName(IProject proj, IVirtualComponent comp) {
97	return super.getArchiveName(proj, comp);
98	}
99
100	@Override	27	@Override
101	public void performFinish(IProgressMonitor monitor) throws CoreException {	28	public void performFinish(IProgressMonitor monitor) throws CoreException {
102	for (int i = 0; i < selected.length; i++) {	29	for (int i = 0; i < selected.length; i++) {
Lines 104-112 Link Here
104	if(JavaEEProjectUtilities.getJ2EEProjectType(proj).equals("")) //$NON-NLS-1$	31	if(JavaEEProjectUtilities.getJ2EEProjectType(proj).equals("")) //$NON-NLS-1$
105	J2EEProjectUtilities.createFlexJavaProjectForProjectOperation(proj).execute(monitor, null);	32	J2EEProjectUtilities.createFlexJavaProjectForProjectOperation(proj).execute(monitor, null);
106	}	33	}
107	String location = "/"; //$NON-NLS-1$	34	getTaskModel().putObject(IReferenceWizardConstants.DEFAULT_LIBRARY_LOCATION, "/" + J2EEConstants.WEB_INF_LIB); //$NON-NLS-1$
108	if(isWebLib) location += J2EEConstants.WEB_INF_LIB;
109	getTaskModel().putObject(IReferenceWizardConstants.DEFAULT_LIBRARY_LOCATION, location);
110	super.performFinish(monitor);	35	super.performFinish(monitor);
111	}	36	}
112		37