Attachment #125711 for bug #176516

View | Details | Raw Unified | Return to bug 176516
Collapse All | Expand All




BuildPathsPropertyPage_closed_project_message=Java information is not available for a closed project.

BuildPathsPropertyPage_unsavedchanges_title=Setting Java Build Path
BuildPathsPropertyPage_unsavedchanges_message=The Java Build Path property page contains unsaved modifications. Do you want to save changes so that other build path related property pages can be updated?
BuildPathsPropertyPage_unsavedchanges_button_save=Apply
BuildPathsPropertyPage_unsavedchanges_button_discard=Discard
BuildPathsPropertyPage_unsavedchanges_button_ignore=Apply Later

ComplianceConfigurationBlock_codegen_targetplatform_label=Ge&nerated .class files compatibility:
ComplianceConfigurationBlock_pb_assert_as_identifier_label=Disallow identifie&rs called 'assert':
ComplianceConfigurationBlock_pb_enum_as_identifier_label=Disallo&w identifiers called 'enum':
ComplianceConfigurationBlock_compliance_follows_EE_label=Use compliance from Execution Environment on the <a>Java Build Path</a>
ComplianceConfigurationBlock_compliance_group_label=JDK Compliance
ComplianceConfigurationBlock_classfiles_group_label=Classfile Generation
ComplianceConfigurationBlock_classfile_greater_compliance=Classfile compatibility must be equal or less than compliance level.


ComplianceConfigurationBlock_jrecompliance_info=When selecting {0} compliance, make sure to have a compatible JRE installed and activated (currently {1}). <a href="1" >Configure...</a>
ComplianceConfigurationBlock_cldc11_requires_source13_compliance_se14=CLDC 1.1 requires source level 1.3 and compliance 1.4 or less
ComplianceConfigurationBlock_jrecompliance_info_project=When selecting {0} compliance, make sure to have a compatible JRE installed and activated (currently {1}). Configure the <a href="1" >Installed JREs</a> and <a href="2" >Execution Environments</a>, or change the JRE on the <a href="3" >Java build path</a>.

