From d03905c62d9ed15f9825fc7e82ad3f5a9025c794 Mon Sep 17 00:00:00 2001 From: Emanuel Graf Date: Tue, 6 Jul 2010 11:19:16 +0000 Subject: [PATCH] Bug 318726: Weird name for methods when using generates getter and setters on variable "ID" https://bugs.eclipse.org/bugs/show_bug.cgi?id=318726 --- .../cdt/ui/tests/refactoring/utils/NameHelperTest.java | 8 ++++++++ .../cdt/internal/ui/refactoring/utils/NameHelper.java | 7 ++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/utils/NameHelperTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/utils/NameHelperTest.java index 76b74ee4b69..937d9b038cb 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/utils/NameHelperTest.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/utils/NameHelperTest.java @@ -38,6 +38,8 @@ public class NameHelperTest extends TestCase { assertEquals("O__b", NameHelper.trimFieldName("fO__b")); assertEquals("Oo", NameHelper.trimFieldName("fOo")); assertEquals("O", NameHelper.trimFieldName("fO")); + assertEquals("MyStatic", NameHelper.trimFieldName("sMyStatic")); + assertEquals("MyMember", NameHelper.trimFieldName("mMyMember")); assertEquals("8", NameHelper.trimFieldName("_8")); @@ -45,6 +47,12 @@ public class NameHelperTest extends TestCase { assertEquals("8bar_8", NameHelper.trimFieldName("_8bar_8")); assertEquals("8bAr", NameHelper.trimFieldName("_8bAr")); assertEquals("b8Ar", NameHelper.trimFieldName("_b8Ar")); + + assertEquals("Id", NameHelper.trimFieldName("Id")); + assertEquals("ID", NameHelper.trimFieldName("ID")); + assertEquals("IDS", NameHelper.trimFieldName("IDS")); + assertEquals("ID", NameHelper.trimFieldName("bID")); + assertEquals("IdA", NameHelper.trimFieldName("IdA")); } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/NameHelper.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/NameHelper.java index f0d1ddc94ff..9e4999c2b38 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/NameHelper.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/NameHelper.java @@ -114,7 +114,12 @@ public class NameHelper { } lookAhead++; } - } else if (start + 1 <= end && Character.isUpperCase(letters[start + 1])) { + + } + // Sometimes, a one letter lower case prefix is used to add some info + // Example: mMyMember, sMyStatic + // Trim the first letter + else if (!Character.isUpperCase(letters[start]) && start + 1 <= end && Character.isUpperCase(letters[start + 1])) { start++; }