Attachment #132764 for bug #154823

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




		"getFieldName", //$NON-NLS-1$
		new String(suggestion));
}
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=154823
public void testSuggestGetterName010() {
	char[] suggestion = NamingConventions.suggestGetterName(
		this.project,
		"eMail".toCharArray(), //$NON-NLS-1$
		0,
		false,
		CharOperation.NO_CHAR_CHAR);

	assumeEquals(
		"geteMail", //$NON-NLS-1$
		new String(suggestion));
}
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=154823
public void testSuggestGetterName011() {
	char[] suggestion = NamingConventions.suggestGetterName(
		this.project,
		"EMail".toCharArray(), //$NON-NLS-1$
		0,
		false,
		CharOperation.NO_CHAR_CHAR);

	assumeEquals(
		"getEMail", //$NON-NLS-1$
		new String(suggestion));
}
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=154823
public void testSuggestGetterName012() {
	char[] suggestion = NamingConventions.suggestGetterName(
		this.project,
		"z".toCharArray(), //$NON-NLS-1$
		0,
		false,
		CharOperation.NO_CHAR_CHAR);

	assumeEquals(
		"getZ", //$NON-NLS-1$
		new String(suggestion));
}
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=154823
public void testSuggestGetterName013() {
	char[] suggestion = NamingConventions.suggestGetterName(
		this.project,
		"Z".toCharArray(), //$NON-NLS-1$
		0,
		false,
		CharOperation.NO_CHAR_CHAR);

	assumeEquals(
		"getZ", //$NON-NLS-1$
		new String(suggestion));
}
public void testSuggestSetterName001() {
	char[] suggestion = NamingConventions.suggestSetterName(
		this.project,




	public static char[] getBaseName(
			int variableKind,
			IJavaProject javaProject,
			char[] name,
			boolean updateFirstCharacter) {
		
		AssistOptions assistOptions;
		if (javaProject != null) {

		}
		
		
		return getBaseName(name, prefixes, suffixes, variableKind == VK_STATIC_FINAL_FIELD, updateFirstCharacter);
	}

	private static char[] getBaseName(char[] name, char[][] prefixes, char[][] suffixes, boolean isConstant, boolean updateFirstCharacter) {
		char[] nameWithoutPrefixAndSiffix = removeVariablePrefixAndSuffix(name, prefixes, suffixes, updateFirstCharacter);
		
		char[] baseName;
		if (isConstant) {

Lines 530-536 Link Here

(-)model/org/eclipse/jdt/core/NamingConventions.java (-5 / +7 lines)
530	int variableKind,	530	int variableKind,
531	String variableName,	531	String variableName,
532	IJavaProject javaProject) {	532	IJavaProject javaProject) {
533	return String.valueOf(InternalNamingConventions.getBaseName(variableKind, javaProject, variableName.toCharArray()));	533	return String.valueOf(InternalNamingConventions.getBaseName(variableKind, javaProject, variableName.toCharArray(), true));
534	}	534	}
535		535
536	private static int getFieldVariableKind(int modifiers) {	536	private static int getFieldVariableKind(int modifiers) {
Lines 544-552 Link Here
544	}	544	}
545		545
546	private static char[] suggestAccessorName(IJavaProject project, char[] fieldName, int modifiers) {	546	private static char[] suggestAccessorName(IJavaProject project, char[] fieldName, int modifiers) {
547	char[] name = InternalNamingConventions.getBaseName(getFieldVariableKind(modifiers), project, fieldName);	547	char[] name = InternalNamingConventions.getBaseName(getFieldVariableKind(modifiers), project, fieldName, false);
548	if (name.length > 0 && ScannerHelper.isLowerCase(name[0])) {	548	if (name.length > 0 && ScannerHelper.isLowerCase(name[0])) {
549	name[0] = ScannerHelper.toUpperCase(name[0]);	549	if (name.length == 1 \|\| !ScannerHelper.isUpperCase(name[1])) {
		550	name[0] = ScannerHelper.toUpperCase(name[0]);
		551	}
550	}	552	}
551	return name;	553	return name;
552	}	554	}
Lines 777-783 Link Here
777	*/	779	*/
778	public static char[] suggestGetterName(IJavaProject project, char[] fieldName, int modifiers, boolean isBoolean, char[][] excludedNames) {	780	public static char[] suggestGetterName(IJavaProject project, char[] fieldName, int modifiers, boolean isBoolean, char[][] excludedNames) {
779	if (isBoolean) {	781	if (isBoolean) {
780	char[] name = InternalNamingConventions.getBaseName(getFieldVariableKind(modifiers), project, fieldName);	782	char[] name = InternalNamingConventions.getBaseName(getFieldVariableKind(modifiers), project, fieldName, false);
781	int prefixLen = GETTER_BOOL_NAME.length;	783	int prefixLen = GETTER_BOOL_NAME.length;
782	if (CharOperation.prefixEquals(GETTER_BOOL_NAME, name)	784	if (CharOperation.prefixEquals(GETTER_BOOL_NAME, name)
783	&& name.length > prefixLen && ScannerHelper.isUpperCase(name[prefixLen])) {	785	&& name.length > prefixLen && ScannerHelper.isUpperCase(name[prefixLen])) {
Lines 977-983 Link Here
977	public static char[] suggestSetterName(IJavaProject project, char[] fieldName, int modifiers, boolean isBoolean, char[][] excludedNames) {	979	public static char[] suggestSetterName(IJavaProject project, char[] fieldName, int modifiers, boolean isBoolean, char[][] excludedNames) {
978		980
979	if (isBoolean) {	981	if (isBoolean) {
980	char[] name = InternalNamingConventions.getBaseName(getFieldVariableKind(modifiers), project, fieldName);	982	char[] name = InternalNamingConventions.getBaseName(getFieldVariableKind(modifiers), project, fieldName, false);
981	int prefixLen = GETTER_BOOL_NAME.length;	983	int prefixLen = GETTER_BOOL_NAME.length;
982	if (CharOperation.prefixEquals(GETTER_BOOL_NAME, name)	984	if (CharOperation.prefixEquals(GETTER_BOOL_NAME, name)
983	&& name.length > prefixLen && ScannerHelper.isUpperCase(name[prefixLen])) {	985	&& name.length > prefixLen && ScannerHelper.isUpperCase(name[prefixLen])) {

Return to bug 154823

Lines 1207-1212 Link Here

(-)src/org/eclipse/jdt/core/tests/model/NamingConventionTests.java (+52 lines)
1207	"getFieldName", //$NON-NLS-1$	1207	"getFieldName", //$NON-NLS-1$
1208	new String(suggestion));	1208	new String(suggestion));
1209	}	1209	}
		1210	//https://bugs.eclipse.org/bugs/show_bug.cgi?id=154823
		1211	public void testSuggestGetterName010() {
		1212	char[] suggestion = NamingConventions.suggestGetterName(
		1213	this.project,
		1214	"eMail".toCharArray(), //$NON-NLS-1$
		1215	0,
		1216	false,
		1217	CharOperation.NO_CHAR_CHAR);
		1218
		1219	assumeEquals(
		1220	"geteMail", //$NON-NLS-1$
		1221	new String(suggestion));
		1222	}
		1223	//https://bugs.eclipse.org/bugs/show_bug.cgi?id=154823
		1224	public void testSuggestGetterName011() {
		1225	char[] suggestion = NamingConventions.suggestGetterName(
		1226	this.project,
		1227	"EMail".toCharArray(), //$NON-NLS-1$
		1228	0,
		1229	false,
		1230	CharOperation.NO_CHAR_CHAR);
		1231
		1232	assumeEquals(
		1233	"getEMail", //$NON-NLS-1$
		1234	new String(suggestion));
		1235	}
		1236	//https://bugs.eclipse.org/bugs/show_bug.cgi?id=154823
		1237	public void testSuggestGetterName012() {
		1238	char[] suggestion = NamingConventions.suggestGetterName(
		1239	this.project,
		1240	"z".toCharArray(), //$NON-NLS-1$
		1241	0,
		1242	false,
		1243	CharOperation.NO_CHAR_CHAR);
		1244
		1245	assumeEquals(
		1246	"getZ", //$NON-NLS-1$
		1247	new String(suggestion));
		1248	}
		1249	//https://bugs.eclipse.org/bugs/show_bug.cgi?id=154823
		1250	public void testSuggestGetterName013() {
		1251	char[] suggestion = NamingConventions.suggestGetterName(
		1252	this.project,
		1253	"Z".toCharArray(), //$NON-NLS-1$
		1254	0,
		1255	false,
		1256	CharOperation.NO_CHAR_CHAR);
		1257
		1258	assumeEquals(
		1259	"getZ", //$NON-NLS-1$
		1260	new String(suggestion));
		1261	}
1210	public void testSuggestSetterName001() {	1262	public void testSuggestSetterName001() {
1211	char[] suggestion = NamingConventions.suggestSetterName(	1263	char[] suggestion = NamingConventions.suggestSetterName(
1212	this.project,	1264	this.project,

Lines 298-304 Link Here

(-)model/org/eclipse/jdt/internal/core/InternalNamingConventions.java (-4 / +5 lines)
298	public static char[] getBaseName(	298	public static char[] getBaseName(
299	int variableKind,	299	int variableKind,
300	IJavaProject javaProject,	300	IJavaProject javaProject,
301	char[] name) {	301	char[] name,
		302	boolean updateFirstCharacter) {
302		303
303	AssistOptions assistOptions;	304	AssistOptions assistOptions;
304	if (javaProject != null) {	305	if (javaProject != null) {
Lines 333-343 Link Here
333	}	334	}
334		335
335		336
336	return getBaseName(name, prefixes, suffixes, variableKind == VK_STATIC_FINAL_FIELD);	337	return getBaseName(name, prefixes, suffixes, variableKind == VK_STATIC_FINAL_FIELD, updateFirstCharacter);
337	}	338	}
338		339
339	private static char[] getBaseName(char[] name, char[][] prefixes, char[][] suffixes, boolean isConstant) {	340	private static char[] getBaseName(char[] name, char[][] prefixes, char[][] suffixes, boolean isConstant, boolean updateFirstCharacter) {
340	char[] nameWithoutPrefixAndSiffix = removeVariablePrefixAndSuffix(name, prefixes, suffixes, true);	341	char[] nameWithoutPrefixAndSiffix = removeVariablePrefixAndSuffix(name, prefixes, suffixes, updateFirstCharacter);
341		342
342	char[] baseName;	343	char[] baseName;
343	if (isConstant) {	344	if (isConstant) {