OptionsConfigurationBlock_job_title=Rebuilding





	}

	/**
	 * Key that is only managed locally and not part of preference store.
	 */
	private static class LocalKey extends Key {
		private HashMap fValues;


		makeScrollableCompositeAware(checkBox);

		updateCheckBox(checkBox);
		checkBox.setSelection(data.getSelection(currValue) == 0);

		fCheckBoxes.add(checkBox);


					checkBox.setSelection(!checkBox.getSelection());
					checkBox.setFocus();
					linkSelected[0]= false;
					controlChanged(checkBox);
				}
			}
		});

		makeScrollableCompositeAware(link);
		makeScrollableCompositeAware(checkBox);

		updateCheckBox(checkBox);
		checkBox.setSelection(data.getSelection(currValue) == 0);

		fCheckBoxes.add(checkBox);



		makeScrollableCompositeAware(comboBox);

		updateCombo(comboBox);
		comboBox.select(data.getSelection(currValue));

		fComboBoxes.add(comboBox);
		return comboBox;


		fLabels.put(textBox, labelControl);

		updateText(textBox);
		
			textBox.setText(currValue);
		}
		textBox.addModifyListener(getTextModifyListener());

		GridData data= new GridData(GridData.HORIZONTAL_ALIGN_FILL);

		validateSettings(key, oldValue, number);
	}

	/**
	 * Checks a setting.
	 * 
	 * @param key a key
	 * @param value an assumed value for the key
	 * @return <code>true</code> iff the given key's value is equal to the given value
	 */
	protected boolean checkValue(Key key, String value) {
		return value.equals(getValue(key));
	}

	/**
	 * Returns the value for the key.
	 * 
	 * @param key the key
	 * @return the stored value
	 */
	protected String getValue(Key key) {
		if (fDisabledProjectSettings != null) {
			return (String) fDisabledProjectSettings.get(key);

		return Boolean.valueOf(getValue(key)).booleanValue();
	}

	/**
	 * Sets the option <code>key</code> to the value <code>value</code>.
	 * Note that callers have to make sure the corresponding controls are updated afterwards.
	 * 
	 * @param key the option key
	 * @param value the new value
	 * @return the old value
	 * 
	 * @see #updateControls()
	 * @see #updateCheckBox(Button)
	 * @see #updateCombo(Combo)
	 * @see #updateText(Text)
	 */
	protected String setValue(Key key, String value) {
		if (fDisabledProjectSettings != null) {
			return (String) fDisabledProjectSettings.put(key, value);

		return oldValue;
	}

	/**
	 * Sets the option <code>key</code> to the value <code>value</code>.
	 * Note that callers have to make sure the corresponding controls are updated afterwards.
	 * 
	 * @param key the option key
	 * @param value the new value
	 * @return the old value
	 * 
	 * @see #updateControls()
	 * @see #updateCheckBox(Button)
	 * @see #updateCombo(Combo)
	 * @see #updateText(Text)
	 */
	protected String setValue(Key key, boolean value) {
		return setValue(key, String.valueOf(value));
	}

	protected final void setDefaultValue(Key key, String value) {
		IScopeContext instanceScope= fLookupOrder[fLookupOrder.length - 1];
		key.setStoredValue(instanceScope, value, fManager);
	}

	/**
	 * Returns the value as stored in the preference store.
	 *
	 * @param key the key
	 * @return the value
	 */
	protected String getStoredValue(Key key) {
		return key.getStoredValue(fLookupOrder, false, fManager);
	}
	
	/**
	 * Returns the value as actually stored in the preference store, without considering
	 * the working copy store.
	 *
	 * @param key the key
	 * @return the value as actually stored in the preference store
	 */
	protected String getOriginalStoredValue(Key key) {
		return key.getStoredValue(fLookupOrder, false, null);
	}

	/**
	 * Reverts the given options to the stored values.
	 * 
	 * @param keys the options to revert
	 * @since 3.5
	 */
	protected void revertValues(Key[] keys) {
		for (int i= 0; i < keys.length; i++) {
			Key curr= keys[i];
			String origValue= curr.getStoredValue(fLookupOrder, false, null);
			setValue(curr, origValue);
		}
	}

	/**
	 * Updates fields and validates settings.
	 * 
	 * @param changedKey key that changed, or <code>null</code>, if all changed.
	 * @param oldValue old value or <code>null</code>
	 * @param newValue new value or <code>null</code>
	 */
	protected abstract void validateSettings(Key changedKey, String oldValue, String newValue);


	 * @since 3.1
	 */
	public void performRevert() {
		revertValues(fAllKeys);
			Key curr= fAllKeys[i];
			String origValue= curr.getStoredValue(fLookupOrder, false, null);
			setValue(curr, origValue);
		}

		settingsUpdated();
		updateControls();

	public void dispose() {
	}

	/**
	 * Updates the UI from the current settings. Must be called whenever a setting has been changed
	 * by code.
	 */
	protected void updateControls() {
		// update the UI
		for (int i= fCheckBoxes.size() - 1; i >= 0; i--) {
			updateCheckBox((Button) fCheckBoxes.get(i));
		}




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

		return pageSettings;
	}

	/*
	 * @see org.eclipse.jface.preference.PreferencePage#okToLeave()
	 * @since 3.5
	 */
	public boolean okToLeave() {
		if (fBuildPathsBlock != null && fBuildPathsBlock.hasChangesInDialog()) {
			String title= PreferencesMessages.BuildPathsPropertyPage_unsavedchanges_title;
			String message= PreferencesMessages.BuildPathsPropertyPage_unsavedchanges_message;
			String[] buttonLabels= new String[] {
					PreferencesMessages.BuildPathsPropertyPage_unsavedchanges_button_save,
					PreferencesMessages.BuildPathsPropertyPage_unsavedchanges_button_discard,
					PreferencesMessages.BuildPathsPropertyPage_unsavedchanges_button_ignore
			};
			MessageDialog dialog= new MessageDialog(getShell(), title, null, message, MessageDialog.QUESTION, buttonLabels, 0);
			int res= dialog.open();
			if (res == 0) { //save
				fBlockOnApply= true;
				performOk();
			} else if (res == 1) { // discard
				fBuildPathsBlock.init(JavaCore.create(getProject()), null, null);
			} else {
				// keep unsaved
			}
		}
		return super.okToLeave();
	}
	
	/* (non-Javadoc)
	 * @see org.eclipse.jface.dialogs.IDialogPage#setVisible(boolean)
	 */
	public void setVisible(boolean visible) {
		if (fBuildPathsBlock != null) {
			if (visible) {
				if (fBuildPathsBlock.hasChangesInDialog()) {
					String title= PreferencesMessages.BuildPathsPropertyPage_unsavedchanges_title;
					String message= PreferencesMessages.BuildPathsPropertyPage_unsavedchanges_message;
					String[] buttonLabels= new String[] {
							PreferencesMessages.BuildPathsPropertyPage_unsavedchanges_button_save,
							PreferencesMessages.BuildPathsPropertyPage_unsavedchanges_button_discard,
							PreferencesMessages.BuildPathsPropertyPage_unsavedchanges_button_ignore
					};
					MessageDialog dialog= new MessageDialog(getShell(), title, null, message, MessageDialog.QUESTION, buttonLabels, 0);
					int res= dialog.open();
					if (res == 0) {
						performOk();
					} else if (res == 1) {
						fBuildPathsBlock.init(JavaCore.create(getProject()), null, null);
					} else {
						// keep unsaved
					}
				}
			} else {
				if (!fBuildPathsBlock.hasChangesInDialog() && fBuildPathsBlock.hasChangesInClasspathFile()) {
					fBuildPathsBlock.init(JavaCore.create(getProject()), null, null);
				}




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

import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.SelectionListener;
import org.eclipse.swt.layout.GridData;

import org.eclipse.ui.dialogs.PreferencesUtil;
import org.eclipse.ui.preferences.IWorkbenchPreferenceContainer;

import org.eclipse.jdt.core.IClasspathEntry;
import org.eclipse.jdt.core.JavaCore;

import org.eclipse.jdt.internal.corext.util.JavaModelUtil;

import org.eclipse.jdt.launching.IVMInstall;
import org.eclipse.jdt.launching.IVMInstall2;
import org.eclipse.jdt.launching.JavaRuntime;
import org.eclipse.jdt.launching.environments.IExecutionEnvironment;

import org.eclipse.jdt.internal.ui.JavaPlugin;
import org.eclipse.jdt.internal.ui.dialogs.StatusInfo;

import org.eclipse.jdt.internal.ui.wizards.buildpaths.BuildPathSupport;

/**
 * Configuration block for the 'Java Compiler' page.
 */
public class ComplianceConfigurationBlock extends OptionsConfigurationBlock {

	/**
	 * Key for the "Compiler compliance follows EE" setting.
	 * <br>Only applicable if <code>fProject != null</code>. 
	 * <p>Values are { {@link #DEFAULT_CONF}, {@link #USER_CONF}, or {@link #DISABLED} }.
	 */
	private static final Key INTR_COMPLIANCE_FOLLOWS_EE= getLocalKey("internal.compliance.follows.ee"); //$NON-NLS-1$
	
	/**
	 * Key for the "Use default compliance" setting.
	 * <p>Values are { {@link #DEFAULT_CONF}, {@link #USER_CONF} }.
	 */
	private static final Key INTR_DEFAULT_COMPLIANCE= getLocalKey("internal.default.compliance"); //$NON-NLS-1$
	
	// Preference store keys, see JavaCore.getOptions
	private static final Key PREF_PB_ASSERT_AS_IDENTIFIER= getJDTCoreKey(JavaCore.COMPILER_PB_ASSERT_IDENTIFIER);
	private static final Key PREF_PB_ENUM_AS_IDENTIFIER= getJDTCoreKey(JavaCore.COMPILER_PB_ENUM_IDENTIFIER);
	private static final Key PREF_SOURCE_COMPATIBILITY= getJDTCoreKey(JavaCore.COMPILER_SOURCE);
	private static final Key PREF_CODEGEN_TARGET_PLATFORM= getJDTCoreKey(JavaCore.COMPILER_CODEGEN_TARGET_PLATFORM);
	private static final Key PREF_COMPLIANCE= getJDTCoreKey(JavaCore.COMPILER_COMPLIANCE);
	
	/* see also BuildPathSupport#PREFS_COMPLIANCE */
	private static final Key[] PREFS_COMPLIANCE= new Key[] { PREF_COMPLIANCE,
		PREF_PB_ASSERT_AS_IDENTIFIER, PREF_PB_ENUM_AS_IDENTIFIER,
		PREF_SOURCE_COMPATIBILITY, PREF_CODEGEN_TARGET_PLATFORM };
	
	private static final Key PREF_CODEGEN_INLINE_JSR_BYTECODE= getJDTCoreKey(JavaCore.COMPILER_CODEGEN_INLINE_JSR_BYTECODE);
	
	private static final Key PREF_LOCAL_VARIABLE_ATTR=  getJDTCoreKey(JavaCore.COMPILER_LOCAL_VARIABLE_ATTR);
	private static final Key PREF_LINE_NUMBER_ATTR= getJDTCoreKey(JavaCore.COMPILER_LINE_NUMBER_ATTR);
	private static final Key PREF_SOURCE_FILE_ATTR= getJDTCoreKey(JavaCore.COMPILER_SOURCE_FILE_ATTR);
	private static final Key PREF_CODEGEN_UNUSED_LOCAL= getJDTCoreKey(JavaCore.COMPILER_CODEGEN_UNUSED_LOCAL);
	
	private static final Key PREF_CODEGEN_INLINE_JSR_BYTECODE= getJDTCoreKey(JavaCore.COMPILER_CODEGEN_INLINE_JSR_BYTECODE);

	private static final Key PREF_SOURCE_COMPATIBILITY= getJDTCoreKey(JavaCore.COMPILER_SOURCE);
	private static final Key PREF_COMPLIANCE= getJDTCoreKey(JavaCore.COMPILER_COMPLIANCE);
	private static final Key PREF_PB_ASSERT_AS_IDENTIFIER= getJDTCoreKey(JavaCore.COMPILER_PB_ASSERT_IDENTIFIER);
	private static final Key PREF_PB_ENUM_AS_IDENTIFIER= getJDTCoreKey(JavaCore.COMPILER_PB_ENUM_IDENTIFIER);

	private static final Key INTR_DEFAULT_COMPLIANCE= getLocalKey("internal.default.compliance"); //$NON-NLS-1$

	// values
	private static final String GENERATE= JavaCore.GENERATE;
	private static final String DO_NOT_GENERATE= JavaCore.DO_NOT_GENERATE;

	private static final String ENABLED= JavaCore.ENABLED;
	private static final String DISABLED= JavaCore.DISABLED;


	private static final String DEFAULT_CONF= "default"; //$NON-NLS-1$
	private static final String USER_CONF= "user";	 //$NON-NLS-1$

	private ArrayList fComplianceFollowsEEControls;
	private ArrayList fComplianceControls;
	private ArrayList fComplianceChildControls;
	private PixelConverter fPixelConverter;

	/**
	 * Remembered user compliance (stored when {@link #INTR_DEFAULT_COMPLIANCE} is switched to {@link #DEFAULT_CONF}).
	 * Elements are identified by <code>IDX_*</code> constants.
	 * @see #IDX_ASSERT_AS_IDENTIFIER
	 * @see #IDX_ENUM_AS_IDENTIFIER
	 * @see #IDX_SOURCE_COMPATIBILITY
	 * @see #IDX_CODEGEN_TARGET_PLATFORM
	 * @see #IDX_COMPLIANCE
	 * @see #IDX_INLINE_JSR_BYTECODE
	 */
	private String[] fRememberedUserCompliance;
	
	/**
	 * Stored compliance settings that were active when the page was first shown. May be <code>null</code>.
	 * Elements are identified by <code>IDX_*</code> constants.
	 * @see #IDX_ASSERT_AS_IDENTIFIER
	 * @see #IDX_ENUM_AS_IDENTIFIER
	 * @see #IDX_SOURCE_COMPATIBILITY
	 * @see #IDX_CODEGEN_TARGET_PLATFORM
	 * @see #IDX_COMPLIANCE
	 * @see #IDX_INLINE_JSR_BYTECODE
	 */
	private String[] fOriginalStoredCompliance;

	private static final int IDX_ASSERT_AS_IDENTIFIER= 0;
	private static final int IDX_ENUM_AS_IDENTIFIER= 1;

	private ControlEnableState fBlockEnableState;

	public ComplianceConfigurationBlock(IStatusChangeListener context, IProject project, IWorkbenchPreferenceContainer container) {
		super(context, project, getKeys(project != null), container);
		setDefaultCompilerComplianceValues();

		fBlockEnableState= null;
		fComplianceFollowsEEControls= new ArrayList();
		fComplianceControls= new ArrayList();
		fComplianceChildControls= new ArrayList();

		fComplianceStatus= new StatusInfo();


		};
	}

	private static Key[] getKeys(boolean projectSpecific) {
		Key[] keys= new Key[] {
				PREF_LOCAL_VARIABLE_ATTR, PREF_LINE_NUMBER_ATTR, PREF_SOURCE_FILE_ATTR, PREF_CODEGEN_UNUSED_LOCAL, PREF_CODEGEN_INLINE_JSR_BYTECODE, INTR_DEFAULT_COMPLIANCE,
				PREF_COMPLIANCE, PREF_SOURCE_COMPATIBILITY,
				PREF_CODEGEN_TARGET_PLATFORM, PREF_PB_ASSERT_AS_IDENTIFIER, PREF_PB_ENUM_AS_IDENTIFIER
			};
		
		if (projectSpecific) {
			Key[] allKeys = new Key[keys.length + 1];
			System.arraycopy(keys, 0, allKeys, 0, keys.length);
			allKeys[keys.length]= INTR_COMPLIANCE_FOLLOWS_EE;
			return allKeys;
		}
		
		return keys;
	}

	/* (non-Javadoc)

	 */
	protected void settingsUpdated() {
		setValue(INTR_DEFAULT_COMPLIANCE, getCurrentCompliance());
		updateComplianceFollowsEE();
		super.settingsUpdated();
	}


		group.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, false));
		group.setLayout(layout);

		String[] defaultUserValues= new String[] { DEFAULT_CONF, USER_CONF };
		
		Control[] otherChildren= group.getChildren();
		if (fProject != null) {
			String label= PreferencesMessages.ComplianceConfigurationBlock_compliance_follows_EE_label;
			int widthHint= fPixelConverter.convertWidthInCharsToPixels(40);
			addCheckBoxWithLink(group, label, INTR_COMPLIANCE_FOLLOWS_EE, defaultUserValues, 0, widthHint, new SelectionAdapter() {
				public void widgetSelected(SelectionEvent e) {
					openBuildPathPropertyPage();
				}
			});
		}
		
		Control[] allChildren= group.getChildren();
		fComplianceFollowsEEControls.addAll(Arrays.asList(allChildren));
		fComplianceFollowsEEControls.removeAll(Arrays.asList(otherChildren));
		otherChildren= allChildren;
		
		
		String label= PreferencesMessages.ComplianceConfigurationBlock_compiler_compliance_label;
		addComboBox(group, label, PREF_COMPLIANCE, values3456, values3456Labels, 0);

		label= PreferencesMessages.ComplianceConfigurationBlock_default_settings_label;
		addCheckBox(group, label, INTR_DEFAULT_COMPLIANCE, defaultUserValues, 0);

		allChildren= group.getChildren();
		fComplianceControls.addAll(Arrays.asList(allChildren));
		fComplianceControls.removeAll(Arrays.asList(otherChildren));
		otherChildren= allChildren;
		
		
		int indent= fPixelConverter.convertWidthInCharsToPixels(2);
		Control[] otherChildren= group.getChildren();

		String[] versions= new String[] { VERSION_CLDC_1_1, VERSION_1_1, VERSION_1_2, VERSION_1_3, VERSION_1_4, VERSION_1_5, VERSION_1_6 };
		String[] versionsLabels= new String[] {

		label= PreferencesMessages.ComplianceConfigurationBlock_pb_enum_as_identifier_label;
		addComboBox(group, label, PREF_PB_ENUM_AS_IDENTIFIER, errorWarningIgnore, errorWarningIgnoreLabels, indent);

		allChildren= group.getChildren();
		fComplianceChildControls.addAll(Arrays.asList(allChildren));
		fComplianceChildControls.removeAll(Arrays.asList(otherChildren));
		

		layout= new GridLayout();
		layout.numColumns= nColumns;

		fJRE50InfoText.addSelectionListener(new SelectionListener() {
			public void widgetDefaultSelected(SelectionEvent e) {
				if ("1".equals(e.text)) { //$NON-NLS-1$
					openJREInstallPreferencePage(false);
				} else if ("2".equals(e.text)) { //$NON-NLS-1$
					openJREInstallPreferencePage(true);
				} else {
					openBuildPathPropertyPage();
				}

		validateComplianceStatus();
	}

	protected final void openJREInstallPreferencePage(boolean openEE) {
		String jreID= BuildPathSupport.JRE_PREF_PAGE_ID;
		String eeID= BuildPathSupport.EE_PREF_PAGE_ID;
		String pageId= openEE ? eeID : jreID;
		if (fProject == null && getPreferenceContainer() != null) {
			getPreferenceContainer().openPage(pageId, null);
		} else {
			PreferencesUtil.createPreferenceDialogOn(getShell(), pageId, new String[] { jreID, eeID }, null).open();
		}
		validateComplianceStatus();
	}

	/**
	 * {@inheritDoc}
	 * @param changedKey Key that changed, or null, if all changed.
	 */
	protected void validateSettings(Key changedKey, String oldValue, String newValue) {
		if (!areSettingsEnabled()) {

				updateComplianceEnableState();
				updateComplianceDefaultSettings(true, null);
				fComplianceStatus= validateCompliance();
			} else if (INTR_COMPLIANCE_FOLLOWS_EE.equals(changedKey)) {
				setValue(INTR_DEFAULT_COMPLIANCE, DEFAULT_CONF);
				updateComplianceEnableState();
				updateComplianceDefaultSettings(true, null);
				updateControls();
				fComplianceStatus= validateCompliance();
				validateComplianceStatus();
			} else if (PREF_COMPLIANCE.equals(changedKey)) {
			    // set compliance settings to default
			    Object oldDefault= getValue(INTR_DEFAULT_COMPLIANCE);
				boolean rememberOld= USER_CONF.equals(oldDefault);
				updateComplianceDefaultSettings(rememberOld, oldValue);
				fComplianceStatus= validateCompliance();
				validateComplianceStatus();
			} else if (PREF_SOURCE_COMPATIBILITY.equals(changedKey)) {
				updateAssertEnumAsIdentifierEnableState();
				fComplianceStatus= validateCompliance();
			} else if (PREF_CODEGEN_TARGET_PLATFORM.equals(changedKey)) {
				updateInlineJSREnableState();
				if (VERSION_CLDC_1_1.equals(newValue) && !oldValue.equals(newValue)) {
					String compliance= getValue(PREF_COMPLIANCE);
					String source= getValue(PREF_SOURCE_COMPATIBILITY);

				return;
			}
		} else {
			updateComplianceFollowsEE();
			updateControls();
			updateComplianceEnableState();
			updateAssertEnumAsIdentifierEnableState();
			updateInlineJSREnableState();

		}
		fContext.statusChanged(fComplianceStatus);
	}
	
	public void refreshComplianceSettings() {
		if (fProject != null) {
			if (fOriginalStoredCompliance == null) {
				fOriginalStoredCompliance= new String[] { // caution: order depends on IDX_* constants
						getOriginalStoredValue(PREF_PB_ASSERT_AS_IDENTIFIER),
						getOriginalStoredValue(PREF_PB_ENUM_AS_IDENTIFIER),
						getOriginalStoredValue(PREF_SOURCE_COMPATIBILITY),
						getOriginalStoredValue(PREF_CODEGEN_TARGET_PLATFORM),
						getOriginalStoredValue(PREF_COMPLIANCE),
						getOriginalStoredValue(PREF_CODEGEN_INLINE_JSR_BYTECODE),
					};
				
			} else {
				String[] storedCompliance= new String[] {
						getOriginalStoredValue(PREF_PB_ASSERT_AS_IDENTIFIER),
						getOriginalStoredValue(PREF_PB_ENUM_AS_IDENTIFIER),
						getOriginalStoredValue(PREF_SOURCE_COMPATIBILITY),
						getOriginalStoredValue(PREF_CODEGEN_TARGET_PLATFORM),
						getOriginalStoredValue(PREF_COMPLIANCE),
						getOriginalStoredValue(PREF_CODEGEN_INLINE_JSR_BYTECODE),
					};
				if (!Arrays.equals(fOriginalStoredCompliance, storedCompliance)) {
					// compliance changed on disk -> override user modifications
					
					fOriginalStoredCompliance= storedCompliance;
					
					setValue(PREF_PB_ASSERT_AS_IDENTIFIER, storedCompliance[IDX_ASSERT_AS_IDENTIFIER]);
					setValue(PREF_PB_ENUM_AS_IDENTIFIER, storedCompliance[IDX_ENUM_AS_IDENTIFIER]);
					setValue(PREF_SOURCE_COMPATIBILITY, storedCompliance[IDX_SOURCE_COMPATIBILITY]);
					setValue(PREF_CODEGEN_TARGET_PLATFORM, storedCompliance[IDX_CODEGEN_TARGET_PLATFORM]);
					setValue(PREF_COMPLIANCE, storedCompliance[IDX_COMPLIANCE]);
					setValue(PREF_CODEGEN_INLINE_JSR_BYTECODE, storedCompliance[IDX_INLINE_JSR_BYTECODE]);
					
				}
				
				updateComplianceFollowsEE();
				updateControls();
				updateComplianceEnableState();
				validateComplianceStatus();
			}
		}			
	}

	private void validateComplianceStatus() {
		//TODO: updated VM in .classpath is not resolved yet!
		if (fJRE50InfoText != null && !fJRE50InfoText.isDisposed()) {
			boolean isVisible= false;
			String compliance= getStoredValue(PREF_COMPLIANCE); // get actual value

		validateComplianceStatus();
	}

	private void updateComplianceFollowsEE() {
		if (fProject != null) {
			String complianceFollowsEE= DISABLED;
			IExecutionEnvironment ee= getEE();
			if (ee != null) {
				complianceFollowsEE= getComplianceFollowsEE(ee);
			}
			setValue(INTR_COMPLIANCE_FOLLOWS_EE, complianceFollowsEE);
		}
	}

	private void updateComplianceEnableState() {
		boolean enableComplianceControls= true;
		if (fProject != null) {
			String complianceFollowsEE= getValue(INTR_COMPLIANCE_FOLLOWS_EE);
			updateCheckBox(getCheckBox(INTR_COMPLIANCE_FOLLOWS_EE));
			boolean enableComplianceFollowsEE= ! DISABLED.equals(complianceFollowsEE); // is default or user
			updateControlsEnableState(fComplianceFollowsEEControls, enableComplianceFollowsEE);
		
			enableComplianceControls= ! DEFAULT_CONF.equals(complianceFollowsEE); // is disabled or user
			updateControlsEnableState(fComplianceControls, enableComplianceControls);
		}
		
		boolean enableComplianceChildren= enableComplianceControls && checkValue(INTR_DEFAULT_COMPLIANCE, USER_CONF);
		updateControlsEnableState(fComplianceChildControls, enableComplianceChildren);
	}

	private void updateControlsEnableState(List controls, boolean enable) {
		for (int i= controls.size() - 1; i >= 0; i--) {
			Control curr= (Control) controls.get(i);
			if (curr instanceof Composite) {
				updateControlsEnableState(Arrays.asList(((Composite)curr).getChildren()), enable);
			}
			curr.setEnabled(enable);
		}
	}


		}
	}

	/**
	 * Sets the default compliance values derived from the chosen level or restores the user
	 * compliance settings.
	 * 
	 * @param rememberOld if <code>true</code>, the current compliance settings are remembered as
	 *            user settings. If <code>false</code>, overwrite the current settings.
	 * @param oldComplianceLevel the previous compliance level
	 */
	private void updateComplianceDefaultSettings(boolean rememberOld, String oldComplianceLevel) {
		String assertAsId, enumAsId, source, target;
		boolean isDefault= checkValue(INTR_DEFAULT_COMPLIANCE, DEFAULT_CONF);
		boolean isFollowEE= checkValue(INTR_COMPLIANCE_FOLLOWS_EE, DEFAULT_CONF);
		String complianceLevel= getValue(PREF_COMPLIANCE);

		if (isDefault || isFollowEE) {
			if (rememberOld) {
				if (oldComplianceLevel == null) {
					oldComplianceLevel= complianceLevel;

				fRememberedUserCompliance[IDX_CODEGEN_TARGET_PLATFORM]= getValue(PREF_CODEGEN_TARGET_PLATFORM);
				fRememberedUserCompliance[IDX_COMPLIANCE]= oldComplianceLevel;
			}
			
			if (isFollowEE) {
				IExecutionEnvironment ee= getEE();
				Map eeOptions= BuildPathSupport.getEEOptions(ee);
				if (eeOptions == null)
					return;
				
				assertAsId= (String)eeOptions.get(PREF_PB_ASSERT_AS_IDENTIFIER.getName());
				enumAsId= (String)eeOptions.get(PREF_PB_ENUM_AS_IDENTIFIER.getName());
				source= (String)eeOptions.get(PREF_SOURCE_COMPATIBILITY.getName());
				target= (String)eeOptions.get(PREF_CODEGEN_TARGET_PLATFORM.getName());
				
				setValue(PREF_COMPLIANCE, (String)eeOptions.get(PREF_COMPLIANCE.getName()));
				String inlineJSR= (String)eeOptions.get(PREF_CODEGEN_INLINE_JSR_BYTECODE.getName());
				if (inlineJSR != null) {
					setValue(PREF_CODEGEN_INLINE_JSR_BYTECODE, inlineJSR);
				}
				
			} else {
				//TODO: use JavaModelUtil.setComplianceOptions(new HashMap(), complianceLevel);
				if (VERSION_1_4.equals(complianceLevel)) {
					assertAsId= WARNING;
					enumAsId= WARNING;
					source= VERSION_1_3;
					target= VERSION_1_2;
				} else if (VERSION_1_5.equals(complianceLevel)) {
					assertAsId= ERROR;
					enumAsId= ERROR;
					source= VERSION_1_5;
					target= VERSION_1_5;
				} else if (VERSION_1_6.equals(complianceLevel)) {
					assertAsId= ERROR;
					enumAsId= ERROR;
					source= VERSION_1_6;
					target= VERSION_1_6;
				} else {
					assertAsId= IGNORE;
					enumAsId= IGNORE;
					source= VERSION_1_3;
					target= VERSION_1_1;
				}
			}
		} else {
			if (rememberOld && complianceLevel.equals(fRememberedUserCompliance[IDX_COMPLIANCE])) {

		updateAssertEnumAsIdentifierEnableState();
	}

	/**
	 * Evaluate if the current compliance setting correspond to a default setting.
	 * 
	 * @return {@link #DEFAULT_CONF} or {@link #USER_CONF}
	 */
	private String getCurrentCompliance() {
		Object complianceLevel= getValue(PREF_COMPLIANCE);
		//TODO: use JavaModelUtil.setComplianceOptions(new HashMap(), complianceLevel);
		if ((VERSION_1_3.equals(complianceLevel)
				&& IGNORE.equals(getValue(PREF_PB_ASSERT_AS_IDENTIFIER))
				&& IGNORE.equals(getValue(PREF_PB_ENUM_AS_IDENTIFIER))

		return USER_CONF;
	}

	private IExecutionEnvironment getEE() {
		if (fProject == null)
			return null;
		
		try {
			IClasspathEntry[] entries= JavaCore.create(fProject).getRawClasspath();
			for (int i= 0; i < entries.length; i++) {
				IClasspathEntry entry= entries[i];
				if (entry.getEntryKind() == IClasspathEntry.CPE_CONTAINER) {
					String eeId= JavaRuntime.getExecutionEnvironmentId(entry.getPath());
					if (eeId != null) {
						return JavaRuntime.getExecutionEnvironmentsManager().getEnvironment(eeId);
					}
				}
			}
		} catch (CoreException e) {
			JavaPlugin.log(e);
		}
		return null;
	}

	/**
	 * Evaluate if the builds path contains an execution environment and the current compliance
	 * settings follow the EE options.
	 * 
	 * @param ee the EE, or <code>null</code> if none available
	 * @return {@link #DEFAULT_CONF} if the compliance follows the EE, or {@link #USER_CONF} if the
	 *         settings differ, or {@link #DISABLED} if there's no EE at all
	 */
	private String getComplianceFollowsEE(IExecutionEnvironment ee) {
		Map options= BuildPathSupport.getEEOptions(ee);
		if (options == null)
			return DISABLED;
		
		return checkDefaults(PREFS_COMPLIANCE, options);
	}

	private String checkDefaults(Key[] keys, Map options) {
		for (int i= 0; i < keys.length; i++) {
			Key key= keys[i];
			Object option= options.get(key.getName());
			if (!checkValue(key, (String)option))
				return USER_CONF;
		}
		return DEFAULT_CONF;
	}
	
	protected String[] getFullBuildDialogStrings(boolean workspaceSettings) {
		String title= PreferencesMessages.ComplianceConfigurationBlock_needsbuild_title;
		String message;

		return new String[] { title, message };
	}

	/**
	 * Sets the default compiler compliance options based on the current default JRE in the workspace.
	 *  
	 * @since 3.5
	 */
	private void setDefaultCompilerComplianceValues() {
		IVMInstall defaultVMInstall= JavaRuntime.getDefaultVMInstall();
		if (defaultVMInstall instanceof IVMInstall2) {

			JavaModelUtil.setComplianceOptions(complianceOptions, complianceLevel);
			setDefaultValue(PREF_COMPLIANCE, (String)complianceOptions.get(PREF_COMPLIANCE.getName()));
			setDefaultValue(PREF_PB_ASSERT_AS_IDENTIFIER, (String)complianceOptions.get(PREF_PB_ASSERT_AS_IDENTIFIER.getName()));
			setDefaultValue(PREF_PB_ENUM_AS_IDENTIFIER, (String)complianceOptions.get(PREF_PB_ENUM_AS_IDENTIFIER.getName()));
			setDefaultValue(PREF_SOURCE_COMPATIBILITY, (String)complianceOptions.get(PREF_SOURCE_COMPATIBILITY.getName()));
			setDefaultValue(PREF_CODEGEN_TARGET_PLATFORM, (String)complianceOptions.get(PREF_CODEGEN_TARGET_PLATFORM.getName()));
		}

Lines 500-505 Link Here

(-)ui/org/eclipse/jdt/internal/ui/preferences/PreferencesMessages.java (+1 lines)
500	public static String ComplianceConfigurationBlock_codegen_targetplatform_label;	500	public static String ComplianceConfigurationBlock_codegen_targetplatform_label;
501	public static String ComplianceConfigurationBlock_pb_assert_as_identifier_label;	501	public static String ComplianceConfigurationBlock_pb_assert_as_identifier_label;
502	public static String ComplianceConfigurationBlock_pb_enum_as_identifier_label;	502	public static String ComplianceConfigurationBlock_pb_enum_as_identifier_label;
		503	public static String ComplianceConfigurationBlock_compliance_follows_EE_label;
503	public static String ComplianceConfigurationBlock_compliance_group_label;	504	public static String ComplianceConfigurationBlock_compliance_group_label;
504	public static String ComplianceConfigurationBlock_classfiles_group_label;	505	public static String ComplianceConfigurationBlock_classfiles_group_label;
505	public static String OptionsConfigurationBlock_job_title;	506	public static String OptionsConfigurationBlock_job_title;




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

			fConfigurationBlock.enablePreferenceContent(enable);
		}
	}
	
	/*
	 * @see org.eclipse.jface.dialogs.DialogPage#setVisible(boolean)
	 * @since 3.5
	 */
	public void setVisible(boolean visible) {
		super.setVisible(visible);
		if (visible && fConfigurationBlock != null) {
			fConfigurationBlock.refreshComplianceSettings();
		}
	}

	/*
	 * @see org.eclipse.jface.preference.IPreferencePage#performDefaults()

Lines 1-5 Link Here

(-)ui/org/eclipse/jdt/internal/ui/preferences/ClasspathContainerPreferencePage.java (-2 / +13 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2007 IBM Corporation and others.	2	* Copyright (c) 2007, 2009 IBM Corporation 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 14-19 Link Here
14		14
15	import org.eclipse.core.runtime.CoreException;	15	import org.eclipse.core.runtime.CoreException;
16	import org.eclipse.core.runtime.IAdaptable;	16	import org.eclipse.core.runtime.IAdaptable;
		17	import org.eclipse.core.runtime.IPath;
17	import org.eclipse.core.runtime.IProgressMonitor;	18	import org.eclipse.core.runtime.IProgressMonitor;
18		19
19	import org.eclipse.jface.dialogs.ProgressMonitorDialog;	20	import org.eclipse.jface.dialogs.ProgressMonitorDialog;
Lines 28-36 Link Here
28	import org.eclipse.jdt.core.IJavaProject;	29	import org.eclipse.jdt.core.IJavaProject;
29	import org.eclipse.jdt.core.JavaModelException;	30	import org.eclipse.jdt.core.JavaModelException;
30		31
		32	import org.eclipse.jdt.launching.JavaRuntime;
		33
31	import org.eclipse.jdt.internal.ui.actions.ActionMessages;	34	import org.eclipse.jdt.internal.ui.actions.ActionMessages;
32	import org.eclipse.jdt.internal.ui.packageview.ClassPathContainer;	35	import org.eclipse.jdt.internal.ui.packageview.ClassPathContainer;
33	import org.eclipse.jdt.internal.ui.util.ExceptionHandler;	36	import org.eclipse.jdt.internal.ui.util.ExceptionHandler;
		37	import org.eclipse.jdt.internal.ui.wizards.buildpaths.BuildPathSupport;
34	import org.eclipse.jdt.internal.ui.wizards.buildpaths.ClasspathContainerWizard;	38	import org.eclipse.jdt.internal.ui.wizards.buildpaths.ClasspathContainerWizard;
35		39
36	/**	40	/**
Lines 84-90 Link Here
84	if (created == null \|\| created.length != 1)	88	if (created == null \|\| created.length != 1)
85	return;	89	return;
86		90
87	IClasspathEntry result= created[0];	91	final IClasspathEntry result= created[0];
88	if (result == null \|\| result.equals(fEntry))	92	if (result == null \|\| result.equals(fEntry))
89	return;	93	return;
90		94
Lines 104-109 Link Here
104	context.run(true, true, new IRunnableWithProgress() {	108	context.run(true, true, new IRunnableWithProgress() {
105	public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {	109	public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
106	try {	110	try {
		111	if (result.getEntryKind() == IClasspathEntry.CPE_CONTAINER) {
		112	IPath path= result.getPath();
		113	String eeID= JavaRuntime.getExecutionEnvironmentId(path);
		114	if (eeID != null) {
		115	BuildPathSupport.setEEComplianceOptions(fJavaProject, eeID, null);
		116	}
		117	}
107	fJavaProject.setRawClasspath(newEntries, fJavaProject.getOutputLocation(), monitor);	118	fJavaProject.setRawClasspath(newEntries, fJavaProject.getOutputLocation(), monitor);
108	} catch (CoreException e) {	119	} catch (CoreException e) {
109	throw new InvocationTargetException(e);	120	throw new InvocationTargetException(e);

Lines 1-5 Link Here

(-)ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/BuildPathsBlock.java (-17 / +72 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2008 IBM Corporation and others.	2	* Copyright (c) 2000, 2009 IBM Corporation 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 12-19 Link Here
12		12
13	import java.net.URI;	13	import java.net.URI;
14	import java.util.ArrayList;	14	import java.util.ArrayList;
		15	import java.util.Arrays;
		16	import java.util.Collections;
15	import java.util.Iterator;	17	import java.util.Iterator;
16	import java.util.List;	18	import java.util.List;
		19	import java.util.Map;
17		20
18	import org.eclipse.swt.SWT;	21	import org.eclipse.swt.SWT;
19	import org.eclipse.swt.events.SelectionAdapter;	22	import org.eclipse.swt.events.SelectionAdapter;
Lines 71-78 Link Here
71	import org.eclipse.jdt.core.JavaConventions;	74	import org.eclipse.jdt.core.JavaConventions;
72	import org.eclipse.jdt.core.JavaCore;	75	import org.eclipse.jdt.core.JavaCore;
73		76
		77	import org.eclipse.jdt.internal.corext.util.JavaModelUtil;
74	import org.eclipse.jdt.internal.corext.util.Messages;	78	import org.eclipse.jdt.internal.corext.util.Messages;
75		79
		80	import org.eclipse.jdt.launching.JavaRuntime;
		81
76	import org.eclipse.jdt.ui.PreferenceConstants;	82	import org.eclipse.jdt.ui.PreferenceConstants;
77		83
78	import org.eclipse.jdt.internal.ui.JavaPlugin;	84	import org.eclipse.jdt.internal.ui.JavaPlugin;
Lines 105-111 Link Here
105	* @param removeLocation true if the folder at oldOutputLocation should be removed, false if only its content	111	* @param removeLocation true if the folder at oldOutputLocation should be removed, false if only its content
106	* @param oldOutputLocation The old output location	112	* @param oldOutputLocation The old output location
107	* @return Returns true if .class files should be removed.	113	* @return Returns true if .class files should be removed.
108	* @throws OperationCanceledException	114	* @throws OperationCanceledException if the operation was canceled
109	*/	115	*/
110	boolean doQuery(boolean removeLocation, IPath oldOutputLocation) throws OperationCanceledException;	116	boolean doQuery(boolean removeLocation, IPath oldOutputLocation) throws OperationCanceledException;
111		117
Lines 302-313 Link Here
302	List newClassPath= null;	308	List newClassPath= null;
303	IProject project= fCurrJProject.getProject();	309	IProject project= fCurrJProject.getProject();
304	projectExists= (project.exists() && project.getFile(".classpath").exists()); //$NON-NLS-1$	310	projectExists= (project.exists() && project.getFile(".classpath").exists()); //$NON-NLS-1$
		311	IClasspathEntry[] existingEntries= null;
305	if (projectExists) {	312	if (projectExists) {
306	if (outputLocation == null) {	313	if (outputLocation == null) {
307	outputLocation= fCurrJProject.readOutputLocation();	314	outputLocation= fCurrJProject.readOutputLocation();
308	}	315	}
		316	existingEntries= fCurrJProject.readRawClasspath();
309	if (classpathEntries == null) {	317	if (classpathEntries == null) {
310	classpathEntries= fCurrJProject.readRawClasspath();	318	classpathEntries= existingEntries;
311	}	319	}
312	}	320	}
313	if (outputLocation == null) {	321	if (outputLocation == null) {
Lines 315-321 Link Here
315	}	323	}
316		324
317	if (classpathEntries != null) {	325	if (classpathEntries != null) {
318	newClassPath= getExistingEntries(classpathEntries);	326	newClassPath= getCPListElements(classpathEntries, existingEntries);
319	}	327	}
320	if (newClassPath == null) {	328	if (newClassPath == null) {
321	newClassPath= getDefaultClassPath(jproject);	329	newClassPath= getDefaultClassPath(jproject);
Lines 406-416 Link Here
406	fUserSettingsTimeStamp= getEncodedSettings();	414	fUserSettingsTimeStamp= getEncodedSettings();
407	}	415	}
408		416
409	private ArrayList getExistingEntries(IClasspathEntry[] classpathEntries) {	417	private ArrayList getCPListElements(IClasspathEntry[] classpathEntries, IClasspathEntry[] existingEntries) {
		418	List existing= existingEntries == null ? Collections.EMPTY_LIST : Arrays.asList(existingEntries);
410	ArrayList newClassPath= new ArrayList();	419	ArrayList newClassPath= new ArrayList();
411	for (int i= 0; i < classpathEntries.length; i++) {	420	for (int i= 0; i < classpathEntries.length; i++) {
412	IClasspathEntry curr= classpathEntries[i];	421	IClasspathEntry curr= classpathEntries[i];
413	newClassPath.add(CPListElement.createFromExisting(curr, fCurrJProject));	422	newClassPath.add(CPListElement.create(curr, ! existing.contains(curr), fCurrJProject));
414	}	423	}
415	return newClassPath;	424	return newClassPath;
416	}	425	}
Lines 468-474 Link Here
468	list.add(new CPListElement(jproj, IClasspathEntry.CPE_SOURCE, srcFolder.getFullPath(), srcFolder));	477	list.add(new CPListElement(jproj, IClasspathEntry.CPE_SOURCE, srcFolder.getFullPath(), srcFolder));
469		478
470	IClasspathEntry[] jreEntries= PreferenceConstants.getDefaultJRELibrary();	479	IClasspathEntry[] jreEntries= PreferenceConstants.getDefaultJRELibrary();
471	list.addAll(getExistingEntries(jreEntries));	480	list.addAll(getCPListElements(jreEntries, null));
472	return list;	481	return list;
473	}	482	}
474		483
Lines 719-736 Link Here
719	}	728	}
720		729
721	public void configureJavaProject(IProgressMonitor monitor) throws CoreException, OperationCanceledException {	730	public void configureJavaProject(IProgressMonitor monitor) throws CoreException, OperationCanceledException {
722		731	configureJavaProject(null, monitor);
723	flush(fClassPathList.getElements(), getOutputLocation(), getJavaProject(), monitor);	732	}
		733
		734	public void configureJavaProject(String newProjectCompliance, IProgressMonitor monitor) throws CoreException, OperationCanceledException {
		735	flush(fClassPathList.getElements(), getOutputLocation(), getJavaProject(), newProjectCompliance, monitor);
724	initializeTimeStamps();	736	initializeTimeStamps();
725		737
726	updateUI();	738	updateUI();
727	}	739	}
728		740
729	/*	741	/**
730	* Creates the Java project and sets the configured build path and output location.	742	* Sets the configured build path and output location to the given Java project.
731	* If the project already exists only build paths are updated.	743	* If the project already exists, only build paths are updated.
		744	* <p>
		745	* If the classpath contains an Execution Environment entry, the EE's compiler compliance options
		746	* are used as project-specific options (unless the classpath already contained the same Execution Environment)
		747	*
		748	* @param classPathEntries the new classpath entries (list of {@link CPListElement})
		749	* @param outputLocation the output location
		750	* @param javaProject the Java project
		751	* @param newProjectCompliance compliance to set for a new project, can be <code>null</code>
		752	* @param monitor a progress monitor, or <code>null</code>
		753	* @throws CoreException if flushing failed
		754	* @throws OperationCanceledException if flushing has been cancelled
732	*/	755	*/
733	public static void flush(List classPathEntries, IPath outputLocation, IJavaProject javaProject, IProgressMonitor monitor) throws CoreException, OperationCanceledException {	756	public static void flush(List classPathEntries, IPath outputLocation, IJavaProject javaProject, String newProjectCompliance, IProgressMonitor monitor) throws CoreException, OperationCanceledException {
734	if (monitor == null) {	757	if (monitor == null) {
735	monitor= new NullProgressMonitor();	758	monitor= new NullProgressMonitor();
736	}	759	}
Lines 862-867 Link Here
862	}	885	}
863	}	886	}
864	} else {	887	} else {
		888	if (entry.getEntryKind() == IClasspathEntry.CPE_CONTAINER) {
		889	IPath path= entry.getPath();
		890	if (! path.equals(entry.getOrginalPath())) {
		891	String eeID= JavaRuntime.getExecutionEnvironmentId(path);
		892	if (eeID != null) {
		893	BuildPathSupport.setEEComplianceOptions(javaProject, eeID, newProjectCompliance);
		894	newProjectCompliance= null; // don't set it again below
		895	}
		896	}
		897	if (newProjectCompliance != null) {
		898	Map options= javaProject.getOptions(false);
		899	JavaModelUtil.setComplianceOptions(options, newProjectCompliance);
		900	JavaModelUtil.setDefaultClassfileOptions(options, newProjectCompliance); // complete compliance options
		901	javaProject.setOptions(options);
		902	}
		903	}
865	monitor.worked(3);	904	monitor.worked(3);
866	}	905	}
867	if (monitor.isCanceled()) {	906	if (monitor.isCanceled()) {
Lines 1002-1014 Link Here
1002	}	1041	}
1003		1042
1004	private CPListElement findElement(IClasspathEntry entry) {	1043	private CPListElement findElement(IClasspathEntry entry) {
		1044	CPListElement prefixMatch= null;
		1045	int entryKind= entry.getEntryKind();
1005	for (int i= 0, len= fClassPathList.getSize(); i < len; i++) {	1046	for (int i= 0, len= fClassPathList.getSize(); i < len; i++) {
1006	CPListElement curr= (CPListElement) fClassPathList.getElement(i);	1047	CPListElement curr= (CPListElement) fClassPathList.getElement(i);
1007	if (curr.getEntryKind() == entry.getEntryKind() && curr.getPath().equals(entry.getPath())) {	1048	if (curr.getEntryKind() == entryKind) {
1008	return curr;	1049	IPath entryPath= entry.getPath();
		1050	IPath currPath= curr.getPath();
		1051	if (currPath.equals(entryPath)) {
		1052	return curr;
		1053	}
		1054	// in case there's no full match, look for a similar container (same ID segment):
		1055	if (prefixMatch == null && entryKind == IClasspathEntry.CPE_CONTAINER) {
		1056	int n= entryPath.segmentCount();
		1057	if (n > 0) {
		1058	IPath genericContainerPath= n == 1 ? entryPath : entryPath.removeLastSegments(n - 1);
		1059	if (n > 1 && genericContainerPath.isPrefixOf(currPath)) {
		1060	prefixMatch= curr;
		1061	}
		1062	}
		1063	}
1009	}	1064	}
1010	}	1065	}
1011	return null;	1066	return prefixMatch;
1012	}	1067	}
1013		1068
1014	public void setElementToReveal(IClasspathEntry entry, String attributeKey) {	1069	public void setElementToReveal(IClasspathEntry entry, String attributeKey) {
Lines 1044-1050 Link Here
1044		1099
1045	Object page= fTabFolder.getItem(pageIndex).getData();	1100	Object page= fTabFolder.getItem(pageIndex).getData();
1046	if (page instanceof LibrariesWorkbookPage) {	1101	if (page instanceof LibrariesWorkbookPage) {
1047	CPListElement element= CPListElement.createFromExisting(entry, fCurrJProject);	1102	CPListElement element= CPListElement.create(entry, true, fCurrJProject);
1048	((LibrariesWorkbookPage) page).addElement(element);	1103	((LibrariesWorkbookPage) page).addElement(element);
1049	}	1104	}
1050	}	1105	}




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

			if (created != null) {
				CPListElement[] res= new CPListElement[created.length];
				for (int i= 0; i < res.length; i++) {
					res[i]= CPListElement.create(created[i], true, fCurrJProject);
				}
				return res;
			}
		} else {
			IClasspathEntry existingEntry= existing.getClasspathEntry();
			IClasspathEntry created= BuildPathDialogAccess.configureContainerEntry(getShell(), existingEntry, fCurrJProject, getRawClasspath());
			if (created != null) {
				CPListElement elem= new CPListElement(null, fCurrJProject, IClasspathEntry.CPE_CONTAINER, created.getPath(), ! created.equals(existingEntry), null, null);
				return new CPListElement[] { elem };
			}
		}

