Update to 1.5 to remove gwt.typeArgs warnings.
git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@1908 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/user/test/com/google/gwt/user/client/rpc/CollectionsTestService.java b/user/test/com/google/gwt/user/client/rpc/CollectionsTestService.java
index cd739ad..2f5d054 100644
--- a/user/test/com/google/gwt/user/client/rpc/CollectionsTestService.java
+++ b/user/test/com/google/gwt/user/client/rpc/CollectionsTestService.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2007 Google Inc.
+ * Copyright 2008 Google Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
@@ -40,11 +40,8 @@
}
}
- /**
- * @gwt.typeArgs value <com.google.gwt.user.client.rpc.IsSerializable>
- * @gwt.typeArgs <com.google.gwt.user.client.rpc.IsSerializable>
- */
- ArrayList echo(ArrayList value) throws CollectionsTestServiceException;
+ ArrayList<IsSerializable> echo(ArrayList<IsSerializable> value)
+ throws CollectionsTestServiceException;
boolean[] echo(boolean[] value) throws CollectionsTestServiceException;
@@ -68,19 +65,11 @@
Float[] echo(Float[] value) throws CollectionsTestServiceException;
- /**
- * @gwt.typeArgs value <java.lang.String,
- * com.google.gwt.user.client.rpc.IsSerializable>
- * @gwt.typeArgs <java.lang.String,
- * com.google.gwt.user.client.rpc.IsSerializable>
- */
- HashMap echo(HashMap value) throws CollectionsTestServiceException;
+ HashMap<String, IsSerializable> echo(HashMap<String, IsSerializable> value)
+ throws CollectionsTestServiceException;
- /**
- * @gwt.typeArgs value <com.google.gwt.user.client.rpc.IsSerializable>
- * @gwt.typeArgs <com.google.gwt.user.client.rpc.IsSerializable>
- */
- HashSet echo(HashSet value) throws CollectionsTestServiceException;
+ HashSet<IsSerializable> echo(HashSet<IsSerializable> value)
+ throws CollectionsTestServiceException;
int[] echo(int[] value) throws CollectionsTestServiceException;
@@ -98,18 +87,8 @@
String[][] echo(String[][] value) throws CollectionsTestServiceException;
- /**
- * @gwt.typeArgs value <com.google.gwt.user.client.rpc.IsSerializable>
- * @gwt.typeArgs <com.google.gwt.user.client.rpc.IsSerializable>
- */
- Vector echo(Vector value) throws CollectionsTestServiceException;
+ Vector<IsSerializable> echo(Vector<IsSerializable> value)
+ throws CollectionsTestServiceException;
- /**
- * This method is used to test that trying to return Arrays.asList will result
- * in an InvocationException on the client.
- *
- * @gwt.typeArgs value <java.lang.Byte>
- * @gwt.typeArgs <java.lang.Byte>
- */
- List getArraysAsList(List value);
+ List<IsSerializable> getArraysAsList(List<IsSerializable> value);
}
diff --git a/user/test/com/google/gwt/user/client/rpc/CollectionsTestServiceAsync.java b/user/test/com/google/gwt/user/client/rpc/CollectionsTestServiceAsync.java
index 103e0ee..9a2a011 100644
--- a/user/test/com/google/gwt/user/client/rpc/CollectionsTestServiceAsync.java
+++ b/user/test/com/google/gwt/user/client/rpc/CollectionsTestServiceAsync.java
@@ -26,51 +26,56 @@
* TODO: document me.
*/
public interface CollectionsTestServiceAsync {
- void echo(ArrayList value, AsyncCallback callback);
+ void echo(ArrayList<IsSerializable> value,
+ AsyncCallback<ArrayList<IsSerializable>> callback);
- void echo(boolean[] value, AsyncCallback callback);
+ void echo(boolean[] value, AsyncCallback<boolean[]> callback);
- void echo(Boolean[] value, AsyncCallback callback);
+ void echo(Boolean[] value, AsyncCallback<Boolean[]> callback);
- void echo(byte[] value, AsyncCallback callback);
+ void echo(byte[] value, AsyncCallback<byte[]> callback);
- void echo(Byte[] value, AsyncCallback callback);
+ void echo(Byte[] value, AsyncCallback<Byte[]> callback);
- void echo(char[] value, AsyncCallback callback);
+ void echo(char[] value, AsyncCallback<char[]> callback);
- void echo(Character[] value, AsyncCallback callback);
+ void echo(Character[] value, AsyncCallback<Character[]> callback);
- void echo(Date[] date, AsyncCallback callback);
+ void echo(Date[] date, AsyncCallback<Date[]> callback);
- void echo(double[] value, AsyncCallback callback);
+ void echo(double[] value, AsyncCallback<double[]> callback);
- void echo(Double[] value, AsyncCallback callback);
+ void echo(Double[] value, AsyncCallback<Double[]> callback);
- void echo(float[] value, AsyncCallback callback);
+ void echo(float[] value, AsyncCallback<float[]> callback);
- void echo(Float[] value, AsyncCallback callback);
+ void echo(Float[] value, AsyncCallback<Float[]> callback);
- void echo(HashMap value, AsyncCallback callback);
+ void echo(HashMap<String, IsSerializable> value,
+ AsyncCallback<HashMap<String, IsSerializable>> callback);
- void echo(HashSet value, AsyncCallback callback);
+ void echo(HashSet<IsSerializable> value,
+ AsyncCallback<HashSet<IsSerializable>> callback);
- void echo(int[] value, AsyncCallback callback);
+ void echo(int[] value, AsyncCallback<int[]> callback);
- void echo(Integer[] value, AsyncCallback callback);
+ void echo(Integer[] value, AsyncCallback<Integer[]> callback);
- void echo(long[] value, AsyncCallback callback);
+ void echo(long[] value, AsyncCallback<long[]> callback);
- void echo(Long[] value, AsyncCallback callback);
+ void echo(Long[] value, AsyncCallback<Long[]> callback);
- void echo(short[] value, AsyncCallback callback);
+ void echo(short[] value, AsyncCallback<short[]> callback);
- void echo(Short[] value, AsyncCallback callback);
+ void echo(Short[] value, AsyncCallback<Short[]> callback);
- void echo(String[] value, AsyncCallback callback);
+ void echo(String[] value, AsyncCallback<String[]> callback);
- void echo(String[][] value, AsyncCallback callback);
+ void echo(String[][] value, AsyncCallback<String[][]> callback);
- void echo(Vector value, AsyncCallback callback);
+ void echo(Vector<IsSerializable> value,
+ AsyncCallback<Vector<IsSerializable>> callback);
- void getArraysAsList(List value, AsyncCallback callback);
+ void getArraysAsList(List<IsSerializable> value,
+ AsyncCallback<List<IsSerializable>> callback);
}
