Use getName makes more sense

diff --git a/gwtquery-core/src/main/java/com/google/gwt/query/client/builders/JsonBuilder.java b/gwtquery-core/src/main/java/com/google/gwt/query/client/builders/JsonBuilder.java
index 887695d34b8342583593a20db56e26c775af769b..6508d3009b812198ae5231f849bbe2c9e5f9229c 100644 (file)
--- a/gwtquery-core/src/main/java/com/google/gwt/query/client/builders/JsonBuilder.java
+++ b/gwtquery-core/src/main/java/com/google/gwt/query/client/builders/JsonBuilder.java
@@ -38,8 +38,7 @@ public interface JsonBuilder extends Binder {
   <J> J getProperties();
 
   /**
-   * return the Json name for this class
-   * @deprecated use getName() instead;
+   * return the short name of this class, to use in json structures.
    */
-  String getJsonName();
+  String getName();
 }

diff --git a/gwtquery-core/src/main/java/com/google/gwt/query/client/builders/JsonBuilderBase.java b/gwtquery-core/src/main/java/com/google/gwt/query/client/builders/JsonBuilderBase.java
index 4ec95de8e9008d45cb22e8d150d32fa197ddfe98..af3a5128047efbf2f983749072f86365b6e9af2b 100644 (file)
--- a/gwtquery-core/src/main/java/com/google/gwt/query/client/builders/JsonBuilderBase.java
+++ b/gwtquery-core/src/main/java/com/google/gwt/query/client/builders/JsonBuilderBase.java
@@ -91,6 +91,11 @@ public abstract class JsonBuilderBase<J extends JsonBuilderBase<?>> implements J
     return p.tostring();
   }
 
+  @Override
+  public String toJson() {
+    return "{\"" + getName() + "\":" + p.tostring() + "}";
+  }
+
   @SuppressWarnings("unchecked")
   @Override
   public Properties getProperties() {
@@ -102,11 +107,6 @@ public abstract class JsonBuilderBase<J extends JsonBuilderBase<?>> implements J
     return p.toQueryString();
   }
   
-  @Override
-  public String getName() {
-    return getJsonName();
-  }
-  
   @SuppressWarnings("unchecked")
   @Override
   public Properties getBound() {

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 8a45c6f98a583a58dae1d1b3d142cea8d5c63ce1..8c9c74082d692b104e98ff538d5cb193ebe7acc6 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
@@ -270,7 +270,7 @@ public class JsonBuilderGenerator extends Generator {
 
   public void generateToJsonMethod(SourceWriter sw, String name, TreeLogger logger) {
     sw.println("public final String getJsonName() {return \"" + name + "\";}");
-    sw.println("public final String toJson() {return \"{\\\"\" + getJsonName() + \"\\\":\" + toString() + \"}\";}");
+    sw.println("public final String getName() {return \"" + name + "\";}");
   }
 
   protected SourceWriter getSourceWriter(TreeLogger logger,