adjust generics

diff --git a/gwtquery-core/src/main/java/com/google/gwt/query/client/Binder.java b/gwtquery-core/src/main/java/com/google/gwt/query/client/Binder.java
index 2f0e47e546cc2eef1e30116134149d291cebfca9..852a3c416f11bcd4925f03ce88b865da2123389d 100644 (file)
--- a/gwtquery-core/src/main/java/com/google/gwt/query/client/Binder.java
+++ b/gwtquery-core/src/main/java/com/google/gwt/query/client/Binder.java
@@ -25,18 +25,18 @@ public interface Binder {
   /**
    * load a properties object.
    */
-  <J> J load(Object prp);
+  <T extends Binder> T load(Object prp);
 
   /**
    * parses a json string and loads the resulting properties object.
    */
-  <J> J parse(String json);
+  <T extends Binder> T parse(String json);
 
   /**
    * Returns the underlying object, normally a Properties jso in client
    * and a Json implementation in JVM.
    */
-  <J> J getBound();
+  <T> T getBound();
   
   /**
    * Return the Object with the given key.
@@ -46,7 +46,7 @@ public interface Binder {
   /**
    * Set an Object with the given key.
    */
-  <T> T set(Object key, Object val);
+  <T extends Binder> T set(Object key, Object val);
 
   /**
    * return a list of field names.

diff --git a/gwtquery-core/src/main/java/com/google/gwt/query/client/Properties.java b/gwtquery-core/src/main/java/com/google/gwt/query/client/Properties.java
index 60ac6a6b8e6e9c6c7012b1a7a5e18f55d191b99b..d24a7f985967705fc427503c069f5f3c83ed1d03 100644 (file)
--- a/gwtquery-core/src/main/java/com/google/gwt/query/client/Properties.java
+++ b/gwtquery-core/src/main/java/com/google/gwt/query/client/Properties.java
@@ -202,7 +202,7 @@ public class Properties extends JavaScriptObject implements Binder {
     return c().length() == 0;
   }
 
-  public final <J> J load(Object prp) {
+  public final <J extends Binder> J load(Object prp) {
     c().clear();
     if (prp instanceof JsCache) {
       c().copy((JsCache)prp);
@@ -210,7 +210,7 @@ public class Properties extends JavaScriptObject implements Binder {
     return getBound();
   }
 
-  public final <J> J parse(String json) {
+  public final <J extends Binder> J parse(String json) {
     return load(JsUtils.parseJSON(json));
   }
 

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 40dbdae75e1ecb7a481c8fb1fac4cfec62ee162c..cfa7729601fa80abe559d8bbaec0ac2603b7bc4a 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
@@ -123,7 +123,7 @@ public abstract class JsonBuilderBase<J extends JsonBuilderBase<?>> implements J
   }
   
   @SuppressWarnings("unchecked")
-  public <T> T set(Object key, Object val) {
+  public <T extends Binder> T set(Object key, Object val) {
     if (val instanceof Binder) {
       p.set(key, ((Binder)val).getBound());
     } else {