Dont change name annotation names. Fixes issue #230

diff --git a/gwtquery-core/src/main/java/com/google/gwt/query/rebind/JsonBuilderGenerator.java b/gwtquery-core/src/main/java/com/google/gwt/query/rebind/JsonBuilderGenerator.java
index 50d609f431bdc63e72d8c7e5a64dc7566a5ef97b..717fee325634dc130785956797d9d83d2275a2c8 100644 (file)
--- a/gwtquery-core/src/main/java/com/google/gwt/query/rebind/JsonBuilderGenerator.java
+++ b/gwtquery-core/src/main/java/com/google/gwt/query/rebind/JsonBuilderGenerator.java
@@ -95,7 +95,9 @@ public class JsonBuilderGenerator extends Generator {
         String name = nameAnnotation != null
           ? nameAnnotation.value()
           : methName.replaceFirst("^(get|set)", "");
-        name = name.substring(0, 1).toLowerCase() + name.substring(1);
+        if (nameAnnotation != null) {
+          name = name.substring(0, 1).toLowerCase() + name.substring(1);
+        }
         attrs.add(name);
         generateMethod(sw, method, name, treeLogger);
       }

diff --git a/gwtquery-core/src/main/java/com/google/gwt/query/rebind/XmlBuilderGenerator.java b/gwtquery-core/src/main/java/com/google/gwt/query/rebind/XmlBuilderGenerator.java
index 1c70815bd6569348de7e2fd9a586b93c6f78b4c9..e8bc27c09abdd8653036e1776561c65bb902e319 100644 (file)
--- a/gwtquery-core/src/main/java/com/google/gwt/query/rebind/XmlBuilderGenerator.java
+++ b/gwtquery-core/src/main/java/com/google/gwt/query/rebind/XmlBuilderGenerator.java
@@ -83,7 +83,11 @@ public class XmlBuilderGenerator extends Generator {
       throws UnableToCompleteException {
     Name nameAnnotation = method.getAnnotation(Name.class);
     String name = nameAnnotation != null ? nameAnnotation.value()
-        : method.getName().replaceFirst("^(get|set)", "").toLowerCase();
+        : method.getName().replaceFirst("^(get|set)", "");
+
+    if (nameAnnotation != null) {
+      name = name.substring(0, 1).toLowerCase() + name.substring(1);
+    }
 
     String retType = method.getReturnType().getParameterizedQualifiedSourceName();