Attachment 235378 Details for Bug 415846 – Updated Patch

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

[patch] Updated Patch

Fix-for-bug-415846-18-UI-option-to-control-generatio.patch (text/plain), 8.54 KB, created by Martin Mathew

on 2013-09-11 05:00:20 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Mathew

Created: 2013-09-11 05:00:20 EDT

Size: 8.54 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.ui
>diff --git ui/org/eclipse/jdt/internal/ui/preferences/ComplianceConfigurationBlock.java ui/org/eclipse/jdt/internal/ui/preferences/ComplianceConfigurationBlock.java
>index 1f8ec81..4fd5429 100644
>--- ui/org/eclipse/jdt/internal/ui/preferences/ComplianceConfigurationBlock.java
>+++ ui/org/eclipse/jdt/internal/ui/preferences/ComplianceConfigurationBlock.java
>@@ -106,6 +106,7 @@
> 	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_METHOD_PARAMETERS_ATTR= getJDTCoreKey(JavaCore.COMPILER_CODEGEN_METHOD_PARAMETERS_ATTR);
> 	
> 	// values
> 	private static final String GENERATE= JavaCore.GENERATE;
>@@ -142,14 +143,16 @@
> 	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.
>+	 * 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
>+	 * @see #IDX_METHOD_PARAMETERS_ATTR
> 	 */
> 	private String[] fRememberedUserCompliance;
> 	
>@@ -162,6 +165,7 @@
> 	 * @see #IDX_CODEGEN_TARGET_PLATFORM
> 	 * @see #IDX_COMPLIANCE
> 	 * @see #IDX_INLINE_JSR_BYTECODE
>+	 * @see #IDX_METHOD_PARAMETERS_ATTR
> 	 */
> 	private String[] fOriginalStoredCompliance;
> 
>@@ -171,6 +175,7 @@
> 	private static final int IDX_CODEGEN_TARGET_PLATFORM= 3;
> 	private static final int IDX_COMPLIANCE= 4;
> 	private static final int IDX_INLINE_JSR_BYTECODE= 5;
>+	private static final int IDX_METHOD_PARAMETERS_ATTR= 6;
> 
> 	private IStatus fComplianceStatus;
> 
>@@ -197,6 +202,7 @@
> 			getValue(PREF_CODEGEN_TARGET_PLATFORM),
> 			getValue(PREF_COMPLIANCE),
> 			getValue(PREF_CODEGEN_INLINE_JSR_BYTECODE),
>+			getValue(PREF_CODEGEN_METHOD_PARAMETERS_ATTR)
> 		};
> 	}
> 
>@@ -204,7 +210,7 @@
> 		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
>+				PREF_CODEGEN_TARGET_PLATFORM, PREF_PB_ASSERT_AS_IDENTIFIER, PREF_PB_ENUM_AS_IDENTIFIER, PREF_CODEGEN_METHOD_PARAMETERS_ATTR
> 			};
> 		
> 		if (projectSpecific) {
>@@ -402,6 +408,9 @@
> 		label= PreferencesMessages.ComplianceConfigurationBlock_codegen_inline_jsr_bytecode_label;
> 		addCheckBox(group, label, PREF_CODEGEN_INLINE_JSR_BYTECODE, enableDisableValues, 0);
> 		
>+		label= PreferencesMessages.ComplianceConfigurationBlock_codegen_method_parameters_attr;
>+		addCheckBox(group, label, PREF_CODEGEN_METHOD_PARAMETERS_ATTR, generateValues, 0);
>+		
> 		Composite infoComposite= new Composite(fControlsComposite, SWT.NONE);
> 		infoComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
> 		infoComposite.setLayout(new GridLayout(2, false));
>@@ -509,6 +518,7 @@
> 				}
> 				updateControls();
> 				updateInlineJSREnableState();
>+				updatePreserveMethodParamNamesEnableState();
> 				updateAssertEnumAsIdentifierEnableState();
> 				fComplianceStatus= validateCompliance();
> 			} else if (PREF_PB_ENUM_AS_IDENTIFIER.equals(changedKey) ||
>@@ -523,6 +533,7 @@
> 			updateComplianceEnableState();
> 			updateAssertEnumAsIdentifierEnableState();
> 			updateInlineJSREnableState();
>+			updatePreserveMethodParamNamesEnableState();
> 			fComplianceStatus= validateCompliance();
> 			validateComplianceStatus();
> 		}
>@@ -539,6 +550,7 @@
> 						getOriginalStoredValue(PREF_CODEGEN_TARGET_PLATFORM),
> 						getOriginalStoredValue(PREF_COMPLIANCE),
> 						getOriginalStoredValue(PREF_CODEGEN_INLINE_JSR_BYTECODE),
>+						getOriginalStoredValue(PREF_CODEGEN_METHOD_PARAMETERS_ATTR)
> 					};
> 				
> 			} else {
>@@ -549,6 +561,7 @@
> 						getOriginalStoredValue(PREF_CODEGEN_TARGET_PLATFORM),
> 						getOriginalStoredValue(PREF_COMPLIANCE),
> 						getOriginalStoredValue(PREF_CODEGEN_INLINE_JSR_BYTECODE),
>+						getOriginalStoredValue(PREF_CODEGEN_METHOD_PARAMETERS_ATTR)
> 					};
> 				if (!Arrays.equals(fOriginalStoredCompliance, storedCompliance)) {
> 					// compliance changed on disk -> override user modifications
>@@ -561,6 +574,7 @@
> 					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]);
>+					setValue(PREF_CODEGEN_METHOD_PARAMETERS_ATTR, storedCompliance[IDX_METHOD_PARAMETERS_ATTR]);
> 					
> 				}
> 				
>@@ -569,6 +583,7 @@
> 				updateComplianceEnableState();
> 				validateComplianceStatus();
> 				updateInlineJSREnableState();
>+				updatePreserveMethodParamNamesEnableState();
> 			}
> 		}
> 	}
>@@ -771,6 +786,33 @@
> 		}
> 	}
> 
>+	private void updatePreserveMethodParamNamesEnableState() {
>+		String target= getValue(PREF_CODEGEN_TARGET_PLATFORM);
>+		boolean enabled= JavaModelUtil.is18OrHigher(target);
>+		Button checkBox= getCheckBox(PREF_CODEGEN_METHOD_PARAMETERS_ATTR);
>+		boolean wasCheckBoxEnabled= checkBox.isEnabled();
>+		checkBox.setEnabled(enabled);
>+
>+		if (enabled) {
>+			if (!wasCheckBoxEnabled) {
>+				String val= fRememberedUserCompliance[IDX_METHOD_PARAMETERS_ATTR];
>+				if (GENERATE.equals(val)) {
>+					setValue(PREF_CODEGEN_METHOD_PARAMETERS_ATTR, val);
>+					updateCheckBox(checkBox);
>+				}
>+			}
>+		} else {
>+			String val= getValue(PREF_CODEGEN_METHOD_PARAMETERS_ATTR);
>+			if (wasCheckBoxEnabled)
>+				fRememberedUserCompliance[IDX_METHOD_PARAMETERS_ATTR]= val;
>+
>+			if (GENERATE.equals(val)) {
>+				setValue(PREF_CODEGEN_METHOD_PARAMETERS_ATTR, DO_NOT_GENERATE);
>+				updateCheckBox(checkBox);
>+			}
>+		}
>+	}
>+
> 	/**
> 	 * Sets the default compliance values derived from the chosen level or restores the user
> 	 * compliance settings.
>@@ -858,6 +900,7 @@
> 			} else {
> 				updateInlineJSREnableState();
> 				updateAssertEnumAsIdentifierEnableState();
>+				updatePreserveMethodParamNamesEnableState();
> 				return;
> 			}
> 		}
>@@ -868,6 +911,7 @@
> 		updateControls();
> 		updateInlineJSREnableState();
> 		updateAssertEnumAsIdentifierEnableState();
>+		updatePreserveMethodParamNamesEnableState();
> 	}
> 
> 	/**
>diff --git ui/org/eclipse/jdt/internal/ui/preferences/PreferencesMessages.java ui/org/eclipse/jdt/internal/ui/preferences/PreferencesMessages.java
>index 9440232..01c70cd 100644
>--- ui/org/eclipse/jdt/internal/ui/preferences/PreferencesMessages.java
>+++ ui/org/eclipse/jdt/internal/ui/preferences/PreferencesMessages.java
>@@ -496,6 +496,7 @@
> 	public static String ComplianceConfigurationBlock_codegen_unused_local_label;
> 	public static String ComplianceConfigurationBlock_cldc11_requires_source13_compliance_se14;
> 	public static String ComplianceConfigurationBlock_codegen_inline_jsr_bytecode_label;
>+	public static String ComplianceConfigurationBlock_codegen_method_parameters_attr;
> 	public static String ComplianceConfigurationBlock_compiler_compliance_label;
> 	public static String ComplianceConfigurationBlock_default_settings_label;
> 	public static String ComplianceConfigurationBlock_source_compatibility_label;
>diff --git ui/org/eclipse/jdt/internal/ui/preferences/PreferencesMessages.properties ui/org/eclipse/jdt/internal/ui/preferences/PreferencesMessages.properties
>index 759f016..6a4e844 100644
>--- ui/org/eclipse/jdt/internal/ui/preferences/PreferencesMessages.properties
>+++ ui/org/eclipse/jdt/internal/ui/preferences/PreferencesMessages.properties
>@@ -558,6 +558,7 @@
> ComplianceConfigurationBlock_src_greater_compliance=Source compatibility must be equal or less than compliance level.
> ComplianceConfigurationBlock_codegen_unused_local_label=Pr&eserve unused (never read) local variables
> ComplianceConfigurationBlock_codegen_inline_jsr_bytecode_label=Inline finally blo&cks (larger class files, but improved performance)
>+ComplianceConfigurationBlock_codegen_method_parameters_attr=&Preserve method parameter names
> ComplianceConfigurationBlock_compiler_compliance_label=Comp&iler compliance level:
> ComplianceConfigurationBlock_default_settings_label=Use defaul&t compliance settings
> ComplianceConfigurationBlock_source_compatibility_label=Source co&mpatibility:

Actions: View | Diff

Attachments on bug 415846: 234841 | 235378