Author: [email protected]
Date: Mon May 11 07:08:30 2009
New Revision: 5328
Modified:
changes/jat/ihm/dev/core/src/com/google/gwt/core/ext/soyc/impl/MemberFactory.java
changes/jat/ihm/dev/core/src/com/google/gwt/core/ext/soyc/impl/StoryRecorderImpl.java
changes/jat/ihm/dev/core/src/com/google/gwt/dev/cfg/ModuleDefSchema.java
changes/jat/ihm/dev/core/src/com/google/gwt/dev/javac/JavaBinary.java
changes/jat/ihm/dev/core/src/com/google/gwt/dev/javac/JavaBinaryOracle.java
changes/jat/ihm/dev/core/src/com/google/gwt/dev/javac/TypeOracleMediator.java
changes/jat/ihm/dev/core/src/com/google/gwt/dev/shell/jetty/JettyLauncher.java
Log:
Fix checkstyle errors.
Modified:
changes/jat/ihm/dev/core/src/com/google/gwt/core/ext/soyc/impl/MemberFactory.java
==============================================================================
---
changes/jat/ihm/dev/core/src/com/google/gwt/core/ext/soyc/impl/MemberFactory.java
(original)
+++
changes/jat/ihm/dev/core/src/com/google/gwt/core/ext/soyc/impl/MemberFactory.java
Mon May 11 07:08:30 2009
@@ -19,7 +19,6 @@
import com.google.gwt.dev.jjs.ast.JDeclaredType;
import com.google.gwt.dev.jjs.ast.JField;
import com.google.gwt.dev.jjs.ast.JMethod;
-import com.google.gwt.dev.jjs.ast.JReferenceType;
import com.google.gwt.dev.js.ast.JsFunction;
import java.lang.reflect.Constructor;
Modified:
changes/jat/ihm/dev/core/src/com/google/gwt/core/ext/soyc/impl/StoryRecorderImpl.java
==============================================================================
---
changes/jat/ihm/dev/core/src/com/google/gwt/core/ext/soyc/impl/StoryRecorderImpl.java
(original)
+++
changes/jat/ihm/dev/core/src/com/google/gwt/core/ext/soyc/impl/StoryRecorderImpl.java
Mon May 11 07:08:30 2009
@@ -31,7 +31,6 @@
import com.google.gwt.dev.jjs.ast.JField;
import com.google.gwt.dev.jjs.ast.JMethod;
import com.google.gwt.dev.jjs.ast.JProgram;
-import com.google.gwt.dev.jjs.ast.JReferenceType;
import com.google.gwt.dev.js.ast.JsFunction;
import com.google.gwt.dev.util.HtmlTextOutput;
import com.google.gwt.util.tools.Utility;
Modified:
changes/jat/ihm/dev/core/src/com/google/gwt/dev/cfg/ModuleDefSchema.java
==============================================================================
---
changes/jat/ihm/dev/core/src/com/google/gwt/dev/cfg/ModuleDefSchema.java
(original)
+++
changes/jat/ihm/dev/core/src/com/google/gwt/dev/cfg/ModuleDefSchema.java
Mon May 11 07:08:30 2009
@@ -150,6 +150,22 @@
return null;
}
+ /**
+ * Indicates which subdirectories contain class files without
+ * necessarily adding a sourcepath entry.
+ */
+ protected Schema __binary_begin(String path, String includes,
+ String excludes, String defaultExcludes, String caseSensitive) {
+ return fChild = new IncludeExcludeSchema();
+ }
+
+ protected void __binary_end(String path, String includes, String
excludes,
+ String defaultExcludes, String caseSensitive) {
+ foundAnyBinary = true;
+ addBinaryPackage(path, includes, excludes, defaultExcludes,
+ caseSensitive);
+ }
+
protected Schema __clear_configuration_property_begin(PropertyName
name)
throws UnableToCompleteException {
// Don't allow configuration properties with the same name as a
@@ -174,22 +190,6 @@
// No children.
return null;
- }
-
- /**
- * Indicates which subdirectories contain class files without
- * necessarily adding a sourcepath entry.
- */
- protected Schema __binary_begin(String path, String includes,
- String excludes, String defaultExcludes, String caseSensitive) {
- return fChild = new IncludeExcludeSchema();
- }
-
- protected void __binary_end(String path, String includes, String
excludes,
- String defaultExcludes, String caseSensitive) {
- foundAnyBinary = true;
- addBinaryPackage(path, includes, excludes, defaultExcludes,
- caseSensitive);
}
protected Schema __define_configuration_property_begin(PropertyName
name,
Modified:
changes/jat/ihm/dev/core/src/com/google/gwt/dev/javac/JavaBinary.java
==============================================================================
--- changes/jat/ihm/dev/core/src/com/google/gwt/dev/javac/JavaBinary.java
(original)
+++ changes/jat/ihm/dev/core/src/com/google/gwt/dev/javac/JavaBinary.java
Mon May 11 07:08:30 2009
@@ -17,7 +17,6 @@
package com.google.gwt.dev.javac;
import com.google.gwt.dev.resource.Resource;
-import com.google.gwt.dev.util.Name.BinaryName;
import java.util.Set;
Modified:
changes/jat/ihm/dev/core/src/com/google/gwt/dev/javac/JavaBinaryOracle.java
==============================================================================
---
changes/jat/ihm/dev/core/src/com/google/gwt/dev/javac/JavaBinaryOracle.java
(original)
+++
changes/jat/ihm/dev/core/src/com/google/gwt/dev/javac/JavaBinaryOracle.java
Mon May 11 07:08:30 2009
@@ -17,7 +17,6 @@
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.dev.resource.Resource;
-import com.google.gwt.dev.util.Name.BinaryName;
import java.util.Map;
import java.util.Set;
Modified:
changes/jat/ihm/dev/core/src/com/google/gwt/dev/javac/TypeOracleMediator.java
==============================================================================
---
changes/jat/ihm/dev/core/src/com/google/gwt/dev/javac/TypeOracleMediator.java
(original)
+++
changes/jat/ihm/dev/core/src/com/google/gwt/dev/javac/TypeOracleMediator.java
Mon May 11 07:08:30 2009
@@ -621,7 +621,7 @@
String prefix = " with args <";
for (JClassType typeArg : typeArgs) {
buf.append(prefix).append(typeArg.getName());
- prefix =", ";
+ prefix = ", ";
}
if (", ".equals(prefix)) {
buf.append('>');
Modified:
changes/jat/ihm/dev/core/src/com/google/gwt/dev/shell/jetty/JettyLauncher.java
==============================================================================
---
changes/jat/ihm/dev/core/src/com/google/gwt/dev/shell/jetty/JettyLauncher.java
(original)
+++
changes/jat/ihm/dev/core/src/com/google/gwt/dev/shell/jetty/JettyLauncher.java
Mon May 11 07:08:30 2009
@@ -263,41 +263,6 @@
*/
protected final class WebAppContextWithReload extends WebAppContext {
- @Override
- public void handle(String target, HttpServletRequest request,
- HttpServletResponse response, int dispatch) throws IOException,
- ServletException {
- super.handle(target, request, response, dispatch);
-
- // Set headers for caching -- unfortunately we can't get the status
- // code from the response, but setting the extra headers on 304s/etc
- // doesn't appear to cause any problems.
- long now = System.currentTimeMillis();
- response.setDateHeader(HttpHeaders.DATE, now);
- if (target.contains(".nocache.")) {
- // nocache is used for the selection script, and should be only
- // privately cached, since it may vary on user-specific data, and
must be
- // revalidated for each use
- response.setHeader(HttpHeaders.CACHE_CONTROL,
- HttpHeaders.CACHE_CONTROL_PRIVATE + ", "
- + HttpHeaders.CACHE_CONTROL_MAXAGE + "0, "
- + HttpHeaders.CACHE_CONTROL_MUST_REVALIDATE);
- // Set expires to the same as Date to disable old proxy caches
- response.setDateHeader(HttpHeaders.EXPIRES, now);
- } else if (target.contains(".cache.")) {
- // cache files should be cached for anyone forever (ie, 1 year)
- response.setHeader("Cache-Control", "public, max-age=31536000");
- response.setDateHeader(HttpHeaders.EXPIRES, now + 31536000000L);
- } else {
- // everything else gets public caching for 60 seconds
- response.setHeader(HttpHeaders.CACHE_CONTROL,
- HttpHeaders.CACHE_CONTROL_PUBLIC + ", "
- + HttpHeaders.CACHE_CONTROL_MAXAGE + "60");
- // Set expires to the same as Date to disable old proxy caches
- response.setDateHeader(HttpHeaders.EXPIRES, now + 6000);
- }
- }
-
/**
* Specialized {...@link WebAppClassLoader} that allows outside resources
to be
* brought in dynamically from the system path. A warning is issued
when
@@ -449,6 +414,41 @@
// Since the parent class loader is bootstrap-only, prefer it first.
setParentLoaderPriority(true);
+ }
+
+ @Override
+ public void handle(String target, HttpServletRequest request,
+ HttpServletResponse response, int dispatch) throws IOException,
+ ServletException {
+ super.handle(target, request, response, dispatch);
+
+ // Set headers for caching -- unfortunately we can't get the status
+ // code from the response, but setting the extra headers on 304s/etc
+ // doesn't appear to cause any problems.
+ long now = System.currentTimeMillis();
+ response.setDateHeader(HttpHeaders.DATE, now);
+ if (target.contains(".nocache.")) {
+ // nocache is used for the selection script, and should be only
+ // privately cached, since it may vary on user-specific data, and
must be
+ // revalidated for each use
+ response.setHeader(HttpHeaders.CACHE_CONTROL,
+ HttpHeaders.CACHE_CONTROL_PRIVATE + ", "
+ + HttpHeaders.CACHE_CONTROL_MAXAGE + "0, "
+ + HttpHeaders.CACHE_CONTROL_MUST_REVALIDATE);
+ // Set expires to the same as Date to disable old proxy caches
+ response.setDateHeader(HttpHeaders.EXPIRES, now);
+ } else if (target.contains(".cache.")) {
+ // cache files should be cached for anyone forever (ie, 1 year)
+ response.setHeader("Cache-Control", "public, max-age=31536000");
+ response.setDateHeader(HttpHeaders.EXPIRES, now + 31536000000L);
+ } else {
+ // everything else gets public caching for 60 seconds
+ response.setHeader(HttpHeaders.CACHE_CONTROL,
+ HttpHeaders.CACHE_CONTROL_PUBLIC + ", "
+ + HttpHeaders.CACHE_CONTROL_MAXAGE + "60");
+ // Set expires to the same as Date to disable old proxy caches
+ response.setDateHeader(HttpHeaders.EXPIRES, now + 6000);
+ }
}
@Override
--~--~---------~--~----~------------~-------~--~----~
http://groups.google.com/group/Google-Web-Toolkit-Contributors
-~----------~----~----~----~------~----~------~--~---
