Revision: 7265
Author: [email protected]
Date: Mon Dec 7 15:50:49 2009
Log: Merge trunk r7264 into this branch
Javadoc fixes for deRPC.
svn merge --ignore-ancestry -c7264 \
https://google-web-toolkit.googlecode.com/svn/trunk/ .
http://code.google.com/p/google-web-toolkit/source/detail?r=7265
Modified:
/releases/2.0/branch-info.txt
/releases/2.0/doc/build.xml
/releases/2.0/user/src/com/google/gwt/rpc/server/ClientOracle.java
/releases/2.0/user/src/com/google/gwt/rpc/server/RpcServlet.java
=======================================
--- /releases/2.0/branch-info.txt Fri Dec 4 14:47:49 2009
+++ /releases/2.0/branch-info.txt Mon Dec 7 15:50:49 2009
@@ -1200,3 +1200,7 @@
Fixes a bug in recursive unit invalidation.
svn merge --ignore-ancestry -c7258
https://google-web-toolkit.googlecode.com/svn/trunk/ .
+tr...@7264 was merged into this branch
+ Javadoc fixes for deRPC.
+ svn merge --ignore-ancestry -c7264 \
+ https://google-web-toolkit.googlecode.com/svn/trunk/ .
=======================================
--- /releases/2.0/doc/build.xml Fri Dec 4 11:46:24 2009
+++ /releases/2.0/doc/build.xml Mon Dec 7 15:50:49 2009
@@ -10,7 +10,7 @@
<property.ensure name="gwt.dev.jar"
location="${gwt.build.lib}/gwt-dev.jar" />
<property name="USER_PKGS"
-
value="com.google.gwt.animation.client;com.google.gwt.benchmarks.client;com.google.gwt.core.client;com.google.gwt.core.ext;com.google.gwt.core.ext.soyc;com.google.gwt.core.ext.linker;com.google.gwt.core.ext.typeinfo;com.google.gwt.core.linker;com.google.gwt.debug.client;com.google.gwt.dom.client;com.google.gwt.event.dom.client;com.google.gwt.event.logical.shared;com.google.gwt.event.shared;com.google.gwt.http.client;com.google.gwt.i18n.client;com.google.gwt.i18n.shared;com.google.gwt.i18n.client.constants;com.google.gwt.i18n.rebind.format;com.google.gwt.i18n.rebind.keygen;com.google.gwt.json.client;com.google.gwt.junit.client;com.google.gwt.benchmarks.client;com.google.gwt.resources.client;com.google.gwt.resources.ext;com.google.gwt.user.client;com.google.gwt.user.client.rpc;com.google.gwt.user.client.ui;com.google.gwt.user.datepicker.client;com.google.gwt.user.server.rpc;com.google.gwt.xml.client;com.google.gwt.uibinder.client"/>
+
value="com.google.gwt.animation.client;com.google.gwt.benchmarks.client;com.google.gwt.core.client;com.google.gwt.core.ext;com.google.gwt.core.ext.soyc;com.google.gwt.core.ext.linker;com.google.gwt.core.ext.typeinfo;com.google.gwt.core.linker;com.google.gwt.debug.client;com.google.gwt.dom.client;com.google.gwt.event.dom.client;com.google.gwt.event.logical.shared;com.google.gwt.event.shared;com.google.gwt.http.client;com.google.gwt.i18n.client;com.google.gwt.i18n.shared;com.google.gwt.i18n.client.constants;com.google.gwt.i18n.rebind.format;com.google.gwt.i18n.rebind.keygen;com.google.gwt.json.client;com.google.gwt.junit.client;com.google.gwt.benchmarks.client;com.google.gwt.resources.client;com.google.gwt.resources.ext;com.google.gwt.user.client;com.google.gwt.user.client.rpc;com.google.gwt.user.client.ui;com.google.gwt.user.datepicker.client;com.google.gwt.user.server.rpc;com.google.gwt.xml.client;com.google.gwt.uibinder.client;com.google.gwt.rpc.client;com.google.gwt.rpc.server"/>
<property name="LANG_PKGS"
value="java.lang;java.lang.annotation;java.util;java.io;java.sql" />
<!-- Individual classes to include when we don't want to
=======================================
--- /releases/2.0/user/src/com/google/gwt/rpc/server/ClientOracle.java Mon
Nov 2 12:44:54 2009
+++ /releases/2.0/user/src/com/google/gwt/rpc/server/ClientOracle.java Mon
Dec 7 15:50:49 2009
@@ -72,7 +72,7 @@
* Return the name of a field from a client-side id. This will search
* superclasses for the first instance of the named field.
*
- * @returns The field's declaring class and the name of the field
+ * @return The field's declaring class and the name of the field
*/
public abstract Pair<Class<?>, String> getFieldName(Class<?> clazz,
String fieldId);
=======================================
--- /releases/2.0/user/src/com/google/gwt/rpc/server/RpcServlet.java Mon
Nov 2 12:44:54 2009
+++ /releases/2.0/user/src/com/google/gwt/rpc/server/RpcServlet.java Mon
Dec 7 15:50:49 2009
@@ -263,7 +263,7 @@
* @return the module's base path, modulo protocol and host, as reported
by
* {...@link com.google.gwt.core.client.GWT#getModuleBaseURL()} or
* <code>null</code> if the request did not contain the
- * {...@value #MODULE_BASE_HEADER} header
+ * {...@value
com.google.gwt.user.client.rpc.RpcRequestBuilder#MODULE_BASE_HEADER} header
*/
protected final String getRequestModuleBasePath() {
try {
--
http://groups.google.com/group/Google-Web-Toolkit-Contributors