Lines 1-5 Link Here

(-)ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/BuildPathWizard.java (-2 / +2 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2008 IBM Corporation and others.	2	* Copyright (c) 2000, 2009 IBM Corporation 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 58-64 Link Here
58	if (fDoFlushChange) {	58	if (fDoFlushChange) {
59	IJavaProject javaProject= getEntryToEdit().getJavaProject();	59	IJavaProject javaProject= getEntryToEdit().getJavaProject();
60		60
61	BuildPathsBlock.flush(getExistingEntries(), getOutputLocation(), javaProject, monitor);	61	BuildPathsBlock.flush(getExistingEntries(), getOutputLocation(), javaProject, null, monitor);
62		62
63	IProject project= javaProject.getProject();	63	IProject project= javaProject.getProject();
64	IPath path= getEntryToEdit().getPath();	64	IPath path= getEntryToEdit().getPath();

Lines 1-5 Link Here

(-)ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/BuildPathSupport.java (-6 / +122 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2008 IBM Corporation and others.	2	* Copyright (c) 2000, 2009 IBM Corporation 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 11-16 Link Here
11	package org.eclipse.jdt.internal.ui.wizards.buildpaths;	11	package org.eclipse.jdt.internal.ui.wizards.buildpaths;
12		12
13	import java.util.ArrayList;	13	import java.util.ArrayList;
		14	import java.util.HashMap;
		15	import java.util.Iterator;
		16	import java.util.List;
		17	import java.util.Map;
14		18
15	import org.eclipse.swt.widgets.Shell;	19	import org.eclipse.swt.widgets.Shell;
16		20
Lines 33-40 Link Here
33	import org.eclipse.jdt.core.JavaCore;	37	import org.eclipse.jdt.core.JavaCore;
34	import org.eclipse.jdt.core.JavaModelException;	38	import org.eclipse.jdt.core.JavaModelException;
35		39
		40	import org.eclipse.jdt.internal.corext.util.JavaModelUtil;
36	import org.eclipse.jdt.internal.corext.util.Messages;	41	import org.eclipse.jdt.internal.corext.util.Messages;
37		42
		43	import org.eclipse.jdt.launching.JavaRuntime;
		44	import org.eclipse.jdt.launching.environments.IExecutionEnvironment;
		45
38	import org.eclipse.jdt.ui.JavaUI;	46	import org.eclipse.jdt.ui.JavaUI;
39		47
40	import org.eclipse.jdt.internal.ui.JavaPlugin;	48	import org.eclipse.jdt.internal.ui.JavaPlugin;
Lines 46-51 Link Here
46	public class BuildPathSupport {	54	public class BuildPathSupport {
47		55
48	public static final String JRE_PREF_PAGE_ID= "org.eclipse.jdt.debug.ui.preferences.VMPreferencePage"; //$NON-NLS-1$	56	public static final String JRE_PREF_PAGE_ID= "org.eclipse.jdt.debug.ui.preferences.VMPreferencePage"; //$NON-NLS-1$
		57	public static final String EE_PREF_PAGE_ID= "org.eclipse.jdt.debug.ui.jreProfiles"; //$NON-NLS-1$
		58
		59	/* see also ComplianceConfigurationBlock#PREFS_COMPLIANCE */
		60	private static final String[] PREFS_COMPLIANCE= new String[] {
		61	JavaCore.COMPILER_PB_ASSERT_IDENTIFIER, JavaCore.COMPILER_PB_ENUM_IDENTIFIER,
		62	JavaCore.COMPILER_SOURCE, JavaCore.COMPILER_CODEGEN_TARGET_PLATFORM,
		63	JavaCore.COMPILER_COMPLIANCE
		64	};
49		65
50		66
51	private BuildPathSupport() {	67	private BuildPathSupport() {
Lines 173-183 Link Here
173	* Apply a modified classpath entry to the classpath. The classpath entry can also be from a classpath container.	189	* Apply a modified classpath entry to the classpath. The classpath entry can also be from a classpath container.
174	* @param shell If not null and the entry could not be found on the projects classpath, a dialog will ask to put the entry on the classpath	190	* @param shell If not null and the entry could not be found on the projects classpath, a dialog will ask to put the entry on the classpath
175	* @param newEntry The modified entry. The entry's kind or path must be unchanged.	191	* @param newEntry The modified entry. The entry's kind or path must be unchanged.
176	* @param changedAttributes The attibutes that have changed. See {@link CPListElement} for constants values.	192	* @param changedAttributes The attributes that have changed. See {@link CPListElement} for constants values.
177	* @param jproject Project where the entry belongs to	193	* @param jproject Project where the entry belongs to
178	* @param containerPath The path of the entry's parent container or <code>null</code> if the entry is not in a container	194	* @param containerPath The path of the entry's parent container or <code>null</code> if the entry is not in a container
179	* @param monitor The progress monitor to use	195	* @param monitor The progress monitor to use
180	* @throws CoreException	196	* @throws CoreException if the update failed
181	*/	197	*/
182	public static void modifyClasspathEntry(Shell shell, IClasspathEntry newEntry, String[] changedAttributes, IJavaProject jproject, IPath containerPath, IProgressMonitor monitor) throws CoreException {	198	public static void modifyClasspathEntry(Shell shell, IClasspathEntry newEntry, String[] changedAttributes, IJavaProject jproject, IPath containerPath, IProgressMonitor monitor) throws CoreException {
183	if (containerPath != null) {	199	if (containerPath != null) {
Lines 195-201 Link Here
195	* @param jproject Project where the entry belongs to	211	* @param jproject Project where the entry belongs to
196	* @param containerPath The path of the entry's parent container or <code>null</code> if the entry is not in a container	212	* @param containerPath The path of the entry's parent container or <code>null</code> if the entry is not in a container
197	* @param monitor The progress monitor to use	213	* @param monitor The progress monitor to use
198	* @throws CoreException	214	* @throws CoreException if the update failed
199	*/	215	*/
200	public static void modifyClasspathEntry(Shell shell, IClasspathEntry newEntry, IJavaProject jproject, IPath containerPath, IProgressMonitor monitor) throws CoreException {	216	public static void modifyClasspathEntry(Shell shell, IClasspathEntry newEntry, IJavaProject jproject, IPath containerPath, IProgressMonitor monitor) throws CoreException {
201	modifyClasspathEntry(shell, newEntry, null, jproject, containerPath, monitor);	217	modifyClasspathEntry(shell, newEntry, null, jproject, containerPath, monitor);
Lines 236-244 Link Here
236	/**	252	/**
237	* Request a container update.	253	* Request a container update.
238	* @param jproject The project of the container	254	* @param jproject The project of the container
239	* @param container The container to requesta change to	255	* @param container The container to request a change to
240	* @param newEntries The updated entries	256	* @param newEntries The updated entries
241	* @throws CoreException	257	* @throws CoreException if the request failed
242	*/	258	*/
243	public static void requestContainerUpdate(IJavaProject jproject, IClasspathContainer container, IClasspathEntry[] newEntries) throws CoreException {	259	public static void requestContainerUpdate(IJavaProject jproject, IClasspathContainer container, IClasspathEntry[] newEntries) throws CoreException {
244	IPath containerPath= container.getPath();	260	IPath containerPath= container.getPath();
Lines 292-295 Link Here
292	});	308	});
293	return result[0];	309	return result[0];
294	}	310	}
		311
		312	/**
		313	* Sets the default compiler compliance options iff <code>modifiedClassPathEntries</code>
		314	* contains a classpath container entry that is modified or new and that points to an execution
		315	* environment. Does nothing if the EE or the options could not be resolved.
		316	*
		317	* @param javaProject the Java project
		318	* @param modifiedClassPathEntries a list of {@link CPListElement}
		319	*
		320	* @see #getEEOptions(IExecutionEnvironment)
		321	*
		322	* @since 3.5
		323	*/
		324	public static void setEEComplianceOptions(IJavaProject javaProject, List modifiedClassPathEntries) {
		325	for (Iterator iter= modifiedClassPathEntries.iterator(); iter.hasNext();) {
		326	CPListElement entry= (CPListElement)iter.next();
		327	if (entry.getEntryKind() == IClasspathEntry.CPE_CONTAINER) {
		328	IPath path= entry.getPath();
		329	if (! path.equals(entry.getOrginalPath())) {
		330	String eeID= JavaRuntime.getExecutionEnvironmentId(path);
		331	if (eeID != null) {
		332	setEEComplianceOptions(javaProject, eeID, null);
		333	return;
		334	}
		335	}
		336	}
		337	}
		338	}
		339
		340	/**
		341	* Sets the default compiler compliance options based on the given execution environment.
		342	* Does nothing if the EE or the options could not be resolved.
		343	*
		344	* @param javaProject the Java project
		345	* @param eeID the execution environment ID
		346	* @param newProjectCompliance compliance to set for a new project, can be <code>null</code>
		347	*
		348	* @see #getEEOptions(IExecutionEnvironment)
		349	*
		350	* @since 3.5
		351	*/
		352	public static void setEEComplianceOptions(IJavaProject javaProject, String eeID, String newProjectCompliance) {
		353	IExecutionEnvironment ee= JavaRuntime.getExecutionEnvironmentsManager().getEnvironment(eeID);
		354	if (ee != null) {
		355	Map options= javaProject.getOptions(false);
		356	Map eeOptions= getEEOptions(ee);
		357	if (eeOptions != null) {
		358	for (int i= 0; i < PREFS_COMPLIANCE.length; i++) {
		359	String option= PREFS_COMPLIANCE[i];
		360	options.put(option, eeOptions.get(option));
		361	}
		362
		363	if (newProjectCompliance != null) {
		364	JavaModelUtil.setDefaultClassfileOptions(options, newProjectCompliance); // complete compliance options
		365	}
		366
		367	String option= JavaCore.COMPILER_CODEGEN_INLINE_JSR_BYTECODE;
		368	String inlineJSR= (String)eeOptions.get(option);
		369	if (inlineJSR != null) {
		370	options.put(option, inlineJSR);
		371	}
		372
		373	javaProject.setOptions(options);
		374	}
375	}
376	}
377
378	/**
379	* Returns the compliance options from the given EE. If the result is not <code>null</code>,
380	* it contains at least these core options:
381	* <ul>
382	* <li>{@link JavaCore#COMPILER_COMPLIANCE}</li>
383	* <li>{@link JavaCore#COMPILER_SOURCE}</li>
384	* <li>{@link JavaCore#COMPILER_CODEGEN_TARGET_PLATFORM}</li>
385	* <li>{@link JavaCore#COMPILER_PB_ASSERT_IDENTIFIER}</li>
386	* <li>{@link JavaCore#COMPILER_PB_ENUM_IDENTIFIER}</li>
387	* <li>{@link JavaCore#COMPILER_CODEGEN_INLINE_JSR_BYTECODE} for compliance levels 1.5 and greater</li>
388	* </ul>
389	*
390	* @param ee the EE, can be <code>null</code>
391	* @return the options, or <code>null</code> if none
392	* @since 3.5
393	*/
394	public static Map getEEOptions(IExecutionEnvironment ee) {
395	if (ee == null)
396	return null;
397	Map eeOptions= ee.getComplianceOptions();
398	if (eeOptions == null)
399	return null;
400
401	Object complianceOption= eeOptions.get(JavaCore.COMPILER_COMPLIANCE);
402	if (!(complianceOption instanceof String))
403	return null;
404
405	// eeOptions can miss some options, make sure they are complete:
406	HashMap options= new HashMap();
407	JavaModelUtil.setComplianceOptions(options, (String)complianceOption);
408	options.putAll(eeOptions);
409	return options;
410	}
295	}	411	}

Lines 1-5 Link Here

(-)ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/CPListElement.java (-5 / +19 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2008 IBM Corporation and others.	2	* Copyright (c) 2000, 2009 IBM Corporation 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 85-95 Link Here
85	}	85	}
86		86
87	public CPListElement(Object parent, IJavaProject project, int entryKind, IPath path, IResource res, IPath linkTarget) {	87	public CPListElement(Object parent, IJavaProject project, int entryKind, IPath path, IResource res, IPath linkTarget) {
		88	this(parent, project, entryKind, path, false, res, linkTarget);
		89	}
		90
		91	public CPListElement(Object parent, IJavaProject project, int entryKind, IPath path, boolean newElement, IResource res, IPath linkTarget) {
88	fProject= project;	92	fProject= project;
89		93
90	fEntryKind= entryKind;	94	fEntryKind= entryKind;
91	fPath= path;	95	fPath= path;
92	fOrginalPath= path;	96	fOrginalPath= newElement ? null : path;
93	fLinkTarget= linkTarget;	97	fLinkTarget= linkTarget;
94	fOrginalLinkTarget= linkTarget;	98	fOrginalLinkTarget= linkTarget;
95	fChildren= new ArrayList();	99	fChildren= new ArrayList();
Lines 125-131 Link Here
125	IClasspathContainer container= JavaCore.getClasspathContainer(fPath, fProject);	129	IClasspathContainer container= JavaCore.getClasspathContainer(fPath, fProject);
126	if (container != null) {	130	if (container != null) {
127	IClasspathEntry[] entries= container.getClasspathEntries();	131	IClasspathEntry[] entries= container.getClasspathEntries();
128	if (entries != null) { // invalid container implementation	132	if (entries != null) { // catch invalid container implementation
129	for (int i= 0; i < entries.length; i++) {	133	for (int i= 0; i < entries.length; i++) {
130	IClasspathEntry entry= entries[i];	134	IClasspathEntry entry= entries[i];
131	if (entry != null) {	135	if (entry != null) {
Lines 541-550 Link Here
541	}	545	}
542		546
543	public static CPListElement createFromExisting(IClasspathEntry curr, IJavaProject project) {	547	public static CPListElement createFromExisting(IClasspathEntry curr, IJavaProject project) {
544	return createFromExisting(null, curr, project);	548	//Note: Some old clients of this method could actually mean create(curr, true, project)
		549	return create(curr, false, project);
545	}	550	}
546		551
547	public static CPListElement createFromExisting(Object parent, IClasspathEntry curr, IJavaProject project) {	552	public static CPListElement createFromExisting(Object parent, IClasspathEntry curr, IJavaProject project) {
		553	//Note: Some old clients of this method could actually mean create(parent, curr, true, project)
		554	return create(parent, curr, false, project);
		555	}
		556
		557	public static CPListElement create(IClasspathEntry curr, boolean newElement, IJavaProject project) {
		558	return create(null, curr, newElement, project);
		559	}
		560
		561	public static CPListElement create(Object parent, IClasspathEntry curr, boolean newElement, IJavaProject project) {
548	IPath path= curr.getPath();	562	IPath path= curr.getPath();
549	IWorkspaceRoot root= ResourcesPlugin.getWorkspace().getRoot();	563	IWorkspaceRoot root= ResourcesPlugin.getWorkspace().getRoot();
550		564
Lines 603-609 Link Here
603	isMissing= (res == null);	617	isMissing= (res == null);
604	break;	618	break;
605	}	619	}
606	CPListElement elem= new CPListElement(parent, project, curr.getEntryKind(), path, res, linkTarget);	620	CPListElement elem= new CPListElement(parent, project, curr.getEntryKind(), path, newElement, res, linkTarget);
607	elem.setExported(curr.isExported());	621	elem.setExported(curr.isExported());
608	elem.setAttribute(SOURCEATTACHMENT, curr.getSourceAttachmentPath());	622	elem.setAttribute(SOURCEATTACHMENT, curr.getSourceAttachmentPath());
609	elem.setAttribute(OUTPUT, curr.getOutputLocation());	623	elem.setAttribute(OUTPUT, curr.getOutputLocation());

Lines 1-5 Link Here

(-)core extension/org/eclipse/jdt/internal/corext/util/JavaModelUtil.java (-5 / +15 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2008 IBM Corporation and others.	2	* Copyright (c) 2000, 2009 IBM Corporation 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 662-668 Link Here
662	/**	662	/**
663	* @param version1 the first version	663	* @param version1 the first version
664	* @param version2 the second version	664	* @param version2 the second version
665	* @return returns if version 1 is less than version 2.	665	* @return <code>true</code> iff version1 is less than version2
666	*/	666	*/
667	public static boolean isVersionLessThan(String version1, String version2) {	667	public static boolean isVersionLessThan(String version1, String version2) {
668	if (JavaCore.VERSION_CLDC_1_1.equals(version1)) {	668	if (JavaCore.VERSION_CLDC_1_1.equals(version1)) {
Lines 736-747 Link Here
736	}	736	}
737		737
738	public static String getExecutionEnvironmentCompliance(IExecutionEnvironment executionEnvironment) {	738	public static String getExecutionEnvironmentCompliance(IExecutionEnvironment executionEnvironment) {
		739	Map complianceOptions= executionEnvironment.getComplianceOptions();
		740	if (complianceOptions != null) {
		741	Object compliance= complianceOptions.get(JavaCore.COMPILER_COMPLIANCE);
		742	if (compliance instanceof String)
		743	return (String)compliance;
		744	}
		745
		746	// fallback:
739	String desc= executionEnvironment.getId();	747	String desc= executionEnvironment.getId();
740	if (desc.indexOf("1.6") != -1) { //$NON-NLS-1$	748	if (desc.indexOf(JavaCore.VERSION_1_6) != -1) {
		749	return JavaCore.VERSION_1_6;
		750	} else if (desc.indexOf(JavaCore.VERSION_1_6) != -1) {
741	return JavaCore.VERSION_1_6;	751	return JavaCore.VERSION_1_6;
742	} else if (desc.indexOf("1.5") != -1) { //$NON-NLS-1$	752	} else if (desc.indexOf(JavaCore.VERSION_1_5) != -1) {
743	return JavaCore.VERSION_1_5;	753	return JavaCore.VERSION_1_5;
744	} else if (desc.indexOf("1.4") != -1) { //$NON-NLS-1$	754	} else if (desc.indexOf(JavaCore.VERSION_1_4) != -1) {
745	return JavaCore.VERSION_1_4;	755	return JavaCore.VERSION_1_4;
746	}	756	}
747	return JavaCore.VERSION_1_3;	757	return JavaCore.VERSION_1_3;

Lines 1-5 Link Here

(-)ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/newsourcepage/AddLibraryToBuildpathAction.java (-2 / +2 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2008 IBM Corporation and others.	2	* Copyright (c) 2000, 2009 IBM Corporation 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 132-138 Link Here
132		132
133	List addedEntries= new ArrayList();	133	List addedEntries= new ArrayList();
134	for (int i= 0; i < selected.length; i++) {	134	for (int i= 0; i < selected.length; i++) {
135	addedEntries.add(CPListElement.createFromExisting(selected[i], project));	135	addedEntries.add(CPListElement.create(selected[i], true, project));
136	}	136	}
137		137
138	pm.worked(1);	138	pm.worked(1);




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

import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;

import org.eclipse.core.filesystem.EFS;
import org.eclipse.core.filesystem.IFileInfo;

import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.JavaCore;

import org.eclipse.jdt.internal.corext.util.JavaModelUtil;
import org.eclipse.jdt.internal.corext.util.Messages;

import org.eclipse.jdt.ui.JavaUI;

			if (fCurrProject == null) {
				updateProject(new SubProgressMonitor(monitor, 1));
			}
			String newProjectCompliance= fKeepContent ? null : fFirstPage.getCompilerCompliance();
			configureJavaProject(newProjectCompliance, new SubProgressMonitor(monitor, 2));
			
				String compliance= fFirstPage.getCompilerCompliance();
				if (compliance != null) {
					IJavaProject project= JavaCore.create(fCurrProject);
					Map options= project.getOptions(false);
					JavaModelUtil.setComplianceOptions(options, compliance);
					JavaModelUtil.setDefaultClassfileOptions(options, compliance); // complete compliance options
					project.setOptions(options);
				}
			}
		} finally {
			monitor.done();
			fCurrProject= null;




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

	/**
	 * Request a project layout.
	 */
	private final class LayoutGroup implements Observer, SelectionListener {

		private final SelectionButtonDialogField fStdRadio, fSrcBinRadio;
		private Group fGroup;

		public LayoutGroup() {
			fStdRadio= new SelectionButtonDialogField(SWT.RADIO);
			fStdRadio.setLabelText(NewWizardMessages.NewJavaProjectWizardPageOne_LayoutGroup_option_oneFolder);
			fStdRadio.setDialogFieldListener(this);

			fSrcBinRadio= new SelectionButtonDialogField(SWT.RADIO);
			fSrcBinRadio.setLabelText(NewWizardMessages.NewJavaProjectWizardPageOne_LayoutGroup_option_separateFolders);
			fSrcBinRadio.setDialogFieldListener(this);

			boolean useSrcBin= PreferenceConstants.getPreferenceStore().getBoolean(PreferenceConstants.SRCBIN_FOLDERS_IN_NEWPROJ);
			fSrcBinRadio.setSelection(useSrcBin);

			fStdRadio.setEnabled(!detect);
			fSrcBinRadio.setEnabled(!detect);
			if (fPreferenceLink != null) {
				fPreferenceLink.setEnabled(!detect);
			}
			if (fGroup != null) {
				fGroup.setEnabled(!detect);

			fDetectGroup.handlePossibleJVMChange();
			fJREGroup.handlePossibleJVMChange();
		}


		/*
		 * @see org.eclipse.jdt.internal.ui.wizards.dialogfields.IDialogFieldListener#dialogFieldChanged(org.eclipse.jdt.internal.ui.wizards.dialogfields.DialogField)
		 * @since 3.5
		 */
		public void dialogFieldChanged(DialogField field) {
			updateEnableState();
		}
	}

	private final class JREGroup implements Observer, SelectionListener, IDialogFieldListener {

		private static final String LAST_SELECTED_EE_SETTINGS_KEY= JavaUI.ID_PLUGIN + ".last.selected.execution.enviroment"; //$NON-NLS-1$
		private static final String LAST_SELECTED_JRE_SETTINGS_KEY= JavaUI.ID_PLUGIN + ".last.selected.project.jre"; //$NON-NLS-1$
//		private static final String LAST_SELECTED_JRE_KIND= JavaUI.ID_PLUGIN + ".last.selected.jre.kind"; // used before EE became default
		private static final String LAST_SELECTED_JRE_KIND2= JavaUI.ID_PLUGIN + ".last.selected.jre.kind2"; //$NON-NLS-1$

		private static final int DEFAULT_JRE= 0;
		private static final int PROJECT_JRE= 1;

			fGroup.setLayout(initGridLayout(new GridLayout(2, false), true));
			fGroup.setText(NewWizardMessages.NewJavaProjectWizardPageOne_JREGroup_title);

			fUseEEJRE.doFillIntoGrid(fGroup, 1);
			Combo eeComboControl= fEECombo.getComboControl(fGroup);
			eeComboControl.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
			
			fUseProjectJRE.doFillIntoGrid(fGroup, 1);
			Combo comboControl= fJRECombo.getComboControl(fGroup);
			comboControl.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));

			fUseDefaultJRE.doFillIntoGrid(fGroup, 1);

			fPreferenceLink= new Link(fGroup, SWT.NONE);

			fPreferenceLink.setLayoutData(new GridData(GridData.END, GridData.CENTER, false, false));
			fPreferenceLink.addSelectionListener(this);

			fUseProjectJRE.doFillIntoGrid(fGroup, 1);
			Combo comboControl= fJRECombo.getComboControl(fGroup);
			comboControl.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));

			fUseEEJRE.doFillIntoGrid(fGroup, 1);
			Combo eeComboControl= fEECombo.getComboControl(fGroup);
			eeComboControl.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));

			updateEnableState();
			return fGroup;
		}

					return environments[i].getId();
			}

			return "J2SE-1.6"; //$NON-NLS-1$
		}

		private String getDefaultJVMLabel() {

			fJRECombo.setEnabled(!detect && fUseProjectJRE.isSelected());
			fEECombo.setEnabled(!detect && fUseEEJRE.isSelected());
			if (fPreferenceLink != null) {
				fPreferenceLink.setEnabled(!detect);
			}
			if (fGroup != null) {
				fGroup.setEnabled(!detect);

		 */
		public void widgetDefaultSelected(SelectionEvent e) {
			String jreID= BuildPathSupport.JRE_PREF_PAGE_ID;
			String eeID= BuildPathSupport.EE_PREF_PAGE_ID;
			String complianceId= CompliancePreferencePage.PREF_ID;
			Map data= new HashMap();
			data.put(PropertyAndPreferencePage.DATA_NO_LINK, Boolean.TRUE);
			PreferencesUtil.createPreferenceDialogOn(getShell(), jreID, new String[] { jreID, complianceId , eeID }, data).open();

			handlePossibleJVMChange();
			fDetectGroup.handlePossibleJVMChange();

				}
			} else if (field == fUseDefaultJRE) {
				if (fUseDefaultJRE.isSelected()) {
					JavaPlugin.getDefault().getDialogSettings().put(LAST_SELECTED_JRE_KIND2, DEFAULT_JRE);
					fUseProjectJRE.setSelection(false);
					fUseEEJRE.setSelection(false);
				}
			} else if (field == fUseProjectJRE) {
				if (fUseProjectJRE.isSelected()) {
					JavaPlugin.getDefault().getDialogSettings().put(LAST_SELECTED_JRE_KIND2, PROJECT_JRE);
					fUseDefaultJRE.setSelection(false);
					fUseEEJRE.setSelection(false);
				}
			} else if (field == fUseEEJRE) {
				if (fUseEEJRE.isSelected()) {
					JavaPlugin.getDefault().getDialogSettings().put(LAST_SELECTED_JRE_KIND2, EE_JRE);
					fUseDefaultJRE.setSelection(false);
					fUseProjectJRE.setSelection(false);
				}


		private int getLastSelectedJREKind() {
			IDialogSettings settings= JavaPlugin.getDefault().getDialogSettings();
			if (settings.get(LAST_SELECTED_JRE_KIND2) == null)
				return EE_JRE;

			return settings.getInt(LAST_SELECTED_JRE_KIND2);
		}

		private String getLastSelectedEE() {

		 */
		public void widgetDefaultSelected(SelectionEvent e) {
			String jreID= BuildPathSupport.JRE_PREF_PAGE_ID;
			String eeID= BuildPathSupport.EE_PREF_PAGE_ID;
			String complianceId= CompliancePreferencePage.PREF_ID;
			Map data= new HashMap();
			data.put(PropertyAndPreferencePage.DATA_NO_LINK, Boolean.TRUE);
			String id= "JRE".equals(e.text) ? jreID : complianceId; //$NON-NLS-1$
			PreferencesUtil.createPreferenceDialogOn(getShell(), id, new String[] { jreID, complianceId, eeID  }, data).open();

			fJREGroup.handlePossibleJVMChange();
			handlePossibleJVMChange();

	 * @return returns the default class path entries
	 */
	public IClasspathEntry[] getDefaultClasspathEntries() {
		IClasspathEntry[] defaultJRELibrary= PreferenceConstants.getDefaultJRELibrary();
		String compliance= getCompilerCompliance();
		IPath jreContainerPath= new Path(JavaRuntime.JRE_CONTAINER);
		if (compliance == null || defaultJRELibrary.length > 1 || !jreContainerPath.isPrefixOf(defaultJRELibrary[0].getPath())) {
			// use default
			return defaultJRELibrary;
		}
		IPath newPath= fJREGroup.getJREContainerPath();
		if (newPath != null) {
			return new IClasspathEntry[] { JavaCore.newContainerEntry(newPath) };
		}
		return PreferenceConstants.getDefaultJRELibrary();
	}

	/**




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

	 * @throws InterruptedException Thrown when the operation has been canceled.
	 */
	public void configureJavaProject(IProgressMonitor monitor) throws CoreException, InterruptedException {
		configureJavaProject(null, monitor);
	}
	
	/**
	 * Adds the Java nature to the project (if not set yet) and configures the build classpath.
	 *
	 * @param newProjectCompliance compliance to set for a new project, can be <code>null</code>
	 * @param monitor a progress monitor to report progress or <code>null</code> if
	 * progress reporting is not desired
	 * @throws CoreException Thrown when the configuring the Java project failed.
	 * @throws InterruptedException Thrown when the operation has been canceled.
	 * @since 3.5
	 */
	public void configureJavaProject(String newProjectCompliance, IProgressMonitor monitor) throws CoreException, InterruptedException {
		if (monitor == null) {
			monitor= new NullProgressMonitor();
		}

		try {
			IProject project= getJavaProject().getProject();
			BuildPathsBlock.addJavaNature(project, new SubProgressMonitor(monitor, 1));
			getBuildPathsBlock().configureJavaProject(newProjectCompliance, new SubProgressMonitor(monitor, 5));
		} catch (OperationCanceledException e) {
			throw new InterruptedException();
		} finally {




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

import org.eclipse.jdt.internal.ui.viewsupport.BasicElementLabels;
import org.eclipse.jdt.internal.ui.wizards.NewWizardMessages;
import org.eclipse.jdt.internal.ui.wizards.buildpaths.ArchiveFileFilter;
import org.eclipse.jdt.internal.ui.wizards.buildpaths.BuildPathSupport;
import org.eclipse.jdt.internal.ui.wizards.buildpaths.CPListElement;
import org.eclipse.jdt.internal.ui.wizards.buildpaths.CPListElementAttribute;
import org.eclipse.jdt.internal.ui.wizards.buildpaths.newsourcepage.ClasspathModifierQueries.OutputFolderValidator;

			IJavaModelStatus status= JavaConventions.validateClasspath(project, entries, outputLocation);
			if (!status.isOK())
				throw new JavaModelException(status);
			
			BuildPathSupport.setEEComplianceOptions(project, newEntries);
			project.setRawClasspath(entries, outputLocation, new SubProgressMonitor(monitor, 2));
		} finally {
			monitor.done();

		monitor.beginTask("", 2); //$NON-NLS-1$

		try {
			List cpListElements= cpProject.getCPListElements();
			IClasspathEntry[] entries= convert(cpListElements);
			IPath outputLocation= cpProject.getDefaultOutputLocation();

			IJavaProject javaProject= cpProject.getJavaProject();
			IJavaModelStatus status= JavaConventions.validateClasspath(javaProject, entries, outputLocation);
			if (!status.isOK())
				throw new JavaModelException(status);

			BuildPathSupport.setEEComplianceOptions(javaProject, cpListElements);
			javaProject.setRawClasspath(entries, outputLocation, new SubProgressMonitor(monitor, 2));
		} finally {
			monitor.done();
		}

Return to bug 176516

Lines 1-5 Link Here

(-)ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/LibrariesWorkbookPage.java (-4 / +5 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2008 IBM Corporation and others.	2	* Copyright (c) 2000, 2009 IBM Corporation 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 868-881 Link Here
868	if (created != null) {	868	if (created != null) {
869	CPListElement[] res= new CPListElement[created.length];	869	CPListElement[] res= new CPListElement[created.length];
870	for (int i= 0; i < res.length; i++) {	870	for (int i= 0; i < res.length; i++) {
871	res[i]= CPListElement.createFromExisting(created[i], fCurrJProject);	871	res[i]= CPListElement.create(created[i], true, fCurrJProject);
872	}	872	}
873	return res;	873	return res;
874	}	874	}
875	} else {	875	} else {
876	IClasspathEntry created= BuildPathDialogAccess.configureContainerEntry(getShell(), existing.getClasspathEntry(), fCurrJProject, getRawClasspath());	876	IClasspathEntry existingEntry= existing.getClasspathEntry();
		877	IClasspathEntry created= BuildPathDialogAccess.configureContainerEntry(getShell(), existingEntry, fCurrJProject, getRawClasspath());
877	if (created != null) {	878	if (created != null) {
878	CPListElement elem= new CPListElement(fCurrJProject, IClasspathEntry.CPE_CONTAINER, created.getPath(), null);	879	CPListElement elem= new CPListElement(null, fCurrJProject, IClasspathEntry.CPE_CONTAINER, created.getPath(), ! created.equals(existingEntry), null, null);
879	return new CPListElement[] { elem };	880	return new CPListElement[] { elem };
880	}	881	}
881	}	882	}

Lines 22-28 Link Here

(-)ui/org/eclipse/jdt/internal/ui/preferences/PreferencesMessages.properties (-2 / +3 lines)
22	BuildPathsPropertyPage_closed_project_message=Java information is not available for a closed project.	22	BuildPathsPropertyPage_closed_project_message=Java information is not available for a closed project.
23		23
24	BuildPathsPropertyPage_unsavedchanges_title=Setting Java Build Path	24	BuildPathsPropertyPage_unsavedchanges_title=Setting Java Build Path
25	BuildPathsPropertyPage_unsavedchanges_message=The Java Build path property page contains unsaved modifications. Do you want to save changes so that other build path related property pages can be updated?	25	BuildPathsPropertyPage_unsavedchanges_message=The Java Build Path property page contains unsaved modifications. Do you want to save changes so that other build path related property pages can be updated?
26	BuildPathsPropertyPage_unsavedchanges_button_save=Apply	26	BuildPathsPropertyPage_unsavedchanges_button_save=Apply
27	BuildPathsPropertyPage_unsavedchanges_button_discard=Discard	27	BuildPathsPropertyPage_unsavedchanges_button_discard=Discard
28	BuildPathsPropertyPage_unsavedchanges_button_ignore=Apply Later	28	BuildPathsPropertyPage_unsavedchanges_button_ignore=Apply Later
Lines 553-558 Link Here
553	ComplianceConfigurationBlock_codegen_targetplatform_label=Ge&nerated .class files compatibility:	553	ComplianceConfigurationBlock_codegen_targetplatform_label=Ge&nerated .class files compatibility:
554	ComplianceConfigurationBlock_pb_assert_as_identifier_label=Disallow identifie&rs called 'assert':	554	ComplianceConfigurationBlock_pb_assert_as_identifier_label=Disallow identifie&rs called 'assert':
555	ComplianceConfigurationBlock_pb_enum_as_identifier_label=Disallo&w identifiers called 'enum':	555	ComplianceConfigurationBlock_pb_enum_as_identifier_label=Disallo&w identifiers called 'enum':
		556	ComplianceConfigurationBlock_compliance_follows_EE_label=Use compliance from Execution Environment on the <a>Java Build Path</a>
556	ComplianceConfigurationBlock_compliance_group_label=JDK Compliance	557	ComplianceConfigurationBlock_compliance_group_label=JDK Compliance
557	ComplianceConfigurationBlock_classfiles_group_label=Classfile Generation	558	ComplianceConfigurationBlock_classfiles_group_label=Classfile Generation
558	ComplianceConfigurationBlock_classfile_greater_compliance=Classfile compatibility must be equal or less than compliance level.	559	ComplianceConfigurationBlock_classfile_greater_compliance=Classfile compatibility must be equal or less than compliance level.
Lines 560-566 Link Here
560		561
561	ComplianceConfigurationBlock_jrecompliance_info=When selecting {0} compliance, make sure to have a compatible JRE installed and activated (currently {1}). <a href="1" >Configure...</a>	562	ComplianceConfigurationBlock_jrecompliance_info=When selecting {0} compliance, make sure to have a compatible JRE installed and activated (currently {1}). <a href="1" >Configure...</a>
562	ComplianceConfigurationBlock_cldc11_requires_source13_compliance_se14=CLDC 1.1 requires source level 1.3 and compliance 1.4 or less	563	ComplianceConfigurationBlock_cldc11_requires_source13_compliance_se14=CLDC 1.1 requires source level 1.3 and compliance 1.4 or less
563	ComplianceConfigurationBlock_jrecompliance_info_project=When selecting {0} compliance, make sure to have a compatible JRE installed and activated (currently {1}). Configure the <a href="1" >Installed JREs</a> or change the JRE on the <a href="2" >Java build path</a>.	564	ComplianceConfigurationBlock_jrecompliance_info_project=When selecting {0} compliance, make sure to have a compatible JRE installed and activated (currently {1}). Configure the <a href="1" >Installed JREs</a> and <a href="2" >Execution Environments</a>, or change the JRE on the <a href="3" >Java build path</a>.
564		565
565	OptionsConfigurationBlock_job_title=Rebuilding	566	OptionsConfigurationBlock_job_title=Rebuilding
566		567

Lines 136-142 Link Here

(-)ui/org/eclipse/jdt/internal/ui/preferences/OptionsConfigurationBlock.java (-23 / +86 lines)
136	}	136	}
137		137
138	/**	138	/**
139	* Key that is only managed locally ans not part of preference store.	139	* Key that is only managed locally and not part of preference store.
140	*/	140	*/
141	private static class LocalKey extends Key {	141	private static class LocalKey extends Key {
142	private HashMap fValues;	142	private HashMap fValues;
Lines 384-391 Link Here
384		384
385	makeScrollableCompositeAware(checkBox);	385	makeScrollableCompositeAware(checkBox);
386		386
387	String currValue= getValue(key);	387	updateCheckBox(checkBox);
388	checkBox.setSelection(data.getSelection(currValue) == 0);
389		388
390	fCheckBoxes.add(checkBox);	389	fCheckBoxes.add(checkBox);
391		390
Lines 440-445 Link Here
440	checkBox.setSelection(!checkBox.getSelection());	439	checkBox.setSelection(!checkBox.getSelection());
441	checkBox.setFocus();	440	checkBox.setFocus();
442	linkSelected[0]= false;	441	linkSelected[0]= false;
		442	controlChanged(checkBox);
443	}	443	}
444	}	444	}
445	});	445	});
Lines 447-454 Link Here
447	makeScrollableCompositeAware(link);	447	makeScrollableCompositeAware(link);
448	makeScrollableCompositeAware(checkBox);	448	makeScrollableCompositeAware(checkBox);
449		449
450	String currValue= getValue(key);	450	updateCheckBox(checkBox);
451	checkBox.setSelection(data.getSelection(currValue) == 0);
452		451
453	fCheckBoxes.add(checkBox);	452	fCheckBoxes.add(checkBox);
454		453
Lines 509-516 Link Here
509		508
510	makeScrollableCompositeAware(comboBox);	509	makeScrollableCompositeAware(comboBox);
511		510
512	String currValue= getValue(key);	511	updateCombo(comboBox);
513	comboBox.select(data.getSelection(currValue));
514		512
515	fComboBoxes.add(comboBox);	513	fComboBoxes.add(comboBox);
516	return comboBox;	514	return comboBox;
Lines 530-539 Link Here
530		528
531	fLabels.put(textBox, labelControl);	529	fLabels.put(textBox, labelControl);
532		530
533	String currValue= getValue(key);	531	updateText(textBox);
534	if (currValue != null) {	532
535	textBox.setText(currValue);
536	}
537	textBox.addModifyListener(getTextModifyListener());	533	textBox.addModifyListener(getTextModifyListener());
538		534
539	GridData data= new GridData(GridData.HORIZONTAL_ALIGN_FILL);	535	GridData data= new GridData(GridData.HORIZONTAL_ALIGN_FILL);
Lines 663-672 Link Here
663	validateSettings(key, oldValue, number);	659	validateSettings(key, oldValue, number);
664	}	660	}
665		661
		662	/**
		663	* Checks a setting.
		664	*
		665	* @param key a key
		666	* @param value an assumed value for the key
		667	* @return <code>true</code> iff the given key's value is equal to the given value
		668	*/
666	protected boolean checkValue(Key key, String value) {	669	protected boolean checkValue(Key key, String value) {
667	return value.equals(getValue(key));	670	return value.equals(getValue(key));
668	}	671	}
669		672
		673	/**
		674	* Returns the value for the key.
		675	*
		676	* @param key the key
		677	* @return the stored value
		678	*/
670	protected String getValue(Key key) {	679	protected String getValue(Key key) {
671	if (fDisabledProjectSettings != null) {	680	if (fDisabledProjectSettings != null) {
672	return (String) fDisabledProjectSettings.get(key);	681	return (String) fDisabledProjectSettings.get(key);
Lines 679-684 Link Here
679	return Boolean.valueOf(getValue(key)).booleanValue();	688	return Boolean.valueOf(getValue(key)).booleanValue();
680	}	689	}
681		690
		691	/**
		692	* Sets the option <code>key</code> to the value <code>value</code>.
		693	* Note that callers have to make sure the corresponding controls are updated afterwards.
		694	*
		695	* @param key the option key
		696	* @param value the new value
		697	* @return the old value
		698	*
		699	* @see #updateControls()
		700	* @see #updateCheckBox(Button)
		701	* @see #updateCombo(Combo)
		702	* @see #updateText(Text)
		703	*/
682	protected String setValue(Key key, String value) {	704	protected String setValue(Key key, String value) {
683	if (fDisabledProjectSettings != null) {	705	if (fDisabledProjectSettings != null) {
684	return (String) fDisabledProjectSettings.put(key, value);	706	return (String) fDisabledProjectSettings.put(key, value);
Lines 688-714 Link Here
688	return oldValue;	710	return oldValue;
689	}	711	}
690		712
		713	/**
		714	* Sets the option <code>key</code> to the value <code>value</code>.
		715	* Note that callers have to make sure the corresponding controls are updated afterwards.
		716	*
		717	* @param key the option key
		718	* @param value the new value
		719	* @return the old value
		720	*
		721	* @see #updateControls()
		722	* @see #updateCheckBox(Button)
		723	* @see #updateCombo(Combo)
		724	* @see #updateText(Text)
		725	*/
691	protected String setValue(Key key, boolean value) {	726	protected String setValue(Key key, boolean value) {
692	return setValue(key, String.valueOf(value));	727	return setValue(key, String.valueOf(value));
693	}	728	}
694		729
695	protected final void setDefaultValue(Key key, String value) {	730	protected final void setDefaultValue(Key key, String value) {
696	key.setStoredValue(fLookupOrder[fLookupOrder.length - 1], value, fManager);	731	IScopeContext instanceScope= fLookupOrder[fLookupOrder.length - 1];
		732	key.setStoredValue(instanceScope, value, fManager);
697	}	733	}
698		734
699	/**	735	/**
700	* Returns the value as actually stored in the preference store.	736	* Returns the value as stored in the preference store.
701	*	737	*
702	* @param key the key	738	* @param key the key
703	* @return the value as actually stored in the preference store.	739	* @return the value
704	*/	740	*/
705	protected String getStoredValue(Key key) {	741	protected String getStoredValue(Key key) {
706	return key.getStoredValue(fLookupOrder, false, fManager);	742	return key.getStoredValue(fLookupOrder, false, fManager);
707	}	743	}
		744
		745	/**
		746	* Returns the value as actually stored in the preference store, without considering
		747	* the working copy store.
		748	*
		749	* @param key the key
		750	* @return the value as actually stored in the preference store
		751	*/
		752	protected String getOriginalStoredValue(Key key) {
		753	return key.getStoredValue(fLookupOrder, false, null);
		754	}
		755
		756	/**
		757	* Reverts the given options to the stored values.
		758	*
		759	* @param keys the options to revert
		760	* @since 3.5
		761	*/
		762	protected void revertValues(Key[] keys) {
		763	for (int i= 0; i < keys.length; i++) {
		764	Key curr= keys[i];
		765	String origValue= curr.getStoredValue(fLookupOrder, false, null);
		766	setValue(curr, origValue);
		767	}
		768	}
708		769
709	/* (non-javadoc)	770	/**
710	* Update fields and validate.	771	* Updates fields and validates settings.
711	* @param changedKey Key that changed, or null, if all changed.	772	*
		773	* @param changedKey key that changed, or <code>null</code>, if all changed.
		774	* @param oldValue old value or <code>null</code>
		775	* @param newValue new value or <code>null</code>
712	*/	776	*/
713	protected abstract void validateSettings(Key changedKey, String oldValue, String newValue);	777	protected abstract void validateSettings(Key changedKey, String oldValue, String newValue);
714		778
Lines 855-865 Link Here
855	* @since 3.1	919	* @since 3.1
856	*/	920	*/
857	public void performRevert() {	921	public void performRevert() {
858	for (int i= 0; i < fAllKeys.length; i++) {	922	revertValues(fAllKeys);
859	Key curr= fAllKeys[i];
860	String origValue= curr.getStoredValue(fLookupOrder, false, null);
861	setValue(curr, origValue);
862	}
863		923
864	settingsUpdated();	924	settingsUpdated();
865	updateControls();	925	updateControls();
Lines 869-876 Link Here
869	public void dispose() {	929	public void dispose() {
870	}	930	}
871		931
		932	/**
		933	* Updates the UI from the current settings. Must be called whenever a setting has been changed
		934	* by code.
		935	*/
872	protected void updateControls() {	936	protected void updateControls() {
873	// update the UI
874	for (int i= fCheckBoxes.size() - 1; i >= 0; i--) {	937	for (int i= fCheckBoxes.size() - 1; i >= 0; i--) {
875	updateCheckBox((Button) fCheckBoxes.get(i));	938	updateCheckBox((Button) fCheckBoxes.get(i));
876	}	939	}

Lines 1-5 Link Here

(-)ui/org/eclipse/jdt/ui/wizards/NewJavaProjectWizardPageTwo.java (-15 / +4 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2008 IBM Corporation and others.	2	* Copyright (c) 2000, 2009 IBM Corporation 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 24-30 Link Here
24	import java.util.HashSet;	24	import java.util.HashSet;
25	import java.util.Iterator;	25	import java.util.Iterator;
26	import java.util.List;	26	import java.util.List;
27	import java.util.Map;
28		27
29	import org.eclipse.core.filesystem.EFS;	28	import org.eclipse.core.filesystem.EFS;
30	import org.eclipse.core.filesystem.IFileInfo;	29	import org.eclipse.core.filesystem.IFileInfo;
Lines 57-63 Link Here
57	import org.eclipse.jdt.core.IJavaProject;	56	import org.eclipse.jdt.core.IJavaProject;
58	import org.eclipse.jdt.core.JavaCore;	57	import org.eclipse.jdt.core.JavaCore;
59		58
60	import org.eclipse.jdt.internal.corext.util.JavaModelUtil;
61	import org.eclipse.jdt.internal.corext.util.Messages;	59	import org.eclipse.jdt.internal.corext.util.Messages;
62		60
63	import org.eclipse.jdt.ui.JavaUI;	61	import org.eclipse.jdt.ui.JavaUI;
Lines 466-483 Link Here
466	if (fCurrProject == null) {	464	if (fCurrProject == null) {
467	updateProject(new SubProgressMonitor(monitor, 1));	465	updateProject(new SubProgressMonitor(monitor, 1));
468	}	466	}
469	configureJavaProject(new SubProgressMonitor(monitor, 2));	467	String newProjectCompliance= fKeepContent ? null : fFirstPage.getCompilerCompliance();
470		468	configureJavaProject(newProjectCompliance, new SubProgressMonitor(monitor, 2));
471	if (!fKeepContent) {	469
472	String compliance= fFirstPage.getCompilerCompliance();
473	if (compliance != null) {
474	IJavaProject project= JavaCore.create(fCurrProject);
475	Map options= project.getOptions(false);
476	JavaModelUtil.setComplianceOptions(options, compliance);
477	JavaModelUtil.setDefaultClassfileOptions(options, compliance); // complete compliance options
478	project.setOptions(options);
479	}
480	}
481	} finally {	470	} finally {
482	monitor.done();	471	monitor.done();
483	fCurrProject= null;	472	fCurrProject= null;

Lines 1-5 Link Here

(-)ui/org/eclipse/jdt/ui/wizards/JavaCapabilityConfigurationPage.java (-2 / +16 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2008 IBM Corporation and others.	2	* Copyright (c) 2000, 2009 IBM Corporation 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 260-265 Link Here
260	* @throws InterruptedException Thrown when the operation has been canceled.	260	* @throws InterruptedException Thrown when the operation has been canceled.
261	*/	261	*/
262	public void configureJavaProject(IProgressMonitor monitor) throws CoreException, InterruptedException {	262	public void configureJavaProject(IProgressMonitor monitor) throws CoreException, InterruptedException {
		263	configureJavaProject(null, monitor);
		264	}
		265
		266	/**
		267	* Adds the Java nature to the project (if not set yet) and configures the build classpath.
		268	*
		269	* @param newProjectCompliance compliance to set for a new project, can be <code>null</code>
		270	* @param monitor a progress monitor to report progress or <code>null</code> if
		271	* progress reporting is not desired
		272	* @throws CoreException Thrown when the configuring the Java project failed.
		273	* @throws InterruptedException Thrown when the operation has been canceled.
		274	* @since 3.5
		275	*/
		276	public void configureJavaProject(String newProjectCompliance, IProgressMonitor monitor) throws CoreException, InterruptedException {
263	if (monitor == null) {	277	if (monitor == null) {
264	monitor= new NullProgressMonitor();	278	monitor= new NullProgressMonitor();
265	}	279	}
Lines 270-276 Link Here
270	try {	284	try {
271	IProject project= getJavaProject().getProject();	285	IProject project= getJavaProject().getProject();
272	BuildPathsBlock.addJavaNature(project, new SubProgressMonitor(monitor, 1));	286	BuildPathsBlock.addJavaNature(project, new SubProgressMonitor(monitor, 1));
273	getBuildPathsBlock().configureJavaProject(new SubProgressMonitor(monitor, 5));	287	getBuildPathsBlock().configureJavaProject(newProjectCompliance, new SubProgressMonitor(monitor, 5));
274	} catch (OperationCanceledException e) {	288	} catch (OperationCanceledException e) {
275	throw new InterruptedException();	289	throw new InterruptedException();
276	} finally {	290	} finally {