Revert "Remove rebasing for guava, closure and gss & upgrade versions."
This reverts commit 77c7d4ca9ec36f76656c4d1d6119af38b269be5f.
Change-Id: I038e1739b9b6ba136210fae4a3ed926a8e3d8fb8
diff --git a/dev/BUILD b/dev/BUILD
index 827ec30..33e8828 100644
--- a/dev/BUILD
+++ b/dev/BUILD
@@ -123,29 +123,6 @@
wrap_javalibrary = 0,
)
-GUAVA_DEPS = [
- "//java/com/google/common/annotations",
- "//java/com/google/common/base",
- "//java/com/google/common/cache",
- "//java/com/google/common/collect",
- "//java/com/google/common/hash",
- "//java/com/google/common/io",
- "//java/com/google/common/primitives",
- "//java/com/google/common/util/concurrent",
-]
-
-JS_COMP_DEPS = [
- "//java/com/google/javascript/jscomp",
- "//third_party/java/rhino_ast/java/com/google/javascript/rhino",
- "//third_party/java_src/jscomp/java/com/google/debugging/sourcemap:common",
- "//third_party/java_src/jscomp/java/com/google/debugging/sourcemap:shared",
-]
-
-PROTO_DEPS = [
- "//java/com/google/protobuf",
- "//java/com/google/protobuf:protobuf_lite",
-]
-
# The gwt-dev classes for GWT internal use only.
# They must be jarjar-ed and dependencies stripped before exposing to google3.
java_library(
@@ -156,10 +133,9 @@
),
deps = [
":compiler.standalone.super",
- "//third_party/java_src/gwt/svn/tools:compiler_deps",
"//third_party/java_src/gwt/svn/tools:dev_deps",
"//third_party/java_src/gwt/svn/tools:servlet_api_3",
- ] + GUAVA_DEPS + JS_COMP_DEPS + PROTO_DEPS,
+ ],
)
# Resource files in core/src.
@@ -228,7 +204,7 @@
deps = [
":compiler.standalone.super",
"//third_party/java_src/gwt/svn/tools:compiler_deps",
- ] + GUAVA_DEPS + JS_COMP_DEPS,
+ ],
)
# This is a bootstrap library; it will later be stripped out of the classpath
@@ -322,10 +298,9 @@
deps = [
":compiler.standalone.super",
":gwt-dev-bare",
- "//third_party/java/gson",
"//third_party/java/junit",
"//third_party/java_src/gwt/svn/tools:dev_deps",
- ] + GUAVA_DEPS + JS_COMP_DEPS,
+ ],
)
# The "dev" directory is tested by loose tests. Some of them fail because of
diff --git a/dev/build.xml b/dev/build.xml
index 199b041..3650c04 100755
--- a/dev/build.xml
+++ b/dev/build.xml
@@ -36,7 +36,7 @@
excludes="**/super/**">
<classpath>
<pathelement location="${javac.out}"/>
- <pathelement location="${gwt.tools.lib}/gss/2015-02-13/closure-stylesheets-library-20150213.jar"/>
+ <pathelement location="${gwt.tools.lib}/gss/2014-09-11/closure-stylesheets-rebased.jar"/>
<pathelement location="${gwt.tools.lib}/junit/junit-4.8.2.jar"/>
<pathelement location="${gwt.tools.lib}/selenium/selenium-java-client-driver.jar"/>
<pathelement location="${gwt.tools.lib}/w3c/sac/sac-1.3.jar"/>
@@ -46,7 +46,7 @@
<pathelement
location="${gwt.tools.lib}/javax/validation/validation-api-1.0.0.GA.jar"/>
<pathelement
- location="${gwt.tools.lib}/streamhtmlparser/streamhtmlparser-jsilver-r10/streamhtmlparser-jsilver-r10-1.5.jar"/>
+ location="${gwt.tools.lib}/streamhtmlparser/streamhtmlparser-jsilver-r10/streamhtmlparser-jsilver-r10-1.5-rebased.jar"/>
<pathelement location="${gwt.build.lib}/gwt-dev-${build.host.platform}.jar"/>
<pathelement location="${alldeps.jar}"/>
</classpath>
@@ -65,13 +65,14 @@
<include name="eclipse/org.eclipse.jdt.core_3.11.0.v20150126-2015.jar"/>
<include name="eclipse/jdtCompilerAdapter_3.11.0.v20150126-2015.jar"/>
<include name="objectweb/asm-5.0.3/lib/asm-all-5.0.3.jar"/>
- <include name="guava/guava-18.0/guava-18.0.jar"/>
+ <include name="guava/guava-16.0.1/guava-16.0.1-rebased.jar"/>
<include name="icu4j/50.1.1/icu4j.jar"/>
<include name="jetty/jetty-8.1.12.v20130726/jetty-8.1.12.v20130726.jar"/>
<include name="jetty/jetty-8.1.12.v20130726/servlet-api-3.0-NoMetaInf.jar"/>
- <include name="jscomp/20150201/compiler-stripped.jar"/>
+ <include name="jscomp/20131118.json.rebased/compiler-rebased.jar"/>
+ <include name="jscomp/20131118.json.rebased/sourcemap-rebased.jar"/>
<include name="jsr305/jsr305.jar"/>
- <include name="protobuf/protobuf-2.5.0/protobuf-java-2.5.0.jar"/>
+ <include name="protobuf/protobuf-2.5.0/protobuf-java-rebased-2.5.0.jar"/>
<!-- dependencies needed for JSP support in DevMode: BEGIN -->
<include name="tomcat/commons-el-1.0.jar"/>
<include name="tomcat/jasper-compiler-1.0.jar"/>
@@ -116,16 +117,17 @@
src="${gwt.tools.lib}/eclipse/org.eclipse.jdt.core_3.11.0.v20150126-2015.jar"/>
<zipfileset
src="${gwt.tools.lib}/eclipse/jdtCompilerAdapter_3.11.0.v20150126-2015.jar"/>
- <zipfileset src="${gwt.tools.lib}/guava/guava-18.0/guava-18.0.jar"/>
+ <zipfileset src="${gwt.tools.lib}/guava/guava-16.0.1/guava-16.0.1-rebased.jar"/>
<zipfileset src="${gwt.tools.lib}/icu4j/50.1.1/icu4j.jar"/>
<zipfileset
src="${gwt.tools.lib}/jetty/jetty-8.1.12.v20130726/jetty-8.1.12.v20130726.jar"/>
<zipfileset
src="${gwt.tools.lib}/jetty/jetty-8.1.12.v20130726/servlet-api-3.0-NoMetaInf.jar"/>
- <zipfileset src="${gwt.tools.lib}/jscomp/20150201/compiler-stripped.jar"/>
+ <zipfileset src="${gwt.tools.lib}/jscomp/20131118.json.rebased/compiler-rebased.jar"/>
+ <zipfileset src="${gwt.tools.lib}/jscomp/20131118.json.rebased/sourcemap-rebased.jar"/>
<zipfileset src="${gwt.tools.lib}/jsr305/jsr305.jar"/>
<zipfileset
- src="${gwt.tools.lib}/protobuf/protobuf-2.5.0/protobuf-java-2.5.0.jar"/>
+ src="${gwt.tools.lib}/protobuf/protobuf-2.5.0/protobuf-java-rebased-2.5.0.jar"/>
<!-- dependencies needed for JSP support in DevMode: BEGIN -->
<zipfileset src="${gwt.tools.lib}/tomcat/commons-el-1.0.jar"/>
<zipfileset src="${gwt.tools.lib}/tomcat/jasper-compiler-1.0.jar"/>
@@ -203,12 +205,13 @@
<pathelement
location="${gwt.tools.lib}/eclipse/jdtCompilerAdapter_3.11.0.v20150126-2015.jar"/>
<pathelement
- location="${gwt.tools.lib}/guava/guava-18.0/guava-18.0.jar"/>
- <pathelement location="${gwt.tools.lib}/jscomp/20150201/compiler-stripped.jar"/>
+ location="${gwt.tools.lib}/guava/guava-16.0.1/guava-16.0.1-rebased.jar"/>
+ <pathelement location="${gwt.tools.lib}/jscomp/20131118.json.rebased/compiler-rebased.jar"/>
+ <pathelement location="${gwt.tools.lib}/jscomp/20131118.json.rebased/sourcemap-rebased.jar"/>
<pathelement location="${gwt.tools.lib}/json/android-sdk-19.1/json-android-rebased.jar"/>
<pathelement location="${gwt.tools.lib}/jsr305/jsr305.jar"/>
<pathelement
- location="${gwt.tools.lib}/protobuf/protobuf-2.5.0/protobuf-java-2.5.0.jar"/>
+ location="${gwt.tools.lib}/protobuf/protobuf-2.5.0/protobuf-java-rebased-2.5.0.jar"/>
</classpath>
</gwt.javac>
</target>
@@ -305,7 +308,7 @@
<pathelement location="${gwt.root}/samples/hello/src/"/>
<!-- CompilerTest needs the dependecies to compile a project that uses UiBinder. -->
<pathelement location="${gwt.tools.lib}/gss/2014-09-11/closure-stylesheets-rebased.jar"/>
- <pathelement location="${gwt.tools.lib}/streamhtmlparser/streamhtmlparser-jsilver-r10/streamhtmlparser-jsilver-r10-1.5.jar"/>
+ <pathelement location="${gwt.tools.lib}/streamhtmlparser/streamhtmlparser-jsilver-r10/streamhtmlparser-jsilver-r10-1.5-rebased.jar"/>
</extraclasspaths>
</gwt.junit>
</target>
@@ -346,4 +349,3 @@
</outofdate>
</target>
</project>
-
diff --git a/dev/codeserver/BUILD b/dev/codeserver/BUILD
index fd13dd0..2364dae 100644
--- a/dev/codeserver/BUILD
+++ b/dev/codeserver/BUILD
@@ -34,15 +34,10 @@
"java/**/*.js",
]),
deps = [
- "//java/com/google/common/base",
- "//java/com/google/common/collect",
- "//java/com/google/common/io",
- "//java/com/google/common/util/concurrent",
# dependencies for open source code (should match ant)
"//third_party/java_src/gwt/svn/trunk/dev:gwt-dev-bare",
"//third_party/java_src/gwt/svn/tools:dev_deps",
"//third_party/java_src/gwt/svn/tools:servlet_api_3",
- "//third_party/java_src/jscomp/java/com/google/debugging/sourcemap:common",
],
)
@@ -52,10 +47,7 @@
srcs = glob(["javatests/**/*.java"]),
deps = [
":codeserver-bare",
- "//java/com/google/common/base",
"//java/com/google/common/collect",
- "//java/com/google/common/io",
- "//java/com/google/common/util/concurrent",
"//third_party/java/junit",
"//third_party/java_src/gwt",
"//third_party/java_src/gwt/svn/tools:dev_deps",
@@ -98,11 +90,6 @@
constraints = [],
dojarjar = 1,
export_deps = [
- "//java/com/google/common/base",
- "//java/com/google/common/cache",
- "//java/com/google/common/collect",
- "//java/com/google/common/io",
- "//java/com/google/common/util/concurrent",
# Dependencies for google3 (after jarjar).
"//third_party/java_src/gwt:gwt-dev",
"//third_party/java_src/gwt:gwt-dev-private",
diff --git a/dev/codeserver/java/com/google/gwt/dev/codeserver/CompileDir.java b/dev/codeserver/java/com/google/gwt/dev/codeserver/CompileDir.java
index af101c9..54d8f3c 100644
--- a/dev/codeserver/java/com/google/gwt/dev/codeserver/CompileDir.java
+++ b/dev/codeserver/java/com/google/gwt/dev/codeserver/CompileDir.java
@@ -16,12 +16,12 @@
package com.google.gwt.dev.codeserver;
-import com.google.common.base.Charsets;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Lists;
-import com.google.common.io.Files;
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.core.ext.UnableToCompleteException;
+import com.google.gwt.thirdparty.guava.common.base.Charsets;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableList;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
+import com.google.gwt.thirdparty.guava.common.io.Files;
import java.io.File;
import java.io.FilenameFilter;
diff --git a/dev/codeserver/java/com/google/gwt/dev/codeserver/CompilerOptionsImpl.java b/dev/codeserver/java/com/google/gwt/dev/codeserver/CompilerOptionsImpl.java
index 702c1bc..0f93422 100644
--- a/dev/codeserver/java/com/google/gwt/dev/codeserver/CompilerOptionsImpl.java
+++ b/dev/codeserver/java/com/google/gwt/dev/codeserver/CompilerOptionsImpl.java
@@ -16,9 +16,6 @@
package com.google.gwt.dev.codeserver;
-import com.google.common.collect.LinkedListMultimap;
-import com.google.common.collect.ListMultimap;
-import com.google.common.collect.Lists;
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.dev.cfg.Properties;
import com.google.gwt.dev.jjs.JsOutputOption;
@@ -27,6 +24,9 @@
import com.google.gwt.dev.util.arg.OptionMethodNameDisplayMode;
import com.google.gwt.dev.util.arg.OptionOptimize;
import com.google.gwt.dev.util.arg.SourceLevel;
+import com.google.gwt.thirdparty.guava.common.collect.LinkedListMultimap;
+import com.google.gwt.thirdparty.guava.common.collect.ListMultimap;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
import java.io.File;
import java.util.List;
diff --git a/dev/codeserver/java/com/google/gwt/dev/codeserver/Job.java b/dev/codeserver/java/com/google/gwt/dev/codeserver/Job.java
index a681ff2..8272d35 100644
--- a/dev/codeserver/java/com/google/gwt/dev/codeserver/Job.java
+++ b/dev/codeserver/java/com/google/gwt/dev/codeserver/Job.java
@@ -15,19 +15,19 @@
*/
package com.google.gwt.dev.codeserver;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSortedMap;
-import com.google.common.util.concurrent.Futures;
-import com.google.common.util.concurrent.ListenableFuture;
-import com.google.common.util.concurrent.SettableFuture;
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.core.ext.TreeLogger.Type;
import com.google.gwt.dev.cfg.ModuleDef;
import com.google.gwt.dev.codeserver.JobEvent.CompileStrategy;
import com.google.gwt.dev.codeserver.JobEvent.Status;
import com.google.gwt.dev.util.log.AbstractTreeLogger;
+import com.google.gwt.thirdparty.guava.common.base.Preconditions;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableList;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableMap;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableSortedMap;
+import com.google.gwt.thirdparty.guava.common.util.concurrent.Futures;
+import com.google.gwt.thirdparty.guava.common.util.concurrent.ListenableFuture;
+import com.google.gwt.thirdparty.guava.common.util.concurrent.SettableFuture;
import java.util.Map;
import java.util.Set;
diff --git a/dev/codeserver/java/com/google/gwt/dev/codeserver/JobEvent.java b/dev/codeserver/java/com/google/gwt/dev/codeserver/JobEvent.java
index 9539765..56f6e01 100644
--- a/dev/codeserver/java/com/google/gwt/dev/codeserver/JobEvent.java
+++ b/dev/codeserver/java/com/google/gwt/dev/codeserver/JobEvent.java
@@ -15,13 +15,13 @@
*/
package com.google.gwt.dev.codeserver;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSortedMap;
import com.google.gwt.dev.cfg.ModuleDef;
import com.google.gwt.dev.cfg.ModuleDefSchema;
import com.google.gwt.dev.util.log.MetricName;
+import com.google.gwt.thirdparty.guava.common.base.Preconditions;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableList;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableMap;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableSortedMap;
import java.util.List;
import java.util.Map;
diff --git a/dev/codeserver/java/com/google/gwt/dev/codeserver/JobEventTable.java b/dev/codeserver/java/com/google/gwt/dev/codeserver/JobEventTable.java
index c63f2fc..83bf47b 100644
--- a/dev/codeserver/java/com/google/gwt/dev/codeserver/JobEventTable.java
+++ b/dev/codeserver/java/com/google/gwt/dev/codeserver/JobEventTable.java
@@ -15,11 +15,11 @@
*/
package com.google.gwt.dev.codeserver;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Maps;
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.core.ext.TreeLogger.Type;
import com.google.gwt.dev.codeserver.JobEvent.Status;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableList;
+import com.google.gwt.thirdparty.guava.common.collect.Maps;
import java.util.LinkedHashSet;
import java.util.Map;
diff --git a/dev/codeserver/java/com/google/gwt/dev/codeserver/LauncherDir.java b/dev/codeserver/java/com/google/gwt/dev/codeserver/LauncherDir.java
index db6e194..484bf75 100644
--- a/dev/codeserver/java/com/google/gwt/dev/codeserver/LauncherDir.java
+++ b/dev/codeserver/java/com/google/gwt/dev/codeserver/LauncherDir.java
@@ -15,16 +15,16 @@
*/
package com.google.gwt.dev.codeserver;
-import com.google.common.base.Charsets;
-import com.google.common.base.Preconditions;
-import com.google.common.io.Files;
-import com.google.common.io.Resources;
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.core.ext.TreeLogger.Type;
import com.google.gwt.core.ext.UnableToCompleteException;
import com.google.gwt.dev.cfg.ModuleDef;
import com.google.gwt.dev.codeserver.CompileDir.PolicyFile;
import com.google.gwt.dev.resource.impl.ResourceOracleImpl;
+import com.google.gwt.thirdparty.guava.common.base.Charsets;
+import com.google.gwt.thirdparty.guava.common.base.Preconditions;
+import com.google.gwt.thirdparty.guava.common.io.Files;
+import com.google.gwt.thirdparty.guava.common.io.Resources;
import java.io.File;
import java.io.IOException;
diff --git a/dev/codeserver/java/com/google/gwt/dev/codeserver/Options.java b/dev/codeserver/java/com/google/gwt/dev/codeserver/Options.java
index 6cc9774..778d601 100644
--- a/dev/codeserver/java/com/google/gwt/dev/codeserver/Options.java
+++ b/dev/codeserver/java/com/google/gwt/dev/codeserver/Options.java
@@ -16,10 +16,6 @@
package com.google.gwt.dev.codeserver;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.LinkedListMultimap;
-import com.google.common.collect.ListMultimap;
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.dev.ArgProcessorBase;
import com.google.gwt.dev.cfg.ModuleDef;
@@ -38,6 +34,10 @@
import com.google.gwt.dev.util.arg.OptionSetProperties;
import com.google.gwt.dev.util.arg.OptionSourceLevel;
import com.google.gwt.dev.util.arg.SourceLevel;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableList;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableSet;
+import com.google.gwt.thirdparty.guava.common.collect.LinkedListMultimap;
+import com.google.gwt.thirdparty.guava.common.collect.ListMultimap;
import com.google.gwt.util.tools.ArgHandler;
import com.google.gwt.util.tools.ArgHandlerDir;
import com.google.gwt.util.tools.ArgHandlerExtra;
diff --git a/dev/codeserver/java/com/google/gwt/dev/codeserver/Outbox.java b/dev/codeserver/java/com/google/gwt/dev/codeserver/Outbox.java
index 627cff6..17aa6e2 100644
--- a/dev/codeserver/java/com/google/gwt/dev/codeserver/Outbox.java
+++ b/dev/codeserver/java/com/google/gwt/dev/codeserver/Outbox.java
@@ -16,12 +16,12 @@
package com.google.gwt.dev.codeserver;
-import com.google.common.base.Preconditions;
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.core.ext.UnableToCompleteException;
import com.google.gwt.dev.cfg.ModuleDef;
import com.google.gwt.dev.codeserver.CompileDir.PolicyFile;
import com.google.gwt.dev.codeserver.Job.Result;
+import com.google.gwt.thirdparty.guava.common.base.Preconditions;
import java.io.BufferedInputStream;
import java.io.File;
diff --git a/dev/codeserver/java/com/google/gwt/dev/codeserver/OutboxTable.java b/dev/codeserver/java/com/google/gwt/dev/codeserver/OutboxTable.java
index ec520cc..220a487 100644
--- a/dev/codeserver/java/com/google/gwt/dev/codeserver/OutboxTable.java
+++ b/dev/codeserver/java/com/google/gwt/dev/codeserver/OutboxTable.java
@@ -16,11 +16,11 @@
package com.google.gwt.dev.codeserver;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.core.ext.UnableToCompleteException;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableList;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
+import com.google.gwt.thirdparty.guava.common.collect.Maps;
import java.io.File;
import java.util.Collection;
diff --git a/dev/codeserver/java/com/google/gwt/dev/codeserver/Pages.java b/dev/codeserver/java/com/google/gwt/dev/codeserver/Pages.java
index 2e1dcba..9c1a704 100644
--- a/dev/codeserver/java/com/google/gwt/dev/codeserver/Pages.java
+++ b/dev/codeserver/java/com/google/gwt/dev/codeserver/Pages.java
@@ -16,10 +16,10 @@
package com.google.gwt.dev.codeserver;
-import com.google.common.io.Resources;
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.core.ext.TreeLogger.Type;
import com.google.gwt.dev.json.JsonObject;
+import com.google.gwt.thirdparty.guava.common.io.Resources;
import java.io.IOException;
import java.io.OutputStreamWriter;
diff --git a/dev/codeserver/java/com/google/gwt/dev/codeserver/Recompiler.java b/dev/codeserver/java/com/google/gwt/dev/codeserver/Recompiler.java
index 6737c9b..af8c0e8 100644
--- a/dev/codeserver/java/com/google/gwt/dev/codeserver/Recompiler.java
+++ b/dev/codeserver/java/com/google/gwt/dev/codeserver/Recompiler.java
@@ -15,13 +15,6 @@
*/
package com.google.gwt.dev.codeserver;
-import com.google.common.base.Charsets;
-import com.google.common.base.Joiner;
-import com.google.common.base.Objects;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Maps;
-import com.google.common.io.Files;
-import com.google.common.io.Resources;
import com.google.gwt.core.ext.Linker;
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.core.ext.TreeLogger.Type;
@@ -51,6 +44,13 @@
import com.google.gwt.dev.resource.impl.ZipFileClassPathEntry;
import com.google.gwt.dev.util.log.CompositeTreeLogger;
import com.google.gwt.dev.util.log.PrintWriterTreeLogger;
+import com.google.gwt.thirdparty.guava.common.base.Charsets;
+import com.google.gwt.thirdparty.guava.common.base.Joiner;
+import com.google.gwt.thirdparty.guava.common.base.Objects;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableMap;
+import com.google.gwt.thirdparty.guava.common.collect.Maps;
+import com.google.gwt.thirdparty.guava.common.io.Files;
+import com.google.gwt.thirdparty.guava.common.io.Resources;
import java.io.File;
import java.io.IOException;
diff --git a/dev/codeserver/java/com/google/gwt/dev/codeserver/Responses.java b/dev/codeserver/java/com/google/gwt/dev/codeserver/Responses.java
index 9aa09cc..9824301 100644
--- a/dev/codeserver/java/com/google/gwt/dev/codeserver/Responses.java
+++ b/dev/codeserver/java/com/google/gwt/dev/codeserver/Responses.java
@@ -16,14 +16,14 @@
package com.google.gwt.dev.codeserver;
-import com.google.common.base.Charsets;
-import com.google.common.base.Preconditions;
-import com.google.common.io.ByteStreams;
-import com.google.common.io.Files;
-import com.google.common.io.Resources;
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.dev.codeserver.Pages.ErrorPage;
import com.google.gwt.dev.json.JsonObject;
+import com.google.gwt.thirdparty.guava.common.base.Charsets;
+import com.google.gwt.thirdparty.guava.common.base.Preconditions;
+import com.google.gwt.thirdparty.guava.common.io.ByteStreams;
+import com.google.gwt.thirdparty.guava.common.io.Files;
+import com.google.gwt.thirdparty.guava.common.io.Resources;
import java.io.BufferedReader;
import java.io.File;
diff --git a/dev/codeserver/java/com/google/gwt/dev/codeserver/ReverseSourceMap.java b/dev/codeserver/java/com/google/gwt/dev/codeserver/ReverseSourceMap.java
index 46d08c6..d737012 100644
--- a/dev/codeserver/java/com/google/gwt/dev/codeserver/ReverseSourceMap.java
+++ b/dev/codeserver/java/com/google/gwt/dev/codeserver/ReverseSourceMap.java
@@ -16,10 +16,10 @@
package com.google.gwt.dev.codeserver;
-import com.google.debugging.sourcemap.SourceMapConsumerV3;
-import com.google.debugging.sourcemap.SourceMapParseException;
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.dev.util.Util;
+import com.google.gwt.thirdparty.debugging.sourcemap.SourceMapConsumerV3;
+import com.google.gwt.thirdparty.debugging.sourcemap.SourceMapParseException;
import java.io.File;
diff --git a/dev/codeserver/javatests/com/google/gwt/dev/codeserver/RecompilerTest.java b/dev/codeserver/javatests/com/google/gwt/dev/codeserver/RecompilerTest.java
index b4d85bd..1be56e7 100644
--- a/dev/codeserver/javatests/com/google/gwt/dev/codeserver/RecompilerTest.java
+++ b/dev/codeserver/javatests/com/google/gwt/dev/codeserver/RecompilerTest.java
@@ -15,9 +15,6 @@
*/
package com.google.gwt.dev.codeserver;
-import com.google.common.base.Charsets;
-import com.google.common.collect.Lists;
-import com.google.common.io.Files;
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.core.ext.UnableToCompleteException;
import com.google.gwt.dev.MinimalRebuildCacheManager;
@@ -28,6 +25,9 @@
import com.google.gwt.dev.javac.testing.impl.MockJavaResource;
import com.google.gwt.dev.javac.testing.impl.MockResource;
import com.google.gwt.dev.util.log.PrintWriterTreeLogger;
+import com.google.gwt.thirdparty.guava.common.base.Charsets;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
+import com.google.gwt.thirdparty.guava.common.io.Files;
import junit.framework.TestCase;
diff --git a/dev/core/src/com/google/gwt/core/ext/Generator.java b/dev/core/src/com/google/gwt/core/ext/Generator.java
index b46c2ea..bd7f2c9 100644
--- a/dev/core/src/com/google/gwt/core/ext/Generator.java
+++ b/dev/core/src/com/google/gwt/core/ext/Generator.java
@@ -13,7 +13,7 @@
*/
package com.google.gwt.core.ext;
-import com.google.common.base.Strings;
+import com.google.gwt.thirdparty.guava.common.base.Strings;
import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;
diff --git a/dev/core/src/com/google/gwt/core/ext/SubsetFilteringPropertyOracle.java b/dev/core/src/com/google/gwt/core/ext/SubsetFilteringPropertyOracle.java
index acbb8dc..b475f36 100644
--- a/dev/core/src/com/google/gwt/core/ext/SubsetFilteringPropertyOracle.java
+++ b/dev/core/src/com/google/gwt/core/ext/SubsetFilteringPropertyOracle.java
@@ -13,8 +13,8 @@
*/
package com.google.gwt.core.ext;
-import com.google.common.base.Preconditions;
import com.google.gwt.dev.cfg.RuleGenerateWith;
+import com.google.gwt.thirdparty.guava.common.base.Preconditions;
import java.util.Set;
diff --git a/dev/core/src/com/google/gwt/core/ext/impl/ResourceGeneratorUtilImpl.java b/dev/core/src/com/google/gwt/core/ext/impl/ResourceGeneratorUtilImpl.java
index cea2d59..6d60b9d 100644
--- a/dev/core/src/com/google/gwt/core/ext/impl/ResourceGeneratorUtilImpl.java
+++ b/dev/core/src/com/google/gwt/core/ext/impl/ResourceGeneratorUtilImpl.java
@@ -15,7 +15,7 @@
*/
package com.google.gwt.core.ext.impl;
-import com.google.common.collect.Maps;
+import com.google.gwt.thirdparty.guava.common.collect.Maps;
import java.io.File;
import java.util.Collections;
diff --git a/dev/core/src/com/google/gwt/core/ext/linker/TypeIndexedSet.java b/dev/core/src/com/google/gwt/core/ext/linker/TypeIndexedSet.java
index 81b5ba0..3f38d20 100644
--- a/dev/core/src/com/google/gwt/core/ext/linker/TypeIndexedSet.java
+++ b/dev/core/src/com/google/gwt/core/ext/linker/TypeIndexedSet.java
@@ -15,12 +15,12 @@
*/
package com.google.gwt.core.ext.linker;
-import com.google.common.base.Supplier;
-import com.google.common.collect.ForwardingIterator;
-import com.google.common.collect.ForwardingSortedSet;
-import com.google.common.collect.ImmutableSortedSet;
-import com.google.common.collect.Multimap;
-import com.google.common.collect.Multimaps;
+import com.google.gwt.thirdparty.guava.common.base.Supplier;
+import com.google.gwt.thirdparty.guava.common.collect.ForwardingIterator;
+import com.google.gwt.thirdparty.guava.common.collect.ForwardingSortedSet;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableSortedSet;
+import com.google.gwt.thirdparty.guava.common.collect.Multimap;
+import com.google.gwt.thirdparty.guava.common.collect.Multimaps;
import java.io.Serializable;
import java.util.Collection;
diff --git a/dev/core/src/com/google/gwt/core/ext/linker/impl/JsSourceMapBuilder.java b/dev/core/src/com/google/gwt/core/ext/linker/impl/JsSourceMapBuilder.java
index a9f1983..b740324 100644
--- a/dev/core/src/com/google/gwt/core/ext/linker/impl/JsSourceMapBuilder.java
+++ b/dev/core/src/com/google/gwt/core/ext/linker/impl/JsSourceMapBuilder.java
@@ -13,9 +13,9 @@
*/
package com.google.gwt.core.ext.linker.impl;
-import com.google.common.collect.Lists;
import com.google.gwt.core.ext.soyc.Range;
import com.google.gwt.dev.jjs.JsSourceMap;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
import java.util.List;
diff --git a/dev/core/src/com/google/gwt/core/ext/linker/impl/JsSourceMapExtractor.java b/dev/core/src/com/google/gwt/core/ext/linker/impl/JsSourceMapExtractor.java
index b3e30d6..728d869 100644
--- a/dev/core/src/com/google/gwt/core/ext/linker/impl/JsSourceMapExtractor.java
+++ b/dev/core/src/com/google/gwt/core/ext/linker/impl/JsSourceMapExtractor.java
@@ -13,9 +13,9 @@
*/
package com.google.gwt.core.ext.linker.impl;
-import com.google.common.collect.Lists;
import com.google.gwt.core.ext.soyc.Range;
import com.google.gwt.dev.jjs.JsSourceMap;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
import java.util.LinkedList;
import java.util.List;
diff --git a/dev/core/src/com/google/gwt/core/ext/linker/impl/StandardStatementRanges.java b/dev/core/src/com/google/gwt/core/ext/linker/impl/StandardStatementRanges.java
index fc5371f..8adf6d2 100644
--- a/dev/core/src/com/google/gwt/core/ext/linker/impl/StandardStatementRanges.java
+++ b/dev/core/src/com/google/gwt/core/ext/linker/impl/StandardStatementRanges.java
@@ -15,10 +15,10 @@
*/
package com.google.gwt.core.ext.linker.impl;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.collect.Lists;
-import com.google.common.primitives.Ints;
import com.google.gwt.core.ext.linker.StatementRanges;
+import com.google.gwt.thirdparty.guava.common.annotations.VisibleForTesting;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
+import com.google.gwt.thirdparty.guava.common.primitives.Ints;
import java.io.Serializable;
import java.util.List;
diff --git a/dev/core/src/com/google/gwt/core/ext/linker/impl/StatementRangesBuilder.java b/dev/core/src/com/google/gwt/core/ext/linker/impl/StatementRangesBuilder.java
index 40a0e3b..84e2cad 100644
--- a/dev/core/src/com/google/gwt/core/ext/linker/impl/StatementRangesBuilder.java
+++ b/dev/core/src/com/google/gwt/core/ext/linker/impl/StatementRangesBuilder.java
@@ -13,8 +13,8 @@
*/
package com.google.gwt.core.ext.linker.impl;
-import com.google.common.collect.Lists;
import com.google.gwt.core.ext.linker.StatementRanges;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
import java.util.LinkedList;
diff --git a/dev/core/src/com/google/gwt/core/ext/linker/impl/StatementRangesExtractor.java b/dev/core/src/com/google/gwt/core/ext/linker/impl/StatementRangesExtractor.java
index 043ad95..f549926 100644
--- a/dev/core/src/com/google/gwt/core/ext/linker/impl/StatementRangesExtractor.java
+++ b/dev/core/src/com/google/gwt/core/ext/linker/impl/StatementRangesExtractor.java
@@ -13,8 +13,8 @@
*/
package com.google.gwt.core.ext.linker.impl;
-import com.google.common.collect.Lists;
import com.google.gwt.core.ext.linker.StatementRanges;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
import java.util.List;
diff --git a/dev/core/src/com/google/gwt/core/ext/soyc/SourceMapRecorder.java b/dev/core/src/com/google/gwt/core/ext/soyc/SourceMapRecorder.java
index 8d07cd5..62cbc3c 100644
--- a/dev/core/src/com/google/gwt/core/ext/soyc/SourceMapRecorder.java
+++ b/dev/core/src/com/google/gwt/core/ext/soyc/SourceMapRecorder.java
@@ -15,9 +15,6 @@
*/
package com.google.gwt.core.ext.soyc;
-import com.google.common.collect.Lists;
-import com.google.debugging.sourcemap.SourceMapGeneratorV3;
-import com.google.debugging.sourcemap.SourceMapParseException;
import com.google.gwt.core.ext.linker.SyntheticArtifact;
import com.google.gwt.core.linker.SymbolMapsLinker;
import com.google.gwt.dev.jjs.Correlation;
@@ -28,6 +25,9 @@
import com.google.gwt.dev.util.log.speedtracer.CompilerEventType;
import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger;
import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger.Event;
+import com.google.gwt.thirdparty.debugging.sourcemap.SourceMapGeneratorV3;
+import com.google.gwt.thirdparty.debugging.sourcemap.SourceMapParseException;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
diff --git a/dev/core/src/com/google/gwt/core/ext/soyc/SourceMappingWriter.java b/dev/core/src/com/google/gwt/core/ext/soyc/SourceMappingWriter.java
index c8de865..3aeccf5d 100644
--- a/dev/core/src/com/google/gwt/core/ext/soyc/SourceMappingWriter.java
+++ b/dev/core/src/com/google/gwt/core/ext/soyc/SourceMappingWriter.java
@@ -15,9 +15,9 @@
*/
package com.google.gwt.core.ext.soyc;
-import com.google.debugging.sourcemap.FilePosition;
-import com.google.debugging.sourcemap.SourceMapGenerator;
import com.google.gwt.dev.jjs.SourceInfo;
+import com.google.gwt.thirdparty.debugging.sourcemap.FilePosition;
+import com.google.gwt.thirdparty.debugging.sourcemap.SourceMapGenerator;
/**
* Writes a sorted stream of mappings to a sourcemap. Automatically merges mappings that have
diff --git a/dev/core/src/com/google/gwt/core/ext/soyc/coderef/ClassDescriptor.java b/dev/core/src/com/google/gwt/core/ext/soyc/coderef/ClassDescriptor.java
index 63da063..1ed8ca3 100644
--- a/dev/core/src/com/google/gwt/core/ext/soyc/coderef/ClassDescriptor.java
+++ b/dev/core/src/com/google/gwt/core/ext/soyc/coderef/ClassDescriptor.java
@@ -15,11 +15,11 @@
*/
package com.google.gwt.core.ext.soyc.coderef;
-import com.google.common.collect.Maps;
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.util.Util;
+import com.google.gwt.thirdparty.guava.common.collect.Maps;
import java.util.Collection;
import java.util.Collections;
diff --git a/dev/core/src/com/google/gwt/core/ext/soyc/coderef/DependencyGraphRecorder.java b/dev/core/src/com/google/gwt/core/ext/soyc/coderef/DependencyGraphRecorder.java
index 82c9b4b..dede4fb 100644
--- a/dev/core/src/com/google/gwt/core/ext/soyc/coderef/DependencyGraphRecorder.java
+++ b/dev/core/src/com/google/gwt/core/ext/soyc/coderef/DependencyGraphRecorder.java
@@ -15,11 +15,11 @@
*/
package com.google.gwt.core.ext.soyc.coderef;
-import com.google.common.collect.Maps;
import com.google.gwt.core.ext.soyc.impl.DependencyRecorder;
import com.google.gwt.dev.jjs.ast.JDeclaredType;
import com.google.gwt.dev.jjs.ast.JMethod;
import com.google.gwt.dev.jjs.ast.JProgram;
+import com.google.gwt.thirdparty.guava.common.collect.Maps;
import java.io.OutputStream;
import java.util.Map;
diff --git a/dev/core/src/com/google/gwt/core/ext/soyc/coderef/EntityDescriptor.java b/dev/core/src/com/google/gwt/core/ext/soyc/coderef/EntityDescriptor.java
index 9d641c1..58cbf89 100644
--- a/dev/core/src/com/google/gwt/core/ext/soyc/coderef/EntityDescriptor.java
+++ b/dev/core/src/com/google/gwt/core/ext/soyc/coderef/EntityDescriptor.java
@@ -15,8 +15,8 @@
*/
package com.google.gwt.core.ext.soyc.coderef;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
+import com.google.gwt.thirdparty.guava.common.collect.Sets;
import java.util.Collection;
import java.util.Collections;
diff --git a/dev/core/src/com/google/gwt/core/ext/soyc/coderef/EntityDescriptorJsonTranslator.java b/dev/core/src/com/google/gwt/core/ext/soyc/coderef/EntityDescriptorJsonTranslator.java
index 538fd93..2c71e39 100644
--- a/dev/core/src/com/google/gwt/core/ext/soyc/coderef/EntityDescriptorJsonTranslator.java
+++ b/dev/core/src/com/google/gwt/core/ext/soyc/coderef/EntityDescriptorJsonTranslator.java
@@ -16,8 +16,8 @@
package com.google.gwt.core.ext.soyc.coderef;
-import com.google.common.collect.Maps;
import com.google.gwt.core.ext.soyc.coderef.EntityDescriptor.Fragment;
+import com.google.gwt.thirdparty.guava.common.collect.Maps;
import com.google.gwt.thirdparty.json.JSONArray;
import com.google.gwt.thirdparty.json.JSONException;
import com.google.gwt.thirdparty.json.JSONObject;
diff --git a/dev/core/src/com/google/gwt/core/ext/soyc/coderef/EntityRecorder.java b/dev/core/src/com/google/gwt/core/ext/soyc/coderef/EntityRecorder.java
index 51118c8..fedb297 100644
--- a/dev/core/src/com/google/gwt/core/ext/soyc/coderef/EntityRecorder.java
+++ b/dev/core/src/com/google/gwt/core/ext/soyc/coderef/EntityRecorder.java
@@ -15,9 +15,6 @@
*/
package com.google.gwt.core.ext.soyc.coderef;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
import com.google.gwt.core.ext.linker.EmittedArtifact.Visibility;
import com.google.gwt.core.ext.linker.SyntheticArtifact;
import com.google.gwt.core.ext.soyc.SourceMapRecorder;
@@ -35,6 +32,9 @@
import com.google.gwt.dev.jjs.impl.codesplitter.FragmentPartitioningResult;
import com.google.gwt.dev.js.SizeBreakdown;
import com.google.gwt.dev.js.ast.JsName;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
+import com.google.gwt.thirdparty.guava.common.collect.Maps;
+import com.google.gwt.thirdparty.guava.common.collect.Sets;
import com.google.gwt.thirdparty.json.JSONArray;
import com.google.gwt.thirdparty.json.JSONException;
import com.google.gwt.thirdparty.json.JSONObject;
diff --git a/dev/core/src/com/google/gwt/core/ext/soyc/coderef/MethodDescriptor.java b/dev/core/src/com/google/gwt/core/ext/soyc/coderef/MethodDescriptor.java
index 69b1a1b..8813342 100644
--- a/dev/core/src/com/google/gwt/core/ext/soyc/coderef/MethodDescriptor.java
+++ b/dev/core/src/com/google/gwt/core/ext/soyc/coderef/MethodDescriptor.java
@@ -15,8 +15,8 @@
*/
package com.google.gwt.core.ext.soyc.coderef;
-import com.google.common.collect.Sets;
import com.google.gwt.dev.jjs.ast.JMethod;
+import com.google.gwt.thirdparty.guava.common.collect.Sets;
import java.util.Collections;
import java.util.Set;
diff --git a/dev/core/src/com/google/gwt/core/ext/soyc/coderef/PackageDescriptor.java b/dev/core/src/com/google/gwt/core/ext/soyc/coderef/PackageDescriptor.java
index 54b9ffd..f8f6740 100644
--- a/dev/core/src/com/google/gwt/core/ext/soyc/coderef/PackageDescriptor.java
+++ b/dev/core/src/com/google/gwt/core/ext/soyc/coderef/PackageDescriptor.java
@@ -15,8 +15,8 @@
*/
package com.google.gwt.core.ext.soyc.coderef;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
+import com.google.gwt.thirdparty.guava.common.collect.Maps;
import java.util.ArrayList;
import java.util.Collection;
diff --git a/dev/core/src/com/google/gwt/core/ext/soyc/impl/StoryRecorder.java b/dev/core/src/com/google/gwt/core/ext/soyc/impl/StoryRecorder.java
index 00fd95e..37a05be 100644
--- a/dev/core/src/com/google/gwt/core/ext/soyc/impl/StoryRecorder.java
+++ b/dev/core/src/com/google/gwt/core/ext/soyc/impl/StoryRecorder.java
@@ -15,7 +15,6 @@
*/
package com.google.gwt.core.ext.soyc.impl;
-import com.google.common.collect.Lists;
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.core.ext.soyc.ClassMember;
import com.google.gwt.core.ext.soyc.Member;
@@ -28,6 +27,7 @@
import com.google.gwt.dev.jjs.ast.JField;
import com.google.gwt.dev.jjs.ast.JMethod;
import com.google.gwt.dev.util.Util;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
import com.google.gwt.util.tools.Utility;
import java.io.IOException;
diff --git a/dev/core/src/com/google/gwt/core/linker/CrossSiteIframeLinker.java b/dev/core/src/com/google/gwt/core/linker/CrossSiteIframeLinker.java
index 0a66833..f6380df 100644
--- a/dev/core/src/com/google/gwt/core/linker/CrossSiteIframeLinker.java
+++ b/dev/core/src/com/google/gwt/core/linker/CrossSiteIframeLinker.java
@@ -16,8 +16,6 @@
package com.google.gwt.core.linker;
-import com.google.common.base.Joiner;
-import com.google.common.base.Splitter;
import com.google.gwt.core.ext.LinkerContext;
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.core.ext.UnableToCompleteException;
@@ -37,6 +35,8 @@
import com.google.gwt.dev.About;
import com.google.gwt.dev.util.DefaultTextOutput;
import com.google.gwt.dev.util.TextOutput;
+import com.google.gwt.thirdparty.guava.common.base.Joiner;
+import com.google.gwt.thirdparty.guava.common.base.Splitter;
import com.google.gwt.util.tools.Utility;
import com.google.gwt.util.tools.shared.StringUtils;
diff --git a/dev/core/src/com/google/gwt/core/linker/SymbolMapsLinker.java b/dev/core/src/com/google/gwt/core/linker/SymbolMapsLinker.java
index c988556..edffd14 100644
--- a/dev/core/src/com/google/gwt/core/linker/SymbolMapsLinker.java
+++ b/dev/core/src/com/google/gwt/core/linker/SymbolMapsLinker.java
@@ -15,8 +15,6 @@
*/
package com.google.gwt.core.linker;
-import com.google.debugging.sourcemap.SourceMapGeneratorV3;
-import com.google.debugging.sourcemap.SourceMapGeneratorV3.ExtensionMergeAction;
import com.google.gwt.core.ext.LinkerContext;
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.core.ext.UnableToCompleteException;
@@ -38,6 +36,8 @@
import com.google.gwt.dev.util.log.speedtracer.CompilerEventType;
import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger;
import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger.Event;
+import com.google.gwt.thirdparty.debugging.sourcemap.SourceMapGeneratorV3;
+import com.google.gwt.thirdparty.debugging.sourcemap.SourceMapGeneratorV3.ExtensionMergeAction;
import java.io.ByteArrayOutputStream;
import java.io.PrintWriter;
diff --git a/dev/core/src/com/google/gwt/dev/CompilePerms.java b/dev/core/src/com/google/gwt/dev/CompilePerms.java
index 3d5d330..fad0dc0 100644
--- a/dev/core/src/com/google/gwt/dev/CompilePerms.java
+++ b/dev/core/src/com/google/gwt/dev/CompilePerms.java
@@ -15,7 +15,6 @@
*/
package com.google.gwt.dev;
-import com.google.common.collect.Lists;
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.core.ext.UnableToCompleteException;
import com.google.gwt.dev.CompileTaskRunner.CompileTask;
@@ -31,6 +30,7 @@
import com.google.gwt.dev.util.Util;
import com.google.gwt.dev.util.arg.ArgHandlerLocalWorkers;
import com.google.gwt.dev.util.arg.OptionLocalWorkers;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
import com.google.gwt.util.tools.ArgHandlerString;
import java.io.File;
diff --git a/dev/core/src/com/google/gwt/dev/Compiler.java b/dev/core/src/com/google/gwt/dev/Compiler.java
index a28aa25..238aa8d 100644
--- a/dev/core/src/com/google/gwt/dev/Compiler.java
+++ b/dev/core/src/com/google/gwt/dev/Compiler.java
@@ -15,8 +15,6 @@
*/
package com.google.gwt.dev;
-import com.google.common.collect.ListMultimap;
-import com.google.common.collect.Sets;
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.core.ext.UnableToCompleteException;
import com.google.gwt.core.ext.linker.ArtifactSet;
@@ -48,6 +46,8 @@
import com.google.gwt.dev.util.log.speedtracer.CompilerEventType;
import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger;
import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger.Event;
+import com.google.gwt.thirdparty.guava.common.collect.ListMultimap;
+import com.google.gwt.thirdparty.guava.common.collect.Sets;
import com.google.gwt.util.tools.Utility;
import java.io.File;
diff --git a/dev/core/src/com/google/gwt/dev/GWTMain.java b/dev/core/src/com/google/gwt/dev/GWTMain.java
index b6074d6..2e292c3 100644
--- a/dev/core/src/com/google/gwt/dev/GWTMain.java
+++ b/dev/core/src/com/google/gwt/dev/GWTMain.java
@@ -15,8 +15,8 @@
*/
package com.google.gwt.dev;
-import com.google.common.base.Strings;
import com.google.gwt.dev.util.Util;
+import com.google.gwt.thirdparty.guava.common.base.Strings;
/**
* Executable class provides help to users who run the jar by indicating the
diff --git a/dev/core/src/com/google/gwt/dev/GwtCreateMap.java b/dev/core/src/com/google/gwt/dev/GwtCreateMap.java
index 7ffbd50..23fe8b7 100644
--- a/dev/core/src/com/google/gwt/dev/GwtCreateMap.java
+++ b/dev/core/src/com/google/gwt/dev/GwtCreateMap.java
@@ -15,8 +15,8 @@
*/
package com.google.gwt.dev;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
+import com.google.gwt.thirdparty.guava.common.collect.Maps;
+import com.google.gwt.thirdparty.guava.common.collect.Sets;
import java.io.Serializable;
import java.util.ArrayList;
diff --git a/dev/core/src/com/google/gwt/dev/Link.java b/dev/core/src/com/google/gwt/dev/Link.java
index ae50826..a15540b 100644
--- a/dev/core/src/com/google/gwt/dev/Link.java
+++ b/dev/core/src/com/google/gwt/dev/Link.java
@@ -15,7 +15,6 @@
*/
package com.google.gwt.dev;
-import com.google.common.collect.Sets;
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.core.ext.UnableToCompleteException;
import com.google.gwt.core.ext.linker.Artifact;
@@ -57,6 +56,7 @@
import com.google.gwt.dev.util.log.speedtracer.CompilerEventType;
import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger;
import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger.Event;
+import com.google.gwt.thirdparty.guava.common.collect.Sets;
import java.io.BufferedInputStream;
import java.io.File;
diff --git a/dev/core/src/com/google/gwt/dev/MinimalRebuildCache.java b/dev/core/src/com/google/gwt/dev/MinimalRebuildCache.java
index 97709a1..c8dd011 100644
--- a/dev/core/src/com/google/gwt/dev/MinimalRebuildCache.java
+++ b/dev/core/src/com/google/gwt/dev/MinimalRebuildCache.java
@@ -13,16 +13,6 @@
*/
package com.google.gwt.dev;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Objects;
-import com.google.common.base.Predicates;
-import com.google.common.collect.HashMultimap;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Multimap;
-import com.google.common.collect.Multimaps;
-import com.google.common.collect.Sets;
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.core.ext.linker.ArtifactSet;
import com.google.gwt.core.ext.linker.StatementRanges;
@@ -40,6 +30,16 @@
import com.google.gwt.dev.js.JsIncrementalNamer.JsIncrementalNamerState;
import com.google.gwt.dev.resource.Resource;
import com.google.gwt.dev.util.Name.InternalName;
+import com.google.gwt.thirdparty.guava.common.annotations.VisibleForTesting;
+import com.google.gwt.thirdparty.guava.common.base.Objects;
+import com.google.gwt.thirdparty.guava.common.base.Predicates;
+import com.google.gwt.thirdparty.guava.common.collect.HashMultimap;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableList;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableSet;
+import com.google.gwt.thirdparty.guava.common.collect.Maps;
+import com.google.gwt.thirdparty.guava.common.collect.Multimap;
+import com.google.gwt.thirdparty.guava.common.collect.Multimaps;
+import com.google.gwt.thirdparty.guava.common.collect.Sets;
import cern.colt.list.IntArrayList;
diff --git a/dev/core/src/com/google/gwt/dev/MinimalRebuildCacheManager.java b/dev/core/src/com/google/gwt/dev/MinimalRebuildCacheManager.java
index 481d90d..042206e 100644
--- a/dev/core/src/com/google/gwt/dev/MinimalRebuildCacheManager.java
+++ b/dev/core/src/com/google/gwt/dev/MinimalRebuildCacheManager.java
@@ -13,14 +13,14 @@
*/
package com.google.gwt.dev;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.cache.Cache;
-import com.google.common.cache.CacheBuilder;
-import com.google.common.util.concurrent.Futures;
-import com.google.common.util.concurrent.MoreExecutors;
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.dev.cfg.PropertyPermutations.PermutationDescription;
import com.google.gwt.dev.util.CompilerVersion;
+import com.google.gwt.thirdparty.guava.common.annotations.VisibleForTesting;
+import com.google.gwt.thirdparty.guava.common.cache.Cache;
+import com.google.gwt.thirdparty.guava.common.cache.CacheBuilder;
+import com.google.gwt.thirdparty.guava.common.util.concurrent.Futures;
+import com.google.gwt.thirdparty.guava.common.util.concurrent.MoreExecutors;
import com.google.gwt.util.tools.Utility;
import com.google.gwt.util.tools.shared.Md5Utils;
import com.google.gwt.util.tools.shared.StringUtils;
diff --git a/dev/core/src/com/google/gwt/dev/Permutation.java b/dev/core/src/com/google/gwt/dev/Permutation.java
index db6c4e0..fc8d8ce 100644
--- a/dev/core/src/com/google/gwt/dev/Permutation.java
+++ b/dev/core/src/com/google/gwt/dev/Permutation.java
@@ -15,9 +15,9 @@
*/
package com.google.gwt.dev;
-import com.google.common.collect.Lists;
import com.google.gwt.dev.cfg.BindingProps;
import com.google.gwt.dev.cfg.PermProps;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
import java.io.Serializable;
import java.util.List;
diff --git a/dev/core/src/com/google/gwt/dev/PrecompileTaskOptionsImpl.java b/dev/core/src/com/google/gwt/dev/PrecompileTaskOptionsImpl.java
index 0ce7ea7..7423ec2 100644
--- a/dev/core/src/com/google/gwt/dev/PrecompileTaskOptionsImpl.java
+++ b/dev/core/src/com/google/gwt/dev/PrecompileTaskOptionsImpl.java
@@ -16,8 +16,6 @@
package com.google.gwt.dev;
-import com.google.common.collect.LinkedListMultimap;
-import com.google.common.collect.ListMultimap;
import com.google.gwt.dev.jjs.JJSOptions;
import com.google.gwt.dev.jjs.JJSOptionsImpl;
import com.google.gwt.dev.jjs.JsOutputOption;
@@ -25,6 +23,8 @@
import com.google.gwt.dev.util.arg.OptionJsInteropMode;
import com.google.gwt.dev.util.arg.OptionMethodNameDisplayMode;
import com.google.gwt.dev.util.arg.SourceLevel;
+import com.google.gwt.thirdparty.guava.common.collect.LinkedListMultimap;
+import com.google.gwt.thirdparty.guava.common.collect.ListMultimap;
import java.io.File;
diff --git a/dev/core/src/com/google/gwt/dev/SourceSaver.java b/dev/core/src/com/google/gwt/dev/SourceSaver.java
index f99062e..0a8ef35 100644
--- a/dev/core/src/com/google/gwt/dev/SourceSaver.java
+++ b/dev/core/src/com/google/gwt/dev/SourceSaver.java
@@ -15,9 +15,6 @@
*/
package com.google.gwt.dev;
-import com.google.common.collect.Sets;
-import com.google.common.io.ByteStreams;
-import com.google.common.io.Resources;
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.core.ext.TreeLogger.Type;
import com.google.gwt.core.ext.UnableToCompleteException;
@@ -31,6 +28,9 @@
import com.google.gwt.dev.json.JsonException;
import com.google.gwt.dev.json.JsonObject;
import com.google.gwt.dev.util.OutputFileSet;
+import com.google.gwt.thirdparty.guava.common.collect.Sets;
+import com.google.gwt.thirdparty.guava.common.io.ByteStreams;
+import com.google.gwt.thirdparty.guava.common.io.Resources;
import java.io.IOException;
import java.io.InputStream;
@@ -210,9 +210,11 @@
return false;
}
- try (InputStream resourceAsStream = Resources.asByteSource(resource).openStream();
- OutputStream out = dest.openForWrite(destPrefix + path);) {
- ByteStreams.copy(Resources.asByteSource(resource).openStream(), out);
+ OutputStream out = dest.openForWrite(destPrefix + path);
+ try {
+ ByteStreams.copy(Resources.asByteSource(resource), out);
+ } finally {
+ out.close();
}
return true;
diff --git a/dev/core/src/com/google/gwt/dev/StringAnalyzableTypeEnvironment.java b/dev/core/src/com/google/gwt/dev/StringAnalyzableTypeEnvironment.java
index b131ede..02a7615 100644
--- a/dev/core/src/com/google/gwt/dev/StringAnalyzableTypeEnvironment.java
+++ b/dev/core/src/com/google/gwt/dev/StringAnalyzableTypeEnvironment.java
@@ -13,13 +13,13 @@
*/
package com.google.gwt.dev;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Objects;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
import com.google.gwt.dev.jjs.impl.RapidTypeAnalyzer.AnalyzableTypeEnvironment;
import com.google.gwt.dev.util.collect.IntHashMultimap;
import com.google.gwt.dev.util.collect.IntMultimap;
+import com.google.gwt.thirdparty.guava.common.annotations.VisibleForTesting;
+import com.google.gwt.thirdparty.guava.common.base.Objects;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
+import com.google.gwt.thirdparty.guava.common.collect.Maps;
import cern.colt.list.IntArrayList;
import cern.colt.map.OpenIntIntHashMap;
diff --git a/dev/core/src/com/google/gwt/dev/cfg/BindingProperty.java b/dev/core/src/com/google/gwt/dev/cfg/BindingProperty.java
index 9119088..9990506 100644
--- a/dev/core/src/com/google/gwt/dev/cfg/BindingProperty.java
+++ b/dev/core/src/com/google/gwt/dev/cfg/BindingProperty.java
@@ -15,12 +15,12 @@
*/
package com.google.gwt.dev.cfg;
-import com.google.common.base.Objects;
-import com.google.common.collect.ImmutableMap;
import com.google.gwt.core.ext.linker.PropertyProviderGenerator;
import com.google.gwt.dev.util.collect.IdentityHashSet;
import com.google.gwt.dev.util.collect.Lists;
import com.google.gwt.dev.util.collect.Sets;
+import com.google.gwt.thirdparty.guava.common.base.Objects;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableMap;
import java.io.Serializable;
import java.util.ArrayList;
diff --git a/dev/core/src/com/google/gwt/dev/cfg/CompoundCondition.java b/dev/core/src/com/google/gwt/dev/cfg/CompoundCondition.java
index b354ec2..36dd0d7 100644
--- a/dev/core/src/com/google/gwt/dev/cfg/CompoundCondition.java
+++ b/dev/core/src/com/google/gwt/dev/cfg/CompoundCondition.java
@@ -15,8 +15,8 @@
*/
package com.google.gwt.dev.cfg;
-import com.google.common.base.Objects;
import com.google.gwt.dev.util.collect.Sets;
+import com.google.gwt.thirdparty.guava.common.base.Objects;
import java.util.Iterator;
import java.util.Set;
diff --git a/dev/core/src/com/google/gwt/dev/cfg/ConditionAll.java b/dev/core/src/com/google/gwt/dev/cfg/ConditionAll.java
index 01d69dc..349ddc9 100644
--- a/dev/core/src/com/google/gwt/dev/cfg/ConditionAll.java
+++ b/dev/core/src/com/google/gwt/dev/cfg/ConditionAll.java
@@ -15,9 +15,9 @@
*/
package com.google.gwt.dev.cfg;
-import com.google.common.base.Objects;
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.core.ext.UnableToCompleteException;
+import com.google.gwt.thirdparty.guava.common.base.Objects;
import java.util.Iterator;
diff --git a/dev/core/src/com/google/gwt/dev/cfg/ConditionAny.java b/dev/core/src/com/google/gwt/dev/cfg/ConditionAny.java
index 76ba40e..e8d12ad 100644
--- a/dev/core/src/com/google/gwt/dev/cfg/ConditionAny.java
+++ b/dev/core/src/com/google/gwt/dev/cfg/ConditionAny.java
@@ -15,9 +15,9 @@
*/
package com.google.gwt.dev.cfg;
-import com.google.common.base.Objects;
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.core.ext.UnableToCompleteException;
+import com.google.gwt.thirdparty.guava.common.base.Objects;
import java.util.Iterator;
diff --git a/dev/core/src/com/google/gwt/dev/cfg/ConditionNone.java b/dev/core/src/com/google/gwt/dev/cfg/ConditionNone.java
index dbaf9cb..ce801fe 100644
--- a/dev/core/src/com/google/gwt/dev/cfg/ConditionNone.java
+++ b/dev/core/src/com/google/gwt/dev/cfg/ConditionNone.java
@@ -15,9 +15,9 @@
*/
package com.google.gwt.dev.cfg;
-import com.google.common.base.Objects;
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.core.ext.UnableToCompleteException;
+import com.google.gwt.thirdparty.guava.common.base.Objects;
import java.util.Iterator;
diff --git a/dev/core/src/com/google/gwt/dev/cfg/ConditionWhenLinkerAdded.java b/dev/core/src/com/google/gwt/dev/cfg/ConditionWhenLinkerAdded.java
index 7e5d700..cb128c7 100644
--- a/dev/core/src/com/google/gwt/dev/cfg/ConditionWhenLinkerAdded.java
+++ b/dev/core/src/com/google/gwt/dev/cfg/ConditionWhenLinkerAdded.java
@@ -15,8 +15,8 @@
*/
package com.google.gwt.dev.cfg;
-import com.google.common.base.Objects;
import com.google.gwt.core.ext.TreeLogger;
+import com.google.gwt.thirdparty.guava.common.base.Objects;
/**
* A condition that is true when the active linkers include the one specified.
diff --git a/dev/core/src/com/google/gwt/dev/cfg/ConditionWhenPropertyIs.java b/dev/core/src/com/google/gwt/dev/cfg/ConditionWhenPropertyIs.java
index 54a364e..1064eb5 100644
--- a/dev/core/src/com/google/gwt/dev/cfg/ConditionWhenPropertyIs.java
+++ b/dev/core/src/com/google/gwt/dev/cfg/ConditionWhenPropertyIs.java
@@ -15,7 +15,6 @@
*/
package com.google.gwt.dev.cfg;
-import com.google.common.base.Objects;
import com.google.gwt.core.ext.BadPropertyValueException;
import com.google.gwt.core.ext.ConfigurationProperty;
import com.google.gwt.core.ext.PropertyOracle;
@@ -23,6 +22,7 @@
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.core.ext.UnableToCompleteException;
import com.google.gwt.dev.util.collect.Sets;
+import com.google.gwt.thirdparty.guava.common.base.Objects;
import java.util.List;
import java.util.Set;
diff --git a/dev/core/src/com/google/gwt/dev/cfg/ConditionWhenTypeAssignableTo.java b/dev/core/src/com/google/gwt/dev/cfg/ConditionWhenTypeAssignableTo.java
index 10d3b56..9a68ac5 100644
--- a/dev/core/src/com/google/gwt/dev/cfg/ConditionWhenTypeAssignableTo.java
+++ b/dev/core/src/com/google/gwt/dev/cfg/ConditionWhenTypeAssignableTo.java
@@ -15,12 +15,12 @@
*/
package com.google.gwt.dev.cfg;
-import com.google.common.base.Objects;
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.core.ext.UnableToCompleteException;
import com.google.gwt.core.ext.typeinfo.JClassType;
import com.google.gwt.core.ext.typeinfo.TypeOracle;
import com.google.gwt.dev.javac.CompilationProblemReporter;
+import com.google.gwt.thirdparty.guava.common.base.Objects;
/**
* A deferred binding condition to determine whether the type being rebound is
diff --git a/dev/core/src/com/google/gwt/dev/cfg/ConditionWhenTypeIs.java b/dev/core/src/com/google/gwt/dev/cfg/ConditionWhenTypeIs.java
index fcc4159..6cfde60 100644
--- a/dev/core/src/com/google/gwt/dev/cfg/ConditionWhenTypeIs.java
+++ b/dev/core/src/com/google/gwt/dev/cfg/ConditionWhenTypeIs.java
@@ -15,8 +15,8 @@
*/
package com.google.gwt.dev.cfg;
-import com.google.common.base.Objects;
import com.google.gwt.core.ext.TreeLogger;
+import com.google.gwt.thirdparty.guava.common.base.Objects;
/**
* A deferred binding condition to determine whether the type being rebound is
diff --git a/dev/core/src/com/google/gwt/dev/cfg/Conditions.java b/dev/core/src/com/google/gwt/dev/cfg/Conditions.java
index d08f347..8f7f991 100644
--- a/dev/core/src/com/google/gwt/dev/cfg/Conditions.java
+++ b/dev/core/src/com/google/gwt/dev/cfg/Conditions.java
@@ -15,8 +15,8 @@
*/
package com.google.gwt.dev.cfg;
-import com.google.common.base.Objects;
import com.google.gwt.dev.util.collect.Lists;
+import com.google.gwt.thirdparty.guava.common.base.Objects;
import java.io.Serializable;
import java.util.Iterator;
diff --git a/dev/core/src/com/google/gwt/dev/cfg/ConfigProps.java b/dev/core/src/com/google/gwt/dev/cfg/ConfigProps.java
index 635311a..cc52757 100644
--- a/dev/core/src/com/google/gwt/dev/cfg/ConfigProps.java
+++ b/dev/core/src/com/google/gwt/dev/cfg/ConfigProps.java
@@ -15,12 +15,12 @@
*/
package com.google.gwt.dev.cfg;
-import com.google.common.base.Splitter;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableMap.Builder;
-import com.google.common.collect.Lists;
import com.google.gwt.core.ext.BadPropertyValueException;
import com.google.gwt.core.ext.DefaultConfigurationProperty;
+import com.google.gwt.thirdparty.guava.common.base.Splitter;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableMap;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableMap.Builder;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
import java.io.Serializable;
import java.util.Collections;
diff --git a/dev/core/src/com/google/gwt/dev/cfg/ConfigurationProperty.java b/dev/core/src/com/google/gwt/dev/cfg/ConfigurationProperty.java
index f32b946..6df1037 100644
--- a/dev/core/src/com/google/gwt/dev/cfg/ConfigurationProperty.java
+++ b/dev/core/src/com/google/gwt/dev/cfg/ConfigurationProperty.java
@@ -15,7 +15,7 @@
*/
package com.google.gwt.dev.cfg;
-import com.google.common.base.Objects;
+import com.google.gwt.thirdparty.guava.common.base.Objects;
import java.util.ArrayList;
import java.util.Collections;
diff --git a/dev/core/src/com/google/gwt/dev/cfg/DynamicPropertyOracle.java b/dev/core/src/com/google/gwt/dev/cfg/DynamicPropertyOracle.java
index 7906247..2a7f62c 100644
--- a/dev/core/src/com/google/gwt/dev/cfg/DynamicPropertyOracle.java
+++ b/dev/core/src/com/google/gwt/dev/cfg/DynamicPropertyOracle.java
@@ -15,8 +15,6 @@
*/
package com.google.gwt.dev.cfg;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
import com.google.gwt.core.ext.BadPropertyValueException;
import com.google.gwt.core.ext.ConfigurationProperty;
import com.google.gwt.core.ext.DefaultConfigurationProperty;
@@ -24,6 +22,8 @@
import com.google.gwt.core.ext.PropertyOracle;
import com.google.gwt.core.ext.SelectionProperty;
import com.google.gwt.core.ext.TreeLogger;
+import com.google.gwt.thirdparty.guava.common.collect.Maps;
+import com.google.gwt.thirdparty.guava.common.collect.Sets;
import java.util.Arrays;
import java.util.Map;
diff --git a/dev/core/src/com/google/gwt/dev/cfg/EntryMethodHolderGenerator.java b/dev/core/src/com/google/gwt/dev/cfg/EntryMethodHolderGenerator.java
index 5020963..d10ae15 100644
--- a/dev/core/src/com/google/gwt/dev/cfg/EntryMethodHolderGenerator.java
+++ b/dev/core/src/com/google/gwt/dev/cfg/EntryMethodHolderGenerator.java
@@ -13,11 +13,11 @@
*/
package com.google.gwt.dev.cfg;
-import com.google.common.annotations.VisibleForTesting;
import com.google.gwt.core.ext.Generator;
import com.google.gwt.core.ext.GeneratorContext;
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.core.ext.UnableToCompleteException;
+import com.google.gwt.thirdparty.guava.common.annotations.VisibleForTesting;
import java.io.PrintWriter;
diff --git a/dev/core/src/com/google/gwt/dev/cfg/ModuleDef.java b/dev/core/src/com/google/gwt/dev/cfg/ModuleDef.java
index d085db5..0418c03 100644
--- a/dev/core/src/com/google/gwt/dev/cfg/ModuleDef.java
+++ b/dev/core/src/com/google/gwt/dev/cfg/ModuleDef.java
@@ -15,13 +15,6 @@
*/
package com.google.gwt.dev.cfg;
-import com.google.common.base.Charsets;
-import com.google.common.base.Predicates;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Iterators;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
import com.google.gwt.core.ext.Linker;
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.core.ext.UnableToCompleteException;
@@ -44,6 +37,13 @@
import com.google.gwt.dev.util.log.speedtracer.CompilerEventType;
import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger;
import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger.Event;
+import com.google.gwt.thirdparty.guava.common.base.Charsets;
+import com.google.gwt.thirdparty.guava.common.base.Predicates;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableList;
+import com.google.gwt.thirdparty.guava.common.collect.Iterators;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
+import com.google.gwt.thirdparty.guava.common.collect.Maps;
+import com.google.gwt.thirdparty.guava.common.collect.Sets;
import java.io.File;
import java.security.MessageDigest;
diff --git a/dev/core/src/com/google/gwt/dev/cfg/ModuleDefLoader.java b/dev/core/src/com/google/gwt/dev/cfg/ModuleDefLoader.java
index 15b34cc..c91d54a 100644
--- a/dev/core/src/com/google/gwt/dev/cfg/ModuleDefLoader.java
+++ b/dev/core/src/com/google/gwt/dev/cfg/ModuleDefLoader.java
@@ -15,9 +15,6 @@
*/
package com.google.gwt.dev.cfg;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.collect.MapMaker;
-import com.google.common.collect.Maps;
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.core.ext.UnableToCompleteException;
import com.google.gwt.dev.CompilerContext;
@@ -26,6 +23,9 @@
import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger;
import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger.Event;
import com.google.gwt.dev.util.xml.ReflectiveParser;
+import com.google.gwt.thirdparty.guava.common.annotations.VisibleForTesting;
+import com.google.gwt.thirdparty.guava.common.collect.MapMaker;
+import com.google.gwt.thirdparty.guava.common.collect.Maps;
import com.google.gwt.util.tools.Utility;
import java.io.File;
diff --git a/dev/core/src/com/google/gwt/dev/cfg/PermProps.java b/dev/core/src/com/google/gwt/dev/cfg/PermProps.java
index 1bb7196..4ce3f15 100644
--- a/dev/core/src/com/google/gwt/dev/cfg/PermProps.java
+++ b/dev/core/src/com/google/gwt/dev/cfg/PermProps.java
@@ -15,13 +15,13 @@
*/
package com.google.gwt.dev.cfg;
-import com.google.common.base.Objects;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.core.ext.TreeLogger.Type;
+import com.google.gwt.thirdparty.guava.common.base.Objects;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableList;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableMap;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
+import com.google.gwt.thirdparty.guava.common.collect.Sets;
import java.util.List;
import java.util.Set;
diff --git a/dev/core/src/com/google/gwt/dev/cfg/PropertyPermutations.java b/dev/core/src/com/google/gwt/dev/cfg/PropertyPermutations.java
index 1c4537a..a00f020 100644
--- a/dev/core/src/com/google/gwt/dev/cfg/PropertyPermutations.java
+++ b/dev/core/src/com/google/gwt/dev/cfg/PropertyPermutations.java
@@ -15,12 +15,12 @@
*/
package com.google.gwt.dev.cfg;
-import com.google.common.base.Objects;
-import com.google.common.collect.Lists;
import com.google.gwt.core.ext.PropertyOracle;
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.core.ext.UnableToCompleteException;
import com.google.gwt.dev.util.CollapsedPropertyKey;
+import com.google.gwt.thirdparty.guava.common.base.Objects;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
import java.util.ArrayList;
import java.util.Arrays;
diff --git a/dev/core/src/com/google/gwt/dev/cfg/PropertyProvider.java b/dev/core/src/com/google/gwt/dev/cfg/PropertyProvider.java
index c2f8af7..be67bd1 100644
--- a/dev/core/src/com/google/gwt/dev/cfg/PropertyProvider.java
+++ b/dev/core/src/com/google/gwt/dev/cfg/PropertyProvider.java
@@ -15,7 +15,7 @@
*/
package com.google.gwt.dev.cfg;
-import com.google.common.base.Objects;
+import com.google.gwt.thirdparty.guava.common.base.Objects;
import java.io.Serializable;
diff --git a/dev/core/src/com/google/gwt/dev/cfg/RuleGenerateWith.java b/dev/core/src/com/google/gwt/dev/cfg/RuleGenerateWith.java
index 4620883..acbde9b 100644
--- a/dev/core/src/com/google/gwt/dev/cfg/RuleGenerateWith.java
+++ b/dev/core/src/com/google/gwt/dev/cfg/RuleGenerateWith.java
@@ -15,8 +15,6 @@
*/
package com.google.gwt.dev.cfg;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.collect.ImmutableSet;
import com.google.gwt.core.ext.Generator;
import com.google.gwt.core.ext.Generator.RunsLocal;
import com.google.gwt.core.ext.RebindResult;
@@ -24,6 +22,8 @@
import com.google.gwt.core.ext.UnableToCompleteException;
import com.google.gwt.dev.javac.StandardGeneratorContext;
import com.google.gwt.dev.jjs.InternalCompilerException;
+import com.google.gwt.thirdparty.guava.common.annotations.VisibleForTesting;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableSet;
import java.util.Set;
diff --git a/dev/core/src/com/google/gwt/dev/cfg/RuntimeRebindRuleGenerator.java b/dev/core/src/com/google/gwt/dev/cfg/RuntimeRebindRuleGenerator.java
index 79d1677..c7bfc0b 100644
--- a/dev/core/src/com/google/gwt/dev/cfg/RuntimeRebindRuleGenerator.java
+++ b/dev/core/src/com/google/gwt/dev/cfg/RuntimeRebindRuleGenerator.java
@@ -13,7 +13,7 @@
*/
package com.google.gwt.dev.cfg;
-import com.google.common.collect.Maps;
+import com.google.gwt.thirdparty.guava.common.collect.Maps;
import java.util.Map;
diff --git a/dev/core/src/com/google/gwt/dev/javac/CompilationErrorsIndexImpl.java b/dev/core/src/com/google/gwt/dev/javac/CompilationErrorsIndexImpl.java
index 841e429..5e80910 100644
--- a/dev/core/src/com/google/gwt/dev/javac/CompilationErrorsIndexImpl.java
+++ b/dev/core/src/com/google/gwt/dev/javac/CompilationErrorsIndexImpl.java
@@ -13,10 +13,10 @@
*/
package com.google.gwt.dev.javac;
-import com.google.common.base.Objects;
-import com.google.common.collect.HashMultimap;
-import com.google.common.collect.Maps;
-import com.google.common.collect.SetMultimap;
+import com.google.gwt.thirdparty.guava.common.base.Objects;
+import com.google.gwt.thirdparty.guava.common.collect.HashMultimap;
+import com.google.gwt.thirdparty.guava.common.collect.Maps;
+import com.google.gwt.thirdparty.guava.common.collect.SetMultimap;
import java.io.IOException;
import java.io.ObjectInputStream;
diff --git a/dev/core/src/com/google/gwt/dev/javac/CompilationProblemReporter.java b/dev/core/src/com/google/gwt/dev/javac/CompilationProblemReporter.java
index 6d69051..9fd6bb0 100644
--- a/dev/core/src/com/google/gwt/dev/javac/CompilationProblemReporter.java
+++ b/dev/core/src/com/google/gwt/dev/javac/CompilationProblemReporter.java
@@ -15,7 +15,6 @@
*/
package com.google.gwt.dev.javac;
-import com.google.common.collect.Lists;
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.core.ext.TreeLogger.HelpInfo;
import com.google.gwt.core.ext.TreeLogger.Type;
@@ -27,6 +26,7 @@
import com.google.gwt.dev.jjs.SourceInfo;
import com.google.gwt.dev.util.Messages;
import com.google.gwt.dev.util.Util;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
import org.eclipse.jdt.core.compiler.CategorizedProblem;
diff --git a/dev/core/src/com/google/gwt/dev/javac/CompilationState.java b/dev/core/src/com/google/gwt/dev/javac/CompilationState.java
index 3ad48b4..c3a1079 100644
--- a/dev/core/src/com/google/gwt/dev/javac/CompilationState.java
+++ b/dev/core/src/com/google/gwt/dev/javac/CompilationState.java
@@ -15,7 +15,6 @@
*/
package com.google.gwt.dev.javac;
-import com.google.common.annotations.VisibleForTesting;
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.core.ext.UnableToCompleteException;
import com.google.gwt.dev.CompilerContext;
@@ -24,6 +23,7 @@
import com.google.gwt.dev.util.log.speedtracer.DevModeEventType;
import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger;
import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger.Event;
+import com.google.gwt.thirdparty.guava.common.annotations.VisibleForTesting;
import java.util.Collection;
import java.util.Collections;
diff --git a/dev/core/src/com/google/gwt/dev/javac/CompilationStateBuilder.java b/dev/core/src/com/google/gwt/dev/javac/CompilationStateBuilder.java
index 63570a1..92bd1fe 100644
--- a/dev/core/src/com/google/gwt/dev/javac/CompilationStateBuilder.java
+++ b/dev/core/src/com/google/gwt/dev/javac/CompilationStateBuilder.java
@@ -15,12 +15,6 @@
*/
package com.google.gwt.dev.javac;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Interner;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.core.ext.TreeLogger.Type;
import com.google.gwt.core.ext.UnableToCompleteException;
@@ -40,6 +34,12 @@
import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger;
import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger.Event;
import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger.EventType;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableList;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableMap;
+import com.google.gwt.thirdparty.guava.common.collect.Interner;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
+import com.google.gwt.thirdparty.guava.common.collect.Maps;
+import com.google.gwt.thirdparty.guava.common.collect.Sets;
import org.eclipse.jdt.core.compiler.CharOperation;
import org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration;
diff --git a/dev/core/src/com/google/gwt/dev/javac/CompilationUnitInvalidator.java b/dev/core/src/com/google/gwt/dev/javac/CompilationUnitInvalidator.java
index 5169ca6..3e636c2 100644
--- a/dev/core/src/com/google/gwt/dev/javac/CompilationUnitInvalidator.java
+++ b/dev/core/src/com/google/gwt/dev/javac/CompilationUnitInvalidator.java
@@ -15,11 +15,11 @@
*/
package com.google.gwt.dev.javac;
-import com.google.common.collect.HashMultimap;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Multimap;
import com.google.gwt.core.ext.TreeLogger;
+import com.google.gwt.thirdparty.guava.common.collect.HashMultimap;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableList;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableSet;
+import com.google.gwt.thirdparty.guava.common.collect.Multimap;
import java.util.Collection;
import java.util.HashSet;
diff --git a/dev/core/src/com/google/gwt/dev/javac/CompilationUnitTypeOracleUpdater.java b/dev/core/src/com/google/gwt/dev/javac/CompilationUnitTypeOracleUpdater.java
index 6bab43a..f63e037 100644
--- a/dev/core/src/com/google/gwt/dev/javac/CompilationUnitTypeOracleUpdater.java
+++ b/dev/core/src/com/google/gwt/dev/javac/CompilationUnitTypeOracleUpdater.java
@@ -13,15 +13,6 @@
*/
package com.google.gwt.dev.javac;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Function;
-import com.google.common.collect.Collections2;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Queues;
-import com.google.common.collect.Sets;
-import com.google.common.util.concurrent.ThreadFactoryBuilder;
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.core.ext.typeinfo.JPrimitiveType;
import com.google.gwt.core.ext.typeinfo.JType;
@@ -53,6 +44,15 @@
import com.google.gwt.dev.util.log.speedtracer.CompilerEventType;
import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger;
import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger.Event;
+import com.google.gwt.thirdparty.guava.common.annotations.VisibleForTesting;
+import com.google.gwt.thirdparty.guava.common.base.Function;
+import com.google.gwt.thirdparty.guava.common.collect.Collections2;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableMap;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
+import com.google.gwt.thirdparty.guava.common.collect.Maps;
+import com.google.gwt.thirdparty.guava.common.collect.Queues;
+import com.google.gwt.thirdparty.guava.common.collect.Sets;
+import com.google.gwt.thirdparty.guava.common.util.concurrent.ThreadFactoryBuilder;
import org.objectweb.asm.ClassReader;
import org.objectweb.asm.ClassVisitor;
diff --git a/dev/core/src/com/google/gwt/dev/javac/CompiledClass.java b/dev/core/src/com/google/gwt/dev/javac/CompiledClass.java
index 80a4cd2..e0e7e25 100644
--- a/dev/core/src/com/google/gwt/dev/javac/CompiledClass.java
+++ b/dev/core/src/com/google/gwt/dev/javac/CompiledClass.java
@@ -15,11 +15,11 @@
*/
package com.google.gwt.dev.javac;
-import com.google.common.annotations.VisibleForTesting;
import com.google.gwt.dev.jjs.InternalCompilerException;
import com.google.gwt.dev.util.DiskCache;
import com.google.gwt.dev.util.DiskCacheToken;
import com.google.gwt.dev.util.StringInterner;
+import com.google.gwt.thirdparty.guava.common.annotations.VisibleForTesting;
import org.eclipse.jdt.internal.compiler.classfmt.ClassFileReader;
import org.eclipse.jdt.internal.compiler.classfmt.ClassFormatException;
diff --git a/dev/core/src/com/google/gwt/dev/javac/JSORestrictionsChecker.java b/dev/core/src/com/google/gwt/dev/javac/JSORestrictionsChecker.java
index 51554fe..5b4e618 100644
--- a/dev/core/src/com/google/gwt/dev/javac/JSORestrictionsChecker.java
+++ b/dev/core/src/com/google/gwt/dev/javac/JSORestrictionsChecker.java
@@ -15,10 +15,10 @@
*/
package com.google.gwt.dev.javac;
-import com.google.common.base.Strings;
import com.google.gwt.dev.jdt.SafeASTVisitor;
import com.google.gwt.dev.util.InstalledHelpInfo;
import com.google.gwt.dev.util.collect.Stack;
+import com.google.gwt.thirdparty.guava.common.base.Strings;
import org.eclipse.jdt.core.compiler.CharOperation;
import org.eclipse.jdt.internal.compiler.ast.ASTNode;
diff --git a/dev/core/src/com/google/gwt/dev/javac/JdtCompiler.java b/dev/core/src/com/google/gwt/dev/javac/JdtCompiler.java
index 2b54942..139da4c 100644
--- a/dev/core/src/com/google/gwt/dev/javac/JdtCompiler.java
+++ b/dev/core/src/com/google/gwt/dev/javac/JdtCompiler.java
@@ -15,10 +15,6 @@
*/
package com.google.gwt.dev.javac;
-import com.google.common.collect.ArrayListMultimap;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ListMultimap;
-import com.google.common.io.BaseEncoding;
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.core.ext.UnableToCompleteException;
import com.google.gwt.dev.CompilerContext;
@@ -30,6 +26,10 @@
import com.google.gwt.dev.util.log.speedtracer.CompilerEventType;
import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger;
import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger.Event;
+import com.google.gwt.thirdparty.guava.common.collect.ArrayListMultimap;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableMap;
+import com.google.gwt.thirdparty.guava.common.collect.ListMultimap;
+import com.google.gwt.thirdparty.guava.common.io.BaseEncoding;
import com.google.gwt.util.tools.Utility;
import org.eclipse.jdt.core.compiler.CharOperation;
diff --git a/dev/core/src/com/google/gwt/dev/javac/JdtUtil.java b/dev/core/src/com/google/gwt/dev/javac/JdtUtil.java
index 20a4b6e..e427346 100644
--- a/dev/core/src/com/google/gwt/dev/javac/JdtUtil.java
+++ b/dev/core/src/com/google/gwt/dev/javac/JdtUtil.java
@@ -15,9 +15,9 @@
*/
package com.google.gwt.dev.javac;
-import com.google.common.base.Joiner;
-import com.google.common.base.Strings;
-import com.google.common.collect.Lists;
+import com.google.gwt.thirdparty.guava.common.base.Joiner;
+import com.google.gwt.thirdparty.guava.common.base.Strings;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
import org.eclipse.jdt.core.compiler.CharOperation;
import org.eclipse.jdt.internal.compiler.ast.AbstractMethodDeclaration;
diff --git a/dev/core/src/com/google/gwt/dev/javac/JsniReferenceResolver.java b/dev/core/src/com/google/gwt/dev/javac/JsniReferenceResolver.java
index 193b605..36010d3 100644
--- a/dev/core/src/com/google/gwt/dev/javac/JsniReferenceResolver.java
+++ b/dev/core/src/com/google/gwt/dev/javac/JsniReferenceResolver.java
@@ -15,8 +15,6 @@
*/
package com.google.gwt.dev.javac;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Lists;
import com.google.gwt.core.client.UnsafeNativeLong;
import com.google.gwt.dev.jdt.SafeASTVisitor;
import com.google.gwt.dev.jjs.SourceInfo;
@@ -28,6 +26,8 @@
import com.google.gwt.dev.util.InstalledHelpInfo;
import com.google.gwt.dev.util.JsniRef;
import com.google.gwt.dev.util.collect.Stack;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableSet;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
import org.eclipse.jdt.core.compiler.CharOperation;
import org.eclipse.jdt.internal.compiler.ast.ASTNode;
diff --git a/dev/core/src/com/google/gwt/dev/javac/MemoryUnitCache.java b/dev/core/src/com/google/gwt/dev/javac/MemoryUnitCache.java
index 9182787..0a4faec 100644
--- a/dev/core/src/com/google/gwt/dev/javac/MemoryUnitCache.java
+++ b/dev/core/src/com/google/gwt/dev/javac/MemoryUnitCache.java
@@ -15,9 +15,10 @@
*/
package com.google.gwt.dev.javac;
-import com.google.common.collect.Maps;
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.core.ext.UnableToCompleteException;
+import com.google.gwt.dev.javac.MemoryUnitCache.UnitCacheEntry;
+import com.google.gwt.thirdparty.guava.common.collect.Maps;
import java.util.Map;
diff --git a/dev/core/src/com/google/gwt/dev/javac/PersistentUnitCache.java b/dev/core/src/com/google/gwt/dev/javac/PersistentUnitCache.java
index c91af20..e18160e 100644
--- a/dev/core/src/com/google/gwt/dev/javac/PersistentUnitCache.java
+++ b/dev/core/src/com/google/gwt/dev/javac/PersistentUnitCache.java
@@ -15,13 +15,13 @@
*/
package com.google.gwt.dev.javac;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Lists;
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.core.ext.TreeLogger.Type;
import com.google.gwt.core.ext.UnableToCompleteException;
import com.google.gwt.dev.jjs.InternalCompilerException;
+import com.google.gwt.thirdparty.guava.common.annotations.VisibleForTesting;
+import com.google.gwt.thirdparty.guava.common.base.Preconditions;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
import java.io.File;
import java.util.List;
diff --git a/dev/core/src/com/google/gwt/dev/javac/PersistentUnitCacheDir.java b/dev/core/src/com/google/gwt/dev/javac/PersistentUnitCacheDir.java
index 391dab8..8b04f19 100644
--- a/dev/core/src/com/google/gwt/dev/javac/PersistentUnitCacheDir.java
+++ b/dev/core/src/com/google/gwt/dev/javac/PersistentUnitCacheDir.java
@@ -15,8 +15,6 @@
*/
package com.google.gwt.dev.javac;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.collect.Lists;
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.core.ext.TreeLogger.Type;
import com.google.gwt.core.ext.UnableToCompleteException;
@@ -26,6 +24,8 @@
import com.google.gwt.dev.util.log.speedtracer.DevModeEventType;
import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger;
import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger.Event;
+import com.google.gwt.thirdparty.guava.common.annotations.VisibleForTesting;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
import com.google.gwt.util.tools.Utility;
import java.io.BufferedInputStream;
diff --git a/dev/core/src/com/google/gwt/dev/javac/StandardGeneratorContext.java b/dev/core/src/com/google/gwt/dev/javac/StandardGeneratorContext.java
index a60743e..5cc75c3 100644
--- a/dev/core/src/com/google/gwt/dev/javac/StandardGeneratorContext.java
+++ b/dev/core/src/com/google/gwt/dev/javac/StandardGeneratorContext.java
@@ -15,7 +15,6 @@
*/
package com.google.gwt.dev.javac;
-import com.google.common.io.Files;
import com.google.gwt.core.ext.CachedGeneratorResult;
import com.google.gwt.core.ext.Generator;
import com.google.gwt.core.ext.GeneratorContext;
@@ -46,6 +45,7 @@
import com.google.gwt.dev.util.log.speedtracer.CompilerEventType;
import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger;
import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger.Event;
+import com.google.gwt.thirdparty.guava.common.io.Files;
import com.google.gwt.util.tools.Utility;
import java.io.ByteArrayOutputStream;
diff --git a/dev/core/src/com/google/gwt/dev/javac/testing/impl/MockResourceOracle.java b/dev/core/src/com/google/gwt/dev/javac/testing/impl/MockResourceOracle.java
index 5f64621..cb31ade 100644
--- a/dev/core/src/com/google/gwt/dev/javac/testing/impl/MockResourceOracle.java
+++ b/dev/core/src/com/google/gwt/dev/javac/testing/impl/MockResourceOracle.java
@@ -15,11 +15,11 @@
*/
package com.google.gwt.dev.javac.testing.impl;
-import com.google.common.collect.Lists;
-import com.google.common.io.Files;
import com.google.gwt.dev.resource.Resource;
import com.google.gwt.dev.resource.impl.ClassPathEntry;
import com.google.gwt.dev.resource.impl.ResourceOracleImpl;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
+import com.google.gwt.thirdparty.guava.common.io.Files;
import java.util.Collections;
import java.util.HashMap;
@@ -75,7 +75,7 @@
pathName = Files.simplifyPath(pathName);
return exportedMap.get(pathName);
}
-
+
@Override
public Set<Resource> getResources() {
return exportedValues;
diff --git a/dev/core/src/com/google/gwt/dev/javac/typemodel/TypeOracle.java b/dev/core/src/com/google/gwt/dev/javac/typemodel/TypeOracle.java
index 57ef735..dd281d8 100644
--- a/dev/core/src/com/google/gwt/dev/javac/typemodel/TypeOracle.java
+++ b/dev/core/src/com/google/gwt/dev/javac/typemodel/TypeOracle.java
@@ -15,8 +15,6 @@
*/
package com.google.gwt.dev.javac.typemodel;
-import com.google.common.collect.MapMaker;
-import com.google.common.collect.Sets;
import com.google.gwt.core.ext.typeinfo.BadTypeArgsException;
import com.google.gwt.core.ext.typeinfo.JPrimitiveType;
import com.google.gwt.core.ext.typeinfo.JType;
@@ -29,6 +27,8 @@
import com.google.gwt.dev.util.Name;
import com.google.gwt.dev.util.collect.HashMap;
import com.google.gwt.dev.util.collect.IdentityHashMap;
+import com.google.gwt.thirdparty.guava.common.collect.MapMaker;
+import com.google.gwt.thirdparty.guava.common.collect.Sets;
import java.lang.annotation.Annotation;
import java.util.ArrayList;
diff --git a/dev/core/src/com/google/gwt/dev/jjs/CorrelationFactory.java b/dev/core/src/com/google/gwt/dev/jjs/CorrelationFactory.java
index f247e29..0ec9491 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/CorrelationFactory.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/CorrelationFactory.java
@@ -15,12 +15,12 @@
*/
package com.google.gwt.dev.jjs;
-import com.google.common.collect.MapMaker;
import com.google.gwt.dev.jjs.Correlation.Axis;
import com.google.gwt.dev.jjs.Correlation.Literal;
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.thirdparty.guava.common.collect.MapMaker;
import java.io.Serializable;
import java.util.EnumMap;
diff --git a/dev/core/src/com/google/gwt/dev/jjs/JavaToJavaScriptCompiler.java b/dev/core/src/com/google/gwt/dev/jjs/JavaToJavaScriptCompiler.java
index ff98e52..185ed0f 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/JavaToJavaScriptCompiler.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/JavaToJavaScriptCompiler.java
@@ -13,11 +13,6 @@
*/
package com.google.gwt.dev.jjs;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Multimap;
-import com.google.common.collect.Sets;
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.core.ext.UnableToCompleteException;
import com.google.gwt.core.ext.linker.Artifact;
@@ -151,6 +146,11 @@
import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger.Event;
import com.google.gwt.soyc.SoycDashboard;
import com.google.gwt.soyc.io.ArtifactsOutputDirectory;
+import com.google.gwt.thirdparty.guava.common.annotations.VisibleForTesting;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableMap;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
+import com.google.gwt.thirdparty.guava.common.collect.Multimap;
+import com.google.gwt.thirdparty.guava.common.collect.Sets;
import org.xml.sax.SAXException;
diff --git a/dev/core/src/com/google/gwt/dev/jjs/ast/JCastMap.java b/dev/core/src/com/google/gwt/dev/jjs/ast/JCastMap.java
index 1b4e77d..24f1cb4 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/ast/JCastMap.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/ast/JCastMap.java
@@ -15,8 +15,8 @@
*/
package com.google.gwt.dev.jjs.ast;
-import com.google.common.collect.Lists;
import com.google.gwt.dev.jjs.SourceInfo;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
import java.util.Collection;
import java.util.List;
diff --git a/dev/core/src/com/google/gwt/dev/jjs/ast/JDeclaredType.java b/dev/core/src/com/google/gwt/dev/jjs/ast/JDeclaredType.java
index 004437c..d50a567 100755
--- a/dev/core/src/com/google/gwt/dev/jjs/ast/JDeclaredType.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/ast/JDeclaredType.java
@@ -15,12 +15,12 @@
*/
package com.google.gwt.dev.jjs.ast;
-import com.google.common.base.Preconditions;
-import com.google.common.base.Strings;
import com.google.gwt.dev.jjs.SourceInfo;
import com.google.gwt.dev.jjs.impl.GwtAstBuilder;
import com.google.gwt.dev.util.StringInterner;
import com.google.gwt.dev.util.collect.Lists;
+import com.google.gwt.thirdparty.guava.common.base.Preconditions;
+import com.google.gwt.thirdparty.guava.common.base.Strings;
import java.io.IOException;
import java.io.ObjectInputStream;
diff --git a/dev/core/src/com/google/gwt/dev/jjs/ast/JForStatement.java b/dev/core/src/com/google/gwt/dev/jjs/ast/JForStatement.java
index daf681e..d9b7c7f 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/ast/JForStatement.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/ast/JForStatement.java
@@ -15,8 +15,8 @@
*/
package com.google.gwt.dev.jjs.ast;
-import com.google.common.collect.Lists;
import com.google.gwt.dev.jjs.SourceInfo;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
import java.util.List;
diff --git a/dev/core/src/com/google/gwt/dev/jjs/ast/JPrimitiveType.java b/dev/core/src/com/google/gwt/dev/jjs/ast/JPrimitiveType.java
index ce19f5c..c7a80c6 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/ast/JPrimitiveType.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/ast/JPrimitiveType.java
@@ -15,9 +15,9 @@
*/
package com.google.gwt.dev.jjs.ast;
-import com.google.common.collect.Maps;
import com.google.gwt.dev.jjs.SourceOrigin;
import com.google.gwt.dev.util.StringInterner;
+import com.google.gwt.thirdparty.guava.common.collect.Maps;
import java.util.Map;
diff --git a/dev/core/src/com/google/gwt/dev/jjs/ast/JProgram.java b/dev/core/src/com/google/gwt/dev/jjs/ast/JProgram.java
index 0adfa4a..a5f0a4a 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/ast/JProgram.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/ast/JProgram.java
@@ -15,14 +15,6 @@
*/
package com.google.gwt.dev.jjs.ast;
-import com.google.common.base.Function;
-import com.google.common.collect.BiMap;
-import com.google.common.collect.Collections2;
-import com.google.common.collect.HashBiMap;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
import com.google.gwt.dev.MinimalRebuildCache;
import com.google.gwt.dev.jjs.Correlation.Literal;
import com.google.gwt.dev.jjs.InternalCompilerException;
@@ -34,6 +26,14 @@
import com.google.gwt.dev.util.log.speedtracer.CompilerEventType;
import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger;
import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger.Event;
+import com.google.gwt.thirdparty.guava.common.base.Function;
+import com.google.gwt.thirdparty.guava.common.collect.BiMap;
+import com.google.gwt.thirdparty.guava.common.collect.Collections2;
+import com.google.gwt.thirdparty.guava.common.collect.HashBiMap;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableList;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
+import com.google.gwt.thirdparty.guava.common.collect.Maps;
+import com.google.gwt.thirdparty.guava.common.collect.Sets;
import java.io.IOException;
import java.io.ObjectInputStream;
diff --git a/dev/core/src/com/google/gwt/dev/jjs/ast/JTypeOracle.java b/dev/core/src/com/google/gwt/dev/jjs/ast/JTypeOracle.java
index b55702c..5e42e85 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/ast/JTypeOracle.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/ast/JTypeOracle.java
@@ -15,24 +15,24 @@
*/
package com.google.gwt.dev.jjs.ast;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Function;
-import com.google.common.base.Objects;
-import com.google.common.base.Predicate;
-import com.google.common.base.Strings;
-import com.google.common.collect.HashMultimap;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSetMultimap;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.LinkedHashMultimap;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Multimap;
-import com.google.common.collect.Multimaps;
-import com.google.common.collect.Sets;
import com.google.gwt.dev.MinimalRebuildCache;
import com.google.gwt.dev.jjs.ast.js.JMultiExpression;
import com.google.gwt.dev.util.arg.OptionJsInteropMode;
+import com.google.gwt.thirdparty.guava.common.annotations.VisibleForTesting;
+import com.google.gwt.thirdparty.guava.common.base.Function;
+import com.google.gwt.thirdparty.guava.common.base.Objects;
+import com.google.gwt.thirdparty.guava.common.base.Predicate;
+import com.google.gwt.thirdparty.guava.common.base.Strings;
+import com.google.gwt.thirdparty.guava.common.collect.HashMultimap;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableList;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableSetMultimap;
+import com.google.gwt.thirdparty.guava.common.collect.Iterables;
+import com.google.gwt.thirdparty.guava.common.collect.LinkedHashMultimap;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
+import com.google.gwt.thirdparty.guava.common.collect.Maps;
+import com.google.gwt.thirdparty.guava.common.collect.Multimap;
+import com.google.gwt.thirdparty.guava.common.collect.Multimaps;
+import com.google.gwt.thirdparty.guava.common.collect.Sets;
import java.io.Serializable;
import java.util.Collection;
diff --git a/dev/core/src/com/google/gwt/dev/jjs/ast/js/JMultiExpression.java b/dev/core/src/com/google/gwt/dev/jjs/ast/js/JMultiExpression.java
index bba2be3..1509c47 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/ast/js/JMultiExpression.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/ast/js/JMultiExpression.java
@@ -15,13 +15,13 @@
*/
package com.google.gwt.dev.jjs.ast.js;
-import com.google.common.collect.Lists;
import com.google.gwt.dev.jjs.SourceInfo;
import com.google.gwt.dev.jjs.ast.Context;
import com.google.gwt.dev.jjs.ast.JExpression;
import com.google.gwt.dev.jjs.ast.JPrimitiveType;
import com.google.gwt.dev.jjs.ast.JType;
import com.google.gwt.dev.jjs.ast.JVisitor;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
import java.util.Arrays;
import java.util.Collection;
diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/CallGraph.java b/dev/core/src/com/google/gwt/dev/jjs/impl/CallGraph.java
index 15004e0..328d75e 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/impl/CallGraph.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/impl/CallGraph.java
@@ -13,13 +13,13 @@
*/
package com.google.gwt.dev.jjs.impl;
-import com.google.common.collect.HashMultimap;
-import com.google.common.collect.Sets;
import com.google.gwt.dev.jjs.ast.Context;
import com.google.gwt.dev.jjs.ast.JMethod;
import com.google.gwt.dev.jjs.ast.JMethodCall;
import com.google.gwt.dev.jjs.ast.JProgram;
import com.google.gwt.dev.jjs.ast.JVisitor;
+import com.google.gwt.thirdparty.guava.common.collect.HashMultimap;
+import com.google.gwt.thirdparty.guava.common.collect.Sets;
import java.util.Collection;
import java.util.Set;
diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/CompileTimeConstantsReplacer.java b/dev/core/src/com/google/gwt/dev/jjs/impl/CompileTimeConstantsReplacer.java
index 1b29613..0491e08 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/impl/CompileTimeConstantsReplacer.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/impl/CompileTimeConstantsReplacer.java
@@ -15,7 +15,6 @@
*/
package com.google.gwt.dev.jjs.impl;
-import com.google.common.collect.Maps;
import com.google.gwt.dev.jjs.ast.Context;
import com.google.gwt.dev.jjs.ast.JCastOperation;
import com.google.gwt.dev.jjs.ast.JExpression;
@@ -25,6 +24,7 @@
import com.google.gwt.dev.jjs.ast.JPrimitiveType;
import com.google.gwt.dev.jjs.ast.JProgram;
import com.google.gwt.dev.jjs.ast.JType;
+import com.google.gwt.thirdparty.guava.common.collect.Maps;
import java.util.Map;
diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/ComputeCastabilityInformation.java b/dev/core/src/com/google/gwt/dev/jjs/impl/ComputeCastabilityInformation.java
index 2e0d8f7..10e1080 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/impl/ComputeCastabilityInformation.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/impl/ComputeCastabilityInformation.java
@@ -15,11 +15,6 @@
*/
package com.google.gwt.dev.jjs.impl;
-import com.google.common.collect.HashMultimap;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Multimap;
-import com.google.common.collect.Sets;
import com.google.gwt.dev.jjs.SourceOrigin;
import com.google.gwt.dev.jjs.ast.Context;
import com.google.gwt.dev.jjs.ast.HasName;
@@ -37,6 +32,11 @@
import com.google.gwt.dev.jjs.ast.JType;
import com.google.gwt.dev.jjs.ast.JTypeOracle;
import com.google.gwt.dev.jjs.ast.JVisitor;
+import com.google.gwt.thirdparty.guava.common.collect.HashMultimap;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
+import com.google.gwt.thirdparty.guava.common.collect.Maps;
+import com.google.gwt.thirdparty.guava.common.collect.Multimap;
+import com.google.gwt.thirdparty.guava.common.collect.Sets;
import java.util.Collection;
import java.util.Collections;
diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/ComputeExhaustiveCastabilityInformation.java b/dev/core/src/com/google/gwt/dev/jjs/impl/ComputeExhaustiveCastabilityInformation.java
index 4f066cd..900a903 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/impl/ComputeExhaustiveCastabilityInformation.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/impl/ComputeExhaustiveCastabilityInformation.java
@@ -13,13 +13,13 @@
*/
package com.google.gwt.dev.jjs.impl;
-import com.google.common.collect.Maps;
import com.google.gwt.dev.jjs.SourceOrigin;
import com.google.gwt.dev.jjs.ast.JArrayType;
import com.google.gwt.dev.jjs.ast.JCastMap;
import com.google.gwt.dev.jjs.ast.JDeclaredType;
import com.google.gwt.dev.jjs.ast.JProgram;
import com.google.gwt.dev.jjs.ast.JReferenceType;
+import com.google.gwt.thirdparty.guava.common.collect.Maps;
import java.util.Map;
diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/ComputePotentiallyObservableUninitializedValues.java b/dev/core/src/com/google/gwt/dev/jjs/impl/ComputePotentiallyObservableUninitializedValues.java
index e48b344..5cd2f0a 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/impl/ComputePotentiallyObservableUninitializedValues.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/impl/ComputePotentiallyObservableUninitializedValues.java
@@ -16,8 +16,6 @@
package com.google.gwt.dev.jjs.impl;
-import com.google.common.base.Predicate;
-import com.google.common.collect.Sets;
import com.google.gwt.dev.jjs.ast.Context;
import com.google.gwt.dev.jjs.ast.JClassType;
import com.google.gwt.dev.jjs.ast.JConstructor;
@@ -34,6 +32,8 @@
import com.google.gwt.dev.jjs.ast.JVisitor;
import com.google.gwt.dev.util.log.speedtracer.CompilerEventType;
import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger;
+import com.google.gwt.thirdparty.guava.common.base.Predicate;
+import com.google.gwt.thirdparty.guava.common.collect.Sets;
import java.util.Set;
diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/ControlFlowAnalyzer.java b/dev/core/src/com/google/gwt/dev/jjs/impl/ControlFlowAnalyzer.java
index 88c1635..f8adbbd 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/impl/ControlFlowAnalyzer.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/impl/ControlFlowAnalyzer.java
@@ -15,11 +15,6 @@
*/
package com.google.gwt.dev.jjs.impl;
-import com.google.common.collect.ArrayListMultimap;
-import com.google.common.collect.LinkedHashMultimap;
-import com.google.common.collect.ListMultimap;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
import com.google.gwt.dev.jjs.ast.Context;
import com.google.gwt.dev.jjs.ast.JAbsentArrayDimension;
import com.google.gwt.dev.jjs.ast.JArrayType;
@@ -62,6 +57,11 @@
import com.google.gwt.dev.js.ast.JsName;
import com.google.gwt.dev.js.ast.JsNameRef;
import com.google.gwt.dev.js.ast.JsVisitor;
+import com.google.gwt.thirdparty.guava.common.collect.ArrayListMultimap;
+import com.google.gwt.thirdparty.guava.common.collect.LinkedHashMultimap;
+import com.google.gwt.thirdparty.guava.common.collect.ListMultimap;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
+import com.google.gwt.thirdparty.guava.common.collect.Sets;
import java.util.List;
import java.util.Set;
diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/ControlFlowRecorder.java b/dev/core/src/com/google/gwt/dev/jjs/impl/ControlFlowRecorder.java
index 06d2f24..0da4f3a 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/impl/ControlFlowRecorder.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/impl/ControlFlowRecorder.java
@@ -13,7 +13,6 @@
*/
package com.google.gwt.dev.jjs.impl;
-import com.google.common.collect.Sets;
import com.google.gwt.dev.StringAnalyzableTypeEnvironment;
import com.google.gwt.dev.jjs.ast.Context;
import com.google.gwt.dev.jjs.ast.JClassLiteral;
@@ -28,6 +27,7 @@
import com.google.gwt.dev.jjs.ast.JVisitor;
import com.google.gwt.dev.jjs.ast.js.JsniFieldRef;
import com.google.gwt.dev.jjs.ast.js.JsniMethodRef;
+import com.google.gwt.thirdparty.guava.common.collect.Sets;
import java.util.Set;
diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/DeadCodeElimination.java b/dev/core/src/com/google/gwt/dev/jjs/impl/DeadCodeElimination.java
index 0a2fa35..25aff76 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/impl/DeadCodeElimination.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/impl/DeadCodeElimination.java
@@ -15,10 +15,6 @@
*/
package com.google.gwt.dev.jjs.impl;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
import com.google.gwt.dev.jjs.SourceInfo;
import com.google.gwt.dev.jjs.ast.Context;
import com.google.gwt.dev.jjs.ast.JBinaryOperation;
@@ -74,6 +70,10 @@
import com.google.gwt.dev.util.log.speedtracer.CompilerEventType;
import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger;
import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger.Event;
+import com.google.gwt.thirdparty.guava.common.annotations.VisibleForTesting;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableMap;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
+import com.google.gwt.thirdparty.guava.common.collect.Sets;
import java.lang.reflect.Method;
import java.util.ArrayList;
diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/Devirtualizer.java b/dev/core/src/com/google/gwt/dev/jjs/impl/Devirtualizer.java
index 48f0512..aac120a 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/impl/Devirtualizer.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/impl/Devirtualizer.java
@@ -15,8 +15,6 @@
*/
package com.google.gwt.dev.jjs.impl;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
import com.google.gwt.dev.jjs.SourceInfo;
import com.google.gwt.dev.jjs.ast.AccessModifier;
import com.google.gwt.dev.jjs.ast.Context;
@@ -40,6 +38,8 @@
import com.google.gwt.dev.jjs.ast.JVariableRef;
import com.google.gwt.dev.jjs.impl.MakeCallsStatic.CreateStaticImplsVisitor;
import com.google.gwt.dev.jjs.impl.MakeCallsStatic.StaticCallConverter;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
+import com.google.gwt.thirdparty.guava.common.collect.Maps;
import java.util.List;
import java.util.Map;
diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/EnumOrdinalizer.java b/dev/core/src/com/google/gwt/dev/jjs/impl/EnumOrdinalizer.java
index 6ef2c56..e4c234d 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/impl/EnumOrdinalizer.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/impl/EnumOrdinalizer.java
@@ -15,11 +15,6 @@
*/
package com.google.gwt.dev.jjs.impl;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Multimap;
-import com.google.common.collect.Ordering;
-import com.google.common.collect.Sets;
-import com.google.common.collect.TreeMultimap;
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.dev.jjs.SourceInfo;
import com.google.gwt.dev.jjs.ast.Context;
@@ -49,6 +44,11 @@
import com.google.gwt.dev.util.log.speedtracer.CompilerEventType;
import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger;
import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger.Event;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
+import com.google.gwt.thirdparty.guava.common.collect.Multimap;
+import com.google.gwt.thirdparty.guava.common.collect.Ordering;
+import com.google.gwt.thirdparty.guava.common.collect.Sets;
+import com.google.gwt.thirdparty.guava.common.collect.TreeMultimap;
import java.util.Comparator;
import java.util.List;
diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/FieldReferencesGraph.java b/dev/core/src/com/google/gwt/dev/jjs/impl/FieldReferencesGraph.java
index f81684c..e82b581 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/impl/FieldReferencesGraph.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/impl/FieldReferencesGraph.java
@@ -13,14 +13,14 @@
*/
package com.google.gwt.dev.jjs.impl;
-import com.google.common.collect.HashMultimap;
-import com.google.common.collect.Multimap;
import com.google.gwt.dev.jjs.ast.Context;
import com.google.gwt.dev.jjs.ast.JField;
import com.google.gwt.dev.jjs.ast.JFieldRef;
import com.google.gwt.dev.jjs.ast.JMethod;
import com.google.gwt.dev.jjs.ast.JProgram;
import com.google.gwt.dev.jjs.ast.JVisitor;
+import com.google.gwt.thirdparty.guava.common.collect.HashMultimap;
+import com.google.gwt.thirdparty.guava.common.collect.Multimap;
import java.util.Collection;
import java.util.LinkedHashSet;
diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/Finalizer.java b/dev/core/src/com/google/gwt/dev/jjs/impl/Finalizer.java
index 21b8bf2..d01e6ca 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/impl/Finalizer.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/impl/Finalizer.java
@@ -15,7 +15,6 @@
*/
package com.google.gwt.dev.jjs.impl;
-import com.google.common.annotations.VisibleForTesting;
import com.google.gwt.dev.jjs.ast.CanBeSetFinal;
import com.google.gwt.dev.jjs.ast.Context;
import com.google.gwt.dev.jjs.ast.JBinaryOperation;
@@ -39,6 +38,7 @@
import com.google.gwt.dev.util.log.speedtracer.CompilerEventType;
import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger;
import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger.Event;
+import com.google.gwt.thirdparty.guava.common.annotations.VisibleForTesting;
import java.util.HashSet;
import java.util.Set;
diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/FullOptimizerContext.java b/dev/core/src/com/google/gwt/dev/jjs/impl/FullOptimizerContext.java
index 8b6adec..43a29e7 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/impl/FullOptimizerContext.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/impl/FullOptimizerContext.java
@@ -13,16 +13,16 @@
*/
package com.google.gwt.dev.jjs.impl;
-import com.google.common.collect.HashMultiset;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Multiset;
-import com.google.common.collect.Sets;
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.JNode;
import com.google.gwt.dev.jjs.ast.JProgram;
import com.google.gwt.dev.jjs.ast.JVisitor;
+import com.google.gwt.thirdparty.guava.common.collect.HashMultiset;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
+import com.google.gwt.thirdparty.guava.common.collect.Multiset;
+import com.google.gwt.thirdparty.guava.common.collect.Sets;
import java.util.Collection;
import java.util.Collections;
diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/GenerateJavaScriptAST.java b/dev/core/src/com/google/gwt/dev/jjs/impl/GenerateJavaScriptAST.java
index 5827b3f..97ecb32 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/impl/GenerateJavaScriptAST.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/impl/GenerateJavaScriptAST.java
@@ -15,18 +15,6 @@
*/
package com.google.gwt.dev.jjs.impl;
-import com.google.common.base.Function;
-import com.google.common.base.Predicate;
-import com.google.common.base.Predicates;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSortedSet;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.LinkedHashMultimap;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Multimap;
-import com.google.common.collect.Sets;
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.core.ext.linker.impl.StandardSymbolData;
import com.google.gwt.dev.CompilerContext;
@@ -181,6 +169,18 @@
import com.google.gwt.dev.util.log.speedtracer.CompilerEventType;
import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger;
import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger.Event;
+import com.google.gwt.thirdparty.guava.common.base.Function;
+import com.google.gwt.thirdparty.guava.common.base.Predicate;
+import com.google.gwt.thirdparty.guava.common.base.Predicates;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableList;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableMap;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableSortedSet;
+import com.google.gwt.thirdparty.guava.common.collect.Iterables;
+import com.google.gwt.thirdparty.guava.common.collect.LinkedHashMultimap;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
+import com.google.gwt.thirdparty.guava.common.collect.Maps;
+import com.google.gwt.thirdparty.guava.common.collect.Multimap;
+import com.google.gwt.thirdparty.guava.common.collect.Sets;
import java.util.ArrayList;
import java.util.Arrays;
diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/GwtAstBuilder.java b/dev/core/src/com/google/gwt/dev/jjs/impl/GwtAstBuilder.java
index bdf70ad..41fef2d 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/impl/GwtAstBuilder.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/impl/GwtAstBuilder.java
@@ -15,13 +15,6 @@
*/
package com.google.gwt.dev.jjs.impl;
-import com.google.common.base.Function;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Interner;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
import com.google.gwt.core.client.impl.DoNotInline;
import com.google.gwt.core.client.impl.HasNoSideEffects;
import com.google.gwt.core.client.impl.SpecializeMethod;
@@ -119,6 +112,13 @@
import com.google.gwt.dev.js.ast.JsParameter;
import com.google.gwt.dev.util.StringInterner;
import com.google.gwt.dev.util.collect.Stack;
+import com.google.gwt.thirdparty.guava.common.base.Function;
+import com.google.gwt.thirdparty.guava.common.base.Preconditions;
+import com.google.gwt.thirdparty.guava.common.collect.Interner;
+import com.google.gwt.thirdparty.guava.common.collect.Iterables;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
+import com.google.gwt.thirdparty.guava.common.collect.Maps;
+import com.google.gwt.thirdparty.guava.common.collect.Sets;
import org.eclipse.jdt.core.compiler.CharOperation;
import org.eclipse.jdt.internal.compiler.ast.AND_AND_Expression;
diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/ImplementCastsAndTypeChecks.java b/dev/core/src/com/google/gwt/dev/jjs/impl/ImplementCastsAndTypeChecks.java
index ee11b26..69e6597 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/impl/ImplementCastsAndTypeChecks.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/impl/ImplementCastsAndTypeChecks.java
@@ -15,7 +15,6 @@
*/
package com.google.gwt.dev.jjs.impl;
-import com.google.common.collect.Maps;
import com.google.gwt.dev.jjs.SourceInfo;
import com.google.gwt.dev.jjs.ast.Context;
import com.google.gwt.dev.jjs.ast.JArrayType;
@@ -33,6 +32,7 @@
import com.google.gwt.dev.jjs.ast.JReferenceType;
import com.google.gwt.dev.jjs.ast.JRuntimeTypeReference;
import com.google.gwt.dev.jjs.ast.JType;
+import com.google.gwt.thirdparty.guava.common.collect.Maps;
import java.util.EnumSet;
import java.util.Map;
diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/ImplementClassLiteralsAsFields.java b/dev/core/src/com/google/gwt/dev/jjs/impl/ImplementClassLiteralsAsFields.java
index 1978455..0ed2e43 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/impl/ImplementClassLiteralsAsFields.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/impl/ImplementClassLiteralsAsFields.java
@@ -15,13 +15,6 @@
*/
package com.google.gwt.dev.jjs.impl;
-import com.google.common.base.Joiner;
-import com.google.common.collect.ArrayListMultimap;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Multimap;
-import com.google.common.collect.Sets;
import com.google.gwt.dev.jjs.Correlation.Literal;
import com.google.gwt.dev.jjs.SourceInfo;
import com.google.gwt.dev.jjs.ast.Context;
@@ -58,6 +51,13 @@
import com.google.gwt.dev.util.log.speedtracer.CompilerEventType;
import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger;
import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger.Event;
+import com.google.gwt.thirdparty.guava.common.base.Joiner;
+import com.google.gwt.thirdparty.guava.common.collect.ArrayListMultimap;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableMap;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
+import com.google.gwt.thirdparty.guava.common.collect.Maps;
+import com.google.gwt.thirdparty.guava.common.collect.Multimap;
+import com.google.gwt.thirdparty.guava.common.collect.Sets;
import java.util.Map;
import java.util.Set;
diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/JModVisitorWithTemporaryVariableCreation.java b/dev/core/src/com/google/gwt/dev/jjs/impl/JModVisitorWithTemporaryVariableCreation.java
index 1d1f5cd..c9487aa 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/impl/JModVisitorWithTemporaryVariableCreation.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/impl/JModVisitorWithTemporaryVariableCreation.java
@@ -15,7 +15,6 @@
*/
package com.google.gwt.dev.jjs.impl;
-import com.google.common.collect.Queues;
import com.google.gwt.dev.jjs.SourceInfo;
import com.google.gwt.dev.jjs.ast.Context;
import com.google.gwt.dev.jjs.ast.JDeclarationStatement;
@@ -25,6 +24,7 @@
import com.google.gwt.dev.jjs.ast.JProgram;
import com.google.gwt.dev.jjs.ast.JStatement;
import com.google.gwt.dev.jjs.ast.JType;
+import com.google.gwt.thirdparty.guava.common.collect.Queues;
import java.util.Deque;
diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/JavaAstVerifier.java b/dev/core/src/com/google/gwt/dev/jjs/impl/JavaAstVerifier.java
index ebffeab..9a2be14 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/impl/JavaAstVerifier.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/impl/JavaAstVerifier.java
@@ -16,8 +16,6 @@
package com.google.gwt.dev.jjs.impl;
-import com.google.common.collect.HashMultimap;
-import com.google.common.collect.Multimap;
import com.google.gwt.dev.jjs.ast.Context;
import com.google.gwt.dev.jjs.ast.JDeclaredType;
import com.google.gwt.dev.jjs.ast.JField;
@@ -29,6 +27,8 @@
import com.google.gwt.dev.jjs.ast.JVisitor;
import com.google.gwt.dev.jjs.ast.js.JsniFieldRef;
import com.google.gwt.dev.jjs.ast.js.JsniMethodRef;
+import com.google.gwt.thirdparty.guava.common.collect.HashMultimap;
+import com.google.gwt.thirdparty.guava.common.collect.Multimap;
/**
* Verifies that all the references from AST nodes to AST nodes are reachable from the
diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/JavaToJavaScriptMap.java b/dev/core/src/com/google/gwt/dev/jjs/impl/JavaToJavaScriptMap.java
index 19fd8a1..4fd08be 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/impl/JavaToJavaScriptMap.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/impl/JavaToJavaScriptMap.java
@@ -15,8 +15,6 @@
*/
package com.google.gwt.dev.jjs.impl;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
import com.google.gwt.dev.jjs.ast.HasName;
import com.google.gwt.dev.jjs.ast.JClassType;
import com.google.gwt.dev.jjs.ast.JDeclaredType;
@@ -24,6 +22,8 @@
import com.google.gwt.dev.jjs.ast.JMethod;
import com.google.gwt.dev.js.ast.JsName;
import com.google.gwt.dev.js.ast.JsStatement;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableList;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableMap;
/**
* A map between chunks of JavaScript to chunks of Java.
diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/JavaToJavaScriptMapImpl.java b/dev/core/src/com/google/gwt/dev/jjs/impl/JavaToJavaScriptMapImpl.java
index 9d323d6..2cf4dd1 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/impl/JavaToJavaScriptMapImpl.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/impl/JavaToJavaScriptMapImpl.java
@@ -15,7 +15,6 @@
*/
package com.google.gwt.dev.jjs.impl;
-import com.google.common.collect.Maps;
import com.google.gwt.dev.jjs.ast.HasName;
import com.google.gwt.dev.jjs.ast.JClassType;
import com.google.gwt.dev.jjs.ast.JDeclaredType;
@@ -23,6 +22,7 @@
import com.google.gwt.dev.jjs.ast.JMethod;
import com.google.gwt.dev.js.ast.JsName;
import com.google.gwt.dev.js.ast.JsStatement;
+import com.google.gwt.thirdparty.guava.common.collect.Maps;
import java.util.List;
import java.util.Map;
diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/JjsUtils.java b/dev/core/src/com/google/gwt/dev/jjs/impl/JjsUtils.java
index f1008ba..5bdfbdc 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/impl/JjsUtils.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/impl/JjsUtils.java
@@ -15,11 +15,6 @@
*/
package com.google.gwt.dev.jjs.impl;
-import com.google.common.base.Predicate;
-import com.google.common.base.Predicates;
-import com.google.common.collect.Collections2;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Lists;
import com.google.gwt.dev.PrecompileTaskOptions;
import com.google.gwt.dev.jjs.SourceInfo;
import com.google.gwt.dev.jjs.SourceOrigin;
@@ -53,6 +48,11 @@
import com.google.gwt.dev.js.ast.JsStringLiteral;
import com.google.gwt.dev.util.arg.OptionJsInteropMode.Mode;
import com.google.gwt.lang.LongLib;
+import com.google.gwt.thirdparty.guava.common.base.Predicate;
+import com.google.gwt.thirdparty.guava.common.base.Predicates;
+import com.google.gwt.thirdparty.guava.common.collect.Collections2;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableMap;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
import java.util.Arrays;
import java.util.List;
diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/JsFunctionClusterer.java b/dev/core/src/com/google/gwt/dev/jjs/impl/JsFunctionClusterer.java
index 496f8e6..2671b27 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/impl/JsFunctionClusterer.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/impl/JsFunctionClusterer.java
@@ -15,11 +15,11 @@
*/
package com.google.gwt.dev.jjs.impl;
-import com.google.common.collect.Lists;
import com.google.gwt.core.ext.soyc.Range;
import com.google.gwt.dev.jjs.JsSourceMap;
import com.google.gwt.dev.util.editdistance.GeneralEditDistance;
import com.google.gwt.dev.util.editdistance.GeneralEditDistances;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
import java.util.ArrayList;
import java.util.Arrays;
diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/JsTypeLinker.java b/dev/core/src/com/google/gwt/dev/jjs/impl/JsTypeLinker.java
index d70ae6c..92cb4c0 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/impl/JsTypeLinker.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/impl/JsTypeLinker.java
@@ -13,8 +13,6 @@
*/
package com.google.gwt.dev.jjs.impl;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.core.ext.linker.StatementRanges;
import com.google.gwt.core.ext.linker.impl.JsSourceMapBuilder;
@@ -25,6 +23,8 @@
import com.google.gwt.dev.MinimalRebuildCache;
import com.google.gwt.dev.jjs.JsSourceMap;
import com.google.gwt.dev.jjs.ast.JTypeOracle;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
+import com.google.gwt.thirdparty.guava.common.collect.Sets;
import java.util.Collections;
import java.util.List;
diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/MakeCallsStatic.java b/dev/core/src/com/google/gwt/dev/jjs/impl/MakeCallsStatic.java
index 40cbf78..c8ab261 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/impl/MakeCallsStatic.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/impl/MakeCallsStatic.java
@@ -15,8 +15,6 @@
*/
package com.google.gwt.dev.jjs.impl;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.collect.Sets;
import com.google.gwt.dev.jjs.InternalCompilerException;
import com.google.gwt.dev.jjs.SourceInfo;
import com.google.gwt.dev.jjs.ast.Context;
@@ -48,6 +46,8 @@
import com.google.gwt.dev.util.log.speedtracer.CompilerEventType;
import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger;
import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger.Event;
+import com.google.gwt.thirdparty.guava.common.annotations.VisibleForTesting;
+import com.google.gwt.thirdparty.guava.common.collect.Sets;
import java.util.ArrayList;
import java.util.HashSet;
diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/MethodCallSpecializer.java b/dev/core/src/com/google/gwt/dev/jjs/impl/MethodCallSpecializer.java
index a9cf8c2..c5353e2 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/impl/MethodCallSpecializer.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/impl/MethodCallSpecializer.java
@@ -15,7 +15,6 @@
*/
package com.google.gwt.dev.jjs.impl;
-import com.google.common.annotations.VisibleForTesting;
import com.google.gwt.dev.jjs.ast.Context;
import com.google.gwt.dev.jjs.ast.JMethod;
import com.google.gwt.dev.jjs.ast.JMethodCall;
@@ -25,6 +24,7 @@
import com.google.gwt.dev.util.log.speedtracer.CompilerEventType;
import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger;
import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger.Event;
+import com.google.gwt.thirdparty.guava.common.annotations.VisibleForTesting;
import java.util.List;
diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/MethodCallTightener.java b/dev/core/src/com/google/gwt/dev/jjs/impl/MethodCallTightener.java
index ef2b196..ecd97c1 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/impl/MethodCallTightener.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/impl/MethodCallTightener.java
@@ -15,7 +15,6 @@
*/
package com.google.gwt.dev.jjs.impl;
-import com.google.common.annotations.VisibleForTesting;
import com.google.gwt.dev.jjs.ast.Context;
import com.google.gwt.dev.jjs.ast.JClassType;
import com.google.gwt.dev.jjs.ast.JMethod;
@@ -27,6 +26,7 @@
import com.google.gwt.dev.util.log.speedtracer.CompilerEventType;
import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger;
import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger.Event;
+import com.google.gwt.thirdparty.guava.common.annotations.VisibleForTesting;
/**
* Update polymorphic method calls to tighter bindings based on the type of the
diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/MethodInliner.java b/dev/core/src/com/google/gwt/dev/jjs/impl/MethodInliner.java
index 962c733..5cc3fd7 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/impl/MethodInliner.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/impl/MethodInliner.java
@@ -15,8 +15,6 @@
*/
package com.google.gwt.dev.jjs.impl;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
import com.google.gwt.dev.jjs.InternalCompilerException;
import com.google.gwt.dev.jjs.ast.Context;
import com.google.gwt.dev.jjs.ast.JCastOperation;
@@ -43,6 +41,8 @@
import com.google.gwt.dev.util.log.speedtracer.CompilerEventType;
import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger;
import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger.Event;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
+import com.google.gwt.thirdparty.guava.common.collect.Sets;
import java.util.List;
import java.util.Set;
diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/Pruner.java b/dev/core/src/com/google/gwt/dev/jjs/impl/Pruner.java
index 014e41e..1cee7b7 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/impl/Pruner.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/impl/Pruner.java
@@ -15,12 +15,6 @@
*/
package com.google.gwt.dev.jjs.impl;
-import com.google.common.base.Predicate;
-import com.google.common.base.Predicates;
-import com.google.common.collect.ArrayListMultimap;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.ListMultimap;
-import com.google.common.collect.Sets;
import com.google.gwt.dev.jjs.InternalCompilerException;
import com.google.gwt.dev.jjs.SourceInfo;
import com.google.gwt.dev.jjs.ast.CanBeStatic;
@@ -61,6 +55,12 @@
import com.google.gwt.dev.util.log.speedtracer.CompilerEventType;
import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger;
import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger.Event;
+import com.google.gwt.thirdparty.guava.common.base.Predicate;
+import com.google.gwt.thirdparty.guava.common.base.Predicates;
+import com.google.gwt.thirdparty.guava.common.collect.ArrayListMultimap;
+import com.google.gwt.thirdparty.guava.common.collect.Iterables;
+import com.google.gwt.thirdparty.guava.common.collect.ListMultimap;
+import com.google.gwt.thirdparty.guava.common.collect.Sets;
import java.util.Iterator;
import java.util.List;
diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/ReferenceMapper.java b/dev/core/src/com/google/gwt/dev/jjs/impl/ReferenceMapper.java
index 714cb48..49ad6b6 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/impl/ReferenceMapper.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/impl/ReferenceMapper.java
@@ -15,7 +15,6 @@
*/
package com.google.gwt.dev.jjs.impl;
-import com.google.common.collect.Interner;
import com.google.gwt.dev.javac.JdtUtil;
import com.google.gwt.dev.jjs.InternalCompilerException;
import com.google.gwt.dev.jjs.SourceInfo;
@@ -35,6 +34,7 @@
import com.google.gwt.dev.jjs.ast.JReferenceType;
import com.google.gwt.dev.jjs.ast.JType;
import com.google.gwt.dev.util.StringInterner;
+import com.google.gwt.thirdparty.guava.common.collect.Interner;
import org.eclipse.jdt.internal.compiler.lookup.ArrayBinding;
diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/ResolveRuntimeTypeReferences.java b/dev/core/src/com/google/gwt/dev/jjs/impl/ResolveRuntimeTypeReferences.java
index b79bbcd..1d89caf 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/impl/ResolveRuntimeTypeReferences.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/impl/ResolveRuntimeTypeReferences.java
@@ -15,13 +15,6 @@
*/
package com.google.gwt.dev.jjs.impl;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Objects;
-import com.google.common.collect.LinkedHashMultiset;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Multiset;
-import com.google.common.collect.Multisets;
import com.google.gwt.dev.jjs.ast.Context;
import com.google.gwt.dev.jjs.ast.HasName;
import com.google.gwt.dev.jjs.ast.JCastMap;
@@ -34,6 +27,13 @@
import com.google.gwt.dev.jjs.ast.JRuntimeTypeReference;
import com.google.gwt.dev.jjs.ast.JType;
import com.google.gwt.dev.jjs.ast.JVisitor;
+import com.google.gwt.thirdparty.guava.common.annotations.VisibleForTesting;
+import com.google.gwt.thirdparty.guava.common.base.Objects;
+import com.google.gwt.thirdparty.guava.common.collect.LinkedHashMultiset;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
+import com.google.gwt.thirdparty.guava.common.collect.Maps;
+import com.google.gwt.thirdparty.guava.common.collect.Multiset;
+import com.google.gwt.thirdparty.guava.common.collect.Multisets;
import java.io.Serializable;
import java.util.Collections;
diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/SameParameterValueOptimizer.java b/dev/core/src/com/google/gwt/dev/jjs/impl/SameParameterValueOptimizer.java
index 24cd877..10c3351 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/impl/SameParameterValueOptimizer.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/impl/SameParameterValueOptimizer.java
@@ -15,7 +15,6 @@
*/
package com.google.gwt.dev.jjs.impl;
-import com.google.common.annotations.VisibleForTesting;
import com.google.gwt.dev.jjs.ast.Context;
import com.google.gwt.dev.jjs.ast.JBinaryOperation;
import com.google.gwt.dev.jjs.ast.JConstructor;
@@ -35,6 +34,7 @@
import com.google.gwt.dev.util.log.speedtracer.CompilerEventType;
import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger;
import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger.Event;
+import com.google.gwt.thirdparty.guava.common.annotations.VisibleForTesting;
import java.util.HashSet;
import java.util.IdentityHashMap;
diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/TypeTightener.java b/dev/core/src/com/google/gwt/dev/jjs/impl/TypeTightener.java
index d978ee3..30f1f0c 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/impl/TypeTightener.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/impl/TypeTightener.java
@@ -15,12 +15,6 @@
*/
package com.google.gwt.dev.jjs.impl;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Predicate;
-import com.google.common.collect.HashMultimap;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Multimap;
-import com.google.common.collect.Sets;
import com.google.gwt.dev.jjs.SourceOrigin;
import com.google.gwt.dev.jjs.ast.CanBeAbstract;
import com.google.gwt.dev.jjs.ast.CanBeStatic;
@@ -60,6 +54,12 @@
import com.google.gwt.dev.util.log.speedtracer.CompilerEventType;
import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger;
import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger.Event;
+import com.google.gwt.thirdparty.guava.common.annotations.VisibleForTesting;
+import com.google.gwt.thirdparty.guava.common.base.Predicate;
+import com.google.gwt.thirdparty.guava.common.collect.HashMultimap;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
+import com.google.gwt.thirdparty.guava.common.collect.Multimap;
+import com.google.gwt.thirdparty.guava.common.collect.Sets;
import java.util.ArrayList;
import java.util.Arrays;
diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/UnifyAst.java b/dev/core/src/com/google/gwt/dev/jjs/impl/UnifyAst.java
index 387bd52..5650a98 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/impl/UnifyAst.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/impl/UnifyAst.java
@@ -15,11 +15,6 @@
*/
package com.google.gwt.dev.jjs.impl;
-import com.google.common.base.Predicate;
-import com.google.common.collect.LinkedHashMultimap;
-import com.google.common.collect.Multimap;
-import com.google.common.collect.Sets;
-import com.google.common.collect.Sets.SetView;
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.core.ext.TreeLogger.Type;
import com.google.gwt.core.ext.UnableToCompleteException;
@@ -92,6 +87,11 @@
import com.google.gwt.dev.util.log.speedtracer.CompilerEventType;
import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger;
import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger.Event;
+import com.google.gwt.thirdparty.guava.common.base.Predicate;
+import com.google.gwt.thirdparty.guava.common.collect.LinkedHashMultimap;
+import com.google.gwt.thirdparty.guava.common.collect.Multimap;
+import com.google.gwt.thirdparty.guava.common.collect.Sets;
+import com.google.gwt.thirdparty.guava.common.collect.Sets.SetView;
import java.util.ArrayList;
import java.util.Arrays;
diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/codesplitter/CodeSplitter.java b/dev/core/src/com/google/gwt/dev/jjs/impl/codesplitter/CodeSplitter.java
index 8e4198e..ed03461 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/impl/codesplitter/CodeSplitter.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/impl/codesplitter/CodeSplitter.java
@@ -15,12 +15,6 @@
*/
package com.google.gwt.dev.jjs.impl.codesplitter;
-import com.google.common.base.Predicate;
-import com.google.common.collect.Collections2;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Multimap;
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.dev.jjs.ast.JClassType;
import com.google.gwt.dev.jjs.ast.JMethod;
@@ -37,6 +31,12 @@
import com.google.gwt.dev.util.log.speedtracer.CompilerEventType;
import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger;
import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger.Event;
+import com.google.gwt.thirdparty.guava.common.base.Predicate;
+import com.google.gwt.thirdparty.guava.common.collect.Collections2;
+import com.google.gwt.thirdparty.guava.common.collect.Iterables;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
+import com.google.gwt.thirdparty.guava.common.collect.Maps;
+import com.google.gwt.thirdparty.guava.common.collect.Multimap;
import java.util.ArrayList;
diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/codesplitter/CodeSplitters.java b/dev/core/src/com/google/gwt/dev/jjs/impl/codesplitter/CodeSplitters.java
index 9a4678d..0fb97fe 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/impl/codesplitter/CodeSplitters.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/impl/codesplitter/CodeSplitters.java
@@ -15,12 +15,6 @@
*/
package com.google.gwt.dev.jjs.impl.codesplitter;
-import com.google.common.base.Function;
-import com.google.common.base.Joiner;
-import com.google.common.collect.Collections2;
-import com.google.common.collect.LinkedListMultimap;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Multimap;
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.core.ext.UnableToCompleteException;
import com.google.gwt.dev.cfg.ConfigProps;
@@ -38,6 +32,12 @@
import com.google.gwt.dev.util.JsniRef;
import com.google.gwt.dev.util.log.speedtracer.CompilerEventType;
import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger;
+import com.google.gwt.thirdparty.guava.common.base.Function;
+import com.google.gwt.thirdparty.guava.common.base.Joiner;
+import com.google.gwt.thirdparty.guava.common.collect.Collections2;
+import com.google.gwt.thirdparty.guava.common.collect.LinkedListMultimap;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
+import com.google.gwt.thirdparty.guava.common.collect.Multimap;
import java.util.ArrayList;
import java.util.Collection;
diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/codesplitter/ExclusivityMap.java b/dev/core/src/com/google/gwt/dev/jjs/impl/codesplitter/ExclusivityMap.java
index e19c7e7..c2290a4 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/impl/codesplitter/ExclusivityMap.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/impl/codesplitter/ExclusivityMap.java
@@ -15,8 +15,6 @@
*/
package com.google.gwt.dev.jjs.impl.codesplitter;
-import com.google.common.base.Predicates;
-import com.google.common.collect.Sets;
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.dev.jjs.ast.Context;
import com.google.gwt.dev.jjs.ast.JClassLiteral;
@@ -34,6 +32,8 @@
import com.google.gwt.dev.js.ast.JsStatement;
import com.google.gwt.dev.util.collect.HashMap;
import com.google.gwt.dev.util.collect.HashSet;
+import com.google.gwt.thirdparty.guava.common.base.Predicates;
+import com.google.gwt.thirdparty.guava.common.collect.Sets;
import java.util.ArrayDeque;
import java.util.Collection;
diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/codesplitter/Fragment.java b/dev/core/src/com/google/gwt/dev/jjs/impl/codesplitter/Fragment.java
index 5b7fda7..2004202 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/impl/codesplitter/Fragment.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/impl/codesplitter/Fragment.java
@@ -15,10 +15,10 @@
*/
package com.google.gwt.dev.jjs.impl.codesplitter;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Sets;
import com.google.gwt.dev.jjs.ast.JRunAsync;
import com.google.gwt.dev.js.ast.JsStatement;
+import com.google.gwt.thirdparty.guava.common.base.Preconditions;
+import com.google.gwt.thirdparty.guava.common.collect.Sets;
import java.util.Collection;
import java.util.List;
diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/codesplitter/FragmentPartitioningResult.java b/dev/core/src/com/google/gwt/dev/jjs/impl/codesplitter/FragmentPartitioningResult.java
index b091b32..fb75070 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/impl/codesplitter/FragmentPartitioningResult.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/impl/codesplitter/FragmentPartitioningResult.java
@@ -15,8 +15,8 @@
*/
package com.google.gwt.dev.jjs.impl.codesplitter;
-import com.google.common.base.Preconditions;
import com.google.gwt.dev.jjs.ast.JRunAsync;
+import com.google.gwt.thirdparty.guava.common.base.Preconditions;
import java.util.Collection;
diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/codesplitter/LiveAtomsByRunAsyncSets.java b/dev/core/src/com/google/gwt/dev/jjs/impl/codesplitter/LiveAtomsByRunAsyncSets.java
index 6a4087c..eb0e13f 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/impl/codesplitter/LiveAtomsByRunAsyncSets.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/impl/codesplitter/LiveAtomsByRunAsyncSets.java
@@ -13,10 +13,6 @@
*/
package com.google.gwt.dev.jjs.impl.codesplitter;
-import com.google.common.collect.LinkedHashMultiset;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Multiset;
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.dev.jjs.ast.JDeclaredType;
import com.google.gwt.dev.jjs.ast.JField;
@@ -25,6 +21,10 @@
import com.google.gwt.dev.jjs.ast.JReferenceType;
import com.google.gwt.dev.jjs.ast.JRunAsync;
import com.google.gwt.dev.jjs.impl.ControlFlowAnalyzer;
+import com.google.gwt.thirdparty.guava.common.collect.LinkedHashMultiset;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
+import com.google.gwt.thirdparty.guava.common.collect.Maps;
+import com.google.gwt.thirdparty.guava.common.collect.Multiset;
import java.util.BitSet;
import java.util.Collection;
diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/gflow/AnalysisSolver.java b/dev/core/src/com/google/gwt/dev/jjs/impl/gflow/AnalysisSolver.java
index 4aa6c02..d8c1997 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/impl/gflow/AnalysisSolver.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/impl/gflow/AnalysisSolver.java
@@ -15,8 +15,8 @@
*/
package com.google.gwt.dev.jjs.impl.gflow;
-import com.google.common.base.Preconditions;
import com.google.gwt.dev.jjs.impl.gflow.TransformationFunction.Transformation;
+import com.google.gwt.thirdparty.guava.common.base.Preconditions;
import java.util.ArrayList;
import java.util.Collections;
diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/gflow/AssumptionUtil.java b/dev/core/src/com/google/gwt/dev/jjs/impl/gflow/AssumptionUtil.java
index 34855c8..cb73197 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/impl/gflow/AssumptionUtil.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/impl/gflow/AssumptionUtil.java
@@ -15,7 +15,7 @@
*/
package com.google.gwt.dev.jjs.impl.gflow;
-import com.google.common.base.Preconditions;
+import com.google.gwt.thirdparty.guava.common.base.Preconditions;
import java.util.List;
diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/gflow/CombinedIntegratedAnalysis.java b/dev/core/src/com/google/gwt/dev/jjs/impl/gflow/CombinedIntegratedAnalysis.java
index fbb5efe..ac9047a 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/impl/gflow/CombinedIntegratedAnalysis.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/impl/gflow/CombinedIntegratedAnalysis.java
@@ -15,8 +15,8 @@
*/
package com.google.gwt.dev.jjs.impl.gflow;
-import com.google.common.base.Preconditions;
import com.google.gwt.dev.jjs.impl.gflow.TransformationFunction.Transformation;
+import com.google.gwt.thirdparty.guava.common.base.Preconditions;
import java.util.ArrayList;
import java.util.IdentityHashMap;
diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/gflow/DataflowOptimizer.java b/dev/core/src/com/google/gwt/dev/jjs/impl/gflow/DataflowOptimizer.java
index 603ae92..73da5d0 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/impl/gflow/DataflowOptimizer.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/impl/gflow/DataflowOptimizer.java
@@ -15,7 +15,6 @@
*/
package com.google.gwt.dev.jjs.impl.gflow;
-import com.google.common.base.Preconditions;
import com.google.gwt.dev.jjs.ast.Context;
import com.google.gwt.dev.jjs.ast.JDeclaredType;
import com.google.gwt.dev.jjs.ast.JMethod;
@@ -37,6 +36,7 @@
import com.google.gwt.dev.util.log.speedtracer.CompilerEventType;
import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger;
import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger.Event;
+import com.google.gwt.thirdparty.guava.common.base.Preconditions;
/**
*/
diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/gflow/cfg/Cfg.java b/dev/core/src/com/google/gwt/dev/jjs/impl/gflow/cfg/Cfg.java
index 05dd3c2..b739cd2 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/impl/gflow/cfg/Cfg.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/impl/gflow/cfg/Cfg.java
@@ -15,9 +15,9 @@
*/
package com.google.gwt.dev.jjs.impl.gflow.cfg;
-import com.google.common.base.Preconditions;
import com.google.gwt.dev.jjs.impl.gflow.Graph;
import com.google.gwt.dev.util.collect.Lists;
+import com.google.gwt.thirdparty.guava.common.base.Preconditions;
import java.util.ArrayList;
import java.util.List;
diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/gflow/cfg/CfgBuilder.java b/dev/core/src/com/google/gwt/dev/jjs/impl/gflow/cfg/CfgBuilder.java
index 13ba91c..3173b5a 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/impl/gflow/cfg/CfgBuilder.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/impl/gflow/cfg/CfgBuilder.java
@@ -15,7 +15,6 @@
*/
package com.google.gwt.dev.jjs.impl.gflow.cfg;
-import com.google.common.base.Preconditions;
import com.google.gwt.dev.jjs.ast.Context;
import com.google.gwt.dev.jjs.ast.JArrayRef;
import com.google.gwt.dev.jjs.ast.JBinaryOperation;
@@ -51,6 +50,7 @@
import com.google.gwt.dev.jjs.ast.JVisitor;
import com.google.gwt.dev.jjs.ast.JWhileStatement;
import com.google.gwt.dev.jjs.ast.js.JDebuggerStatement;
+import com.google.gwt.thirdparty.guava.common.base.Preconditions;
import java.util.ArrayList;
import java.util.EnumMap;
diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/gflow/constants/ConstantConditionTransformation.java b/dev/core/src/com/google/gwt/dev/jjs/impl/gflow/constants/ConstantConditionTransformation.java
index 4c929fb..51d90d8 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/impl/gflow/constants/ConstantConditionTransformation.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/impl/gflow/constants/ConstantConditionTransformation.java
@@ -15,7 +15,6 @@
*/
package com.google.gwt.dev.jjs.impl.gflow.constants;
-import com.google.common.base.Preconditions;
import com.google.gwt.dev.jjs.ast.Context;
import com.google.gwt.dev.jjs.ast.JBooleanLiteral;
import com.google.gwt.dev.jjs.ast.JExpression;
@@ -29,6 +28,7 @@
import com.google.gwt.dev.jjs.impl.gflow.cfg.CfgNode;
import com.google.gwt.dev.jjs.impl.gflow.cfg.CfgNopNode;
import com.google.gwt.dev.jjs.impl.gflow.cfg.CfgTransformer;
+import com.google.gwt.thirdparty.guava.common.base.Preconditions;
/**
* Transformation to be applied when CfgConditionalNode's condition is constant
diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/gflow/constants/ConstantsAssumption.java b/dev/core/src/com/google/gwt/dev/jjs/impl/gflow/constants/ConstantsAssumption.java
index 857002b..024dfc1 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/impl/gflow/constants/ConstantsAssumption.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/impl/gflow/constants/ConstantsAssumption.java
@@ -15,13 +15,13 @@
*/
package com.google.gwt.dev.jjs.impl.gflow.constants;
-import com.google.common.base.Preconditions;
import com.google.gwt.dev.jjs.ast.HasName;
import com.google.gwt.dev.jjs.ast.JDoubleLiteral;
import com.google.gwt.dev.jjs.ast.JFloatLiteral;
import com.google.gwt.dev.jjs.ast.JValueLiteral;
import com.google.gwt.dev.jjs.ast.JVariable;
import com.google.gwt.dev.jjs.impl.gflow.Assumption;
+import com.google.gwt.thirdparty.guava.common.base.Preconditions;
import java.util.ArrayList;
import java.util.HashMap;
diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/gflow/constants/ConstantsFlowFunction.java b/dev/core/src/com/google/gwt/dev/jjs/impl/gflow/constants/ConstantsFlowFunction.java
index 8595958..ea7f158 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/impl/gflow/constants/ConstantsFlowFunction.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/impl/gflow/constants/ConstantsFlowFunction.java
@@ -15,7 +15,6 @@
*/
package com.google.gwt.dev.jjs.impl.gflow.constants;
-import com.google.common.base.Preconditions;
import com.google.gwt.dev.jjs.ast.JBooleanLiteral;
import com.google.gwt.dev.jjs.ast.JExpression;
import com.google.gwt.dev.jjs.ast.JLocal;
@@ -34,6 +33,7 @@
import com.google.gwt.dev.jjs.impl.gflow.cfg.CfgVisitor;
import com.google.gwt.dev.jjs.impl.gflow.cfg.CfgWriteNode;
import com.google.gwt.dev.jjs.impl.gflow.constants.ConstantsAssumption.Updater;
+import com.google.gwt.thirdparty.guava.common.base.Preconditions;
import java.util.ArrayList;
diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/gflow/constants/ConstantsTransformationFunction.java b/dev/core/src/com/google/gwt/dev/jjs/impl/gflow/constants/ConstantsTransformationFunction.java
index 65a8cc3..73aa3e9 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/impl/gflow/constants/ConstantsTransformationFunction.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/impl/gflow/constants/ConstantsTransformationFunction.java
@@ -15,7 +15,6 @@
*/
package com.google.gwt.dev.jjs.impl.gflow.constants;
-import com.google.common.base.Preconditions;
import com.google.gwt.dev.jjs.ast.JBooleanLiteral;
import com.google.gwt.dev.jjs.ast.JExpression;
import com.google.gwt.dev.jjs.ast.JValueLiteral;
@@ -29,6 +28,7 @@
import com.google.gwt.dev.jjs.impl.gflow.cfg.CfgReadNode;
import com.google.gwt.dev.jjs.impl.gflow.cfg.CfgTransformer;
import com.google.gwt.dev.jjs.impl.gflow.cfg.CfgVisitor;
+import com.google.gwt.thirdparty.guava.common.base.Preconditions;
/**
* Transformation function for ConstantsAnalysis. Checks if current node can
diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/gflow/constants/ExpressionEvaluator.java b/dev/core/src/com/google/gwt/dev/jjs/impl/gflow/constants/ExpressionEvaluator.java
index 1478517..04c95a6 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/impl/gflow/constants/ExpressionEvaluator.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/impl/gflow/constants/ExpressionEvaluator.java
@@ -15,7 +15,6 @@
*/
package com.google.gwt.dev.jjs.impl.gflow.constants;
-import com.google.common.base.Preconditions;
import com.google.gwt.dev.jjs.ast.Context;
import com.google.gwt.dev.jjs.ast.JBinaryOperation;
import com.google.gwt.dev.jjs.ast.JBinaryOperator;
@@ -28,6 +27,7 @@
import com.google.gwt.dev.jjs.ast.JVariableRef;
import com.google.gwt.dev.jjs.ast.JVisitor;
import com.google.gwt.dev.jjs.ast.js.JMultiExpression;
+import com.google.gwt.thirdparty.guava.common.base.Preconditions;
/**
* Evaluate expression based on current assumptions.
diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/gflow/constants/FoldConstantTransformer.java b/dev/core/src/com/google/gwt/dev/jjs/impl/gflow/constants/FoldConstantTransformer.java
index ee00967..374be6b 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/impl/gflow/constants/FoldConstantTransformer.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/impl/gflow/constants/FoldConstantTransformer.java
@@ -15,7 +15,6 @@
*/
package com.google.gwt.dev.jjs.impl.gflow.constants;
-import com.google.common.base.Preconditions;
import com.google.gwt.dev.jjs.ast.Context;
import com.google.gwt.dev.jjs.ast.JModVisitor;
import com.google.gwt.dev.jjs.ast.JNode;
@@ -27,6 +26,7 @@
import com.google.gwt.dev.jjs.impl.gflow.cfg.CfgNode;
import com.google.gwt.dev.jjs.impl.gflow.cfg.CfgReadNode;
import com.google.gwt.dev.jjs.impl.gflow.cfg.CfgTransformer;
+import com.google.gwt.thirdparty.guava.common.base.Preconditions;
/**
* Replace variable read by its constant value.
diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/gflow/copy/CopyAssumption.java b/dev/core/src/com/google/gwt/dev/jjs/impl/gflow/copy/CopyAssumption.java
index e056e8c..6cf3556 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/impl/gflow/copy/CopyAssumption.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/impl/gflow/copy/CopyAssumption.java
@@ -15,11 +15,11 @@
*/
package com.google.gwt.dev.jjs.impl.gflow.copy;
-import com.google.common.base.Preconditions;
import com.google.gwt.dev.jjs.ast.HasName;
import com.google.gwt.dev.jjs.ast.JVariable;
import com.google.gwt.dev.jjs.impl.gflow.Assumption;
import com.google.gwt.dev.util.collect.Lists;
+import com.google.gwt.thirdparty.guava.common.base.Preconditions;
import java.util.ArrayList;
import java.util.IdentityHashMap;
diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/gflow/copy/CopyIntegratedFlowFunction.java b/dev/core/src/com/google/gwt/dev/jjs/impl/gflow/copy/CopyIntegratedFlowFunction.java
index 0e35a20..c26c771 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/impl/gflow/copy/CopyIntegratedFlowFunction.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/impl/gflow/copy/CopyIntegratedFlowFunction.java
@@ -15,7 +15,6 @@
*/
package com.google.gwt.dev.jjs.impl.gflow.copy;
-import com.google.common.base.Preconditions;
import com.google.gwt.dev.jjs.SourceInfo;
import com.google.gwt.dev.jjs.ast.Context;
import com.google.gwt.dev.jjs.ast.JLocal;
@@ -36,6 +35,7 @@
import com.google.gwt.dev.jjs.impl.gflow.cfg.CfgReadNode;
import com.google.gwt.dev.jjs.impl.gflow.cfg.CfgTransformer;
import com.google.gwt.dev.jjs.impl.gflow.cfg.CfgUtil;
+import com.google.gwt.thirdparty.guava.common.base.Preconditions;
/**
* Integrated flow function for CopyAnalysis. Tries to replace copied vars with
diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/gflow/liveness/LivenessTransformation.java b/dev/core/src/com/google/gwt/dev/jjs/impl/gflow/liveness/LivenessTransformation.java
index 55d347e..28a01e0 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/impl/gflow/liveness/LivenessTransformation.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/impl/gflow/liveness/LivenessTransformation.java
@@ -15,7 +15,6 @@
*/
package com.google.gwt.dev.jjs.impl.gflow.liveness;
-import com.google.common.base.Preconditions;
import com.google.gwt.dev.jjs.ast.Context;
import com.google.gwt.dev.jjs.ast.JBinaryOperation;
import com.google.gwt.dev.jjs.ast.JDeclarationStatement;
@@ -30,6 +29,7 @@
import com.google.gwt.dev.jjs.impl.gflow.cfg.CfgTransformer;
import com.google.gwt.dev.jjs.impl.gflow.cfg.CfgUtil;
import com.google.gwt.dev.jjs.impl.gflow.cfg.CfgWriteNode;
+import com.google.gwt.thirdparty.guava.common.base.Preconditions;
/**
* Kill assignment. Leave rhs expression evaluation if it has side effects.
diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/gflow/unreachable/DeleteNodeTransformation.java b/dev/core/src/com/google/gwt/dev/jjs/impl/gflow/unreachable/DeleteNodeTransformation.java
index 1543344..98f496b 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/impl/gflow/unreachable/DeleteNodeTransformation.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/impl/gflow/unreachable/DeleteNodeTransformation.java
@@ -15,7 +15,6 @@
*/
package com.google.gwt.dev.jjs.impl.gflow.unreachable;
-import com.google.common.base.Preconditions;
import com.google.gwt.dev.jjs.ast.JBlock;
import com.google.gwt.dev.jjs.ast.JNode;
import com.google.gwt.dev.jjs.impl.gflow.TransformationFunction.Transformation;
@@ -25,6 +24,7 @@
import com.google.gwt.dev.jjs.impl.gflow.cfg.CfgStatementNode;
import com.google.gwt.dev.jjs.impl.gflow.cfg.CfgTransformer;
import com.google.gwt.dev.jjs.impl.gflow.cfg.CfgUtil;
+import com.google.gwt.thirdparty.guava.common.base.Preconditions;
class DeleteNodeTransformation implements Transformation<CfgTransformer, Cfg> {
private final Cfg graph;
diff --git a/dev/core/src/com/google/gwt/dev/js/BaselineCoverageGatherer.java b/dev/core/src/com/google/gwt/dev/js/BaselineCoverageGatherer.java
index 19afb7b..2bdb242 100644
--- a/dev/core/src/com/google/gwt/dev/js/BaselineCoverageGatherer.java
+++ b/dev/core/src/com/google/gwt/dev/js/BaselineCoverageGatherer.java
@@ -15,12 +15,6 @@
*/
package com.google.gwt.dev.js;
-import com.google.common.base.Charsets;
-import com.google.common.collect.HashMultimap;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Multimap;
-import com.google.common.collect.Sets;
-import com.google.common.io.Files;
import com.google.gwt.dev.jjs.InternalCompilerException;
import com.google.gwt.dev.jjs.SourceInfo;
import com.google.gwt.dev.jjs.ast.Context;
@@ -37,6 +31,12 @@
import com.google.gwt.dev.jjs.ast.js.JsniMethodBody;
import com.google.gwt.dev.js.ast.JsContext;
import com.google.gwt.dev.js.ast.JsExpression;
+import com.google.gwt.thirdparty.guava.common.base.Charsets;
+import com.google.gwt.thirdparty.guava.common.collect.HashMultimap;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableSet;
+import com.google.gwt.thirdparty.guava.common.collect.Multimap;
+import com.google.gwt.thirdparty.guava.common.collect.Sets;
+import com.google.gwt.thirdparty.guava.common.io.Files;
import java.io.File;
import java.io.IOException;
diff --git a/dev/core/src/com/google/gwt/dev/js/ClosureJsAst.java b/dev/core/src/com/google/gwt/dev/js/ClosureJsAst.java
index fdd006c..0a437b0 100644
--- a/dev/core/src/com/google/gwt/dev/js/ClosureJsAst.java
+++ b/dev/core/src/com/google/gwt/dev/js/ClosureJsAst.java
@@ -14,12 +14,12 @@
package com.google.gwt.dev.js;
-import com.google.common.base.Preconditions;
-import com.google.javascript.jscomp.AbstractCompiler;
-import com.google.javascript.jscomp.SourceAst;
-import com.google.javascript.jscomp.SourceFile;
-import com.google.javascript.rhino.InputId;
-import com.google.javascript.rhino.Node;
+import com.google.gwt.thirdparty.guava.common.base.Preconditions;
+import com.google.gwt.thirdparty.javascript.jscomp.AbstractCompiler;
+import com.google.gwt.thirdparty.javascript.jscomp.SourceAst;
+import com.google.gwt.thirdparty.javascript.jscomp.SourceFile;
+import com.google.gwt.thirdparty.javascript.rhino.InputId;
+import com.google.gwt.thirdparty.javascript.rhino.Node;
/**
* Maps the JavaScript AST to a Closure Compiler input source.
diff --git a/dev/core/src/com/google/gwt/dev/js/ClosureJsAstTranslator.java b/dev/core/src/com/google/gwt/dev/js/ClosureJsAstTranslator.java
index aafe51b..07874f2 100644
--- a/dev/core/src/com/google/gwt/dev/js/ClosureJsAstTranslator.java
+++ b/dev/core/src/com/google/gwt/dev/js/ClosureJsAstTranslator.java
@@ -13,8 +13,6 @@
*/
package com.google.gwt.dev.js;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Sets;
import com.google.gwt.dev.jjs.HasSourceInfo;
import com.google.gwt.dev.jjs.SourceInfo;
import com.google.gwt.dev.js.ast.HasName;
@@ -71,14 +69,15 @@
import com.google.gwt.dev.js.ast.JsVars.JsVar;
import com.google.gwt.dev.js.ast.JsWhile;
import com.google.gwt.dev.js.ast.NodeKind;
-import com.google.javascript.jscomp.AbstractCompiler;
-import com.google.javascript.jscomp.AstValidator;
-import com.google.javascript.rhino.IR;
-import com.google.javascript.rhino.InputId;
-import com.google.javascript.rhino.Node;
-import com.google.javascript.rhino.Token;
-import com.google.javascript.rhino.jstype.SimpleSourceFile;
-import com.google.javascript.rhino.jstype.StaticSourceFile;
+import com.google.gwt.thirdparty.guava.common.base.Preconditions;
+import com.google.gwt.thirdparty.guava.common.collect.Sets;
+import com.google.gwt.thirdparty.javascript.jscomp.AstValidator;
+import com.google.gwt.thirdparty.javascript.rhino.IR;
+import com.google.gwt.thirdparty.javascript.rhino.InputId;
+import com.google.gwt.thirdparty.javascript.rhino.Node;
+import com.google.gwt.thirdparty.javascript.rhino.Token;
+import com.google.gwt.thirdparty.javascript.rhino.jstype.SimpleSourceFile;
+import com.google.gwt.thirdparty.javascript.rhino.jstype.StaticSourceFile;
import java.util.HashMap;
import java.util.Map;
@@ -109,12 +108,9 @@
private final JsProgram program;
- private final AbstractCompiler abstractCompiler;
-
- ClosureJsAstTranslator(boolean validate, JsProgram program, AbstractCompiler abstractCompiler) {
+ ClosureJsAstTranslator(boolean validate, JsProgram program) {
this.program = program;
this.validate = validate;
- this.abstractCompiler = abstractCompiler;
}
public Node translate(JsProgramFragment fragment, InputId inputId, String source) {
@@ -127,7 +123,7 @@
}
// Validate the structural integrity of the AST.
if (validate) {
- new AstValidator(abstractCompiler).validateScript(script);
+ new AstValidator().validateScript(script);
}
return script;
}
diff --git a/dev/core/src/com/google/gwt/dev/js/ClosureJsRunner.java b/dev/core/src/com/google/gwt/dev/js/ClosureJsRunner.java
index 83f8ca8..365096d 100644
--- a/dev/core/src/com/google/gwt/dev/js/ClosureJsRunner.java
+++ b/dev/core/src/com/google/gwt/dev/js/ClosureJsRunner.java
@@ -14,35 +14,35 @@
package com.google.gwt.dev.js;
-import com.google.common.base.Preconditions;
-import com.google.common.base.Throwables;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
-import com.google.common.io.ByteStreams;
import com.google.gwt.dev.jjs.JsOutputOption;
import com.google.gwt.dev.jjs.ast.JProgram;
import com.google.gwt.dev.jjs.impl.codesplitter.FragmentPartitioningResult;
import com.google.gwt.dev.js.ast.JsProgram;
import com.google.gwt.dev.js.ast.JsProgramFragment;
-import com.google.javascript.jscomp.CheckLevel;
-import com.google.javascript.jscomp.Compiler;
-import com.google.javascript.jscomp.CompilerInput;
-import com.google.javascript.jscomp.CompilerOptions;
-import com.google.javascript.jscomp.CompilerOptions.Reach;
-import com.google.javascript.jscomp.DiagnosticGroups;
-import com.google.javascript.jscomp.JSError;
-import com.google.javascript.jscomp.JSModule;
-import com.google.javascript.jscomp.PropertyRenamingPolicy;
-import com.google.javascript.jscomp.Result;
-import com.google.javascript.jscomp.SourceAst;
-import com.google.javascript.jscomp.SourceFile;
-import com.google.javascript.jscomp.VariableMap;
-import com.google.javascript.jscomp.VariableRenamingPolicy;
-import com.google.javascript.jscomp.WarningLevel;
-import com.google.javascript.rhino.InputId;
-import com.google.javascript.rhino.Node;
+import com.google.gwt.thirdparty.guava.common.base.Preconditions;
+import com.google.gwt.thirdparty.guava.common.base.Throwables;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableList;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
+import com.google.gwt.thirdparty.guava.common.collect.Maps;
+import com.google.gwt.thirdparty.guava.common.collect.Sets;
+import com.google.gwt.thirdparty.guava.common.io.ByteStreams;
+import com.google.gwt.thirdparty.javascript.jscomp.CheckLevel;
+import com.google.gwt.thirdparty.javascript.jscomp.Compiler;
+import com.google.gwt.thirdparty.javascript.jscomp.CompilerInput;
+import com.google.gwt.thirdparty.javascript.jscomp.CompilerOptions;
+import com.google.gwt.thirdparty.javascript.jscomp.CompilerOptions.Reach;
+import com.google.gwt.thirdparty.javascript.jscomp.DiagnosticGroups;
+import com.google.gwt.thirdparty.javascript.jscomp.JSError;
+import com.google.gwt.thirdparty.javascript.jscomp.JSModule;
+import com.google.gwt.thirdparty.javascript.jscomp.JSSourceFile;
+import com.google.gwt.thirdparty.javascript.jscomp.PropertyRenamingPolicy;
+import com.google.gwt.thirdparty.javascript.jscomp.Result;
+import com.google.gwt.thirdparty.javascript.jscomp.SourceAst;
+import com.google.gwt.thirdparty.javascript.jscomp.VariableMap;
+import com.google.gwt.thirdparty.javascript.jscomp.VariableRenamingPolicy;
+import com.google.gwt.thirdparty.javascript.jscomp.WarningLevel;
+import com.google.gwt.thirdparty.javascript.rhino.InputId;
+import com.google.gwt.thirdparty.javascript.rhino.Node;
import java.io.BufferedInputStream;
import java.io.IOException;
@@ -99,7 +99,7 @@
* @return a mutable list
* @throws IOException
*/
- public static List<SourceFile> getDefaultExterns() throws IOException {
+ public static List<JSSourceFile> getDefaultExterns() throws IOException {
Class<ClosureJsRunner> clazz = ClosureJsRunner.class;
InputStream input = clazz.getResourceAsStream("/com/google/javascript/jscomp/externs.zip");
if (input == null) {
@@ -110,11 +110,11 @@
input = clazz.getResourceAsStream("/externs.zip");
}
ZipInputStream zip = new ZipInputStream(input);
- Map<String, SourceFile> externsMap = Maps.newHashMap();
+ Map<String, JSSourceFile> externsMap = Maps.newHashMap();
for (ZipEntry entry = null; (entry = zip.getNextEntry()) != null;) {
BufferedInputStream entryStream =
new BufferedInputStream(ByteStreams.limit(zip, entry.getSize()));
- externsMap.put(entry.getName(), SourceFile.fromInputStream(
+ externsMap.put(entry.getName(), JSSourceFile.fromInputStream(
// Give the files an odd prefix, so that they do not conflict
// with the user's files.
"externs.zip//" + entry.getName(), entryStream));
@@ -125,7 +125,7 @@
// Order matters, so the resources must be added to the result list
// in the expected order.
- List<SourceFile> externs = Lists.newArrayList();
+ List<JSSourceFile> externs = Lists.newArrayList();
for (String key : DEFAULT_EXTERNS_NAMES) {
externs.add(externsMap.get(key));
}
@@ -192,7 +192,7 @@
List<JSModule> modules = createClosureModules(program);
// Build the externs based on what we discovered building the modules.
- List<SourceFile> externs = getClosureCompilerExterns();
+ List<JSSourceFile> externs = getClosureCompilerExterns();
Result result = compiler.compileModules(externs, modules, options);
if (result.success) {
@@ -209,8 +209,8 @@
}
}
- protected List<SourceFile> getDefaultExternsList() {
- List<SourceFile> defaultExterns;
+ protected List<JSSourceFile> getDefaultExternsList() {
+ List<JSSourceFile> defaultExterns;
try {
defaultExterns = getDefaultExterns();
return defaultExterns;
@@ -275,7 +275,7 @@
String source) {
String inputName = source;
InputId inputId = new InputId(inputName);
- ClosureJsAstTranslator translator = new ClosureJsAstTranslator(validate, program, compiler);
+ ClosureJsAstTranslator translator = new ClosureJsAstTranslator(validate, program);
Node root = translator.translate(fragment, inputId, source);
globalVars.addAll(translator.getGlobalVariableNames());
externalProps.addAll(translator.getExternalPropertyReferences());
@@ -315,14 +315,14 @@
modules[i].addDependency(leftovers);
}
}
- modules[0].add(SourceFile.fromCode("hack", "window['gwtOnLoad'] = gwtOnLoad;\n"));
+ modules[0].add(JSSourceFile.fromCode("hack", "window['gwtOnLoad'] = gwtOnLoad;\n"));
return Arrays.asList(modules);
}
- private List<SourceFile> getClosureCompilerExterns() {
- List<SourceFile> externs = getDefaultExternsList();
- externs.add(SourceFile.fromCode("gwt_externs",
+ private List<JSSourceFile> getClosureCompilerExterns() {
+ List<JSSourceFile> externs = getDefaultExternsList();
+ externs.add(JSSourceFile.fromCode("gwt_externs",
"var gwtOnLoad;\n"
+ "var $entry;\n"
@@ -356,7 +356,7 @@
generatedExterns += "var " + var + ";\n";
}
- externs.add(SourceFile.fromCode("gwt_generated_externs", generatedExterns));
+ externs.add(JSSourceFile.fromCode("gwt_generated_externs", generatedExterns));
return externs;
}
@@ -374,7 +374,7 @@
for (String var : globalVars) {
varNames.put(var, var);
}
- options.setInputVariableMap(VariableMap.fromMap(varNames));
+ options.setInputVariableMapSerialized(VariableMap.fromMap(varNames).toBytes());
if (jsOutputOption == JsOutputOption.OBFUSCATED) {
options.setRenamingPolicy(VariableRenamingPolicy.ALL, PropertyRenamingPolicy.OFF);
options.setPrettyPrint(false);
@@ -412,7 +412,7 @@
options.setFlowSensitiveInlineVariables(true);
options.setComputeFunctionSideEffects(true);
// Remove unused vars also removes unused functions.
- options.setRemoveUnusedVariables(Reach.ALL);
+ options.setRemoveUnusedVariable(Reach.ALL);
options.setOptimizeParameters(true);
options.setOptimizeReturns(true);
options.setOptimizeCalls(true);
@@ -425,6 +425,7 @@
// Advanced optimization, disabled
options.setRemoveClosureAsserts(false);
+ options.setAliasKeywords(false);
options.setRemoveUnusedPrototypePropertiesInExterns(false);
options.setCheckGlobalThisLevel(CheckLevel.OFF);
options.setRewriteFunctionExpressions(false); // Performance hit
diff --git a/dev/core/src/com/google/gwt/dev/js/CoverageInstrumentor.java b/dev/core/src/com/google/gwt/dev/js/CoverageInstrumentor.java
index c52c9b8..2ca63b4 100644
--- a/dev/core/src/com/google/gwt/dev/js/CoverageInstrumentor.java
+++ b/dev/core/src/com/google/gwt/dev/js/CoverageInstrumentor.java
@@ -15,8 +15,6 @@
*/
package com.google.gwt.dev.js;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.collect.Multimap;
import com.google.gwt.dev.jjs.SourceInfo;
import com.google.gwt.dev.js.ast.JsBinaryOperation;
import com.google.gwt.dev.js.ast.JsBinaryOperator;
@@ -31,6 +29,8 @@
import com.google.gwt.dev.js.ast.JsProgram;
import com.google.gwt.dev.js.ast.JsPropertyInitializer;
import com.google.gwt.dev.js.ast.JsStringLiteral;
+import com.google.gwt.thirdparty.guava.common.annotations.VisibleForTesting;
+import com.google.gwt.thirdparty.guava.common.collect.Multimap;
import java.util.List;
diff --git a/dev/core/src/com/google/gwt/dev/js/CoverageVisitor.java b/dev/core/src/com/google/gwt/dev/js/CoverageVisitor.java
index 6e1d0e7..29d0bbb 100644
--- a/dev/core/src/com/google/gwt/dev/js/CoverageVisitor.java
+++ b/dev/core/src/com/google/gwt/dev/js/CoverageVisitor.java
@@ -15,7 +15,6 @@
*/
package com.google.gwt.dev.js;
-import com.google.common.collect.Sets;
import com.google.gwt.dev.js.ast.JsArrayAccess;
import com.google.gwt.dev.js.ast.JsBinaryOperation;
import com.google.gwt.dev.js.ast.JsContext;
@@ -30,6 +29,7 @@
import com.google.gwt.dev.js.ast.JsPrefixOperation;
import com.google.gwt.dev.js.ast.JsUnaryOperator;
import com.google.gwt.dev.js.ast.JsWhile;
+import com.google.gwt.thirdparty.guava.common.collect.Sets;
import java.util.Set;
diff --git a/dev/core/src/com/google/gwt/dev/js/EvalFunctionsAtTopScope.java b/dev/core/src/com/google/gwt/dev/js/EvalFunctionsAtTopScope.java
index 0045fdc..c942009 100644
--- a/dev/core/src/com/google/gwt/dev/js/EvalFunctionsAtTopScope.java
+++ b/dev/core/src/com/google/gwt/dev/js/EvalFunctionsAtTopScope.java
@@ -15,7 +15,6 @@
*/
package com.google.gwt.dev.js;
-import com.google.common.collect.Queues;
import com.google.gwt.dev.jjs.impl.JavaToJavaScriptMap;
import com.google.gwt.dev.js.ast.JsBlock;
import com.google.gwt.dev.js.ast.JsContext;
@@ -25,6 +24,7 @@
import com.google.gwt.dev.js.ast.JsProgram;
import com.google.gwt.dev.js.ast.JsProgramFragment;
import com.google.gwt.dev.js.ast.JsStatement;
+import com.google.gwt.thirdparty.guava.common.collect.Queues;
import java.util.Deque;
import java.util.HashSet;
diff --git a/dev/core/src/com/google/gwt/dev/js/JsDuplicateFunctionRemover.java b/dev/core/src/com/google/gwt/dev/js/JsDuplicateFunctionRemover.java
index ef7a2a7..d571ffd 100644
--- a/dev/core/src/com/google/gwt/dev/js/JsDuplicateFunctionRemover.java
+++ b/dev/core/src/com/google/gwt/dev/js/JsDuplicateFunctionRemover.java
@@ -15,8 +15,6 @@
*/
package com.google.gwt.dev.js;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
import com.google.gwt.dev.js.ast.JsBlock;
import com.google.gwt.dev.js.ast.JsContext;
import com.google.gwt.dev.js.ast.JsFunction;
@@ -28,6 +26,8 @@
import com.google.gwt.dev.js.ast.JsProgram;
import com.google.gwt.dev.js.ast.JsVisitor;
import com.google.gwt.dev.util.collect.Stack;
+import com.google.gwt.thirdparty.guava.common.collect.Maps;
+import com.google.gwt.thirdparty.guava.common.collect.Sets;
import java.util.Map;
import java.util.Set;
diff --git a/dev/core/src/com/google/gwt/dev/js/JsIncrementalNamer.java b/dev/core/src/com/google/gwt/dev/js/JsIncrementalNamer.java
index de9bea0..950ce38 100644
--- a/dev/core/src/com/google/gwt/dev/js/JsIncrementalNamer.java
+++ b/dev/core/src/com/google/gwt/dev/js/JsIncrementalNamer.java
@@ -13,17 +13,17 @@
*/
package com.google.gwt.dev.js;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Objects;
-import com.google.common.collect.HashMultiset;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Multiset;
-import com.google.common.collect.Sets;
import com.google.gwt.dev.cfg.ConfigProps;
import com.google.gwt.dev.jjs.impl.JavaToJavaScriptMap;
import com.google.gwt.dev.js.ast.JsName;
import com.google.gwt.dev.js.ast.JsProgram;
import com.google.gwt.dev.js.ast.JsScope;
+import com.google.gwt.thirdparty.guava.common.annotations.VisibleForTesting;
+import com.google.gwt.thirdparty.guava.common.base.Objects;
+import com.google.gwt.thirdparty.guava.common.collect.HashMultiset;
+import com.google.gwt.thirdparty.guava.common.collect.Maps;
+import com.google.gwt.thirdparty.guava.common.collect.Multiset;
+import com.google.gwt.thirdparty.guava.common.collect.Sets;
import java.io.Serializable;
import java.util.Map;
diff --git a/dev/core/src/com/google/gwt/dev/js/JsInliner.java b/dev/core/src/com/google/gwt/dev/js/JsInliner.java
index a581399..3de81bf 100644
--- a/dev/core/src/com/google/gwt/dev/js/JsInliner.java
+++ b/dev/core/src/com/google/gwt/dev/js/JsInliner.java
@@ -15,12 +15,6 @@
*/
package com.google.gwt.dev.js;
-import com.google.common.collect.HashMultiset;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Multiset;
-import com.google.common.collect.Sets;
import com.google.gwt.dev.jjs.HasSourceInfo;
import com.google.gwt.dev.jjs.InternalCompilerException;
import com.google.gwt.dev.jjs.SourceInfo;
@@ -66,6 +60,12 @@
import com.google.gwt.dev.util.log.speedtracer.CompilerEventType;
import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger;
import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger.Event;
+import com.google.gwt.thirdparty.guava.common.collect.HashMultiset;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableSet;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
+import com.google.gwt.thirdparty.guava.common.collect.Maps;
+import com.google.gwt.thirdparty.guava.common.collect.Multiset;
+import com.google.gwt.thirdparty.guava.common.collect.Sets;
import java.util.Collection;
import java.util.Collections;
diff --git a/dev/core/src/com/google/gwt/dev/js/JsLiteralInterner.java b/dev/core/src/com/google/gwt/dev/js/JsLiteralInterner.java
index b9e9f49..439ba77 100644
--- a/dev/core/src/com/google/gwt/dev/js/JsLiteralInterner.java
+++ b/dev/core/src/com/google/gwt/dev/js/JsLiteralInterner.java
@@ -15,11 +15,6 @@
*/
package com.google.gwt.dev.js;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.HashMultiset;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Multiset;
-import com.google.common.collect.Sets;
import com.google.gwt.dev.jjs.SourceInfo;
import com.google.gwt.dev.jjs.ast.JProgram;
import com.google.gwt.dev.js.ast.JsArrayLiteral;
@@ -43,6 +38,11 @@
import com.google.gwt.dev.js.ast.JsVars;
import com.google.gwt.dev.js.ast.JsVars.JsVar;
import com.google.gwt.dev.js.ast.JsVisitor;
+import com.google.gwt.thirdparty.guava.common.base.Preconditions;
+import com.google.gwt.thirdparty.guava.common.collect.HashMultiset;
+import com.google.gwt.thirdparty.guava.common.collect.Maps;
+import com.google.gwt.thirdparty.guava.common.collect.Multiset;
+import com.google.gwt.thirdparty.guava.common.collect.Sets;
import java.util.Collection;
import java.util.Map;
diff --git a/dev/core/src/com/google/gwt/dev/js/JsNamespaceChooser.java b/dev/core/src/com/google/gwt/dev/js/JsNamespaceChooser.java
index 7663e9e..db4a7b8 100644
--- a/dev/core/src/com/google/gwt/dev/js/JsNamespaceChooser.java
+++ b/dev/core/src/com/google/gwt/dev/js/JsNamespaceChooser.java
@@ -15,8 +15,6 @@
*/
package com.google.gwt.dev.js;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
import com.google.gwt.dev.jjs.SourceOrigin;
import com.google.gwt.dev.jjs.ast.JDeclaredType;
import com.google.gwt.dev.jjs.ast.JField;
@@ -37,6 +35,8 @@
import com.google.gwt.dev.js.ast.JsVars;
import com.google.gwt.dev.js.ast.JsVars.JsVar;
import com.google.gwt.dev.util.Util;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
+import com.google.gwt.thirdparty.guava.common.collect.Maps;
import java.util.Collection;
import java.util.List;
diff --git a/dev/core/src/com/google/gwt/dev/js/JsProtectedNames.java b/dev/core/src/com/google/gwt/dev/js/JsProtectedNames.java
index d1196b8..c332e07 100644
--- a/dev/core/src/com/google/gwt/dev/js/JsProtectedNames.java
+++ b/dev/core/src/com/google/gwt/dev/js/JsProtectedNames.java
@@ -15,9 +15,9 @@
*/
package com.google.gwt.dev.js;
-import com.google.common.base.Charsets;
-import com.google.common.collect.Sets;
-import com.google.common.io.Resources;
+import com.google.gwt.thirdparty.guava.common.base.Charsets;
+import com.google.gwt.thirdparty.guava.common.collect.Sets;
+import com.google.gwt.thirdparty.guava.common.io.Resources;
import java.io.IOException;
import java.net.URL;
diff --git a/dev/core/src/com/google/gwt/dev/js/JsReportGenerationVisitor.java b/dev/core/src/com/google/gwt/dev/js/JsReportGenerationVisitor.java
index 319b765..b07c741 100644
--- a/dev/core/src/com/google/gwt/dev/js/JsReportGenerationVisitor.java
+++ b/dev/core/src/com/google/gwt/dev/js/JsReportGenerationVisitor.java
@@ -15,8 +15,6 @@
*/
package com.google.gwt.dev.js;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.collect.Lists;
import com.google.gwt.core.ext.soyc.Range;
import com.google.gwt.dev.jjs.JsSourceMap;
import com.google.gwt.dev.jjs.SourceInfo;
@@ -31,6 +29,8 @@
import com.google.gwt.dev.js.ast.JsStatement;
import com.google.gwt.dev.js.ast.JsVisitable;
import com.google.gwt.dev.util.TextOutput;
+import com.google.gwt.thirdparty.guava.common.annotations.VisibleForTesting;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
import java.util.LinkedList;
import java.util.List;
diff --git a/dev/core/src/com/google/gwt/dev/js/ast/JsArrayLiteral.java b/dev/core/src/com/google/gwt/dev/js/ast/JsArrayLiteral.java
index e3b2aba..eb3b219 100644
--- a/dev/core/src/com/google/gwt/dev/js/ast/JsArrayLiteral.java
+++ b/dev/core/src/com/google/gwt/dev/js/ast/JsArrayLiteral.java
@@ -13,8 +13,8 @@
*/
package com.google.gwt.dev.js.ast;
-import com.google.common.collect.Lists;
import com.google.gwt.dev.jjs.SourceInfo;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
import java.util.Collections;
import java.util.List;
diff --git a/dev/core/src/com/google/gwt/dev/js/ast/JsProgram.java b/dev/core/src/com/google/gwt/dev/js/ast/JsProgram.java
index f48a9cf..e3894dd 100644
--- a/dev/core/src/com/google/gwt/dev/js/ast/JsProgram.java
+++ b/dev/core/src/com/google/gwt/dev/js/ast/JsProgram.java
@@ -13,11 +13,11 @@
*/
package com.google.gwt.dev.js.ast;
-import com.google.common.collect.Sets;
import com.google.gwt.dev.jjs.CorrelationFactory;
import com.google.gwt.dev.jjs.CorrelationFactory.DummyCorrelationFactory;
import com.google.gwt.dev.jjs.SourceInfo;
import com.google.gwt.dev.jjs.SourceOrigin;
+import com.google.gwt.thirdparty.guava.common.collect.Sets;
import java.util.HashMap;
import java.util.HashSet;
diff --git a/dev/core/src/com/google/gwt/dev/resource/impl/ChangedFileAccumulator.java b/dev/core/src/com/google/gwt/dev/resource/impl/ChangedFileAccumulator.java
index a420de6..d788d7e 100644
--- a/dev/core/src/com/google/gwt/dev/resource/impl/ChangedFileAccumulator.java
+++ b/dev/core/src/com/google/gwt/dev/resource/impl/ChangedFileAccumulator.java
@@ -13,9 +13,9 @@
*/
package com.google.gwt.dev.resource.impl;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
+import com.google.gwt.thirdparty.guava.common.collect.Maps;
+import com.google.gwt.thirdparty.guava.common.collect.Sets;
import java.io.File;
import java.io.IOException;
diff --git a/dev/core/src/com/google/gwt/dev/resource/impl/DirectoryClassPathEntry.java b/dev/core/src/com/google/gwt/dev/resource/impl/DirectoryClassPathEntry.java
index d5f8d3a..e496f21 100644
--- a/dev/core/src/com/google/gwt/dev/resource/impl/DirectoryClassPathEntry.java
+++ b/dev/core/src/com/google/gwt/dev/resource/impl/DirectoryClassPathEntry.java
@@ -15,12 +15,12 @@
*/
package com.google.gwt.dev.resource.impl;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.collect.Maps;
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.dev.util.Util;
import com.google.gwt.dev.util.collect.Lists;
import com.google.gwt.dev.util.msg.Message1String;
+import com.google.gwt.thirdparty.guava.common.annotations.VisibleForTesting;
+import com.google.gwt.thirdparty.guava.common.collect.Maps;
import java.io.File;
import java.io.IOException;
diff --git a/dev/core/src/com/google/gwt/dev/resource/impl/DirectoryPathPrefixChangeManager.java b/dev/core/src/com/google/gwt/dev/resource/impl/DirectoryPathPrefixChangeManager.java
index 869a000..9bc05f5 100644
--- a/dev/core/src/com/google/gwt/dev/resource/impl/DirectoryPathPrefixChangeManager.java
+++ b/dev/core/src/com/google/gwt/dev/resource/impl/DirectoryPathPrefixChangeManager.java
@@ -13,8 +13,8 @@
*/
package com.google.gwt.dev.resource.impl;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.collect.Maps;
+import com.google.gwt.thirdparty.guava.common.annotations.VisibleForTesting;
+import com.google.gwt.thirdparty.guava.common.collect.Maps;
import java.io.File;
import java.io.IOException;
diff --git a/dev/core/src/com/google/gwt/dev/resource/impl/FileResource.java b/dev/core/src/com/google/gwt/dev/resource/impl/FileResource.java
index 1373526..4333e79 100644
--- a/dev/core/src/com/google/gwt/dev/resource/impl/FileResource.java
+++ b/dev/core/src/com/google/gwt/dev/resource/impl/FileResource.java
@@ -15,7 +15,7 @@
*/
package com.google.gwt.dev.resource.impl;
-import com.google.common.collect.MapMaker;
+import com.google.gwt.thirdparty.guava.common.collect.MapMaker;
import java.io.File;
import java.io.FileInputStream;
diff --git a/dev/core/src/com/google/gwt/dev/resource/impl/PathPrefixSet.java b/dev/core/src/com/google/gwt/dev/resource/impl/PathPrefixSet.java
index 7ca26dd..3a16a16 100644
--- a/dev/core/src/com/google/gwt/dev/resource/impl/PathPrefixSet.java
+++ b/dev/core/src/com/google/gwt/dev/resource/impl/PathPrefixSet.java
@@ -15,10 +15,10 @@
*/
package com.google.gwt.dev.resource.impl;
-import com.google.common.collect.Lists;
import com.google.gwt.dev.resource.impl.PathPrefix.Judgement;
import com.google.gwt.dev.util.StringInterner;
import com.google.gwt.dev.util.collect.Maps;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
import java.util.ArrayList;
import java.util.Collection;
diff --git a/dev/core/src/com/google/gwt/dev/resource/impl/ResourceOracleImpl.java b/dev/core/src/com/google/gwt/dev/resource/impl/ResourceOracleImpl.java
index 166fd58..d9f25ed 100644
--- a/dev/core/src/com/google/gwt/dev/resource/impl/ResourceOracleImpl.java
+++ b/dev/core/src/com/google/gwt/dev/resource/impl/ResourceOracleImpl.java
@@ -15,11 +15,6 @@
*/
package com.google.gwt.dev.resource.impl;
-import com.google.common.collect.HashMultimap;
-import com.google.common.collect.MapMaker;
-import com.google.common.collect.SetMultimap;
-import com.google.common.collect.Sets;
-import com.google.common.io.Files;
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.dev.cfg.ResourceLoader;
import com.google.gwt.dev.cfg.ResourceLoaders;
@@ -29,6 +24,11 @@
import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger.Event;
import com.google.gwt.dev.util.msg.Message0;
import com.google.gwt.dev.util.msg.Message1String;
+import com.google.gwt.thirdparty.guava.common.collect.HashMultimap;
+import com.google.gwt.thirdparty.guava.common.collect.MapMaker;
+import com.google.gwt.thirdparty.guava.common.collect.SetMultimap;
+import com.google.gwt.thirdparty.guava.common.collect.Sets;
+import com.google.gwt.thirdparty.guava.common.io.Files;
import java.io.File;
import java.io.IOException;
diff --git a/dev/core/src/com/google/gwt/dev/resource/impl/ResourceResolution.java b/dev/core/src/com/google/gwt/dev/resource/impl/ResourceResolution.java
index c70e828..3f18e41 100644
--- a/dev/core/src/com/google/gwt/dev/resource/impl/ResourceResolution.java
+++ b/dev/core/src/com/google/gwt/dev/resource/impl/ResourceResolution.java
@@ -13,8 +13,8 @@
*/
package com.google.gwt.dev.resource.impl;
-import com.google.common.base.Objects;
-import com.google.common.collect.Sets;
+import com.google.gwt.thirdparty.guava.common.base.Objects;
+import com.google.gwt.thirdparty.guava.common.collect.Sets;
import java.util.SortedSet;
diff --git a/dev/core/src/com/google/gwt/dev/resource/impl/ZipFileClassPathEntry.java b/dev/core/src/com/google/gwt/dev/resource/impl/ZipFileClassPathEntry.java
index 63aaa67..d54c8a9 100644
--- a/dev/core/src/com/google/gwt/dev/resource/impl/ZipFileClassPathEntry.java
+++ b/dev/core/src/com/google/gwt/dev/resource/impl/ZipFileClassPathEntry.java
@@ -15,14 +15,14 @@
*/
package com.google.gwt.dev.resource.impl;
-import com.google.common.collect.MapMaker;
-import com.google.common.collect.Maps;
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.dev.util.collect.IdentityHashMap;
import com.google.gwt.dev.util.collect.IdentityHashSet;
import com.google.gwt.dev.util.collect.IdentityMaps;
import com.google.gwt.dev.util.collect.Sets;
import com.google.gwt.dev.util.msg.Message1String;
+import com.google.gwt.thirdparty.guava.common.collect.MapMaker;
+import com.google.gwt.thirdparty.guava.common.collect.Maps;
import java.io.File;
import java.io.IOException;
diff --git a/dev/core/src/com/google/gwt/dev/shell/CompilingClassLoader.java b/dev/core/src/com/google/gwt/dev/shell/CompilingClassLoader.java
index da10977..f1c704f 100644
--- a/dev/core/src/com/google/gwt/dev/shell/CompilingClassLoader.java
+++ b/dev/core/src/com/google/gwt/dev/shell/CompilingClassLoader.java
@@ -15,9 +15,6 @@
*/
package com.google.gwt.dev.shell;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.MapMaker;
-import com.google.common.primitives.Primitives;
import com.google.gwt.core.client.GWTBridge;
import com.google.gwt.core.client.GwtScriptOnly;
import com.google.gwt.core.ext.TreeLogger;
@@ -48,6 +45,9 @@
import com.google.gwt.dev.util.log.speedtracer.DevModeEventType;
import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger;
import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger.Event;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableMap;
+import com.google.gwt.thirdparty.guava.common.collect.MapMaker;
+import com.google.gwt.thirdparty.guava.common.primitives.Primitives;
import com.google.gwt.util.tools.Utility;
import java.beans.Beans;
@@ -785,7 +785,7 @@
} catch (ClassNotFoundException ignored) {
}
emmaStrategy = EmmaStrategy.get(emmaAvailable);
-
+
/* Bridging Jacoco's Offline entry point. */
try {
Class<?> jacoco = Class.forName(JACOCO_ENTRYPOINT,
diff --git a/dev/core/src/com/google/gwt/dev/shell/SuperDevListener.java b/dev/core/src/com/google/gwt/dev/shell/SuperDevListener.java
index 4c7467c..03fe2d4 100644
--- a/dev/core/src/com/google/gwt/dev/shell/SuperDevListener.java
+++ b/dev/core/src/com/google/gwt/dev/shell/SuperDevListener.java
@@ -15,9 +15,6 @@
*/
package com.google.gwt.dev.shell;
-import com.google.common.base.Stopwatch;
-import com.google.common.collect.ListMultimap;
-import com.google.common.collect.Lists;
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.core.ext.TreeLogger.Type;
import com.google.gwt.core.ext.UnableToCompleteException;
@@ -27,6 +24,9 @@
import com.google.gwt.dev.cfg.ModuleDef;
import com.google.gwt.dev.util.arg.OptionJsInteropMode;
import com.google.gwt.dev.util.arg.OptionMethodNameDisplayMode;
+import com.google.gwt.thirdparty.guava.common.base.Stopwatch;
+import com.google.gwt.thirdparty.guava.common.collect.ListMultimap;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
import java.io.File;
import java.io.IOException;
diff --git a/dev/core/src/com/google/gwt/dev/shell/remoteui/RemoteMessageProto.java b/dev/core/src/com/google/gwt/dev/shell/remoteui/RemoteMessageProto.java
index 5d03297..7088204 100644
--- a/dev/core/src/com/google/gwt/dev/shell/remoteui/RemoteMessageProto.java
+++ b/dev/core/src/com/google/gwt/dev/shell/remoteui/RemoteMessageProto.java
@@ -6,10 +6,10 @@
public final class RemoteMessageProto {
private RemoteMessageProto() {}
public static void registerAllExtensions(
- com.google.protobuf.ExtensionRegistry registry) {
+ com.google.gwt.dev.protobuf.ExtensionRegistry registry) {
}
public interface MessageOrBuilder
- extends com.google.protobuf.MessageOrBuilder {
+ extends com.google.gwt.dev.protobuf.MessageOrBuilder {
// optional string protocolVersion = 1;
/**
@@ -38,7 +38,7 @@
* we can make use of it to detect protocol incompatibilities
* </pre>
*/
- com.google.protobuf.ByteString
+ com.google.gwt.dev.protobuf.ByteString
getProtocolVersionBytes();
// optional .com.google.gwt.dev.shell.remoteui.Message.MessageType messageType = 2;
@@ -111,14 +111,14 @@
* </pre>
*/
public static final class Message extends
- com.google.protobuf.GeneratedMessage
+ com.google.gwt.dev.protobuf.GeneratedMessage
implements MessageOrBuilder {
// Use Message.newBuilder() to construct.
- private Message(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+ private Message(com.google.gwt.dev.protobuf.GeneratedMessage.Builder<?> builder) {
super(builder);
this.unknownFields = builder.getUnknownFields();
}
- private Message(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+ private Message(boolean noInit) { this.unknownFields = com.google.gwt.dev.protobuf.UnknownFieldSet.getDefaultInstance(); }
private static final Message defaultInstance;
public static Message getDefaultInstance() {
@@ -129,20 +129,20 @@
return defaultInstance;
}
- private final com.google.protobuf.UnknownFieldSet unknownFields;
+ private final com.google.gwt.dev.protobuf.UnknownFieldSet unknownFields;
@java.lang.Override
- public final com.google.protobuf.UnknownFieldSet
+ public final com.google.gwt.dev.protobuf.UnknownFieldSet
getUnknownFields() {
return this.unknownFields;
}
private Message(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
initFields();
int mutable_bitField0_ = 0;
- com.google.protobuf.UnknownFieldSet.Builder unknownFields =
- com.google.protobuf.UnknownFieldSet.newBuilder();
+ com.google.gwt.dev.protobuf.UnknownFieldSet.Builder unknownFields =
+ com.google.gwt.dev.protobuf.UnknownFieldSet.newBuilder();
try {
boolean done = false;
while (!done) {
@@ -220,40 +220,40 @@
}
}
}
- } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ } catch (com.google.gwt.dev.protobuf.InvalidProtocolBufferException e) {
throw e.setUnfinishedMessage(this);
} catch (java.io.IOException e) {
- throw new com.google.protobuf.InvalidProtocolBufferException(
+ throw new com.google.gwt.dev.protobuf.InvalidProtocolBufferException(
e.getMessage()).setUnfinishedMessage(this);
} finally {
this.unknownFields = unknownFields.build();
makeExtensionsImmutable();
}
}
- public static final com.google.protobuf.Descriptors.Descriptor
+ public static final com.google.gwt.dev.protobuf.Descriptors.Descriptor
getDescriptor() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_descriptor;
}
- protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ protected com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_fieldAccessorTable
.ensureFieldAccessorsInitialized(
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.class, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Builder.class);
}
- public static com.google.protobuf.Parser<Message> PARSER =
- new com.google.protobuf.AbstractParser<Message>() {
+ public static com.google.gwt.dev.protobuf.Parser<Message> PARSER =
+ new com.google.gwt.dev.protobuf.AbstractParser<Message>() {
public Message parsePartialFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return new Message(input, extensionRegistry);
}
};
@java.lang.Override
- public com.google.protobuf.Parser<Message> getParserForType() {
+ public com.google.gwt.dev.protobuf.Parser<Message> getParserForType() {
return PARSER;
}
@@ -265,7 +265,7 @@
* </pre>
*/
public enum MessageType
- implements com.google.protobuf.ProtocolMessageEnum {
+ implements com.google.gwt.dev.protobuf.ProtocolMessageEnum {
/**
* <code>REQUEST = 0;</code>
*/
@@ -305,27 +305,27 @@
}
}
- public static com.google.protobuf.Internal.EnumLiteMap<MessageType>
+ public static com.google.gwt.dev.protobuf.Internal.EnumLiteMap<MessageType>
internalGetValueMap() {
return internalValueMap;
}
- private static com.google.protobuf.Internal.EnumLiteMap<MessageType>
+ private static com.google.gwt.dev.protobuf.Internal.EnumLiteMap<MessageType>
internalValueMap =
- new com.google.protobuf.Internal.EnumLiteMap<MessageType>() {
+ new com.google.gwt.dev.protobuf.Internal.EnumLiteMap<MessageType>() {
public MessageType findValueByNumber(int number) {
return MessageType.valueOf(number);
}
};
- public final com.google.protobuf.Descriptors.EnumValueDescriptor
+ public final com.google.gwt.dev.protobuf.Descriptors.EnumValueDescriptor
getValueDescriptor() {
return getDescriptor().getValues().get(index);
}
- public final com.google.protobuf.Descriptors.EnumDescriptor
+ public final com.google.gwt.dev.protobuf.Descriptors.EnumDescriptor
getDescriptorForType() {
return getDescriptor();
}
- public static final com.google.protobuf.Descriptors.EnumDescriptor
+ public static final com.google.gwt.dev.protobuf.Descriptors.EnumDescriptor
getDescriptor() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.getDescriptor().getEnumTypes().get(0);
}
@@ -333,7 +333,7 @@
private static final MessageType[] VALUES = values();
public static MessageType valueOf(
- com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+ com.google.gwt.dev.protobuf.Descriptors.EnumValueDescriptor desc) {
if (desc.getType() != getDescriptor()) {
throw new java.lang.IllegalArgumentException(
"EnumValueDescriptor is not for this type.");
@@ -353,7 +353,7 @@
}
public interface RequestOrBuilder
- extends com.google.protobuf.MessageOrBuilder {
+ extends com.google.gwt.dev.protobuf.MessageOrBuilder {
// optional .com.google.gwt.dev.shell.remoteui.Message.Request.ServiceType serviceType = 1;
/**
@@ -401,14 +401,14 @@
* </pre>
*/
public static final class Request extends
- com.google.protobuf.GeneratedMessage
+ com.google.gwt.dev.protobuf.GeneratedMessage
implements RequestOrBuilder {
// Use Request.newBuilder() to construct.
- private Request(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+ private Request(com.google.gwt.dev.protobuf.GeneratedMessage.Builder<?> builder) {
super(builder);
this.unknownFields = builder.getUnknownFields();
}
- private Request(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+ private Request(boolean noInit) { this.unknownFields = com.google.gwt.dev.protobuf.UnknownFieldSet.getDefaultInstance(); }
private static final Request defaultInstance;
public static Request getDefaultInstance() {
@@ -419,20 +419,20 @@
return defaultInstance;
}
- private final com.google.protobuf.UnknownFieldSet unknownFields;
+ private final com.google.gwt.dev.protobuf.UnknownFieldSet unknownFields;
@java.lang.Override
- public final com.google.protobuf.UnknownFieldSet
+ public final com.google.gwt.dev.protobuf.UnknownFieldSet
getUnknownFields() {
return this.unknownFields;
}
private Request(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
initFields();
int mutable_bitField0_ = 0;
- com.google.protobuf.UnknownFieldSet.Builder unknownFields =
- com.google.protobuf.UnknownFieldSet.newBuilder();
+ com.google.gwt.dev.protobuf.UnknownFieldSet.Builder unknownFields =
+ com.google.gwt.dev.protobuf.UnknownFieldSet.newBuilder();
try {
boolean done = false;
while (!done) {
@@ -487,40 +487,40 @@
}
}
}
- } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ } catch (com.google.gwt.dev.protobuf.InvalidProtocolBufferException e) {
throw e.setUnfinishedMessage(this);
} catch (java.io.IOException e) {
- throw new com.google.protobuf.InvalidProtocolBufferException(
+ throw new com.google.gwt.dev.protobuf.InvalidProtocolBufferException(
e.getMessage()).setUnfinishedMessage(this);
} finally {
this.unknownFields = unknownFields.build();
makeExtensionsImmutable();
}
}
- public static final com.google.protobuf.Descriptors.Descriptor
+ public static final com.google.gwt.dev.protobuf.Descriptors.Descriptor
getDescriptor() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_descriptor;
}
- protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ protected com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_fieldAccessorTable
.ensureFieldAccessorsInitialized(
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.class, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.Builder.class);
}
- public static com.google.protobuf.Parser<Request> PARSER =
- new com.google.protobuf.AbstractParser<Request>() {
+ public static com.google.gwt.dev.protobuf.Parser<Request> PARSER =
+ new com.google.gwt.dev.protobuf.AbstractParser<Request>() {
public Request parsePartialFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return new Request(input, extensionRegistry);
}
};
@java.lang.Override
- public com.google.protobuf.Parser<Request> getParserForType() {
+ public com.google.gwt.dev.protobuf.Parser<Request> getParserForType() {
return PARSER;
}
@@ -535,7 +535,7 @@
* </pre>
*/
public enum ServiceType
- implements com.google.protobuf.ProtocolMessageEnum {
+ implements com.google.gwt.dev.protobuf.ProtocolMessageEnum {
/**
* <code>VIEWER = 0;</code>
*/
@@ -566,27 +566,27 @@
}
}
- public static com.google.protobuf.Internal.EnumLiteMap<ServiceType>
+ public static com.google.gwt.dev.protobuf.Internal.EnumLiteMap<ServiceType>
internalGetValueMap() {
return internalValueMap;
}
- private static com.google.protobuf.Internal.EnumLiteMap<ServiceType>
+ private static com.google.gwt.dev.protobuf.Internal.EnumLiteMap<ServiceType>
internalValueMap =
- new com.google.protobuf.Internal.EnumLiteMap<ServiceType>() {
+ new com.google.gwt.dev.protobuf.Internal.EnumLiteMap<ServiceType>() {
public ServiceType findValueByNumber(int number) {
return ServiceType.valueOf(number);
}
};
- public final com.google.protobuf.Descriptors.EnumValueDescriptor
+ public final com.google.gwt.dev.protobuf.Descriptors.EnumValueDescriptor
getValueDescriptor() {
return getDescriptor().getValues().get(index);
}
- public final com.google.protobuf.Descriptors.EnumDescriptor
+ public final com.google.gwt.dev.protobuf.Descriptors.EnumDescriptor
getDescriptorForType() {
return getDescriptor();
}
- public static final com.google.protobuf.Descriptors.EnumDescriptor
+ public static final com.google.gwt.dev.protobuf.Descriptors.EnumDescriptor
getDescriptor() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.getDescriptor().getEnumTypes().get(0);
}
@@ -594,7 +594,7 @@
private static final ServiceType[] VALUES = values();
public static ServiceType valueOf(
- com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+ com.google.gwt.dev.protobuf.Descriptors.EnumValueDescriptor desc) {
if (desc.getType() != getDescriptor()) {
throw new java.lang.IllegalArgumentException(
"EnumValueDescriptor is not for this type.");
@@ -614,7 +614,7 @@
}
public interface ViewerRequestOrBuilder
- extends com.google.protobuf.MessageOrBuilder {
+ extends com.google.gwt.dev.protobuf.MessageOrBuilder {
// optional .com.google.gwt.dev.shell.remoteui.Message.Request.ViewerRequest.RequestType requestType = 1;
/**
@@ -718,14 +718,14 @@
* </pre>
*/
public static final class ViewerRequest extends
- com.google.protobuf.GeneratedMessage
+ com.google.gwt.dev.protobuf.GeneratedMessage
implements ViewerRequestOrBuilder {
// Use ViewerRequest.newBuilder() to construct.
- private ViewerRequest(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+ private ViewerRequest(com.google.gwt.dev.protobuf.GeneratedMessage.Builder<?> builder) {
super(builder);
this.unknownFields = builder.getUnknownFields();
}
- private ViewerRequest(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+ private ViewerRequest(boolean noInit) { this.unknownFields = com.google.gwt.dev.protobuf.UnknownFieldSet.getDefaultInstance(); }
private static final ViewerRequest defaultInstance;
public static ViewerRequest getDefaultInstance() {
@@ -736,20 +736,20 @@
return defaultInstance;
}
- private final com.google.protobuf.UnknownFieldSet unknownFields;
+ private final com.google.gwt.dev.protobuf.UnknownFieldSet unknownFields;
@java.lang.Override
- public final com.google.protobuf.UnknownFieldSet
+ public final com.google.gwt.dev.protobuf.UnknownFieldSet
getUnknownFields() {
return this.unknownFields;
}
private ViewerRequest(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
initFields();
int mutable_bitField0_ = 0;
- com.google.protobuf.UnknownFieldSet.Builder unknownFields =
- com.google.protobuf.UnknownFieldSet.newBuilder();
+ com.google.gwt.dev.protobuf.UnknownFieldSet.Builder unknownFields =
+ com.google.gwt.dev.protobuf.UnknownFieldSet.newBuilder();
try {
boolean done = false;
while (!done) {
@@ -856,40 +856,40 @@
}
}
}
- } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ } catch (com.google.gwt.dev.protobuf.InvalidProtocolBufferException e) {
throw e.setUnfinishedMessage(this);
} catch (java.io.IOException e) {
- throw new com.google.protobuf.InvalidProtocolBufferException(
+ throw new com.google.gwt.dev.protobuf.InvalidProtocolBufferException(
e.getMessage()).setUnfinishedMessage(this);
} finally {
this.unknownFields = unknownFields.build();
makeExtensionsImmutable();
}
}
- public static final com.google.protobuf.Descriptors.Descriptor
+ public static final com.google.gwt.dev.protobuf.Descriptors.Descriptor
getDescriptor() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_descriptor;
}
- protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ protected com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_fieldAccessorTable
.ensureFieldAccessorsInitialized(
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.class, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.Builder.class);
}
- public static com.google.protobuf.Parser<ViewerRequest> PARSER =
- new com.google.protobuf.AbstractParser<ViewerRequest>() {
+ public static com.google.gwt.dev.protobuf.Parser<ViewerRequest> PARSER =
+ new com.google.gwt.dev.protobuf.AbstractParser<ViewerRequest>() {
public ViewerRequest parsePartialFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return new ViewerRequest(input, extensionRegistry);
}
};
@java.lang.Override
- public com.google.protobuf.Parser<ViewerRequest> getParserForType() {
+ public com.google.gwt.dev.protobuf.Parser<ViewerRequest> getParserForType() {
return PARSER;
}
@@ -901,7 +901,7 @@
* </pre>
*/
public enum RequestType
- implements com.google.protobuf.ProtocolMessageEnum {
+ implements com.google.gwt.dev.protobuf.ProtocolMessageEnum {
/**
* <code>CAPABILITY_EXCHANGE = 0;</code>
*/
@@ -968,27 +968,27 @@
}
}
- public static com.google.protobuf.Internal.EnumLiteMap<RequestType>
+ public static com.google.gwt.dev.protobuf.Internal.EnumLiteMap<RequestType>
internalGetValueMap() {
return internalValueMap;
}
- private static com.google.protobuf.Internal.EnumLiteMap<RequestType>
+ private static com.google.gwt.dev.protobuf.Internal.EnumLiteMap<RequestType>
internalValueMap =
- new com.google.protobuf.Internal.EnumLiteMap<RequestType>() {
+ new com.google.gwt.dev.protobuf.Internal.EnumLiteMap<RequestType>() {
public RequestType findValueByNumber(int number) {
return RequestType.valueOf(number);
}
};
- public final com.google.protobuf.Descriptors.EnumValueDescriptor
+ public final com.google.gwt.dev.protobuf.Descriptors.EnumValueDescriptor
getValueDescriptor() {
return getDescriptor().getValues().get(index);
}
- public final com.google.protobuf.Descriptors.EnumDescriptor
+ public final com.google.gwt.dev.protobuf.Descriptors.EnumDescriptor
getDescriptorForType() {
return getDescriptor();
}
- public static final com.google.protobuf.Descriptors.EnumDescriptor
+ public static final com.google.gwt.dev.protobuf.Descriptors.EnumDescriptor
getDescriptor() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.getDescriptor().getEnumTypes().get(0);
}
@@ -996,7 +996,7 @@
private static final RequestType[] VALUES = values();
public static RequestType valueOf(
- com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+ com.google.gwt.dev.protobuf.Descriptors.EnumValueDescriptor desc) {
if (desc.getType() != getDescriptor()) {
throw new java.lang.IllegalArgumentException(
"EnumValueDescriptor is not for this type.");
@@ -1016,7 +1016,7 @@
}
public interface CapabilityExchangeOrBuilder
- extends com.google.protobuf.MessageOrBuilder {
+ extends com.google.gwt.dev.protobuf.MessageOrBuilder {
}
/**
* Protobuf type {@code com.google.gwt.dev.shell.remoteui.Message.Request.ViewerRequest.CapabilityExchange}
@@ -1027,14 +1027,14 @@
* </pre>
*/
public static final class CapabilityExchange extends
- com.google.protobuf.GeneratedMessage
+ com.google.gwt.dev.protobuf.GeneratedMessage
implements CapabilityExchangeOrBuilder {
// Use CapabilityExchange.newBuilder() to construct.
- private CapabilityExchange(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+ private CapabilityExchange(com.google.gwt.dev.protobuf.GeneratedMessage.Builder<?> builder) {
super(builder);
this.unknownFields = builder.getUnknownFields();
}
- private CapabilityExchange(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+ private CapabilityExchange(boolean noInit) { this.unknownFields = com.google.gwt.dev.protobuf.UnknownFieldSet.getDefaultInstance(); }
private static final CapabilityExchange defaultInstance;
public static CapabilityExchange getDefaultInstance() {
@@ -1045,19 +1045,19 @@
return defaultInstance;
}
- private final com.google.protobuf.UnknownFieldSet unknownFields;
+ private final com.google.gwt.dev.protobuf.UnknownFieldSet unknownFields;
@java.lang.Override
- public final com.google.protobuf.UnknownFieldSet
+ public final com.google.gwt.dev.protobuf.UnknownFieldSet
getUnknownFields() {
return this.unknownFields;
}
private CapabilityExchange(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
initFields();
- com.google.protobuf.UnknownFieldSet.Builder unknownFields =
- com.google.protobuf.UnknownFieldSet.newBuilder();
+ com.google.gwt.dev.protobuf.UnknownFieldSet.Builder unknownFields =
+ com.google.gwt.dev.protobuf.UnknownFieldSet.newBuilder();
try {
boolean done = false;
while (!done) {
@@ -1075,40 +1075,40 @@
}
}
}
- } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ } catch (com.google.gwt.dev.protobuf.InvalidProtocolBufferException e) {
throw e.setUnfinishedMessage(this);
} catch (java.io.IOException e) {
- throw new com.google.protobuf.InvalidProtocolBufferException(
+ throw new com.google.gwt.dev.protobuf.InvalidProtocolBufferException(
e.getMessage()).setUnfinishedMessage(this);
} finally {
this.unknownFields = unknownFields.build();
makeExtensionsImmutable();
}
}
- public static final com.google.protobuf.Descriptors.Descriptor
+ public static final com.google.gwt.dev.protobuf.Descriptors.Descriptor
getDescriptor() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_CapabilityExchange_descriptor;
}
- protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ protected com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_CapabilityExchange_fieldAccessorTable
.ensureFieldAccessorsInitialized(
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.CapabilityExchange.class, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.CapabilityExchange.Builder.class);
}
- public static com.google.protobuf.Parser<CapabilityExchange> PARSER =
- new com.google.protobuf.AbstractParser<CapabilityExchange>() {
+ public static com.google.gwt.dev.protobuf.Parser<CapabilityExchange> PARSER =
+ new com.google.gwt.dev.protobuf.AbstractParser<CapabilityExchange>() {
public CapabilityExchange parsePartialFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return new CapabilityExchange(input, extensionRegistry);
}
};
@java.lang.Override
- public com.google.protobuf.Parser<CapabilityExchange> getParserForType() {
+ public com.google.gwt.dev.protobuf.Parser<CapabilityExchange> getParserForType() {
return PARSER;
}
@@ -1123,7 +1123,7 @@
return true;
}
- public void writeTo(com.google.protobuf.CodedOutputStream output)
+ public void writeTo(com.google.gwt.dev.protobuf.CodedOutputStream output)
throws java.io.IOException {
getSerializedSize();
getUnknownFields().writeTo(output);
@@ -1148,24 +1148,24 @@
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.CapabilityExchange parseFrom(
- com.google.protobuf.ByteString data)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.ByteString data)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.CapabilityExchange parseFrom(
- com.google.protobuf.ByteString data,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.ByteString data,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.CapabilityExchange parseFrom(byte[] data)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.CapabilityExchange parseFrom(
byte[] data,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.CapabilityExchange parseFrom(java.io.InputStream input)
@@ -1174,7 +1174,7 @@
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.CapabilityExchange parseFrom(
java.io.InputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseFrom(input, extensionRegistry);
}
@@ -1184,18 +1184,18 @@
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.CapabilityExchange parseDelimitedFrom(
java.io.InputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseDelimitedFrom(input, extensionRegistry);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.CapabilityExchange parseFrom(
- com.google.protobuf.CodedInputStream input)
+ com.google.gwt.dev.protobuf.CodedInputStream input)
throws java.io.IOException {
return PARSER.parseFrom(input);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.CapabilityExchange parseFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseFrom(input, extensionRegistry);
}
@@ -1209,7 +1209,7 @@
@java.lang.Override
protected Builder newBuilderForType(
- com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+ com.google.gwt.dev.protobuf.GeneratedMessage.BuilderParent parent) {
Builder builder = new Builder(parent);
return builder;
}
@@ -1222,14 +1222,14 @@
* </pre>
*/
public static final class Builder extends
- com.google.protobuf.GeneratedMessage.Builder<Builder>
+ com.google.gwt.dev.protobuf.GeneratedMessage.Builder<Builder>
implements com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.CapabilityExchangeOrBuilder {
- public static final com.google.protobuf.Descriptors.Descriptor
+ public static final com.google.gwt.dev.protobuf.Descriptors.Descriptor
getDescriptor() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_CapabilityExchange_descriptor;
}
- protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ protected com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_CapabilityExchange_fieldAccessorTable
.ensureFieldAccessorsInitialized(
@@ -1242,12 +1242,12 @@
}
private Builder(
- com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+ com.google.gwt.dev.protobuf.GeneratedMessage.BuilderParent parent) {
super(parent);
maybeForceBuilderInitialization();
}
private void maybeForceBuilderInitialization() {
- if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+ if (com.google.gwt.dev.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
}
}
private static Builder create() {
@@ -1263,7 +1263,7 @@
return create().mergeFrom(buildPartial());
}
- public com.google.protobuf.Descriptors.Descriptor
+ public com.google.gwt.dev.protobuf.Descriptors.Descriptor
getDescriptorForType() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_CapabilityExchange_descriptor;
}
@@ -1286,7 +1286,7 @@
return result;
}
- public Builder mergeFrom(com.google.protobuf.Message other) {
+ public Builder mergeFrom(com.google.gwt.dev.protobuf.Message other) {
if (other instanceof com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.CapabilityExchange) {
return mergeFrom((com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.CapabilityExchange)other);
} else {
@@ -1306,13 +1306,13 @@
}
public Builder mergeFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.CapabilityExchange parsedMessage = null;
try {
parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
- } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ } catch (com.google.gwt.dev.protobuf.InvalidProtocolBufferException e) {
parsedMessage = (com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.CapabilityExchange) e.getUnfinishedMessage();
throw e;
} finally {
@@ -1335,7 +1335,7 @@
}
public interface AddLogOrBuilder
- extends com.google.protobuf.MessageOrBuilder {
+ extends com.google.gwt.dev.protobuf.MessageOrBuilder {
// optional .com.google.gwt.dev.shell.remoteui.Message.Request.ViewerRequest.AddLog.LogType type = 1;
/**
@@ -1397,14 +1397,14 @@
* </pre>
*/
public static final class AddLog extends
- com.google.protobuf.GeneratedMessage
+ com.google.gwt.dev.protobuf.GeneratedMessage
implements AddLogOrBuilder {
// Use AddLog.newBuilder() to construct.
- private AddLog(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+ private AddLog(com.google.gwt.dev.protobuf.GeneratedMessage.Builder<?> builder) {
super(builder);
this.unknownFields = builder.getUnknownFields();
}
- private AddLog(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+ private AddLog(boolean noInit) { this.unknownFields = com.google.gwt.dev.protobuf.UnknownFieldSet.getDefaultInstance(); }
private static final AddLog defaultInstance;
public static AddLog getDefaultInstance() {
@@ -1415,20 +1415,20 @@
return defaultInstance;
}
- private final com.google.protobuf.UnknownFieldSet unknownFields;
+ private final com.google.gwt.dev.protobuf.UnknownFieldSet unknownFields;
@java.lang.Override
- public final com.google.protobuf.UnknownFieldSet
+ public final com.google.gwt.dev.protobuf.UnknownFieldSet
getUnknownFields() {
return this.unknownFields;
}
private AddLog(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
initFields();
int mutable_bitField0_ = 0;
- com.google.protobuf.UnknownFieldSet.Builder unknownFields =
- com.google.protobuf.UnknownFieldSet.newBuilder();
+ com.google.gwt.dev.protobuf.UnknownFieldSet.Builder unknownFields =
+ com.google.gwt.dev.protobuf.UnknownFieldSet.newBuilder();
try {
boolean done = false;
while (!done) {
@@ -1496,40 +1496,40 @@
}
}
}
- } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ } catch (com.google.gwt.dev.protobuf.InvalidProtocolBufferException e) {
throw e.setUnfinishedMessage(this);
} catch (java.io.IOException e) {
- throw new com.google.protobuf.InvalidProtocolBufferException(
+ throw new com.google.gwt.dev.protobuf.InvalidProtocolBufferException(
e.getMessage()).setUnfinishedMessage(this);
} finally {
this.unknownFields = unknownFields.build();
makeExtensionsImmutable();
}
}
- public static final com.google.protobuf.Descriptors.Descriptor
+ public static final com.google.gwt.dev.protobuf.Descriptors.Descriptor
getDescriptor() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_AddLog_descriptor;
}
- protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ protected com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_AddLog_fieldAccessorTable
.ensureFieldAccessorsInitialized(
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog.class, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog.Builder.class);
}
- public static com.google.protobuf.Parser<AddLog> PARSER =
- new com.google.protobuf.AbstractParser<AddLog>() {
+ public static com.google.gwt.dev.protobuf.Parser<AddLog> PARSER =
+ new com.google.gwt.dev.protobuf.AbstractParser<AddLog>() {
public AddLog parsePartialFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return new AddLog(input, extensionRegistry);
}
};
@java.lang.Override
- public com.google.protobuf.Parser<AddLog> getParserForType() {
+ public com.google.gwt.dev.protobuf.Parser<AddLog> getParserForType() {
return PARSER;
}
@@ -1542,7 +1542,7 @@
* </pre>
*/
public enum LogType
- implements com.google.protobuf.ProtocolMessageEnum {
+ implements com.google.gwt.dev.protobuf.ProtocolMessageEnum {
/**
* <code>MAIN = 0;</code>
*/
@@ -1582,27 +1582,27 @@
}
}
- public static com.google.protobuf.Internal.EnumLiteMap<LogType>
+ public static com.google.gwt.dev.protobuf.Internal.EnumLiteMap<LogType>
internalGetValueMap() {
return internalValueMap;
}
- private static com.google.protobuf.Internal.EnumLiteMap<LogType>
+ private static com.google.gwt.dev.protobuf.Internal.EnumLiteMap<LogType>
internalValueMap =
- new com.google.protobuf.Internal.EnumLiteMap<LogType>() {
+ new com.google.gwt.dev.protobuf.Internal.EnumLiteMap<LogType>() {
public LogType findValueByNumber(int number) {
return LogType.valueOf(number);
}
};
- public final com.google.protobuf.Descriptors.EnumValueDescriptor
+ public final com.google.gwt.dev.protobuf.Descriptors.EnumValueDescriptor
getValueDescriptor() {
return getDescriptor().getValues().get(index);
}
- public final com.google.protobuf.Descriptors.EnumDescriptor
+ public final com.google.gwt.dev.protobuf.Descriptors.EnumDescriptor
getDescriptorForType() {
return getDescriptor();
}
- public static final com.google.protobuf.Descriptors.EnumDescriptor
+ public static final com.google.gwt.dev.protobuf.Descriptors.EnumDescriptor
getDescriptor() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog.getDescriptor().getEnumTypes().get(0);
}
@@ -1610,7 +1610,7 @@
private static final LogType[] VALUES = values();
public static LogType valueOf(
- com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+ com.google.gwt.dev.protobuf.Descriptors.EnumValueDescriptor desc) {
if (desc.getType() != getDescriptor()) {
throw new java.lang.IllegalArgumentException(
"EnumValueDescriptor is not for this type.");
@@ -1630,7 +1630,7 @@
}
public interface ModuleLogOrBuilder
- extends com.google.protobuf.MessageOrBuilder {
+ extends com.google.gwt.dev.protobuf.MessageOrBuilder {
// required string name = 1;
/**
@@ -1644,7 +1644,7 @@
/**
* <code>required string name = 1;</code>
*/
- com.google.protobuf.ByteString
+ com.google.gwt.dev.protobuf.ByteString
getNameBytes();
// optional bytes icon = 2;
@@ -1655,7 +1655,7 @@
/**
* <code>optional bytes icon = 2;</code>
*/
- com.google.protobuf.ByteString getIcon();
+ com.google.gwt.dev.protobuf.ByteString getIcon();
// optional string sessionKey = 3;
/**
@@ -1669,7 +1669,7 @@
/**
* <code>optional string sessionKey = 3;</code>
*/
- com.google.protobuf.ByteString
+ com.google.gwt.dev.protobuf.ByteString
getSessionKeyBytes();
// optional string userAgent = 4;
@@ -1684,7 +1684,7 @@
/**
* <code>optional string userAgent = 4;</code>
*/
- com.google.protobuf.ByteString
+ com.google.gwt.dev.protobuf.ByteString
getUserAgentBytes();
// optional string url = 5;
@@ -1699,7 +1699,7 @@
/**
* <code>optional string url = 5;</code>
*/
- com.google.protobuf.ByteString
+ com.google.gwt.dev.protobuf.ByteString
getUrlBytes();
// optional string tabKey = 6;
@@ -1714,7 +1714,7 @@
/**
* <code>optional string tabKey = 6;</code>
*/
- com.google.protobuf.ByteString
+ com.google.gwt.dev.protobuf.ByteString
getTabKeyBytes();
// optional string remoteHost = 7;
@@ -1729,7 +1729,7 @@
/**
* <code>optional string remoteHost = 7;</code>
*/
- com.google.protobuf.ByteString
+ com.google.gwt.dev.protobuf.ByteString
getRemoteHostBytes();
}
/**
@@ -1740,14 +1740,14 @@
* </pre>
*/
public static final class ModuleLog extends
- com.google.protobuf.GeneratedMessage
+ com.google.gwt.dev.protobuf.GeneratedMessage
implements ModuleLogOrBuilder {
// Use ModuleLog.newBuilder() to construct.
- private ModuleLog(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+ private ModuleLog(com.google.gwt.dev.protobuf.GeneratedMessage.Builder<?> builder) {
super(builder);
this.unknownFields = builder.getUnknownFields();
}
- private ModuleLog(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+ private ModuleLog(boolean noInit) { this.unknownFields = com.google.gwt.dev.protobuf.UnknownFieldSet.getDefaultInstance(); }
private static final ModuleLog defaultInstance;
public static ModuleLog getDefaultInstance() {
@@ -1758,20 +1758,20 @@
return defaultInstance;
}
- private final com.google.protobuf.UnknownFieldSet unknownFields;
+ private final com.google.gwt.dev.protobuf.UnknownFieldSet unknownFields;
@java.lang.Override
- public final com.google.protobuf.UnknownFieldSet
+ public final com.google.gwt.dev.protobuf.UnknownFieldSet
getUnknownFields() {
return this.unknownFields;
}
private ModuleLog(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
initFields();
int mutable_bitField0_ = 0;
- com.google.protobuf.UnknownFieldSet.Builder unknownFields =
- com.google.protobuf.UnknownFieldSet.newBuilder();
+ com.google.gwt.dev.protobuf.UnknownFieldSet.Builder unknownFields =
+ com.google.gwt.dev.protobuf.UnknownFieldSet.newBuilder();
try {
boolean done = false;
while (!done) {
@@ -1824,40 +1824,40 @@
}
}
}
- } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ } catch (com.google.gwt.dev.protobuf.InvalidProtocolBufferException e) {
throw e.setUnfinishedMessage(this);
} catch (java.io.IOException e) {
- throw new com.google.protobuf.InvalidProtocolBufferException(
+ throw new com.google.gwt.dev.protobuf.InvalidProtocolBufferException(
e.getMessage()).setUnfinishedMessage(this);
} finally {
this.unknownFields = unknownFields.build();
makeExtensionsImmutable();
}
}
- public static final com.google.protobuf.Descriptors.Descriptor
+ public static final com.google.gwt.dev.protobuf.Descriptors.Descriptor
getDescriptor() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_AddLog_ModuleLog_descriptor;
}
- protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ protected com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_AddLog_ModuleLog_fieldAccessorTable
.ensureFieldAccessorsInitialized(
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog.ModuleLog.class, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog.ModuleLog.Builder.class);
}
- public static com.google.protobuf.Parser<ModuleLog> PARSER =
- new com.google.protobuf.AbstractParser<ModuleLog>() {
+ public static com.google.gwt.dev.protobuf.Parser<ModuleLog> PARSER =
+ new com.google.gwt.dev.protobuf.AbstractParser<ModuleLog>() {
public ModuleLog parsePartialFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return new ModuleLog(input, extensionRegistry);
}
};
@java.lang.Override
- public com.google.protobuf.Parser<ModuleLog> getParserForType() {
+ public com.google.gwt.dev.protobuf.Parser<ModuleLog> getParserForType() {
return PARSER;
}
@@ -1879,8 +1879,8 @@
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
} else {
- com.google.protobuf.ByteString bs =
- (com.google.protobuf.ByteString) ref;
+ com.google.gwt.dev.protobuf.ByteString bs =
+ (com.google.gwt.dev.protobuf.ByteString) ref;
java.lang.String s = bs.toStringUtf8();
if (bs.isValidUtf8()) {
name_ = s;
@@ -1891,23 +1891,23 @@
/**
* <code>required string name = 1;</code>
*/
- public com.google.protobuf.ByteString
+ public com.google.gwt.dev.protobuf.ByteString
getNameBytes() {
java.lang.Object ref = name_;
if (ref instanceof java.lang.String) {
- com.google.protobuf.ByteString b =
- com.google.protobuf.ByteString.copyFromUtf8(
+ com.google.gwt.dev.protobuf.ByteString b =
+ com.google.gwt.dev.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref);
name_ = b;
return b;
} else {
- return (com.google.protobuf.ByteString) ref;
+ return (com.google.gwt.dev.protobuf.ByteString) ref;
}
}
// optional bytes icon = 2;
public static final int ICON_FIELD_NUMBER = 2;
- private com.google.protobuf.ByteString icon_;
+ private com.google.gwt.dev.protobuf.ByteString icon_;
/**
* <code>optional bytes icon = 2;</code>
*/
@@ -1917,7 +1917,7 @@
/**
* <code>optional bytes icon = 2;</code>
*/
- public com.google.protobuf.ByteString getIcon() {
+ public com.google.gwt.dev.protobuf.ByteString getIcon() {
return icon_;
}
@@ -1938,8 +1938,8 @@
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
} else {
- com.google.protobuf.ByteString bs =
- (com.google.protobuf.ByteString) ref;
+ com.google.gwt.dev.protobuf.ByteString bs =
+ (com.google.gwt.dev.protobuf.ByteString) ref;
java.lang.String s = bs.toStringUtf8();
if (bs.isValidUtf8()) {
sessionKey_ = s;
@@ -1950,17 +1950,17 @@
/**
* <code>optional string sessionKey = 3;</code>
*/
- public com.google.protobuf.ByteString
+ public com.google.gwt.dev.protobuf.ByteString
getSessionKeyBytes() {
java.lang.Object ref = sessionKey_;
if (ref instanceof java.lang.String) {
- com.google.protobuf.ByteString b =
- com.google.protobuf.ByteString.copyFromUtf8(
+ com.google.gwt.dev.protobuf.ByteString b =
+ com.google.gwt.dev.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref);
sessionKey_ = b;
return b;
} else {
- return (com.google.protobuf.ByteString) ref;
+ return (com.google.gwt.dev.protobuf.ByteString) ref;
}
}
@@ -1981,8 +1981,8 @@
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
} else {
- com.google.protobuf.ByteString bs =
- (com.google.protobuf.ByteString) ref;
+ com.google.gwt.dev.protobuf.ByteString bs =
+ (com.google.gwt.dev.protobuf.ByteString) ref;
java.lang.String s = bs.toStringUtf8();
if (bs.isValidUtf8()) {
userAgent_ = s;
@@ -1993,17 +1993,17 @@
/**
* <code>optional string userAgent = 4;</code>
*/
- public com.google.protobuf.ByteString
+ public com.google.gwt.dev.protobuf.ByteString
getUserAgentBytes() {
java.lang.Object ref = userAgent_;
if (ref instanceof java.lang.String) {
- com.google.protobuf.ByteString b =
- com.google.protobuf.ByteString.copyFromUtf8(
+ com.google.gwt.dev.protobuf.ByteString b =
+ com.google.gwt.dev.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref);
userAgent_ = b;
return b;
} else {
- return (com.google.protobuf.ByteString) ref;
+ return (com.google.gwt.dev.protobuf.ByteString) ref;
}
}
@@ -2024,8 +2024,8 @@
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
} else {
- com.google.protobuf.ByteString bs =
- (com.google.protobuf.ByteString) ref;
+ com.google.gwt.dev.protobuf.ByteString bs =
+ (com.google.gwt.dev.protobuf.ByteString) ref;
java.lang.String s = bs.toStringUtf8();
if (bs.isValidUtf8()) {
url_ = s;
@@ -2036,17 +2036,17 @@
/**
* <code>optional string url = 5;</code>
*/
- public com.google.protobuf.ByteString
+ public com.google.gwt.dev.protobuf.ByteString
getUrlBytes() {
java.lang.Object ref = url_;
if (ref instanceof java.lang.String) {
- com.google.protobuf.ByteString b =
- com.google.protobuf.ByteString.copyFromUtf8(
+ com.google.gwt.dev.protobuf.ByteString b =
+ com.google.gwt.dev.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref);
url_ = b;
return b;
} else {
- return (com.google.protobuf.ByteString) ref;
+ return (com.google.gwt.dev.protobuf.ByteString) ref;
}
}
@@ -2067,8 +2067,8 @@
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
} else {
- com.google.protobuf.ByteString bs =
- (com.google.protobuf.ByteString) ref;
+ com.google.gwt.dev.protobuf.ByteString bs =
+ (com.google.gwt.dev.protobuf.ByteString) ref;
java.lang.String s = bs.toStringUtf8();
if (bs.isValidUtf8()) {
tabKey_ = s;
@@ -2079,17 +2079,17 @@
/**
* <code>optional string tabKey = 6;</code>
*/
- public com.google.protobuf.ByteString
+ public com.google.gwt.dev.protobuf.ByteString
getTabKeyBytes() {
java.lang.Object ref = tabKey_;
if (ref instanceof java.lang.String) {
- com.google.protobuf.ByteString b =
- com.google.protobuf.ByteString.copyFromUtf8(
+ com.google.gwt.dev.protobuf.ByteString b =
+ com.google.gwt.dev.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref);
tabKey_ = b;
return b;
} else {
- return (com.google.protobuf.ByteString) ref;
+ return (com.google.gwt.dev.protobuf.ByteString) ref;
}
}
@@ -2110,8 +2110,8 @@
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
} else {
- com.google.protobuf.ByteString bs =
- (com.google.protobuf.ByteString) ref;
+ com.google.gwt.dev.protobuf.ByteString bs =
+ (com.google.gwt.dev.protobuf.ByteString) ref;
java.lang.String s = bs.toStringUtf8();
if (bs.isValidUtf8()) {
remoteHost_ = s;
@@ -2122,23 +2122,23 @@
/**
* <code>optional string remoteHost = 7;</code>
*/
- public com.google.protobuf.ByteString
+ public com.google.gwt.dev.protobuf.ByteString
getRemoteHostBytes() {
java.lang.Object ref = remoteHost_;
if (ref instanceof java.lang.String) {
- com.google.protobuf.ByteString b =
- com.google.protobuf.ByteString.copyFromUtf8(
+ com.google.gwt.dev.protobuf.ByteString b =
+ com.google.gwt.dev.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref);
remoteHost_ = b;
return b;
} else {
- return (com.google.protobuf.ByteString) ref;
+ return (com.google.gwt.dev.protobuf.ByteString) ref;
}
}
private void initFields() {
name_ = "";
- icon_ = com.google.protobuf.ByteString.EMPTY;
+ icon_ = com.google.gwt.dev.protobuf.ByteString.EMPTY;
sessionKey_ = "";
userAgent_ = "";
url_ = "";
@@ -2158,7 +2158,7 @@
return true;
}
- public void writeTo(com.google.protobuf.CodedOutputStream output)
+ public void writeTo(com.google.gwt.dev.protobuf.CodedOutputStream output)
throws java.io.IOException {
getSerializedSize();
if (((bitField0_ & 0x00000001) == 0x00000001)) {
@@ -2192,31 +2192,31 @@
size = 0;
if (((bitField0_ & 0x00000001) == 0x00000001)) {
- size += com.google.protobuf.CodedOutputStream
+ size += com.google.gwt.dev.protobuf.CodedOutputStream
.computeBytesSize(1, getNameBytes());
}
if (((bitField0_ & 0x00000002) == 0x00000002)) {
- size += com.google.protobuf.CodedOutputStream
+ size += com.google.gwt.dev.protobuf.CodedOutputStream
.computeBytesSize(2, icon_);
}
if (((bitField0_ & 0x00000004) == 0x00000004)) {
- size += com.google.protobuf.CodedOutputStream
+ size += com.google.gwt.dev.protobuf.CodedOutputStream
.computeBytesSize(3, getSessionKeyBytes());
}
if (((bitField0_ & 0x00000008) == 0x00000008)) {
- size += com.google.protobuf.CodedOutputStream
+ size += com.google.gwt.dev.protobuf.CodedOutputStream
.computeBytesSize(4, getUserAgentBytes());
}
if (((bitField0_ & 0x00000010) == 0x00000010)) {
- size += com.google.protobuf.CodedOutputStream
+ size += com.google.gwt.dev.protobuf.CodedOutputStream
.computeBytesSize(5, getUrlBytes());
}
if (((bitField0_ & 0x00000020) == 0x00000020)) {
- size += com.google.protobuf.CodedOutputStream
+ size += com.google.gwt.dev.protobuf.CodedOutputStream
.computeBytesSize(6, getTabKeyBytes());
}
if (((bitField0_ & 0x00000040) == 0x00000040)) {
- size += com.google.protobuf.CodedOutputStream
+ size += com.google.gwt.dev.protobuf.CodedOutputStream
.computeBytesSize(7, getRemoteHostBytes());
}
size += getUnknownFields().getSerializedSize();
@@ -2232,24 +2232,24 @@
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog.ModuleLog parseFrom(
- com.google.protobuf.ByteString data)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.ByteString data)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog.ModuleLog parseFrom(
- com.google.protobuf.ByteString data,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.ByteString data,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog.ModuleLog parseFrom(byte[] data)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog.ModuleLog parseFrom(
byte[] data,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog.ModuleLog parseFrom(java.io.InputStream input)
@@ -2258,7 +2258,7 @@
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog.ModuleLog parseFrom(
java.io.InputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseFrom(input, extensionRegistry);
}
@@ -2268,18 +2268,18 @@
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog.ModuleLog parseDelimitedFrom(
java.io.InputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseDelimitedFrom(input, extensionRegistry);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog.ModuleLog parseFrom(
- com.google.protobuf.CodedInputStream input)
+ com.google.gwt.dev.protobuf.CodedInputStream input)
throws java.io.IOException {
return PARSER.parseFrom(input);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog.ModuleLog parseFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseFrom(input, extensionRegistry);
}
@@ -2293,7 +2293,7 @@
@java.lang.Override
protected Builder newBuilderForType(
- com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+ com.google.gwt.dev.protobuf.GeneratedMessage.BuilderParent parent) {
Builder builder = new Builder(parent);
return builder;
}
@@ -2305,14 +2305,14 @@
* </pre>
*/
public static final class Builder extends
- com.google.protobuf.GeneratedMessage.Builder<Builder>
+ com.google.gwt.dev.protobuf.GeneratedMessage.Builder<Builder>
implements com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog.ModuleLogOrBuilder {
- public static final com.google.protobuf.Descriptors.Descriptor
+ public static final com.google.gwt.dev.protobuf.Descriptors.Descriptor
getDescriptor() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_AddLog_ModuleLog_descriptor;
}
- protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ protected com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_AddLog_ModuleLog_fieldAccessorTable
.ensureFieldAccessorsInitialized(
@@ -2325,12 +2325,12 @@
}
private Builder(
- com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+ com.google.gwt.dev.protobuf.GeneratedMessage.BuilderParent parent) {
super(parent);
maybeForceBuilderInitialization();
}
private void maybeForceBuilderInitialization() {
- if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+ if (com.google.gwt.dev.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
}
}
private static Builder create() {
@@ -2341,7 +2341,7 @@
super.clear();
name_ = "";
bitField0_ = (bitField0_ & ~0x00000001);
- icon_ = com.google.protobuf.ByteString.EMPTY;
+ icon_ = com.google.gwt.dev.protobuf.ByteString.EMPTY;
bitField0_ = (bitField0_ & ~0x00000002);
sessionKey_ = "";
bitField0_ = (bitField0_ & ~0x00000004);
@@ -2360,7 +2360,7 @@
return create().mergeFrom(buildPartial());
}
- public com.google.protobuf.Descriptors.Descriptor
+ public com.google.gwt.dev.protobuf.Descriptors.Descriptor
getDescriptorForType() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_AddLog_ModuleLog_descriptor;
}
@@ -2414,7 +2414,7 @@
return result;
}
- public Builder mergeFrom(com.google.protobuf.Message other) {
+ public Builder mergeFrom(com.google.gwt.dev.protobuf.Message other) {
if (other instanceof com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog.ModuleLog) {
return mergeFrom((com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog.ModuleLog)other);
} else {
@@ -2471,13 +2471,13 @@
}
public Builder mergeFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog.ModuleLog parsedMessage = null;
try {
parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
- } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ } catch (com.google.gwt.dev.protobuf.InvalidProtocolBufferException e) {
parsedMessage = (com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog.ModuleLog) e.getUnfinishedMessage();
throw e;
} finally {
@@ -2503,7 +2503,7 @@
public java.lang.String getName() {
java.lang.Object ref = name_;
if (!(ref instanceof java.lang.String)) {
- java.lang.String s = ((com.google.protobuf.ByteString) ref)
+ java.lang.String s = ((com.google.gwt.dev.protobuf.ByteString) ref)
.toStringUtf8();
name_ = s;
return s;
@@ -2514,17 +2514,17 @@
/**
* <code>required string name = 1;</code>
*/
- public com.google.protobuf.ByteString
+ public com.google.gwt.dev.protobuf.ByteString
getNameBytes() {
java.lang.Object ref = name_;
if (ref instanceof String) {
- com.google.protobuf.ByteString b =
- com.google.protobuf.ByteString.copyFromUtf8(
+ com.google.gwt.dev.protobuf.ByteString b =
+ com.google.gwt.dev.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref);
name_ = b;
return b;
} else {
- return (com.google.protobuf.ByteString) ref;
+ return (com.google.gwt.dev.protobuf.ByteString) ref;
}
}
/**
@@ -2553,7 +2553,7 @@
* <code>required string name = 1;</code>
*/
public Builder setNameBytes(
- com.google.protobuf.ByteString value) {
+ com.google.gwt.dev.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
}
@@ -2564,7 +2564,7 @@
}
// optional bytes icon = 2;
- private com.google.protobuf.ByteString icon_ = com.google.protobuf.ByteString.EMPTY;
+ private com.google.gwt.dev.protobuf.ByteString icon_ = com.google.gwt.dev.protobuf.ByteString.EMPTY;
/**
* <code>optional bytes icon = 2;</code>
*/
@@ -2574,13 +2574,13 @@
/**
* <code>optional bytes icon = 2;</code>
*/
- public com.google.protobuf.ByteString getIcon() {
+ public com.google.gwt.dev.protobuf.ByteString getIcon() {
return icon_;
}
/**
* <code>optional bytes icon = 2;</code>
*/
- public Builder setIcon(com.google.protobuf.ByteString value) {
+ public Builder setIcon(com.google.gwt.dev.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
}
@@ -2613,7 +2613,7 @@
public java.lang.String getSessionKey() {
java.lang.Object ref = sessionKey_;
if (!(ref instanceof java.lang.String)) {
- java.lang.String s = ((com.google.protobuf.ByteString) ref)
+ java.lang.String s = ((com.google.gwt.dev.protobuf.ByteString) ref)
.toStringUtf8();
sessionKey_ = s;
return s;
@@ -2624,17 +2624,17 @@
/**
* <code>optional string sessionKey = 3;</code>
*/
- public com.google.protobuf.ByteString
+ public com.google.gwt.dev.protobuf.ByteString
getSessionKeyBytes() {
java.lang.Object ref = sessionKey_;
if (ref instanceof String) {
- com.google.protobuf.ByteString b =
- com.google.protobuf.ByteString.copyFromUtf8(
+ com.google.gwt.dev.protobuf.ByteString b =
+ com.google.gwt.dev.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref);
sessionKey_ = b;
return b;
} else {
- return (com.google.protobuf.ByteString) ref;
+ return (com.google.gwt.dev.protobuf.ByteString) ref;
}
}
/**
@@ -2663,7 +2663,7 @@
* <code>optional string sessionKey = 3;</code>
*/
public Builder setSessionKeyBytes(
- com.google.protobuf.ByteString value) {
+ com.google.gwt.dev.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
}
@@ -2687,7 +2687,7 @@
public java.lang.String getUserAgent() {
java.lang.Object ref = userAgent_;
if (!(ref instanceof java.lang.String)) {
- java.lang.String s = ((com.google.protobuf.ByteString) ref)
+ java.lang.String s = ((com.google.gwt.dev.protobuf.ByteString) ref)
.toStringUtf8();
userAgent_ = s;
return s;
@@ -2698,17 +2698,17 @@
/**
* <code>optional string userAgent = 4;</code>
*/
- public com.google.protobuf.ByteString
+ public com.google.gwt.dev.protobuf.ByteString
getUserAgentBytes() {
java.lang.Object ref = userAgent_;
if (ref instanceof String) {
- com.google.protobuf.ByteString b =
- com.google.protobuf.ByteString.copyFromUtf8(
+ com.google.gwt.dev.protobuf.ByteString b =
+ com.google.gwt.dev.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref);
userAgent_ = b;
return b;
} else {
- return (com.google.protobuf.ByteString) ref;
+ return (com.google.gwt.dev.protobuf.ByteString) ref;
}
}
/**
@@ -2737,7 +2737,7 @@
* <code>optional string userAgent = 4;</code>
*/
public Builder setUserAgentBytes(
- com.google.protobuf.ByteString value) {
+ com.google.gwt.dev.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
}
@@ -2761,7 +2761,7 @@
public java.lang.String getUrl() {
java.lang.Object ref = url_;
if (!(ref instanceof java.lang.String)) {
- java.lang.String s = ((com.google.protobuf.ByteString) ref)
+ java.lang.String s = ((com.google.gwt.dev.protobuf.ByteString) ref)
.toStringUtf8();
url_ = s;
return s;
@@ -2772,17 +2772,17 @@
/**
* <code>optional string url = 5;</code>
*/
- public com.google.protobuf.ByteString
+ public com.google.gwt.dev.protobuf.ByteString
getUrlBytes() {
java.lang.Object ref = url_;
if (ref instanceof String) {
- com.google.protobuf.ByteString b =
- com.google.protobuf.ByteString.copyFromUtf8(
+ com.google.gwt.dev.protobuf.ByteString b =
+ com.google.gwt.dev.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref);
url_ = b;
return b;
} else {
- return (com.google.protobuf.ByteString) ref;
+ return (com.google.gwt.dev.protobuf.ByteString) ref;
}
}
/**
@@ -2811,7 +2811,7 @@
* <code>optional string url = 5;</code>
*/
public Builder setUrlBytes(
- com.google.protobuf.ByteString value) {
+ com.google.gwt.dev.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
}
@@ -2835,7 +2835,7 @@
public java.lang.String getTabKey() {
java.lang.Object ref = tabKey_;
if (!(ref instanceof java.lang.String)) {
- java.lang.String s = ((com.google.protobuf.ByteString) ref)
+ java.lang.String s = ((com.google.gwt.dev.protobuf.ByteString) ref)
.toStringUtf8();
tabKey_ = s;
return s;
@@ -2846,17 +2846,17 @@
/**
* <code>optional string tabKey = 6;</code>
*/
- public com.google.protobuf.ByteString
+ public com.google.gwt.dev.protobuf.ByteString
getTabKeyBytes() {
java.lang.Object ref = tabKey_;
if (ref instanceof String) {
- com.google.protobuf.ByteString b =
- com.google.protobuf.ByteString.copyFromUtf8(
+ com.google.gwt.dev.protobuf.ByteString b =
+ com.google.gwt.dev.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref);
tabKey_ = b;
return b;
} else {
- return (com.google.protobuf.ByteString) ref;
+ return (com.google.gwt.dev.protobuf.ByteString) ref;
}
}
/**
@@ -2885,7 +2885,7 @@
* <code>optional string tabKey = 6;</code>
*/
public Builder setTabKeyBytes(
- com.google.protobuf.ByteString value) {
+ com.google.gwt.dev.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
}
@@ -2909,7 +2909,7 @@
public java.lang.String getRemoteHost() {
java.lang.Object ref = remoteHost_;
if (!(ref instanceof java.lang.String)) {
- java.lang.String s = ((com.google.protobuf.ByteString) ref)
+ java.lang.String s = ((com.google.gwt.dev.protobuf.ByteString) ref)
.toStringUtf8();
remoteHost_ = s;
return s;
@@ -2920,17 +2920,17 @@
/**
* <code>optional string remoteHost = 7;</code>
*/
- public com.google.protobuf.ByteString
+ public com.google.gwt.dev.protobuf.ByteString
getRemoteHostBytes() {
java.lang.Object ref = remoteHost_;
if (ref instanceof String) {
- com.google.protobuf.ByteString b =
- com.google.protobuf.ByteString.copyFromUtf8(
+ com.google.gwt.dev.protobuf.ByteString b =
+ com.google.gwt.dev.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref);
remoteHost_ = b;
return b;
} else {
- return (com.google.protobuf.ByteString) ref;
+ return (com.google.gwt.dev.protobuf.ByteString) ref;
}
}
/**
@@ -2959,7 +2959,7 @@
* <code>optional string remoteHost = 7;</code>
*/
public Builder setRemoteHostBytes(
- com.google.protobuf.ByteString value) {
+ com.google.gwt.dev.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
}
@@ -2981,7 +2981,7 @@
}
public interface ServerLogOrBuilder
- extends com.google.protobuf.MessageOrBuilder {
+ extends com.google.gwt.dev.protobuf.MessageOrBuilder {
// required string name = 1;
/**
@@ -2995,7 +2995,7 @@
/**
* <code>required string name = 1;</code>
*/
- com.google.protobuf.ByteString
+ com.google.gwt.dev.protobuf.ByteString
getNameBytes();
// optional bytes icon = 2;
@@ -3006,7 +3006,7 @@
/**
* <code>optional bytes icon = 2;</code>
*/
- com.google.protobuf.ByteString getIcon();
+ com.google.gwt.dev.protobuf.ByteString getIcon();
}
/**
* Protobuf type {@code com.google.gwt.dev.shell.remoteui.Message.Request.ViewerRequest.AddLog.ServerLog}
@@ -3016,14 +3016,14 @@
* </pre>
*/
public static final class ServerLog extends
- com.google.protobuf.GeneratedMessage
+ com.google.gwt.dev.protobuf.GeneratedMessage
implements ServerLogOrBuilder {
// Use ServerLog.newBuilder() to construct.
- private ServerLog(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+ private ServerLog(com.google.gwt.dev.protobuf.GeneratedMessage.Builder<?> builder) {
super(builder);
this.unknownFields = builder.getUnknownFields();
}
- private ServerLog(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+ private ServerLog(boolean noInit) { this.unknownFields = com.google.gwt.dev.protobuf.UnknownFieldSet.getDefaultInstance(); }
private static final ServerLog defaultInstance;
public static ServerLog getDefaultInstance() {
@@ -3034,20 +3034,20 @@
return defaultInstance;
}
- private final com.google.protobuf.UnknownFieldSet unknownFields;
+ private final com.google.gwt.dev.protobuf.UnknownFieldSet unknownFields;
@java.lang.Override
- public final com.google.protobuf.UnknownFieldSet
+ public final com.google.gwt.dev.protobuf.UnknownFieldSet
getUnknownFields() {
return this.unknownFields;
}
private ServerLog(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
initFields();
int mutable_bitField0_ = 0;
- com.google.protobuf.UnknownFieldSet.Builder unknownFields =
- com.google.protobuf.UnknownFieldSet.newBuilder();
+ com.google.gwt.dev.protobuf.UnknownFieldSet.Builder unknownFields =
+ com.google.gwt.dev.protobuf.UnknownFieldSet.newBuilder();
try {
boolean done = false;
while (!done) {
@@ -3075,40 +3075,40 @@
}
}
}
- } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ } catch (com.google.gwt.dev.protobuf.InvalidProtocolBufferException e) {
throw e.setUnfinishedMessage(this);
} catch (java.io.IOException e) {
- throw new com.google.protobuf.InvalidProtocolBufferException(
+ throw new com.google.gwt.dev.protobuf.InvalidProtocolBufferException(
e.getMessage()).setUnfinishedMessage(this);
} finally {
this.unknownFields = unknownFields.build();
makeExtensionsImmutable();
}
}
- public static final com.google.protobuf.Descriptors.Descriptor
+ public static final com.google.gwt.dev.protobuf.Descriptors.Descriptor
getDescriptor() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_AddLog_ServerLog_descriptor;
}
- protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ protected com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_AddLog_ServerLog_fieldAccessorTable
.ensureFieldAccessorsInitialized(
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog.ServerLog.class, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog.ServerLog.Builder.class);
}
- public static com.google.protobuf.Parser<ServerLog> PARSER =
- new com.google.protobuf.AbstractParser<ServerLog>() {
+ public static com.google.gwt.dev.protobuf.Parser<ServerLog> PARSER =
+ new com.google.gwt.dev.protobuf.AbstractParser<ServerLog>() {
public ServerLog parsePartialFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return new ServerLog(input, extensionRegistry);
}
};
@java.lang.Override
- public com.google.protobuf.Parser<ServerLog> getParserForType() {
+ public com.google.gwt.dev.protobuf.Parser<ServerLog> getParserForType() {
return PARSER;
}
@@ -3130,8 +3130,8 @@
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
} else {
- com.google.protobuf.ByteString bs =
- (com.google.protobuf.ByteString) ref;
+ com.google.gwt.dev.protobuf.ByteString bs =
+ (com.google.gwt.dev.protobuf.ByteString) ref;
java.lang.String s = bs.toStringUtf8();
if (bs.isValidUtf8()) {
name_ = s;
@@ -3142,23 +3142,23 @@
/**
* <code>required string name = 1;</code>
*/
- public com.google.protobuf.ByteString
+ public com.google.gwt.dev.protobuf.ByteString
getNameBytes() {
java.lang.Object ref = name_;
if (ref instanceof java.lang.String) {
- com.google.protobuf.ByteString b =
- com.google.protobuf.ByteString.copyFromUtf8(
+ com.google.gwt.dev.protobuf.ByteString b =
+ com.google.gwt.dev.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref);
name_ = b;
return b;
} else {
- return (com.google.protobuf.ByteString) ref;
+ return (com.google.gwt.dev.protobuf.ByteString) ref;
}
}
// optional bytes icon = 2;
public static final int ICON_FIELD_NUMBER = 2;
- private com.google.protobuf.ByteString icon_;
+ private com.google.gwt.dev.protobuf.ByteString icon_;
/**
* <code>optional bytes icon = 2;</code>
*/
@@ -3168,13 +3168,13 @@
/**
* <code>optional bytes icon = 2;</code>
*/
- public com.google.protobuf.ByteString getIcon() {
+ public com.google.gwt.dev.protobuf.ByteString getIcon() {
return icon_;
}
private void initFields() {
name_ = "";
- icon_ = com.google.protobuf.ByteString.EMPTY;
+ icon_ = com.google.gwt.dev.protobuf.ByteString.EMPTY;
}
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
@@ -3189,7 +3189,7 @@
return true;
}
- public void writeTo(com.google.protobuf.CodedOutputStream output)
+ public void writeTo(com.google.gwt.dev.protobuf.CodedOutputStream output)
throws java.io.IOException {
getSerializedSize();
if (((bitField0_ & 0x00000001) == 0x00000001)) {
@@ -3208,11 +3208,11 @@
size = 0;
if (((bitField0_ & 0x00000001) == 0x00000001)) {
- size += com.google.protobuf.CodedOutputStream
+ size += com.google.gwt.dev.protobuf.CodedOutputStream
.computeBytesSize(1, getNameBytes());
}
if (((bitField0_ & 0x00000002) == 0x00000002)) {
- size += com.google.protobuf.CodedOutputStream
+ size += com.google.gwt.dev.protobuf.CodedOutputStream
.computeBytesSize(2, icon_);
}
size += getUnknownFields().getSerializedSize();
@@ -3228,24 +3228,24 @@
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog.ServerLog parseFrom(
- com.google.protobuf.ByteString data)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.ByteString data)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog.ServerLog parseFrom(
- com.google.protobuf.ByteString data,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.ByteString data,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog.ServerLog parseFrom(byte[] data)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog.ServerLog parseFrom(
byte[] data,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog.ServerLog parseFrom(java.io.InputStream input)
@@ -3254,7 +3254,7 @@
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog.ServerLog parseFrom(
java.io.InputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseFrom(input, extensionRegistry);
}
@@ -3264,18 +3264,18 @@
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog.ServerLog parseDelimitedFrom(
java.io.InputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseDelimitedFrom(input, extensionRegistry);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog.ServerLog parseFrom(
- com.google.protobuf.CodedInputStream input)
+ com.google.gwt.dev.protobuf.CodedInputStream input)
throws java.io.IOException {
return PARSER.parseFrom(input);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog.ServerLog parseFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseFrom(input, extensionRegistry);
}
@@ -3289,7 +3289,7 @@
@java.lang.Override
protected Builder newBuilderForType(
- com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+ com.google.gwt.dev.protobuf.GeneratedMessage.BuilderParent parent) {
Builder builder = new Builder(parent);
return builder;
}
@@ -3301,14 +3301,14 @@
* </pre>
*/
public static final class Builder extends
- com.google.protobuf.GeneratedMessage.Builder<Builder>
+ com.google.gwt.dev.protobuf.GeneratedMessage.Builder<Builder>
implements com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog.ServerLogOrBuilder {
- public static final com.google.protobuf.Descriptors.Descriptor
+ public static final com.google.gwt.dev.protobuf.Descriptors.Descriptor
getDescriptor() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_AddLog_ServerLog_descriptor;
}
- protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ protected com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_AddLog_ServerLog_fieldAccessorTable
.ensureFieldAccessorsInitialized(
@@ -3321,12 +3321,12 @@
}
private Builder(
- com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+ com.google.gwt.dev.protobuf.GeneratedMessage.BuilderParent parent) {
super(parent);
maybeForceBuilderInitialization();
}
private void maybeForceBuilderInitialization() {
- if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+ if (com.google.gwt.dev.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
}
}
private static Builder create() {
@@ -3337,7 +3337,7 @@
super.clear();
name_ = "";
bitField0_ = (bitField0_ & ~0x00000001);
- icon_ = com.google.protobuf.ByteString.EMPTY;
+ icon_ = com.google.gwt.dev.protobuf.ByteString.EMPTY;
bitField0_ = (bitField0_ & ~0x00000002);
return this;
}
@@ -3346,7 +3346,7 @@
return create().mergeFrom(buildPartial());
}
- public com.google.protobuf.Descriptors.Descriptor
+ public com.google.gwt.dev.protobuf.Descriptors.Descriptor
getDescriptorForType() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_AddLog_ServerLog_descriptor;
}
@@ -3380,7 +3380,7 @@
return result;
}
- public Builder mergeFrom(com.google.protobuf.Message other) {
+ public Builder mergeFrom(com.google.gwt.dev.protobuf.Message other) {
if (other instanceof com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog.ServerLog) {
return mergeFrom((com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog.ServerLog)other);
} else {
@@ -3412,13 +3412,13 @@
}
public Builder mergeFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog.ServerLog parsedMessage = null;
try {
parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
- } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ } catch (com.google.gwt.dev.protobuf.InvalidProtocolBufferException e) {
parsedMessage = (com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog.ServerLog) e.getUnfinishedMessage();
throw e;
} finally {
@@ -3444,7 +3444,7 @@
public java.lang.String getName() {
java.lang.Object ref = name_;
if (!(ref instanceof java.lang.String)) {
- java.lang.String s = ((com.google.protobuf.ByteString) ref)
+ java.lang.String s = ((com.google.gwt.dev.protobuf.ByteString) ref)
.toStringUtf8();
name_ = s;
return s;
@@ -3455,17 +3455,17 @@
/**
* <code>required string name = 1;</code>
*/
- public com.google.protobuf.ByteString
+ public com.google.gwt.dev.protobuf.ByteString
getNameBytes() {
java.lang.Object ref = name_;
if (ref instanceof String) {
- com.google.protobuf.ByteString b =
- com.google.protobuf.ByteString.copyFromUtf8(
+ com.google.gwt.dev.protobuf.ByteString b =
+ com.google.gwt.dev.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref);
name_ = b;
return b;
} else {
- return (com.google.protobuf.ByteString) ref;
+ return (com.google.gwt.dev.protobuf.ByteString) ref;
}
}
/**
@@ -3494,7 +3494,7 @@
* <code>required string name = 1;</code>
*/
public Builder setNameBytes(
- com.google.protobuf.ByteString value) {
+ com.google.gwt.dev.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
}
@@ -3505,7 +3505,7 @@
}
// optional bytes icon = 2;
- private com.google.protobuf.ByteString icon_ = com.google.protobuf.ByteString.EMPTY;
+ private com.google.gwt.dev.protobuf.ByteString icon_ = com.google.gwt.dev.protobuf.ByteString.EMPTY;
/**
* <code>optional bytes icon = 2;</code>
*/
@@ -3515,13 +3515,13 @@
/**
* <code>optional bytes icon = 2;</code>
*/
- public com.google.protobuf.ByteString getIcon() {
+ public com.google.gwt.dev.protobuf.ByteString getIcon() {
return icon_;
}
/**
* <code>optional bytes icon = 2;</code>
*/
- public Builder setIcon(com.google.protobuf.ByteString value) {
+ public Builder setIcon(com.google.gwt.dev.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
}
@@ -3552,7 +3552,7 @@
}
public interface MainLogOrBuilder
- extends com.google.protobuf.MessageOrBuilder {
+ extends com.google.gwt.dev.protobuf.MessageOrBuilder {
}
/**
* Protobuf type {@code com.google.gwt.dev.shell.remoteui.Message.Request.ViewerRequest.AddLog.MainLog}
@@ -3563,14 +3563,14 @@
* </pre>
*/
public static final class MainLog extends
- com.google.protobuf.GeneratedMessage
+ com.google.gwt.dev.protobuf.GeneratedMessage
implements MainLogOrBuilder {
// Use MainLog.newBuilder() to construct.
- private MainLog(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+ private MainLog(com.google.gwt.dev.protobuf.GeneratedMessage.Builder<?> builder) {
super(builder);
this.unknownFields = builder.getUnknownFields();
}
- private MainLog(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+ private MainLog(boolean noInit) { this.unknownFields = com.google.gwt.dev.protobuf.UnknownFieldSet.getDefaultInstance(); }
private static final MainLog defaultInstance;
public static MainLog getDefaultInstance() {
@@ -3581,19 +3581,19 @@
return defaultInstance;
}
- private final com.google.protobuf.UnknownFieldSet unknownFields;
+ private final com.google.gwt.dev.protobuf.UnknownFieldSet unknownFields;
@java.lang.Override
- public final com.google.protobuf.UnknownFieldSet
+ public final com.google.gwt.dev.protobuf.UnknownFieldSet
getUnknownFields() {
return this.unknownFields;
}
private MainLog(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
initFields();
- com.google.protobuf.UnknownFieldSet.Builder unknownFields =
- com.google.protobuf.UnknownFieldSet.newBuilder();
+ com.google.gwt.dev.protobuf.UnknownFieldSet.Builder unknownFields =
+ com.google.gwt.dev.protobuf.UnknownFieldSet.newBuilder();
try {
boolean done = false;
while (!done) {
@@ -3611,40 +3611,40 @@
}
}
}
- } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ } catch (com.google.gwt.dev.protobuf.InvalidProtocolBufferException e) {
throw e.setUnfinishedMessage(this);
} catch (java.io.IOException e) {
- throw new com.google.protobuf.InvalidProtocolBufferException(
+ throw new com.google.gwt.dev.protobuf.InvalidProtocolBufferException(
e.getMessage()).setUnfinishedMessage(this);
} finally {
this.unknownFields = unknownFields.build();
makeExtensionsImmutable();
}
}
- public static final com.google.protobuf.Descriptors.Descriptor
+ public static final com.google.gwt.dev.protobuf.Descriptors.Descriptor
getDescriptor() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_AddLog_MainLog_descriptor;
}
- protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ protected com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_AddLog_MainLog_fieldAccessorTable
.ensureFieldAccessorsInitialized(
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog.MainLog.class, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog.MainLog.Builder.class);
}
- public static com.google.protobuf.Parser<MainLog> PARSER =
- new com.google.protobuf.AbstractParser<MainLog>() {
+ public static com.google.gwt.dev.protobuf.Parser<MainLog> PARSER =
+ new com.google.gwt.dev.protobuf.AbstractParser<MainLog>() {
public MainLog parsePartialFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return new MainLog(input, extensionRegistry);
}
};
@java.lang.Override
- public com.google.protobuf.Parser<MainLog> getParserForType() {
+ public com.google.gwt.dev.protobuf.Parser<MainLog> getParserForType() {
return PARSER;
}
@@ -3659,7 +3659,7 @@
return true;
}
- public void writeTo(com.google.protobuf.CodedOutputStream output)
+ public void writeTo(com.google.gwt.dev.protobuf.CodedOutputStream output)
throws java.io.IOException {
getSerializedSize();
getUnknownFields().writeTo(output);
@@ -3684,24 +3684,24 @@
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog.MainLog parseFrom(
- com.google.protobuf.ByteString data)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.ByteString data)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog.MainLog parseFrom(
- com.google.protobuf.ByteString data,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.ByteString data,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog.MainLog parseFrom(byte[] data)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog.MainLog parseFrom(
byte[] data,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog.MainLog parseFrom(java.io.InputStream input)
@@ -3710,7 +3710,7 @@
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog.MainLog parseFrom(
java.io.InputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseFrom(input, extensionRegistry);
}
@@ -3720,18 +3720,18 @@
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog.MainLog parseDelimitedFrom(
java.io.InputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseDelimitedFrom(input, extensionRegistry);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog.MainLog parseFrom(
- com.google.protobuf.CodedInputStream input)
+ com.google.gwt.dev.protobuf.CodedInputStream input)
throws java.io.IOException {
return PARSER.parseFrom(input);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog.MainLog parseFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseFrom(input, extensionRegistry);
}
@@ -3745,7 +3745,7 @@
@java.lang.Override
protected Builder newBuilderForType(
- com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+ com.google.gwt.dev.protobuf.GeneratedMessage.BuilderParent parent) {
Builder builder = new Builder(parent);
return builder;
}
@@ -3758,14 +3758,14 @@
* </pre>
*/
public static final class Builder extends
- com.google.protobuf.GeneratedMessage.Builder<Builder>
+ com.google.gwt.dev.protobuf.GeneratedMessage.Builder<Builder>
implements com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog.MainLogOrBuilder {
- public static final com.google.protobuf.Descriptors.Descriptor
+ public static final com.google.gwt.dev.protobuf.Descriptors.Descriptor
getDescriptor() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_AddLog_MainLog_descriptor;
}
- protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ protected com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_AddLog_MainLog_fieldAccessorTable
.ensureFieldAccessorsInitialized(
@@ -3778,12 +3778,12 @@
}
private Builder(
- com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+ com.google.gwt.dev.protobuf.GeneratedMessage.BuilderParent parent) {
super(parent);
maybeForceBuilderInitialization();
}
private void maybeForceBuilderInitialization() {
- if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+ if (com.google.gwt.dev.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
}
}
private static Builder create() {
@@ -3799,7 +3799,7 @@
return create().mergeFrom(buildPartial());
}
- public com.google.protobuf.Descriptors.Descriptor
+ public com.google.gwt.dev.protobuf.Descriptors.Descriptor
getDescriptorForType() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_AddLog_MainLog_descriptor;
}
@@ -3822,7 +3822,7 @@
return result;
}
- public Builder mergeFrom(com.google.protobuf.Message other) {
+ public Builder mergeFrom(com.google.gwt.dev.protobuf.Message other) {
if (other instanceof com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog.MainLog) {
return mergeFrom((com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog.MainLog)other);
} else {
@@ -3842,13 +3842,13 @@
}
public Builder mergeFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog.MainLog parsedMessage = null;
try {
parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
- } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ } catch (com.google.gwt.dev.protobuf.InvalidProtocolBufferException e) {
parsedMessage = (com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog.MainLog) e.getUnfinishedMessage();
throw e;
} finally {
@@ -3980,7 +3980,7 @@
return true;
}
- public void writeTo(com.google.protobuf.CodedOutputStream output)
+ public void writeTo(com.google.gwt.dev.protobuf.CodedOutputStream output)
throws java.io.IOException {
getSerializedSize();
if (((bitField0_ & 0x00000001) == 0x00000001)) {
@@ -4005,19 +4005,19 @@
size = 0;
if (((bitField0_ & 0x00000001) == 0x00000001)) {
- size += com.google.protobuf.CodedOutputStream
+ size += com.google.gwt.dev.protobuf.CodedOutputStream
.computeEnumSize(1, type_.getNumber());
}
if (((bitField0_ & 0x00000002) == 0x00000002)) {
- size += com.google.protobuf.CodedOutputStream
+ size += com.google.gwt.dev.protobuf.CodedOutputStream
.computeMessageSize(2, moduleLog_);
}
if (((bitField0_ & 0x00000004) == 0x00000004)) {
- size += com.google.protobuf.CodedOutputStream
+ size += com.google.gwt.dev.protobuf.CodedOutputStream
.computeMessageSize(3, serverLog_);
}
if (((bitField0_ & 0x00000008) == 0x00000008)) {
- size += com.google.protobuf.CodedOutputStream
+ size += com.google.gwt.dev.protobuf.CodedOutputStream
.computeMessageSize(4, mainLog_);
}
size += getUnknownFields().getSerializedSize();
@@ -4033,24 +4033,24 @@
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog parseFrom(
- com.google.protobuf.ByteString data)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.ByteString data)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog parseFrom(
- com.google.protobuf.ByteString data,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.ByteString data,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog parseFrom(byte[] data)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog parseFrom(
byte[] data,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog parseFrom(java.io.InputStream input)
@@ -4059,7 +4059,7 @@
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog parseFrom(
java.io.InputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseFrom(input, extensionRegistry);
}
@@ -4069,18 +4069,18 @@
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog parseDelimitedFrom(
java.io.InputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseDelimitedFrom(input, extensionRegistry);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog parseFrom(
- com.google.protobuf.CodedInputStream input)
+ com.google.gwt.dev.protobuf.CodedInputStream input)
throws java.io.IOException {
return PARSER.parseFrom(input);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog parseFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseFrom(input, extensionRegistry);
}
@@ -4094,7 +4094,7 @@
@java.lang.Override
protected Builder newBuilderForType(
- com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+ com.google.gwt.dev.protobuf.GeneratedMessage.BuilderParent parent) {
Builder builder = new Builder(parent);
return builder;
}
@@ -4106,14 +4106,14 @@
* </pre>
*/
public static final class Builder extends
- com.google.protobuf.GeneratedMessage.Builder<Builder>
+ com.google.gwt.dev.protobuf.GeneratedMessage.Builder<Builder>
implements com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLogOrBuilder {
- public static final com.google.protobuf.Descriptors.Descriptor
+ public static final com.google.gwt.dev.protobuf.Descriptors.Descriptor
getDescriptor() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_AddLog_descriptor;
}
- protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ protected com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_AddLog_fieldAccessorTable
.ensureFieldAccessorsInitialized(
@@ -4126,12 +4126,12 @@
}
private Builder(
- com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+ com.google.gwt.dev.protobuf.GeneratedMessage.BuilderParent parent) {
super(parent);
maybeForceBuilderInitialization();
}
private void maybeForceBuilderInitialization() {
- if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+ if (com.google.gwt.dev.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
getModuleLogFieldBuilder();
getServerLogFieldBuilder();
getMainLogFieldBuilder();
@@ -4170,7 +4170,7 @@
return create().mergeFrom(buildPartial());
}
- public com.google.protobuf.Descriptors.Descriptor
+ public com.google.gwt.dev.protobuf.Descriptors.Descriptor
getDescriptorForType() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_AddLog_descriptor;
}
@@ -4224,7 +4224,7 @@
return result;
}
- public Builder mergeFrom(com.google.protobuf.Message other) {
+ public Builder mergeFrom(com.google.gwt.dev.protobuf.Message other) {
if (other instanceof com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog) {
return mergeFrom((com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog)other);
} else {
@@ -4268,13 +4268,13 @@
}
public Builder mergeFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog parsedMessage = null;
try {
parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
- } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ } catch (com.google.gwt.dev.protobuf.InvalidProtocolBufferException e) {
parsedMessage = (com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog) e.getUnfinishedMessage();
throw e;
} finally {
@@ -4324,7 +4324,7 @@
// optional .com.google.gwt.dev.shell.remoteui.Message.Request.ViewerRequest.AddLog.ModuleLog moduleLog = 2;
private com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog.ModuleLog moduleLog_ = com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog.ModuleLog.getDefaultInstance();
- private com.google.protobuf.SingleFieldBuilder<
+ private com.google.gwt.dev.protobuf.SingleFieldBuilder<
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog.ModuleLog, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog.ModuleLog.Builder, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog.ModuleLogOrBuilder> moduleLogBuilder_;
/**
* <code>optional .com.google.gwt.dev.shell.remoteui.Message.Request.ViewerRequest.AddLog.ModuleLog moduleLog = 2;</code>
@@ -4425,11 +4425,11 @@
/**
* <code>optional .com.google.gwt.dev.shell.remoteui.Message.Request.ViewerRequest.AddLog.ModuleLog moduleLog = 2;</code>
*/
- private com.google.protobuf.SingleFieldBuilder<
+ private com.google.gwt.dev.protobuf.SingleFieldBuilder<
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog.ModuleLog, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog.ModuleLog.Builder, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog.ModuleLogOrBuilder>
getModuleLogFieldBuilder() {
if (moduleLogBuilder_ == null) {
- moduleLogBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+ moduleLogBuilder_ = new com.google.gwt.dev.protobuf.SingleFieldBuilder<
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog.ModuleLog, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog.ModuleLog.Builder, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog.ModuleLogOrBuilder>(
moduleLog_,
getParentForChildren(),
@@ -4441,7 +4441,7 @@
// optional .com.google.gwt.dev.shell.remoteui.Message.Request.ViewerRequest.AddLog.ServerLog serverLog = 3;
private com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog.ServerLog serverLog_ = com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog.ServerLog.getDefaultInstance();
- private com.google.protobuf.SingleFieldBuilder<
+ private com.google.gwt.dev.protobuf.SingleFieldBuilder<
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog.ServerLog, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog.ServerLog.Builder, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog.ServerLogOrBuilder> serverLogBuilder_;
/**
* <code>optional .com.google.gwt.dev.shell.remoteui.Message.Request.ViewerRequest.AddLog.ServerLog serverLog = 3;</code>
@@ -4542,11 +4542,11 @@
/**
* <code>optional .com.google.gwt.dev.shell.remoteui.Message.Request.ViewerRequest.AddLog.ServerLog serverLog = 3;</code>
*/
- private com.google.protobuf.SingleFieldBuilder<
+ private com.google.gwt.dev.protobuf.SingleFieldBuilder<
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog.ServerLog, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog.ServerLog.Builder, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog.ServerLogOrBuilder>
getServerLogFieldBuilder() {
if (serverLogBuilder_ == null) {
- serverLogBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+ serverLogBuilder_ = new com.google.gwt.dev.protobuf.SingleFieldBuilder<
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog.ServerLog, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog.ServerLog.Builder, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog.ServerLogOrBuilder>(
serverLog_,
getParentForChildren(),
@@ -4558,7 +4558,7 @@
// optional .com.google.gwt.dev.shell.remoteui.Message.Request.ViewerRequest.AddLog.MainLog mainLog = 4;
private com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog.MainLog mainLog_ = com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog.MainLog.getDefaultInstance();
- private com.google.protobuf.SingleFieldBuilder<
+ private com.google.gwt.dev.protobuf.SingleFieldBuilder<
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog.MainLog, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog.MainLog.Builder, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog.MainLogOrBuilder> mainLogBuilder_;
/**
* <code>optional .com.google.gwt.dev.shell.remoteui.Message.Request.ViewerRequest.AddLog.MainLog mainLog = 4;</code>
@@ -4659,11 +4659,11 @@
/**
* <code>optional .com.google.gwt.dev.shell.remoteui.Message.Request.ViewerRequest.AddLog.MainLog mainLog = 4;</code>
*/
- private com.google.protobuf.SingleFieldBuilder<
+ private com.google.gwt.dev.protobuf.SingleFieldBuilder<
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog.MainLog, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog.MainLog.Builder, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog.MainLogOrBuilder>
getMainLogFieldBuilder() {
if (mainLogBuilder_ == null) {
- mainLogBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+ mainLogBuilder_ = new com.google.gwt.dev.protobuf.SingleFieldBuilder<
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog.MainLog, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog.MainLog.Builder, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog.MainLogOrBuilder>(
mainLog_,
getParentForChildren(),
@@ -4685,7 +4685,7 @@
}
public interface LogDataOrBuilder
- extends com.google.protobuf.MessageOrBuilder {
+ extends com.google.gwt.dev.protobuf.MessageOrBuilder {
// required string summary = 1;
/**
@@ -4699,7 +4699,7 @@
/**
* <code>required string summary = 1;</code>
*/
- com.google.protobuf.ByteString
+ com.google.gwt.dev.protobuf.ByteString
getSummaryBytes();
// optional string level = 2;
@@ -4714,7 +4714,7 @@
/**
* <code>optional string level = 2;</code>
*/
- com.google.protobuf.ByteString
+ com.google.gwt.dev.protobuf.ByteString
getLevelBytes();
// optional bool needsAttention = 3;
@@ -4739,7 +4739,7 @@
/**
* <code>optional string details = 4;</code>
*/
- com.google.protobuf.ByteString
+ com.google.gwt.dev.protobuf.ByteString
getDetailsBytes();
// optional .com.google.gwt.dev.shell.remoteui.Message.Request.ViewerRequest.LogData.HelpInfo helpInfo = 5;
@@ -4764,14 +4764,14 @@
* </pre>
*/
public static final class LogData extends
- com.google.protobuf.GeneratedMessage
+ com.google.gwt.dev.protobuf.GeneratedMessage
implements LogDataOrBuilder {
// Use LogData.newBuilder() to construct.
- private LogData(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+ private LogData(com.google.gwt.dev.protobuf.GeneratedMessage.Builder<?> builder) {
super(builder);
this.unknownFields = builder.getUnknownFields();
}
- private LogData(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+ private LogData(boolean noInit) { this.unknownFields = com.google.gwt.dev.protobuf.UnknownFieldSet.getDefaultInstance(); }
private static final LogData defaultInstance;
public static LogData getDefaultInstance() {
@@ -4782,20 +4782,20 @@
return defaultInstance;
}
- private final com.google.protobuf.UnknownFieldSet unknownFields;
+ private final com.google.gwt.dev.protobuf.UnknownFieldSet unknownFields;
@java.lang.Override
- public final com.google.protobuf.UnknownFieldSet
+ public final com.google.gwt.dev.protobuf.UnknownFieldSet
getUnknownFields() {
return this.unknownFields;
}
private LogData(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
initFields();
int mutable_bitField0_ = 0;
- com.google.protobuf.UnknownFieldSet.Builder unknownFields =
- com.google.protobuf.UnknownFieldSet.newBuilder();
+ com.google.gwt.dev.protobuf.UnknownFieldSet.Builder unknownFields =
+ com.google.gwt.dev.protobuf.UnknownFieldSet.newBuilder();
try {
boolean done = false;
while (!done) {
@@ -4846,45 +4846,45 @@
}
}
}
- } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ } catch (com.google.gwt.dev.protobuf.InvalidProtocolBufferException e) {
throw e.setUnfinishedMessage(this);
} catch (java.io.IOException e) {
- throw new com.google.protobuf.InvalidProtocolBufferException(
+ throw new com.google.gwt.dev.protobuf.InvalidProtocolBufferException(
e.getMessage()).setUnfinishedMessage(this);
} finally {
this.unknownFields = unknownFields.build();
makeExtensionsImmutable();
}
}
- public static final com.google.protobuf.Descriptors.Descriptor
+ public static final com.google.gwt.dev.protobuf.Descriptors.Descriptor
getDescriptor() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_LogData_descriptor;
}
- protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ protected com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_LogData_fieldAccessorTable
.ensureFieldAccessorsInitialized(
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.LogData.class, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.LogData.Builder.class);
}
- public static com.google.protobuf.Parser<LogData> PARSER =
- new com.google.protobuf.AbstractParser<LogData>() {
+ public static com.google.gwt.dev.protobuf.Parser<LogData> PARSER =
+ new com.google.gwt.dev.protobuf.AbstractParser<LogData>() {
public LogData parsePartialFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return new LogData(input, extensionRegistry);
}
};
@java.lang.Override
- public com.google.protobuf.Parser<LogData> getParserForType() {
+ public com.google.gwt.dev.protobuf.Parser<LogData> getParserForType() {
return PARSER;
}
public interface HelpInfoOrBuilder
- extends com.google.protobuf.MessageOrBuilder {
+ extends com.google.gwt.dev.protobuf.MessageOrBuilder {
// optional string url = 1;
/**
@@ -4898,7 +4898,7 @@
/**
* <code>optional string url = 1;</code>
*/
- com.google.protobuf.ByteString
+ com.google.gwt.dev.protobuf.ByteString
getUrlBytes();
// optional string text = 2;
@@ -4913,7 +4913,7 @@
/**
* <code>optional string text = 2;</code>
*/
- com.google.protobuf.ByteString
+ com.google.gwt.dev.protobuf.ByteString
getTextBytes();
}
/**
@@ -4924,14 +4924,14 @@
* </pre>
*/
public static final class HelpInfo extends
- com.google.protobuf.GeneratedMessage
+ com.google.gwt.dev.protobuf.GeneratedMessage
implements HelpInfoOrBuilder {
// Use HelpInfo.newBuilder() to construct.
- private HelpInfo(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+ private HelpInfo(com.google.gwt.dev.protobuf.GeneratedMessage.Builder<?> builder) {
super(builder);
this.unknownFields = builder.getUnknownFields();
}
- private HelpInfo(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+ private HelpInfo(boolean noInit) { this.unknownFields = com.google.gwt.dev.protobuf.UnknownFieldSet.getDefaultInstance(); }
private static final HelpInfo defaultInstance;
public static HelpInfo getDefaultInstance() {
@@ -4942,20 +4942,20 @@
return defaultInstance;
}
- private final com.google.protobuf.UnknownFieldSet unknownFields;
+ private final com.google.gwt.dev.protobuf.UnknownFieldSet unknownFields;
@java.lang.Override
- public final com.google.protobuf.UnknownFieldSet
+ public final com.google.gwt.dev.protobuf.UnknownFieldSet
getUnknownFields() {
return this.unknownFields;
}
private HelpInfo(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
initFields();
int mutable_bitField0_ = 0;
- com.google.protobuf.UnknownFieldSet.Builder unknownFields =
- com.google.protobuf.UnknownFieldSet.newBuilder();
+ com.google.gwt.dev.protobuf.UnknownFieldSet.Builder unknownFields =
+ com.google.gwt.dev.protobuf.UnknownFieldSet.newBuilder();
try {
boolean done = false;
while (!done) {
@@ -4983,40 +4983,40 @@
}
}
}
- } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ } catch (com.google.gwt.dev.protobuf.InvalidProtocolBufferException e) {
throw e.setUnfinishedMessage(this);
} catch (java.io.IOException e) {
- throw new com.google.protobuf.InvalidProtocolBufferException(
+ throw new com.google.gwt.dev.protobuf.InvalidProtocolBufferException(
e.getMessage()).setUnfinishedMessage(this);
} finally {
this.unknownFields = unknownFields.build();
makeExtensionsImmutable();
}
}
- public static final com.google.protobuf.Descriptors.Descriptor
+ public static final com.google.gwt.dev.protobuf.Descriptors.Descriptor
getDescriptor() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_LogData_HelpInfo_descriptor;
}
- protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ protected com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_LogData_HelpInfo_fieldAccessorTable
.ensureFieldAccessorsInitialized(
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.LogData.HelpInfo.class, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.LogData.HelpInfo.Builder.class);
}
- public static com.google.protobuf.Parser<HelpInfo> PARSER =
- new com.google.protobuf.AbstractParser<HelpInfo>() {
+ public static com.google.gwt.dev.protobuf.Parser<HelpInfo> PARSER =
+ new com.google.gwt.dev.protobuf.AbstractParser<HelpInfo>() {
public HelpInfo parsePartialFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return new HelpInfo(input, extensionRegistry);
}
};
@java.lang.Override
- public com.google.protobuf.Parser<HelpInfo> getParserForType() {
+ public com.google.gwt.dev.protobuf.Parser<HelpInfo> getParserForType() {
return PARSER;
}
@@ -5038,8 +5038,8 @@
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
} else {
- com.google.protobuf.ByteString bs =
- (com.google.protobuf.ByteString) ref;
+ com.google.gwt.dev.protobuf.ByteString bs =
+ (com.google.gwt.dev.protobuf.ByteString) ref;
java.lang.String s = bs.toStringUtf8();
if (bs.isValidUtf8()) {
url_ = s;
@@ -5050,17 +5050,17 @@
/**
* <code>optional string url = 1;</code>
*/
- public com.google.protobuf.ByteString
+ public com.google.gwt.dev.protobuf.ByteString
getUrlBytes() {
java.lang.Object ref = url_;
if (ref instanceof java.lang.String) {
- com.google.protobuf.ByteString b =
- com.google.protobuf.ByteString.copyFromUtf8(
+ com.google.gwt.dev.protobuf.ByteString b =
+ com.google.gwt.dev.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref);
url_ = b;
return b;
} else {
- return (com.google.protobuf.ByteString) ref;
+ return (com.google.gwt.dev.protobuf.ByteString) ref;
}
}
@@ -5081,8 +5081,8 @@
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
} else {
- com.google.protobuf.ByteString bs =
- (com.google.protobuf.ByteString) ref;
+ com.google.gwt.dev.protobuf.ByteString bs =
+ (com.google.gwt.dev.protobuf.ByteString) ref;
java.lang.String s = bs.toStringUtf8();
if (bs.isValidUtf8()) {
text_ = s;
@@ -5093,17 +5093,17 @@
/**
* <code>optional string text = 2;</code>
*/
- public com.google.protobuf.ByteString
+ public com.google.gwt.dev.protobuf.ByteString
getTextBytes() {
java.lang.Object ref = text_;
if (ref instanceof java.lang.String) {
- com.google.protobuf.ByteString b =
- com.google.protobuf.ByteString.copyFromUtf8(
+ com.google.gwt.dev.protobuf.ByteString b =
+ com.google.gwt.dev.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref);
text_ = b;
return b;
} else {
- return (com.google.protobuf.ByteString) ref;
+ return (com.google.gwt.dev.protobuf.ByteString) ref;
}
}
@@ -5120,7 +5120,7 @@
return true;
}
- public void writeTo(com.google.protobuf.CodedOutputStream output)
+ public void writeTo(com.google.gwt.dev.protobuf.CodedOutputStream output)
throws java.io.IOException {
getSerializedSize();
if (((bitField0_ & 0x00000001) == 0x00000001)) {
@@ -5139,11 +5139,11 @@
size = 0;
if (((bitField0_ & 0x00000001) == 0x00000001)) {
- size += com.google.protobuf.CodedOutputStream
+ size += com.google.gwt.dev.protobuf.CodedOutputStream
.computeBytesSize(1, getUrlBytes());
}
if (((bitField0_ & 0x00000002) == 0x00000002)) {
- size += com.google.protobuf.CodedOutputStream
+ size += com.google.gwt.dev.protobuf.CodedOutputStream
.computeBytesSize(2, getTextBytes());
}
size += getUnknownFields().getSerializedSize();
@@ -5159,24 +5159,24 @@
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.LogData.HelpInfo parseFrom(
- com.google.protobuf.ByteString data)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.ByteString data)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.LogData.HelpInfo parseFrom(
- com.google.protobuf.ByteString data,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.ByteString data,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.LogData.HelpInfo parseFrom(byte[] data)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.LogData.HelpInfo parseFrom(
byte[] data,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.LogData.HelpInfo parseFrom(java.io.InputStream input)
@@ -5185,7 +5185,7 @@
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.LogData.HelpInfo parseFrom(
java.io.InputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseFrom(input, extensionRegistry);
}
@@ -5195,18 +5195,18 @@
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.LogData.HelpInfo parseDelimitedFrom(
java.io.InputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseDelimitedFrom(input, extensionRegistry);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.LogData.HelpInfo parseFrom(
- com.google.protobuf.CodedInputStream input)
+ com.google.gwt.dev.protobuf.CodedInputStream input)
throws java.io.IOException {
return PARSER.parseFrom(input);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.LogData.HelpInfo parseFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseFrom(input, extensionRegistry);
}
@@ -5220,7 +5220,7 @@
@java.lang.Override
protected Builder newBuilderForType(
- com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+ com.google.gwt.dev.protobuf.GeneratedMessage.BuilderParent parent) {
Builder builder = new Builder(parent);
return builder;
}
@@ -5232,14 +5232,14 @@
* </pre>
*/
public static final class Builder extends
- com.google.protobuf.GeneratedMessage.Builder<Builder>
+ com.google.gwt.dev.protobuf.GeneratedMessage.Builder<Builder>
implements com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.LogData.HelpInfoOrBuilder {
- public static final com.google.protobuf.Descriptors.Descriptor
+ public static final com.google.gwt.dev.protobuf.Descriptors.Descriptor
getDescriptor() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_LogData_HelpInfo_descriptor;
}
- protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ protected com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_LogData_HelpInfo_fieldAccessorTable
.ensureFieldAccessorsInitialized(
@@ -5252,12 +5252,12 @@
}
private Builder(
- com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+ com.google.gwt.dev.protobuf.GeneratedMessage.BuilderParent parent) {
super(parent);
maybeForceBuilderInitialization();
}
private void maybeForceBuilderInitialization() {
- if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+ if (com.google.gwt.dev.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
}
}
private static Builder create() {
@@ -5277,7 +5277,7 @@
return create().mergeFrom(buildPartial());
}
- public com.google.protobuf.Descriptors.Descriptor
+ public com.google.gwt.dev.protobuf.Descriptors.Descriptor
getDescriptorForType() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_LogData_HelpInfo_descriptor;
}
@@ -5311,7 +5311,7 @@
return result;
}
- public Builder mergeFrom(com.google.protobuf.Message other) {
+ public Builder mergeFrom(com.google.gwt.dev.protobuf.Message other) {
if (other instanceof com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.LogData.HelpInfo) {
return mergeFrom((com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.LogData.HelpInfo)other);
} else {
@@ -5341,13 +5341,13 @@
}
public Builder mergeFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.LogData.HelpInfo parsedMessage = null;
try {
parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
- } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ } catch (com.google.gwt.dev.protobuf.InvalidProtocolBufferException e) {
parsedMessage = (com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.LogData.HelpInfo) e.getUnfinishedMessage();
throw e;
} finally {
@@ -5373,7 +5373,7 @@
public java.lang.String getUrl() {
java.lang.Object ref = url_;
if (!(ref instanceof java.lang.String)) {
- java.lang.String s = ((com.google.protobuf.ByteString) ref)
+ java.lang.String s = ((com.google.gwt.dev.protobuf.ByteString) ref)
.toStringUtf8();
url_ = s;
return s;
@@ -5384,17 +5384,17 @@
/**
* <code>optional string url = 1;</code>
*/
- public com.google.protobuf.ByteString
+ public com.google.gwt.dev.protobuf.ByteString
getUrlBytes() {
java.lang.Object ref = url_;
if (ref instanceof String) {
- com.google.protobuf.ByteString b =
- com.google.protobuf.ByteString.copyFromUtf8(
+ com.google.gwt.dev.protobuf.ByteString b =
+ com.google.gwt.dev.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref);
url_ = b;
return b;
} else {
- return (com.google.protobuf.ByteString) ref;
+ return (com.google.gwt.dev.protobuf.ByteString) ref;
}
}
/**
@@ -5423,7 +5423,7 @@
* <code>optional string url = 1;</code>
*/
public Builder setUrlBytes(
- com.google.protobuf.ByteString value) {
+ com.google.gwt.dev.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
}
@@ -5447,7 +5447,7 @@
public java.lang.String getText() {
java.lang.Object ref = text_;
if (!(ref instanceof java.lang.String)) {
- java.lang.String s = ((com.google.protobuf.ByteString) ref)
+ java.lang.String s = ((com.google.gwt.dev.protobuf.ByteString) ref)
.toStringUtf8();
text_ = s;
return s;
@@ -5458,17 +5458,17 @@
/**
* <code>optional string text = 2;</code>
*/
- public com.google.protobuf.ByteString
+ public com.google.gwt.dev.protobuf.ByteString
getTextBytes() {
java.lang.Object ref = text_;
if (ref instanceof String) {
- com.google.protobuf.ByteString b =
- com.google.protobuf.ByteString.copyFromUtf8(
+ com.google.gwt.dev.protobuf.ByteString b =
+ com.google.gwt.dev.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref);
text_ = b;
return b;
} else {
- return (com.google.protobuf.ByteString) ref;
+ return (com.google.gwt.dev.protobuf.ByteString) ref;
}
}
/**
@@ -5497,7 +5497,7 @@
* <code>optional string text = 2;</code>
*/
public Builder setTextBytes(
- com.google.protobuf.ByteString value) {
+ com.google.gwt.dev.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
}
@@ -5536,8 +5536,8 @@
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
} else {
- com.google.protobuf.ByteString bs =
- (com.google.protobuf.ByteString) ref;
+ com.google.gwt.dev.protobuf.ByteString bs =
+ (com.google.gwt.dev.protobuf.ByteString) ref;
java.lang.String s = bs.toStringUtf8();
if (bs.isValidUtf8()) {
summary_ = s;
@@ -5548,17 +5548,17 @@
/**
* <code>required string summary = 1;</code>
*/
- public com.google.protobuf.ByteString
+ public com.google.gwt.dev.protobuf.ByteString
getSummaryBytes() {
java.lang.Object ref = summary_;
if (ref instanceof java.lang.String) {
- com.google.protobuf.ByteString b =
- com.google.protobuf.ByteString.copyFromUtf8(
+ com.google.gwt.dev.protobuf.ByteString b =
+ com.google.gwt.dev.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref);
summary_ = b;
return b;
} else {
- return (com.google.protobuf.ByteString) ref;
+ return (com.google.gwt.dev.protobuf.ByteString) ref;
}
}
@@ -5579,8 +5579,8 @@
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
} else {
- com.google.protobuf.ByteString bs =
- (com.google.protobuf.ByteString) ref;
+ com.google.gwt.dev.protobuf.ByteString bs =
+ (com.google.gwt.dev.protobuf.ByteString) ref;
java.lang.String s = bs.toStringUtf8();
if (bs.isValidUtf8()) {
level_ = s;
@@ -5591,17 +5591,17 @@
/**
* <code>optional string level = 2;</code>
*/
- public com.google.protobuf.ByteString
+ public com.google.gwt.dev.protobuf.ByteString
getLevelBytes() {
java.lang.Object ref = level_;
if (ref instanceof java.lang.String) {
- com.google.protobuf.ByteString b =
- com.google.protobuf.ByteString.copyFromUtf8(
+ com.google.gwt.dev.protobuf.ByteString b =
+ com.google.gwt.dev.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref);
level_ = b;
return b;
} else {
- return (com.google.protobuf.ByteString) ref;
+ return (com.google.gwt.dev.protobuf.ByteString) ref;
}
}
@@ -5638,8 +5638,8 @@
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
} else {
- com.google.protobuf.ByteString bs =
- (com.google.protobuf.ByteString) ref;
+ com.google.gwt.dev.protobuf.ByteString bs =
+ (com.google.gwt.dev.protobuf.ByteString) ref;
java.lang.String s = bs.toStringUtf8();
if (bs.isValidUtf8()) {
details_ = s;
@@ -5650,17 +5650,17 @@
/**
* <code>optional string details = 4;</code>
*/
- public com.google.protobuf.ByteString
+ public com.google.gwt.dev.protobuf.ByteString
getDetailsBytes() {
java.lang.Object ref = details_;
if (ref instanceof java.lang.String) {
- com.google.protobuf.ByteString b =
- com.google.protobuf.ByteString.copyFromUtf8(
+ com.google.gwt.dev.protobuf.ByteString b =
+ com.google.gwt.dev.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref);
details_ = b;
return b;
} else {
- return (com.google.protobuf.ByteString) ref;
+ return (com.google.gwt.dev.protobuf.ByteString) ref;
}
}
@@ -5706,7 +5706,7 @@
return true;
}
- public void writeTo(com.google.protobuf.CodedOutputStream output)
+ public void writeTo(com.google.gwt.dev.protobuf.CodedOutputStream output)
throws java.io.IOException {
getSerializedSize();
if (((bitField0_ & 0x00000001) == 0x00000001)) {
@@ -5734,23 +5734,23 @@
size = 0;
if (((bitField0_ & 0x00000001) == 0x00000001)) {
- size += com.google.protobuf.CodedOutputStream
+ size += com.google.gwt.dev.protobuf.CodedOutputStream
.computeBytesSize(1, getSummaryBytes());
}
if (((bitField0_ & 0x00000002) == 0x00000002)) {
- size += com.google.protobuf.CodedOutputStream
+ size += com.google.gwt.dev.protobuf.CodedOutputStream
.computeBytesSize(2, getLevelBytes());
}
if (((bitField0_ & 0x00000004) == 0x00000004)) {
- size += com.google.protobuf.CodedOutputStream
+ size += com.google.gwt.dev.protobuf.CodedOutputStream
.computeBoolSize(3, needsAttention_);
}
if (((bitField0_ & 0x00000008) == 0x00000008)) {
- size += com.google.protobuf.CodedOutputStream
+ size += com.google.gwt.dev.protobuf.CodedOutputStream
.computeBytesSize(4, getDetailsBytes());
}
if (((bitField0_ & 0x00000010) == 0x00000010)) {
- size += com.google.protobuf.CodedOutputStream
+ size += com.google.gwt.dev.protobuf.CodedOutputStream
.computeMessageSize(5, helpInfo_);
}
size += getUnknownFields().getSerializedSize();
@@ -5766,24 +5766,24 @@
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.LogData parseFrom(
- com.google.protobuf.ByteString data)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.ByteString data)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.LogData parseFrom(
- com.google.protobuf.ByteString data,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.ByteString data,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.LogData parseFrom(byte[] data)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.LogData parseFrom(
byte[] data,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.LogData parseFrom(java.io.InputStream input)
@@ -5792,7 +5792,7 @@
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.LogData parseFrom(
java.io.InputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseFrom(input, extensionRegistry);
}
@@ -5802,18 +5802,18 @@
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.LogData parseDelimitedFrom(
java.io.InputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseDelimitedFrom(input, extensionRegistry);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.LogData parseFrom(
- com.google.protobuf.CodedInputStream input)
+ com.google.gwt.dev.protobuf.CodedInputStream input)
throws java.io.IOException {
return PARSER.parseFrom(input);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.LogData parseFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseFrom(input, extensionRegistry);
}
@@ -5827,7 +5827,7 @@
@java.lang.Override
protected Builder newBuilderForType(
- com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+ com.google.gwt.dev.protobuf.GeneratedMessage.BuilderParent parent) {
Builder builder = new Builder(parent);
return builder;
}
@@ -5839,14 +5839,14 @@
* </pre>
*/
public static final class Builder extends
- com.google.protobuf.GeneratedMessage.Builder<Builder>
+ com.google.gwt.dev.protobuf.GeneratedMessage.Builder<Builder>
implements com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.LogDataOrBuilder {
- public static final com.google.protobuf.Descriptors.Descriptor
+ public static final com.google.gwt.dev.protobuf.Descriptors.Descriptor
getDescriptor() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_LogData_descriptor;
}
- protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ protected com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_LogData_fieldAccessorTable
.ensureFieldAccessorsInitialized(
@@ -5859,12 +5859,12 @@
}
private Builder(
- com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+ com.google.gwt.dev.protobuf.GeneratedMessage.BuilderParent parent) {
super(parent);
maybeForceBuilderInitialization();
}
private void maybeForceBuilderInitialization() {
- if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+ if (com.google.gwt.dev.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
getHelpInfoFieldBuilder();
}
}
@@ -5895,7 +5895,7 @@
return create().mergeFrom(buildPartial());
}
- public com.google.protobuf.Descriptors.Descriptor
+ public com.google.gwt.dev.protobuf.Descriptors.Descriptor
getDescriptorForType() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_LogData_descriptor;
}
@@ -5945,7 +5945,7 @@
return result;
}
- public Builder mergeFrom(com.google.protobuf.Message other) {
+ public Builder mergeFrom(com.google.gwt.dev.protobuf.Message other) {
if (other instanceof com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.LogData) {
return mergeFrom((com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.LogData)other);
} else {
@@ -5990,13 +5990,13 @@
}
public Builder mergeFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.LogData parsedMessage = null;
try {
parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
- } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ } catch (com.google.gwt.dev.protobuf.InvalidProtocolBufferException e) {
parsedMessage = (com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.LogData) e.getUnfinishedMessage();
throw e;
} finally {
@@ -6022,7 +6022,7 @@
public java.lang.String getSummary() {
java.lang.Object ref = summary_;
if (!(ref instanceof java.lang.String)) {
- java.lang.String s = ((com.google.protobuf.ByteString) ref)
+ java.lang.String s = ((com.google.gwt.dev.protobuf.ByteString) ref)
.toStringUtf8();
summary_ = s;
return s;
@@ -6033,17 +6033,17 @@
/**
* <code>required string summary = 1;</code>
*/
- public com.google.protobuf.ByteString
+ public com.google.gwt.dev.protobuf.ByteString
getSummaryBytes() {
java.lang.Object ref = summary_;
if (ref instanceof String) {
- com.google.protobuf.ByteString b =
- com.google.protobuf.ByteString.copyFromUtf8(
+ com.google.gwt.dev.protobuf.ByteString b =
+ com.google.gwt.dev.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref);
summary_ = b;
return b;
} else {
- return (com.google.protobuf.ByteString) ref;
+ return (com.google.gwt.dev.protobuf.ByteString) ref;
}
}
/**
@@ -6072,7 +6072,7 @@
* <code>required string summary = 1;</code>
*/
public Builder setSummaryBytes(
- com.google.protobuf.ByteString value) {
+ com.google.gwt.dev.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
}
@@ -6096,7 +6096,7 @@
public java.lang.String getLevel() {
java.lang.Object ref = level_;
if (!(ref instanceof java.lang.String)) {
- java.lang.String s = ((com.google.protobuf.ByteString) ref)
+ java.lang.String s = ((com.google.gwt.dev.protobuf.ByteString) ref)
.toStringUtf8();
level_ = s;
return s;
@@ -6107,17 +6107,17 @@
/**
* <code>optional string level = 2;</code>
*/
- public com.google.protobuf.ByteString
+ public com.google.gwt.dev.protobuf.ByteString
getLevelBytes() {
java.lang.Object ref = level_;
if (ref instanceof String) {
- com.google.protobuf.ByteString b =
- com.google.protobuf.ByteString.copyFromUtf8(
+ com.google.gwt.dev.protobuf.ByteString b =
+ com.google.gwt.dev.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref);
level_ = b;
return b;
} else {
- return (com.google.protobuf.ByteString) ref;
+ return (com.google.gwt.dev.protobuf.ByteString) ref;
}
}
/**
@@ -6146,7 +6146,7 @@
* <code>optional string level = 2;</code>
*/
public Builder setLevelBytes(
- com.google.protobuf.ByteString value) {
+ com.google.gwt.dev.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
}
@@ -6203,7 +6203,7 @@
public java.lang.String getDetails() {
java.lang.Object ref = details_;
if (!(ref instanceof java.lang.String)) {
- java.lang.String s = ((com.google.protobuf.ByteString) ref)
+ java.lang.String s = ((com.google.gwt.dev.protobuf.ByteString) ref)
.toStringUtf8();
details_ = s;
return s;
@@ -6214,17 +6214,17 @@
/**
* <code>optional string details = 4;</code>
*/
- public com.google.protobuf.ByteString
+ public com.google.gwt.dev.protobuf.ByteString
getDetailsBytes() {
java.lang.Object ref = details_;
if (ref instanceof String) {
- com.google.protobuf.ByteString b =
- com.google.protobuf.ByteString.copyFromUtf8(
+ com.google.gwt.dev.protobuf.ByteString b =
+ com.google.gwt.dev.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref);
details_ = b;
return b;
} else {
- return (com.google.protobuf.ByteString) ref;
+ return (com.google.gwt.dev.protobuf.ByteString) ref;
}
}
/**
@@ -6253,7 +6253,7 @@
* <code>optional string details = 4;</code>
*/
public Builder setDetailsBytes(
- com.google.protobuf.ByteString value) {
+ com.google.gwt.dev.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
}
@@ -6265,7 +6265,7 @@
// optional .com.google.gwt.dev.shell.remoteui.Message.Request.ViewerRequest.LogData.HelpInfo helpInfo = 5;
private com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.LogData.HelpInfo helpInfo_ = com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.LogData.HelpInfo.getDefaultInstance();
- private com.google.protobuf.SingleFieldBuilder<
+ private com.google.gwt.dev.protobuf.SingleFieldBuilder<
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.LogData.HelpInfo, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.LogData.HelpInfo.Builder, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.LogData.HelpInfoOrBuilder> helpInfoBuilder_;
/**
* <code>optional .com.google.gwt.dev.shell.remoteui.Message.Request.ViewerRequest.LogData.HelpInfo helpInfo = 5;</code>
@@ -6366,11 +6366,11 @@
/**
* <code>optional .com.google.gwt.dev.shell.remoteui.Message.Request.ViewerRequest.LogData.HelpInfo helpInfo = 5;</code>
*/
- private com.google.protobuf.SingleFieldBuilder<
+ private com.google.gwt.dev.protobuf.SingleFieldBuilder<
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.LogData.HelpInfo, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.LogData.HelpInfo.Builder, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.LogData.HelpInfoOrBuilder>
getHelpInfoFieldBuilder() {
if (helpInfoBuilder_ == null) {
- helpInfoBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+ helpInfoBuilder_ = new com.google.gwt.dev.protobuf.SingleFieldBuilder<
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.LogData.HelpInfo, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.LogData.HelpInfo.Builder, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.LogData.HelpInfoOrBuilder>(
helpInfo_,
getParentForChildren(),
@@ -6392,7 +6392,7 @@
}
public interface AddLogBranchOrBuilder
- extends com.google.protobuf.MessageOrBuilder {
+ extends com.google.gwt.dev.protobuf.MessageOrBuilder {
// required uint32 parentLogHandle = 1;
/**
@@ -6436,14 +6436,14 @@
* </pre>
*/
public static final class AddLogBranch extends
- com.google.protobuf.GeneratedMessage
+ com.google.gwt.dev.protobuf.GeneratedMessage
implements AddLogBranchOrBuilder {
// Use AddLogBranch.newBuilder() to construct.
- private AddLogBranch(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+ private AddLogBranch(com.google.gwt.dev.protobuf.GeneratedMessage.Builder<?> builder) {
super(builder);
this.unknownFields = builder.getUnknownFields();
}
- private AddLogBranch(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+ private AddLogBranch(boolean noInit) { this.unknownFields = com.google.gwt.dev.protobuf.UnknownFieldSet.getDefaultInstance(); }
private static final AddLogBranch defaultInstance;
public static AddLogBranch getDefaultInstance() {
@@ -6454,20 +6454,20 @@
return defaultInstance;
}
- private final com.google.protobuf.UnknownFieldSet unknownFields;
+ private final com.google.gwt.dev.protobuf.UnknownFieldSet unknownFields;
@java.lang.Override
- public final com.google.protobuf.UnknownFieldSet
+ public final com.google.gwt.dev.protobuf.UnknownFieldSet
getUnknownFields() {
return this.unknownFields;
}
private AddLogBranch(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
initFields();
int mutable_bitField0_ = 0;
- com.google.protobuf.UnknownFieldSet.Builder unknownFields =
- com.google.protobuf.UnknownFieldSet.newBuilder();
+ com.google.gwt.dev.protobuf.UnknownFieldSet.Builder unknownFields =
+ com.google.gwt.dev.protobuf.UnknownFieldSet.newBuilder();
try {
boolean done = false;
while (!done) {
@@ -6508,40 +6508,40 @@
}
}
}
- } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ } catch (com.google.gwt.dev.protobuf.InvalidProtocolBufferException e) {
throw e.setUnfinishedMessage(this);
} catch (java.io.IOException e) {
- throw new com.google.protobuf.InvalidProtocolBufferException(
+ throw new com.google.gwt.dev.protobuf.InvalidProtocolBufferException(
e.getMessage()).setUnfinishedMessage(this);
} finally {
this.unknownFields = unknownFields.build();
makeExtensionsImmutable();
}
}
- public static final com.google.protobuf.Descriptors.Descriptor
+ public static final com.google.gwt.dev.protobuf.Descriptors.Descriptor
getDescriptor() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_AddLogBranch_descriptor;
}
- protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ protected com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_AddLogBranch_fieldAccessorTable
.ensureFieldAccessorsInitialized(
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLogBranch.class, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLogBranch.Builder.class);
}
- public static com.google.protobuf.Parser<AddLogBranch> PARSER =
- new com.google.protobuf.AbstractParser<AddLogBranch>() {
+ public static com.google.gwt.dev.protobuf.Parser<AddLogBranch> PARSER =
+ new com.google.gwt.dev.protobuf.AbstractParser<AddLogBranch>() {
public AddLogBranch parsePartialFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return new AddLogBranch(input, extensionRegistry);
}
};
@java.lang.Override
- public com.google.protobuf.Parser<AddLogBranch> getParserForType() {
+ public com.google.gwt.dev.protobuf.Parser<AddLogBranch> getParserForType() {
return PARSER;
}
@@ -6630,7 +6630,7 @@
return true;
}
- public void writeTo(com.google.protobuf.CodedOutputStream output)
+ public void writeTo(com.google.gwt.dev.protobuf.CodedOutputStream output)
throws java.io.IOException {
getSerializedSize();
if (((bitField0_ & 0x00000001) == 0x00000001)) {
@@ -6652,15 +6652,15 @@
size = 0;
if (((bitField0_ & 0x00000001) == 0x00000001)) {
- size += com.google.protobuf.CodedOutputStream
+ size += com.google.gwt.dev.protobuf.CodedOutputStream
.computeUInt32Size(1, parentLogHandle_);
}
if (((bitField0_ & 0x00000002) == 0x00000002)) {
- size += com.google.protobuf.CodedOutputStream
+ size += com.google.gwt.dev.protobuf.CodedOutputStream
.computeUInt32Size(2, indexInParent_);
}
if (((bitField0_ & 0x00000004) == 0x00000004)) {
- size += com.google.protobuf.CodedOutputStream
+ size += com.google.gwt.dev.protobuf.CodedOutputStream
.computeMessageSize(3, logData_);
}
size += getUnknownFields().getSerializedSize();
@@ -6676,24 +6676,24 @@
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLogBranch parseFrom(
- com.google.protobuf.ByteString data)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.ByteString data)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLogBranch parseFrom(
- com.google.protobuf.ByteString data,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.ByteString data,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLogBranch parseFrom(byte[] data)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLogBranch parseFrom(
byte[] data,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLogBranch parseFrom(java.io.InputStream input)
@@ -6702,7 +6702,7 @@
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLogBranch parseFrom(
java.io.InputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseFrom(input, extensionRegistry);
}
@@ -6712,18 +6712,18 @@
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLogBranch parseDelimitedFrom(
java.io.InputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseDelimitedFrom(input, extensionRegistry);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLogBranch parseFrom(
- com.google.protobuf.CodedInputStream input)
+ com.google.gwt.dev.protobuf.CodedInputStream input)
throws java.io.IOException {
return PARSER.parseFrom(input);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLogBranch parseFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseFrom(input, extensionRegistry);
}
@@ -6737,7 +6737,7 @@
@java.lang.Override
protected Builder newBuilderForType(
- com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+ com.google.gwt.dev.protobuf.GeneratedMessage.BuilderParent parent) {
Builder builder = new Builder(parent);
return builder;
}
@@ -6749,14 +6749,14 @@
* </pre>
*/
public static final class Builder extends
- com.google.protobuf.GeneratedMessage.Builder<Builder>
+ com.google.gwt.dev.protobuf.GeneratedMessage.Builder<Builder>
implements com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLogBranchOrBuilder {
- public static final com.google.protobuf.Descriptors.Descriptor
+ public static final com.google.gwt.dev.protobuf.Descriptors.Descriptor
getDescriptor() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_AddLogBranch_descriptor;
}
- protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ protected com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_AddLogBranch_fieldAccessorTable
.ensureFieldAccessorsInitialized(
@@ -6769,12 +6769,12 @@
}
private Builder(
- com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+ com.google.gwt.dev.protobuf.GeneratedMessage.BuilderParent parent) {
super(parent);
maybeForceBuilderInitialization();
}
private void maybeForceBuilderInitialization() {
- if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+ if (com.google.gwt.dev.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
getLogDataFieldBuilder();
}
}
@@ -6801,7 +6801,7 @@
return create().mergeFrom(buildPartial());
}
- public com.google.protobuf.Descriptors.Descriptor
+ public com.google.gwt.dev.protobuf.Descriptors.Descriptor
getDescriptorForType() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_AddLogBranch_descriptor;
}
@@ -6843,7 +6843,7 @@
return result;
}
- public Builder mergeFrom(com.google.protobuf.Message other) {
+ public Builder mergeFrom(com.google.gwt.dev.protobuf.Message other) {
if (other instanceof com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLogBranch) {
return mergeFrom((com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLogBranch)other);
} else {
@@ -6888,13 +6888,13 @@
}
public Builder mergeFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLogBranch parsedMessage = null;
try {
parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
- } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ } catch (com.google.gwt.dev.protobuf.InvalidProtocolBufferException e) {
parsedMessage = (com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLogBranch) e.getUnfinishedMessage();
throw e;
} finally {
@@ -6974,7 +6974,7 @@
// required .com.google.gwt.dev.shell.remoteui.Message.Request.ViewerRequest.LogData logData = 3;
private com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.LogData logData_ = com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.LogData.getDefaultInstance();
- private com.google.protobuf.SingleFieldBuilder<
+ private com.google.gwt.dev.protobuf.SingleFieldBuilder<
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.LogData, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.LogData.Builder, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.LogDataOrBuilder> logDataBuilder_;
/**
* <code>required .com.google.gwt.dev.shell.remoteui.Message.Request.ViewerRequest.LogData logData = 3;</code>
@@ -7075,11 +7075,11 @@
/**
* <code>required .com.google.gwt.dev.shell.remoteui.Message.Request.ViewerRequest.LogData logData = 3;</code>
*/
- private com.google.protobuf.SingleFieldBuilder<
+ private com.google.gwt.dev.protobuf.SingleFieldBuilder<
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.LogData, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.LogData.Builder, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.LogDataOrBuilder>
getLogDataFieldBuilder() {
if (logDataBuilder_ == null) {
- logDataBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+ logDataBuilder_ = new com.google.gwt.dev.protobuf.SingleFieldBuilder<
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.LogData, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.LogData.Builder, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.LogDataOrBuilder>(
logData_,
getParentForChildren(),
@@ -7101,7 +7101,7 @@
}
public interface AddLogEntryOrBuilder
- extends com.google.protobuf.MessageOrBuilder {
+ extends com.google.gwt.dev.protobuf.MessageOrBuilder {
// required uint32 logHandle = 1;
/**
@@ -7145,14 +7145,14 @@
* </pre>
*/
public static final class AddLogEntry extends
- com.google.protobuf.GeneratedMessage
+ com.google.gwt.dev.protobuf.GeneratedMessage
implements AddLogEntryOrBuilder {
// Use AddLogEntry.newBuilder() to construct.
- private AddLogEntry(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+ private AddLogEntry(com.google.gwt.dev.protobuf.GeneratedMessage.Builder<?> builder) {
super(builder);
this.unknownFields = builder.getUnknownFields();
}
- private AddLogEntry(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+ private AddLogEntry(boolean noInit) { this.unknownFields = com.google.gwt.dev.protobuf.UnknownFieldSet.getDefaultInstance(); }
private static final AddLogEntry defaultInstance;
public static AddLogEntry getDefaultInstance() {
@@ -7163,20 +7163,20 @@
return defaultInstance;
}
- private final com.google.protobuf.UnknownFieldSet unknownFields;
+ private final com.google.gwt.dev.protobuf.UnknownFieldSet unknownFields;
@java.lang.Override
- public final com.google.protobuf.UnknownFieldSet
+ public final com.google.gwt.dev.protobuf.UnknownFieldSet
getUnknownFields() {
return this.unknownFields;
}
private AddLogEntry(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
initFields();
int mutable_bitField0_ = 0;
- com.google.protobuf.UnknownFieldSet.Builder unknownFields =
- com.google.protobuf.UnknownFieldSet.newBuilder();
+ com.google.gwt.dev.protobuf.UnknownFieldSet.Builder unknownFields =
+ com.google.gwt.dev.protobuf.UnknownFieldSet.newBuilder();
try {
boolean done = false;
while (!done) {
@@ -7217,40 +7217,40 @@
}
}
}
- } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ } catch (com.google.gwt.dev.protobuf.InvalidProtocolBufferException e) {
throw e.setUnfinishedMessage(this);
} catch (java.io.IOException e) {
- throw new com.google.protobuf.InvalidProtocolBufferException(
+ throw new com.google.gwt.dev.protobuf.InvalidProtocolBufferException(
e.getMessage()).setUnfinishedMessage(this);
} finally {
this.unknownFields = unknownFields.build();
makeExtensionsImmutable();
}
}
- public static final com.google.protobuf.Descriptors.Descriptor
+ public static final com.google.gwt.dev.protobuf.Descriptors.Descriptor
getDescriptor() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_AddLogEntry_descriptor;
}
- protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ protected com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_AddLogEntry_fieldAccessorTable
.ensureFieldAccessorsInitialized(
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLogEntry.class, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLogEntry.Builder.class);
}
- public static com.google.protobuf.Parser<AddLogEntry> PARSER =
- new com.google.protobuf.AbstractParser<AddLogEntry>() {
+ public static com.google.gwt.dev.protobuf.Parser<AddLogEntry> PARSER =
+ new com.google.gwt.dev.protobuf.AbstractParser<AddLogEntry>() {
public AddLogEntry parsePartialFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return new AddLogEntry(input, extensionRegistry);
}
};
@java.lang.Override
- public com.google.protobuf.Parser<AddLogEntry> getParserForType() {
+ public com.google.gwt.dev.protobuf.Parser<AddLogEntry> getParserForType() {
return PARSER;
}
@@ -7339,7 +7339,7 @@
return true;
}
- public void writeTo(com.google.protobuf.CodedOutputStream output)
+ public void writeTo(com.google.gwt.dev.protobuf.CodedOutputStream output)
throws java.io.IOException {
getSerializedSize();
if (((bitField0_ & 0x00000001) == 0x00000001)) {
@@ -7361,15 +7361,15 @@
size = 0;
if (((bitField0_ & 0x00000001) == 0x00000001)) {
- size += com.google.protobuf.CodedOutputStream
+ size += com.google.gwt.dev.protobuf.CodedOutputStream
.computeUInt32Size(1, logHandle_);
}
if (((bitField0_ & 0x00000002) == 0x00000002)) {
- size += com.google.protobuf.CodedOutputStream
+ size += com.google.gwt.dev.protobuf.CodedOutputStream
.computeUInt32Size(2, indexInLog_);
}
if (((bitField0_ & 0x00000004) == 0x00000004)) {
- size += com.google.protobuf.CodedOutputStream
+ size += com.google.gwt.dev.protobuf.CodedOutputStream
.computeMessageSize(3, logData_);
}
size += getUnknownFields().getSerializedSize();
@@ -7385,24 +7385,24 @@
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLogEntry parseFrom(
- com.google.protobuf.ByteString data)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.ByteString data)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLogEntry parseFrom(
- com.google.protobuf.ByteString data,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.ByteString data,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLogEntry parseFrom(byte[] data)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLogEntry parseFrom(
byte[] data,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLogEntry parseFrom(java.io.InputStream input)
@@ -7411,7 +7411,7 @@
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLogEntry parseFrom(
java.io.InputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseFrom(input, extensionRegistry);
}
@@ -7421,18 +7421,18 @@
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLogEntry parseDelimitedFrom(
java.io.InputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseDelimitedFrom(input, extensionRegistry);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLogEntry parseFrom(
- com.google.protobuf.CodedInputStream input)
+ com.google.gwt.dev.protobuf.CodedInputStream input)
throws java.io.IOException {
return PARSER.parseFrom(input);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLogEntry parseFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseFrom(input, extensionRegistry);
}
@@ -7446,7 +7446,7 @@
@java.lang.Override
protected Builder newBuilderForType(
- com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+ com.google.gwt.dev.protobuf.GeneratedMessage.BuilderParent parent) {
Builder builder = new Builder(parent);
return builder;
}
@@ -7458,14 +7458,14 @@
* </pre>
*/
public static final class Builder extends
- com.google.protobuf.GeneratedMessage.Builder<Builder>
+ com.google.gwt.dev.protobuf.GeneratedMessage.Builder<Builder>
implements com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLogEntryOrBuilder {
- public static final com.google.protobuf.Descriptors.Descriptor
+ public static final com.google.gwt.dev.protobuf.Descriptors.Descriptor
getDescriptor() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_AddLogEntry_descriptor;
}
- protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ protected com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_AddLogEntry_fieldAccessorTable
.ensureFieldAccessorsInitialized(
@@ -7478,12 +7478,12 @@
}
private Builder(
- com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+ com.google.gwt.dev.protobuf.GeneratedMessage.BuilderParent parent) {
super(parent);
maybeForceBuilderInitialization();
}
private void maybeForceBuilderInitialization() {
- if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+ if (com.google.gwt.dev.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
getLogDataFieldBuilder();
}
}
@@ -7510,7 +7510,7 @@
return create().mergeFrom(buildPartial());
}
- public com.google.protobuf.Descriptors.Descriptor
+ public com.google.gwt.dev.protobuf.Descriptors.Descriptor
getDescriptorForType() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_AddLogEntry_descriptor;
}
@@ -7552,7 +7552,7 @@
return result;
}
- public Builder mergeFrom(com.google.protobuf.Message other) {
+ public Builder mergeFrom(com.google.gwt.dev.protobuf.Message other) {
if (other instanceof com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLogEntry) {
return mergeFrom((com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLogEntry)other);
} else {
@@ -7597,13 +7597,13 @@
}
public Builder mergeFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLogEntry parsedMessage = null;
try {
parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
- } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ } catch (com.google.gwt.dev.protobuf.InvalidProtocolBufferException e) {
parsedMessage = (com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLogEntry) e.getUnfinishedMessage();
throw e;
} finally {
@@ -7683,7 +7683,7 @@
// required .com.google.gwt.dev.shell.remoteui.Message.Request.ViewerRequest.LogData logData = 3;
private com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.LogData logData_ = com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.LogData.getDefaultInstance();
- private com.google.protobuf.SingleFieldBuilder<
+ private com.google.gwt.dev.protobuf.SingleFieldBuilder<
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.LogData, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.LogData.Builder, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.LogDataOrBuilder> logDataBuilder_;
/**
* <code>required .com.google.gwt.dev.shell.remoteui.Message.Request.ViewerRequest.LogData logData = 3;</code>
@@ -7784,11 +7784,11 @@
/**
* <code>required .com.google.gwt.dev.shell.remoteui.Message.Request.ViewerRequest.LogData logData = 3;</code>
*/
- private com.google.protobuf.SingleFieldBuilder<
+ private com.google.gwt.dev.protobuf.SingleFieldBuilder<
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.LogData, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.LogData.Builder, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.LogDataOrBuilder>
getLogDataFieldBuilder() {
if (logDataBuilder_ == null) {
- logDataBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+ logDataBuilder_ = new com.google.gwt.dev.protobuf.SingleFieldBuilder<
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.LogData, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.LogData.Builder, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.LogDataOrBuilder>(
logData_,
getParentForChildren(),
@@ -7810,7 +7810,7 @@
}
public interface DisconnectLogOrBuilder
- extends com.google.protobuf.MessageOrBuilder {
+ extends com.google.gwt.dev.protobuf.MessageOrBuilder {
// required uint32 logHandle = 1;
/**
@@ -7831,14 +7831,14 @@
* </pre>
*/
public static final class DisconnectLog extends
- com.google.protobuf.GeneratedMessage
+ com.google.gwt.dev.protobuf.GeneratedMessage
implements DisconnectLogOrBuilder {
// Use DisconnectLog.newBuilder() to construct.
- private DisconnectLog(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+ private DisconnectLog(com.google.gwt.dev.protobuf.GeneratedMessage.Builder<?> builder) {
super(builder);
this.unknownFields = builder.getUnknownFields();
}
- private DisconnectLog(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+ private DisconnectLog(boolean noInit) { this.unknownFields = com.google.gwt.dev.protobuf.UnknownFieldSet.getDefaultInstance(); }
private static final DisconnectLog defaultInstance;
public static DisconnectLog getDefaultInstance() {
@@ -7849,20 +7849,20 @@
return defaultInstance;
}
- private final com.google.protobuf.UnknownFieldSet unknownFields;
+ private final com.google.gwt.dev.protobuf.UnknownFieldSet unknownFields;
@java.lang.Override
- public final com.google.protobuf.UnknownFieldSet
+ public final com.google.gwt.dev.protobuf.UnknownFieldSet
getUnknownFields() {
return this.unknownFields;
}
private DisconnectLog(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
initFields();
int mutable_bitField0_ = 0;
- com.google.protobuf.UnknownFieldSet.Builder unknownFields =
- com.google.protobuf.UnknownFieldSet.newBuilder();
+ com.google.gwt.dev.protobuf.UnknownFieldSet.Builder unknownFields =
+ com.google.gwt.dev.protobuf.UnknownFieldSet.newBuilder();
try {
boolean done = false;
while (!done) {
@@ -7885,40 +7885,40 @@
}
}
}
- } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ } catch (com.google.gwt.dev.protobuf.InvalidProtocolBufferException e) {
throw e.setUnfinishedMessage(this);
} catch (java.io.IOException e) {
- throw new com.google.protobuf.InvalidProtocolBufferException(
+ throw new com.google.gwt.dev.protobuf.InvalidProtocolBufferException(
e.getMessage()).setUnfinishedMessage(this);
} finally {
this.unknownFields = unknownFields.build();
makeExtensionsImmutable();
}
}
- public static final com.google.protobuf.Descriptors.Descriptor
+ public static final com.google.gwt.dev.protobuf.Descriptors.Descriptor
getDescriptor() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_DisconnectLog_descriptor;
}
- protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ protected com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_DisconnectLog_fieldAccessorTable
.ensureFieldAccessorsInitialized(
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.DisconnectLog.class, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.DisconnectLog.Builder.class);
}
- public static com.google.protobuf.Parser<DisconnectLog> PARSER =
- new com.google.protobuf.AbstractParser<DisconnectLog>() {
+ public static com.google.gwt.dev.protobuf.Parser<DisconnectLog> PARSER =
+ new com.google.gwt.dev.protobuf.AbstractParser<DisconnectLog>() {
public DisconnectLog parsePartialFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return new DisconnectLog(input, extensionRegistry);
}
};
@java.lang.Override
- public com.google.protobuf.Parser<DisconnectLog> getParserForType() {
+ public com.google.gwt.dev.protobuf.Parser<DisconnectLog> getParserForType() {
return PARSER;
}
@@ -7955,7 +7955,7 @@
return true;
}
- public void writeTo(com.google.protobuf.CodedOutputStream output)
+ public void writeTo(com.google.gwt.dev.protobuf.CodedOutputStream output)
throws java.io.IOException {
getSerializedSize();
if (((bitField0_ & 0x00000001) == 0x00000001)) {
@@ -7971,7 +7971,7 @@
size = 0;
if (((bitField0_ & 0x00000001) == 0x00000001)) {
- size += com.google.protobuf.CodedOutputStream
+ size += com.google.gwt.dev.protobuf.CodedOutputStream
.computeUInt32Size(1, logHandle_);
}
size += getUnknownFields().getSerializedSize();
@@ -7987,24 +7987,24 @@
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.DisconnectLog parseFrom(
- com.google.protobuf.ByteString data)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.ByteString data)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.DisconnectLog parseFrom(
- com.google.protobuf.ByteString data,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.ByteString data,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.DisconnectLog parseFrom(byte[] data)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.DisconnectLog parseFrom(
byte[] data,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.DisconnectLog parseFrom(java.io.InputStream input)
@@ -8013,7 +8013,7 @@
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.DisconnectLog parseFrom(
java.io.InputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseFrom(input, extensionRegistry);
}
@@ -8023,18 +8023,18 @@
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.DisconnectLog parseDelimitedFrom(
java.io.InputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseDelimitedFrom(input, extensionRegistry);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.DisconnectLog parseFrom(
- com.google.protobuf.CodedInputStream input)
+ com.google.gwt.dev.protobuf.CodedInputStream input)
throws java.io.IOException {
return PARSER.parseFrom(input);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.DisconnectLog parseFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseFrom(input, extensionRegistry);
}
@@ -8048,7 +8048,7 @@
@java.lang.Override
protected Builder newBuilderForType(
- com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+ com.google.gwt.dev.protobuf.GeneratedMessage.BuilderParent parent) {
Builder builder = new Builder(parent);
return builder;
}
@@ -8061,14 +8061,14 @@
* </pre>
*/
public static final class Builder extends
- com.google.protobuf.GeneratedMessage.Builder<Builder>
+ com.google.gwt.dev.protobuf.GeneratedMessage.Builder<Builder>
implements com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.DisconnectLogOrBuilder {
- public static final com.google.protobuf.Descriptors.Descriptor
+ public static final com.google.gwt.dev.protobuf.Descriptors.Descriptor
getDescriptor() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_DisconnectLog_descriptor;
}
- protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ protected com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_DisconnectLog_fieldAccessorTable
.ensureFieldAccessorsInitialized(
@@ -8081,12 +8081,12 @@
}
private Builder(
- com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+ com.google.gwt.dev.protobuf.GeneratedMessage.BuilderParent parent) {
super(parent);
maybeForceBuilderInitialization();
}
private void maybeForceBuilderInitialization() {
- if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+ if (com.google.gwt.dev.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
}
}
private static Builder create() {
@@ -8104,7 +8104,7 @@
return create().mergeFrom(buildPartial());
}
- public com.google.protobuf.Descriptors.Descriptor
+ public com.google.gwt.dev.protobuf.Descriptors.Descriptor
getDescriptorForType() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_DisconnectLog_descriptor;
}
@@ -8134,7 +8134,7 @@
return result;
}
- public Builder mergeFrom(com.google.protobuf.Message other) {
+ public Builder mergeFrom(com.google.gwt.dev.protobuf.Message other) {
if (other instanceof com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.DisconnectLog) {
return mergeFrom((com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.DisconnectLog)other);
} else {
@@ -8161,13 +8161,13 @@
}
public Builder mergeFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.DisconnectLog parsedMessage = null;
try {
parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
- } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ } catch (com.google.gwt.dev.protobuf.InvalidProtocolBufferException e) {
parsedMessage = (com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.DisconnectLog) e.getUnfinishedMessage();
throw e;
} finally {
@@ -8224,7 +8224,7 @@
}
public interface InitializeOrBuilder
- extends com.google.protobuf.MessageOrBuilder {
+ extends com.google.gwt.dev.protobuf.MessageOrBuilder {
// optional string clientId = 1;
/**
@@ -8238,7 +8238,7 @@
/**
* <code>optional string clientId = 1;</code>
*/
- com.google.protobuf.ByteString
+ com.google.gwt.dev.protobuf.ByteString
getClientIdBytes();
// repeated string startupURLs = 2;
@@ -8258,21 +8258,21 @@
/**
* <code>repeated string startupURLs = 2;</code>
*/
- com.google.protobuf.ByteString
+ com.google.gwt.dev.protobuf.ByteString
getStartupURLsBytes(int index);
}
/**
* Protobuf type {@code com.google.gwt.dev.shell.remoteui.Message.Request.ViewerRequest.Initialize}
*/
public static final class Initialize extends
- com.google.protobuf.GeneratedMessage
+ com.google.gwt.dev.protobuf.GeneratedMessage
implements InitializeOrBuilder {
// Use Initialize.newBuilder() to construct.
- private Initialize(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+ private Initialize(com.google.gwt.dev.protobuf.GeneratedMessage.Builder<?> builder) {
super(builder);
this.unknownFields = builder.getUnknownFields();
}
- private Initialize(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+ private Initialize(boolean noInit) { this.unknownFields = com.google.gwt.dev.protobuf.UnknownFieldSet.getDefaultInstance(); }
private static final Initialize defaultInstance;
public static Initialize getDefaultInstance() {
@@ -8283,20 +8283,20 @@
return defaultInstance;
}
- private final com.google.protobuf.UnknownFieldSet unknownFields;
+ private final com.google.gwt.dev.protobuf.UnknownFieldSet unknownFields;
@java.lang.Override
- public final com.google.protobuf.UnknownFieldSet
+ public final com.google.gwt.dev.protobuf.UnknownFieldSet
getUnknownFields() {
return this.unknownFields;
}
private Initialize(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
initFields();
int mutable_bitField0_ = 0;
- com.google.protobuf.UnknownFieldSet.Builder unknownFields =
- com.google.protobuf.UnknownFieldSet.newBuilder();
+ com.google.gwt.dev.protobuf.UnknownFieldSet.Builder unknownFields =
+ com.google.gwt.dev.protobuf.UnknownFieldSet.newBuilder();
try {
boolean done = false;
while (!done) {
@@ -8319,7 +8319,7 @@
}
case 18: {
if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
- startupURLs_ = new com.google.protobuf.LazyStringArrayList();
+ startupURLs_ = new com.google.gwt.dev.protobuf.LazyStringArrayList();
mutable_bitField0_ |= 0x00000002;
}
startupURLs_.add(input.readBytes());
@@ -8327,43 +8327,43 @@
}
}
}
- } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ } catch (com.google.gwt.dev.protobuf.InvalidProtocolBufferException e) {
throw e.setUnfinishedMessage(this);
} catch (java.io.IOException e) {
- throw new com.google.protobuf.InvalidProtocolBufferException(
+ throw new com.google.gwt.dev.protobuf.InvalidProtocolBufferException(
e.getMessage()).setUnfinishedMessage(this);
} finally {
if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
- startupURLs_ = new com.google.protobuf.UnmodifiableLazyStringList(startupURLs_);
+ startupURLs_ = new com.google.gwt.dev.protobuf.UnmodifiableLazyStringList(startupURLs_);
}
this.unknownFields = unknownFields.build();
makeExtensionsImmutable();
}
}
- public static final com.google.protobuf.Descriptors.Descriptor
+ public static final com.google.gwt.dev.protobuf.Descriptors.Descriptor
getDescriptor() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_Initialize_descriptor;
}
- protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ protected com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_Initialize_fieldAccessorTable
.ensureFieldAccessorsInitialized(
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.Initialize.class, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.Initialize.Builder.class);
}
- public static com.google.protobuf.Parser<Initialize> PARSER =
- new com.google.protobuf.AbstractParser<Initialize>() {
+ public static com.google.gwt.dev.protobuf.Parser<Initialize> PARSER =
+ new com.google.gwt.dev.protobuf.AbstractParser<Initialize>() {
public Initialize parsePartialFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return new Initialize(input, extensionRegistry);
}
};
@java.lang.Override
- public com.google.protobuf.Parser<Initialize> getParserForType() {
+ public com.google.gwt.dev.protobuf.Parser<Initialize> getParserForType() {
return PARSER;
}
@@ -8385,8 +8385,8 @@
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
} else {
- com.google.protobuf.ByteString bs =
- (com.google.protobuf.ByteString) ref;
+ com.google.gwt.dev.protobuf.ByteString bs =
+ (com.google.gwt.dev.protobuf.ByteString) ref;
java.lang.String s = bs.toStringUtf8();
if (bs.isValidUtf8()) {
clientId_ = s;
@@ -8397,23 +8397,23 @@
/**
* <code>optional string clientId = 1;</code>
*/
- public com.google.protobuf.ByteString
+ public com.google.gwt.dev.protobuf.ByteString
getClientIdBytes() {
java.lang.Object ref = clientId_;
if (ref instanceof java.lang.String) {
- com.google.protobuf.ByteString b =
- com.google.protobuf.ByteString.copyFromUtf8(
+ com.google.gwt.dev.protobuf.ByteString b =
+ com.google.gwt.dev.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref);
clientId_ = b;
return b;
} else {
- return (com.google.protobuf.ByteString) ref;
+ return (com.google.gwt.dev.protobuf.ByteString) ref;
}
}
// repeated string startupURLs = 2;
public static final int STARTUPURLS_FIELD_NUMBER = 2;
- private com.google.protobuf.LazyStringList startupURLs_;
+ private com.google.gwt.dev.protobuf.LazyStringList startupURLs_;
/**
* <code>repeated string startupURLs = 2;</code>
*/
@@ -8436,14 +8436,14 @@
/**
* <code>repeated string startupURLs = 2;</code>
*/
- public com.google.protobuf.ByteString
+ public com.google.gwt.dev.protobuf.ByteString
getStartupURLsBytes(int index) {
return startupURLs_.getByteString(index);
}
private void initFields() {
clientId_ = "";
- startupURLs_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+ startupURLs_ = com.google.gwt.dev.protobuf.LazyStringArrayList.EMPTY;
}
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
@@ -8454,7 +8454,7 @@
return true;
}
- public void writeTo(com.google.protobuf.CodedOutputStream output)
+ public void writeTo(com.google.gwt.dev.protobuf.CodedOutputStream output)
throws java.io.IOException {
getSerializedSize();
if (((bitField0_ & 0x00000001) == 0x00000001)) {
@@ -8473,13 +8473,13 @@
size = 0;
if (((bitField0_ & 0x00000001) == 0x00000001)) {
- size += com.google.protobuf.CodedOutputStream
+ size += com.google.gwt.dev.protobuf.CodedOutputStream
.computeBytesSize(1, getClientIdBytes());
}
{
int dataSize = 0;
for (int i = 0; i < startupURLs_.size(); i++) {
- dataSize += com.google.protobuf.CodedOutputStream
+ dataSize += com.google.gwt.dev.protobuf.CodedOutputStream
.computeBytesSizeNoTag(startupURLs_.getByteString(i));
}
size += dataSize;
@@ -8498,24 +8498,24 @@
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.Initialize parseFrom(
- com.google.protobuf.ByteString data)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.ByteString data)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.Initialize parseFrom(
- com.google.protobuf.ByteString data,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.ByteString data,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.Initialize parseFrom(byte[] data)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.Initialize parseFrom(
byte[] data,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.Initialize parseFrom(java.io.InputStream input)
@@ -8524,7 +8524,7 @@
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.Initialize parseFrom(
java.io.InputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseFrom(input, extensionRegistry);
}
@@ -8534,18 +8534,18 @@
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.Initialize parseDelimitedFrom(
java.io.InputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseDelimitedFrom(input, extensionRegistry);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.Initialize parseFrom(
- com.google.protobuf.CodedInputStream input)
+ com.google.gwt.dev.protobuf.CodedInputStream input)
throws java.io.IOException {
return PARSER.parseFrom(input);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.Initialize parseFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseFrom(input, extensionRegistry);
}
@@ -8559,7 +8559,7 @@
@java.lang.Override
protected Builder newBuilderForType(
- com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+ com.google.gwt.dev.protobuf.GeneratedMessage.BuilderParent parent) {
Builder builder = new Builder(parent);
return builder;
}
@@ -8567,14 +8567,14 @@
* Protobuf type {@code com.google.gwt.dev.shell.remoteui.Message.Request.ViewerRequest.Initialize}
*/
public static final class Builder extends
- com.google.protobuf.GeneratedMessage.Builder<Builder>
+ com.google.gwt.dev.protobuf.GeneratedMessage.Builder<Builder>
implements com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.InitializeOrBuilder {
- public static final com.google.protobuf.Descriptors.Descriptor
+ public static final com.google.gwt.dev.protobuf.Descriptors.Descriptor
getDescriptor() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_Initialize_descriptor;
}
- protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ protected com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_Initialize_fieldAccessorTable
.ensureFieldAccessorsInitialized(
@@ -8587,12 +8587,12 @@
}
private Builder(
- com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+ com.google.gwt.dev.protobuf.GeneratedMessage.BuilderParent parent) {
super(parent);
maybeForceBuilderInitialization();
}
private void maybeForceBuilderInitialization() {
- if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+ if (com.google.gwt.dev.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
}
}
private static Builder create() {
@@ -8603,7 +8603,7 @@
super.clear();
clientId_ = "";
bitField0_ = (bitField0_ & ~0x00000001);
- startupURLs_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+ startupURLs_ = com.google.gwt.dev.protobuf.LazyStringArrayList.EMPTY;
bitField0_ = (bitField0_ & ~0x00000002);
return this;
}
@@ -8612,7 +8612,7 @@
return create().mergeFrom(buildPartial());
}
- public com.google.protobuf.Descriptors.Descriptor
+ public com.google.gwt.dev.protobuf.Descriptors.Descriptor
getDescriptorForType() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_Initialize_descriptor;
}
@@ -8638,7 +8638,7 @@
}
result.clientId_ = clientId_;
if (((bitField0_ & 0x00000002) == 0x00000002)) {
- startupURLs_ = new com.google.protobuf.UnmodifiableLazyStringList(
+ startupURLs_ = new com.google.gwt.dev.protobuf.UnmodifiableLazyStringList(
startupURLs_);
bitField0_ = (bitField0_ & ~0x00000002);
}
@@ -8648,7 +8648,7 @@
return result;
}
- public Builder mergeFrom(com.google.protobuf.Message other) {
+ public Builder mergeFrom(com.google.gwt.dev.protobuf.Message other) {
if (other instanceof com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.Initialize) {
return mergeFrom((com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.Initialize)other);
} else {
@@ -8683,13 +8683,13 @@
}
public Builder mergeFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.Initialize parsedMessage = null;
try {
parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
- } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ } catch (com.google.gwt.dev.protobuf.InvalidProtocolBufferException e) {
parsedMessage = (com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.Initialize) e.getUnfinishedMessage();
throw e;
} finally {
@@ -8715,7 +8715,7 @@
public java.lang.String getClientId() {
java.lang.Object ref = clientId_;
if (!(ref instanceof java.lang.String)) {
- java.lang.String s = ((com.google.protobuf.ByteString) ref)
+ java.lang.String s = ((com.google.gwt.dev.protobuf.ByteString) ref)
.toStringUtf8();
clientId_ = s;
return s;
@@ -8726,17 +8726,17 @@
/**
* <code>optional string clientId = 1;</code>
*/
- public com.google.protobuf.ByteString
+ public com.google.gwt.dev.protobuf.ByteString
getClientIdBytes() {
java.lang.Object ref = clientId_;
if (ref instanceof String) {
- com.google.protobuf.ByteString b =
- com.google.protobuf.ByteString.copyFromUtf8(
+ com.google.gwt.dev.protobuf.ByteString b =
+ com.google.gwt.dev.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref);
clientId_ = b;
return b;
} else {
- return (com.google.protobuf.ByteString) ref;
+ return (com.google.gwt.dev.protobuf.ByteString) ref;
}
}
/**
@@ -8765,7 +8765,7 @@
* <code>optional string clientId = 1;</code>
*/
public Builder setClientIdBytes(
- com.google.protobuf.ByteString value) {
+ com.google.gwt.dev.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
}
@@ -8776,10 +8776,10 @@
}
// repeated string startupURLs = 2;
- private com.google.protobuf.LazyStringList startupURLs_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+ private com.google.gwt.dev.protobuf.LazyStringList startupURLs_ = com.google.gwt.dev.protobuf.LazyStringArrayList.EMPTY;
private void ensureStartupURLsIsMutable() {
if (!((bitField0_ & 0x00000002) == 0x00000002)) {
- startupURLs_ = new com.google.protobuf.LazyStringArrayList(startupURLs_);
+ startupURLs_ = new com.google.gwt.dev.protobuf.LazyStringArrayList(startupURLs_);
bitField0_ |= 0x00000002;
}
}
@@ -8805,7 +8805,7 @@
/**
* <code>repeated string startupURLs = 2;</code>
*/
- public com.google.protobuf.ByteString
+ public com.google.gwt.dev.protobuf.ByteString
getStartupURLsBytes(int index) {
return startupURLs_.getByteString(index);
}
@@ -8849,7 +8849,7 @@
* <code>repeated string startupURLs = 2;</code>
*/
public Builder clearStartupURLs() {
- startupURLs_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+ startupURLs_ = com.google.gwt.dev.protobuf.LazyStringArrayList.EMPTY;
bitField0_ = (bitField0_ & ~0x00000002);
onChanged();
return this;
@@ -8858,7 +8858,7 @@
* <code>repeated string startupURLs = 2;</code>
*/
public Builder addStartupURLsBytes(
- com.google.protobuf.ByteString value) {
+ com.google.gwt.dev.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
}
@@ -9070,7 +9070,7 @@
return true;
}
- public void writeTo(com.google.protobuf.CodedOutputStream output)
+ public void writeTo(com.google.gwt.dev.protobuf.CodedOutputStream output)
throws java.io.IOException {
getSerializedSize();
if (((bitField0_ & 0x00000001) == 0x00000001)) {
@@ -9104,31 +9104,31 @@
size = 0;
if (((bitField0_ & 0x00000001) == 0x00000001)) {
- size += com.google.protobuf.CodedOutputStream
+ size += com.google.gwt.dev.protobuf.CodedOutputStream
.computeEnumSize(1, requestType_.getNumber());
}
if (((bitField0_ & 0x00000002) == 0x00000002)) {
- size += com.google.protobuf.CodedOutputStream
+ size += com.google.gwt.dev.protobuf.CodedOutputStream
.computeMessageSize(2, capabilityExchange_);
}
if (((bitField0_ & 0x00000004) == 0x00000004)) {
- size += com.google.protobuf.CodedOutputStream
+ size += com.google.gwt.dev.protobuf.CodedOutputStream
.computeMessageSize(3, addLog_);
}
if (((bitField0_ & 0x00000008) == 0x00000008)) {
- size += com.google.protobuf.CodedOutputStream
+ size += com.google.gwt.dev.protobuf.CodedOutputStream
.computeMessageSize(4, addLogBranch_);
}
if (((bitField0_ & 0x00000010) == 0x00000010)) {
- size += com.google.protobuf.CodedOutputStream
+ size += com.google.gwt.dev.protobuf.CodedOutputStream
.computeMessageSize(5, addLogEntry_);
}
if (((bitField0_ & 0x00000020) == 0x00000020)) {
- size += com.google.protobuf.CodedOutputStream
+ size += com.google.gwt.dev.protobuf.CodedOutputStream
.computeMessageSize(6, disconnectLog_);
}
if (((bitField0_ & 0x00000040) == 0x00000040)) {
- size += com.google.protobuf.CodedOutputStream
+ size += com.google.gwt.dev.protobuf.CodedOutputStream
.computeMessageSize(7, initialize_);
}
size += getUnknownFields().getSerializedSize();
@@ -9144,24 +9144,24 @@
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest parseFrom(
- com.google.protobuf.ByteString data)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.ByteString data)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest parseFrom(
- com.google.protobuf.ByteString data,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.ByteString data,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest parseFrom(byte[] data)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest parseFrom(
byte[] data,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest parseFrom(java.io.InputStream input)
@@ -9170,7 +9170,7 @@
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest parseFrom(
java.io.InputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseFrom(input, extensionRegistry);
}
@@ -9180,18 +9180,18 @@
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest parseDelimitedFrom(
java.io.InputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseDelimitedFrom(input, extensionRegistry);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest parseFrom(
- com.google.protobuf.CodedInputStream input)
+ com.google.gwt.dev.protobuf.CodedInputStream input)
throws java.io.IOException {
return PARSER.parseFrom(input);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest parseFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseFrom(input, extensionRegistry);
}
@@ -9205,7 +9205,7 @@
@java.lang.Override
protected Builder newBuilderForType(
- com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+ com.google.gwt.dev.protobuf.GeneratedMessage.BuilderParent parent) {
Builder builder = new Builder(parent);
return builder;
}
@@ -9217,14 +9217,14 @@
* </pre>
*/
public static final class Builder extends
- com.google.protobuf.GeneratedMessage.Builder<Builder>
+ com.google.gwt.dev.protobuf.GeneratedMessage.Builder<Builder>
implements com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequestOrBuilder {
- public static final com.google.protobuf.Descriptors.Descriptor
+ public static final com.google.gwt.dev.protobuf.Descriptors.Descriptor
getDescriptor() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_descriptor;
}
- protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ protected com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_fieldAccessorTable
.ensureFieldAccessorsInitialized(
@@ -9237,12 +9237,12 @@
}
private Builder(
- com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+ com.google.gwt.dev.protobuf.GeneratedMessage.BuilderParent parent) {
super(parent);
maybeForceBuilderInitialization();
}
private void maybeForceBuilderInitialization() {
- if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+ if (com.google.gwt.dev.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
getCapabilityExchangeFieldBuilder();
getAddLogFieldBuilder();
getAddLogBranchFieldBuilder();
@@ -9302,7 +9302,7 @@
return create().mergeFrom(buildPartial());
}
- public com.google.protobuf.Descriptors.Descriptor
+ public com.google.gwt.dev.protobuf.Descriptors.Descriptor
getDescriptorForType() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_descriptor;
}
@@ -9380,7 +9380,7 @@
return result;
}
- public Builder mergeFrom(com.google.protobuf.Message other) {
+ public Builder mergeFrom(com.google.gwt.dev.protobuf.Message other) {
if (other instanceof com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest) {
return mergeFrom((com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest)other);
} else {
@@ -9445,13 +9445,13 @@
}
public Builder mergeFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest parsedMessage = null;
try {
parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
- } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ } catch (com.google.gwt.dev.protobuf.InvalidProtocolBufferException e) {
parsedMessage = (com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest) e.getUnfinishedMessage();
throw e;
} finally {
@@ -9501,7 +9501,7 @@
// optional .com.google.gwt.dev.shell.remoteui.Message.Request.ViewerRequest.CapabilityExchange capabilityExchange = 2;
private com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.CapabilityExchange capabilityExchange_ = com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.CapabilityExchange.getDefaultInstance();
- private com.google.protobuf.SingleFieldBuilder<
+ private com.google.gwt.dev.protobuf.SingleFieldBuilder<
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.CapabilityExchange, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.CapabilityExchange.Builder, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.CapabilityExchangeOrBuilder> capabilityExchangeBuilder_;
/**
* <code>optional .com.google.gwt.dev.shell.remoteui.Message.Request.ViewerRequest.CapabilityExchange capabilityExchange = 2;</code>
@@ -9602,11 +9602,11 @@
/**
* <code>optional .com.google.gwt.dev.shell.remoteui.Message.Request.ViewerRequest.CapabilityExchange capabilityExchange = 2;</code>
*/
- private com.google.protobuf.SingleFieldBuilder<
+ private com.google.gwt.dev.protobuf.SingleFieldBuilder<
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.CapabilityExchange, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.CapabilityExchange.Builder, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.CapabilityExchangeOrBuilder>
getCapabilityExchangeFieldBuilder() {
if (capabilityExchangeBuilder_ == null) {
- capabilityExchangeBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+ capabilityExchangeBuilder_ = new com.google.gwt.dev.protobuf.SingleFieldBuilder<
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.CapabilityExchange, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.CapabilityExchange.Builder, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.CapabilityExchangeOrBuilder>(
capabilityExchange_,
getParentForChildren(),
@@ -9618,7 +9618,7 @@
// optional .com.google.gwt.dev.shell.remoteui.Message.Request.ViewerRequest.AddLog addLog = 3;
private com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog addLog_ = com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog.getDefaultInstance();
- private com.google.protobuf.SingleFieldBuilder<
+ private com.google.gwt.dev.protobuf.SingleFieldBuilder<
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog.Builder, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLogOrBuilder> addLogBuilder_;
/**
* <code>optional .com.google.gwt.dev.shell.remoteui.Message.Request.ViewerRequest.AddLog addLog = 3;</code>
@@ -9719,11 +9719,11 @@
/**
* <code>optional .com.google.gwt.dev.shell.remoteui.Message.Request.ViewerRequest.AddLog addLog = 3;</code>
*/
- private com.google.protobuf.SingleFieldBuilder<
+ private com.google.gwt.dev.protobuf.SingleFieldBuilder<
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog.Builder, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLogOrBuilder>
getAddLogFieldBuilder() {
if (addLogBuilder_ == null) {
- addLogBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+ addLogBuilder_ = new com.google.gwt.dev.protobuf.SingleFieldBuilder<
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLog.Builder, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLogOrBuilder>(
addLog_,
getParentForChildren(),
@@ -9735,7 +9735,7 @@
// optional .com.google.gwt.dev.shell.remoteui.Message.Request.ViewerRequest.AddLogBranch addLogBranch = 4;
private com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLogBranch addLogBranch_ = com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLogBranch.getDefaultInstance();
- private com.google.protobuf.SingleFieldBuilder<
+ private com.google.gwt.dev.protobuf.SingleFieldBuilder<
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLogBranch, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLogBranch.Builder, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLogBranchOrBuilder> addLogBranchBuilder_;
/**
* <code>optional .com.google.gwt.dev.shell.remoteui.Message.Request.ViewerRequest.AddLogBranch addLogBranch = 4;</code>
@@ -9836,11 +9836,11 @@
/**
* <code>optional .com.google.gwt.dev.shell.remoteui.Message.Request.ViewerRequest.AddLogBranch addLogBranch = 4;</code>
*/
- private com.google.protobuf.SingleFieldBuilder<
+ private com.google.gwt.dev.protobuf.SingleFieldBuilder<
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLogBranch, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLogBranch.Builder, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLogBranchOrBuilder>
getAddLogBranchFieldBuilder() {
if (addLogBranchBuilder_ == null) {
- addLogBranchBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+ addLogBranchBuilder_ = new com.google.gwt.dev.protobuf.SingleFieldBuilder<
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLogBranch, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLogBranch.Builder, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLogBranchOrBuilder>(
addLogBranch_,
getParentForChildren(),
@@ -9852,7 +9852,7 @@
// optional .com.google.gwt.dev.shell.remoteui.Message.Request.ViewerRequest.AddLogEntry addLogEntry = 5;
private com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLogEntry addLogEntry_ = com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLogEntry.getDefaultInstance();
- private com.google.protobuf.SingleFieldBuilder<
+ private com.google.gwt.dev.protobuf.SingleFieldBuilder<
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLogEntry, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLogEntry.Builder, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLogEntryOrBuilder> addLogEntryBuilder_;
/**
* <code>optional .com.google.gwt.dev.shell.remoteui.Message.Request.ViewerRequest.AddLogEntry addLogEntry = 5;</code>
@@ -9953,11 +9953,11 @@
/**
* <code>optional .com.google.gwt.dev.shell.remoteui.Message.Request.ViewerRequest.AddLogEntry addLogEntry = 5;</code>
*/
- private com.google.protobuf.SingleFieldBuilder<
+ private com.google.gwt.dev.protobuf.SingleFieldBuilder<
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLogEntry, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLogEntry.Builder, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLogEntryOrBuilder>
getAddLogEntryFieldBuilder() {
if (addLogEntryBuilder_ == null) {
- addLogEntryBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+ addLogEntryBuilder_ = new com.google.gwt.dev.protobuf.SingleFieldBuilder<
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLogEntry, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLogEntry.Builder, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.AddLogEntryOrBuilder>(
addLogEntry_,
getParentForChildren(),
@@ -9969,7 +9969,7 @@
// optional .com.google.gwt.dev.shell.remoteui.Message.Request.ViewerRequest.DisconnectLog disconnectLog = 6;
private com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.DisconnectLog disconnectLog_ = com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.DisconnectLog.getDefaultInstance();
- private com.google.protobuf.SingleFieldBuilder<
+ private com.google.gwt.dev.protobuf.SingleFieldBuilder<
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.DisconnectLog, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.DisconnectLog.Builder, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.DisconnectLogOrBuilder> disconnectLogBuilder_;
/**
* <code>optional .com.google.gwt.dev.shell.remoteui.Message.Request.ViewerRequest.DisconnectLog disconnectLog = 6;</code>
@@ -10070,11 +10070,11 @@
/**
* <code>optional .com.google.gwt.dev.shell.remoteui.Message.Request.ViewerRequest.DisconnectLog disconnectLog = 6;</code>
*/
- private com.google.protobuf.SingleFieldBuilder<
+ private com.google.gwt.dev.protobuf.SingleFieldBuilder<
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.DisconnectLog, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.DisconnectLog.Builder, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.DisconnectLogOrBuilder>
getDisconnectLogFieldBuilder() {
if (disconnectLogBuilder_ == null) {
- disconnectLogBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+ disconnectLogBuilder_ = new com.google.gwt.dev.protobuf.SingleFieldBuilder<
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.DisconnectLog, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.DisconnectLog.Builder, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.DisconnectLogOrBuilder>(
disconnectLog_,
getParentForChildren(),
@@ -10086,7 +10086,7 @@
// optional .com.google.gwt.dev.shell.remoteui.Message.Request.ViewerRequest.Initialize initialize = 7;
private com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.Initialize initialize_ = com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.Initialize.getDefaultInstance();
- private com.google.protobuf.SingleFieldBuilder<
+ private com.google.gwt.dev.protobuf.SingleFieldBuilder<
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.Initialize, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.Initialize.Builder, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.InitializeOrBuilder> initializeBuilder_;
/**
* <code>optional .com.google.gwt.dev.shell.remoteui.Message.Request.ViewerRequest.Initialize initialize = 7;</code>
@@ -10187,11 +10187,11 @@
/**
* <code>optional .com.google.gwt.dev.shell.remoteui.Message.Request.ViewerRequest.Initialize initialize = 7;</code>
*/
- private com.google.protobuf.SingleFieldBuilder<
+ private com.google.gwt.dev.protobuf.SingleFieldBuilder<
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.Initialize, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.Initialize.Builder, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.InitializeOrBuilder>
getInitializeFieldBuilder() {
if (initializeBuilder_ == null) {
- initializeBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+ initializeBuilder_ = new com.google.gwt.dev.protobuf.SingleFieldBuilder<
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.Initialize, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.Initialize.Builder, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.InitializeOrBuilder>(
initialize_,
getParentForChildren(),
@@ -10213,7 +10213,7 @@
}
public interface DevModeRequestOrBuilder
- extends com.google.protobuf.MessageOrBuilder {
+ extends com.google.gwt.dev.protobuf.MessageOrBuilder {
// optional .com.google.gwt.dev.shell.remoteui.Message.Request.DevModeRequest.RequestType requestType = 1;
/**
@@ -10261,14 +10261,14 @@
* </pre>
*/
public static final class DevModeRequest extends
- com.google.protobuf.GeneratedMessage
+ com.google.gwt.dev.protobuf.GeneratedMessage
implements DevModeRequestOrBuilder {
// Use DevModeRequest.newBuilder() to construct.
- private DevModeRequest(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+ private DevModeRequest(com.google.gwt.dev.protobuf.GeneratedMessage.Builder<?> builder) {
super(builder);
this.unknownFields = builder.getUnknownFields();
}
- private DevModeRequest(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+ private DevModeRequest(boolean noInit) { this.unknownFields = com.google.gwt.dev.protobuf.UnknownFieldSet.getDefaultInstance(); }
private static final DevModeRequest defaultInstance;
public static DevModeRequest getDefaultInstance() {
@@ -10279,20 +10279,20 @@
return defaultInstance;
}
- private final com.google.protobuf.UnknownFieldSet unknownFields;
+ private final com.google.gwt.dev.protobuf.UnknownFieldSet unknownFields;
@java.lang.Override
- public final com.google.protobuf.UnknownFieldSet
+ public final com.google.gwt.dev.protobuf.UnknownFieldSet
getUnknownFields() {
return this.unknownFields;
}
private DevModeRequest(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
initFields();
int mutable_bitField0_ = 0;
- com.google.protobuf.UnknownFieldSet.Builder unknownFields =
- com.google.protobuf.UnknownFieldSet.newBuilder();
+ com.google.gwt.dev.protobuf.UnknownFieldSet.Builder unknownFields =
+ com.google.gwt.dev.protobuf.UnknownFieldSet.newBuilder();
try {
boolean done = false;
while (!done) {
@@ -10347,40 +10347,40 @@
}
}
}
- } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ } catch (com.google.gwt.dev.protobuf.InvalidProtocolBufferException e) {
throw e.setUnfinishedMessage(this);
} catch (java.io.IOException e) {
- throw new com.google.protobuf.InvalidProtocolBufferException(
+ throw new com.google.gwt.dev.protobuf.InvalidProtocolBufferException(
e.getMessage()).setUnfinishedMessage(this);
} finally {
this.unknownFields = unknownFields.build();
makeExtensionsImmutable();
}
}
- public static final com.google.protobuf.Descriptors.Descriptor
+ public static final com.google.gwt.dev.protobuf.Descriptors.Descriptor
getDescriptor() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_DevModeRequest_descriptor;
}
- protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ protected com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_DevModeRequest_fieldAccessorTable
.ensureFieldAccessorsInitialized(
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequest.class, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequest.Builder.class);
}
- public static com.google.protobuf.Parser<DevModeRequest> PARSER =
- new com.google.protobuf.AbstractParser<DevModeRequest>() {
+ public static com.google.gwt.dev.protobuf.Parser<DevModeRequest> PARSER =
+ new com.google.gwt.dev.protobuf.AbstractParser<DevModeRequest>() {
public DevModeRequest parsePartialFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return new DevModeRequest(input, extensionRegistry);
}
};
@java.lang.Override
- public com.google.protobuf.Parser<DevModeRequest> getParserForType() {
+ public com.google.gwt.dev.protobuf.Parser<DevModeRequest> getParserForType() {
return PARSER;
}
@@ -10392,7 +10392,7 @@
* </pre>
*/
public enum RequestType
- implements com.google.protobuf.ProtocolMessageEnum {
+ implements com.google.gwt.dev.protobuf.ProtocolMessageEnum {
/**
* <code>CAPABILITY_EXCHANGE = 0;</code>
*/
@@ -10423,27 +10423,27 @@
}
}
- public static com.google.protobuf.Internal.EnumLiteMap<RequestType>
+ public static com.google.gwt.dev.protobuf.Internal.EnumLiteMap<RequestType>
internalGetValueMap() {
return internalValueMap;
}
- private static com.google.protobuf.Internal.EnumLiteMap<RequestType>
+ private static com.google.gwt.dev.protobuf.Internal.EnumLiteMap<RequestType>
internalValueMap =
- new com.google.protobuf.Internal.EnumLiteMap<RequestType>() {
+ new com.google.gwt.dev.protobuf.Internal.EnumLiteMap<RequestType>() {
public RequestType findValueByNumber(int number) {
return RequestType.valueOf(number);
}
};
- public final com.google.protobuf.Descriptors.EnumValueDescriptor
+ public final com.google.gwt.dev.protobuf.Descriptors.EnumValueDescriptor
getValueDescriptor() {
return getDescriptor().getValues().get(index);
}
- public final com.google.protobuf.Descriptors.EnumDescriptor
+ public final com.google.gwt.dev.protobuf.Descriptors.EnumDescriptor
getDescriptorForType() {
return getDescriptor();
}
- public static final com.google.protobuf.Descriptors.EnumDescriptor
+ public static final com.google.gwt.dev.protobuf.Descriptors.EnumDescriptor
getDescriptor() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequest.getDescriptor().getEnumTypes().get(0);
}
@@ -10451,7 +10451,7 @@
private static final RequestType[] VALUES = values();
public static RequestType valueOf(
- com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+ com.google.gwt.dev.protobuf.Descriptors.EnumValueDescriptor desc) {
if (desc.getType() != getDescriptor()) {
throw new java.lang.IllegalArgumentException(
"EnumValueDescriptor is not for this type.");
@@ -10471,7 +10471,7 @@
}
public interface CapabilityExchangeOrBuilder
- extends com.google.protobuf.MessageOrBuilder {
+ extends com.google.gwt.dev.protobuf.MessageOrBuilder {
}
/**
* Protobuf type {@code com.google.gwt.dev.shell.remoteui.Message.Request.DevModeRequest.CapabilityExchange}
@@ -10482,14 +10482,14 @@
* </pre>
*/
public static final class CapabilityExchange extends
- com.google.protobuf.GeneratedMessage
+ com.google.gwt.dev.protobuf.GeneratedMessage
implements CapabilityExchangeOrBuilder {
// Use CapabilityExchange.newBuilder() to construct.
- private CapabilityExchange(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+ private CapabilityExchange(com.google.gwt.dev.protobuf.GeneratedMessage.Builder<?> builder) {
super(builder);
this.unknownFields = builder.getUnknownFields();
}
- private CapabilityExchange(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+ private CapabilityExchange(boolean noInit) { this.unknownFields = com.google.gwt.dev.protobuf.UnknownFieldSet.getDefaultInstance(); }
private static final CapabilityExchange defaultInstance;
public static CapabilityExchange getDefaultInstance() {
@@ -10500,19 +10500,19 @@
return defaultInstance;
}
- private final com.google.protobuf.UnknownFieldSet unknownFields;
+ private final com.google.gwt.dev.protobuf.UnknownFieldSet unknownFields;
@java.lang.Override
- public final com.google.protobuf.UnknownFieldSet
+ public final com.google.gwt.dev.protobuf.UnknownFieldSet
getUnknownFields() {
return this.unknownFields;
}
private CapabilityExchange(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
initFields();
- com.google.protobuf.UnknownFieldSet.Builder unknownFields =
- com.google.protobuf.UnknownFieldSet.newBuilder();
+ com.google.gwt.dev.protobuf.UnknownFieldSet.Builder unknownFields =
+ com.google.gwt.dev.protobuf.UnknownFieldSet.newBuilder();
try {
boolean done = false;
while (!done) {
@@ -10530,40 +10530,40 @@
}
}
}
- } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ } catch (com.google.gwt.dev.protobuf.InvalidProtocolBufferException e) {
throw e.setUnfinishedMessage(this);
} catch (java.io.IOException e) {
- throw new com.google.protobuf.InvalidProtocolBufferException(
+ throw new com.google.gwt.dev.protobuf.InvalidProtocolBufferException(
e.getMessage()).setUnfinishedMessage(this);
} finally {
this.unknownFields = unknownFields.build();
makeExtensionsImmutable();
}
}
- public static final com.google.protobuf.Descriptors.Descriptor
+ public static final com.google.gwt.dev.protobuf.Descriptors.Descriptor
getDescriptor() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_DevModeRequest_CapabilityExchange_descriptor;
}
- protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ protected com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_DevModeRequest_CapabilityExchange_fieldAccessorTable
.ensureFieldAccessorsInitialized(
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequest.CapabilityExchange.class, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequest.CapabilityExchange.Builder.class);
}
- public static com.google.protobuf.Parser<CapabilityExchange> PARSER =
- new com.google.protobuf.AbstractParser<CapabilityExchange>() {
+ public static com.google.gwt.dev.protobuf.Parser<CapabilityExchange> PARSER =
+ new com.google.gwt.dev.protobuf.AbstractParser<CapabilityExchange>() {
public CapabilityExchange parsePartialFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return new CapabilityExchange(input, extensionRegistry);
}
};
@java.lang.Override
- public com.google.protobuf.Parser<CapabilityExchange> getParserForType() {
+ public com.google.gwt.dev.protobuf.Parser<CapabilityExchange> getParserForType() {
return PARSER;
}
@@ -10578,7 +10578,7 @@
return true;
}
- public void writeTo(com.google.protobuf.CodedOutputStream output)
+ public void writeTo(com.google.gwt.dev.protobuf.CodedOutputStream output)
throws java.io.IOException {
getSerializedSize();
getUnknownFields().writeTo(output);
@@ -10603,24 +10603,24 @@
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequest.CapabilityExchange parseFrom(
- com.google.protobuf.ByteString data)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.ByteString data)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequest.CapabilityExchange parseFrom(
- com.google.protobuf.ByteString data,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.ByteString data,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequest.CapabilityExchange parseFrom(byte[] data)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequest.CapabilityExchange parseFrom(
byte[] data,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequest.CapabilityExchange parseFrom(java.io.InputStream input)
@@ -10629,7 +10629,7 @@
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequest.CapabilityExchange parseFrom(
java.io.InputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseFrom(input, extensionRegistry);
}
@@ -10639,18 +10639,18 @@
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequest.CapabilityExchange parseDelimitedFrom(
java.io.InputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseDelimitedFrom(input, extensionRegistry);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequest.CapabilityExchange parseFrom(
- com.google.protobuf.CodedInputStream input)
+ com.google.gwt.dev.protobuf.CodedInputStream input)
throws java.io.IOException {
return PARSER.parseFrom(input);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequest.CapabilityExchange parseFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseFrom(input, extensionRegistry);
}
@@ -10664,7 +10664,7 @@
@java.lang.Override
protected Builder newBuilderForType(
- com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+ com.google.gwt.dev.protobuf.GeneratedMessage.BuilderParent parent) {
Builder builder = new Builder(parent);
return builder;
}
@@ -10677,14 +10677,14 @@
* </pre>
*/
public static final class Builder extends
- com.google.protobuf.GeneratedMessage.Builder<Builder>
+ com.google.gwt.dev.protobuf.GeneratedMessage.Builder<Builder>
implements com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequest.CapabilityExchangeOrBuilder {
- public static final com.google.protobuf.Descriptors.Descriptor
+ public static final com.google.gwt.dev.protobuf.Descriptors.Descriptor
getDescriptor() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_DevModeRequest_CapabilityExchange_descriptor;
}
- protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ protected com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_DevModeRequest_CapabilityExchange_fieldAccessorTable
.ensureFieldAccessorsInitialized(
@@ -10697,12 +10697,12 @@
}
private Builder(
- com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+ com.google.gwt.dev.protobuf.GeneratedMessage.BuilderParent parent) {
super(parent);
maybeForceBuilderInitialization();
}
private void maybeForceBuilderInitialization() {
- if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+ if (com.google.gwt.dev.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
}
}
private static Builder create() {
@@ -10718,7 +10718,7 @@
return create().mergeFrom(buildPartial());
}
- public com.google.protobuf.Descriptors.Descriptor
+ public com.google.gwt.dev.protobuf.Descriptors.Descriptor
getDescriptorForType() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_DevModeRequest_CapabilityExchange_descriptor;
}
@@ -10741,7 +10741,7 @@
return result;
}
- public Builder mergeFrom(com.google.protobuf.Message other) {
+ public Builder mergeFrom(com.google.gwt.dev.protobuf.Message other) {
if (other instanceof com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequest.CapabilityExchange) {
return mergeFrom((com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequest.CapabilityExchange)other);
} else {
@@ -10761,13 +10761,13 @@
}
public Builder mergeFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequest.CapabilityExchange parsedMessage = null;
try {
parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
- } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ } catch (com.google.gwt.dev.protobuf.InvalidProtocolBufferException e) {
parsedMessage = (com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequest.CapabilityExchange) e.getUnfinishedMessage();
throw e;
} finally {
@@ -10790,7 +10790,7 @@
}
public interface RestartWebServerOrBuilder
- extends com.google.protobuf.MessageOrBuilder {
+ extends com.google.gwt.dev.protobuf.MessageOrBuilder {
}
/**
* Protobuf type {@code com.google.gwt.dev.shell.remoteui.Message.Request.DevModeRequest.RestartWebServer}
@@ -10800,14 +10800,14 @@
* </pre>
*/
public static final class RestartWebServer extends
- com.google.protobuf.GeneratedMessage
+ com.google.gwt.dev.protobuf.GeneratedMessage
implements RestartWebServerOrBuilder {
// Use RestartWebServer.newBuilder() to construct.
- private RestartWebServer(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+ private RestartWebServer(com.google.gwt.dev.protobuf.GeneratedMessage.Builder<?> builder) {
super(builder);
this.unknownFields = builder.getUnknownFields();
}
- private RestartWebServer(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+ private RestartWebServer(boolean noInit) { this.unknownFields = com.google.gwt.dev.protobuf.UnknownFieldSet.getDefaultInstance(); }
private static final RestartWebServer defaultInstance;
public static RestartWebServer getDefaultInstance() {
@@ -10818,19 +10818,19 @@
return defaultInstance;
}
- private final com.google.protobuf.UnknownFieldSet unknownFields;
+ private final com.google.gwt.dev.protobuf.UnknownFieldSet unknownFields;
@java.lang.Override
- public final com.google.protobuf.UnknownFieldSet
+ public final com.google.gwt.dev.protobuf.UnknownFieldSet
getUnknownFields() {
return this.unknownFields;
}
private RestartWebServer(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
initFields();
- com.google.protobuf.UnknownFieldSet.Builder unknownFields =
- com.google.protobuf.UnknownFieldSet.newBuilder();
+ com.google.gwt.dev.protobuf.UnknownFieldSet.Builder unknownFields =
+ com.google.gwt.dev.protobuf.UnknownFieldSet.newBuilder();
try {
boolean done = false;
while (!done) {
@@ -10848,40 +10848,40 @@
}
}
}
- } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ } catch (com.google.gwt.dev.protobuf.InvalidProtocolBufferException e) {
throw e.setUnfinishedMessage(this);
} catch (java.io.IOException e) {
- throw new com.google.protobuf.InvalidProtocolBufferException(
+ throw new com.google.gwt.dev.protobuf.InvalidProtocolBufferException(
e.getMessage()).setUnfinishedMessage(this);
} finally {
this.unknownFields = unknownFields.build();
makeExtensionsImmutable();
}
}
- public static final com.google.protobuf.Descriptors.Descriptor
+ public static final com.google.gwt.dev.protobuf.Descriptors.Descriptor
getDescriptor() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_DevModeRequest_RestartWebServer_descriptor;
}
- protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ protected com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_DevModeRequest_RestartWebServer_fieldAccessorTable
.ensureFieldAccessorsInitialized(
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequest.RestartWebServer.class, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequest.RestartWebServer.Builder.class);
}
- public static com.google.protobuf.Parser<RestartWebServer> PARSER =
- new com.google.protobuf.AbstractParser<RestartWebServer>() {
+ public static com.google.gwt.dev.protobuf.Parser<RestartWebServer> PARSER =
+ new com.google.gwt.dev.protobuf.AbstractParser<RestartWebServer>() {
public RestartWebServer parsePartialFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return new RestartWebServer(input, extensionRegistry);
}
};
@java.lang.Override
- public com.google.protobuf.Parser<RestartWebServer> getParserForType() {
+ public com.google.gwt.dev.protobuf.Parser<RestartWebServer> getParserForType() {
return PARSER;
}
@@ -10896,7 +10896,7 @@
return true;
}
- public void writeTo(com.google.protobuf.CodedOutputStream output)
+ public void writeTo(com.google.gwt.dev.protobuf.CodedOutputStream output)
throws java.io.IOException {
getSerializedSize();
getUnknownFields().writeTo(output);
@@ -10921,24 +10921,24 @@
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequest.RestartWebServer parseFrom(
- com.google.protobuf.ByteString data)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.ByteString data)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequest.RestartWebServer parseFrom(
- com.google.protobuf.ByteString data,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.ByteString data,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequest.RestartWebServer parseFrom(byte[] data)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequest.RestartWebServer parseFrom(
byte[] data,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequest.RestartWebServer parseFrom(java.io.InputStream input)
@@ -10947,7 +10947,7 @@
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequest.RestartWebServer parseFrom(
java.io.InputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseFrom(input, extensionRegistry);
}
@@ -10957,18 +10957,18 @@
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequest.RestartWebServer parseDelimitedFrom(
java.io.InputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseDelimitedFrom(input, extensionRegistry);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequest.RestartWebServer parseFrom(
- com.google.protobuf.CodedInputStream input)
+ com.google.gwt.dev.protobuf.CodedInputStream input)
throws java.io.IOException {
return PARSER.parseFrom(input);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequest.RestartWebServer parseFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseFrom(input, extensionRegistry);
}
@@ -10982,7 +10982,7 @@
@java.lang.Override
protected Builder newBuilderForType(
- com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+ com.google.gwt.dev.protobuf.GeneratedMessage.BuilderParent parent) {
Builder builder = new Builder(parent);
return builder;
}
@@ -10994,14 +10994,14 @@
* </pre>
*/
public static final class Builder extends
- com.google.protobuf.GeneratedMessage.Builder<Builder>
+ com.google.gwt.dev.protobuf.GeneratedMessage.Builder<Builder>
implements com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequest.RestartWebServerOrBuilder {
- public static final com.google.protobuf.Descriptors.Descriptor
+ public static final com.google.gwt.dev.protobuf.Descriptors.Descriptor
getDescriptor() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_DevModeRequest_RestartWebServer_descriptor;
}
- protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ protected com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_DevModeRequest_RestartWebServer_fieldAccessorTable
.ensureFieldAccessorsInitialized(
@@ -11014,12 +11014,12 @@
}
private Builder(
- com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+ com.google.gwt.dev.protobuf.GeneratedMessage.BuilderParent parent) {
super(parent);
maybeForceBuilderInitialization();
}
private void maybeForceBuilderInitialization() {
- if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+ if (com.google.gwt.dev.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
}
}
private static Builder create() {
@@ -11035,7 +11035,7 @@
return create().mergeFrom(buildPartial());
}
- public com.google.protobuf.Descriptors.Descriptor
+ public com.google.gwt.dev.protobuf.Descriptors.Descriptor
getDescriptorForType() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_DevModeRequest_RestartWebServer_descriptor;
}
@@ -11058,7 +11058,7 @@
return result;
}
- public Builder mergeFrom(com.google.protobuf.Message other) {
+ public Builder mergeFrom(com.google.gwt.dev.protobuf.Message other) {
if (other instanceof com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequest.RestartWebServer) {
return mergeFrom((com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequest.RestartWebServer)other);
} else {
@@ -11078,13 +11078,13 @@
}
public Builder mergeFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequest.RestartWebServer parsedMessage = null;
try {
parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
- } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ } catch (com.google.gwt.dev.protobuf.InvalidProtocolBufferException e) {
parsedMessage = (com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequest.RestartWebServer) e.getUnfinishedMessage();
throw e;
} finally {
@@ -11181,7 +11181,7 @@
return true;
}
- public void writeTo(com.google.protobuf.CodedOutputStream output)
+ public void writeTo(com.google.gwt.dev.protobuf.CodedOutputStream output)
throws java.io.IOException {
getSerializedSize();
if (((bitField0_ & 0x00000001) == 0x00000001)) {
@@ -11203,15 +11203,15 @@
size = 0;
if (((bitField0_ & 0x00000001) == 0x00000001)) {
- size += com.google.protobuf.CodedOutputStream
+ size += com.google.gwt.dev.protobuf.CodedOutputStream
.computeEnumSize(1, requestType_.getNumber());
}
if (((bitField0_ & 0x00000002) == 0x00000002)) {
- size += com.google.protobuf.CodedOutputStream
+ size += com.google.gwt.dev.protobuf.CodedOutputStream
.computeMessageSize(2, capabilityExchange_);
}
if (((bitField0_ & 0x00000004) == 0x00000004)) {
- size += com.google.protobuf.CodedOutputStream
+ size += com.google.gwt.dev.protobuf.CodedOutputStream
.computeMessageSize(3, restartWebServer_);
}
size += getUnknownFields().getSerializedSize();
@@ -11227,24 +11227,24 @@
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequest parseFrom(
- com.google.protobuf.ByteString data)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.ByteString data)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequest parseFrom(
- com.google.protobuf.ByteString data,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.ByteString data,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequest parseFrom(byte[] data)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequest parseFrom(
byte[] data,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequest parseFrom(java.io.InputStream input)
@@ -11253,7 +11253,7 @@
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequest parseFrom(
java.io.InputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseFrom(input, extensionRegistry);
}
@@ -11263,18 +11263,18 @@
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequest parseDelimitedFrom(
java.io.InputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseDelimitedFrom(input, extensionRegistry);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequest parseFrom(
- com.google.protobuf.CodedInputStream input)
+ com.google.gwt.dev.protobuf.CodedInputStream input)
throws java.io.IOException {
return PARSER.parseFrom(input);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequest parseFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseFrom(input, extensionRegistry);
}
@@ -11288,7 +11288,7 @@
@java.lang.Override
protected Builder newBuilderForType(
- com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+ com.google.gwt.dev.protobuf.GeneratedMessage.BuilderParent parent) {
Builder builder = new Builder(parent);
return builder;
}
@@ -11300,14 +11300,14 @@
* </pre>
*/
public static final class Builder extends
- com.google.protobuf.GeneratedMessage.Builder<Builder>
+ com.google.gwt.dev.protobuf.GeneratedMessage.Builder<Builder>
implements com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequestOrBuilder {
- public static final com.google.protobuf.Descriptors.Descriptor
+ public static final com.google.gwt.dev.protobuf.Descriptors.Descriptor
getDescriptor() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_DevModeRequest_descriptor;
}
- protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ protected com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_DevModeRequest_fieldAccessorTable
.ensureFieldAccessorsInitialized(
@@ -11320,12 +11320,12 @@
}
private Builder(
- com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+ com.google.gwt.dev.protobuf.GeneratedMessage.BuilderParent parent) {
super(parent);
maybeForceBuilderInitialization();
}
private void maybeForceBuilderInitialization() {
- if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+ if (com.google.gwt.dev.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
getCapabilityExchangeFieldBuilder();
getRestartWebServerFieldBuilder();
}
@@ -11357,7 +11357,7 @@
return create().mergeFrom(buildPartial());
}
- public com.google.protobuf.Descriptors.Descriptor
+ public com.google.gwt.dev.protobuf.Descriptors.Descriptor
getDescriptorForType() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_DevModeRequest_descriptor;
}
@@ -11403,7 +11403,7 @@
return result;
}
- public Builder mergeFrom(com.google.protobuf.Message other) {
+ public Builder mergeFrom(com.google.gwt.dev.protobuf.Message other) {
if (other instanceof com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequest) {
return mergeFrom((com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequest)other);
} else {
@@ -11432,13 +11432,13 @@
}
public Builder mergeFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequest parsedMessage = null;
try {
parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
- } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ } catch (com.google.gwt.dev.protobuf.InvalidProtocolBufferException e) {
parsedMessage = (com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequest) e.getUnfinishedMessage();
throw e;
} finally {
@@ -11488,7 +11488,7 @@
// optional .com.google.gwt.dev.shell.remoteui.Message.Request.DevModeRequest.CapabilityExchange capabilityExchange = 2;
private com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequest.CapabilityExchange capabilityExchange_ = com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequest.CapabilityExchange.getDefaultInstance();
- private com.google.protobuf.SingleFieldBuilder<
+ private com.google.gwt.dev.protobuf.SingleFieldBuilder<
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequest.CapabilityExchange, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequest.CapabilityExchange.Builder, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequest.CapabilityExchangeOrBuilder> capabilityExchangeBuilder_;
/**
* <code>optional .com.google.gwt.dev.shell.remoteui.Message.Request.DevModeRequest.CapabilityExchange capabilityExchange = 2;</code>
@@ -11589,11 +11589,11 @@
/**
* <code>optional .com.google.gwt.dev.shell.remoteui.Message.Request.DevModeRequest.CapabilityExchange capabilityExchange = 2;</code>
*/
- private com.google.protobuf.SingleFieldBuilder<
+ private com.google.gwt.dev.protobuf.SingleFieldBuilder<
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequest.CapabilityExchange, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequest.CapabilityExchange.Builder, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequest.CapabilityExchangeOrBuilder>
getCapabilityExchangeFieldBuilder() {
if (capabilityExchangeBuilder_ == null) {
- capabilityExchangeBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+ capabilityExchangeBuilder_ = new com.google.gwt.dev.protobuf.SingleFieldBuilder<
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequest.CapabilityExchange, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequest.CapabilityExchange.Builder, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequest.CapabilityExchangeOrBuilder>(
capabilityExchange_,
getParentForChildren(),
@@ -11605,7 +11605,7 @@
// optional .com.google.gwt.dev.shell.remoteui.Message.Request.DevModeRequest.RestartWebServer restartWebServer = 3;
private com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequest.RestartWebServer restartWebServer_ = com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequest.RestartWebServer.getDefaultInstance();
- private com.google.protobuf.SingleFieldBuilder<
+ private com.google.gwt.dev.protobuf.SingleFieldBuilder<
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequest.RestartWebServer, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequest.RestartWebServer.Builder, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequest.RestartWebServerOrBuilder> restartWebServerBuilder_;
/**
* <code>optional .com.google.gwt.dev.shell.remoteui.Message.Request.DevModeRequest.RestartWebServer restartWebServer = 3;</code>
@@ -11706,11 +11706,11 @@
/**
* <code>optional .com.google.gwt.dev.shell.remoteui.Message.Request.DevModeRequest.RestartWebServer restartWebServer = 3;</code>
*/
- private com.google.protobuf.SingleFieldBuilder<
+ private com.google.gwt.dev.protobuf.SingleFieldBuilder<
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequest.RestartWebServer, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequest.RestartWebServer.Builder, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequest.RestartWebServerOrBuilder>
getRestartWebServerFieldBuilder() {
if (restartWebServerBuilder_ == null) {
- restartWebServerBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+ restartWebServerBuilder_ = new com.google.gwt.dev.protobuf.SingleFieldBuilder<
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequest.RestartWebServer, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequest.RestartWebServer.Builder, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequest.RestartWebServerOrBuilder>(
restartWebServer_,
getParentForChildren(),
@@ -11812,7 +11812,7 @@
return true;
}
- public void writeTo(com.google.protobuf.CodedOutputStream output)
+ public void writeTo(com.google.gwt.dev.protobuf.CodedOutputStream output)
throws java.io.IOException {
getSerializedSize();
if (((bitField0_ & 0x00000001) == 0x00000001)) {
@@ -11834,15 +11834,15 @@
size = 0;
if (((bitField0_ & 0x00000001) == 0x00000001)) {
- size += com.google.protobuf.CodedOutputStream
+ size += com.google.gwt.dev.protobuf.CodedOutputStream
.computeEnumSize(1, serviceType_.getNumber());
}
if (((bitField0_ & 0x00000002) == 0x00000002)) {
- size += com.google.protobuf.CodedOutputStream
+ size += com.google.gwt.dev.protobuf.CodedOutputStream
.computeMessageSize(2, viewerRequest_);
}
if (((bitField0_ & 0x00000004) == 0x00000004)) {
- size += com.google.protobuf.CodedOutputStream
+ size += com.google.gwt.dev.protobuf.CodedOutputStream
.computeMessageSize(3, devModeRequest_);
}
size += getUnknownFields().getSerializedSize();
@@ -11858,24 +11858,24 @@
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request parseFrom(
- com.google.protobuf.ByteString data)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.ByteString data)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request parseFrom(
- com.google.protobuf.ByteString data,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.ByteString data,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request parseFrom(byte[] data)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request parseFrom(
byte[] data,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request parseFrom(java.io.InputStream input)
@@ -11884,7 +11884,7 @@
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request parseFrom(
java.io.InputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseFrom(input, extensionRegistry);
}
@@ -11894,18 +11894,18 @@
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request parseDelimitedFrom(
java.io.InputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseDelimitedFrom(input, extensionRegistry);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request parseFrom(
- com.google.protobuf.CodedInputStream input)
+ com.google.gwt.dev.protobuf.CodedInputStream input)
throws java.io.IOException {
return PARSER.parseFrom(input);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request parseFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseFrom(input, extensionRegistry);
}
@@ -11919,7 +11919,7 @@
@java.lang.Override
protected Builder newBuilderForType(
- com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+ com.google.gwt.dev.protobuf.GeneratedMessage.BuilderParent parent) {
Builder builder = new Builder(parent);
return builder;
}
@@ -11931,14 +11931,14 @@
* </pre>
*/
public static final class Builder extends
- com.google.protobuf.GeneratedMessage.Builder<Builder>
+ com.google.gwt.dev.protobuf.GeneratedMessage.Builder<Builder>
implements com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.RequestOrBuilder {
- public static final com.google.protobuf.Descriptors.Descriptor
+ public static final com.google.gwt.dev.protobuf.Descriptors.Descriptor
getDescriptor() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_descriptor;
}
- protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ protected com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_fieldAccessorTable
.ensureFieldAccessorsInitialized(
@@ -11951,12 +11951,12 @@
}
private Builder(
- com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+ com.google.gwt.dev.protobuf.GeneratedMessage.BuilderParent parent) {
super(parent);
maybeForceBuilderInitialization();
}
private void maybeForceBuilderInitialization() {
- if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+ if (com.google.gwt.dev.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
getViewerRequestFieldBuilder();
getDevModeRequestFieldBuilder();
}
@@ -11988,7 +11988,7 @@
return create().mergeFrom(buildPartial());
}
- public com.google.protobuf.Descriptors.Descriptor
+ public com.google.gwt.dev.protobuf.Descriptors.Descriptor
getDescriptorForType() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_descriptor;
}
@@ -12034,7 +12034,7 @@
return result;
}
- public Builder mergeFrom(com.google.protobuf.Message other) {
+ public Builder mergeFrom(com.google.gwt.dev.protobuf.Message other) {
if (other instanceof com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request) {
return mergeFrom((com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request)other);
} else {
@@ -12069,13 +12069,13 @@
}
public Builder mergeFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request parsedMessage = null;
try {
parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
- } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ } catch (com.google.gwt.dev.protobuf.InvalidProtocolBufferException e) {
parsedMessage = (com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request) e.getUnfinishedMessage();
throw e;
} finally {
@@ -12125,7 +12125,7 @@
// optional .com.google.gwt.dev.shell.remoteui.Message.Request.ViewerRequest viewerRequest = 2;
private com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest viewerRequest_ = com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.getDefaultInstance();
- private com.google.protobuf.SingleFieldBuilder<
+ private com.google.gwt.dev.protobuf.SingleFieldBuilder<
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.Builder, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequestOrBuilder> viewerRequestBuilder_;
/**
* <code>optional .com.google.gwt.dev.shell.remoteui.Message.Request.ViewerRequest viewerRequest = 2;</code>
@@ -12226,11 +12226,11 @@
/**
* <code>optional .com.google.gwt.dev.shell.remoteui.Message.Request.ViewerRequest viewerRequest = 2;</code>
*/
- private com.google.protobuf.SingleFieldBuilder<
+ private com.google.gwt.dev.protobuf.SingleFieldBuilder<
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.Builder, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequestOrBuilder>
getViewerRequestFieldBuilder() {
if (viewerRequestBuilder_ == null) {
- viewerRequestBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+ viewerRequestBuilder_ = new com.google.gwt.dev.protobuf.SingleFieldBuilder<
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest.Builder, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequestOrBuilder>(
viewerRequest_,
getParentForChildren(),
@@ -12242,7 +12242,7 @@
// optional .com.google.gwt.dev.shell.remoteui.Message.Request.DevModeRequest devModeRequest = 3;
private com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequest devModeRequest_ = com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequest.getDefaultInstance();
- private com.google.protobuf.SingleFieldBuilder<
+ private com.google.gwt.dev.protobuf.SingleFieldBuilder<
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequest, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequest.Builder, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequestOrBuilder> devModeRequestBuilder_;
/**
* <code>optional .com.google.gwt.dev.shell.remoteui.Message.Request.DevModeRequest devModeRequest = 3;</code>
@@ -12343,11 +12343,11 @@
/**
* <code>optional .com.google.gwt.dev.shell.remoteui.Message.Request.DevModeRequest devModeRequest = 3;</code>
*/
- private com.google.protobuf.SingleFieldBuilder<
+ private com.google.gwt.dev.protobuf.SingleFieldBuilder<
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequest, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequest.Builder, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequestOrBuilder>
getDevModeRequestFieldBuilder() {
if (devModeRequestBuilder_ == null) {
- devModeRequestBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+ devModeRequestBuilder_ = new com.google.gwt.dev.protobuf.SingleFieldBuilder<
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequest, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequest.Builder, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.DevModeRequestOrBuilder>(
devModeRequest_,
getParentForChildren(),
@@ -12369,7 +12369,7 @@
}
public interface ResponseOrBuilder
- extends com.google.protobuf.MessageOrBuilder {
+ extends com.google.gwt.dev.protobuf.MessageOrBuilder {
// optional .com.google.gwt.dev.shell.remoteui.Message.Response.ViewerResponse viewerResponse = 1;
/**
@@ -12408,14 +12408,14 @@
* </pre>
*/
public static final class Response extends
- com.google.protobuf.GeneratedMessage
+ com.google.gwt.dev.protobuf.GeneratedMessage
implements ResponseOrBuilder {
// Use Response.newBuilder() to construct.
- private Response(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+ private Response(com.google.gwt.dev.protobuf.GeneratedMessage.Builder<?> builder) {
super(builder);
this.unknownFields = builder.getUnknownFields();
}
- private Response(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+ private Response(boolean noInit) { this.unknownFields = com.google.gwt.dev.protobuf.UnknownFieldSet.getDefaultInstance(); }
private static final Response defaultInstance;
public static Response getDefaultInstance() {
@@ -12426,20 +12426,20 @@
return defaultInstance;
}
- private final com.google.protobuf.UnknownFieldSet unknownFields;
+ private final com.google.gwt.dev.protobuf.UnknownFieldSet unknownFields;
@java.lang.Override
- public final com.google.protobuf.UnknownFieldSet
+ public final com.google.gwt.dev.protobuf.UnknownFieldSet
getUnknownFields() {
return this.unknownFields;
}
private Response(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
initFields();
int mutable_bitField0_ = 0;
- com.google.protobuf.UnknownFieldSet.Builder unknownFields =
- com.google.protobuf.UnknownFieldSet.newBuilder();
+ com.google.gwt.dev.protobuf.UnknownFieldSet.Builder unknownFields =
+ com.google.gwt.dev.protobuf.UnknownFieldSet.newBuilder();
try {
boolean done = false;
while (!done) {
@@ -12483,45 +12483,45 @@
}
}
}
- } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ } catch (com.google.gwt.dev.protobuf.InvalidProtocolBufferException e) {
throw e.setUnfinishedMessage(this);
} catch (java.io.IOException e) {
- throw new com.google.protobuf.InvalidProtocolBufferException(
+ throw new com.google.gwt.dev.protobuf.InvalidProtocolBufferException(
e.getMessage()).setUnfinishedMessage(this);
} finally {
this.unknownFields = unknownFields.build();
makeExtensionsImmutable();
}
}
- public static final com.google.protobuf.Descriptors.Descriptor
+ public static final com.google.gwt.dev.protobuf.Descriptors.Descriptor
getDescriptor() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_descriptor;
}
- protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ protected com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_fieldAccessorTable
.ensureFieldAccessorsInitialized(
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.class, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.Builder.class);
}
- public static com.google.protobuf.Parser<Response> PARSER =
- new com.google.protobuf.AbstractParser<Response>() {
+ public static com.google.gwt.dev.protobuf.Parser<Response> PARSER =
+ new com.google.gwt.dev.protobuf.AbstractParser<Response>() {
public Response parsePartialFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return new Response(input, extensionRegistry);
}
};
@java.lang.Override
- public com.google.protobuf.Parser<Response> getParserForType() {
+ public com.google.gwt.dev.protobuf.Parser<Response> getParserForType() {
return PARSER;
}
public interface ViewerResponseOrBuilder
- extends com.google.protobuf.MessageOrBuilder {
+ extends com.google.gwt.dev.protobuf.MessageOrBuilder {
// optional .com.google.gwt.dev.shell.remoteui.Message.Response.ViewerResponse.ResponseType responseType = 1;
/**
@@ -12583,14 +12583,14 @@
* </pre>
*/
public static final class ViewerResponse extends
- com.google.protobuf.GeneratedMessage
+ com.google.gwt.dev.protobuf.GeneratedMessage
implements ViewerResponseOrBuilder {
// Use ViewerResponse.newBuilder() to construct.
- private ViewerResponse(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+ private ViewerResponse(com.google.gwt.dev.protobuf.GeneratedMessage.Builder<?> builder) {
super(builder);
this.unknownFields = builder.getUnknownFields();
}
- private ViewerResponse(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+ private ViewerResponse(boolean noInit) { this.unknownFields = com.google.gwt.dev.protobuf.UnknownFieldSet.getDefaultInstance(); }
private static final ViewerResponse defaultInstance;
public static ViewerResponse getDefaultInstance() {
@@ -12601,20 +12601,20 @@
return defaultInstance;
}
- private final com.google.protobuf.UnknownFieldSet unknownFields;
+ private final com.google.gwt.dev.protobuf.UnknownFieldSet unknownFields;
@java.lang.Override
- public final com.google.protobuf.UnknownFieldSet
+ public final com.google.gwt.dev.protobuf.UnknownFieldSet
getUnknownFields() {
return this.unknownFields;
}
private ViewerResponse(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
initFields();
int mutable_bitField0_ = 0;
- com.google.protobuf.UnknownFieldSet.Builder unknownFields =
- com.google.protobuf.UnknownFieldSet.newBuilder();
+ com.google.gwt.dev.protobuf.UnknownFieldSet.Builder unknownFields =
+ com.google.gwt.dev.protobuf.UnknownFieldSet.newBuilder();
try {
boolean done = false;
while (!done) {
@@ -12682,40 +12682,40 @@
}
}
}
- } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ } catch (com.google.gwt.dev.protobuf.InvalidProtocolBufferException e) {
throw e.setUnfinishedMessage(this);
} catch (java.io.IOException e) {
- throw new com.google.protobuf.InvalidProtocolBufferException(
+ throw new com.google.gwt.dev.protobuf.InvalidProtocolBufferException(
e.getMessage()).setUnfinishedMessage(this);
} finally {
this.unknownFields = unknownFields.build();
makeExtensionsImmutable();
}
}
- public static final com.google.protobuf.Descriptors.Descriptor
+ public static final com.google.gwt.dev.protobuf.Descriptors.Descriptor
getDescriptor() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_ViewerResponse_descriptor;
}
- protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ protected com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_ViewerResponse_fieldAccessorTable
.ensureFieldAccessorsInitialized(
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.class, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.Builder.class);
}
- public static com.google.protobuf.Parser<ViewerResponse> PARSER =
- new com.google.protobuf.AbstractParser<ViewerResponse>() {
+ public static com.google.gwt.dev.protobuf.Parser<ViewerResponse> PARSER =
+ new com.google.gwt.dev.protobuf.AbstractParser<ViewerResponse>() {
public ViewerResponse parsePartialFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return new ViewerResponse(input, extensionRegistry);
}
};
@java.lang.Override
- public com.google.protobuf.Parser<ViewerResponse> getParserForType() {
+ public com.google.gwt.dev.protobuf.Parser<ViewerResponse> getParserForType() {
return PARSER;
}
@@ -12728,7 +12728,7 @@
* </pre>
*/
public enum ResponseType
- implements com.google.protobuf.ProtocolMessageEnum {
+ implements com.google.gwt.dev.protobuf.ProtocolMessageEnum {
/**
* <code>CAPABILITY_EXCHANGE = 0;</code>
*/
@@ -12768,27 +12768,27 @@
}
}
- public static com.google.protobuf.Internal.EnumLiteMap<ResponseType>
+ public static com.google.gwt.dev.protobuf.Internal.EnumLiteMap<ResponseType>
internalGetValueMap() {
return internalValueMap;
}
- private static com.google.protobuf.Internal.EnumLiteMap<ResponseType>
+ private static com.google.gwt.dev.protobuf.Internal.EnumLiteMap<ResponseType>
internalValueMap =
- new com.google.protobuf.Internal.EnumLiteMap<ResponseType>() {
+ new com.google.gwt.dev.protobuf.Internal.EnumLiteMap<ResponseType>() {
public ResponseType findValueByNumber(int number) {
return ResponseType.valueOf(number);
}
};
- public final com.google.protobuf.Descriptors.EnumValueDescriptor
+ public final com.google.gwt.dev.protobuf.Descriptors.EnumValueDescriptor
getValueDescriptor() {
return getDescriptor().getValues().get(index);
}
- public final com.google.protobuf.Descriptors.EnumDescriptor
+ public final com.google.gwt.dev.protobuf.Descriptors.EnumDescriptor
getDescriptorForType() {
return getDescriptor();
}
- public static final com.google.protobuf.Descriptors.EnumDescriptor
+ public static final com.google.gwt.dev.protobuf.Descriptors.EnumDescriptor
getDescriptor() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.getDescriptor().getEnumTypes().get(0);
}
@@ -12796,7 +12796,7 @@
private static final ResponseType[] VALUES = values();
public static ResponseType valueOf(
- com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+ com.google.gwt.dev.protobuf.Descriptors.EnumValueDescriptor desc) {
if (desc.getType() != getDescriptor()) {
throw new java.lang.IllegalArgumentException(
"EnumValueDescriptor is not for this type.");
@@ -12816,7 +12816,7 @@
}
public interface CapabilityExchangeOrBuilder
- extends com.google.protobuf.MessageOrBuilder {
+ extends com.google.gwt.dev.protobuf.MessageOrBuilder {
// repeated .com.google.gwt.dev.shell.remoteui.Message.Response.ViewerResponse.CapabilityExchange.Capability capabilities = 2;
/**
@@ -12851,14 +12851,14 @@
* </pre>
*/
public static final class CapabilityExchange extends
- com.google.protobuf.GeneratedMessage
+ com.google.gwt.dev.protobuf.GeneratedMessage
implements CapabilityExchangeOrBuilder {
// Use CapabilityExchange.newBuilder() to construct.
- private CapabilityExchange(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+ private CapabilityExchange(com.google.gwt.dev.protobuf.GeneratedMessage.Builder<?> builder) {
super(builder);
this.unknownFields = builder.getUnknownFields();
}
- private CapabilityExchange(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+ private CapabilityExchange(boolean noInit) { this.unknownFields = com.google.gwt.dev.protobuf.UnknownFieldSet.getDefaultInstance(); }
private static final CapabilityExchange defaultInstance;
public static CapabilityExchange getDefaultInstance() {
@@ -12869,20 +12869,20 @@
return defaultInstance;
}
- private final com.google.protobuf.UnknownFieldSet unknownFields;
+ private final com.google.gwt.dev.protobuf.UnknownFieldSet unknownFields;
@java.lang.Override
- public final com.google.protobuf.UnknownFieldSet
+ public final com.google.gwt.dev.protobuf.UnknownFieldSet
getUnknownFields() {
return this.unknownFields;
}
private CapabilityExchange(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
initFields();
int mutable_bitField0_ = 0;
- com.google.protobuf.UnknownFieldSet.Builder unknownFields =
- com.google.protobuf.UnknownFieldSet.newBuilder();
+ com.google.gwt.dev.protobuf.UnknownFieldSet.Builder unknownFields =
+ com.google.gwt.dev.protobuf.UnknownFieldSet.newBuilder();
try {
boolean done = false;
while (!done) {
@@ -12908,10 +12908,10 @@
}
}
}
- } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ } catch (com.google.gwt.dev.protobuf.InvalidProtocolBufferException e) {
throw e.setUnfinishedMessage(this);
} catch (java.io.IOException e) {
- throw new com.google.protobuf.InvalidProtocolBufferException(
+ throw new com.google.gwt.dev.protobuf.InvalidProtocolBufferException(
e.getMessage()).setUnfinishedMessage(this);
} finally {
if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -12921,35 +12921,35 @@
makeExtensionsImmutable();
}
}
- public static final com.google.protobuf.Descriptors.Descriptor
+ public static final com.google.gwt.dev.protobuf.Descriptors.Descriptor
getDescriptor() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_ViewerResponse_CapabilityExchange_descriptor;
}
- protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ protected com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_ViewerResponse_CapabilityExchange_fieldAccessorTable
.ensureFieldAccessorsInitialized(
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.CapabilityExchange.class, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.CapabilityExchange.Builder.class);
}
- public static com.google.protobuf.Parser<CapabilityExchange> PARSER =
- new com.google.protobuf.AbstractParser<CapabilityExchange>() {
+ public static com.google.gwt.dev.protobuf.Parser<CapabilityExchange> PARSER =
+ new com.google.gwt.dev.protobuf.AbstractParser<CapabilityExchange>() {
public CapabilityExchange parsePartialFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return new CapabilityExchange(input, extensionRegistry);
}
};
@java.lang.Override
- public com.google.protobuf.Parser<CapabilityExchange> getParserForType() {
+ public com.google.gwt.dev.protobuf.Parser<CapabilityExchange> getParserForType() {
return PARSER;
}
public interface CapabilityOrBuilder
- extends com.google.protobuf.MessageOrBuilder {
+ extends com.google.gwt.dev.protobuf.MessageOrBuilder {
// optional .com.google.gwt.dev.shell.remoteui.Message.Request.ViewerRequest.RequestType capability = 1;
/**
@@ -12965,14 +12965,14 @@
* Protobuf type {@code com.google.gwt.dev.shell.remoteui.Message.Response.ViewerResponse.CapabilityExchange.Capability}
*/
public static final class Capability extends
- com.google.protobuf.GeneratedMessage
+ com.google.gwt.dev.protobuf.GeneratedMessage
implements CapabilityOrBuilder {
// Use Capability.newBuilder() to construct.
- private Capability(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+ private Capability(com.google.gwt.dev.protobuf.GeneratedMessage.Builder<?> builder) {
super(builder);
this.unknownFields = builder.getUnknownFields();
}
- private Capability(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+ private Capability(boolean noInit) { this.unknownFields = com.google.gwt.dev.protobuf.UnknownFieldSet.getDefaultInstance(); }
private static final Capability defaultInstance;
public static Capability getDefaultInstance() {
@@ -12983,20 +12983,20 @@
return defaultInstance;
}
- private final com.google.protobuf.UnknownFieldSet unknownFields;
+ private final com.google.gwt.dev.protobuf.UnknownFieldSet unknownFields;
@java.lang.Override
- public final com.google.protobuf.UnknownFieldSet
+ public final com.google.gwt.dev.protobuf.UnknownFieldSet
getUnknownFields() {
return this.unknownFields;
}
private Capability(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
initFields();
int mutable_bitField0_ = 0;
- com.google.protobuf.UnknownFieldSet.Builder unknownFields =
- com.google.protobuf.UnknownFieldSet.newBuilder();
+ com.google.gwt.dev.protobuf.UnknownFieldSet.Builder unknownFields =
+ com.google.gwt.dev.protobuf.UnknownFieldSet.newBuilder();
try {
boolean done = false;
while (!done) {
@@ -13025,40 +13025,40 @@
}
}
}
- } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ } catch (com.google.gwt.dev.protobuf.InvalidProtocolBufferException e) {
throw e.setUnfinishedMessage(this);
} catch (java.io.IOException e) {
- throw new com.google.protobuf.InvalidProtocolBufferException(
+ throw new com.google.gwt.dev.protobuf.InvalidProtocolBufferException(
e.getMessage()).setUnfinishedMessage(this);
} finally {
this.unknownFields = unknownFields.build();
makeExtensionsImmutable();
}
}
- public static final com.google.protobuf.Descriptors.Descriptor
+ public static final com.google.gwt.dev.protobuf.Descriptors.Descriptor
getDescriptor() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_ViewerResponse_CapabilityExchange_Capability_descriptor;
}
- protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ protected com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_ViewerResponse_CapabilityExchange_Capability_fieldAccessorTable
.ensureFieldAccessorsInitialized(
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.CapabilityExchange.Capability.class, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.CapabilityExchange.Capability.Builder.class);
}
- public static com.google.protobuf.Parser<Capability> PARSER =
- new com.google.protobuf.AbstractParser<Capability>() {
+ public static com.google.gwt.dev.protobuf.Parser<Capability> PARSER =
+ new com.google.gwt.dev.protobuf.AbstractParser<Capability>() {
public Capability parsePartialFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return new Capability(input, extensionRegistry);
}
};
@java.lang.Override
- public com.google.protobuf.Parser<Capability> getParserForType() {
+ public com.google.gwt.dev.protobuf.Parser<Capability> getParserForType() {
return PARSER;
}
@@ -13091,7 +13091,7 @@
return true;
}
- public void writeTo(com.google.protobuf.CodedOutputStream output)
+ public void writeTo(com.google.gwt.dev.protobuf.CodedOutputStream output)
throws java.io.IOException {
getSerializedSize();
if (((bitField0_ & 0x00000001) == 0x00000001)) {
@@ -13107,7 +13107,7 @@
size = 0;
if (((bitField0_ & 0x00000001) == 0x00000001)) {
- size += com.google.protobuf.CodedOutputStream
+ size += com.google.gwt.dev.protobuf.CodedOutputStream
.computeEnumSize(1, capability_.getNumber());
}
size += getUnknownFields().getSerializedSize();
@@ -13123,24 +13123,24 @@
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.CapabilityExchange.Capability parseFrom(
- com.google.protobuf.ByteString data)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.ByteString data)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.CapabilityExchange.Capability parseFrom(
- com.google.protobuf.ByteString data,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.ByteString data,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.CapabilityExchange.Capability parseFrom(byte[] data)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.CapabilityExchange.Capability parseFrom(
byte[] data,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.CapabilityExchange.Capability parseFrom(java.io.InputStream input)
@@ -13149,7 +13149,7 @@
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.CapabilityExchange.Capability parseFrom(
java.io.InputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseFrom(input, extensionRegistry);
}
@@ -13159,18 +13159,18 @@
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.CapabilityExchange.Capability parseDelimitedFrom(
java.io.InputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseDelimitedFrom(input, extensionRegistry);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.CapabilityExchange.Capability parseFrom(
- com.google.protobuf.CodedInputStream input)
+ com.google.gwt.dev.protobuf.CodedInputStream input)
throws java.io.IOException {
return PARSER.parseFrom(input);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.CapabilityExchange.Capability parseFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseFrom(input, extensionRegistry);
}
@@ -13184,7 +13184,7 @@
@java.lang.Override
protected Builder newBuilderForType(
- com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+ com.google.gwt.dev.protobuf.GeneratedMessage.BuilderParent parent) {
Builder builder = new Builder(parent);
return builder;
}
@@ -13192,14 +13192,14 @@
* Protobuf type {@code com.google.gwt.dev.shell.remoteui.Message.Response.ViewerResponse.CapabilityExchange.Capability}
*/
public static final class Builder extends
- com.google.protobuf.GeneratedMessage.Builder<Builder>
+ com.google.gwt.dev.protobuf.GeneratedMessage.Builder<Builder>
implements com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.CapabilityExchange.CapabilityOrBuilder {
- public static final com.google.protobuf.Descriptors.Descriptor
+ public static final com.google.gwt.dev.protobuf.Descriptors.Descriptor
getDescriptor() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_ViewerResponse_CapabilityExchange_Capability_descriptor;
}
- protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ protected com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_ViewerResponse_CapabilityExchange_Capability_fieldAccessorTable
.ensureFieldAccessorsInitialized(
@@ -13212,12 +13212,12 @@
}
private Builder(
- com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+ com.google.gwt.dev.protobuf.GeneratedMessage.BuilderParent parent) {
super(parent);
maybeForceBuilderInitialization();
}
private void maybeForceBuilderInitialization() {
- if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+ if (com.google.gwt.dev.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
}
}
private static Builder create() {
@@ -13235,7 +13235,7 @@
return create().mergeFrom(buildPartial());
}
- public com.google.protobuf.Descriptors.Descriptor
+ public com.google.gwt.dev.protobuf.Descriptors.Descriptor
getDescriptorForType() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_ViewerResponse_CapabilityExchange_Capability_descriptor;
}
@@ -13265,7 +13265,7 @@
return result;
}
- public Builder mergeFrom(com.google.protobuf.Message other) {
+ public Builder mergeFrom(com.google.gwt.dev.protobuf.Message other) {
if (other instanceof com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.CapabilityExchange.Capability) {
return mergeFrom((com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.CapabilityExchange.Capability)other);
} else {
@@ -13288,13 +13288,13 @@
}
public Builder mergeFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.CapabilityExchange.Capability parsedMessage = null;
try {
parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
- } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ } catch (com.google.gwt.dev.protobuf.InvalidProtocolBufferException e) {
parsedMessage = (com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.CapabilityExchange.Capability) e.getUnfinishedMessage();
throw e;
} finally {
@@ -13401,7 +13401,7 @@
return true;
}
- public void writeTo(com.google.protobuf.CodedOutputStream output)
+ public void writeTo(com.google.gwt.dev.protobuf.CodedOutputStream output)
throws java.io.IOException {
getSerializedSize();
for (int i = 0; i < capabilities_.size(); i++) {
@@ -13417,7 +13417,7 @@
size = 0;
for (int i = 0; i < capabilities_.size(); i++) {
- size += com.google.protobuf.CodedOutputStream
+ size += com.google.gwt.dev.protobuf.CodedOutputStream
.computeMessageSize(2, capabilities_.get(i));
}
size += getUnknownFields().getSerializedSize();
@@ -13433,24 +13433,24 @@
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.CapabilityExchange parseFrom(
- com.google.protobuf.ByteString data)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.ByteString data)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.CapabilityExchange parseFrom(
- com.google.protobuf.ByteString data,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.ByteString data,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.CapabilityExchange parseFrom(byte[] data)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.CapabilityExchange parseFrom(
byte[] data,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.CapabilityExchange parseFrom(java.io.InputStream input)
@@ -13459,7 +13459,7 @@
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.CapabilityExchange parseFrom(
java.io.InputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseFrom(input, extensionRegistry);
}
@@ -13469,18 +13469,18 @@
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.CapabilityExchange parseDelimitedFrom(
java.io.InputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseDelimitedFrom(input, extensionRegistry);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.CapabilityExchange parseFrom(
- com.google.protobuf.CodedInputStream input)
+ com.google.gwt.dev.protobuf.CodedInputStream input)
throws java.io.IOException {
return PARSER.parseFrom(input);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.CapabilityExchange parseFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseFrom(input, extensionRegistry);
}
@@ -13494,7 +13494,7 @@
@java.lang.Override
protected Builder newBuilderForType(
- com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+ com.google.gwt.dev.protobuf.GeneratedMessage.BuilderParent parent) {
Builder builder = new Builder(parent);
return builder;
}
@@ -13506,14 +13506,14 @@
* </pre>
*/
public static final class Builder extends
- com.google.protobuf.GeneratedMessage.Builder<Builder>
+ com.google.gwt.dev.protobuf.GeneratedMessage.Builder<Builder>
implements com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.CapabilityExchangeOrBuilder {
- public static final com.google.protobuf.Descriptors.Descriptor
+ public static final com.google.gwt.dev.protobuf.Descriptors.Descriptor
getDescriptor() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_ViewerResponse_CapabilityExchange_descriptor;
}
- protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ protected com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_ViewerResponse_CapabilityExchange_fieldAccessorTable
.ensureFieldAccessorsInitialized(
@@ -13526,12 +13526,12 @@
}
private Builder(
- com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+ com.google.gwt.dev.protobuf.GeneratedMessage.BuilderParent parent) {
super(parent);
maybeForceBuilderInitialization();
}
private void maybeForceBuilderInitialization() {
- if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+ if (com.google.gwt.dev.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
getCapabilitiesFieldBuilder();
}
}
@@ -13554,7 +13554,7 @@
return create().mergeFrom(buildPartial());
}
- public com.google.protobuf.Descriptors.Descriptor
+ public com.google.gwt.dev.protobuf.Descriptors.Descriptor
getDescriptorForType() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_ViewerResponse_CapabilityExchange_descriptor;
}
@@ -13587,7 +13587,7 @@
return result;
}
- public Builder mergeFrom(com.google.protobuf.Message other) {
+ public Builder mergeFrom(com.google.gwt.dev.protobuf.Message other) {
if (other instanceof com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.CapabilityExchange) {
return mergeFrom((com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.CapabilityExchange)other);
} else {
@@ -13617,7 +13617,7 @@
capabilities_ = other.capabilities_;
bitField0_ = (bitField0_ & ~0x00000001);
capabilitiesBuilder_ =
- com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
+ com.google.gwt.dev.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
getCapabilitiesFieldBuilder() : null;
} else {
capabilitiesBuilder_.addAllMessages(other.capabilities_);
@@ -13633,13 +13633,13 @@
}
public Builder mergeFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.CapabilityExchange parsedMessage = null;
try {
parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
- } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ } catch (com.google.gwt.dev.protobuf.InvalidProtocolBufferException e) {
parsedMessage = (com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.CapabilityExchange) e.getUnfinishedMessage();
throw e;
} finally {
@@ -13661,7 +13661,7 @@
}
}
- private com.google.protobuf.RepeatedFieldBuilder<
+ private com.google.gwt.dev.protobuf.RepeatedFieldBuilder<
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.CapabilityExchange.Capability, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.CapabilityExchange.Capability.Builder, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.CapabilityExchange.CapabilityOrBuilder> capabilitiesBuilder_;
/**
@@ -13876,11 +13876,11 @@
getCapabilitiesBuilderList() {
return getCapabilitiesFieldBuilder().getBuilderList();
}
- private com.google.protobuf.RepeatedFieldBuilder<
+ private com.google.gwt.dev.protobuf.RepeatedFieldBuilder<
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.CapabilityExchange.Capability, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.CapabilityExchange.Capability.Builder, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.CapabilityExchange.CapabilityOrBuilder>
getCapabilitiesFieldBuilder() {
if (capabilitiesBuilder_ == null) {
- capabilitiesBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
+ capabilitiesBuilder_ = new com.google.gwt.dev.protobuf.RepeatedFieldBuilder<
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.CapabilityExchange.Capability, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.CapabilityExchange.Capability.Builder, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.CapabilityExchange.CapabilityOrBuilder>(
capabilities_,
((bitField0_ & 0x00000001) == 0x00000001),
@@ -13903,7 +13903,7 @@
}
public interface AddLogOrBuilder
- extends com.google.protobuf.MessageOrBuilder {
+ extends com.google.gwt.dev.protobuf.MessageOrBuilder {
// required uint32 logHandle = 1;
/**
@@ -13923,14 +13923,14 @@
* </pre>
*/
public static final class AddLog extends
- com.google.protobuf.GeneratedMessage
+ com.google.gwt.dev.protobuf.GeneratedMessage
implements AddLogOrBuilder {
// Use AddLog.newBuilder() to construct.
- private AddLog(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+ private AddLog(com.google.gwt.dev.protobuf.GeneratedMessage.Builder<?> builder) {
super(builder);
this.unknownFields = builder.getUnknownFields();
}
- private AddLog(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+ private AddLog(boolean noInit) { this.unknownFields = com.google.gwt.dev.protobuf.UnknownFieldSet.getDefaultInstance(); }
private static final AddLog defaultInstance;
public static AddLog getDefaultInstance() {
@@ -13941,20 +13941,20 @@
return defaultInstance;
}
- private final com.google.protobuf.UnknownFieldSet unknownFields;
+ private final com.google.gwt.dev.protobuf.UnknownFieldSet unknownFields;
@java.lang.Override
- public final com.google.protobuf.UnknownFieldSet
+ public final com.google.gwt.dev.protobuf.UnknownFieldSet
getUnknownFields() {
return this.unknownFields;
}
private AddLog(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
initFields();
int mutable_bitField0_ = 0;
- com.google.protobuf.UnknownFieldSet.Builder unknownFields =
- com.google.protobuf.UnknownFieldSet.newBuilder();
+ com.google.gwt.dev.protobuf.UnknownFieldSet.Builder unknownFields =
+ com.google.gwt.dev.protobuf.UnknownFieldSet.newBuilder();
try {
boolean done = false;
while (!done) {
@@ -13977,40 +13977,40 @@
}
}
}
- } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ } catch (com.google.gwt.dev.protobuf.InvalidProtocolBufferException e) {
throw e.setUnfinishedMessage(this);
} catch (java.io.IOException e) {
- throw new com.google.protobuf.InvalidProtocolBufferException(
+ throw new com.google.gwt.dev.protobuf.InvalidProtocolBufferException(
e.getMessage()).setUnfinishedMessage(this);
} finally {
this.unknownFields = unknownFields.build();
makeExtensionsImmutable();
}
}
- public static final com.google.protobuf.Descriptors.Descriptor
+ public static final com.google.gwt.dev.protobuf.Descriptors.Descriptor
getDescriptor() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_ViewerResponse_AddLog_descriptor;
}
- protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ protected com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_ViewerResponse_AddLog_fieldAccessorTable
.ensureFieldAccessorsInitialized(
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.AddLog.class, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.AddLog.Builder.class);
}
- public static com.google.protobuf.Parser<AddLog> PARSER =
- new com.google.protobuf.AbstractParser<AddLog>() {
+ public static com.google.gwt.dev.protobuf.Parser<AddLog> PARSER =
+ new com.google.gwt.dev.protobuf.AbstractParser<AddLog>() {
public AddLog parsePartialFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return new AddLog(input, extensionRegistry);
}
};
@java.lang.Override
- public com.google.protobuf.Parser<AddLog> getParserForType() {
+ public com.google.gwt.dev.protobuf.Parser<AddLog> getParserForType() {
return PARSER;
}
@@ -14047,7 +14047,7 @@
return true;
}
- public void writeTo(com.google.protobuf.CodedOutputStream output)
+ public void writeTo(com.google.gwt.dev.protobuf.CodedOutputStream output)
throws java.io.IOException {
getSerializedSize();
if (((bitField0_ & 0x00000001) == 0x00000001)) {
@@ -14063,7 +14063,7 @@
size = 0;
if (((bitField0_ & 0x00000001) == 0x00000001)) {
- size += com.google.protobuf.CodedOutputStream
+ size += com.google.gwt.dev.protobuf.CodedOutputStream
.computeUInt32Size(1, logHandle_);
}
size += getUnknownFields().getSerializedSize();
@@ -14079,24 +14079,24 @@
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.AddLog parseFrom(
- com.google.protobuf.ByteString data)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.ByteString data)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.AddLog parseFrom(
- com.google.protobuf.ByteString data,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.ByteString data,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.AddLog parseFrom(byte[] data)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.AddLog parseFrom(
byte[] data,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.AddLog parseFrom(java.io.InputStream input)
@@ -14105,7 +14105,7 @@
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.AddLog parseFrom(
java.io.InputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseFrom(input, extensionRegistry);
}
@@ -14115,18 +14115,18 @@
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.AddLog parseDelimitedFrom(
java.io.InputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseDelimitedFrom(input, extensionRegistry);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.AddLog parseFrom(
- com.google.protobuf.CodedInputStream input)
+ com.google.gwt.dev.protobuf.CodedInputStream input)
throws java.io.IOException {
return PARSER.parseFrom(input);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.AddLog parseFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseFrom(input, extensionRegistry);
}
@@ -14140,7 +14140,7 @@
@java.lang.Override
protected Builder newBuilderForType(
- com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+ com.google.gwt.dev.protobuf.GeneratedMessage.BuilderParent parent) {
Builder builder = new Builder(parent);
return builder;
}
@@ -14152,14 +14152,14 @@
* </pre>
*/
public static final class Builder extends
- com.google.protobuf.GeneratedMessage.Builder<Builder>
+ com.google.gwt.dev.protobuf.GeneratedMessage.Builder<Builder>
implements com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.AddLogOrBuilder {
- public static final com.google.protobuf.Descriptors.Descriptor
+ public static final com.google.gwt.dev.protobuf.Descriptors.Descriptor
getDescriptor() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_ViewerResponse_AddLog_descriptor;
}
- protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ protected com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_ViewerResponse_AddLog_fieldAccessorTable
.ensureFieldAccessorsInitialized(
@@ -14172,12 +14172,12 @@
}
private Builder(
- com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+ com.google.gwt.dev.protobuf.GeneratedMessage.BuilderParent parent) {
super(parent);
maybeForceBuilderInitialization();
}
private void maybeForceBuilderInitialization() {
- if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+ if (com.google.gwt.dev.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
}
}
private static Builder create() {
@@ -14195,7 +14195,7 @@
return create().mergeFrom(buildPartial());
}
- public com.google.protobuf.Descriptors.Descriptor
+ public com.google.gwt.dev.protobuf.Descriptors.Descriptor
getDescriptorForType() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_ViewerResponse_AddLog_descriptor;
}
@@ -14225,7 +14225,7 @@
return result;
}
- public Builder mergeFrom(com.google.protobuf.Message other) {
+ public Builder mergeFrom(com.google.gwt.dev.protobuf.Message other) {
if (other instanceof com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.AddLog) {
return mergeFrom((com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.AddLog)other);
} else {
@@ -14252,13 +14252,13 @@
}
public Builder mergeFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.AddLog parsedMessage = null;
try {
parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
- } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ } catch (com.google.gwt.dev.protobuf.InvalidProtocolBufferException e) {
parsedMessage = (com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.AddLog) e.getUnfinishedMessage();
throw e;
} finally {
@@ -14315,7 +14315,7 @@
}
public interface AddLogBranchOrBuilder
- extends com.google.protobuf.MessageOrBuilder {
+ extends com.google.gwt.dev.protobuf.MessageOrBuilder {
// required uint32 logHandle = 1;
/**
@@ -14335,14 +14335,14 @@
* </pre>
*/
public static final class AddLogBranch extends
- com.google.protobuf.GeneratedMessage
+ com.google.gwt.dev.protobuf.GeneratedMessage
implements AddLogBranchOrBuilder {
// Use AddLogBranch.newBuilder() to construct.
- private AddLogBranch(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+ private AddLogBranch(com.google.gwt.dev.protobuf.GeneratedMessage.Builder<?> builder) {
super(builder);
this.unknownFields = builder.getUnknownFields();
}
- private AddLogBranch(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+ private AddLogBranch(boolean noInit) { this.unknownFields = com.google.gwt.dev.protobuf.UnknownFieldSet.getDefaultInstance(); }
private static final AddLogBranch defaultInstance;
public static AddLogBranch getDefaultInstance() {
@@ -14353,20 +14353,20 @@
return defaultInstance;
}
- private final com.google.protobuf.UnknownFieldSet unknownFields;
+ private final com.google.gwt.dev.protobuf.UnknownFieldSet unknownFields;
@java.lang.Override
- public final com.google.protobuf.UnknownFieldSet
+ public final com.google.gwt.dev.protobuf.UnknownFieldSet
getUnknownFields() {
return this.unknownFields;
}
private AddLogBranch(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
initFields();
int mutable_bitField0_ = 0;
- com.google.protobuf.UnknownFieldSet.Builder unknownFields =
- com.google.protobuf.UnknownFieldSet.newBuilder();
+ com.google.gwt.dev.protobuf.UnknownFieldSet.Builder unknownFields =
+ com.google.gwt.dev.protobuf.UnknownFieldSet.newBuilder();
try {
boolean done = false;
while (!done) {
@@ -14389,40 +14389,40 @@
}
}
}
- } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ } catch (com.google.gwt.dev.protobuf.InvalidProtocolBufferException e) {
throw e.setUnfinishedMessage(this);
} catch (java.io.IOException e) {
- throw new com.google.protobuf.InvalidProtocolBufferException(
+ throw new com.google.gwt.dev.protobuf.InvalidProtocolBufferException(
e.getMessage()).setUnfinishedMessage(this);
} finally {
this.unknownFields = unknownFields.build();
makeExtensionsImmutable();
}
}
- public static final com.google.protobuf.Descriptors.Descriptor
+ public static final com.google.gwt.dev.protobuf.Descriptors.Descriptor
getDescriptor() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_ViewerResponse_AddLogBranch_descriptor;
}
- protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ protected com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_ViewerResponse_AddLogBranch_fieldAccessorTable
.ensureFieldAccessorsInitialized(
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.AddLogBranch.class, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.AddLogBranch.Builder.class);
}
- public static com.google.protobuf.Parser<AddLogBranch> PARSER =
- new com.google.protobuf.AbstractParser<AddLogBranch>() {
+ public static com.google.gwt.dev.protobuf.Parser<AddLogBranch> PARSER =
+ new com.google.gwt.dev.protobuf.AbstractParser<AddLogBranch>() {
public AddLogBranch parsePartialFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return new AddLogBranch(input, extensionRegistry);
}
};
@java.lang.Override
- public com.google.protobuf.Parser<AddLogBranch> getParserForType() {
+ public com.google.gwt.dev.protobuf.Parser<AddLogBranch> getParserForType() {
return PARSER;
}
@@ -14459,7 +14459,7 @@
return true;
}
- public void writeTo(com.google.protobuf.CodedOutputStream output)
+ public void writeTo(com.google.gwt.dev.protobuf.CodedOutputStream output)
throws java.io.IOException {
getSerializedSize();
if (((bitField0_ & 0x00000001) == 0x00000001)) {
@@ -14475,7 +14475,7 @@
size = 0;
if (((bitField0_ & 0x00000001) == 0x00000001)) {
- size += com.google.protobuf.CodedOutputStream
+ size += com.google.gwt.dev.protobuf.CodedOutputStream
.computeUInt32Size(1, logHandle_);
}
size += getUnknownFields().getSerializedSize();
@@ -14491,24 +14491,24 @@
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.AddLogBranch parseFrom(
- com.google.protobuf.ByteString data)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.ByteString data)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.AddLogBranch parseFrom(
- com.google.protobuf.ByteString data,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.ByteString data,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.AddLogBranch parseFrom(byte[] data)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.AddLogBranch parseFrom(
byte[] data,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.AddLogBranch parseFrom(java.io.InputStream input)
@@ -14517,7 +14517,7 @@
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.AddLogBranch parseFrom(
java.io.InputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseFrom(input, extensionRegistry);
}
@@ -14527,18 +14527,18 @@
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.AddLogBranch parseDelimitedFrom(
java.io.InputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseDelimitedFrom(input, extensionRegistry);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.AddLogBranch parseFrom(
- com.google.protobuf.CodedInputStream input)
+ com.google.gwt.dev.protobuf.CodedInputStream input)
throws java.io.IOException {
return PARSER.parseFrom(input);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.AddLogBranch parseFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseFrom(input, extensionRegistry);
}
@@ -14552,7 +14552,7 @@
@java.lang.Override
protected Builder newBuilderForType(
- com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+ com.google.gwt.dev.protobuf.GeneratedMessage.BuilderParent parent) {
Builder builder = new Builder(parent);
return builder;
}
@@ -14564,14 +14564,14 @@
* </pre>
*/
public static final class Builder extends
- com.google.protobuf.GeneratedMessage.Builder<Builder>
+ com.google.gwt.dev.protobuf.GeneratedMessage.Builder<Builder>
implements com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.AddLogBranchOrBuilder {
- public static final com.google.protobuf.Descriptors.Descriptor
+ public static final com.google.gwt.dev.protobuf.Descriptors.Descriptor
getDescriptor() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_ViewerResponse_AddLogBranch_descriptor;
}
- protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ protected com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_ViewerResponse_AddLogBranch_fieldAccessorTable
.ensureFieldAccessorsInitialized(
@@ -14584,12 +14584,12 @@
}
private Builder(
- com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+ com.google.gwt.dev.protobuf.GeneratedMessage.BuilderParent parent) {
super(parent);
maybeForceBuilderInitialization();
}
private void maybeForceBuilderInitialization() {
- if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+ if (com.google.gwt.dev.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
}
}
private static Builder create() {
@@ -14607,7 +14607,7 @@
return create().mergeFrom(buildPartial());
}
- public com.google.protobuf.Descriptors.Descriptor
+ public com.google.gwt.dev.protobuf.Descriptors.Descriptor
getDescriptorForType() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_ViewerResponse_AddLogBranch_descriptor;
}
@@ -14637,7 +14637,7 @@
return result;
}
- public Builder mergeFrom(com.google.protobuf.Message other) {
+ public Builder mergeFrom(com.google.gwt.dev.protobuf.Message other) {
if (other instanceof com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.AddLogBranch) {
return mergeFrom((com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.AddLogBranch)other);
} else {
@@ -14664,13 +14664,13 @@
}
public Builder mergeFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.AddLogBranch parsedMessage = null;
try {
parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
- } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ } catch (com.google.gwt.dev.protobuf.InvalidProtocolBufferException e) {
parsedMessage = (com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.AddLogBranch) e.getUnfinishedMessage();
throw e;
} finally {
@@ -14836,7 +14836,7 @@
return true;
}
- public void writeTo(com.google.protobuf.CodedOutputStream output)
+ public void writeTo(com.google.gwt.dev.protobuf.CodedOutputStream output)
throws java.io.IOException {
getSerializedSize();
if (((bitField0_ & 0x00000001) == 0x00000001)) {
@@ -14861,19 +14861,19 @@
size = 0;
if (((bitField0_ & 0x00000001) == 0x00000001)) {
- size += com.google.protobuf.CodedOutputStream
+ size += com.google.gwt.dev.protobuf.CodedOutputStream
.computeEnumSize(1, responseType_.getNumber());
}
if (((bitField0_ & 0x00000002) == 0x00000002)) {
- size += com.google.protobuf.CodedOutputStream
+ size += com.google.gwt.dev.protobuf.CodedOutputStream
.computeMessageSize(2, capabilityExchange_);
}
if (((bitField0_ & 0x00000004) == 0x00000004)) {
- size += com.google.protobuf.CodedOutputStream
+ size += com.google.gwt.dev.protobuf.CodedOutputStream
.computeMessageSize(3, addLog_);
}
if (((bitField0_ & 0x00000008) == 0x00000008)) {
- size += com.google.protobuf.CodedOutputStream
+ size += com.google.gwt.dev.protobuf.CodedOutputStream
.computeMessageSize(4, addLogBranch_);
}
size += getUnknownFields().getSerializedSize();
@@ -14889,24 +14889,24 @@
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse parseFrom(
- com.google.protobuf.ByteString data)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.ByteString data)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse parseFrom(
- com.google.protobuf.ByteString data,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.ByteString data,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse parseFrom(byte[] data)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse parseFrom(
byte[] data,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse parseFrom(java.io.InputStream input)
@@ -14915,7 +14915,7 @@
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse parseFrom(
java.io.InputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseFrom(input, extensionRegistry);
}
@@ -14925,18 +14925,18 @@
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse parseDelimitedFrom(
java.io.InputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseDelimitedFrom(input, extensionRegistry);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse parseFrom(
- com.google.protobuf.CodedInputStream input)
+ com.google.gwt.dev.protobuf.CodedInputStream input)
throws java.io.IOException {
return PARSER.parseFrom(input);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse parseFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseFrom(input, extensionRegistry);
}
@@ -14950,7 +14950,7 @@
@java.lang.Override
protected Builder newBuilderForType(
- com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+ com.google.gwt.dev.protobuf.GeneratedMessage.BuilderParent parent) {
Builder builder = new Builder(parent);
return builder;
}
@@ -14962,14 +14962,14 @@
* </pre>
*/
public static final class Builder extends
- com.google.protobuf.GeneratedMessage.Builder<Builder>
+ com.google.gwt.dev.protobuf.GeneratedMessage.Builder<Builder>
implements com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponseOrBuilder {
- public static final com.google.protobuf.Descriptors.Descriptor
+ public static final com.google.gwt.dev.protobuf.Descriptors.Descriptor
getDescriptor() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_ViewerResponse_descriptor;
}
- protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ protected com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_ViewerResponse_fieldAccessorTable
.ensureFieldAccessorsInitialized(
@@ -14982,12 +14982,12 @@
}
private Builder(
- com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+ com.google.gwt.dev.protobuf.GeneratedMessage.BuilderParent parent) {
super(parent);
maybeForceBuilderInitialization();
}
private void maybeForceBuilderInitialization() {
- if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+ if (com.google.gwt.dev.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
getCapabilityExchangeFieldBuilder();
getAddLogFieldBuilder();
getAddLogBranchFieldBuilder();
@@ -15026,7 +15026,7 @@
return create().mergeFrom(buildPartial());
}
- public com.google.protobuf.Descriptors.Descriptor
+ public com.google.gwt.dev.protobuf.Descriptors.Descriptor
getDescriptorForType() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_ViewerResponse_descriptor;
}
@@ -15080,7 +15080,7 @@
return result;
}
- public Builder mergeFrom(com.google.protobuf.Message other) {
+ public Builder mergeFrom(com.google.gwt.dev.protobuf.Message other) {
if (other instanceof com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse) {
return mergeFrom((com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse)other);
} else {
@@ -15124,13 +15124,13 @@
}
public Builder mergeFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse parsedMessage = null;
try {
parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
- } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ } catch (com.google.gwt.dev.protobuf.InvalidProtocolBufferException e) {
parsedMessage = (com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse) e.getUnfinishedMessage();
throw e;
} finally {
@@ -15180,7 +15180,7 @@
// optional .com.google.gwt.dev.shell.remoteui.Message.Response.ViewerResponse.CapabilityExchange capabilityExchange = 2;
private com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.CapabilityExchange capabilityExchange_ = com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.CapabilityExchange.getDefaultInstance();
- private com.google.protobuf.SingleFieldBuilder<
+ private com.google.gwt.dev.protobuf.SingleFieldBuilder<
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.CapabilityExchange, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.CapabilityExchange.Builder, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.CapabilityExchangeOrBuilder> capabilityExchangeBuilder_;
/**
* <code>optional .com.google.gwt.dev.shell.remoteui.Message.Response.ViewerResponse.CapabilityExchange capabilityExchange = 2;</code>
@@ -15281,11 +15281,11 @@
/**
* <code>optional .com.google.gwt.dev.shell.remoteui.Message.Response.ViewerResponse.CapabilityExchange capabilityExchange = 2;</code>
*/
- private com.google.protobuf.SingleFieldBuilder<
+ private com.google.gwt.dev.protobuf.SingleFieldBuilder<
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.CapabilityExchange, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.CapabilityExchange.Builder, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.CapabilityExchangeOrBuilder>
getCapabilityExchangeFieldBuilder() {
if (capabilityExchangeBuilder_ == null) {
- capabilityExchangeBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+ capabilityExchangeBuilder_ = new com.google.gwt.dev.protobuf.SingleFieldBuilder<
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.CapabilityExchange, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.CapabilityExchange.Builder, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.CapabilityExchangeOrBuilder>(
capabilityExchange_,
getParentForChildren(),
@@ -15297,7 +15297,7 @@
// optional .com.google.gwt.dev.shell.remoteui.Message.Response.ViewerResponse.AddLog addLog = 3;
private com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.AddLog addLog_ = com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.AddLog.getDefaultInstance();
- private com.google.protobuf.SingleFieldBuilder<
+ private com.google.gwt.dev.protobuf.SingleFieldBuilder<
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.AddLog, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.AddLog.Builder, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.AddLogOrBuilder> addLogBuilder_;
/**
* <code>optional .com.google.gwt.dev.shell.remoteui.Message.Response.ViewerResponse.AddLog addLog = 3;</code>
@@ -15398,11 +15398,11 @@
/**
* <code>optional .com.google.gwt.dev.shell.remoteui.Message.Response.ViewerResponse.AddLog addLog = 3;</code>
*/
- private com.google.protobuf.SingleFieldBuilder<
+ private com.google.gwt.dev.protobuf.SingleFieldBuilder<
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.AddLog, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.AddLog.Builder, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.AddLogOrBuilder>
getAddLogFieldBuilder() {
if (addLogBuilder_ == null) {
- addLogBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+ addLogBuilder_ = new com.google.gwt.dev.protobuf.SingleFieldBuilder<
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.AddLog, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.AddLog.Builder, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.AddLogOrBuilder>(
addLog_,
getParentForChildren(),
@@ -15414,7 +15414,7 @@
// optional .com.google.gwt.dev.shell.remoteui.Message.Response.ViewerResponse.AddLogBranch addLogBranch = 4;
private com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.AddLogBranch addLogBranch_ = com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.AddLogBranch.getDefaultInstance();
- private com.google.protobuf.SingleFieldBuilder<
+ private com.google.gwt.dev.protobuf.SingleFieldBuilder<
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.AddLogBranch, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.AddLogBranch.Builder, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.AddLogBranchOrBuilder> addLogBranchBuilder_;
/**
* <code>optional .com.google.gwt.dev.shell.remoteui.Message.Response.ViewerResponse.AddLogBranch addLogBranch = 4;</code>
@@ -15515,11 +15515,11 @@
/**
* <code>optional .com.google.gwt.dev.shell.remoteui.Message.Response.ViewerResponse.AddLogBranch addLogBranch = 4;</code>
*/
- private com.google.protobuf.SingleFieldBuilder<
+ private com.google.gwt.dev.protobuf.SingleFieldBuilder<
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.AddLogBranch, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.AddLogBranch.Builder, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.AddLogBranchOrBuilder>
getAddLogBranchFieldBuilder() {
if (addLogBranchBuilder_ == null) {
- addLogBranchBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+ addLogBranchBuilder_ = new com.google.gwt.dev.protobuf.SingleFieldBuilder<
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.AddLogBranch, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.AddLogBranch.Builder, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.AddLogBranchOrBuilder>(
addLogBranch_,
getParentForChildren(),
@@ -15541,7 +15541,7 @@
}
public interface DevModeResponseOrBuilder
- extends com.google.protobuf.MessageOrBuilder {
+ extends com.google.gwt.dev.protobuf.MessageOrBuilder {
// optional .com.google.gwt.dev.shell.remoteui.Message.Response.DevModeResponse.ResponseType responseType = 1;
/**
@@ -15589,14 +15589,14 @@
* </pre>
*/
public static final class DevModeResponse extends
- com.google.protobuf.GeneratedMessage
+ com.google.gwt.dev.protobuf.GeneratedMessage
implements DevModeResponseOrBuilder {
// Use DevModeResponse.newBuilder() to construct.
- private DevModeResponse(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+ private DevModeResponse(com.google.gwt.dev.protobuf.GeneratedMessage.Builder<?> builder) {
super(builder);
this.unknownFields = builder.getUnknownFields();
}
- private DevModeResponse(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+ private DevModeResponse(boolean noInit) { this.unknownFields = com.google.gwt.dev.protobuf.UnknownFieldSet.getDefaultInstance(); }
private static final DevModeResponse defaultInstance;
public static DevModeResponse getDefaultInstance() {
@@ -15607,20 +15607,20 @@
return defaultInstance;
}
- private final com.google.protobuf.UnknownFieldSet unknownFields;
+ private final com.google.gwt.dev.protobuf.UnknownFieldSet unknownFields;
@java.lang.Override
- public final com.google.protobuf.UnknownFieldSet
+ public final com.google.gwt.dev.protobuf.UnknownFieldSet
getUnknownFields() {
return this.unknownFields;
}
private DevModeResponse(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
initFields();
int mutable_bitField0_ = 0;
- com.google.protobuf.UnknownFieldSet.Builder unknownFields =
- com.google.protobuf.UnknownFieldSet.newBuilder();
+ com.google.gwt.dev.protobuf.UnknownFieldSet.Builder unknownFields =
+ com.google.gwt.dev.protobuf.UnknownFieldSet.newBuilder();
try {
boolean done = false;
while (!done) {
@@ -15675,40 +15675,40 @@
}
}
}
- } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ } catch (com.google.gwt.dev.protobuf.InvalidProtocolBufferException e) {
throw e.setUnfinishedMessage(this);
} catch (java.io.IOException e) {
- throw new com.google.protobuf.InvalidProtocolBufferException(
+ throw new com.google.gwt.dev.protobuf.InvalidProtocolBufferException(
e.getMessage()).setUnfinishedMessage(this);
} finally {
this.unknownFields = unknownFields.build();
makeExtensionsImmutable();
}
}
- public static final com.google.protobuf.Descriptors.Descriptor
+ public static final com.google.gwt.dev.protobuf.Descriptors.Descriptor
getDescriptor() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_DevModeResponse_descriptor;
}
- protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ protected com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_DevModeResponse_fieldAccessorTable
.ensureFieldAccessorsInitialized(
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse.class, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse.Builder.class);
}
- public static com.google.protobuf.Parser<DevModeResponse> PARSER =
- new com.google.protobuf.AbstractParser<DevModeResponse>() {
+ public static com.google.gwt.dev.protobuf.Parser<DevModeResponse> PARSER =
+ new com.google.gwt.dev.protobuf.AbstractParser<DevModeResponse>() {
public DevModeResponse parsePartialFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return new DevModeResponse(input, extensionRegistry);
}
};
@java.lang.Override
- public com.google.protobuf.Parser<DevModeResponse> getParserForType() {
+ public com.google.gwt.dev.protobuf.Parser<DevModeResponse> getParserForType() {
return PARSER;
}
@@ -15720,7 +15720,7 @@
* </pre>
*/
public enum ResponseType
- implements com.google.protobuf.ProtocolMessageEnum {
+ implements com.google.gwt.dev.protobuf.ProtocolMessageEnum {
/**
* <code>CAPABILITY_EXCHANGE = 0;</code>
*/
@@ -15751,27 +15751,27 @@
}
}
- public static com.google.protobuf.Internal.EnumLiteMap<ResponseType>
+ public static com.google.gwt.dev.protobuf.Internal.EnumLiteMap<ResponseType>
internalGetValueMap() {
return internalValueMap;
}
- private static com.google.protobuf.Internal.EnumLiteMap<ResponseType>
+ private static com.google.gwt.dev.protobuf.Internal.EnumLiteMap<ResponseType>
internalValueMap =
- new com.google.protobuf.Internal.EnumLiteMap<ResponseType>() {
+ new com.google.gwt.dev.protobuf.Internal.EnumLiteMap<ResponseType>() {
public ResponseType findValueByNumber(int number) {
return ResponseType.valueOf(number);
}
};
- public final com.google.protobuf.Descriptors.EnumValueDescriptor
+ public final com.google.gwt.dev.protobuf.Descriptors.EnumValueDescriptor
getValueDescriptor() {
return getDescriptor().getValues().get(index);
}
- public final com.google.protobuf.Descriptors.EnumDescriptor
+ public final com.google.gwt.dev.protobuf.Descriptors.EnumDescriptor
getDescriptorForType() {
return getDescriptor();
}
- public static final com.google.protobuf.Descriptors.EnumDescriptor
+ public static final com.google.gwt.dev.protobuf.Descriptors.EnumDescriptor
getDescriptor() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse.getDescriptor().getEnumTypes().get(0);
}
@@ -15779,7 +15779,7 @@
private static final ResponseType[] VALUES = values();
public static ResponseType valueOf(
- com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+ com.google.gwt.dev.protobuf.Descriptors.EnumValueDescriptor desc) {
if (desc.getType() != getDescriptor()) {
throw new java.lang.IllegalArgumentException(
"EnumValueDescriptor is not for this type.");
@@ -15799,7 +15799,7 @@
}
public interface CapabilityExchangeOrBuilder
- extends com.google.protobuf.MessageOrBuilder {
+ extends com.google.gwt.dev.protobuf.MessageOrBuilder {
// repeated .com.google.gwt.dev.shell.remoteui.Message.Response.DevModeResponse.CapabilityExchange.Capability capabilities = 2;
/**
@@ -15834,14 +15834,14 @@
* </pre>
*/
public static final class CapabilityExchange extends
- com.google.protobuf.GeneratedMessage
+ com.google.gwt.dev.protobuf.GeneratedMessage
implements CapabilityExchangeOrBuilder {
// Use CapabilityExchange.newBuilder() to construct.
- private CapabilityExchange(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+ private CapabilityExchange(com.google.gwt.dev.protobuf.GeneratedMessage.Builder<?> builder) {
super(builder);
this.unknownFields = builder.getUnknownFields();
}
- private CapabilityExchange(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+ private CapabilityExchange(boolean noInit) { this.unknownFields = com.google.gwt.dev.protobuf.UnknownFieldSet.getDefaultInstance(); }
private static final CapabilityExchange defaultInstance;
public static CapabilityExchange getDefaultInstance() {
@@ -15852,20 +15852,20 @@
return defaultInstance;
}
- private final com.google.protobuf.UnknownFieldSet unknownFields;
+ private final com.google.gwt.dev.protobuf.UnknownFieldSet unknownFields;
@java.lang.Override
- public final com.google.protobuf.UnknownFieldSet
+ public final com.google.gwt.dev.protobuf.UnknownFieldSet
getUnknownFields() {
return this.unknownFields;
}
private CapabilityExchange(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
initFields();
int mutable_bitField0_ = 0;
- com.google.protobuf.UnknownFieldSet.Builder unknownFields =
- com.google.protobuf.UnknownFieldSet.newBuilder();
+ com.google.gwt.dev.protobuf.UnknownFieldSet.Builder unknownFields =
+ com.google.gwt.dev.protobuf.UnknownFieldSet.newBuilder();
try {
boolean done = false;
while (!done) {
@@ -15891,10 +15891,10 @@
}
}
}
- } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ } catch (com.google.gwt.dev.protobuf.InvalidProtocolBufferException e) {
throw e.setUnfinishedMessage(this);
} catch (java.io.IOException e) {
- throw new com.google.protobuf.InvalidProtocolBufferException(
+ throw new com.google.gwt.dev.protobuf.InvalidProtocolBufferException(
e.getMessage()).setUnfinishedMessage(this);
} finally {
if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -15904,35 +15904,35 @@
makeExtensionsImmutable();
}
}
- public static final com.google.protobuf.Descriptors.Descriptor
+ public static final com.google.gwt.dev.protobuf.Descriptors.Descriptor
getDescriptor() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_DevModeResponse_CapabilityExchange_descriptor;
}
- protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ protected com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_DevModeResponse_CapabilityExchange_fieldAccessorTable
.ensureFieldAccessorsInitialized(
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse.CapabilityExchange.class, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse.CapabilityExchange.Builder.class);
}
- public static com.google.protobuf.Parser<CapabilityExchange> PARSER =
- new com.google.protobuf.AbstractParser<CapabilityExchange>() {
+ public static com.google.gwt.dev.protobuf.Parser<CapabilityExchange> PARSER =
+ new com.google.gwt.dev.protobuf.AbstractParser<CapabilityExchange>() {
public CapabilityExchange parsePartialFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return new CapabilityExchange(input, extensionRegistry);
}
};
@java.lang.Override
- public com.google.protobuf.Parser<CapabilityExchange> getParserForType() {
+ public com.google.gwt.dev.protobuf.Parser<CapabilityExchange> getParserForType() {
return PARSER;
}
public interface CapabilityOrBuilder
- extends com.google.protobuf.MessageOrBuilder {
+ extends com.google.gwt.dev.protobuf.MessageOrBuilder {
// optional .com.google.gwt.dev.shell.remoteui.Message.Request.DevModeRequest.RequestType capability = 1;
/**
@@ -15948,14 +15948,14 @@
* Protobuf type {@code com.google.gwt.dev.shell.remoteui.Message.Response.DevModeResponse.CapabilityExchange.Capability}
*/
public static final class Capability extends
- com.google.protobuf.GeneratedMessage
+ com.google.gwt.dev.protobuf.GeneratedMessage
implements CapabilityOrBuilder {
// Use Capability.newBuilder() to construct.
- private Capability(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+ private Capability(com.google.gwt.dev.protobuf.GeneratedMessage.Builder<?> builder) {
super(builder);
this.unknownFields = builder.getUnknownFields();
}
- private Capability(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+ private Capability(boolean noInit) { this.unknownFields = com.google.gwt.dev.protobuf.UnknownFieldSet.getDefaultInstance(); }
private static final Capability defaultInstance;
public static Capability getDefaultInstance() {
@@ -15966,20 +15966,20 @@
return defaultInstance;
}
- private final com.google.protobuf.UnknownFieldSet unknownFields;
+ private final com.google.gwt.dev.protobuf.UnknownFieldSet unknownFields;
@java.lang.Override
- public final com.google.protobuf.UnknownFieldSet
+ public final com.google.gwt.dev.protobuf.UnknownFieldSet
getUnknownFields() {
return this.unknownFields;
}
private Capability(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
initFields();
int mutable_bitField0_ = 0;
- com.google.protobuf.UnknownFieldSet.Builder unknownFields =
- com.google.protobuf.UnknownFieldSet.newBuilder();
+ com.google.gwt.dev.protobuf.UnknownFieldSet.Builder unknownFields =
+ com.google.gwt.dev.protobuf.UnknownFieldSet.newBuilder();
try {
boolean done = false;
while (!done) {
@@ -16008,40 +16008,40 @@
}
}
}
- } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ } catch (com.google.gwt.dev.protobuf.InvalidProtocolBufferException e) {
throw e.setUnfinishedMessage(this);
} catch (java.io.IOException e) {
- throw new com.google.protobuf.InvalidProtocolBufferException(
+ throw new com.google.gwt.dev.protobuf.InvalidProtocolBufferException(
e.getMessage()).setUnfinishedMessage(this);
} finally {
this.unknownFields = unknownFields.build();
makeExtensionsImmutable();
}
}
- public static final com.google.protobuf.Descriptors.Descriptor
+ public static final com.google.gwt.dev.protobuf.Descriptors.Descriptor
getDescriptor() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_DevModeResponse_CapabilityExchange_Capability_descriptor;
}
- protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ protected com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_DevModeResponse_CapabilityExchange_Capability_fieldAccessorTable
.ensureFieldAccessorsInitialized(
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse.CapabilityExchange.Capability.class, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse.CapabilityExchange.Capability.Builder.class);
}
- public static com.google.protobuf.Parser<Capability> PARSER =
- new com.google.protobuf.AbstractParser<Capability>() {
+ public static com.google.gwt.dev.protobuf.Parser<Capability> PARSER =
+ new com.google.gwt.dev.protobuf.AbstractParser<Capability>() {
public Capability parsePartialFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return new Capability(input, extensionRegistry);
}
};
@java.lang.Override
- public com.google.protobuf.Parser<Capability> getParserForType() {
+ public com.google.gwt.dev.protobuf.Parser<Capability> getParserForType() {
return PARSER;
}
@@ -16074,7 +16074,7 @@
return true;
}
- public void writeTo(com.google.protobuf.CodedOutputStream output)
+ public void writeTo(com.google.gwt.dev.protobuf.CodedOutputStream output)
throws java.io.IOException {
getSerializedSize();
if (((bitField0_ & 0x00000001) == 0x00000001)) {
@@ -16090,7 +16090,7 @@
size = 0;
if (((bitField0_ & 0x00000001) == 0x00000001)) {
- size += com.google.protobuf.CodedOutputStream
+ size += com.google.gwt.dev.protobuf.CodedOutputStream
.computeEnumSize(1, capability_.getNumber());
}
size += getUnknownFields().getSerializedSize();
@@ -16106,24 +16106,24 @@
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse.CapabilityExchange.Capability parseFrom(
- com.google.protobuf.ByteString data)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.ByteString data)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse.CapabilityExchange.Capability parseFrom(
- com.google.protobuf.ByteString data,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.ByteString data,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse.CapabilityExchange.Capability parseFrom(byte[] data)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse.CapabilityExchange.Capability parseFrom(
byte[] data,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse.CapabilityExchange.Capability parseFrom(java.io.InputStream input)
@@ -16132,7 +16132,7 @@
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse.CapabilityExchange.Capability parseFrom(
java.io.InputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseFrom(input, extensionRegistry);
}
@@ -16142,18 +16142,18 @@
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse.CapabilityExchange.Capability parseDelimitedFrom(
java.io.InputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseDelimitedFrom(input, extensionRegistry);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse.CapabilityExchange.Capability parseFrom(
- com.google.protobuf.CodedInputStream input)
+ com.google.gwt.dev.protobuf.CodedInputStream input)
throws java.io.IOException {
return PARSER.parseFrom(input);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse.CapabilityExchange.Capability parseFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseFrom(input, extensionRegistry);
}
@@ -16167,7 +16167,7 @@
@java.lang.Override
protected Builder newBuilderForType(
- com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+ com.google.gwt.dev.protobuf.GeneratedMessage.BuilderParent parent) {
Builder builder = new Builder(parent);
return builder;
}
@@ -16175,14 +16175,14 @@
* Protobuf type {@code com.google.gwt.dev.shell.remoteui.Message.Response.DevModeResponse.CapabilityExchange.Capability}
*/
public static final class Builder extends
- com.google.protobuf.GeneratedMessage.Builder<Builder>
+ com.google.gwt.dev.protobuf.GeneratedMessage.Builder<Builder>
implements com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse.CapabilityExchange.CapabilityOrBuilder {
- public static final com.google.protobuf.Descriptors.Descriptor
+ public static final com.google.gwt.dev.protobuf.Descriptors.Descriptor
getDescriptor() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_DevModeResponse_CapabilityExchange_Capability_descriptor;
}
- protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ protected com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_DevModeResponse_CapabilityExchange_Capability_fieldAccessorTable
.ensureFieldAccessorsInitialized(
@@ -16195,12 +16195,12 @@
}
private Builder(
- com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+ com.google.gwt.dev.protobuf.GeneratedMessage.BuilderParent parent) {
super(parent);
maybeForceBuilderInitialization();
}
private void maybeForceBuilderInitialization() {
- if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+ if (com.google.gwt.dev.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
}
}
private static Builder create() {
@@ -16218,7 +16218,7 @@
return create().mergeFrom(buildPartial());
}
- public com.google.protobuf.Descriptors.Descriptor
+ public com.google.gwt.dev.protobuf.Descriptors.Descriptor
getDescriptorForType() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_DevModeResponse_CapabilityExchange_Capability_descriptor;
}
@@ -16248,7 +16248,7 @@
return result;
}
- public Builder mergeFrom(com.google.protobuf.Message other) {
+ public Builder mergeFrom(com.google.gwt.dev.protobuf.Message other) {
if (other instanceof com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse.CapabilityExchange.Capability) {
return mergeFrom((com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse.CapabilityExchange.Capability)other);
} else {
@@ -16271,13 +16271,13 @@
}
public Builder mergeFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse.CapabilityExchange.Capability parsedMessage = null;
try {
parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
- } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ } catch (com.google.gwt.dev.protobuf.InvalidProtocolBufferException e) {
parsedMessage = (com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse.CapabilityExchange.Capability) e.getUnfinishedMessage();
throw e;
} finally {
@@ -16384,7 +16384,7 @@
return true;
}
- public void writeTo(com.google.protobuf.CodedOutputStream output)
+ public void writeTo(com.google.gwt.dev.protobuf.CodedOutputStream output)
throws java.io.IOException {
getSerializedSize();
for (int i = 0; i < capabilities_.size(); i++) {
@@ -16400,7 +16400,7 @@
size = 0;
for (int i = 0; i < capabilities_.size(); i++) {
- size += com.google.protobuf.CodedOutputStream
+ size += com.google.gwt.dev.protobuf.CodedOutputStream
.computeMessageSize(2, capabilities_.get(i));
}
size += getUnknownFields().getSerializedSize();
@@ -16416,24 +16416,24 @@
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse.CapabilityExchange parseFrom(
- com.google.protobuf.ByteString data)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.ByteString data)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse.CapabilityExchange parseFrom(
- com.google.protobuf.ByteString data,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.ByteString data,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse.CapabilityExchange parseFrom(byte[] data)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse.CapabilityExchange parseFrom(
byte[] data,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse.CapabilityExchange parseFrom(java.io.InputStream input)
@@ -16442,7 +16442,7 @@
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse.CapabilityExchange parseFrom(
java.io.InputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseFrom(input, extensionRegistry);
}
@@ -16452,18 +16452,18 @@
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse.CapabilityExchange parseDelimitedFrom(
java.io.InputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseDelimitedFrom(input, extensionRegistry);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse.CapabilityExchange parseFrom(
- com.google.protobuf.CodedInputStream input)
+ com.google.gwt.dev.protobuf.CodedInputStream input)
throws java.io.IOException {
return PARSER.parseFrom(input);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse.CapabilityExchange parseFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseFrom(input, extensionRegistry);
}
@@ -16477,7 +16477,7 @@
@java.lang.Override
protected Builder newBuilderForType(
- com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+ com.google.gwt.dev.protobuf.GeneratedMessage.BuilderParent parent) {
Builder builder = new Builder(parent);
return builder;
}
@@ -16489,14 +16489,14 @@
* </pre>
*/
public static final class Builder extends
- com.google.protobuf.GeneratedMessage.Builder<Builder>
+ com.google.gwt.dev.protobuf.GeneratedMessage.Builder<Builder>
implements com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse.CapabilityExchangeOrBuilder {
- public static final com.google.protobuf.Descriptors.Descriptor
+ public static final com.google.gwt.dev.protobuf.Descriptors.Descriptor
getDescriptor() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_DevModeResponse_CapabilityExchange_descriptor;
}
- protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ protected com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_DevModeResponse_CapabilityExchange_fieldAccessorTable
.ensureFieldAccessorsInitialized(
@@ -16509,12 +16509,12 @@
}
private Builder(
- com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+ com.google.gwt.dev.protobuf.GeneratedMessage.BuilderParent parent) {
super(parent);
maybeForceBuilderInitialization();
}
private void maybeForceBuilderInitialization() {
- if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+ if (com.google.gwt.dev.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
getCapabilitiesFieldBuilder();
}
}
@@ -16537,7 +16537,7 @@
return create().mergeFrom(buildPartial());
}
- public com.google.protobuf.Descriptors.Descriptor
+ public com.google.gwt.dev.protobuf.Descriptors.Descriptor
getDescriptorForType() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_DevModeResponse_CapabilityExchange_descriptor;
}
@@ -16570,7 +16570,7 @@
return result;
}
- public Builder mergeFrom(com.google.protobuf.Message other) {
+ public Builder mergeFrom(com.google.gwt.dev.protobuf.Message other) {
if (other instanceof com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse.CapabilityExchange) {
return mergeFrom((com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse.CapabilityExchange)other);
} else {
@@ -16600,7 +16600,7 @@
capabilities_ = other.capabilities_;
bitField0_ = (bitField0_ & ~0x00000001);
capabilitiesBuilder_ =
- com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
+ com.google.gwt.dev.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
getCapabilitiesFieldBuilder() : null;
} else {
capabilitiesBuilder_.addAllMessages(other.capabilities_);
@@ -16616,13 +16616,13 @@
}
public Builder mergeFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse.CapabilityExchange parsedMessage = null;
try {
parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
- } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ } catch (com.google.gwt.dev.protobuf.InvalidProtocolBufferException e) {
parsedMessage = (com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse.CapabilityExchange) e.getUnfinishedMessage();
throw e;
} finally {
@@ -16644,7 +16644,7 @@
}
}
- private com.google.protobuf.RepeatedFieldBuilder<
+ private com.google.gwt.dev.protobuf.RepeatedFieldBuilder<
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse.CapabilityExchange.Capability, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse.CapabilityExchange.Capability.Builder, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse.CapabilityExchange.CapabilityOrBuilder> capabilitiesBuilder_;
/**
@@ -16859,11 +16859,11 @@
getCapabilitiesBuilderList() {
return getCapabilitiesFieldBuilder().getBuilderList();
}
- private com.google.protobuf.RepeatedFieldBuilder<
+ private com.google.gwt.dev.protobuf.RepeatedFieldBuilder<
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse.CapabilityExchange.Capability, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse.CapabilityExchange.Capability.Builder, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse.CapabilityExchange.CapabilityOrBuilder>
getCapabilitiesFieldBuilder() {
if (capabilitiesBuilder_ == null) {
- capabilitiesBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
+ capabilitiesBuilder_ = new com.google.gwt.dev.protobuf.RepeatedFieldBuilder<
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse.CapabilityExchange.Capability, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse.CapabilityExchange.Capability.Builder, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse.CapabilityExchange.CapabilityOrBuilder>(
capabilities_,
((bitField0_ & 0x00000001) == 0x00000001),
@@ -16886,7 +16886,7 @@
}
public interface RestartWebServerOrBuilder
- extends com.google.protobuf.MessageOrBuilder {
+ extends com.google.gwt.dev.protobuf.MessageOrBuilder {
}
/**
* Protobuf type {@code com.google.gwt.dev.shell.remoteui.Message.Response.DevModeResponse.RestartWebServer}
@@ -16897,14 +16897,14 @@
* </pre>
*/
public static final class RestartWebServer extends
- com.google.protobuf.GeneratedMessage
+ com.google.gwt.dev.protobuf.GeneratedMessage
implements RestartWebServerOrBuilder {
// Use RestartWebServer.newBuilder() to construct.
- private RestartWebServer(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+ private RestartWebServer(com.google.gwt.dev.protobuf.GeneratedMessage.Builder<?> builder) {
super(builder);
this.unknownFields = builder.getUnknownFields();
}
- private RestartWebServer(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+ private RestartWebServer(boolean noInit) { this.unknownFields = com.google.gwt.dev.protobuf.UnknownFieldSet.getDefaultInstance(); }
private static final RestartWebServer defaultInstance;
public static RestartWebServer getDefaultInstance() {
@@ -16915,19 +16915,19 @@
return defaultInstance;
}
- private final com.google.protobuf.UnknownFieldSet unknownFields;
+ private final com.google.gwt.dev.protobuf.UnknownFieldSet unknownFields;
@java.lang.Override
- public final com.google.protobuf.UnknownFieldSet
+ public final com.google.gwt.dev.protobuf.UnknownFieldSet
getUnknownFields() {
return this.unknownFields;
}
private RestartWebServer(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
initFields();
- com.google.protobuf.UnknownFieldSet.Builder unknownFields =
- com.google.protobuf.UnknownFieldSet.newBuilder();
+ com.google.gwt.dev.protobuf.UnknownFieldSet.Builder unknownFields =
+ com.google.gwt.dev.protobuf.UnknownFieldSet.newBuilder();
try {
boolean done = false;
while (!done) {
@@ -16945,40 +16945,40 @@
}
}
}
- } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ } catch (com.google.gwt.dev.protobuf.InvalidProtocolBufferException e) {
throw e.setUnfinishedMessage(this);
} catch (java.io.IOException e) {
- throw new com.google.protobuf.InvalidProtocolBufferException(
+ throw new com.google.gwt.dev.protobuf.InvalidProtocolBufferException(
e.getMessage()).setUnfinishedMessage(this);
} finally {
this.unknownFields = unknownFields.build();
makeExtensionsImmutable();
}
}
- public static final com.google.protobuf.Descriptors.Descriptor
+ public static final com.google.gwt.dev.protobuf.Descriptors.Descriptor
getDescriptor() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_DevModeResponse_RestartWebServer_descriptor;
}
- protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ protected com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_DevModeResponse_RestartWebServer_fieldAccessorTable
.ensureFieldAccessorsInitialized(
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse.RestartWebServer.class, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse.RestartWebServer.Builder.class);
}
- public static com.google.protobuf.Parser<RestartWebServer> PARSER =
- new com.google.protobuf.AbstractParser<RestartWebServer>() {
+ public static com.google.gwt.dev.protobuf.Parser<RestartWebServer> PARSER =
+ new com.google.gwt.dev.protobuf.AbstractParser<RestartWebServer>() {
public RestartWebServer parsePartialFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return new RestartWebServer(input, extensionRegistry);
}
};
@java.lang.Override
- public com.google.protobuf.Parser<RestartWebServer> getParserForType() {
+ public com.google.gwt.dev.protobuf.Parser<RestartWebServer> getParserForType() {
return PARSER;
}
@@ -16993,7 +16993,7 @@
return true;
}
- public void writeTo(com.google.protobuf.CodedOutputStream output)
+ public void writeTo(com.google.gwt.dev.protobuf.CodedOutputStream output)
throws java.io.IOException {
getSerializedSize();
getUnknownFields().writeTo(output);
@@ -17018,24 +17018,24 @@
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse.RestartWebServer parseFrom(
- com.google.protobuf.ByteString data)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.ByteString data)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse.RestartWebServer parseFrom(
- com.google.protobuf.ByteString data,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.ByteString data,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse.RestartWebServer parseFrom(byte[] data)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse.RestartWebServer parseFrom(
byte[] data,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse.RestartWebServer parseFrom(java.io.InputStream input)
@@ -17044,7 +17044,7 @@
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse.RestartWebServer parseFrom(
java.io.InputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseFrom(input, extensionRegistry);
}
@@ -17054,18 +17054,18 @@
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse.RestartWebServer parseDelimitedFrom(
java.io.InputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseDelimitedFrom(input, extensionRegistry);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse.RestartWebServer parseFrom(
- com.google.protobuf.CodedInputStream input)
+ com.google.gwt.dev.protobuf.CodedInputStream input)
throws java.io.IOException {
return PARSER.parseFrom(input);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse.RestartWebServer parseFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseFrom(input, extensionRegistry);
}
@@ -17079,7 +17079,7 @@
@java.lang.Override
protected Builder newBuilderForType(
- com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+ com.google.gwt.dev.protobuf.GeneratedMessage.BuilderParent parent) {
Builder builder = new Builder(parent);
return builder;
}
@@ -17092,14 +17092,14 @@
* </pre>
*/
public static final class Builder extends
- com.google.protobuf.GeneratedMessage.Builder<Builder>
+ com.google.gwt.dev.protobuf.GeneratedMessage.Builder<Builder>
implements com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse.RestartWebServerOrBuilder {
- public static final com.google.protobuf.Descriptors.Descriptor
+ public static final com.google.gwt.dev.protobuf.Descriptors.Descriptor
getDescriptor() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_DevModeResponse_RestartWebServer_descriptor;
}
- protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ protected com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_DevModeResponse_RestartWebServer_fieldAccessorTable
.ensureFieldAccessorsInitialized(
@@ -17112,12 +17112,12 @@
}
private Builder(
- com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+ com.google.gwt.dev.protobuf.GeneratedMessage.BuilderParent parent) {
super(parent);
maybeForceBuilderInitialization();
}
private void maybeForceBuilderInitialization() {
- if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+ if (com.google.gwt.dev.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
}
}
private static Builder create() {
@@ -17133,7 +17133,7 @@
return create().mergeFrom(buildPartial());
}
- public com.google.protobuf.Descriptors.Descriptor
+ public com.google.gwt.dev.protobuf.Descriptors.Descriptor
getDescriptorForType() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_DevModeResponse_RestartWebServer_descriptor;
}
@@ -17156,7 +17156,7 @@
return result;
}
- public Builder mergeFrom(com.google.protobuf.Message other) {
+ public Builder mergeFrom(com.google.gwt.dev.protobuf.Message other) {
if (other instanceof com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse.RestartWebServer) {
return mergeFrom((com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse.RestartWebServer)other);
} else {
@@ -17176,13 +17176,13 @@
}
public Builder mergeFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse.RestartWebServer parsedMessage = null;
try {
parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
- } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ } catch (com.google.gwt.dev.protobuf.InvalidProtocolBufferException e) {
parsedMessage = (com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse.RestartWebServer) e.getUnfinishedMessage();
throw e;
} finally {
@@ -17279,7 +17279,7 @@
return true;
}
- public void writeTo(com.google.protobuf.CodedOutputStream output)
+ public void writeTo(com.google.gwt.dev.protobuf.CodedOutputStream output)
throws java.io.IOException {
getSerializedSize();
if (((bitField0_ & 0x00000001) == 0x00000001)) {
@@ -17301,15 +17301,15 @@
size = 0;
if (((bitField0_ & 0x00000001) == 0x00000001)) {
- size += com.google.protobuf.CodedOutputStream
+ size += com.google.gwt.dev.protobuf.CodedOutputStream
.computeEnumSize(1, responseType_.getNumber());
}
if (((bitField0_ & 0x00000002) == 0x00000002)) {
- size += com.google.protobuf.CodedOutputStream
+ size += com.google.gwt.dev.protobuf.CodedOutputStream
.computeMessageSize(2, capabilityExchange_);
}
if (((bitField0_ & 0x00000004) == 0x00000004)) {
- size += com.google.protobuf.CodedOutputStream
+ size += com.google.gwt.dev.protobuf.CodedOutputStream
.computeMessageSize(3, restartWebServer_);
}
size += getUnknownFields().getSerializedSize();
@@ -17325,24 +17325,24 @@
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse parseFrom(
- com.google.protobuf.ByteString data)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.ByteString data)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse parseFrom(
- com.google.protobuf.ByteString data,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.ByteString data,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse parseFrom(byte[] data)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse parseFrom(
byte[] data,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse parseFrom(java.io.InputStream input)
@@ -17351,7 +17351,7 @@
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse parseFrom(
java.io.InputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseFrom(input, extensionRegistry);
}
@@ -17361,18 +17361,18 @@
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse parseDelimitedFrom(
java.io.InputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseDelimitedFrom(input, extensionRegistry);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse parseFrom(
- com.google.protobuf.CodedInputStream input)
+ com.google.gwt.dev.protobuf.CodedInputStream input)
throws java.io.IOException {
return PARSER.parseFrom(input);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse parseFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseFrom(input, extensionRegistry);
}
@@ -17386,7 +17386,7 @@
@java.lang.Override
protected Builder newBuilderForType(
- com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+ com.google.gwt.dev.protobuf.GeneratedMessage.BuilderParent parent) {
Builder builder = new Builder(parent);
return builder;
}
@@ -17398,14 +17398,14 @@
* </pre>
*/
public static final class Builder extends
- com.google.protobuf.GeneratedMessage.Builder<Builder>
+ com.google.gwt.dev.protobuf.GeneratedMessage.Builder<Builder>
implements com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponseOrBuilder {
- public static final com.google.protobuf.Descriptors.Descriptor
+ public static final com.google.gwt.dev.protobuf.Descriptors.Descriptor
getDescriptor() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_DevModeResponse_descriptor;
}
- protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ protected com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_DevModeResponse_fieldAccessorTable
.ensureFieldAccessorsInitialized(
@@ -17418,12 +17418,12 @@
}
private Builder(
- com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+ com.google.gwt.dev.protobuf.GeneratedMessage.BuilderParent parent) {
super(parent);
maybeForceBuilderInitialization();
}
private void maybeForceBuilderInitialization() {
- if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+ if (com.google.gwt.dev.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
getCapabilityExchangeFieldBuilder();
getRestartWebServerFieldBuilder();
}
@@ -17455,7 +17455,7 @@
return create().mergeFrom(buildPartial());
}
- public com.google.protobuf.Descriptors.Descriptor
+ public com.google.gwt.dev.protobuf.Descriptors.Descriptor
getDescriptorForType() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_DevModeResponse_descriptor;
}
@@ -17501,7 +17501,7 @@
return result;
}
- public Builder mergeFrom(com.google.protobuf.Message other) {
+ public Builder mergeFrom(com.google.gwt.dev.protobuf.Message other) {
if (other instanceof com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse) {
return mergeFrom((com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse)other);
} else {
@@ -17530,13 +17530,13 @@
}
public Builder mergeFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse parsedMessage = null;
try {
parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
- } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ } catch (com.google.gwt.dev.protobuf.InvalidProtocolBufferException e) {
parsedMessage = (com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse) e.getUnfinishedMessage();
throw e;
} finally {
@@ -17586,7 +17586,7 @@
// optional .com.google.gwt.dev.shell.remoteui.Message.Response.DevModeResponse.CapabilityExchange capabilityExchange = 2;
private com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse.CapabilityExchange capabilityExchange_ = com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse.CapabilityExchange.getDefaultInstance();
- private com.google.protobuf.SingleFieldBuilder<
+ private com.google.gwt.dev.protobuf.SingleFieldBuilder<
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse.CapabilityExchange, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse.CapabilityExchange.Builder, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse.CapabilityExchangeOrBuilder> capabilityExchangeBuilder_;
/**
* <code>optional .com.google.gwt.dev.shell.remoteui.Message.Response.DevModeResponse.CapabilityExchange capabilityExchange = 2;</code>
@@ -17687,11 +17687,11 @@
/**
* <code>optional .com.google.gwt.dev.shell.remoteui.Message.Response.DevModeResponse.CapabilityExchange capabilityExchange = 2;</code>
*/
- private com.google.protobuf.SingleFieldBuilder<
+ private com.google.gwt.dev.protobuf.SingleFieldBuilder<
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse.CapabilityExchange, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse.CapabilityExchange.Builder, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse.CapabilityExchangeOrBuilder>
getCapabilityExchangeFieldBuilder() {
if (capabilityExchangeBuilder_ == null) {
- capabilityExchangeBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+ capabilityExchangeBuilder_ = new com.google.gwt.dev.protobuf.SingleFieldBuilder<
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse.CapabilityExchange, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse.CapabilityExchange.Builder, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse.CapabilityExchangeOrBuilder>(
capabilityExchange_,
getParentForChildren(),
@@ -17703,7 +17703,7 @@
// optional .com.google.gwt.dev.shell.remoteui.Message.Response.DevModeResponse.RestartWebServer restartWebServer = 3;
private com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse.RestartWebServer restartWebServer_ = com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse.RestartWebServer.getDefaultInstance();
- private com.google.protobuf.SingleFieldBuilder<
+ private com.google.gwt.dev.protobuf.SingleFieldBuilder<
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse.RestartWebServer, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse.RestartWebServer.Builder, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse.RestartWebServerOrBuilder> restartWebServerBuilder_;
/**
* <code>optional .com.google.gwt.dev.shell.remoteui.Message.Response.DevModeResponse.RestartWebServer restartWebServer = 3;</code>
@@ -17804,11 +17804,11 @@
/**
* <code>optional .com.google.gwt.dev.shell.remoteui.Message.Response.DevModeResponse.RestartWebServer restartWebServer = 3;</code>
*/
- private com.google.protobuf.SingleFieldBuilder<
+ private com.google.gwt.dev.protobuf.SingleFieldBuilder<
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse.RestartWebServer, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse.RestartWebServer.Builder, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse.RestartWebServerOrBuilder>
getRestartWebServerFieldBuilder() {
if (restartWebServerBuilder_ == null) {
- restartWebServerBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+ restartWebServerBuilder_ = new com.google.gwt.dev.protobuf.SingleFieldBuilder<
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse.RestartWebServer, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse.RestartWebServer.Builder, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse.RestartWebServerOrBuilder>(
restartWebServer_,
getParentForChildren(),
@@ -17893,7 +17893,7 @@
return true;
}
- public void writeTo(com.google.protobuf.CodedOutputStream output)
+ public void writeTo(com.google.gwt.dev.protobuf.CodedOutputStream output)
throws java.io.IOException {
getSerializedSize();
if (((bitField0_ & 0x00000001) == 0x00000001)) {
@@ -17912,11 +17912,11 @@
size = 0;
if (((bitField0_ & 0x00000001) == 0x00000001)) {
- size += com.google.protobuf.CodedOutputStream
+ size += com.google.gwt.dev.protobuf.CodedOutputStream
.computeMessageSize(1, viewerResponse_);
}
if (((bitField0_ & 0x00000002) == 0x00000002)) {
- size += com.google.protobuf.CodedOutputStream
+ size += com.google.gwt.dev.protobuf.CodedOutputStream
.computeMessageSize(2, devModeResponse_);
}
size += getUnknownFields().getSerializedSize();
@@ -17932,24 +17932,24 @@
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response parseFrom(
- com.google.protobuf.ByteString data)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.ByteString data)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response parseFrom(
- com.google.protobuf.ByteString data,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.ByteString data,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response parseFrom(byte[] data)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response parseFrom(
byte[] data,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response parseFrom(java.io.InputStream input)
@@ -17958,7 +17958,7 @@
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response parseFrom(
java.io.InputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseFrom(input, extensionRegistry);
}
@@ -17968,18 +17968,18 @@
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response parseDelimitedFrom(
java.io.InputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseDelimitedFrom(input, extensionRegistry);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response parseFrom(
- com.google.protobuf.CodedInputStream input)
+ com.google.gwt.dev.protobuf.CodedInputStream input)
throws java.io.IOException {
return PARSER.parseFrom(input);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response parseFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseFrom(input, extensionRegistry);
}
@@ -17993,7 +17993,7 @@
@java.lang.Override
protected Builder newBuilderForType(
- com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+ com.google.gwt.dev.protobuf.GeneratedMessage.BuilderParent parent) {
Builder builder = new Builder(parent);
return builder;
}
@@ -18006,14 +18006,14 @@
* </pre>
*/
public static final class Builder extends
- com.google.protobuf.GeneratedMessage.Builder<Builder>
+ com.google.gwt.dev.protobuf.GeneratedMessage.Builder<Builder>
implements com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.ResponseOrBuilder {
- public static final com.google.protobuf.Descriptors.Descriptor
+ public static final com.google.gwt.dev.protobuf.Descriptors.Descriptor
getDescriptor() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_descriptor;
}
- protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ protected com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_fieldAccessorTable
.ensureFieldAccessorsInitialized(
@@ -18026,12 +18026,12 @@
}
private Builder(
- com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+ com.google.gwt.dev.protobuf.GeneratedMessage.BuilderParent parent) {
super(parent);
maybeForceBuilderInitialization();
}
private void maybeForceBuilderInitialization() {
- if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+ if (com.google.gwt.dev.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
getViewerResponseFieldBuilder();
getDevModeResponseFieldBuilder();
}
@@ -18061,7 +18061,7 @@
return create().mergeFrom(buildPartial());
}
- public com.google.protobuf.Descriptors.Descriptor
+ public com.google.gwt.dev.protobuf.Descriptors.Descriptor
getDescriptorForType() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_descriptor;
}
@@ -18103,7 +18103,7 @@
return result;
}
- public Builder mergeFrom(com.google.protobuf.Message other) {
+ public Builder mergeFrom(com.google.gwt.dev.protobuf.Message other) {
if (other instanceof com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response) {
return mergeFrom((com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response)other);
} else {
@@ -18135,13 +18135,13 @@
}
public Builder mergeFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response parsedMessage = null;
try {
parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
- } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ } catch (com.google.gwt.dev.protobuf.InvalidProtocolBufferException e) {
parsedMessage = (com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response) e.getUnfinishedMessage();
throw e;
} finally {
@@ -18155,7 +18155,7 @@
// optional .com.google.gwt.dev.shell.remoteui.Message.Response.ViewerResponse viewerResponse = 1;
private com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse viewerResponse_ = com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.getDefaultInstance();
- private com.google.protobuf.SingleFieldBuilder<
+ private com.google.gwt.dev.protobuf.SingleFieldBuilder<
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.Builder, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponseOrBuilder> viewerResponseBuilder_;
/**
* <code>optional .com.google.gwt.dev.shell.remoteui.Message.Response.ViewerResponse viewerResponse = 1;</code>
@@ -18256,11 +18256,11 @@
/**
* <code>optional .com.google.gwt.dev.shell.remoteui.Message.Response.ViewerResponse viewerResponse = 1;</code>
*/
- private com.google.protobuf.SingleFieldBuilder<
+ private com.google.gwt.dev.protobuf.SingleFieldBuilder<
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.Builder, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponseOrBuilder>
getViewerResponseFieldBuilder() {
if (viewerResponseBuilder_ == null) {
- viewerResponseBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+ viewerResponseBuilder_ = new com.google.gwt.dev.protobuf.SingleFieldBuilder<
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.Builder, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponseOrBuilder>(
viewerResponse_,
getParentForChildren(),
@@ -18272,7 +18272,7 @@
// optional .com.google.gwt.dev.shell.remoteui.Message.Response.DevModeResponse devModeResponse = 2;
private com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse devModeResponse_ = com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse.getDefaultInstance();
- private com.google.protobuf.SingleFieldBuilder<
+ private com.google.gwt.dev.protobuf.SingleFieldBuilder<
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse.Builder, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponseOrBuilder> devModeResponseBuilder_;
/**
* <code>optional .com.google.gwt.dev.shell.remoteui.Message.Response.DevModeResponse devModeResponse = 2;</code>
@@ -18373,11 +18373,11 @@
/**
* <code>optional .com.google.gwt.dev.shell.remoteui.Message.Response.DevModeResponse devModeResponse = 2;</code>
*/
- private com.google.protobuf.SingleFieldBuilder<
+ private com.google.gwt.dev.protobuf.SingleFieldBuilder<
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse.Builder, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponseOrBuilder>
getDevModeResponseFieldBuilder() {
if (devModeResponseBuilder_ == null) {
- devModeResponseBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+ devModeResponseBuilder_ = new com.google.gwt.dev.protobuf.SingleFieldBuilder<
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponse.Builder, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.DevModeResponseOrBuilder>(
devModeResponse_,
getParentForChildren(),
@@ -18399,7 +18399,7 @@
}
public interface FailureOrBuilder
- extends com.google.protobuf.MessageOrBuilder {
+ extends com.google.gwt.dev.protobuf.MessageOrBuilder {
// optional string message = 1;
/**
@@ -18413,7 +18413,7 @@
/**
* <code>optional string message = 1;</code>
*/
- com.google.protobuf.ByteString
+ com.google.gwt.dev.protobuf.ByteString
getMessageBytes();
// optional string stackTrace = 2;
@@ -18428,21 +18428,21 @@
/**
* <code>optional string stackTrace = 2;</code>
*/
- com.google.protobuf.ByteString
+ com.google.gwt.dev.protobuf.ByteString
getStackTraceBytes();
}
/**
* Protobuf type {@code com.google.gwt.dev.shell.remoteui.Message.Failure}
*/
public static final class Failure extends
- com.google.protobuf.GeneratedMessage
+ com.google.gwt.dev.protobuf.GeneratedMessage
implements FailureOrBuilder {
// Use Failure.newBuilder() to construct.
- private Failure(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+ private Failure(com.google.gwt.dev.protobuf.GeneratedMessage.Builder<?> builder) {
super(builder);
this.unknownFields = builder.getUnknownFields();
}
- private Failure(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+ private Failure(boolean noInit) { this.unknownFields = com.google.gwt.dev.protobuf.UnknownFieldSet.getDefaultInstance(); }
private static final Failure defaultInstance;
public static Failure getDefaultInstance() {
@@ -18453,20 +18453,20 @@
return defaultInstance;
}
- private final com.google.protobuf.UnknownFieldSet unknownFields;
+ private final com.google.gwt.dev.protobuf.UnknownFieldSet unknownFields;
@java.lang.Override
- public final com.google.protobuf.UnknownFieldSet
+ public final com.google.gwt.dev.protobuf.UnknownFieldSet
getUnknownFields() {
return this.unknownFields;
}
private Failure(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
initFields();
int mutable_bitField0_ = 0;
- com.google.protobuf.UnknownFieldSet.Builder unknownFields =
- com.google.protobuf.UnknownFieldSet.newBuilder();
+ com.google.gwt.dev.protobuf.UnknownFieldSet.Builder unknownFields =
+ com.google.gwt.dev.protobuf.UnknownFieldSet.newBuilder();
try {
boolean done = false;
while (!done) {
@@ -18494,40 +18494,40 @@
}
}
}
- } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ } catch (com.google.gwt.dev.protobuf.InvalidProtocolBufferException e) {
throw e.setUnfinishedMessage(this);
} catch (java.io.IOException e) {
- throw new com.google.protobuf.InvalidProtocolBufferException(
+ throw new com.google.gwt.dev.protobuf.InvalidProtocolBufferException(
e.getMessage()).setUnfinishedMessage(this);
} finally {
this.unknownFields = unknownFields.build();
makeExtensionsImmutable();
}
}
- public static final com.google.protobuf.Descriptors.Descriptor
+ public static final com.google.gwt.dev.protobuf.Descriptors.Descriptor
getDescriptor() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Failure_descriptor;
}
- protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ protected com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Failure_fieldAccessorTable
.ensureFieldAccessorsInitialized(
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Failure.class, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Failure.Builder.class);
}
- public static com.google.protobuf.Parser<Failure> PARSER =
- new com.google.protobuf.AbstractParser<Failure>() {
+ public static com.google.gwt.dev.protobuf.Parser<Failure> PARSER =
+ new com.google.gwt.dev.protobuf.AbstractParser<Failure>() {
public Failure parsePartialFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return new Failure(input, extensionRegistry);
}
};
@java.lang.Override
- public com.google.protobuf.Parser<Failure> getParserForType() {
+ public com.google.gwt.dev.protobuf.Parser<Failure> getParserForType() {
return PARSER;
}
@@ -18549,8 +18549,8 @@
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
} else {
- com.google.protobuf.ByteString bs =
- (com.google.protobuf.ByteString) ref;
+ com.google.gwt.dev.protobuf.ByteString bs =
+ (com.google.gwt.dev.protobuf.ByteString) ref;
java.lang.String s = bs.toStringUtf8();
if (bs.isValidUtf8()) {
message_ = s;
@@ -18561,17 +18561,17 @@
/**
* <code>optional string message = 1;</code>
*/
- public com.google.protobuf.ByteString
+ public com.google.gwt.dev.protobuf.ByteString
getMessageBytes() {
java.lang.Object ref = message_;
if (ref instanceof java.lang.String) {
- com.google.protobuf.ByteString b =
- com.google.protobuf.ByteString.copyFromUtf8(
+ com.google.gwt.dev.protobuf.ByteString b =
+ com.google.gwt.dev.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref);
message_ = b;
return b;
} else {
- return (com.google.protobuf.ByteString) ref;
+ return (com.google.gwt.dev.protobuf.ByteString) ref;
}
}
@@ -18592,8 +18592,8 @@
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
} else {
- com.google.protobuf.ByteString bs =
- (com.google.protobuf.ByteString) ref;
+ com.google.gwt.dev.protobuf.ByteString bs =
+ (com.google.gwt.dev.protobuf.ByteString) ref;
java.lang.String s = bs.toStringUtf8();
if (bs.isValidUtf8()) {
stackTrace_ = s;
@@ -18604,17 +18604,17 @@
/**
* <code>optional string stackTrace = 2;</code>
*/
- public com.google.protobuf.ByteString
+ public com.google.gwt.dev.protobuf.ByteString
getStackTraceBytes() {
java.lang.Object ref = stackTrace_;
if (ref instanceof java.lang.String) {
- com.google.protobuf.ByteString b =
- com.google.protobuf.ByteString.copyFromUtf8(
+ com.google.gwt.dev.protobuf.ByteString b =
+ com.google.gwt.dev.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref);
stackTrace_ = b;
return b;
} else {
- return (com.google.protobuf.ByteString) ref;
+ return (com.google.gwt.dev.protobuf.ByteString) ref;
}
}
@@ -18631,7 +18631,7 @@
return true;
}
- public void writeTo(com.google.protobuf.CodedOutputStream output)
+ public void writeTo(com.google.gwt.dev.protobuf.CodedOutputStream output)
throws java.io.IOException {
getSerializedSize();
if (((bitField0_ & 0x00000001) == 0x00000001)) {
@@ -18650,11 +18650,11 @@
size = 0;
if (((bitField0_ & 0x00000001) == 0x00000001)) {
- size += com.google.protobuf.CodedOutputStream
+ size += com.google.gwt.dev.protobuf.CodedOutputStream
.computeBytesSize(1, getMessageBytes());
}
if (((bitField0_ & 0x00000002) == 0x00000002)) {
- size += com.google.protobuf.CodedOutputStream
+ size += com.google.gwt.dev.protobuf.CodedOutputStream
.computeBytesSize(2, getStackTraceBytes());
}
size += getUnknownFields().getSerializedSize();
@@ -18670,24 +18670,24 @@
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Failure parseFrom(
- com.google.protobuf.ByteString data)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.ByteString data)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Failure parseFrom(
- com.google.protobuf.ByteString data,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.ByteString data,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Failure parseFrom(byte[] data)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Failure parseFrom(
byte[] data,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Failure parseFrom(java.io.InputStream input)
@@ -18696,7 +18696,7 @@
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Failure parseFrom(
java.io.InputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseFrom(input, extensionRegistry);
}
@@ -18706,18 +18706,18 @@
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Failure parseDelimitedFrom(
java.io.InputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseDelimitedFrom(input, extensionRegistry);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Failure parseFrom(
- com.google.protobuf.CodedInputStream input)
+ com.google.gwt.dev.protobuf.CodedInputStream input)
throws java.io.IOException {
return PARSER.parseFrom(input);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Failure parseFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseFrom(input, extensionRegistry);
}
@@ -18731,7 +18731,7 @@
@java.lang.Override
protected Builder newBuilderForType(
- com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+ com.google.gwt.dev.protobuf.GeneratedMessage.BuilderParent parent) {
Builder builder = new Builder(parent);
return builder;
}
@@ -18739,14 +18739,14 @@
* Protobuf type {@code com.google.gwt.dev.shell.remoteui.Message.Failure}
*/
public static final class Builder extends
- com.google.protobuf.GeneratedMessage.Builder<Builder>
+ com.google.gwt.dev.protobuf.GeneratedMessage.Builder<Builder>
implements com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.FailureOrBuilder {
- public static final com.google.protobuf.Descriptors.Descriptor
+ public static final com.google.gwt.dev.protobuf.Descriptors.Descriptor
getDescriptor() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Failure_descriptor;
}
- protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ protected com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Failure_fieldAccessorTable
.ensureFieldAccessorsInitialized(
@@ -18759,12 +18759,12 @@
}
private Builder(
- com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+ com.google.gwt.dev.protobuf.GeneratedMessage.BuilderParent parent) {
super(parent);
maybeForceBuilderInitialization();
}
private void maybeForceBuilderInitialization() {
- if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+ if (com.google.gwt.dev.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
}
}
private static Builder create() {
@@ -18784,7 +18784,7 @@
return create().mergeFrom(buildPartial());
}
- public com.google.protobuf.Descriptors.Descriptor
+ public com.google.gwt.dev.protobuf.Descriptors.Descriptor
getDescriptorForType() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_Failure_descriptor;
}
@@ -18818,7 +18818,7 @@
return result;
}
- public Builder mergeFrom(com.google.protobuf.Message other) {
+ public Builder mergeFrom(com.google.gwt.dev.protobuf.Message other) {
if (other instanceof com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Failure) {
return mergeFrom((com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Failure)other);
} else {
@@ -18848,13 +18848,13 @@
}
public Builder mergeFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Failure parsedMessage = null;
try {
parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
- } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ } catch (com.google.gwt.dev.protobuf.InvalidProtocolBufferException e) {
parsedMessage = (com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Failure) e.getUnfinishedMessage();
throw e;
} finally {
@@ -18880,7 +18880,7 @@
public java.lang.String getMessage() {
java.lang.Object ref = message_;
if (!(ref instanceof java.lang.String)) {
- java.lang.String s = ((com.google.protobuf.ByteString) ref)
+ java.lang.String s = ((com.google.gwt.dev.protobuf.ByteString) ref)
.toStringUtf8();
message_ = s;
return s;
@@ -18891,17 +18891,17 @@
/**
* <code>optional string message = 1;</code>
*/
- public com.google.protobuf.ByteString
+ public com.google.gwt.dev.protobuf.ByteString
getMessageBytes() {
java.lang.Object ref = message_;
if (ref instanceof String) {
- com.google.protobuf.ByteString b =
- com.google.protobuf.ByteString.copyFromUtf8(
+ com.google.gwt.dev.protobuf.ByteString b =
+ com.google.gwt.dev.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref);
message_ = b;
return b;
} else {
- return (com.google.protobuf.ByteString) ref;
+ return (com.google.gwt.dev.protobuf.ByteString) ref;
}
}
/**
@@ -18930,7 +18930,7 @@
* <code>optional string message = 1;</code>
*/
public Builder setMessageBytes(
- com.google.protobuf.ByteString value) {
+ com.google.gwt.dev.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
}
@@ -18954,7 +18954,7 @@
public java.lang.String getStackTrace() {
java.lang.Object ref = stackTrace_;
if (!(ref instanceof java.lang.String)) {
- java.lang.String s = ((com.google.protobuf.ByteString) ref)
+ java.lang.String s = ((com.google.gwt.dev.protobuf.ByteString) ref)
.toStringUtf8();
stackTrace_ = s;
return s;
@@ -18965,17 +18965,17 @@
/**
* <code>optional string stackTrace = 2;</code>
*/
- public com.google.protobuf.ByteString
+ public com.google.gwt.dev.protobuf.ByteString
getStackTraceBytes() {
java.lang.Object ref = stackTrace_;
if (ref instanceof String) {
- com.google.protobuf.ByteString b =
- com.google.protobuf.ByteString.copyFromUtf8(
+ com.google.gwt.dev.protobuf.ByteString b =
+ com.google.gwt.dev.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref);
stackTrace_ = b;
return b;
} else {
- return (com.google.protobuf.ByteString) ref;
+ return (com.google.gwt.dev.protobuf.ByteString) ref;
}
}
/**
@@ -19004,7 +19004,7 @@
* <code>optional string stackTrace = 2;</code>
*/
public Builder setStackTraceBytes(
- com.google.protobuf.ByteString value) {
+ com.google.gwt.dev.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
}
@@ -19053,8 +19053,8 @@
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
} else {
- com.google.protobuf.ByteString bs =
- (com.google.protobuf.ByteString) ref;
+ com.google.gwt.dev.protobuf.ByteString bs =
+ (com.google.gwt.dev.protobuf.ByteString) ref;
java.lang.String s = bs.toStringUtf8();
if (bs.isValidUtf8()) {
protocolVersion_ = s;
@@ -19070,17 +19070,17 @@
* we can make use of it to detect protocol incompatibilities
* </pre>
*/
- public com.google.protobuf.ByteString
+ public com.google.gwt.dev.protobuf.ByteString
getProtocolVersionBytes() {
java.lang.Object ref = protocolVersion_;
if (ref instanceof java.lang.String) {
- com.google.protobuf.ByteString b =
- com.google.protobuf.ByteString.copyFromUtf8(
+ com.google.gwt.dev.protobuf.ByteString b =
+ com.google.gwt.dev.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref);
protocolVersion_ = b;
return b;
} else {
- return (com.google.protobuf.ByteString) ref;
+ return (com.google.gwt.dev.protobuf.ByteString) ref;
}
}
@@ -19215,7 +19215,7 @@
return true;
}
- public void writeTo(com.google.protobuf.CodedOutputStream output)
+ public void writeTo(com.google.gwt.dev.protobuf.CodedOutputStream output)
throws java.io.IOException {
getSerializedSize();
if (((bitField0_ & 0x00000001) == 0x00000001)) {
@@ -19246,27 +19246,27 @@
size = 0;
if (((bitField0_ & 0x00000001) == 0x00000001)) {
- size += com.google.protobuf.CodedOutputStream
+ size += com.google.gwt.dev.protobuf.CodedOutputStream
.computeBytesSize(1, getProtocolVersionBytes());
}
if (((bitField0_ & 0x00000002) == 0x00000002)) {
- size += com.google.protobuf.CodedOutputStream
+ size += com.google.gwt.dev.protobuf.CodedOutputStream
.computeEnumSize(2, messageType_.getNumber());
}
if (((bitField0_ & 0x00000004) == 0x00000004)) {
- size += com.google.protobuf.CodedOutputStream
+ size += com.google.gwt.dev.protobuf.CodedOutputStream
.computeUInt32Size(3, messageId_);
}
if (((bitField0_ & 0x00000008) == 0x00000008)) {
- size += com.google.protobuf.CodedOutputStream
+ size += com.google.gwt.dev.protobuf.CodedOutputStream
.computeMessageSize(4, request_);
}
if (((bitField0_ & 0x00000010) == 0x00000010)) {
- size += com.google.protobuf.CodedOutputStream
+ size += com.google.gwt.dev.protobuf.CodedOutputStream
.computeMessageSize(5, response_);
}
if (((bitField0_ & 0x00000020) == 0x00000020)) {
- size += com.google.protobuf.CodedOutputStream
+ size += com.google.gwt.dev.protobuf.CodedOutputStream
.computeMessageSize(6, failure_);
}
size += getUnknownFields().getSerializedSize();
@@ -19282,24 +19282,24 @@
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message parseFrom(
- com.google.protobuf.ByteString data)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.ByteString data)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message parseFrom(
- com.google.protobuf.ByteString data,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.ByteString data,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message parseFrom(byte[] data)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message parseFrom(
byte[] data,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.gwt.dev.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message parseFrom(java.io.InputStream input)
@@ -19308,7 +19308,7 @@
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message parseFrom(
java.io.InputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseFrom(input, extensionRegistry);
}
@@ -19318,18 +19318,18 @@
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message parseDelimitedFrom(
java.io.InputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseDelimitedFrom(input, extensionRegistry);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message parseFrom(
- com.google.protobuf.CodedInputStream input)
+ com.google.gwt.dev.protobuf.CodedInputStream input)
throws java.io.IOException {
return PARSER.parseFrom(input);
}
public static com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message parseFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseFrom(input, extensionRegistry);
}
@@ -19343,7 +19343,7 @@
@java.lang.Override
protected Builder newBuilderForType(
- com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+ com.google.gwt.dev.protobuf.GeneratedMessage.BuilderParent parent) {
Builder builder = new Builder(parent);
return builder;
}
@@ -19355,14 +19355,14 @@
* </pre>
*/
public static final class Builder extends
- com.google.protobuf.GeneratedMessage.Builder<Builder>
+ com.google.gwt.dev.protobuf.GeneratedMessage.Builder<Builder>
implements com.google.gwt.dev.shell.remoteui.RemoteMessageProto.MessageOrBuilder {
- public static final com.google.protobuf.Descriptors.Descriptor
+ public static final com.google.gwt.dev.protobuf.Descriptors.Descriptor
getDescriptor() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_descriptor;
}
- protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ protected com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_fieldAccessorTable
.ensureFieldAccessorsInitialized(
@@ -19375,12 +19375,12 @@
}
private Builder(
- com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+ com.google.gwt.dev.protobuf.GeneratedMessage.BuilderParent parent) {
super(parent);
maybeForceBuilderInitialization();
}
private void maybeForceBuilderInitialization() {
- if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+ if (com.google.gwt.dev.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
getRequestFieldBuilder();
getResponseFieldBuilder();
getFailureFieldBuilder();
@@ -19423,7 +19423,7 @@
return create().mergeFrom(buildPartial());
}
- public com.google.protobuf.Descriptors.Descriptor
+ public com.google.gwt.dev.protobuf.Descriptors.Descriptor
getDescriptorForType() {
return com.google.gwt.dev.shell.remoteui.RemoteMessageProto.internal_static_com_google_gwt_dev_shell_remoteui_Message_descriptor;
}
@@ -19485,7 +19485,7 @@
return result;
}
- public Builder mergeFrom(com.google.protobuf.Message other) {
+ public Builder mergeFrom(com.google.gwt.dev.protobuf.Message other) {
if (other instanceof com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message) {
return mergeFrom((com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message)other);
} else {
@@ -19541,13 +19541,13 @@
}
public Builder mergeFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ com.google.gwt.dev.protobuf.CodedInputStream input,
+ com.google.gwt.dev.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message parsedMessage = null;
try {
parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
- } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ } catch (com.google.gwt.dev.protobuf.InvalidProtocolBufferException e) {
parsedMessage = (com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message) e.getUnfinishedMessage();
throw e;
} finally {
@@ -19583,7 +19583,7 @@
public java.lang.String getProtocolVersion() {
java.lang.Object ref = protocolVersion_;
if (!(ref instanceof java.lang.String)) {
- java.lang.String s = ((com.google.protobuf.ByteString) ref)
+ java.lang.String s = ((com.google.gwt.dev.protobuf.ByteString) ref)
.toStringUtf8();
protocolVersion_ = s;
return s;
@@ -19599,17 +19599,17 @@
* we can make use of it to detect protocol incompatibilities
* </pre>
*/
- public com.google.protobuf.ByteString
+ public com.google.gwt.dev.protobuf.ByteString
getProtocolVersionBytes() {
java.lang.Object ref = protocolVersion_;
if (ref instanceof String) {
- com.google.protobuf.ByteString b =
- com.google.protobuf.ByteString.copyFromUtf8(
+ com.google.gwt.dev.protobuf.ByteString b =
+ com.google.gwt.dev.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref);
protocolVersion_ = b;
return b;
} else {
- return (com.google.protobuf.ByteString) ref;
+ return (com.google.gwt.dev.protobuf.ByteString) ref;
}
}
/**
@@ -19653,7 +19653,7 @@
* </pre>
*/
public Builder setProtocolVersionBytes(
- com.google.protobuf.ByteString value) {
+ com.google.gwt.dev.protobuf.ByteString value) {
if (value == null) {
throw new NullPointerException();
}
@@ -19734,7 +19734,7 @@
// optional .com.google.gwt.dev.shell.remoteui.Message.Request request = 4;
private com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request request_ = com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.getDefaultInstance();
- private com.google.protobuf.SingleFieldBuilder<
+ private com.google.gwt.dev.protobuf.SingleFieldBuilder<
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.Builder, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.RequestOrBuilder> requestBuilder_;
/**
* <code>optional .com.google.gwt.dev.shell.remoteui.Message.Request request = 4;</code>
@@ -19835,11 +19835,11 @@
/**
* <code>optional .com.google.gwt.dev.shell.remoteui.Message.Request request = 4;</code>
*/
- private com.google.protobuf.SingleFieldBuilder<
+ private com.google.gwt.dev.protobuf.SingleFieldBuilder<
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.Builder, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.RequestOrBuilder>
getRequestFieldBuilder() {
if (requestBuilder_ == null) {
- requestBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+ requestBuilder_ = new com.google.gwt.dev.protobuf.SingleFieldBuilder<
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.Builder, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.RequestOrBuilder>(
request_,
getParentForChildren(),
@@ -19851,7 +19851,7 @@
// optional .com.google.gwt.dev.shell.remoteui.Message.Response response = 5;
private com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response response_ = com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.getDefaultInstance();
- private com.google.protobuf.SingleFieldBuilder<
+ private com.google.gwt.dev.protobuf.SingleFieldBuilder<
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.Builder, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.ResponseOrBuilder> responseBuilder_;
/**
* <code>optional .com.google.gwt.dev.shell.remoteui.Message.Response response = 5;</code>
@@ -19952,11 +19952,11 @@
/**
* <code>optional .com.google.gwt.dev.shell.remoteui.Message.Response response = 5;</code>
*/
- private com.google.protobuf.SingleFieldBuilder<
+ private com.google.gwt.dev.protobuf.SingleFieldBuilder<
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.Builder, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.ResponseOrBuilder>
getResponseFieldBuilder() {
if (responseBuilder_ == null) {
- responseBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+ responseBuilder_ = new com.google.gwt.dev.protobuf.SingleFieldBuilder<
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.Builder, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.ResponseOrBuilder>(
response_,
getParentForChildren(),
@@ -19968,7 +19968,7 @@
// optional .com.google.gwt.dev.shell.remoteui.Message.Failure failure = 6;
private com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Failure failure_ = com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Failure.getDefaultInstance();
- private com.google.protobuf.SingleFieldBuilder<
+ private com.google.gwt.dev.protobuf.SingleFieldBuilder<
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Failure, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Failure.Builder, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.FailureOrBuilder> failureBuilder_;
/**
* <code>optional .com.google.gwt.dev.shell.remoteui.Message.Failure failure = 6;</code>
@@ -20069,11 +20069,11 @@
/**
* <code>optional .com.google.gwt.dev.shell.remoteui.Message.Failure failure = 6;</code>
*/
- private com.google.protobuf.SingleFieldBuilder<
+ private com.google.gwt.dev.protobuf.SingleFieldBuilder<
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Failure, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Failure.Builder, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.FailureOrBuilder>
getFailureFieldBuilder() {
if (failureBuilder_ == null) {
- failureBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+ failureBuilder_ = new com.google.gwt.dev.protobuf.SingleFieldBuilder<
com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Failure, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Failure.Builder, com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.FailureOrBuilder>(
failure_,
getParentForChildren(),
@@ -20094,152 +20094,152 @@
// @@protoc_insertion_point(class_scope:com.google.gwt.dev.shell.remoteui.Message)
}
- private static com.google.protobuf.Descriptors.Descriptor
+ private static com.google.gwt.dev.protobuf.Descriptors.Descriptor
internal_static_com_google_gwt_dev_shell_remoteui_Message_descriptor;
private static
- com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_com_google_gwt_dev_shell_remoteui_Message_fieldAccessorTable;
- private static com.google.protobuf.Descriptors.Descriptor
+ private static com.google.gwt.dev.protobuf.Descriptors.Descriptor
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_descriptor;
private static
- com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_fieldAccessorTable;
- private static com.google.protobuf.Descriptors.Descriptor
+ private static com.google.gwt.dev.protobuf.Descriptors.Descriptor
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_descriptor;
private static
- com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_fieldAccessorTable;
- private static com.google.protobuf.Descriptors.Descriptor
+ private static com.google.gwt.dev.protobuf.Descriptors.Descriptor
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_CapabilityExchange_descriptor;
private static
- com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_CapabilityExchange_fieldAccessorTable;
- private static com.google.protobuf.Descriptors.Descriptor
+ private static com.google.gwt.dev.protobuf.Descriptors.Descriptor
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_AddLog_descriptor;
private static
- com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_AddLog_fieldAccessorTable;
- private static com.google.protobuf.Descriptors.Descriptor
+ private static com.google.gwt.dev.protobuf.Descriptors.Descriptor
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_AddLog_ModuleLog_descriptor;
private static
- com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_AddLog_ModuleLog_fieldAccessorTable;
- private static com.google.protobuf.Descriptors.Descriptor
+ private static com.google.gwt.dev.protobuf.Descriptors.Descriptor
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_AddLog_ServerLog_descriptor;
private static
- com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_AddLog_ServerLog_fieldAccessorTable;
- private static com.google.protobuf.Descriptors.Descriptor
+ private static com.google.gwt.dev.protobuf.Descriptors.Descriptor
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_AddLog_MainLog_descriptor;
private static
- com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_AddLog_MainLog_fieldAccessorTable;
- private static com.google.protobuf.Descriptors.Descriptor
+ private static com.google.gwt.dev.protobuf.Descriptors.Descriptor
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_LogData_descriptor;
private static
- com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_LogData_fieldAccessorTable;
- private static com.google.protobuf.Descriptors.Descriptor
+ private static com.google.gwt.dev.protobuf.Descriptors.Descriptor
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_LogData_HelpInfo_descriptor;
private static
- com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_LogData_HelpInfo_fieldAccessorTable;
- private static com.google.protobuf.Descriptors.Descriptor
+ private static com.google.gwt.dev.protobuf.Descriptors.Descriptor
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_AddLogBranch_descriptor;
private static
- com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_AddLogBranch_fieldAccessorTable;
- private static com.google.protobuf.Descriptors.Descriptor
+ private static com.google.gwt.dev.protobuf.Descriptors.Descriptor
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_AddLogEntry_descriptor;
private static
- com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_AddLogEntry_fieldAccessorTable;
- private static com.google.protobuf.Descriptors.Descriptor
+ private static com.google.gwt.dev.protobuf.Descriptors.Descriptor
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_DisconnectLog_descriptor;
private static
- com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_DisconnectLog_fieldAccessorTable;
- private static com.google.protobuf.Descriptors.Descriptor
+ private static com.google.gwt.dev.protobuf.Descriptors.Descriptor
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_Initialize_descriptor;
private static
- com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_Initialize_fieldAccessorTable;
- private static com.google.protobuf.Descriptors.Descriptor
+ private static com.google.gwt.dev.protobuf.Descriptors.Descriptor
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_DevModeRequest_descriptor;
private static
- com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_DevModeRequest_fieldAccessorTable;
- private static com.google.protobuf.Descriptors.Descriptor
+ private static com.google.gwt.dev.protobuf.Descriptors.Descriptor
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_DevModeRequest_CapabilityExchange_descriptor;
private static
- com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_DevModeRequest_CapabilityExchange_fieldAccessorTable;
- private static com.google.protobuf.Descriptors.Descriptor
+ private static com.google.gwt.dev.protobuf.Descriptors.Descriptor
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_DevModeRequest_RestartWebServer_descriptor;
private static
- com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_DevModeRequest_RestartWebServer_fieldAccessorTable;
- private static com.google.protobuf.Descriptors.Descriptor
+ private static com.google.gwt.dev.protobuf.Descriptors.Descriptor
internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_descriptor;
private static
- com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_fieldAccessorTable;
- private static com.google.protobuf.Descriptors.Descriptor
+ private static com.google.gwt.dev.protobuf.Descriptors.Descriptor
internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_ViewerResponse_descriptor;
private static
- com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_ViewerResponse_fieldAccessorTable;
- private static com.google.protobuf.Descriptors.Descriptor
+ private static com.google.gwt.dev.protobuf.Descriptors.Descriptor
internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_ViewerResponse_CapabilityExchange_descriptor;
private static
- com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_ViewerResponse_CapabilityExchange_fieldAccessorTable;
- private static com.google.protobuf.Descriptors.Descriptor
+ private static com.google.gwt.dev.protobuf.Descriptors.Descriptor
internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_ViewerResponse_CapabilityExchange_Capability_descriptor;
private static
- com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_ViewerResponse_CapabilityExchange_Capability_fieldAccessorTable;
- private static com.google.protobuf.Descriptors.Descriptor
+ private static com.google.gwt.dev.protobuf.Descriptors.Descriptor
internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_ViewerResponse_AddLog_descriptor;
private static
- com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_ViewerResponse_AddLog_fieldAccessorTable;
- private static com.google.protobuf.Descriptors.Descriptor
+ private static com.google.gwt.dev.protobuf.Descriptors.Descriptor
internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_ViewerResponse_AddLogBranch_descriptor;
private static
- com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_ViewerResponse_AddLogBranch_fieldAccessorTable;
- private static com.google.protobuf.Descriptors.Descriptor
+ private static com.google.gwt.dev.protobuf.Descriptors.Descriptor
internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_DevModeResponse_descriptor;
private static
- com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_DevModeResponse_fieldAccessorTable;
- private static com.google.protobuf.Descriptors.Descriptor
+ private static com.google.gwt.dev.protobuf.Descriptors.Descriptor
internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_DevModeResponse_CapabilityExchange_descriptor;
private static
- com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_DevModeResponse_CapabilityExchange_fieldAccessorTable;
- private static com.google.protobuf.Descriptors.Descriptor
+ private static com.google.gwt.dev.protobuf.Descriptors.Descriptor
internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_DevModeResponse_CapabilityExchange_Capability_descriptor;
private static
- com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_DevModeResponse_CapabilityExchange_Capability_fieldAccessorTable;
- private static com.google.protobuf.Descriptors.Descriptor
+ private static com.google.gwt.dev.protobuf.Descriptors.Descriptor
internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_DevModeResponse_RestartWebServer_descriptor;
private static
- com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_DevModeResponse_RestartWebServer_fieldAccessorTable;
- private static com.google.protobuf.Descriptors.Descriptor
+ private static com.google.gwt.dev.protobuf.Descriptors.Descriptor
internal_static_com_google_gwt_dev_shell_remoteui_Message_Failure_descriptor;
private static
- com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_com_google_gwt_dev_shell_remoteui_Message_Failure_fieldAccessorTable;
- public static com.google.protobuf.Descriptors.FileDescriptor
+ public static com.google.gwt.dev.protobuf.Descriptors.FileDescriptor
getDescriptor() {
return descriptor;
}
- private static com.google.protobuf.Descriptors.FileDescriptor
+ private static com.google.gwt.dev.protobuf.Descriptors.FileDescriptor
descriptor;
static {
java.lang.String[] descriptorData = {
@@ -20373,185 +20373,185 @@
"\000\022\014\n\010RESPONSE\020\001\022\013\n\007FAILURE\020\002B\024B\022RemoteMe" +
"ssageProto"
};
- com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
- new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
- public com.google.protobuf.ExtensionRegistry assignDescriptors(
- com.google.protobuf.Descriptors.FileDescriptor root) {
+ com.google.gwt.dev.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
+ new com.google.gwt.dev.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
+ public com.google.gwt.dev.protobuf.ExtensionRegistry assignDescriptors(
+ com.google.gwt.dev.protobuf.Descriptors.FileDescriptor root) {
descriptor = root;
internal_static_com_google_gwt_dev_shell_remoteui_Message_descriptor =
getDescriptor().getMessageTypes().get(0);
internal_static_com_google_gwt_dev_shell_remoteui_Message_fieldAccessorTable = new
- com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+ com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_com_google_gwt_dev_shell_remoteui_Message_descriptor,
new java.lang.String[] { "ProtocolVersion", "MessageType", "MessageId", "Request", "Response", "Failure", });
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_descriptor =
internal_static_com_google_gwt_dev_shell_remoteui_Message_descriptor.getNestedTypes().get(0);
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_fieldAccessorTable = new
- com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+ com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_descriptor,
new java.lang.String[] { "ServiceType", "ViewerRequest", "DevModeRequest", });
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_descriptor =
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_descriptor.getNestedTypes().get(0);
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_fieldAccessorTable = new
- com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+ com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_descriptor,
new java.lang.String[] { "RequestType", "CapabilityExchange", "AddLog", "AddLogBranch", "AddLogEntry", "DisconnectLog", "Initialize", });
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_CapabilityExchange_descriptor =
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_descriptor.getNestedTypes().get(0);
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_CapabilityExchange_fieldAccessorTable = new
- com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+ com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_CapabilityExchange_descriptor,
new java.lang.String[] { });
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_AddLog_descriptor =
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_descriptor.getNestedTypes().get(1);
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_AddLog_fieldAccessorTable = new
- com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+ com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_AddLog_descriptor,
new java.lang.String[] { "Type", "ModuleLog", "ServerLog", "MainLog", });
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_AddLog_ModuleLog_descriptor =
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_AddLog_descriptor.getNestedTypes().get(0);
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_AddLog_ModuleLog_fieldAccessorTable = new
- com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+ com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_AddLog_ModuleLog_descriptor,
new java.lang.String[] { "Name", "Icon", "SessionKey", "UserAgent", "Url", "TabKey", "RemoteHost", });
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_AddLog_ServerLog_descriptor =
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_AddLog_descriptor.getNestedTypes().get(1);
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_AddLog_ServerLog_fieldAccessorTable = new
- com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+ com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_AddLog_ServerLog_descriptor,
new java.lang.String[] { "Name", "Icon", });
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_AddLog_MainLog_descriptor =
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_AddLog_descriptor.getNestedTypes().get(2);
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_AddLog_MainLog_fieldAccessorTable = new
- com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+ com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_AddLog_MainLog_descriptor,
new java.lang.String[] { });
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_LogData_descriptor =
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_descriptor.getNestedTypes().get(2);
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_LogData_fieldAccessorTable = new
- com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+ com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_LogData_descriptor,
new java.lang.String[] { "Summary", "Level", "NeedsAttention", "Details", "HelpInfo", });
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_LogData_HelpInfo_descriptor =
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_LogData_descriptor.getNestedTypes().get(0);
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_LogData_HelpInfo_fieldAccessorTable = new
- com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+ com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_LogData_HelpInfo_descriptor,
new java.lang.String[] { "Url", "Text", });
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_AddLogBranch_descriptor =
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_descriptor.getNestedTypes().get(3);
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_AddLogBranch_fieldAccessorTable = new
- com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+ com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_AddLogBranch_descriptor,
new java.lang.String[] { "ParentLogHandle", "IndexInParent", "LogData", });
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_AddLogEntry_descriptor =
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_descriptor.getNestedTypes().get(4);
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_AddLogEntry_fieldAccessorTable = new
- com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+ com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_AddLogEntry_descriptor,
new java.lang.String[] { "LogHandle", "IndexInLog", "LogData", });
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_DisconnectLog_descriptor =
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_descriptor.getNestedTypes().get(5);
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_DisconnectLog_fieldAccessorTable = new
- com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+ com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_DisconnectLog_descriptor,
new java.lang.String[] { "LogHandle", });
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_Initialize_descriptor =
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_descriptor.getNestedTypes().get(6);
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_Initialize_fieldAccessorTable = new
- com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+ com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_ViewerRequest_Initialize_descriptor,
new java.lang.String[] { "ClientId", "StartupURLs", });
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_DevModeRequest_descriptor =
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_descriptor.getNestedTypes().get(1);
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_DevModeRequest_fieldAccessorTable = new
- com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+ com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_DevModeRequest_descriptor,
new java.lang.String[] { "RequestType", "CapabilityExchange", "RestartWebServer", });
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_DevModeRequest_CapabilityExchange_descriptor =
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_DevModeRequest_descriptor.getNestedTypes().get(0);
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_DevModeRequest_CapabilityExchange_fieldAccessorTable = new
- com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+ com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_DevModeRequest_CapabilityExchange_descriptor,
new java.lang.String[] { });
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_DevModeRequest_RestartWebServer_descriptor =
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_DevModeRequest_descriptor.getNestedTypes().get(1);
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_DevModeRequest_RestartWebServer_fieldAccessorTable = new
- com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+ com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_com_google_gwt_dev_shell_remoteui_Message_Request_DevModeRequest_RestartWebServer_descriptor,
new java.lang.String[] { });
internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_descriptor =
internal_static_com_google_gwt_dev_shell_remoteui_Message_descriptor.getNestedTypes().get(1);
internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_fieldAccessorTable = new
- com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+ com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_descriptor,
new java.lang.String[] { "ViewerResponse", "DevModeResponse", });
internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_ViewerResponse_descriptor =
internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_descriptor.getNestedTypes().get(0);
internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_ViewerResponse_fieldAccessorTable = new
- com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+ com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_ViewerResponse_descriptor,
new java.lang.String[] { "ResponseType", "CapabilityExchange", "AddLog", "AddLogBranch", });
internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_ViewerResponse_CapabilityExchange_descriptor =
internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_ViewerResponse_descriptor.getNestedTypes().get(0);
internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_ViewerResponse_CapabilityExchange_fieldAccessorTable = new
- com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+ com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_ViewerResponse_CapabilityExchange_descriptor,
new java.lang.String[] { "Capabilities", });
internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_ViewerResponse_CapabilityExchange_Capability_descriptor =
internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_ViewerResponse_CapabilityExchange_descriptor.getNestedTypes().get(0);
internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_ViewerResponse_CapabilityExchange_Capability_fieldAccessorTable = new
- com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+ com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_ViewerResponse_CapabilityExchange_Capability_descriptor,
new java.lang.String[] { "Capability", });
internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_ViewerResponse_AddLog_descriptor =
internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_ViewerResponse_descriptor.getNestedTypes().get(1);
internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_ViewerResponse_AddLog_fieldAccessorTable = new
- com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+ com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_ViewerResponse_AddLog_descriptor,
new java.lang.String[] { "LogHandle", });
internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_ViewerResponse_AddLogBranch_descriptor =
internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_ViewerResponse_descriptor.getNestedTypes().get(2);
internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_ViewerResponse_AddLogBranch_fieldAccessorTable = new
- com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+ com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_ViewerResponse_AddLogBranch_descriptor,
new java.lang.String[] { "LogHandle", });
internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_DevModeResponse_descriptor =
internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_descriptor.getNestedTypes().get(1);
internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_DevModeResponse_fieldAccessorTable = new
- com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+ com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_DevModeResponse_descriptor,
new java.lang.String[] { "ResponseType", "CapabilityExchange", "RestartWebServer", });
internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_DevModeResponse_CapabilityExchange_descriptor =
internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_DevModeResponse_descriptor.getNestedTypes().get(0);
internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_DevModeResponse_CapabilityExchange_fieldAccessorTable = new
- com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+ com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_DevModeResponse_CapabilityExchange_descriptor,
new java.lang.String[] { "Capabilities", });
internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_DevModeResponse_CapabilityExchange_Capability_descriptor =
internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_DevModeResponse_CapabilityExchange_descriptor.getNestedTypes().get(0);
internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_DevModeResponse_CapabilityExchange_Capability_fieldAccessorTable = new
- com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+ com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_DevModeResponse_CapabilityExchange_Capability_descriptor,
new java.lang.String[] { "Capability", });
internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_DevModeResponse_RestartWebServer_descriptor =
internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_DevModeResponse_descriptor.getNestedTypes().get(1);
internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_DevModeResponse_RestartWebServer_fieldAccessorTable = new
- com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+ com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_com_google_gwt_dev_shell_remoteui_Message_Response_DevModeResponse_RestartWebServer_descriptor,
new java.lang.String[] { });
internal_static_com_google_gwt_dev_shell_remoteui_Message_Failure_descriptor =
internal_static_com_google_gwt_dev_shell_remoteui_Message_descriptor.getNestedTypes().get(2);
internal_static_com_google_gwt_dev_shell_remoteui_Message_Failure_fieldAccessorTable = new
- com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+ com.google.gwt.dev.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_com_google_gwt_dev_shell_remoteui_Message_Failure_descriptor,
new java.lang.String[] { "Message", "StackTrace", });
return null;
}
};
- com.google.protobuf.Descriptors.FileDescriptor
+ com.google.gwt.dev.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
- new com.google.protobuf.Descriptors.FileDescriptor[] {
+ new com.google.gwt.dev.protobuf.Descriptors.FileDescriptor[] {
}, assigner);
}
diff --git a/dev/core/src/com/google/gwt/dev/shell/remoteui/ViewerServiceClient.java b/dev/core/src/com/google/gwt/dev/shell/remoteui/ViewerServiceClient.java
index d43dba8..52140a5 100644
--- a/dev/core/src/com/google/gwt/dev/shell/remoteui/ViewerServiceClient.java
+++ b/dev/core/src/com/google/gwt/dev/shell/remoteui/ViewerServiceClient.java
@@ -18,6 +18,7 @@
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.core.ext.TreeLogger.HelpInfo;
import com.google.gwt.core.ext.TreeLogger.Type;
+import com.google.gwt.dev.protobuf.ByteString;
import com.google.gwt.dev.shell.remoteui.MessageTransport.RequestException;
import com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request;
import com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Request.ViewerRequest;
@@ -28,7 +29,6 @@
import com.google.gwt.dev.shell.remoteui.RemoteMessageProto.Message.Response.ViewerResponse.CapabilityExchange.Capability;
import com.google.gwt.dev.util.Callback;
import com.google.gwt.dev.util.log.AbstractTreeLogger;
-import com.google.protobuf.ByteString;
import java.util.List;
import java.util.concurrent.ExecutionException;
diff --git a/dev/core/src/com/google/gwt/dev/url/CloseableJarHandler.java b/dev/core/src/com/google/gwt/dev/url/CloseableJarHandler.java
index 55cc9c6..095c0cb 100644
--- a/dev/core/src/com/google/gwt/dev/url/CloseableJarHandler.java
+++ b/dev/core/src/com/google/gwt/dev/url/CloseableJarHandler.java
@@ -13,8 +13,8 @@
*/
package com.google.gwt.dev.url;
-import com.google.common.collect.HashMultimap;
-import com.google.common.collect.Multimap;
+import com.google.gwt.thirdparty.guava.common.collect.HashMultimap;
+import com.google.gwt.thirdparty.guava.common.collect.Multimap;
import java.io.IOException;
import java.io.InputStream;
diff --git a/dev/core/src/com/google/gwt/dev/util/CollapsedPropertyKey.java b/dev/core/src/com/google/gwt/dev/util/CollapsedPropertyKey.java
index 32f7052..e02107a 100644
--- a/dev/core/src/com/google/gwt/dev/util/CollapsedPropertyKey.java
+++ b/dev/core/src/com/google/gwt/dev/util/CollapsedPropertyKey.java
@@ -15,10 +15,10 @@
*/
package com.google.gwt.dev.util;
-import com.google.common.collect.ImmutableList;
import com.google.gwt.dev.Permutation;
import com.google.gwt.dev.cfg.BindingProperty;
import com.google.gwt.dev.cfg.BindingProps;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableList;
import java.util.Arrays;
import java.util.List;
diff --git a/dev/core/src/com/google/gwt/dev/util/CompilerVersion.java b/dev/core/src/com/google/gwt/dev/util/CompilerVersion.java
index e941312..027810a 100644
--- a/dev/core/src/com/google/gwt/dev/util/CompilerVersion.java
+++ b/dev/core/src/com/google/gwt/dev/util/CompilerVersion.java
@@ -13,9 +13,9 @@
*/
package com.google.gwt.dev.util;
-import com.google.common.hash.Hashing;
-import com.google.common.io.Files;
import com.google.gwt.dev.jjs.ast.JNode;
+import com.google.gwt.thirdparty.guava.common.hash.Hashing;
+import com.google.gwt.thirdparty.guava.common.io.Files;
import com.google.gwt.util.tools.shared.Md5Utils;
import com.google.gwt.util.tools.shared.StringUtils;
diff --git a/dev/core/src/com/google/gwt/dev/util/DiskCachingUtil.java b/dev/core/src/com/google/gwt/dev/util/DiskCachingUtil.java
index 0d66abe..a4b3191 100644
--- a/dev/core/src/com/google/gwt/dev/util/DiskCachingUtil.java
+++ b/dev/core/src/com/google/gwt/dev/util/DiskCachingUtil.java
@@ -13,8 +13,8 @@
*/
package com.google.gwt.dev.util;
-import com.google.common.base.Joiner;
import com.google.gwt.core.ext.TreeLogger;
+import com.google.gwt.thirdparty.guava.common.base.Joiner;
import com.google.gwt.util.tools.shared.Md5Utils;
import com.google.gwt.util.tools.shared.StringUtils;
diff --git a/dev/core/src/com/google/gwt/dev/util/FileBackedObject.java b/dev/core/src/com/google/gwt/dev/util/FileBackedObject.java
index 2b4a5af..d1133d2 100644
--- a/dev/core/src/com/google/gwt/dev/util/FileBackedObject.java
+++ b/dev/core/src/com/google/gwt/dev/util/FileBackedObject.java
@@ -15,9 +15,9 @@
*/
package com.google.gwt.dev.util;
-import com.google.common.base.Preconditions;
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.core.ext.UnableToCompleteException;
+import com.google.gwt.thirdparty.guava.common.base.Preconditions;
import java.io.File;
import java.io.IOException;
diff --git a/dev/core/src/com/google/gwt/dev/util/JsniRef.java b/dev/core/src/com/google/gwt/dev/util/JsniRef.java
index 7997dd6..66868cb 100644
--- a/dev/core/src/com/google/gwt/dev/util/JsniRef.java
+++ b/dev/core/src/com/google/gwt/dev/util/JsniRef.java
@@ -15,9 +15,9 @@
*/
package com.google.gwt.dev.util;
-import com.google.common.base.Strings;
-import com.google.common.collect.Lists;
import com.google.gwt.core.ext.typeinfo.JniConstants;
+import com.google.gwt.thirdparty.guava.common.base.Strings;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
import java.util.List;
import java.util.regex.Matcher;
diff --git a/dev/core/src/com/google/gwt/dev/util/MemoryBackedObject.java b/dev/core/src/com/google/gwt/dev/util/MemoryBackedObject.java
index 46f995a..dec2a41 100644
--- a/dev/core/src/com/google/gwt/dev/util/MemoryBackedObject.java
+++ b/dev/core/src/com/google/gwt/dev/util/MemoryBackedObject.java
@@ -15,9 +15,9 @@
*/
package com.google.gwt.dev.util;
-import com.google.common.base.Preconditions;
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.core.ext.UnableToCompleteException;
+import com.google.gwt.thirdparty.guava.common.base.Preconditions;
import java.io.Serializable;
diff --git a/dev/core/src/com/google/gwt/dev/util/PerfCounter.java b/dev/core/src/com/google/gwt/dev/util/PerfCounter.java
index 639d88f..183e1f0 100644
--- a/dev/core/src/com/google/gwt/dev/util/PerfCounter.java
+++ b/dev/core/src/com/google/gwt/dev/util/PerfCounter.java
@@ -15,7 +15,7 @@
*/
package com.google.gwt.dev.util;
-import com.google.common.base.Preconditions;
+import com.google.gwt.thirdparty.guava.common.base.Preconditions;
import java.util.ArrayList;
import java.util.Collections;
diff --git a/dev/core/src/com/google/gwt/dev/util/StringInterner.java b/dev/core/src/com/google/gwt/dev/util/StringInterner.java
index d6a8086..371f4fa 100644
--- a/dev/core/src/com/google/gwt/dev/util/StringInterner.java
+++ b/dev/core/src/com/google/gwt/dev/util/StringInterner.java
@@ -16,8 +16,8 @@
package com.google.gwt.dev.util;
-import com.google.common.collect.Interner;
-import com.google.common.collect.Interners;
+import com.google.gwt.thirdparty.guava.common.collect.Interner;
+import com.google.gwt.thirdparty.guava.common.collect.Interners;
/**
* The string interner singleton.
*
diff --git a/dev/core/src/com/google/gwt/dev/util/arg/ArgHandlerSetProperties.java b/dev/core/src/com/google/gwt/dev/util/arg/ArgHandlerSetProperties.java
index 204cb5e..3f8bb1f 100644
--- a/dev/core/src/com/google/gwt/dev/util/arg/ArgHandlerSetProperties.java
+++ b/dev/core/src/com/google/gwt/dev/util/arg/ArgHandlerSetProperties.java
@@ -13,7 +13,7 @@
*/
package com.google.gwt.dev.util.arg;
-import com.google.common.base.Splitter;
+import com.google.gwt.thirdparty.guava.common.base.Splitter;
import com.google.gwt.util.tools.ArgHandlerString;
import java.util.List;
diff --git a/dev/core/src/com/google/gwt/dev/util/arg/ArgHandlerSourceLevel.java b/dev/core/src/com/google/gwt/dev/util/arg/ArgHandlerSourceLevel.java
index 75864d7..ed28dbf 100644
--- a/dev/core/src/com/google/gwt/dev/util/arg/ArgHandlerSourceLevel.java
+++ b/dev/core/src/com/google/gwt/dev/util/arg/ArgHandlerSourceLevel.java
@@ -15,7 +15,7 @@
*/
package com.google.gwt.dev.util.arg;
-import com.google.common.base.Joiner;
+import com.google.gwt.thirdparty.guava.common.base.Joiner;
import com.google.gwt.util.tools.ArgHandlerString;
/**
diff --git a/dev/core/src/com/google/gwt/dev/util/arg/OptionSetProperties.java b/dev/core/src/com/google/gwt/dev/util/arg/OptionSetProperties.java
index 9e725da..4ef915e 100644
--- a/dev/core/src/com/google/gwt/dev/util/arg/OptionSetProperties.java
+++ b/dev/core/src/com/google/gwt/dev/util/arg/OptionSetProperties.java
@@ -13,7 +13,7 @@
*/
package com.google.gwt.dev.util.arg;
-import com.google.common.collect.ListMultimap;
+import com.google.gwt.thirdparty.guava.common.collect.ListMultimap;
/**
* Option to set property values.
diff --git a/dev/core/src/com/google/gwt/dev/util/arg/SourceLevel.java b/dev/core/src/com/google/gwt/dev/util/arg/SourceLevel.java
index 9f83a78..14d2188 100644
--- a/dev/core/src/com/google/gwt/dev/util/arg/SourceLevel.java
+++ b/dev/core/src/com/google/gwt/dev/util/arg/SourceLevel.java
@@ -15,7 +15,7 @@
*/
package com.google.gwt.dev.util.arg;
-import com.google.common.annotations.VisibleForTesting;
+import com.google.gwt.thirdparty.guava.common.annotations.VisibleForTesting;
import com.google.gwt.util.tools.Utility;
/**
diff --git a/dev/core/src/com/google/gwt/dev/util/collect/Stack.java b/dev/core/src/com/google/gwt/dev/util/collect/Stack.java
index 6dc3cc2..53077af 100644
--- a/dev/core/src/com/google/gwt/dev/util/collect/Stack.java
+++ b/dev/core/src/com/google/gwt/dev/util/collect/Stack.java
@@ -15,7 +15,7 @@
*/
package com.google.gwt.dev.util.collect;
-import com.google.common.collect.Lists;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
import java.util.ArrayList;
import java.util.Iterator;
diff --git a/dev/core/src/com/google/gwt/dev/util/log/MetricMap.java b/dev/core/src/com/google/gwt/dev/util/log/MetricMap.java
index 1f96e62..a5c4118 100644
--- a/dev/core/src/com/google/gwt/dev/util/log/MetricMap.java
+++ b/dev/core/src/com/google/gwt/dev/util/log/MetricMap.java
@@ -15,8 +15,8 @@
*/
package com.google.gwt.dev.util.log;
-import com.google.common.collect.ImmutableSortedMap;
import com.google.gwt.dev.util.collect.HashMap;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableSortedMap;
import java.util.Map;
diff --git a/dev/core/src/com/google/gwt/dev/util/log/MetricName.java b/dev/core/src/com/google/gwt/dev/util/log/MetricName.java
index 9c5042c..0808afe 100644
--- a/dev/core/src/com/google/gwt/dev/util/log/MetricName.java
+++ b/dev/core/src/com/google/gwt/dev/util/log/MetricName.java
@@ -15,9 +15,9 @@
*/
package com.google.gwt.dev.util.log;
-import com.google.common.base.Preconditions;
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.core.ext.TreeLogger.Type;
+import com.google.gwt.thirdparty.guava.common.base.Preconditions;
import java.util.regex.Pattern;
diff --git a/dev/core/src/com/google/gwt/soyc/MakeTopLevelHtmlForPerm.java b/dev/core/src/com/google/gwt/soyc/MakeTopLevelHtmlForPerm.java
index bb7477c..166bb01 100644
--- a/dev/core/src/com/google/gwt/soyc/MakeTopLevelHtmlForPerm.java
+++ b/dev/core/src/com/google/gwt/soyc/MakeTopLevelHtmlForPerm.java
@@ -16,7 +16,6 @@
package com.google.gwt.soyc;
-import com.google.common.base.Joiner;
import com.google.gwt.core.ext.linker.CompilationMetricsArtifact;
import com.google.gwt.core.ext.linker.ModuleMetricsArtifact;
import com.google.gwt.core.ext.linker.PrecompilationMetricsArtifact;
@@ -25,6 +24,7 @@
import com.google.gwt.dev.util.collect.Lists;
import com.google.gwt.dev.util.collect.Sets;
import com.google.gwt.soyc.io.OutputDirectory;
+import com.google.gwt.thirdparty.guava.common.base.Joiner;
import java.io.IOException;
import java.io.OutputStream;
diff --git a/dev/core/src/com/google/gwt/util/tools/ArgHandlerEnum.java b/dev/core/src/com/google/gwt/util/tools/ArgHandlerEnum.java
index aa0adbd..f652d87 100644
--- a/dev/core/src/com/google/gwt/util/tools/ArgHandlerEnum.java
+++ b/dev/core/src/com/google/gwt/util/tools/ArgHandlerEnum.java
@@ -15,14 +15,14 @@
*/
package com.google.gwt.util.tools;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static com.google.gwt.thirdparty.guava.common.base.Preconditions.checkNotNull;
-import com.google.common.base.Ascii;
-import com.google.common.base.Enums;
-import com.google.common.base.Joiner;
-import com.google.common.base.Preconditions;
-import com.google.common.base.Predicate;
-import com.google.common.collect.FluentIterable;
+import com.google.gwt.thirdparty.guava.common.base.Ascii;
+import com.google.gwt.thirdparty.guava.common.base.Enums;
+import com.google.gwt.thirdparty.guava.common.base.Joiner;
+import com.google.gwt.thirdparty.guava.common.base.Preconditions;
+import com.google.gwt.thirdparty.guava.common.base.Predicate;
+import com.google.gwt.thirdparty.guava.common.collect.FluentIterable;
import java.util.Arrays;
import java.util.List;
diff --git a/dev/core/src/com/google/gwt/util/tools/ArgHandlerNoopDeprecatedFlag.java b/dev/core/src/com/google/gwt/util/tools/ArgHandlerNoopDeprecatedFlag.java
index be0af36..3c52bd1 100644
--- a/dev/core/src/com/google/gwt/util/tools/ArgHandlerNoopDeprecatedFlag.java
+++ b/dev/core/src/com/google/gwt/util/tools/ArgHandlerNoopDeprecatedFlag.java
@@ -15,7 +15,7 @@
*/
package com.google.gwt.util.tools;
-import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.gwt.thirdparty.guava.common.base.Preconditions.checkArgument;
/**
* Argument handler for deprecated no-op flags.
diff --git a/dev/core/test/com/google/gwt/core/ext/linker/SourceMapTest.java b/dev/core/test/com/google/gwt/core/ext/linker/SourceMapTest.java
index b7f84ff..c820112 100644
--- a/dev/core/test/com/google/gwt/core/ext/linker/SourceMapTest.java
+++ b/dev/core/test/com/google/gwt/core/ext/linker/SourceMapTest.java
@@ -15,13 +15,6 @@
*/
package com.google.gwt.core.ext.linker;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
-import com.google.common.primitives.Ints;
-import com.google.debugging.sourcemap.FilePosition;
-import com.google.debugging.sourcemap.SourceMapConsumerV3;
-import com.google.gson.JsonPrimitive;
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.core.ext.soyc.coderef.ClassDescriptor;
import com.google.gwt.core.ext.soyc.coderef.EntityDescriptor;
@@ -32,6 +25,12 @@
import com.google.gwt.dev.CompilerOptionsImpl;
import com.google.gwt.dev.util.Util;
import com.google.gwt.dev.util.log.PrintWriterTreeLogger;
+import com.google.gwt.thirdparty.debugging.sourcemap.FilePosition;
+import com.google.gwt.thirdparty.debugging.sourcemap.SourceMapConsumerV3;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
+import com.google.gwt.thirdparty.guava.common.collect.Maps;
+import com.google.gwt.thirdparty.guava.common.collect.Sets;
+import com.google.gwt.thirdparty.guava.common.primitives.Ints;
import com.google.gwt.thirdparty.json.JSONArray;
import com.google.gwt.thirdparty.json.JSONException;
import com.google.gwt.thirdparty.json.JSONObject;
@@ -40,6 +39,7 @@
import junit.framework.TestCase;
import org.eclipse.jdt.internal.compiler.problem.ShouldNotImplement;
+
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.DefaultHandler;
@@ -234,8 +234,7 @@
SourceMapConsumerV3 sourceMap = new SourceMapConsumerV3();
sourceMap.parse(stringContent(sourceMapFile));
if (firstIteration) {
- int permutationId =
- ((JsonPrimitive) sourceMap.getExtensions().get("x_gwt_permutation")).getAsInt();
+ Integer permutationId = (Integer) sourceMap.getExtensions().get("x_gwt_permutation");
assertNotNull(permutationId);
mapping.put(permutationId, symbolTable);
firstIteration = false;
diff --git a/dev/core/test/com/google/gwt/core/ext/linker/SymbolMapTest.java b/dev/core/test/com/google/gwt/core/ext/linker/SymbolMapTest.java
index 85dffba..4b80662 100644
--- a/dev/core/test/com/google/gwt/core/ext/linker/SymbolMapTest.java
+++ b/dev/core/test/com/google/gwt/core/ext/linker/SymbolMapTest.java
@@ -15,15 +15,15 @@
*/
package com.google.gwt.core.ext.linker;
-import com.google.common.base.Function;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Maps;
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.core.ext.UnableToCompleteException;
import com.google.gwt.dev.CompilerOptionsImpl;
import com.google.gwt.dev.util.Util;
import com.google.gwt.dev.util.arg.OptionOptimize;
import com.google.gwt.dev.util.log.PrintWriterTreeLogger;
+import com.google.gwt.thirdparty.guava.common.base.Function;
+import com.google.gwt.thirdparty.guava.common.collect.Iterables;
+import com.google.gwt.thirdparty.guava.common.collect.Maps;
import com.google.gwt.util.tools.Utility;
import junit.framework.TestCase;
diff --git a/dev/core/test/com/google/gwt/core/ext/linker/impl/SelectionScriptJavaScriptTest.java b/dev/core/test/com/google/gwt/core/ext/linker/impl/SelectionScriptJavaScriptTest.java
index 222e0a6..6b67e7e 100644
--- a/dev/core/test/com/google/gwt/core/ext/linker/impl/SelectionScriptJavaScriptTest.java
+++ b/dev/core/test/com/google/gwt/core/ext/linker/impl/SelectionScriptJavaScriptTest.java
@@ -68,7 +68,7 @@
}
/**
- * Test a meta tag specifying a base for this module.
+ * Test a meta tag specifying a base for this module
*/
public void testModuleSpecificMetas1() throws IOException {
StringBuilder metas = new StringBuilder();
@@ -133,7 +133,7 @@
}
/**
- * Test the default href.
+ * Test the default href
*/
public void testDefault() throws IOException {
StringBuilder testCode = new StringBuilder();
@@ -165,7 +165,7 @@
}
/**
- * Test getting the base URL from a meta property with an absolute URL.
+ * Test getting the base URL from a meta property with an absolute URL
*/
public void testScriptBaseFromMetas() throws IOException {
StringBuilder testCode = new StringBuilder();
@@ -180,7 +180,7 @@
}
/**
- * Test getting the base URL from a meta property with a relative URL.
+ * Test getting the base URL from a meta property with a relative URL
*/
public void testRelativeScriptBaseFromMetas() throws IOException {
StringBuilder testCode = new StringBuilder();
@@ -213,7 +213,7 @@
}
/**
- * Test getting a the base URL from the HTML base tag.
+ * Test getting a the base URL from the HTML base tag
*/
public void testScriptBaseFromBaseTag() throws IOException {
StringBuilder hostPage = new StringBuilder();
diff --git a/dev/core/test/com/google/gwt/core/ext/linker/impl/StandardStatementRangesTest.java b/dev/core/test/com/google/gwt/core/ext/linker/impl/StandardStatementRangesTest.java
index 70eeda6..16d5ffe 100644
--- a/dev/core/test/com/google/gwt/core/ext/linker/impl/StandardStatementRangesTest.java
+++ b/dev/core/test/com/google/gwt/core/ext/linker/impl/StandardStatementRangesTest.java
@@ -13,8 +13,8 @@
*/
package com.google.gwt.core.ext.linker.impl;
-import com.google.common.collect.Lists;
import com.google.gwt.core.ext.linker.StatementRanges;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
import junit.framework.TestCase;
diff --git a/dev/core/test/com/google/gwt/core/ext/linker/impl/StatementRangesBuilderTest.java b/dev/core/test/com/google/gwt/core/ext/linker/impl/StatementRangesBuilderTest.java
index c32e21b..0f48397 100644
--- a/dev/core/test/com/google/gwt/core/ext/linker/impl/StatementRangesBuilderTest.java
+++ b/dev/core/test/com/google/gwt/core/ext/linker/impl/StatementRangesBuilderTest.java
@@ -13,7 +13,7 @@
*/
package com.google.gwt.core.ext.linker.impl;
-import com.google.common.collect.Lists;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
import junit.framework.TestCase;
diff --git a/dev/core/test/com/google/gwt/core/ext/linker/impl/StatementRangesExtractorTest.java b/dev/core/test/com/google/gwt/core/ext/linker/impl/StatementRangesExtractorTest.java
index 8e191ad..961de35 100644
--- a/dev/core/test/com/google/gwt/core/ext/linker/impl/StatementRangesExtractorTest.java
+++ b/dev/core/test/com/google/gwt/core/ext/linker/impl/StatementRangesExtractorTest.java
@@ -13,7 +13,7 @@
*/
package com.google.gwt.core.ext.linker.impl;
-import com.google.common.collect.Lists;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
import junit.framework.TestCase;
diff --git a/dev/core/test/com/google/gwt/core/ext/soyc/SourceMappingWriterTest.java b/dev/core/test/com/google/gwt/core/ext/soyc/SourceMappingWriterTest.java
index 8a1d7b7..a3ad0e0 100644
--- a/dev/core/test/com/google/gwt/core/ext/soyc/SourceMappingWriterTest.java
+++ b/dev/core/test/com/google/gwt/core/ext/soyc/SourceMappingWriterTest.java
@@ -15,13 +15,13 @@
*/
package com.google.gwt.core.ext.soyc;
-import com.google.common.base.Joiner;
-import com.google.debugging.sourcemap.FilePosition;
-import com.google.debugging.sourcemap.SourceMapConsumerV3;
-import com.google.debugging.sourcemap.SourceMapConsumerV3.EntryVisitor;
-import com.google.debugging.sourcemap.SourceMapGeneratorV3;
-import com.google.debugging.sourcemap.SourceMapParseException;
import com.google.gwt.dev.jjs.SourceOrigin;
+import com.google.gwt.thirdparty.debugging.sourcemap.FilePosition;
+import com.google.gwt.thirdparty.debugging.sourcemap.SourceMapConsumerV3;
+import com.google.gwt.thirdparty.debugging.sourcemap.SourceMapConsumerV3.EntryVisitor;
+import com.google.gwt.thirdparty.debugging.sourcemap.SourceMapGeneratorV3;
+import com.google.gwt.thirdparty.debugging.sourcemap.SourceMapParseException;
+import com.google.gwt.thirdparty.guava.common.base.Joiner;
import junit.framework.TestCase;
diff --git a/dev/core/test/com/google/gwt/core/ext/util/UtilSuite.java b/dev/core/test/com/google/gwt/core/ext/util/UtilSuite.java
index b84a3ef..b6a8c74 100644
--- a/dev/core/test/com/google/gwt/core/ext/util/UtilSuite.java
+++ b/dev/core/test/com/google/gwt/core/ext/util/UtilSuite.java
@@ -19,7 +19,7 @@
import junit.framework.TestSuite;
/**
- * Test suite for {@link Util}.
+ * Test suite for {@link Util}
*/
public class UtilSuite {
public static Test suite() {
diff --git a/dev/core/test/com/google/gwt/core/linker/ScriptChunkingTest.java b/dev/core/test/com/google/gwt/core/linker/ScriptChunkingTest.java
index 50800b7..469aac6 100644
--- a/dev/core/test/com/google/gwt/core/linker/ScriptChunkingTest.java
+++ b/dev/core/test/com/google/gwt/core/linker/ScriptChunkingTest.java
@@ -171,6 +171,7 @@
+ ';' + stmt4, split);
}
+
/**
* Test that with the default chunk separator (""), splitting is a no-op.
*/
diff --git a/dev/core/test/com/google/gwt/dev/AboutTest.java b/dev/core/test/com/google/gwt/dev/AboutTest.java
index 873326e..52e33e5 100644
--- a/dev/core/test/com/google/gwt/dev/AboutTest.java
+++ b/dev/core/test/com/google/gwt/dev/AboutTest.java
@@ -18,7 +18,7 @@
import junit.framework.TestCase;
/**
- * Tests the methods in About.
+ * Tests the methods in About
*/
public class AboutTest extends TestCase {
diff --git a/dev/core/test/com/google/gwt/dev/CompilerTest.java b/dev/core/test/com/google/gwt/dev/CompilerTest.java
index 2686dcd..919e476 100644
--- a/dev/core/test/com/google/gwt/dev/CompilerTest.java
+++ b/dev/core/test/com/google/gwt/dev/CompilerTest.java
@@ -15,11 +15,6 @@
*/
package com.google.gwt.dev;
-import com.google.common.base.Charsets;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
-import com.google.common.io.Files;
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.core.ext.UnableToCompleteException;
import com.google.gwt.dev.UnstableNestedAnonymousGenerator.OutputVersion;
@@ -35,6 +30,11 @@
import com.google.gwt.dev.util.Util;
import com.google.gwt.dev.util.arg.SourceLevel;
import com.google.gwt.dev.util.log.PrintWriterTreeLogger;
+import com.google.gwt.thirdparty.guava.common.base.Charsets;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableList;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
+import com.google.gwt.thirdparty.guava.common.collect.Sets;
+import com.google.gwt.thirdparty.guava.common.io.Files;
import com.google.gwt.util.tools.Utility;
import java.io.File;
diff --git a/dev/core/test/com/google/gwt/dev/FooResourceGenerator.java b/dev/core/test/com/google/gwt/dev/FooResourceGenerator.java
index 55b9d53..18432c4 100644
--- a/dev/core/test/com/google/gwt/dev/FooResourceGenerator.java
+++ b/dev/core/test/com/google/gwt/dev/FooResourceGenerator.java
@@ -13,13 +13,13 @@
*/
package com.google.gwt.dev;
-import com.google.common.base.Charsets;
import com.google.gwt.core.ext.Generator;
import com.google.gwt.core.ext.GeneratorContext;
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.core.ext.UnableToCompleteException;
import com.google.gwt.core.ext.linker.EmittedArtifact.Visibility;
import com.google.gwt.dev.util.Util;
+import com.google.gwt.thirdparty.guava.common.base.Charsets;
import java.io.IOException;
import java.io.OutputStream;
diff --git a/dev/core/test/com/google/gwt/dev/MinimalRebuildCacheManagerTest.java b/dev/core/test/com/google/gwt/dev/MinimalRebuildCacheManagerTest.java
index 959cc8c..bb3fed6 100644
--- a/dev/core/test/com/google/gwt/dev/MinimalRebuildCacheManagerTest.java
+++ b/dev/core/test/com/google/gwt/dev/MinimalRebuildCacheManagerTest.java
@@ -13,12 +13,12 @@
*/
package com.google.gwt.dev;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Sets;
-import com.google.common.io.Files;
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.dev.cfg.PropertyPermutations.PermutationDescription;
import com.google.gwt.dev.jjs.ast.JTypeOracle;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableMap;
+import com.google.gwt.thirdparty.guava.common.collect.Sets;
+import com.google.gwt.thirdparty.guava.common.io.Files;
import junit.framework.TestCase;
diff --git a/dev/core/test/com/google/gwt/dev/MinimalRebuildCacheTest.java b/dev/core/test/com/google/gwt/dev/MinimalRebuildCacheTest.java
index 0aa09f6..0b50027 100644
--- a/dev/core/test/com/google/gwt/dev/MinimalRebuildCacheTest.java
+++ b/dev/core/test/com/google/gwt/dev/MinimalRebuildCacheTest.java
@@ -13,11 +13,11 @@
*/
package com.google.gwt.dev;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.dev.jjs.ast.JTypeOracle;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableMap;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
+import com.google.gwt.thirdparty.guava.common.collect.Sets;
import junit.framework.TestCase;
diff --git a/dev/core/test/com/google/gwt/dev/UnstableNestedAnonymousGenerator.java b/dev/core/test/com/google/gwt/dev/UnstableNestedAnonymousGenerator.java
index 3c208cf..199fc6b 100644
--- a/dev/core/test/com/google/gwt/dev/UnstableNestedAnonymousGenerator.java
+++ b/dev/core/test/com/google/gwt/dev/UnstableNestedAnonymousGenerator.java
@@ -13,12 +13,12 @@
*/
package com.google.gwt.dev;
-import com.google.common.collect.Lists;
import com.google.gwt.core.ext.Generator;
import com.google.gwt.core.ext.Generator.RunsLocal;
import com.google.gwt.core.ext.GeneratorContext;
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.core.ext.UnableToCompleteException;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
import java.io.PrintWriter;
import java.util.LinkedList;
diff --git a/dev/core/test/com/google/gwt/dev/cfg/DynamicPropertyOracleTest.java b/dev/core/test/com/google/gwt/dev/cfg/DynamicPropertyOracleTest.java
index a5083ab..d0a358e 100644
--- a/dev/core/test/com/google/gwt/dev/cfg/DynamicPropertyOracleTest.java
+++ b/dev/core/test/com/google/gwt/dev/cfg/DynamicPropertyOracleTest.java
@@ -13,8 +13,8 @@
*/
package com.google.gwt.dev.cfg;
-import com.google.common.collect.Lists;
import com.google.gwt.core.ext.BadPropertyValueException;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
import junit.framework.TestCase;
diff --git a/dev/core/test/com/google/gwt/dev/cfg/ModuleDefLoaderTest.java b/dev/core/test/com/google/gwt/dev/cfg/ModuleDefLoaderTest.java
index 944b410..23b2662 100644
--- a/dev/core/test/com/google/gwt/dev/cfg/ModuleDefLoaderTest.java
+++ b/dev/core/test/com/google/gwt/dev/cfg/ModuleDefLoaderTest.java
@@ -15,19 +15,19 @@
*/
package com.google.gwt.dev.cfg;
-import com.google.common.collect.Sets;
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.core.ext.UnableToCompleteException;
import com.google.gwt.dev.CompilerContext;
import com.google.gwt.dev.resource.Resource;
import com.google.gwt.dev.util.UnitTestTreeLogger;
+import com.google.gwt.thirdparty.guava.common.collect.Sets;
import junit.framework.TestCase;
import java.util.Set;
/**
- * Test for the module def loading.
+ * Test for the module def loading
*/
public class ModuleDefLoaderTest extends TestCase {
diff --git a/dev/core/test/com/google/gwt/dev/javac/BinaryTypeReferenceRestrictionsCheckerTest.java b/dev/core/test/com/google/gwt/dev/javac/BinaryTypeReferenceRestrictionsCheckerTest.java
index bd5376a..2228a1e 100644
--- a/dev/core/test/com/google/gwt/dev/javac/BinaryTypeReferenceRestrictionsCheckerTest.java
+++ b/dev/core/test/com/google/gwt/dev/javac/BinaryTypeReferenceRestrictionsCheckerTest.java
@@ -48,7 +48,7 @@
import java.util.List;
/**
- * Test for {@link BinaryTypeReferenceRestrictionsChecker}.
+ *
*/
public class BinaryTypeReferenceRestrictionsCheckerTest extends TestCase {
/**
diff --git a/dev/core/test/com/google/gwt/dev/javac/BytecodeSignatureMakerTest.java b/dev/core/test/com/google/gwt/dev/javac/BytecodeSignatureMakerTest.java
index f5cbf91..1201da4 100644
--- a/dev/core/test/com/google/gwt/dev/javac/BytecodeSignatureMakerTest.java
+++ b/dev/core/test/com/google/gwt/dev/javac/BytecodeSignatureMakerTest.java
@@ -20,7 +20,7 @@
import org.eclipse.jdt.core.compiler.CategorizedProblem;
/**
- * Tests for {@link BytecodeSignatureMaker}.
+ * Tests for {@link BytecodeSignatureMaker}
*/
public class BytecodeSignatureMakerTest extends CompilationStateTestBase {
static final String CLASS_DEP_TYPE_NAME = "test.ClassDependency";
diff --git a/dev/core/test/com/google/gwt/dev/javac/CheckerTestCase.java b/dev/core/test/com/google/gwt/dev/javac/CheckerTestCase.java
index 6d76b34..a1ef78f 100644
--- a/dev/core/test/com/google/gwt/dev/javac/CheckerTestCase.java
+++ b/dev/core/test/com/google/gwt/dev/javac/CheckerTestCase.java
@@ -15,7 +15,6 @@
*/
package com.google.gwt.dev.javac;
-import com.google.common.base.Joiner;
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.core.ext.TreeLogger.Type;
import com.google.gwt.core.ext.typeinfo.TypeOracle;
@@ -23,6 +22,7 @@
import com.google.gwt.dev.javac.testing.impl.StaticJavaResource;
import com.google.gwt.dev.resource.Resource;
import com.google.gwt.dev.util.UnitTestTreeLogger;
+import com.google.gwt.thirdparty.guava.common.base.Joiner;
import junit.framework.TestCase;
diff --git a/dev/core/test/com/google/gwt/dev/javac/CompiledClassTest.java b/dev/core/test/com/google/gwt/dev/javac/CompiledClassTest.java
index 2a80e87..4482ec1 100644
--- a/dev/core/test/com/google/gwt/dev/javac/CompiledClassTest.java
+++ b/dev/core/test/com/google/gwt/dev/javac/CompiledClassTest.java
@@ -26,7 +26,9 @@
* Test for {@link CompiledClass}.
*/
public class CompiledClassTest extends TestCase {
- static byte[] dummyByteCode = {(byte) 0xDE, (byte) 0xAD, (byte) 0xBE, (byte) 0xEF};
+ static byte[] dummyByteCode = {
+ (byte) 0xDE, (byte) 0xAD, (byte)0xBE, (byte)0xEF
+ };
public void testCompiledClassSerialization() throws Exception {
CompiledClass writeObject = new CompiledClass(dummyByteCode, null, false,
diff --git a/dev/core/test/com/google/gwt/dev/javac/GeneratedClassnameFinderTest.java b/dev/core/test/com/google/gwt/dev/javac/GeneratedClassnameFinderTest.java
index 4551ac7..3e15454 100644
--- a/dev/core/test/com/google/gwt/dev/javac/GeneratedClassnameFinderTest.java
+++ b/dev/core/test/com/google/gwt/dev/javac/GeneratedClassnameFinderTest.java
@@ -149,6 +149,8 @@
public void testTopLevel() {
assertEquals(1, new TopLevelTester().getGeneratedClasses().size());
}
+
+
}
/**
diff --git a/dev/core/test/com/google/gwt/dev/javac/GwtIncompatibleJdtCompilerTest.java b/dev/core/test/com/google/gwt/dev/javac/GwtIncompatibleJdtCompilerTest.java
index 3d82ad3..261fe79 100644
--- a/dev/core/test/com/google/gwt/dev/javac/GwtIncompatibleJdtCompilerTest.java
+++ b/dev/core/test/com/google/gwt/dev/javac/GwtIncompatibleJdtCompilerTest.java
@@ -15,8 +15,8 @@
*/
package com.google.gwt.dev.javac;
-import com.google.common.base.Joiner;
import com.google.gwt.dev.javac.testing.impl.MockJavaResource;
+import com.google.gwt.thirdparty.guava.common.base.Joiner;
import java.util.List;
diff --git a/dev/core/test/com/google/gwt/dev/javac/JdtCompilerTest.java b/dev/core/test/com/google/gwt/dev/javac/JdtCompilerTest.java
index 37e8324..6ceeee6 100644
--- a/dev/core/test/com/google/gwt/dev/javac/JdtCompilerTest.java
+++ b/dev/core/test/com/google/gwt/dev/javac/JdtCompilerTest.java
@@ -15,11 +15,11 @@
*/
package com.google.gwt.dev.javac;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
import com.google.gwt.core.ext.UnableToCompleteException;
import com.google.gwt.dev.javac.testing.impl.JavaResourceBase;
import com.google.gwt.dev.javac.testing.impl.MockJavaResource;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
+import com.google.gwt.thirdparty.guava.common.collect.Sets;
import java.util.Collection;
import java.util.List;
diff --git a/dev/core/test/com/google/gwt/dev/javac/JdtCompilerTestBase.java b/dev/core/test/com/google/gwt/dev/javac/JdtCompilerTestBase.java
index 6b62aa0..25584d9 100644
--- a/dev/core/test/com/google/gwt/dev/javac/JdtCompilerTestBase.java
+++ b/dev/core/test/com/google/gwt/dev/javac/JdtCompilerTestBase.java
@@ -17,14 +17,14 @@
import static org.junit.Assert.assertArrayEquals;
-import com.google.common.base.Joiner;
-import com.google.common.collect.Lists;
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.core.ext.UnableToCompleteException;
import com.google.gwt.dev.CompilerContext;
import com.google.gwt.dev.javac.testing.impl.JavaResourceBase;
import com.google.gwt.dev.resource.Resource;
import com.google.gwt.dev.util.arg.SourceLevel;
+import com.google.gwt.thirdparty.guava.common.base.Joiner;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
import junit.framework.TestCase;
diff --git a/dev/core/test/com/google/gwt/dev/javac/MockCompilationUnit.java b/dev/core/test/com/google/gwt/dev/javac/MockCompilationUnit.java
index b6ccc36..c22303b 100644
--- a/dev/core/test/com/google/gwt/dev/javac/MockCompilationUnit.java
+++ b/dev/core/test/com/google/gwt/dev/javac/MockCompilationUnit.java
@@ -15,12 +15,12 @@
*/
package com.google.gwt.dev.javac;
-import com.google.common.collect.Lists;
import com.google.gwt.dev.jjs.SourceOrigin;
import com.google.gwt.dev.jjs.ast.JClassType;
import com.google.gwt.dev.jjs.ast.JDeclaredType;
import com.google.gwt.dev.util.DiskCache;
import com.google.gwt.dev.util.Util;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
import org.eclipse.jdt.core.compiler.CategorizedProblem;
diff --git a/dev/core/test/com/google/gwt/dev/javac/PersistentUnitCacheTest.java b/dev/core/test/com/google/gwt/dev/javac/PersistentUnitCacheTest.java
index 8229ec7..59f3e81 100644
--- a/dev/core/test/com/google/gwt/dev/javac/PersistentUnitCacheTest.java
+++ b/dev/core/test/com/google/gwt/dev/javac/PersistentUnitCacheTest.java
@@ -15,11 +15,11 @@
*/
package com.google.gwt.dev.javac;
-import com.google.common.util.concurrent.Futures;
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.core.ext.TreeLogger.Type;
import com.google.gwt.core.ext.UnableToCompleteException;
import com.google.gwt.dev.util.Util;
+import com.google.gwt.thirdparty.guava.common.util.concurrent.Futures;
import junit.framework.TestCase;
diff --git a/dev/core/test/com/google/gwt/dev/javac/TypeOracleUpdaterTestBase.java b/dev/core/test/com/google/gwt/dev/javac/TypeOracleUpdaterTestBase.java
index 6f96a83..f22c848 100644
--- a/dev/core/test/com/google/gwt/dev/javac/TypeOracleUpdaterTestBase.java
+++ b/dev/core/test/com/google/gwt/dev/javac/TypeOracleUpdaterTestBase.java
@@ -15,8 +15,6 @@
*/
package com.google.gwt.dev.javac;
-import com.google.common.collect.MapMaker;
-import com.google.common.io.BaseEncoding;
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.core.ext.typeinfo.JArrayType;
import com.google.gwt.core.ext.typeinfo.JClassType;
@@ -65,6 +63,8 @@
import com.google.gwt.dev.util.Util;
import com.google.gwt.dev.util.log.AbstractTreeLogger;
import com.google.gwt.dev.util.log.PrintWriterTreeLogger;
+import com.google.gwt.thirdparty.guava.common.collect.MapMaker;
+import com.google.gwt.thirdparty.guava.common.io.BaseEncoding;
import junit.framework.TestCase;
diff --git a/dev/core/test/com/google/gwt/dev/javac/UnusedImportRemoverJdtCompilerTest.java b/dev/core/test/com/google/gwt/dev/javac/UnusedImportRemoverJdtCompilerTest.java
index aff4b74..b79aae9 100644
--- a/dev/core/test/com/google/gwt/dev/javac/UnusedImportRemoverJdtCompilerTest.java
+++ b/dev/core/test/com/google/gwt/dev/javac/UnusedImportRemoverJdtCompilerTest.java
@@ -15,8 +15,8 @@
*/
package com.google.gwt.dev.javac;
-import com.google.common.base.Joiner;
import com.google.gwt.dev.javac.testing.impl.MockJavaResource;
+import com.google.gwt.thirdparty.guava.common.base.Joiner;
import java.util.List;
diff --git a/dev/core/test/com/google/gwt/dev/jjs/JavaAstConstructor.java b/dev/core/test/com/google/gwt/dev/jjs/JavaAstConstructor.java
index c575142..d592796 100644
--- a/dev/core/test/com/google/gwt/dev/jjs/JavaAstConstructor.java
+++ b/dev/core/test/com/google/gwt/dev/jjs/JavaAstConstructor.java
@@ -15,7 +15,6 @@
*/
package com.google.gwt.dev.jjs;
-import com.google.common.base.Joiner;
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.core.ext.UnableToCompleteException;
import com.google.gwt.dev.PrecompileTaskOptions;
@@ -26,6 +25,7 @@
import com.google.gwt.dev.jjs.ast.JDeclaredType;
import com.google.gwt.dev.jjs.ast.JMethod;
import com.google.gwt.dev.jjs.ast.JProgram;
+import com.google.gwt.thirdparty.guava.common.base.Joiner;
import java.util.ArrayList;
import java.util.Collections;
diff --git a/dev/core/test/com/google/gwt/dev/jjs/JjsTypeTest.java b/dev/core/test/com/google/gwt/dev/jjs/JjsTypeTest.java
index bc40383..2e8b262 100644
--- a/dev/core/test/com/google/gwt/dev/jjs/JjsTypeTest.java
+++ b/dev/core/test/com/google/gwt/dev/jjs/JjsTypeTest.java
@@ -16,8 +16,6 @@
package com.google.gwt.dev.jjs;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
import com.google.gwt.dev.MinimalRebuildCache;
import com.google.gwt.dev.jjs.ast.JArrayType;
import com.google.gwt.dev.jjs.ast.JClassType;
@@ -30,6 +28,8 @@
import com.google.gwt.dev.jjs.ast.JTypeOracle;
import com.google.gwt.dev.jjs.ast.JTypeOracle.ImmediateTypeRelations;
import com.google.gwt.dev.jjs.ast.JTypeOracle.StandardTypes;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
+import com.google.gwt.thirdparty.guava.common.collect.Sets;
import junit.framework.TestCase;
diff --git a/dev/core/test/com/google/gwt/dev/jjs/impl/ComputeExhaustiveCastabilityInformationTest.java b/dev/core/test/com/google/gwt/dev/jjs/impl/ComputeExhaustiveCastabilityInformationTest.java
index 61212b8..7bb5d26 100644
--- a/dev/core/test/com/google/gwt/dev/jjs/impl/ComputeExhaustiveCastabilityInformationTest.java
+++ b/dev/core/test/com/google/gwt/dev/jjs/impl/ComputeExhaustiveCastabilityInformationTest.java
@@ -15,10 +15,6 @@
*/
package com.google.gwt.dev.jjs.impl;
-import com.google.common.base.Function;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
import com.google.gwt.core.ext.UnableToCompleteException;
import com.google.gwt.dev.javac.testing.impl.JavaResourceBase;
import com.google.gwt.dev.jjs.ast.JArrayType;
@@ -27,6 +23,10 @@
import com.google.gwt.dev.jjs.ast.JProgram;
import com.google.gwt.dev.jjs.ast.JReferenceType;
import com.google.gwt.dev.jjs.ast.JRuntimeTypeReference;
+import com.google.gwt.thirdparty.guava.common.base.Function;
+import com.google.gwt.thirdparty.guava.common.collect.Iterables;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
+import com.google.gwt.thirdparty.guava.common.collect.Sets;
import java.util.List;
import java.util.Set;
diff --git a/dev/core/test/com/google/gwt/dev/jjs/impl/ComputePotentiallyObservableUninitializedValuesTest.java b/dev/core/test/com/google/gwt/dev/jjs/impl/ComputePotentiallyObservableUninitializedValuesTest.java
index a5794da..ae6bf37 100644
--- a/dev/core/test/com/google/gwt/dev/jjs/impl/ComputePotentiallyObservableUninitializedValuesTest.java
+++ b/dev/core/test/com/google/gwt/dev/jjs/impl/ComputePotentiallyObservableUninitializedValuesTest.java
@@ -15,11 +15,11 @@
*/
package com.google.gwt.dev.jjs.impl;
-import com.google.common.base.Predicate;
-import com.google.common.collect.ImmutableList;
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.thirdparty.guava.common.base.Predicate;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableList;
/**
* Tests {@link ComputePotentiallyObservableUninitializedValues}.
diff --git a/dev/core/test/com/google/gwt/dev/jjs/impl/ControlFlowAnalyzerTest.java b/dev/core/test/com/google/gwt/dev/jjs/impl/ControlFlowAnalyzerTest.java
index a5efa20..b320b66 100644
--- a/dev/core/test/com/google/gwt/dev/jjs/impl/ControlFlowAnalyzerTest.java
+++ b/dev/core/test/com/google/gwt/dev/jjs/impl/ControlFlowAnalyzerTest.java
@@ -15,8 +15,6 @@
*/
package com.google.gwt.dev.jjs.impl;
-import com.google.common.base.Joiner;
-import com.google.common.collect.Sets;
import com.google.gwt.core.ext.UnableToCompleteException;
import com.google.gwt.dev.javac.testing.impl.MockJavaResource;
import com.google.gwt.dev.jjs.ast.JField;
@@ -25,6 +23,8 @@
import com.google.gwt.dev.jjs.ast.JProgram;
import com.google.gwt.dev.jjs.ast.JType;
import com.google.gwt.dev.util.Empty;
+import com.google.gwt.thirdparty.guava.common.base.Joiner;
+import com.google.gwt.thirdparty.guava.common.collect.Sets;
import java.util.Collections;
import java.util.HashSet;
diff --git a/dev/core/test/com/google/gwt/dev/jjs/impl/DevirtualizerTest.java b/dev/core/test/com/google/gwt/dev/jjs/impl/DevirtualizerTest.java
index 131e91c..8dcff18 100644
--- a/dev/core/test/com/google/gwt/dev/jjs/impl/DevirtualizerTest.java
+++ b/dev/core/test/com/google/gwt/dev/jjs/impl/DevirtualizerTest.java
@@ -16,10 +16,10 @@
package com.google.gwt.dev.jjs.impl;
-import com.google.common.collect.Lists;
import com.google.gwt.core.ext.UnableToCompleteException;
import com.google.gwt.dev.jjs.ast.JMethod;
import com.google.gwt.dev.jjs.ast.JProgram;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
/**
* Tests for the {@link Devirtualizer} visitor.
diff --git a/dev/core/test/com/google/gwt/dev/jjs/impl/FullCompileTestBase.java b/dev/core/test/com/google/gwt/dev/jjs/impl/FullCompileTestBase.java
index 0ca1ca0..1c775af 100644
--- a/dev/core/test/com/google/gwt/dev/jjs/impl/FullCompileTestBase.java
+++ b/dev/core/test/com/google/gwt/dev/jjs/impl/FullCompileTestBase.java
@@ -15,7 +15,6 @@
*/
package com.google.gwt.dev.jjs.impl;
-import com.google.common.collect.Lists;
import com.google.gwt.core.ext.UnableToCompleteException;
import com.google.gwt.core.ext.linker.SymbolData;
import com.google.gwt.core.ext.linker.impl.StandardSymbolData;
@@ -37,6 +36,7 @@
import com.google.gwt.dev.js.ast.JsNode;
import com.google.gwt.dev.js.ast.JsProgram;
import com.google.gwt.dev.util.Pair;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
import java.util.Arrays;
import java.util.Map;
diff --git a/dev/core/test/com/google/gwt/dev/jjs/impl/GenerateJavaScriptAstTest.java b/dev/core/test/com/google/gwt/dev/jjs/impl/GenerateJavaScriptAstTest.java
index 29c5199..530d7a5 100644
--- a/dev/core/test/com/google/gwt/dev/jjs/impl/GenerateJavaScriptAstTest.java
+++ b/dev/core/test/com/google/gwt/dev/jjs/impl/GenerateJavaScriptAstTest.java
@@ -15,9 +15,6 @@
*/
package com.google.gwt.dev.jjs.impl;
-import com.google.common.base.Joiner;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Sets;
import com.google.gwt.core.ext.UnableToCompleteException;
import com.google.gwt.dev.CompilerContext;
import com.google.gwt.dev.PrecompileTaskOptions;
@@ -30,6 +27,9 @@
import com.google.gwt.dev.js.ast.JsName;
import com.google.gwt.dev.js.ast.JsNode;
import com.google.gwt.dev.js.ast.JsProgram;
+import com.google.gwt.thirdparty.guava.common.base.Joiner;
+import com.google.gwt.thirdparty.guava.common.collect.Iterables;
+import com.google.gwt.thirdparty.guava.common.collect.Sets;
import java.util.Set;
diff --git a/dev/core/test/com/google/gwt/dev/jjs/impl/GwtAstBuilderTest.java b/dev/core/test/com/google/gwt/dev/jjs/impl/GwtAstBuilderTest.java
index 57b4a74..90ac2f2 100644
--- a/dev/core/test/com/google/gwt/dev/jjs/impl/GwtAstBuilderTest.java
+++ b/dev/core/test/com/google/gwt/dev/jjs/impl/GwtAstBuilderTest.java
@@ -16,8 +16,6 @@
package com.google.gwt.dev.jjs.impl;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
import com.google.gwt.core.ext.UnableToCompleteException;
import com.google.gwt.dev.CompilerContext;
import com.google.gwt.dev.PrecompileTaskOptionsImpl;
@@ -39,6 +37,8 @@
import com.google.gwt.dev.jjs.ast.JVariable;
import com.google.gwt.dev.jjs.ast.JVisitor;
import com.google.gwt.dev.resource.Resource;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
+import com.google.gwt.thirdparty.guava.common.collect.Sets;
import java.util.List;
import java.util.Set;
diff --git a/dev/core/test/com/google/gwt/dev/jjs/impl/JJSTestBase.java b/dev/core/test/com/google/gwt/dev/jjs/impl/JJSTestBase.java
index f0e9a0f..4e030ac 100644
--- a/dev/core/test/com/google/gwt/dev/jjs/impl/JJSTestBase.java
+++ b/dev/core/test/com/google/gwt/dev/jjs/impl/JJSTestBase.java
@@ -15,9 +15,6 @@
*/
package com.google.gwt.dev.jjs.impl;
-import com.google.common.base.Joiner;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.core.ext.UnableToCompleteException;
import com.google.gwt.dev.CompilerContext;
@@ -46,6 +43,9 @@
import com.google.gwt.dev.util.arg.SourceLevel;
import com.google.gwt.dev.util.log.AbstractTreeLogger;
import com.google.gwt.dev.util.log.PrintWriterTreeLogger;
+import com.google.gwt.thirdparty.guava.common.base.Joiner;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
+import com.google.gwt.thirdparty.guava.common.collect.Sets;
import junit.framework.TestCase;
diff --git a/dev/core/test/com/google/gwt/dev/jjs/impl/JsTypeLinkerTest.java b/dev/core/test/com/google/gwt/dev/jjs/impl/JsTypeLinkerTest.java
index 98f8ee9..eab42a1 100644
--- a/dev/core/test/com/google/gwt/dev/jjs/impl/JsTypeLinkerTest.java
+++ b/dev/core/test/com/google/gwt/dev/jjs/impl/JsTypeLinkerTest.java
@@ -13,7 +13,6 @@
*/
package com.google.gwt.dev.jjs.impl;
-import com.google.common.collect.Lists;
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.core.ext.linker.impl.JsSourceMapBuilder;
import com.google.gwt.core.ext.linker.impl.NamedRange;
@@ -24,6 +23,7 @@
import com.google.gwt.dev.jjs.JsSourceMap;
import com.google.gwt.dev.jjs.SourceOrigin;
import com.google.gwt.dev.jjs.ast.JTypeOracle;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
import junit.framework.TestCase;
diff --git a/dev/core/test/com/google/gwt/dev/jjs/impl/OptimizerTestBase.java b/dev/core/test/com/google/gwt/dev/jjs/impl/OptimizerTestBase.java
index d907d1f..3f089fc 100644
--- a/dev/core/test/com/google/gwt/dev/jjs/impl/OptimizerTestBase.java
+++ b/dev/core/test/com/google/gwt/dev/jjs/impl/OptimizerTestBase.java
@@ -15,9 +15,6 @@
*/
package com.google.gwt.dev.jjs.impl;
-import com.google.common.base.Joiner;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Sets;
import com.google.gwt.core.ext.UnableToCompleteException;
import com.google.gwt.dev.jjs.SourceInfo;
import com.google.gwt.dev.jjs.ast.Context;
@@ -38,6 +35,9 @@
import com.google.gwt.dev.jjs.ast.JReturnStatement;
import com.google.gwt.dev.jjs.ast.JStatement;
import com.google.gwt.dev.jjs.ast.js.JMultiExpression;
+import com.google.gwt.thirdparty.guava.common.base.Joiner;
+import com.google.gwt.thirdparty.guava.common.base.Preconditions;
+import com.google.gwt.thirdparty.guava.common.collect.Sets;
import java.util.List;
import java.util.Set;
diff --git a/dev/core/test/com/google/gwt/dev/jjs/impl/codesplitter/CodeSplitterTest.java b/dev/core/test/com/google/gwt/dev/jjs/impl/codesplitter/CodeSplitterTest.java
index ebf7fbe..28b8c4c 100644
--- a/dev/core/test/com/google/gwt/dev/jjs/impl/codesplitter/CodeSplitterTest.java
+++ b/dev/core/test/com/google/gwt/dev/jjs/impl/codesplitter/CodeSplitterTest.java
@@ -15,7 +15,6 @@
*/
package com.google.gwt.dev.jjs.impl.codesplitter;
-import com.google.common.collect.Sets;
import com.google.gwt.core.ext.UnableToCompleteException;
import com.google.gwt.dev.CompilerContext;
import com.google.gwt.dev.PrecompileTaskOptions;
@@ -35,6 +34,7 @@
import com.google.gwt.dev.js.ast.JsProgram;
import com.google.gwt.dev.js.ast.JsVisitor;
import com.google.gwt.dev.util.Pair;
+import com.google.gwt.thirdparty.guava.common.collect.Sets;
import java.util.List;
import java.util.Set;
diff --git a/dev/core/test/com/google/gwt/dev/jjs/impl/codesplitter/FragmentPartitioningResultTest.java b/dev/core/test/com/google/gwt/dev/jjs/impl/codesplitter/FragmentPartitioningResultTest.java
index 99e025b..67c2b32 100644
--- a/dev/core/test/com/google/gwt/dev/jjs/impl/codesplitter/FragmentPartitioningResultTest.java
+++ b/dev/core/test/com/google/gwt/dev/jjs/impl/codesplitter/FragmentPartitioningResultTest.java
@@ -15,10 +15,10 @@
*/
package com.google.gwt.dev.jjs.impl.codesplitter;
-import com.google.common.collect.Lists;
import com.google.gwt.dev.jjs.SourceOrigin;
import com.google.gwt.dev.jjs.ast.JNullLiteral;
import com.google.gwt.dev.jjs.ast.JRunAsync;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
import junit.framework.TestCase;
diff --git a/dev/core/test/com/google/gwt/dev/jjs/impl/gflow/CfgAnalysisTestBase.java b/dev/core/test/com/google/gwt/dev/jjs/impl/gflow/CfgAnalysisTestBase.java
index 9a9b60c..8ba8fd2 100644
--- a/dev/core/test/com/google/gwt/dev/jjs/impl/gflow/CfgAnalysisTestBase.java
+++ b/dev/core/test/com/google/gwt/dev/jjs/impl/gflow/CfgAnalysisTestBase.java
@@ -15,7 +15,6 @@
*/
package com.google.gwt.dev.jjs.impl.gflow;
-import com.google.common.base.Joiner;
import com.google.gwt.core.ext.UnableToCompleteException;
import com.google.gwt.dev.jjs.ast.JMethodBody;
import com.google.gwt.dev.jjs.ast.JProgram;
@@ -25,6 +24,7 @@
import com.google.gwt.dev.jjs.impl.gflow.cfg.CfgBuilder;
import com.google.gwt.dev.jjs.impl.gflow.cfg.CfgEdge;
import com.google.gwt.dev.jjs.impl.gflow.cfg.CfgNode;
+import com.google.gwt.thirdparty.guava.common.base.Joiner;
import java.util.Map;
diff --git a/dev/core/test/com/google/gwt/dev/jjs/impl/gflow/cfg/CfgBuilderTest.java b/dev/core/test/com/google/gwt/dev/jjs/impl/gflow/cfg/CfgBuilderTest.java
index ad7743a..35330af 100644
--- a/dev/core/test/com/google/gwt/dev/jjs/impl/gflow/cfg/CfgBuilderTest.java
+++ b/dev/core/test/com/google/gwt/dev/jjs/impl/gflow/cfg/CfgBuilderTest.java
@@ -15,11 +15,11 @@
*/
package com.google.gwt.dev.jjs.impl.gflow.cfg;
-import com.google.common.base.Joiner;
import com.google.gwt.core.ext.UnableToCompleteException;
import com.google.gwt.dev.jjs.ast.JMethodBody;
import com.google.gwt.dev.jjs.ast.JProgram;
import com.google.gwt.dev.jjs.impl.JJSTestBase;
+import com.google.gwt.thirdparty.guava.common.base.Joiner;
import java.util.List;
diff --git a/dev/core/test/com/google/gwt/dev/js/CoverageInstrumentorTest.java b/dev/core/test/com/google/gwt/dev/js/CoverageInstrumentorTest.java
index c23bbc4..1186b95 100644
--- a/dev/core/test/com/google/gwt/dev/js/CoverageInstrumentorTest.java
+++ b/dev/core/test/com/google/gwt/dev/js/CoverageInstrumentorTest.java
@@ -16,11 +16,6 @@
package com.google.gwt.dev.js;
-import com.google.common.base.Splitter;
-import com.google.common.collect.HashMultimap;
-import com.google.common.collect.LinkedHashMultimap;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Multimap;
import com.google.gwt.dev.jjs.SourceInfo;
import com.google.gwt.dev.js.ast.JsBlock;
import com.google.gwt.dev.js.ast.JsContext;
@@ -31,6 +26,11 @@
import com.google.gwt.dev.js.ast.JsObjectLiteral;
import com.google.gwt.dev.js.ast.JsProgram;
import com.google.gwt.dev.js.ast.JsStatement;
+import com.google.gwt.thirdparty.guava.common.base.Splitter;
+import com.google.gwt.thirdparty.guava.common.collect.HashMultimap;
+import com.google.gwt.thirdparty.guava.common.collect.LinkedHashMultimap;
+import com.google.gwt.thirdparty.guava.common.collect.Maps;
+import com.google.gwt.thirdparty.guava.common.collect.Multimap;
import junit.framework.TestCase;
diff --git a/dev/core/test/com/google/gwt/dev/js/JsNamerTest.java b/dev/core/test/com/google/gwt/dev/js/JsNamerTest.java
index 9b575a4..0ef7a30 100644
--- a/dev/core/test/com/google/gwt/dev/js/JsNamerTest.java
+++ b/dev/core/test/com/google/gwt/dev/js/JsNamerTest.java
@@ -15,7 +15,6 @@
*/
package com.google.gwt.dev.js;
-import com.google.common.collect.Maps;
import com.google.gwt.dev.cfg.ConfigProps;
import com.google.gwt.dev.jjs.JsOutputOption;
import com.google.gwt.dev.jjs.SourceOrigin;
@@ -33,6 +32,7 @@
import com.google.gwt.dev.js.ast.JsVisitor;
import com.google.gwt.dev.util.DefaultTextOutput;
import com.google.gwt.dev.util.TextOutput;
+import com.google.gwt.thirdparty.guava.common.collect.Maps;
import junit.framework.TestCase;
diff --git a/dev/core/test/com/google/gwt/dev/js/JsNamespaceChooserTest.java b/dev/core/test/com/google/gwt/dev/js/JsNamespaceChooserTest.java
index daa015d..37faf44 100644
--- a/dev/core/test/com/google/gwt/dev/js/JsNamespaceChooserTest.java
+++ b/dev/core/test/com/google/gwt/dev/js/JsNamespaceChooserTest.java
@@ -15,9 +15,7 @@
*/
package com.google.gwt.dev.js;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Maps;
+
import com.google.gwt.dev.jjs.SourceOrigin;
import com.google.gwt.dev.jjs.ast.AccessModifier;
import com.google.gwt.dev.jjs.ast.HasName;
@@ -34,6 +32,9 @@
import com.google.gwt.dev.js.ast.JsVisitor;
import com.google.gwt.dev.util.DefaultTextOutput;
import com.google.gwt.dev.util.TextOutput;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableList;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableMap;
+import com.google.gwt.thirdparty.guava.common.collect.Maps;
import junit.framework.TestCase;
diff --git a/dev/core/test/com/google/gwt/dev/js/JsReportGenerationVisitorTest.java b/dev/core/test/com/google/gwt/dev/js/JsReportGenerationVisitorTest.java
index c200f99..6bde11f 100644
--- a/dev/core/test/com/google/gwt/dev/js/JsReportGenerationVisitorTest.java
+++ b/dev/core/test/com/google/gwt/dev/js/JsReportGenerationVisitorTest.java
@@ -15,7 +15,6 @@
*/
package com.google.gwt.dev.js;
-import com.google.common.collect.Lists;
import com.google.gwt.core.ext.soyc.Range;
import com.google.gwt.dev.jjs.JsSourceMap;
import com.google.gwt.dev.jjs.SourceInfo;
@@ -24,6 +23,7 @@
import com.google.gwt.dev.js.ast.JsProgram;
import com.google.gwt.dev.js.ast.JsStatement;
import com.google.gwt.dev.util.DefaultTextOutput;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
import junit.framework.TestCase;
diff --git a/dev/core/test/com/google/gwt/dev/js/JsStackEmulatorTest.java b/dev/core/test/com/google/gwt/dev/js/JsStackEmulatorTest.java
index 8a4a817..ace6560 100644
--- a/dev/core/test/com/google/gwt/dev/js/JsStackEmulatorTest.java
+++ b/dev/core/test/com/google/gwt/dev/js/JsStackEmulatorTest.java
@@ -15,7 +15,6 @@
*/
package com.google.gwt.dev.js;
-import com.google.common.base.Joiner;
import com.google.gwt.core.ext.UnableToCompleteException;
import com.google.gwt.core.ext.linker.SymbolData;
import com.google.gwt.core.ext.linker.impl.StandardSymbolData;
@@ -57,6 +56,7 @@
import com.google.gwt.dev.js.ast.JsVisitor;
import com.google.gwt.dev.util.DefaultTextOutput;
import com.google.gwt.dev.util.TextOutput;
+import com.google.gwt.thirdparty.guava.common.base.Joiner;
import java.util.Arrays;
import java.util.Map;
diff --git a/dev/core/test/com/google/gwt/dev/js/JsToStringGenerationVisitorTest.java b/dev/core/test/com/google/gwt/dev/js/JsToStringGenerationVisitorTest.java
index 7caeecc..3edb8e9 100644
--- a/dev/core/test/com/google/gwt/dev/js/JsToStringGenerationVisitorTest.java
+++ b/dev/core/test/com/google/gwt/dev/js/JsToStringGenerationVisitorTest.java
@@ -13,7 +13,6 @@
*/
package com.google.gwt.dev.js;
-import com.google.common.collect.Maps;
import com.google.gwt.core.ext.UnableToCompleteException;
import com.google.gwt.core.ext.linker.impl.NamedRange;
import com.google.gwt.dev.cfg.BindingProperty;
@@ -22,6 +21,7 @@
import com.google.gwt.dev.jjs.impl.FullCompileTestBase;
import com.google.gwt.dev.util.DefaultTextOutput;
import com.google.gwt.dev.util.TextOutput;
+import com.google.gwt.thirdparty.guava.common.collect.Maps;
import java.util.List;
import java.util.Map;
diff --git a/dev/core/test/com/google/gwt/dev/resource/impl/ChangedFileAccumulatorTest.java b/dev/core/test/com/google/gwt/dev/resource/impl/ChangedFileAccumulatorTest.java
index e2169ab..6900f90 100644
--- a/dev/core/test/com/google/gwt/dev/resource/impl/ChangedFileAccumulatorTest.java
+++ b/dev/core/test/com/google/gwt/dev/resource/impl/ChangedFileAccumulatorTest.java
@@ -13,7 +13,7 @@
*/
package com.google.gwt.dev.resource.impl;
-import com.google.common.io.Files;
+import com.google.gwt.thirdparty.guava.common.io.Files;
import junit.framework.TestCase;
diff --git a/dev/core/test/com/google/gwt/dev/resource/impl/ClassPathEntryTest.java b/dev/core/test/com/google/gwt/dev/resource/impl/ClassPathEntryTest.java
index 583bfe8..eef4de3 100644
--- a/dev/core/test/com/google/gwt/dev/resource/impl/ClassPathEntryTest.java
+++ b/dev/core/test/com/google/gwt/dev/resource/impl/ClassPathEntryTest.java
@@ -15,10 +15,10 @@
*/
package com.google.gwt.dev.resource.impl;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.google.common.io.Files;
import com.google.gwt.core.ext.TreeLogger;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
+import com.google.gwt.thirdparty.guava.common.collect.Maps;
+import com.google.gwt.thirdparty.guava.common.io.Files;
import java.io.File;
import java.io.IOException;
diff --git a/eclipse/dev/.classpath b/eclipse/dev/.classpath
index 4aa5cfb..00a2632 100644
--- a/eclipse/dev/.classpath
+++ b/eclipse/dev/.classpath
@@ -21,11 +21,12 @@
<classpathentry kind="var" path="GWT_TOOLS/lib/tomcat/jsp-api-2.0.jar"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/htmlunit/htmlunit-2.13/htmlunit-core-js-2.13.jar"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/htmlunit/htmlunit-2.13/htmlunit-2.13.jar"/>
- <classpathentry kind="var" path="GWT_TOOLS/lib/protobuf/protobuf-2.5.0/protobuf-java-2.5.0.jar"/>
- <classpathentry kind="var" path="GWT_TOOLS/lib/guava/guava-18.0/guava-18.0.jar"/>
- <classpathentry kind="var" path="GWT_TOOLS/lib/jscomp/20150201/compiler-stripped.jar"/>
+ <classpathentry kind="var" path="GWT_TOOLS/lib/protobuf/protobuf-2.5.0/protobuf-java-rebased-2.5.0.jar"/>
+ <classpathentry kind="var" path="GWT_TOOLS/lib/guava/guava-16.0.1/guava-16.0.1-rebased.jar"/>
+ <classpathentry kind="var" path="GWT_TOOLS/lib/jscomp/20131118.json.rebased/sourcemap-rebased.jar"/>
+ <classpathentry kind="var" path="GWT_TOOLS/lib/jscomp/20131118.json.rebased/compiler-rebased.jar"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/json/android-sdk-19.1/json-android-rebased.jar"/>
- <classpathentry kind="var" path="GWT_TOOLS/lib/apache/commons/commons-collections-3.2.1.jar"/>
+ <classpathentry kind="var" path="GWT_TOOLS/lib/apache/commons/commons-collections-3.2.1.jar"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/jetty/jetty-8.1.12.v20130726/servlet-api-3.0-NoMetaInf.jar"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/colt/colt-1.2.jar" sourcepath="/GWT_TOOLS/lib/colt/colt-1.2-src.jar"/>
<classpathentry kind="output" path="bin"/>
diff --git a/eclipse/dev/codeserver/.classpath b/eclipse/dev/codeserver/.classpath
index 7eeb56a..0318d20 100644
--- a/eclipse/dev/codeserver/.classpath
+++ b/eclipse/dev/codeserver/.classpath
@@ -4,8 +4,9 @@
<classpathentry kind="src" path="codeserver/javatests"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/jetty/jetty-8.1.12.v20130726/jetty-8.1.12.v20130726.jar"/>
- <classpathentry kind="var" path="GWT_TOOLS/lib/guava/guava-18.0/guava-18.0.jar"/>
- <classpathentry kind="var" path="GWT_TOOLS/lib/jscomp/20150201/compiler-stripped.jar"/>
+ <classpathentry kind="var" path="GWT_TOOLS/lib/guava/guava-16.0.1/guava-16.0.1-rebased.jar"/>
+ <classpathentry kind="var" path="GWT_TOOLS/lib/jscomp/20131118.json.rebased/sourcemap-rebased.jar"/>
+ <classpathentry kind="var" path="GWT_TOOLS/lib/jscomp/20131118.json.rebased/compiler-rebased.jar"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/jetty/jetty-8.1.12.v20130726/servlet-api-3.0-NoMetaInf.jar"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/junit/junit-4.8.2.jar" sourcepath="/GWT_TOOLS/lib/junit/junit-4.8.2-src.zip"/>
<classpathentry combineaccessrules="false" kind="src" path="/gwt-dev"/>
diff --git a/eclipse/user/.classpath b/eclipse/user/.classpath
index 4b3d8dd..c2440a5 100644
--- a/eclipse/user/.classpath
+++ b/eclipse/user/.classpath
@@ -20,7 +20,7 @@
<classpathentry kind="var" path="GWT_TOOLS/lib/apache/commons/commons-logging-1.1.1.jar"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/apache/commons/commons-io-2.4.jar"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/cssparser/cssparser-0.9.11.jar"/>
- <classpathentry kind="var" path="GWT_TOOLS/lib/gss/2015-02-13/closure-stylesheets-library-20150213.jar"/>
+ <classpathentry kind="var" path="GWT_TOOLS/lib/gss/2014-09-11/closure-stylesheets-rebased.jar"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/mockito/1.9.5/mockito-all-1.9.5.jar"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/nekohtml/nekohtml-1.9.19.jar"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/selenium/selenium-java-client-driver.jar" sourcepath="/GWT_TOOLS/lib/selenium/selenium-java-client-driver-sources.jar"/>
@@ -46,8 +46,8 @@
<classpathentry kind="var" path="GWT_TOOLS/lib/apache/log4j/log4j-1.2.16.jar"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/slf4j/slf4j-api/slf4j-api-1.6.1.jar"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/slf4j/slf4j-log4j12/slf4j-log4j12-1.6.1.jar"/>
- <classpathentry kind="var" path="GWT_TOOLS/lib/guava/guava-18.0/guava-18.0.jar"/>
- <classpathentry kind="var" path="GWT_TOOLS/lib/streamhtmlparser/streamhtmlparser-jsilver-r10/streamhtmlparser-jsilver-r10-1.5.jar"/>
+ <classpathentry kind="var" path="GWT_TOOLS/lib/guava/guava-16.0.1/guava-16.0.1-rebased.jar"/>
+ <classpathentry kind="var" path="GWT_TOOLS/lib/streamhtmlparser/streamhtmlparser-jsilver-r10/streamhtmlparser-jsilver-r10-1.5-rebased.jar"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/icu4j/50.1.1/icu4j.jar"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/javax/activation/activation-1.1.jar"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/javax/xml/bind/jaxb-api-2.1.jar"/>
@@ -61,8 +61,8 @@
<classpathentry kind="var" path="GWT_TOOLS/lib/jboss/test-harness/jboss-test-harness-api-1.0.0.jar" sourcepath="/GWT_TOOLS/lib/jboss/test-harness/jboss-test-harness-api-1.0.0-sources.jar"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/testng/testng-5.14.1-sources.jar"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/testng/testng-5.14.1-nojunit.jar" sourcepath="/GWT_TOOLS/lib/testng/testng-5.14.1-sources.jar"/>
- <classpathentry kind="var" path="GWT_TOOLS/lib/protobuf/protobuf-2.5.0/protobuf-java-2.5.0.jar"/>
- <classpathentry kind="var" path="GWT_TOOLS/lib/jscomp/20150201/compiler-rebased.jar"/>
+ <classpathentry kind="var" path="GWT_TOOLS/lib/protobuf/protobuf-2.5.0/protobuf-java-rebased-2.5.0.jar"/>
+ <classpathentry kind="var" path="GWT_TOOLS/lib/jscomp/20131118.json.rebased/sourcemap-rebased.jar"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/eclipse/org.eclipse.jdt.core_3.11.0.v20150126-2015.jar"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/eclipse/jdtCompilerAdapter_3.11.0.v20150126-2015.jar"/>
<classpathentry kind="output" path="bin"/>
diff --git a/user/BUILD b/user/BUILD
index 74379ab..72025a7 100644
--- a/user/BUILD
+++ b/user/BUILD
@@ -55,30 +55,6 @@
wrap_javalibrary = 0,
)
-GSS_DEPS = [
- "//java/com/google/common/css",
- "//java/com/google/common/css/compiler/ast",
- "//java/com/google/common/css/compiler/ast:gssparser",
- "//java/com/google/common/css/compiler/gssfunctions",
- "//java/com/google/common/css/compiler/passes",
-]
-
-GUAVA_DEPS = [
- "//java/com/google/common/annotations",
- "//java/com/google/common/base",
- "//java/com/google/common/collect",
- "//java/com/google/common/io",
- "//java/com/google/common/primitives",
-]
-
-JS_COMP_DEPS = [
- "//java/com/google/javascript/jscomp",
- "//third_party/java_src/jscomp/java/com/google/debugging/sourcemap:common",
- "//third_party/java_src/jscomp/java/com/google/debugging/sourcemap:consumption",
- "//third_party/java_src/jscomp/java/com/google/debugging/sourcemap:shared",
- "//third_party/java_src/jscomp/java/com/google/debugging/sourcemap/proto:mapping_proto",
-]
-
# The gwt-user classes for GWT internal use only.
# They must be jarjar-ed and dependencies stripped before exposing to google3.
java_library(
@@ -97,7 +73,7 @@
"//third_party/java_src/gwt/svn/tools:user_deps",
"//third_party/java_src/gwt/svn/trunk/dev:compiler.standalone.super",
"//third_party/java_src/gwt/svn/trunk/dev:gwt-dev-bare",
- ] + JS_COMP_DEPS + GUAVA_DEPS + GSS_DEPS,
+ ],
)
# This target is used by a java_plugin over in java/gwt/BUILD. It's
@@ -387,7 +363,7 @@
"//third_party/java_src/gwt/svn/tools:servlet_deps",
"//third_party/java_src/gwt/svn/trunk/dev:compiler.standalone.super",
"//third_party/java_src/gwt/svn/trunk/dev:servlet-deps",
- ] + JS_COMP_DEPS + GUAVA_DEPS,
+ ],
)
# The minimum requirements for GWT-RPC serializable object definition.
@@ -477,8 +453,6 @@
),
deps = [
":gwt-user-bare",
- "//java/com/google/common/base",
- "//java/com/google/common/collect",
"//third_party/java/junit",
"//third_party/java_src/gwt/svn/tools:dev_deps",
"//third_party/java_src/gwt/svn/tools:servlet_api_3",
@@ -550,7 +524,7 @@
"//third_party/java/jsr305_annotations",
"//third_party/java/junit",
"//third_party/java_src/gwt/svn/tools:testtool_deps",
- ] + GUAVA_DEPS + GSS_DEPS,
+ ],
)
# This target should only be dependent from platform tests that care about tck.
@@ -574,8 +548,6 @@
],
dojarjar = 1,
deps = [
- "//java/com/google/common/base",
- "//java/com/google/common/collect",
"//third_party/java/junit",
"//third_party/java_src/gwt/svn/tools:validator_deps",
"//third_party/java_src/gwt/svn/tools:validator_tck_deps",
diff --git a/user/build.xml b/user/build.xml
index b36f730..395834b 100755
--- a/user/build.xml
+++ b/user/build.xml
@@ -64,7 +64,7 @@
<pathelement location="${gwt.tools.lib}/slf4j/slf4j-api/slf4j-api-1.6.1.jar"/>
<pathelement location="${gwt.tools.lib}/slf4j/slf4j-log4j12/slf4j-log4j12-1.6.1.jar"/>
<pathelement
- location="${gwt.tools.lib}/streamhtmlparser/streamhtmlparser-jsilver-r10/streamhtmlparser-jsilver-r10-1.5.jar"/>
+ location="${gwt.tools.lib}/streamhtmlparser/streamhtmlparser-jsilver-r10/streamhtmlparser-jsilver-r10-1.5-rebased.jar"/>
<!-- TCK jars -->
<pathelement
location="${gwt.tools.lib}/hibernate/validator/tck/jsr303-tck-1.0.3.GA-sources.jar"/>
@@ -81,7 +81,7 @@
<pathelement location="${gwt.tools.lib}/testng/testng-5.14.1-sources.jar"/>
<pathelement location="${gwt.tools.lib}/testng/testng-5.14.1-nojunit.jar"/>
<pathelement location="${gwt.dev.jar}"/>
- <pathelement location="${gwt.tools.lib}/gss/2015-02-13/closure-stylesheets-library-20150213.jar"/>
+ <pathelement location="${gwt.tools.lib}/gss/2014-09-11/closure-stylesheets-rebased.jar"/>
</path>
<target name="compile" description="Compile all class files"
@@ -89,7 +89,7 @@
<mkdir dir="${javac.out}"/>
<gwt.javac excludes="**/super/**">
<classpath>
- <pathelement location="${gwt.tools.lib}/gss/2015-02-13/closure-stylesheets-library-20150213.jar"/>
+ <pathelement location="${gwt.tools.lib}/gss/2014-09-11/closure-stylesheets-rebased.jar"/>
<pathelement
location="${gwt.tools.lib}/jetty/jetty-8.1.12.v20130726/servlet-api-3.0-NoMetaInf.jar"/>
<pathelement location="${gwt.tools.lib}/junit/junit-4.8.2.jar"/>
@@ -106,7 +106,7 @@
<pathelement
location="${gwt.tools.lib}/hibernate/validator/hibernate-validator-4.1.0.Final-sources.jar"/>
<pathelement
- location="${gwt.tools.lib}/streamhtmlparser/streamhtmlparser-jsilver-r10/streamhtmlparser-jsilver-r10-1.5.jar"/>
+ location="${gwt.tools.lib}/streamhtmlparser/streamhtmlparser-jsilver-r10/streamhtmlparser-jsilver-r10-1.5-rebased.jar"/>
<pathelement location="${gwt.dev.jar}"/>
</classpath>
</gwt.javac>
@@ -151,8 +151,8 @@
<zipfileset src="${gwt.tools.lib}/w3c/sac/sac-1.3.jar"/>
<zipfileset src="${gwt.tools.lib}/w3c/flute/flute-1.3-gg2.jar"/>
<zipfileset
- src="${gwt.tools.lib}/streamhtmlparser/streamhtmlparser-jsilver-r10/streamhtmlparser-jsilver-r10-1.5.jar"/>
- <zipfileset src="${gwt.tools.lib}/gss/2015-02-13/closure-stylesheets-library-20150213.jar"/>
+ src="${gwt.tools.lib}/streamhtmlparser/streamhtmlparser-jsilver-r10/streamhtmlparser-jsilver-r10-1.5-rebased.jar"/>
+ <zipfileset src="${gwt.tools.lib}/gss/2014-09-11/closure-stylesheets-rebased.jar"/>
</gwt.jar>
</target>
diff --git a/user/src/com/google/gwt/core/server/StackTraceDeobfuscator.java b/user/src/com/google/gwt/core/server/StackTraceDeobfuscator.java
index b03e87f..967913e 100644
--- a/user/src/com/google/gwt/core/server/StackTraceDeobfuscator.java
+++ b/user/src/com/google/gwt/core/server/StackTraceDeobfuscator.java
@@ -15,9 +15,9 @@
*/
package com.google.gwt.core.server;
-import com.google.debugging.sourcemap.SourceMapConsumerFactory;
-import com.google.debugging.sourcemap.SourceMapping;
-import com.google.debugging.sourcemap.proto.Mapping;
+import com.google.gwt.thirdparty.debugging.sourcemap.SourceMapConsumerFactory;
+import com.google.gwt.thirdparty.debugging.sourcemap.SourceMapping;
+import com.google.gwt.thirdparty.debugging.sourcemap.proto.Mapping;
import java.io.BufferedReader;
import java.io.File;
diff --git a/user/src/com/google/gwt/junit/JUnitShell.java b/user/src/com/google/gwt/junit/JUnitShell.java
index 8fd1fb4..b43614a 100644
--- a/user/src/com/google/gwt/junit/JUnitShell.java
+++ b/user/src/com/google/gwt/junit/JUnitShell.java
@@ -15,8 +15,6 @@
*/
package com.google.gwt.junit;
-import com.google.common.base.Splitter;
-import com.google.common.collect.ImmutableSet;
import com.google.gwt.core.ext.Linker;
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.core.ext.TreeLogger.Type;
@@ -71,6 +69,8 @@
import com.google.gwt.junit.client.TimeoutException;
import com.google.gwt.junit.client.impl.JUnitHost.TestInfo;
import com.google.gwt.junit.client.impl.JUnitResult;
+import com.google.gwt.thirdparty.guava.common.base.Splitter;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableSet;
import com.google.gwt.util.tools.ArgHandlerFlag;
import com.google.gwt.util.tools.ArgHandlerInt;
import com.google.gwt.util.tools.ArgHandlerString;
diff --git a/user/src/com/google/gwt/junit/RunStyleHtmlUnit.java b/user/src/com/google/gwt/junit/RunStyleHtmlUnit.java
index 2ade4eb..3297431 100644
--- a/user/src/com/google/gwt/junit/RunStyleHtmlUnit.java
+++ b/user/src/com/google/gwt/junit/RunStyleHtmlUnit.java
@@ -1,12 +1,12 @@
/*
* Copyright 2009 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
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -15,10 +15,10 @@
*/
package com.google.gwt.junit;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Maps;
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.dev.shell.HostedModePluginObject;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableSet;
+import com.google.gwt.thirdparty.guava.common.collect.Maps;
import com.gargoylesoftware.htmlunit.AlertHandler;
import com.gargoylesoftware.htmlunit.BrowserVersion;
diff --git a/user/src/com/google/gwt/resources/converter/Css2Gss.java b/user/src/com/google/gwt/resources/converter/Css2Gss.java
index 63a71d9..cec6e1b 100644
--- a/user/src/com/google/gwt/resources/converter/Css2Gss.java
+++ b/user/src/com/google/gwt/resources/converter/Css2Gss.java
@@ -15,12 +15,6 @@
*/
package com.google.gwt.resources.converter;
-import com.google.common.base.Predicate;
-import com.google.common.base.Predicates;
-import com.google.common.base.Splitter;
-import com.google.common.collect.FluentIterable;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.io.Files;
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.core.ext.TreeLogger.Type;
import com.google.gwt.core.ext.UnableToCompleteException;
@@ -28,6 +22,12 @@
import com.google.gwt.dev.util.log.PrintWriterTreeLogger;
import com.google.gwt.resources.css.GenerateCssAst;
import com.google.gwt.resources.css.ast.CssStylesheet;
+import com.google.gwt.thirdparty.guava.common.base.Predicate;
+import com.google.gwt.thirdparty.guava.common.base.Predicates;
+import com.google.gwt.thirdparty.guava.common.base.Splitter;
+import com.google.gwt.thirdparty.guava.common.collect.FluentIterable;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableSet;
+import com.google.gwt.thirdparty.guava.common.io.Files;
import org.apache.commons.io.Charsets;
import org.apache.commons.io.FileUtils;
diff --git a/user/src/com/google/gwt/resources/converter/DefCollectorVisitor.java b/user/src/com/google/gwt/resources/converter/DefCollectorVisitor.java
index 9ba6cc9..7190cd5 100644
--- a/user/src/com/google/gwt/resources/converter/DefCollectorVisitor.java
+++ b/user/src/com/google/gwt/resources/converter/DefCollectorVisitor.java
@@ -15,9 +15,6 @@
*/
package com.google.gwt.resources.converter;
-import com.google.common.base.Strings;
-import com.google.common.collect.BiMap;
-import com.google.common.collect.HashBiMap;
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.core.ext.TreeLogger.Type;
import com.google.gwt.resources.css.ast.Context;
@@ -25,6 +22,9 @@
import com.google.gwt.resources.css.ast.CssEval;
import com.google.gwt.resources.css.ast.CssUrl;
import com.google.gwt.resources.css.ast.CssVisitor;
+import com.google.gwt.thirdparty.guava.common.base.Strings;
+import com.google.gwt.thirdparty.guava.common.collect.BiMap;
+import com.google.gwt.thirdparty.guava.common.collect.HashBiMap;
import java.util.LinkedList;
import java.util.List;
diff --git a/user/src/com/google/gwt/resources/converter/GssGenerationVisitor.java b/user/src/com/google/gwt/resources/converter/GssGenerationVisitor.java
index 182a1e4..f266d18 100644
--- a/user/src/com/google/gwt/resources/converter/GssGenerationVisitor.java
+++ b/user/src/com/google/gwt/resources/converter/GssGenerationVisitor.java
@@ -15,12 +15,6 @@
*/
package com.google.gwt.resources.converter;
-import com.google.common.base.Predicate;
-import com.google.common.base.Splitter;
-import com.google.common.base.Strings;
-import com.google.common.css.SourceCode;
-import com.google.common.css.compiler.ast.GssParser;
-import com.google.common.css.compiler.ast.GssParserException;
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.core.ext.TreeLogger.Type;
import com.google.gwt.dev.util.TextOutput;
@@ -43,6 +37,12 @@
import com.google.gwt.resources.css.ast.CssSprite;
import com.google.gwt.resources.css.ast.CssUnknownAtRule;
import com.google.gwt.resources.css.ast.CssUrl;
+import com.google.gwt.thirdparty.common.css.SourceCode;
+import com.google.gwt.thirdparty.common.css.compiler.ast.GssParser;
+import com.google.gwt.thirdparty.common.css.compiler.ast.GssParserException;
+import com.google.gwt.thirdparty.guava.common.base.Predicate;
+import com.google.gwt.thirdparty.guava.common.base.Splitter;
+import com.google.gwt.thirdparty.guava.common.base.Strings;
import java.util.ArrayList;
import java.util.List;
diff --git a/user/src/com/google/gwt/resources/converter/UndefinedConstantVisitor.java b/user/src/com/google/gwt/resources/converter/UndefinedConstantVisitor.java
index 57c7a6f..83d38da 100644
--- a/user/src/com/google/gwt/resources/converter/UndefinedConstantVisitor.java
+++ b/user/src/com/google/gwt/resources/converter/UndefinedConstantVisitor.java
@@ -15,8 +15,6 @@
*/
package com.google.gwt.resources.converter;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Sets;
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.core.ext.TreeLogger.Type;
import com.google.gwt.resources.css.ast.Context;
@@ -27,6 +25,8 @@
import com.google.gwt.resources.css.ast.CssProperty.Value;
import com.google.gwt.resources.css.ast.CssRule;
import com.google.gwt.resources.css.ast.CssVisitor;
+import com.google.gwt.thirdparty.guava.common.base.Preconditions;
+import com.google.gwt.thirdparty.guava.common.collect.Sets;
import java.util.ArrayList;
import java.util.List;
diff --git a/user/src/com/google/gwt/resources/gss/BooleanConditionCollector.java b/user/src/com/google/gwt/resources/gss/BooleanConditionCollector.java
index 87d8869..5d06d5e 100644
--- a/user/src/com/google/gwt/resources/gss/BooleanConditionCollector.java
+++ b/user/src/com/google/gwt/resources/gss/BooleanConditionCollector.java
@@ -16,11 +16,11 @@
package com.google.gwt.resources.gss;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.css.compiler.ast.CssBooleanExpressionNode;
-import com.google.common.css.compiler.ast.CssBooleanExpressionNode.Type;
-import com.google.common.css.compiler.ast.CssCompilerPass;
-import com.google.common.css.compiler.ast.MutatingVisitController;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssBooleanExpressionNode;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssBooleanExpressionNode.Type;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssCompilerPass;
+import com.google.gwt.thirdparty.common.css.compiler.ast.MutatingVisitController;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableSet;
import java.util.HashSet;
import java.util.Set;
diff --git a/user/src/com/google/gwt/resources/gss/ClassNamesCollector.java b/user/src/com/google/gwt/resources/gss/ClassNamesCollector.java
index 86a3634..610ef26 100644
--- a/user/src/com/google/gwt/resources/gss/ClassNamesCollector.java
+++ b/user/src/com/google/gwt/resources/gss/ClassNamesCollector.java
@@ -15,12 +15,12 @@
*/
package com.google.gwt.resources.gss;
-import com.google.common.base.Preconditions;
-import com.google.common.css.compiler.ast.CssClassSelectorNode;
-import com.google.common.css.compiler.ast.CssTree;
-import com.google.common.css.compiler.ast.DefaultTreeVisitor;
import com.google.gwt.core.ext.typeinfo.JClassType;
import com.google.gwt.resources.rg.GssResourceGenerator;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssClassSelectorNode;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssTree;
+import com.google.gwt.thirdparty.common.css.compiler.ast.DefaultTreeVisitor;
+import com.google.gwt.thirdparty.guava.common.base.Preconditions;
import java.util.HashSet;
import java.util.Set;
diff --git a/user/src/com/google/gwt/resources/gss/ConstantResolver.java b/user/src/com/google/gwt/resources/gss/ConstantResolver.java
index 352b971..22a92dd 100644
--- a/user/src/com/google/gwt/resources/gss/ConstantResolver.java
+++ b/user/src/com/google/gwt/resources/gss/ConstantResolver.java
@@ -15,15 +15,15 @@
*/
package com.google.gwt.resources.gss;
-import com.google.common.css.compiler.ast.CssCompilerPass;
-import com.google.common.css.compiler.ast.CssConstantReferenceNode;
-import com.google.common.css.compiler.ast.CssDefinitionNode;
-import com.google.common.css.compiler.ast.CssTree;
-import com.google.common.css.compiler.ast.CssValueNode;
-import com.google.common.css.compiler.ast.DefaultTreeVisitor;
-import com.google.common.css.compiler.ast.MutatingVisitController;
-import com.google.common.css.compiler.passes.CollectConstantDefinitions;
-import com.google.common.css.compiler.passes.ConstantDefinitions;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssCompilerPass;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssConstantReferenceNode;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssDefinitionNode;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssTree;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssValueNode;
+import com.google.gwt.thirdparty.common.css.compiler.ast.DefaultTreeVisitor;
+import com.google.gwt.thirdparty.common.css.compiler.ast.MutatingVisitController;
+import com.google.gwt.thirdparty.common.css.compiler.passes.CollectConstantDefinitions;
+import com.google.gwt.thirdparty.common.css.compiler.passes.ConstantDefinitions;
import java.util.ArrayList;
import java.util.List;
diff --git a/user/src/com/google/gwt/resources/gss/CreateRuntimeConditionalNodes.java b/user/src/com/google/gwt/resources/gss/CreateRuntimeConditionalNodes.java
index 3f7b242..6cf0fa0 100644
--- a/user/src/com/google/gwt/resources/gss/CreateRuntimeConditionalNodes.java
+++ b/user/src/com/google/gwt/resources/gss/CreateRuntimeConditionalNodes.java
@@ -15,17 +15,17 @@
*/
package com.google.gwt.resources.gss;
-import com.google.common.collect.Lists;
-import com.google.common.css.compiler.ast.CssAtRuleNode.Type;
-import com.google.common.css.compiler.ast.CssBooleanExpressionNode;
-import com.google.common.css.compiler.ast.CssCompilerPass;
-import com.google.common.css.compiler.ast.CssConditionalBlockNode;
-import com.google.common.css.compiler.ast.CssConditionalRuleNode;
-import com.google.common.css.compiler.ast.CssValueNode;
-import com.google.common.css.compiler.ast.DefaultTreeVisitor;
-import com.google.common.css.compiler.ast.MutatingVisitController;
import com.google.gwt.resources.gss.ast.CssJavaExpressionNode;
import com.google.gwt.resources.gss.ast.CssRuntimeConditionalRuleNode;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssAtRuleNode.Type;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssBooleanExpressionNode;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssCompilerPass;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssConditionalBlockNode;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssConditionalRuleNode;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssValueNode;
+import com.google.gwt.thirdparty.common.css.compiler.ast.DefaultTreeVisitor;
+import com.google.gwt.thirdparty.common.css.compiler.ast.MutatingVisitController;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
import java.util.List;
import java.util.regex.Matcher;
diff --git a/user/src/com/google/gwt/resources/gss/CssPrinter.java b/user/src/com/google/gwt/resources/gss/CssPrinter.java
index c41be1c..c5b69e2 100644
--- a/user/src/com/google/gwt/resources/gss/CssPrinter.java
+++ b/user/src/com/google/gwt/resources/gss/CssPrinter.java
@@ -15,18 +15,18 @@
*/
package com.google.gwt.resources.gss;
-import com.google.common.css.compiler.ast.CssAtRuleNode.Type;
-import com.google.common.css.compiler.ast.CssConditionalBlockNode;
-import com.google.common.css.compiler.ast.CssConditionalRuleNode;
-import com.google.common.css.compiler.ast.CssNode;
-import com.google.common.css.compiler.ast.CssRootNode;
-import com.google.common.css.compiler.ast.CssTree;
-import com.google.common.css.compiler.ast.CssValueNode;
-import com.google.common.css.compiler.passes.CompactPrinter;
import com.google.gwt.core.ext.Generator;
import com.google.gwt.resources.gss.ast.CssDotPathNode;
import com.google.gwt.resources.gss.ast.CssJavaExpressionNode;
import com.google.gwt.resources.gss.ast.CssRuntimeConditionalRuleNode;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssAtRuleNode.Type;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssConditionalBlockNode;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssConditionalRuleNode;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssNode;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssRootNode;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssTree;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssValueNode;
+import com.google.gwt.thirdparty.common.css.compiler.passes.CompactPrinter;
import java.util.Stack;
diff --git a/user/src/com/google/gwt/resources/gss/EvalFunction.java b/user/src/com/google/gwt/resources/gss/EvalFunction.java
index 110ec61..1fd8fc7 100644
--- a/user/src/com/google/gwt/resources/gss/EvalFunction.java
+++ b/user/src/com/google/gwt/resources/gss/EvalFunction.java
@@ -15,13 +15,13 @@
*/
package com.google.gwt.resources.gss;
-import com.google.common.collect.ImmutableList;
-import com.google.common.css.SourceCodeLocation;
-import com.google.common.css.compiler.ast.CssValueNode;
-import com.google.common.css.compiler.ast.ErrorManager;
-import com.google.common.css.compiler.ast.GssFunction;
-import com.google.common.css.compiler.ast.GssFunctionException;
import com.google.gwt.resources.gss.ast.CssJavaExpressionNode;
+import com.google.gwt.thirdparty.common.css.SourceCodeLocation;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssValueNode;
+import com.google.gwt.thirdparty.common.css.compiler.ast.ErrorManager;
+import com.google.gwt.thirdparty.common.css.compiler.ast.GssFunction;
+import com.google.gwt.thirdparty.common.css.compiler.ast.GssFunctionException;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableList;
import java.util.List;
diff --git a/user/src/com/google/gwt/resources/gss/ExtendedConditionalNodeVisitor.java b/user/src/com/google/gwt/resources/gss/ExtendedConditionalNodeVisitor.java
index 672f39a..dd6f209 100644
--- a/user/src/com/google/gwt/resources/gss/ExtendedConditionalNodeVisitor.java
+++ b/user/src/com/google/gwt/resources/gss/ExtendedConditionalNodeVisitor.java
@@ -16,10 +16,10 @@
package com.google.gwt.resources.gss;
-import com.google.common.css.compiler.ast.CssBooleanExpressionNode;
-import com.google.common.css.compiler.ast.CssConditionalRuleNode;
-import com.google.common.css.compiler.ast.CssValueNode;
-import com.google.common.css.compiler.ast.DefaultTreeVisitor;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssBooleanExpressionNode;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssConditionalRuleNode;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssValueNode;
+import com.google.gwt.thirdparty.common.css.compiler.ast.DefaultTreeVisitor;
import java.util.Stack;
diff --git a/user/src/com/google/gwt/resources/gss/ExtendedEliminateConditionalNodes.java b/user/src/com/google/gwt/resources/gss/ExtendedEliminateConditionalNodes.java
index 34ee9cc..54fdb4a 100644
--- a/user/src/com/google/gwt/resources/gss/ExtendedEliminateConditionalNodes.java
+++ b/user/src/com/google/gwt/resources/gss/ExtendedEliminateConditionalNodes.java
@@ -15,16 +15,16 @@
*/
package com.google.gwt.resources.gss;
-import com.google.common.collect.Lists;
-import com.google.common.css.compiler.ast.CssAtRuleNode.Type;
-import com.google.common.css.compiler.ast.CssBooleanExpressionNode;
-import com.google.common.css.compiler.ast.CssCompilerPass;
-import com.google.common.css.compiler.ast.CssConditionalBlockNode;
-import com.google.common.css.compiler.ast.CssConditionalRuleNode;
-import com.google.common.css.compiler.ast.MutatingVisitController;
-import com.google.common.css.compiler.passes.BooleanExpressionEvaluator;
-import com.google.common.css.compiler.passes.EliminateConditionalNodes;
import com.google.gwt.resources.gss.ast.CssRuntimeConditionalRuleNode;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssAtRuleNode.Type;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssBooleanExpressionNode;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssCompilerPass;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssConditionalBlockNode;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssConditionalRuleNode;
+import com.google.gwt.thirdparty.common.css.compiler.ast.MutatingVisitController;
+import com.google.gwt.thirdparty.common.css.compiler.passes.BooleanExpressionEvaluator;
+import com.google.gwt.thirdparty.common.css.compiler.passes.EliminateConditionalNodes;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
import java.util.ArrayList;
import java.util.HashSet;
diff --git a/user/src/com/google/gwt/resources/gss/ExternalClassesCollector.java b/user/src/com/google/gwt/resources/gss/ExternalClassesCollector.java
index c2c286d..ab36ebe 100644
--- a/user/src/com/google/gwt/resources/gss/ExternalClassesCollector.java
+++ b/user/src/com/google/gwt/resources/gss/ExternalClassesCollector.java
@@ -15,20 +15,20 @@
*/
package com.google.gwt.resources.gss;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.ImmutableSet.Builder;
-import com.google.common.css.SourceCodeLocation;
-import com.google.common.css.compiler.ast.CssClassSelectorNode;
-import com.google.common.css.compiler.ast.CssCompilerPass;
-import com.google.common.css.compiler.ast.CssCompositeValueNode;
-import com.google.common.css.compiler.ast.CssLiteralNode;
-import com.google.common.css.compiler.ast.CssStringNode;
-import com.google.common.css.compiler.ast.CssUnknownAtRuleNode;
-import com.google.common.css.compiler.ast.CssValueNode;
-import com.google.common.css.compiler.ast.DefaultTreeVisitor;
-import com.google.common.css.compiler.ast.ErrorManager;
-import com.google.common.css.compiler.ast.GssError;
-import com.google.common.css.compiler.ast.MutatingVisitController;
+import com.google.gwt.thirdparty.common.css.SourceCodeLocation;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssClassSelectorNode;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssCompilerPass;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssCompositeValueNode;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssLiteralNode;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssStringNode;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssUnknownAtRuleNode;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssValueNode;
+import com.google.gwt.thirdparty.common.css.compiler.ast.DefaultTreeVisitor;
+import com.google.gwt.thirdparty.common.css.compiler.ast.ErrorManager;
+import com.google.gwt.thirdparty.common.css.compiler.ast.GssError;
+import com.google.gwt.thirdparty.common.css.compiler.ast.MutatingVisitController;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableSet;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableSet.Builder;
import java.util.ArrayList;
import java.util.HashSet;
diff --git a/user/src/com/google/gwt/resources/gss/GwtGssFunctionMapProvider.java b/user/src/com/google/gwt/resources/gss/GwtGssFunctionMapProvider.java
index 7e37c58..4195748 100644
--- a/user/src/com/google/gwt/resources/gss/GwtGssFunctionMapProvider.java
+++ b/user/src/com/google/gwt/resources/gss/GwtGssFunctionMapProvider.java
@@ -15,10 +15,10 @@
*/
package com.google.gwt.resources.gss;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.css.compiler.ast.GssFunction;
-import com.google.common.css.compiler.gssfunctions.DefaultGssFunctionMapProvider;
import com.google.gwt.resources.ext.ResourceContext;
+import com.google.gwt.thirdparty.common.css.compiler.ast.GssFunction;
+import com.google.gwt.thirdparty.common.css.compiler.gssfunctions.DefaultGssFunctionMapProvider;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableMap;
import java.util.Map;
diff --git a/user/src/com/google/gwt/resources/gss/ImageSpriteCreator.java b/user/src/com/google/gwt/resources/gss/ImageSpriteCreator.java
index 0182990..fbd56b0 100644
--- a/user/src/com/google/gwt/resources/gss/ImageSpriteCreator.java
+++ b/user/src/com/google/gwt/resources/gss/ImageSpriteCreator.java
@@ -15,27 +15,8 @@
*/
package com.google.gwt.resources.gss;
-import static com.google.common.css.compiler.passes.PassUtil.ALTERNATE;
+import static com.google.gwt.thirdparty.common.css.compiler.passes.PassUtil.ALTERNATE;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableList.Builder;
-import com.google.common.collect.Lists;
-import com.google.common.css.SourceCodeLocation;
-import com.google.common.css.compiler.ast.CssCommentNode;
-import com.google.common.css.compiler.ast.CssCompilerPass;
-import com.google.common.css.compiler.ast.CssDeclarationNode;
-import com.google.common.css.compiler.ast.CssFunctionArgumentsNode;
-import com.google.common.css.compiler.ast.CssFunctionNode;
-import com.google.common.css.compiler.ast.CssFunctionNode.Function;
-import com.google.common.css.compiler.ast.CssLiteralNode;
-import com.google.common.css.compiler.ast.CssPropertyNode;
-import com.google.common.css.compiler.ast.CssPropertyValueNode;
-import com.google.common.css.compiler.ast.CssValueNode;
-import com.google.common.css.compiler.ast.DefaultTreeVisitor;
-import com.google.common.css.compiler.ast.ErrorManager;
-import com.google.common.css.compiler.ast.GssError;
-import com.google.common.css.compiler.ast.MutatingVisitController;
import com.google.gwt.core.ext.typeinfo.JClassType;
import com.google.gwt.core.ext.typeinfo.JMethod;
import com.google.gwt.core.ext.typeinfo.JType;
@@ -46,6 +27,25 @@
import com.google.gwt.resources.ext.ResourceContext;
import com.google.gwt.resources.ext.ResourceGeneratorUtil;
import com.google.gwt.resources.gss.ast.CssDotPathNode;
+import com.google.gwt.thirdparty.common.css.SourceCodeLocation;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssCommentNode;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssCompilerPass;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssDeclarationNode;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssFunctionArgumentsNode;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssFunctionNode;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssFunctionNode.Function;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssLiteralNode;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssPropertyNode;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssPropertyValueNode;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssValueNode;
+import com.google.gwt.thirdparty.common.css.compiler.ast.DefaultTreeVisitor;
+import com.google.gwt.thirdparty.common.css.compiler.ast.ErrorManager;
+import com.google.gwt.thirdparty.common.css.compiler.ast.GssError;
+import com.google.gwt.thirdparty.common.css.compiler.ast.MutatingVisitController;
+import com.google.gwt.thirdparty.guava.common.annotations.VisibleForTesting;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableList;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableList.Builder;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
import java.util.List;
diff --git a/user/src/com/google/gwt/resources/gss/PermutationsCollector.java b/user/src/com/google/gwt/resources/gss/PermutationsCollector.java
index 6bad83f..5caed99 100644
--- a/user/src/com/google/gwt/resources/gss/PermutationsCollector.java
+++ b/user/src/com/google/gwt/resources/gss/PermutationsCollector.java
@@ -15,11 +15,11 @@
*/
package com.google.gwt.resources.gss;
-import com.google.common.collect.ImmutableList;
-import com.google.common.css.compiler.ast.CssBooleanExpressionNode;
-import com.google.common.css.compiler.ast.CssBooleanExpressionNode.Type;
-import com.google.common.css.compiler.ast.CssCompilerPass;
-import com.google.common.css.compiler.ast.MutatingVisitController;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssBooleanExpressionNode;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssBooleanExpressionNode.Type;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssCompilerPass;
+import com.google.gwt.thirdparty.common.css.compiler.ast.MutatingVisitController;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableList;
import java.util.HashSet;
import java.util.List;
diff --git a/user/src/com/google/gwt/resources/gss/RecordingBidiFlipper.java b/user/src/com/google/gwt/resources/gss/RecordingBidiFlipper.java
index af8ec51..638f378 100644
--- a/user/src/com/google/gwt/resources/gss/RecordingBidiFlipper.java
+++ b/user/src/com/google/gwt/resources/gss/RecordingBidiFlipper.java
@@ -15,20 +15,20 @@
*/
package com.google.gwt.resources.gss;
-import com.google.common.base.Objects;
-import com.google.common.css.compiler.ast.CssCompilerPass;
-import com.google.common.css.compiler.ast.CssCompositeValueNode;
-import com.google.common.css.compiler.ast.CssDeclarationNode;
-import com.google.common.css.compiler.ast.CssFunctionNode;
-import com.google.common.css.compiler.ast.CssNode;
-import com.google.common.css.compiler.ast.CssNumericNode;
-import com.google.common.css.compiler.ast.CssPropertyNode;
-import com.google.common.css.compiler.ast.CssPropertyValueNode;
-import com.google.common.css.compiler.ast.CssTreeVisitor;
-import com.google.common.css.compiler.ast.CssValueNode;
-import com.google.common.css.compiler.ast.DefaultTreeVisitor;
-import com.google.common.css.compiler.ast.MutatingVisitController;
-import com.google.common.css.compiler.passes.BiDiFlipper;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssCompilerPass;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssCompositeValueNode;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssDeclarationNode;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssFunctionNode;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssNode;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssNumericNode;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssPropertyNode;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssPropertyValueNode;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssTreeVisitor;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssValueNode;
+import com.google.gwt.thirdparty.common.css.compiler.ast.DefaultTreeVisitor;
+import com.google.gwt.thirdparty.common.css.compiler.ast.MutatingVisitController;
+import com.google.gwt.thirdparty.common.css.compiler.passes.BiDiFlipper;
+import com.google.gwt.thirdparty.guava.common.base.Objects;
import java.util.List;
diff --git a/user/src/com/google/gwt/resources/gss/RenamingSubstitutionMap.java b/user/src/com/google/gwt/resources/gss/RenamingSubstitutionMap.java
index 9eecb6b..c82be4d 100644
--- a/user/src/com/google/gwt/resources/gss/RenamingSubstitutionMap.java
+++ b/user/src/com/google/gwt/resources/gss/RenamingSubstitutionMap.java
@@ -15,7 +15,7 @@
*/
package com.google.gwt.resources.gss;
-import com.google.common.css.SubstitutionMap;
+import com.google.gwt.thirdparty.common.css.SubstitutionMap;
import java.util.HashMap;
import java.util.HashSet;
diff --git a/user/src/com/google/gwt/resources/gss/ResourceUrlFunction.java b/user/src/com/google/gwt/resources/gss/ResourceUrlFunction.java
index 1f3bc50..677ba79 100644
--- a/user/src/com/google/gwt/resources/gss/ResourceUrlFunction.java
+++ b/user/src/com/google/gwt/resources/gss/ResourceUrlFunction.java
@@ -15,17 +15,6 @@
*/
package com.google.gwt.resources.gss;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.collect.ImmutableList;
-import com.google.common.css.SourceCodeLocation;
-import com.google.common.css.compiler.ast.CssFunctionArgumentsNode;
-import com.google.common.css.compiler.ast.CssFunctionNode;
-import com.google.common.css.compiler.ast.CssValueNode;
-import com.google.common.css.compiler.ast.ErrorManager;
-import com.google.common.css.compiler.ast.GssError;
-import com.google.common.css.compiler.ast.GssFunction;
-import com.google.common.css.compiler.ast.GssFunctionException;
-import com.google.common.css.compiler.gssfunctions.GssFunctions;
import com.google.gwt.core.ext.typeinfo.JClassType;
import com.google.gwt.core.ext.typeinfo.JType;
import com.google.gwt.core.ext.typeinfo.NotFoundException;
@@ -35,6 +24,17 @@
import com.google.gwt.resources.ext.ResourceGeneratorUtil;
import com.google.gwt.resources.gss.ast.CssDotPathNode;
import com.google.gwt.resources.gss.ast.CssJavaExpressionNode;
+import com.google.gwt.thirdparty.common.css.SourceCodeLocation;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssFunctionArgumentsNode;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssFunctionNode;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssValueNode;
+import com.google.gwt.thirdparty.common.css.compiler.ast.ErrorManager;
+import com.google.gwt.thirdparty.common.css.compiler.ast.GssError;
+import com.google.gwt.thirdparty.common.css.compiler.ast.GssFunction;
+import com.google.gwt.thirdparty.common.css.compiler.ast.GssFunctionException;
+import com.google.gwt.thirdparty.common.css.compiler.gssfunctions.GssFunctions;
+import com.google.gwt.thirdparty.guava.common.annotations.VisibleForTesting;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableList;
import java.util.List;
diff --git a/user/src/com/google/gwt/resources/gss/RuntimeConditionalBlockCollector.java b/user/src/com/google/gwt/resources/gss/RuntimeConditionalBlockCollector.java
index 376d978..5d633ee 100644
--- a/user/src/com/google/gwt/resources/gss/RuntimeConditionalBlockCollector.java
+++ b/user/src/com/google/gwt/resources/gss/RuntimeConditionalBlockCollector.java
@@ -15,12 +15,12 @@
*/
package com.google.gwt.resources.gss;
-import com.google.common.css.compiler.ast.CssCompilerPass;
-import com.google.common.css.compiler.ast.CssConditionalBlockNode;
-import com.google.common.css.compiler.ast.CssConditionalRuleNode;
-import com.google.common.css.compiler.ast.DefaultTreeVisitor;
-import com.google.common.css.compiler.ast.VisitController;
import com.google.gwt.resources.gss.ast.CssRuntimeConditionalRuleNode;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssCompilerPass;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssConditionalBlockNode;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssConditionalRuleNode;
+import com.google.gwt.thirdparty.common.css.compiler.ast.DefaultTreeVisitor;
+import com.google.gwt.thirdparty.common.css.compiler.ast.VisitController;
import java.util.HashSet;
import java.util.Set;
diff --git a/user/src/com/google/gwt/resources/gss/ValidateRuntimeConditionalNode.java b/user/src/com/google/gwt/resources/gss/ValidateRuntimeConditionalNode.java
index cb0b399..c676114 100644
--- a/user/src/com/google/gwt/resources/gss/ValidateRuntimeConditionalNode.java
+++ b/user/src/com/google/gwt/resources/gss/ValidateRuntimeConditionalNode.java
@@ -15,14 +15,14 @@
*/
package com.google.gwt.resources.gss;
-import com.google.common.css.compiler.ast.CssCompilerPass;
-import com.google.common.css.compiler.ast.CssConditionalRuleNode;
-import com.google.common.css.compiler.ast.CssDefinitionNode;
-import com.google.common.css.compiler.ast.CssUnknownAtRuleNode;
-import com.google.common.css.compiler.ast.DefaultTreeVisitor;
-import com.google.common.css.compiler.ast.ErrorManager;
-import com.google.common.css.compiler.ast.GssError;
-import com.google.common.css.compiler.ast.VisitController;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssCompilerPass;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssConditionalRuleNode;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssDefinitionNode;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssUnknownAtRuleNode;
+import com.google.gwt.thirdparty.common.css.compiler.ast.DefaultTreeVisitor;
+import com.google.gwt.thirdparty.common.css.compiler.ast.ErrorManager;
+import com.google.gwt.thirdparty.common.css.compiler.ast.GssError;
+import com.google.gwt.thirdparty.common.css.compiler.ast.VisitController;
/**
* Visitor that validates runtime conditional node.
diff --git a/user/src/com/google/gwt/resources/gss/ValueFunction.java b/user/src/com/google/gwt/resources/gss/ValueFunction.java
index 26c37c2..4c1e08b 100644
--- a/user/src/com/google/gwt/resources/gss/ValueFunction.java
+++ b/user/src/com/google/gwt/resources/gss/ValueFunction.java
@@ -15,12 +15,12 @@
*/
package com.google.gwt.resources.gss;
-import com.google.common.collect.ImmutableList;
-import com.google.common.css.compiler.ast.CssValueNode;
-import com.google.common.css.compiler.ast.ErrorManager;
-import com.google.common.css.compiler.ast.GssFunction;
-import com.google.common.css.compiler.ast.GssFunctionException;
import com.google.gwt.resources.gss.ast.CssDotPathNode;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssValueNode;
+import com.google.gwt.thirdparty.common.css.compiler.ast.ErrorManager;
+import com.google.gwt.thirdparty.common.css.compiler.ast.GssFunction;
+import com.google.gwt.thirdparty.common.css.compiler.ast.GssFunctionException;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableList;
import java.util.List;
diff --git a/user/src/com/google/gwt/resources/gss/ast/CssDotPathNode.java b/user/src/com/google/gwt/resources/gss/ast/CssDotPathNode.java
index e6bc3f1..ed40dd4 100644
--- a/user/src/com/google/gwt/resources/gss/ast/CssDotPathNode.java
+++ b/user/src/com/google/gwt/resources/gss/ast/CssDotPathNode.java
@@ -15,10 +15,10 @@
*/
package com.google.gwt.resources.gss.ast;
-import com.google.common.base.Strings;
-import com.google.common.css.SourceCodeLocation;
-import com.google.common.css.compiler.ast.CssValueNode;
import com.google.gwt.core.ext.Generator;
+import com.google.gwt.thirdparty.common.css.SourceCodeLocation;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssValueNode;
+import com.google.gwt.thirdparty.guava.common.base.Strings;
import java.util.Arrays;
import java.util.List;
diff --git a/user/src/com/google/gwt/resources/gss/ast/CssJavaExpressionNode.java b/user/src/com/google/gwt/resources/gss/ast/CssJavaExpressionNode.java
index fc4cf62..3f664c7 100644
--- a/user/src/com/google/gwt/resources/gss/ast/CssJavaExpressionNode.java
+++ b/user/src/com/google/gwt/resources/gss/ast/CssJavaExpressionNode.java
@@ -15,8 +15,8 @@
*/
package com.google.gwt.resources.gss.ast;
-import com.google.common.css.SourceCodeLocation;
-import com.google.common.css.compiler.ast.CssValueNode;
+import com.google.gwt.thirdparty.common.css.SourceCodeLocation;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssValueNode;
/**
* Represents a Java expression.
diff --git a/user/src/com/google/gwt/resources/gss/ast/CssRuntimeConditionalRuleNode.java b/user/src/com/google/gwt/resources/gss/ast/CssRuntimeConditionalRuleNode.java
index a462e72..04c914a 100644
--- a/user/src/com/google/gwt/resources/gss/ast/CssRuntimeConditionalRuleNode.java
+++ b/user/src/com/google/gwt/resources/gss/ast/CssRuntimeConditionalRuleNode.java
@@ -15,10 +15,10 @@
*/
package com.google.gwt.resources.gss.ast;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.ImmutableList;
-import com.google.common.css.compiler.ast.CssConditionalRuleNode;
-import com.google.common.css.compiler.ast.CssValueNode;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssConditionalRuleNode;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssValueNode;
+import com.google.gwt.thirdparty.guava.common.base.Preconditions;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableList;
/**
* Represents a conditional rule that needs to be evaluated at runtime.
diff --git a/user/src/com/google/gwt/resources/rebind/context/AbstractResourceContext.java b/user/src/com/google/gwt/resources/rebind/context/AbstractResourceContext.java
index fdbcca8..42e50ea 100644
--- a/user/src/com/google/gwt/resources/rebind/context/AbstractResourceContext.java
+++ b/user/src/com/google/gwt/resources/rebind/context/AbstractResourceContext.java
@@ -1,12 +1,12 @@
/*
* 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
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -15,7 +15,6 @@
*/
package com.google.gwt.resources.rebind.context;
-import com.google.common.io.BaseEncoding;
import com.google.gwt.core.ext.GeneratorContext;
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.core.ext.UnableToCompleteException;
@@ -25,6 +24,7 @@
import com.google.gwt.resources.ext.ResourceContext;
import com.google.gwt.resources.ext.ResourceGenerator;
import com.google.gwt.resources.ext.ResourceGeneratorUtil;
+import com.google.gwt.thirdparty.guava.common.io.BaseEncoding;
import java.io.IOException;
import java.net.URL;
@@ -65,7 +65,7 @@
throws UnableToCompleteException {
return deploy(resource, null, forceExternal);
}
-
+
public String deploy(URL resource, String mimeType, boolean forceExternal)
throws UnableToCompleteException {
String fileName = ResourceGeneratorUtil.baseName(resource);
@@ -100,7 +100,7 @@
}
return simpleSourceName;
}
-
+
public ClientBundleRequirements getRequirements() {
return requirements;
}
@@ -109,7 +109,7 @@
key = currentResourceGeneratorType + ":" + key;
return value != clientBundleCtx.putCachedData(key, value);
}
-
+
public void setRequirements(ClientBundleRequirements requirements) {
this.requirements = requirements;
}
diff --git a/user/src/com/google/gwt/resources/rg/CssResourceGenerator.java b/user/src/com/google/gwt/resources/rg/CssResourceGenerator.java
index a2ac4f0..704cf8e 100644
--- a/user/src/com/google/gwt/resources/rg/CssResourceGenerator.java
+++ b/user/src/com/google/gwt/resources/rg/CssResourceGenerator.java
@@ -15,7 +15,6 @@
*/
package com.google.gwt.resources.rg;
-import com.google.common.base.Joiner;
import com.google.gwt.core.ext.BadPropertyValueException;
import com.google.gwt.core.ext.ConfigurationProperty;
import com.google.gwt.core.ext.Generator;
@@ -71,6 +70,7 @@
import com.google.gwt.resources.ext.ResourceContext;
import com.google.gwt.resources.ext.ResourceGeneratorUtil;
import com.google.gwt.resources.ext.SupportsGeneratorResultCaching;
+import com.google.gwt.thirdparty.guava.common.base.Joiner;
import com.google.gwt.user.rebind.SourceWriter;
import com.google.gwt.user.rebind.StringSourceWriter;
diff --git a/user/src/com/google/gwt/resources/rg/GssResourceGenerator.java b/user/src/com/google/gwt/resources/rg/GssResourceGenerator.java
index c246012..6e2cc61 100644
--- a/user/src/com/google/gwt/resources/rg/GssResourceGenerator.java
+++ b/user/src/com/google/gwt/resources/rg/GssResourceGenerator.java
@@ -15,63 +15,6 @@
*/
package com.google.gwt.resources.rg;
-import com.google.common.base.CaseFormat;
-import com.google.common.base.Charsets;
-import com.google.common.base.Joiner;
-import com.google.common.base.Predicate;
-import com.google.common.base.Predicates;
-import com.google.common.base.Strings;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.ImmutableSet.Builder;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
-import com.google.common.css.MinimalSubstitutionMap;
-import com.google.common.css.PrefixingSubstitutionMap;
-import com.google.common.css.SourceCode;
-import com.google.common.css.SourceCodeLocation;
-import com.google.common.css.SubstitutionMap;
-import com.google.common.css.compiler.ast.CssDefinitionNode;
-import com.google.common.css.compiler.ast.CssNumericNode;
-import com.google.common.css.compiler.ast.CssTree;
-import com.google.common.css.compiler.ast.CssValueNode;
-import com.google.common.css.compiler.ast.ErrorManager;
-import com.google.common.css.compiler.ast.GssError;
-import com.google.common.css.compiler.ast.GssFunction;
-import com.google.common.css.compiler.ast.GssParser;
-import com.google.common.css.compiler.ast.GssParserException;
-import com.google.common.css.compiler.passes.AbbreviatePositionalValues;
-import com.google.common.css.compiler.passes.CheckDependencyNodes;
-import com.google.common.css.compiler.passes.CollectConstantDefinitions;
-import com.google.common.css.compiler.passes.CollectMixinDefinitions;
-import com.google.common.css.compiler.passes.ColorValueOptimizer;
-import com.google.common.css.compiler.passes.ConstantDefinitions;
-import com.google.common.css.compiler.passes.CreateComponentNodes;
-import com.google.common.css.compiler.passes.CreateConditionalNodes;
-import com.google.common.css.compiler.passes.CreateConstantReferences;
-import com.google.common.css.compiler.passes.CreateDefinitionNodes;
-import com.google.common.css.compiler.passes.CreateMixins;
-import com.google.common.css.compiler.passes.CreateStandardAtRuleNodes;
-import com.google.common.css.compiler.passes.CssClassRenaming;
-import com.google.common.css.compiler.passes.DisallowDuplicateDeclarations;
-import com.google.common.css.compiler.passes.EliminateEmptyRulesetNodes;
-import com.google.common.css.compiler.passes.EliminateUnitsFromZeroNumericValues;
-import com.google.common.css.compiler.passes.EliminateUselessRulesetNodes;
-import com.google.common.css.compiler.passes.HandleUnknownAtRuleNodes;
-import com.google.common.css.compiler.passes.MarkNonFlippableNodes;
-import com.google.common.css.compiler.passes.MarkRemovableRulesetNodes;
-import com.google.common.css.compiler.passes.MergeAdjacentRulesetNodesWithSameDeclarations;
-import com.google.common.css.compiler.passes.MergeAdjacentRulesetNodesWithSameSelector;
-import com.google.common.css.compiler.passes.ProcessComponents;
-import com.google.common.css.compiler.passes.ProcessKeyframes;
-import com.google.common.css.compiler.passes.ProcessRefiners;
-import com.google.common.css.compiler.passes.ReplaceConstantReferences;
-import com.google.common.css.compiler.passes.ReplaceMixins;
-import com.google.common.css.compiler.passes.ResolveCustomFunctionNodes;
-import com.google.common.css.compiler.passes.SplitRulesetNodes;
-import com.google.common.io.ByteSource;
-import com.google.common.io.Resources;
import com.google.gwt.core.ext.BadPropertyValueException;
import com.google.gwt.core.ext.ConfigurationProperty;
import com.google.gwt.core.ext.Generator;
@@ -115,6 +58,63 @@
import com.google.gwt.resources.gss.RuntimeConditionalBlockCollector;
import com.google.gwt.resources.gss.ValidateRuntimeConditionalNode;
import com.google.gwt.resources.rg.CssResourceGenerator.JClassOrderComparator;
+import com.google.gwt.thirdparty.common.css.MinimalSubstitutionMap;
+import com.google.gwt.thirdparty.common.css.PrefixingSubstitutionMap;
+import com.google.gwt.thirdparty.common.css.SourceCode;
+import com.google.gwt.thirdparty.common.css.SourceCodeLocation;
+import com.google.gwt.thirdparty.common.css.SubstitutionMap;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssDefinitionNode;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssNumericNode;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssTree;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssValueNode;
+import com.google.gwt.thirdparty.common.css.compiler.ast.ErrorManager;
+import com.google.gwt.thirdparty.common.css.compiler.ast.GssError;
+import com.google.gwt.thirdparty.common.css.compiler.ast.GssFunction;
+import com.google.gwt.thirdparty.common.css.compiler.ast.GssParser;
+import com.google.gwt.thirdparty.common.css.compiler.ast.GssParserException;
+import com.google.gwt.thirdparty.common.css.compiler.passes.AbbreviatePositionalValues;
+import com.google.gwt.thirdparty.common.css.compiler.passes.CheckDependencyNodes;
+import com.google.gwt.thirdparty.common.css.compiler.passes.CollectConstantDefinitions;
+import com.google.gwt.thirdparty.common.css.compiler.passes.CollectMixinDefinitions;
+import com.google.gwt.thirdparty.common.css.compiler.passes.ColorValueOptimizer;
+import com.google.gwt.thirdparty.common.css.compiler.passes.ConstantDefinitions;
+import com.google.gwt.thirdparty.common.css.compiler.passes.CreateComponentNodes;
+import com.google.gwt.thirdparty.common.css.compiler.passes.CreateConditionalNodes;
+import com.google.gwt.thirdparty.common.css.compiler.passes.CreateConstantReferences;
+import com.google.gwt.thirdparty.common.css.compiler.passes.CreateDefinitionNodes;
+import com.google.gwt.thirdparty.common.css.compiler.passes.CreateMixins;
+import com.google.gwt.thirdparty.common.css.compiler.passes.CreateStandardAtRuleNodes;
+import com.google.gwt.thirdparty.common.css.compiler.passes.CssClassRenaming;
+import com.google.gwt.thirdparty.common.css.compiler.passes.DisallowDuplicateDeclarations;
+import com.google.gwt.thirdparty.common.css.compiler.passes.EliminateEmptyRulesetNodes;
+import com.google.gwt.thirdparty.common.css.compiler.passes.EliminateUnitsFromZeroNumericValues;
+import com.google.gwt.thirdparty.common.css.compiler.passes.EliminateUselessRulesetNodes;
+import com.google.gwt.thirdparty.common.css.compiler.passes.HandleUnknownAtRuleNodes;
+import com.google.gwt.thirdparty.common.css.compiler.passes.MarkNonFlippableNodes;
+import com.google.gwt.thirdparty.common.css.compiler.passes.MarkRemovableRulesetNodes;
+import com.google.gwt.thirdparty.common.css.compiler.passes.MergeAdjacentRulesetNodesWithSameDeclarations;
+import com.google.gwt.thirdparty.common.css.compiler.passes.MergeAdjacentRulesetNodesWithSameSelector;
+import com.google.gwt.thirdparty.common.css.compiler.passes.ProcessComponents;
+import com.google.gwt.thirdparty.common.css.compiler.passes.ProcessKeyframes;
+import com.google.gwt.thirdparty.common.css.compiler.passes.ProcessRefiners;
+import com.google.gwt.thirdparty.common.css.compiler.passes.ReplaceConstantReferences;
+import com.google.gwt.thirdparty.common.css.compiler.passes.ReplaceMixins;
+import com.google.gwt.thirdparty.common.css.compiler.passes.ResolveCustomFunctionNodes;
+import com.google.gwt.thirdparty.common.css.compiler.passes.SplitRulesetNodes;
+import com.google.gwt.thirdparty.guava.common.base.CaseFormat;
+import com.google.gwt.thirdparty.guava.common.base.Charsets;
+import com.google.gwt.thirdparty.guava.common.base.Joiner;
+import com.google.gwt.thirdparty.guava.common.base.Predicate;
+import com.google.gwt.thirdparty.guava.common.base.Predicates;
+import com.google.gwt.thirdparty.guava.common.base.Strings;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableMap;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableSet;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableSet.Builder;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
+import com.google.gwt.thirdparty.guava.common.collect.Maps;
+import com.google.gwt.thirdparty.guava.common.collect.Sets;
+import com.google.gwt.thirdparty.guava.common.io.ByteSource;
+import com.google.gwt.thirdparty.guava.common.io.Resources;
import com.google.gwt.user.rebind.SourceWriter;
import com.google.gwt.user.rebind.StringSourceWriter;
@@ -187,7 +187,7 @@
/**
* {@link ErrorManager} used to log the errors and warning messages produced by the different
- * {@link com.google.common.css.compiler.ast.CssCompilerPass}.
+ * {@link com.google.gwt.thirdparty.common.css.compiler.ast.CssCompilerPass}.
*/
private static class LoggerErrorManager implements ErrorManager {
private final TreeLogger logger;
diff --git a/user/src/com/google/gwt/safecss/shared/SafeStylesHostedModeUtils.java b/user/src/com/google/gwt/safecss/shared/SafeStylesHostedModeUtils.java
index 346e392..a9ddbbb 100644
--- a/user/src/com/google/gwt/safecss/shared/SafeStylesHostedModeUtils.java
+++ b/user/src/com/google/gwt/safecss/shared/SafeStylesHostedModeUtils.java
@@ -15,9 +15,9 @@
*/
package com.google.gwt.safecss.shared;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
import com.google.gwt.core.shared.GWT;
+import com.google.gwt.thirdparty.guava.common.annotations.VisibleForTesting;
+import com.google.gwt.thirdparty.guava.common.base.Preconditions;
import java.util.HashMap;
import java.util.Stack;
diff --git a/user/src/com/google/gwt/safehtml/rebind/HtmlTemplateParser.java b/user/src/com/google/gwt/safehtml/rebind/HtmlTemplateParser.java
index 6fea1c3..d9fab53 100644
--- a/user/src/com/google/gwt/safehtml/rebind/HtmlTemplateParser.java
+++ b/user/src/com/google/gwt/safehtml/rebind/HtmlTemplateParser.java
@@ -15,14 +15,14 @@
*/
package com.google.gwt.safehtml.rebind;
-import com.google.common.base.Preconditions;
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.core.ext.UnableToCompleteException;
import com.google.gwt.safehtml.rebind.ParsedHtmlTemplate.HtmlContext;
import com.google.gwt.safehtml.rebind.ParsedHtmlTemplate.ParameterChunk;
-import com.google.streamhtmlparser.HtmlParser;
-import com.google.streamhtmlparser.HtmlParserFactory;
-import com.google.streamhtmlparser.ParseException;
+import com.google.gwt.thirdparty.guava.common.base.Preconditions;
+import com.google.gwt.thirdparty.streamhtmlparser.HtmlParser;
+import com.google.gwt.thirdparty.streamhtmlparser.HtmlParserFactory;
+import com.google.gwt.thirdparty.streamhtmlparser.ParseException;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
diff --git a/user/src/com/google/gwt/safehtml/rebind/ParsedHtmlTemplate.java b/user/src/com/google/gwt/safehtml/rebind/ParsedHtmlTemplate.java
index 841553c..c65574b 100644
--- a/user/src/com/google/gwt/safehtml/rebind/ParsedHtmlTemplate.java
+++ b/user/src/com/google/gwt/safehtml/rebind/ParsedHtmlTemplate.java
@@ -15,7 +15,7 @@
*/
package com.google.gwt.safehtml.rebind;
-import com.google.common.base.Preconditions;
+import com.google.gwt.thirdparty.guava.common.base.Preconditions;
import java.util.Collections;
import java.util.LinkedList;
diff --git a/user/src/com/google/gwt/safehtml/shared/SafeHtmlHostedModeUtils.java b/user/src/com/google/gwt/safehtml/shared/SafeHtmlHostedModeUtils.java
index 265dc37..04b3def 100644
--- a/user/src/com/google/gwt/safehtml/shared/SafeHtmlHostedModeUtils.java
+++ b/user/src/com/google/gwt/safehtml/shared/SafeHtmlHostedModeUtils.java
@@ -15,11 +15,11 @@
*/
package com.google.gwt.safehtml.shared;
-import com.google.common.base.Preconditions;
import com.google.gwt.core.shared.GWT;
-import com.google.streamhtmlparser.HtmlParser;
-import com.google.streamhtmlparser.HtmlParserFactory;
-import com.google.streamhtmlparser.ParseException;
+import com.google.gwt.thirdparty.guava.common.base.Preconditions;
+import com.google.gwt.thirdparty.streamhtmlparser.HtmlParser;
+import com.google.gwt.thirdparty.streamhtmlparser.HtmlParserFactory;
+import com.google.gwt.thirdparty.streamhtmlparser.ParseException;
/**
* SafeHtml utilities whose implementation differs between Development and
diff --git a/user/src/com/google/gwt/safehtml/shared/SafeUriHostedModeUtils.java b/user/src/com/google/gwt/safehtml/shared/SafeUriHostedModeUtils.java
index 63d8384..6b52143 100644
--- a/user/src/com/google/gwt/safehtml/shared/SafeUriHostedModeUtils.java
+++ b/user/src/com/google/gwt/safehtml/shared/SafeUriHostedModeUtils.java
@@ -15,8 +15,8 @@
*/
package com.google.gwt.safehtml.shared;
-import com.google.common.base.Preconditions;
import com.google.gwt.core.shared.GWT;
+import com.google.gwt.thirdparty.guava.common.base.Preconditions;
import java.net.URI;
import java.net.URISyntaxException;
diff --git a/user/src/com/google/gwt/uibinder/rebind/model/ImplicitCssResource.java b/user/src/com/google/gwt/uibinder/rebind/model/ImplicitCssResource.java
index e914a68..eb3f08c 100644
--- a/user/src/com/google/gwt/uibinder/rebind/model/ImplicitCssResource.java
+++ b/user/src/com/google/gwt/uibinder/rebind/model/ImplicitCssResource.java
@@ -15,10 +15,6 @@
*/
package com.google.gwt.uibinder.rebind.model;
-import com.google.common.css.SourceCode;
-import com.google.common.css.compiler.ast.CssTree;
-import com.google.common.css.compiler.ast.GssParser;
-import com.google.common.css.compiler.ast.GssParserException;
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.core.ext.UnableToCompleteException;
import com.google.gwt.core.ext.impl.ResourceLocatorImpl;
@@ -29,6 +25,10 @@
import com.google.gwt.resources.css.ast.CssStylesheet;
import com.google.gwt.resources.ext.ResourceGeneratorUtil;
import com.google.gwt.resources.gss.ClassNamesCollector;
+import com.google.gwt.thirdparty.common.css.SourceCode;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssTree;
+import com.google.gwt.thirdparty.common.css.compiler.ast.GssParser;
+import com.google.gwt.thirdparty.common.css.compiler.ast.GssParserException;
import com.google.gwt.uibinder.attributeparsers.CssNameConverter;
import com.google.gwt.uibinder.rebind.MortalLogger;
diff --git a/user/src/com/google/gwt/user/rebind/ui/ImageBundleGenerator.java b/user/src/com/google/gwt/user/rebind/ui/ImageBundleGenerator.java
index 1652cb2..d65351f 100644
--- a/user/src/com/google/gwt/user/rebind/ui/ImageBundleGenerator.java
+++ b/user/src/com/google/gwt/user/rebind/ui/ImageBundleGenerator.java
@@ -15,7 +15,6 @@
*/
package com.google.gwt.user.rebind.ui;
-import com.google.common.annotations.VisibleForTesting;
import com.google.gwt.core.ext.Generator;
import com.google.gwt.core.ext.Generator.RunsLocal;
import com.google.gwt.core.ext.GeneratorContext;
@@ -26,6 +25,7 @@
import com.google.gwt.core.ext.typeinfo.JMethod;
import com.google.gwt.core.ext.typeinfo.NotFoundException;
import com.google.gwt.core.ext.typeinfo.TypeOracle;
+import com.google.gwt.thirdparty.guava.common.annotations.VisibleForTesting;
import com.google.gwt.user.client.ui.ImageBundle;
import com.google.gwt.user.client.ui.ImageBundle.Resource;
import com.google.gwt.user.rebind.ClassSourceFileComposerFactory;
diff --git a/user/src/com/google/gwt/user/tools/QuerySourceMap.java b/user/src/com/google/gwt/user/tools/QuerySourceMap.java
index 5c271e5..c93b1ac 100644
--- a/user/src/com/google/gwt/user/tools/QuerySourceMap.java
+++ b/user/src/com/google/gwt/user/tools/QuerySourceMap.java
@@ -15,9 +15,9 @@
*/
package com.google.gwt.user.tools;
-import com.google.debugging.sourcemap.SourceMapConsumerFactory;
-import com.google.debugging.sourcemap.SourceMapping;
import com.google.gwt.dev.util.Util;
+import com.google.gwt.thirdparty.debugging.sourcemap.SourceMapConsumerFactory;
+import com.google.gwt.thirdparty.debugging.sourcemap.SourceMapping;
import java.io.File;
diff --git a/user/src/com/google/gwt/validation/rebind/BeanHelper.java b/user/src/com/google/gwt/validation/rebind/BeanHelper.java
index e5d8c61..23b6ff2 100644
--- a/user/src/com/google/gwt/validation/rebind/BeanHelper.java
+++ b/user/src/com/google/gwt/validation/rebind/BeanHelper.java
@@ -15,7 +15,6 @@
*/
package com.google.gwt.validation.rebind;
-import com.google.common.base.Function;
import com.google.gwt.core.ext.typeinfo.JArrayType;
import com.google.gwt.core.ext.typeinfo.JClassType;
import com.google.gwt.core.ext.typeinfo.JField;
@@ -23,6 +22,7 @@
import com.google.gwt.core.ext.typeinfo.JRawType;
import com.google.gwt.core.ext.typeinfo.JType;
import com.google.gwt.core.ext.typeinfo.NotFoundException;
+import com.google.gwt.thirdparty.guava.common.base.Function;
import javax.validation.metadata.BeanDescriptor;
import javax.validation.metadata.PropertyDescriptor;
@@ -33,7 +33,7 @@
*/
public final class BeanHelper {
- public static final Function<BeanHelper, Class<?>> TO_CLAZZ =
+ public static final Function<BeanHelper, Class<?>> TO_CLAZZ =
new Function<BeanHelper, Class<?>>() {
@Override
public Class<?> apply(BeanHelper helper) {
diff --git a/user/src/com/google/gwt/validation/rebind/GwtSpecificValidatorCreator.java b/user/src/com/google/gwt/validation/rebind/GwtSpecificValidatorCreator.java
index 96c20a5..1350bb8 100644
--- a/user/src/com/google/gwt/validation/rebind/GwtSpecificValidatorCreator.java
+++ b/user/src/com/google/gwt/validation/rebind/GwtSpecificValidatorCreator.java
@@ -15,17 +15,6 @@
*/
package com.google.gwt.validation.rebind;
-import com.google.common.base.Function;
-import com.google.common.base.Functions;
-import com.google.common.base.Joiner;
-import com.google.common.base.Predicate;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Ordering;
-import com.google.common.collect.Sets;
-import com.google.common.primitives.Primitives;
import com.google.gwt.core.client.GWT;
import com.google.gwt.core.client.UnsafeNativeLong;
import com.google.gwt.core.ext.Generator;
@@ -43,6 +32,17 @@
import com.google.gwt.dev.jjs.ast.JFloatLiteral;
import com.google.gwt.dev.jjs.ast.JIntLiteral;
import com.google.gwt.dev.jjs.ast.JLongLiteral;
+import com.google.gwt.thirdparty.guava.common.base.Function;
+import com.google.gwt.thirdparty.guava.common.base.Functions;
+import com.google.gwt.thirdparty.guava.common.base.Joiner;
+import com.google.gwt.thirdparty.guava.common.base.Predicate;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableList;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableSet;
+import com.google.gwt.thirdparty.guava.common.collect.Iterables;
+import com.google.gwt.thirdparty.guava.common.collect.Maps;
+import com.google.gwt.thirdparty.guava.common.collect.Ordering;
+import com.google.gwt.thirdparty.guava.common.collect.Sets;
+import com.google.gwt.thirdparty.guava.common.primitives.Primitives;
import com.google.gwt.user.rebind.ClassSourceFileComposerFactory;
import com.google.gwt.user.rebind.SourceWriter;
import com.google.gwt.validation.client.impl.AbstractGwtSpecificValidator;
@@ -231,7 +231,7 @@
*/
static <T extends Annotation> Class<?> getTypeOfConstraintValidator(
Class<? extends ConstraintValidator<T, ?>> constraintClass) {
-
+
int candidateCount = 0;
Class<?> result = null;
for (Method method : constraintClass.getMethods()) {
@@ -366,7 +366,7 @@
protected void compose(ClassSourceFileComposerFactory composerFactory) {
addImports(composerFactory, Annotation.class, ConstraintViolation.class,
GWT.class, ValidationGroupsMetadata.class, Group.class, GroupChain.class, PathImpl.class,
- Node.class, GroupChainGenerator.class, GwtBeanDescriptor.class, BeanMetadata.class,
+ Node.class, GroupChainGenerator.class, GwtBeanDescriptor.class, BeanMetadata.class,
GwtValidationContext.class, ArrayList.class, HashSet.class, IllegalArgumentException.class,
Set.class, Collection.class, Iterator.class, List.class, ValidationException.class);
composerFactory.setSuperclass(AbstractGwtSpecificValidator.class.getCanonicalName()
@@ -574,7 +574,7 @@
}
// for non-cascaded properties
for (ConstraintDescriptor<?> constraint : p.getConstraintDescriptors()) {
- org.hibernate.validator.metadata.ConstraintDescriptorImpl<?> constraintHibernate =
+ org.hibernate.validator.metadata.ConstraintDescriptorImpl<?> constraintHibernate =
(org.hibernate.validator.metadata.ConstraintDescriptorImpl<?>) constraint;
if (constraintHibernate.getElementType() ==
(useField ? ElementType.FIELD : ElementType.METHOD)) {
@@ -718,15 +718,15 @@
if (!constraint.getConstraintValidatorClasses().isEmpty()) {
Class<? extends ConstraintValidator<? extends Annotation, ?>> validatorClass =
getValidatorForType(constraint, clazz);
-
+
// validate(context, violations, null, object,
sw.print("validate(context, violations, null, object, ");
-
+
// new MyValidtor(),
sw.print("new ");
sw.print(validatorClass.getCanonicalName());
sw.print("(), "); // TODO(nchalko) use ConstraintValidatorFactory
-
+
// this.aConstraintDescriptor, groups);
sw.print(constraintDescriptorVar("this", count));
sw.print(", ");
@@ -1079,7 +1079,7 @@
beanHelper.getBeanDescriptor().getConstrainedProperties()) {
int count = 0;
for (ConstraintDescriptor<?> constraint : p.getConstraintDescriptors()) {
- org.hibernate.validator.metadata.ConstraintDescriptorImpl<?> constraintHibernate =
+ org.hibernate.validator.metadata.ConstraintDescriptorImpl<?> constraintHibernate =
(org.hibernate.validator.metadata.ConstraintDescriptorImpl<?>) constraint;
if (areConstraintDescriptorGroupsValid(constraint)) {
writeConstraintDescriptor(sw, constraint, constraintHibernate.getElementType(),
@@ -1856,15 +1856,15 @@
// BeanType object,
sw.println(beanHelper.getTypeCanonicalName() + " object,");
-
+
// final <Type> value,
sw.print("final ");
sw.print(elementType.getParameterizedQualifiedSourceName());
sw.println(" value,");
-
+
// boolean honorValid,
sw.println("boolean honorValid,");
-
+
// Class<?>... groups) {
sw.println("Class<?>... groups) {");
sw.outdent();
@@ -1875,7 +1875,7 @@
sw.print("final GwtValidationContext<T> myContext = context.append(\"");
sw.print(p.getPropertyName());
sw.println("\");");
-
+
// only check this property if the TraversableResolver says we can
// Node leafNode = myContext.getPath().getLeafNode();
@@ -1890,7 +1890,7 @@
// isReachable = myContext.getTraversableResolver().isReachable(object, leafNode,
// myContext.getRootBeanClass(), path, ElementType);
sw.println("isReachable = myContext.getTraversableResolver().isReachable(object, " +
- "leafNode, myContext.getRootBeanClass(), path, " +
+ "leafNode, myContext.getRootBeanClass(), path, " +
(useField ? asLiteral(ElementType.FIELD) : asLiteral(ElementType.METHOD)) + ");");
// } catch (Exception e) {
sw.outdent();
@@ -1905,10 +1905,10 @@
// if (isReachable) {
sw.println("if (isReachable) {");
sw.indent();
-
+
// TODO(nchalko) move this out of here to the Validate method
if (p.isCascaded() && hasValid(p, useField)) {
-
+
// if (honorValid && value != null) {
sw.println("if (honorValid && value != null) {");
sw.indent();
@@ -1920,7 +1920,7 @@
// isCascadable = myContext.getTraversableResolver().isCascadable(object, leafNode,
// myContext.getRootBeanClass(), path, ElementType)
sw.println("isCascadable = myContext.getTraversableResolver().isCascadable(object, " +
- "leafNode, myContext.getRootBeanClass(), path, " +
+ "leafNode, myContext.getRootBeanClass(), path, " +
(useField ? asLiteral(ElementType.FIELD) : asLiteral(ElementType.METHOD)) + ");");
// } catch (Exception e) {
sw.outdent();
@@ -1935,7 +1935,7 @@
// if (isCascadable) {
sw.println("if (isCascadable) {");
sw.indent();
-
+
if (isIterableOrMap(elementClass)) {
JClassType associationType = beanHelper.getAssociationType(p,
useField);
@@ -1947,16 +1947,16 @@
}
} else {
createBeanHelper(elementClass);
-
+
// if (!context.alreadyValidated(value)) {
sw.println(" if (!context.alreadyValidated(value)) {");
sw.indent();
-
+
// violations.addAll(myContext.getValidator().validate(context, value,
// groups));
sw.print("violations.addAll(");
sw.println("myContext.getValidator().validate(myContext, value, groups));");
-
+
// }
sw.outdent();
sw.println("}");
@@ -1969,7 +1969,7 @@
sw.outdent();
sw.println("}");
}
-
+
// It is possible for an annotation with the exact same values to be set on
// both the field and the getter.
// Keep track of the ones we have used to make sure we don't duplicate.
diff --git a/user/src/com/google/gwt/validation/rebind/Util.java b/user/src/com/google/gwt/validation/rebind/Util.java
index 6f0efa9..f24b653 100644
--- a/user/src/com/google/gwt/validation/rebind/Util.java
+++ b/user/src/com/google/gwt/validation/rebind/Util.java
@@ -1,12 +1,12 @@
/*
* Copyright 2010 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
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -15,14 +15,14 @@
*/
package com.google.gwt.validation.rebind;
-import com.google.common.base.Function;
-import com.google.common.base.Functions;
-import com.google.common.base.Predicate;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
+import com.google.gwt.thirdparty.guava.common.base.Function;
+import com.google.gwt.thirdparty.guava.common.base.Functions;
+import com.google.gwt.thirdparty.guava.common.base.Predicate;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableList;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableSet;
+import com.google.gwt.thirdparty.guava.common.collect.Iterables;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
+import com.google.gwt.thirdparty.guava.common.collect.Sets;
import java.util.HashSet;
import java.util.Iterator;
diff --git a/user/src/com/google/gwt/validation/rebind/ValidatorCreator.java b/user/src/com/google/gwt/validation/rebind/ValidatorCreator.java
index d798cbb..3944e19 100644
--- a/user/src/com/google/gwt/validation/rebind/ValidatorCreator.java
+++ b/user/src/com/google/gwt/validation/rebind/ValidatorCreator.java
@@ -15,13 +15,13 @@
*/
package com.google.gwt.validation.rebind;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Lists;
import com.google.gwt.core.client.GWT;
import com.google.gwt.core.ext.GeneratorContext;
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.core.ext.UnableToCompleteException;
import com.google.gwt.core.ext.typeinfo.JClassType;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableList;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
import com.google.gwt.user.rebind.ClassSourceFileComposerFactory;
import com.google.gwt.user.rebind.SourceWriter;
import com.google.gwt.validation.client.GwtValidation;
@@ -153,7 +153,7 @@
// private static ValidationGroupsMetadata createValidationGroupsMetadata() {
sw.println("private static ValidationGroupsMetadata createValidationGroupsMetadata() {");
sw.indent();
-
+
// return ValidationGroupsMetadata.builder()
sw.println("return ValidationGroupsMetadata.builder()");
sw.indent();
diff --git a/user/test/com/google/gwt/core/ext/linker/impl/SelectionScriptLinkerUnitTest.java b/user/test/com/google/gwt/core/ext/linker/impl/SelectionScriptLinkerUnitTest.java
index a68f814..0d92b6a 100644
--- a/user/test/com/google/gwt/core/ext/linker/impl/SelectionScriptLinkerUnitTest.java
+++ b/user/test/com/google/gwt/core/ext/linker/impl/SelectionScriptLinkerUnitTest.java
@@ -16,7 +16,6 @@
package com.google.gwt.core.ext.linker.impl;
-import com.google.common.collect.Lists;
import com.google.gwt.core.ext.LinkerContext;
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.core.ext.UnableToCompleteException;
@@ -27,6 +26,7 @@
import com.google.gwt.core.ext.linker.SelectionProperty;
import com.google.gwt.core.ext.linker.Shardable;
import com.google.gwt.core.ext.linker.StatementRanges;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
import junit.framework.TestCase;
diff --git a/user/test/com/google/gwt/core/ext/linker/impl/StandardCompilationResultTest.java b/user/test/com/google/gwt/core/ext/linker/impl/StandardCompilationResultTest.java
index 2a99b7b..5525e0d 100644
--- a/user/test/com/google/gwt/core/ext/linker/impl/StandardCompilationResultTest.java
+++ b/user/test/com/google/gwt/core/ext/linker/impl/StandardCompilationResultTest.java
@@ -15,8 +15,8 @@
*/
package com.google.gwt.core.ext.linker.impl;
-import com.google.common.collect.Lists;
import com.google.gwt.core.ext.linker.StatementRanges;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
import junit.framework.TestCase;
diff --git a/user/test/com/google/gwt/core/ext/test/GeneratorTest.java b/user/test/com/google/gwt/core/ext/test/GeneratorTest.java
index ec8b630..b8270f2 100644
--- a/user/test/com/google/gwt/core/ext/test/GeneratorTest.java
+++ b/user/test/com/google/gwt/core/ext/test/GeneratorTest.java
@@ -13,9 +13,9 @@
*/
package com.google.gwt.core.ext.test;
-import com.google.common.collect.Maps;
import com.google.gwt.core.ext.Generator;
import com.google.gwt.dev.util.Name;
+import com.google.gwt.thirdparty.guava.common.collect.Maps;
import junit.framework.TestCase;
diff --git a/user/test/com/google/gwt/junit/JUnitShellTest.java b/user/test/com/google/gwt/junit/JUnitShellTest.java
index bae76d8..97b672e 100644
--- a/user/test/com/google/gwt/junit/JUnitShellTest.java
+++ b/user/test/com/google/gwt/junit/JUnitShellTest.java
@@ -15,7 +15,7 @@
*/
package com.google.gwt.junit;
-import com.google.common.collect.ImmutableSet;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableSet;
import junit.framework.TestCase;
diff --git a/user/test/com/google/gwt/resources/client/CSSResourceWithGSSTest.java b/user/test/com/google/gwt/resources/client/CSSResourceWithGSSTest.java
index cb72f0f..82d3bec 100644
--- a/user/test/com/google/gwt/resources/client/CSSResourceWithGSSTest.java
+++ b/user/test/com/google/gwt/resources/client/CSSResourceWithGSSTest.java
@@ -69,8 +69,7 @@
assertTrue(text.contains("ns:tag::-webkit-scrollbar"));
// Check escaped string values
- // TODO(dankurka) investigate why latest gss fails here:
-// assertTrue(text.contains("Hello\\\\\\000022 world"));
+ assertTrue(text.contains("Hello\\\\\\000022 world"));
// Check values
assertFalse(text.contains("0.0;"));
diff --git a/user/test/com/google/gwt/resources/converter/Css2GssTest.java b/user/test/com/google/gwt/resources/converter/Css2GssTest.java
index adf6702..579ede9 100644
--- a/user/test/com/google/gwt/resources/converter/Css2GssTest.java
+++ b/user/test/com/google/gwt/resources/converter/Css2GssTest.java
@@ -15,12 +15,12 @@
*/
package com.google.gwt.resources.converter;
-import com.google.common.base.Predicate;
-import com.google.common.base.Predicates;
-import com.google.common.css.SourceCode;
-import com.google.common.css.compiler.ast.GssParser;
-import com.google.common.css.compiler.ast.GssParserException;
import com.google.gwt.core.ext.UnableToCompleteException;
+import com.google.gwt.thirdparty.common.css.SourceCode;
+import com.google.gwt.thirdparty.common.css.compiler.ast.GssParser;
+import com.google.gwt.thirdparty.common.css.compiler.ast.GssParserException;
+import com.google.gwt.thirdparty.guava.common.base.Predicate;
+import com.google.gwt.thirdparty.guava.common.base.Predicates;
import junit.framework.TestCase;
diff --git a/user/test/com/google/gwt/resources/converter/UndefinedConstantVisitorTest.java b/user/test/com/google/gwt/resources/converter/UndefinedConstantVisitorTest.java
index f379f93..72d089b 100644
--- a/user/test/com/google/gwt/resources/converter/UndefinedConstantVisitorTest.java
+++ b/user/test/com/google/gwt/resources/converter/UndefinedConstantVisitorTest.java
@@ -22,8 +22,6 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
import com.google.gwt.core.ext.TreeLogger;
import com.google.gwt.resources.css.ast.CssProperty;
import com.google.gwt.resources.css.ast.CssProperty.FunctionValue;
@@ -31,6 +29,8 @@
import com.google.gwt.resources.css.ast.CssProperty.ListValue;
import com.google.gwt.resources.css.ast.CssProperty.Value;
import com.google.gwt.resources.css.ast.CssRule;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
+import com.google.gwt.thirdparty.guava.common.collect.Sets;
import junit.framework.TestCase;
diff --git a/user/test/com/google/gwt/resources/gss/BaseGssTest.java b/user/test/com/google/gwt/resources/gss/BaseGssTest.java
index fc60633..90c5fd9 100644
--- a/user/test/com/google/gwt/resources/gss/BaseGssTest.java
+++ b/user/test/com/google/gwt/resources/gss/BaseGssTest.java
@@ -21,13 +21,13 @@
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
-import com.google.common.base.Joiner;
-import com.google.common.css.SourceCode;
-import com.google.common.css.compiler.ast.CssTree;
-import com.google.common.css.compiler.ast.ErrorManager;
-import com.google.common.css.compiler.ast.GssError;
-import com.google.common.css.compiler.ast.GssParser;
-import com.google.common.css.compiler.ast.GssParserException;
+import com.google.gwt.thirdparty.common.css.SourceCode;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssTree;
+import com.google.gwt.thirdparty.common.css.compiler.ast.ErrorManager;
+import com.google.gwt.thirdparty.common.css.compiler.ast.GssError;
+import com.google.gwt.thirdparty.common.css.compiler.ast.GssParser;
+import com.google.gwt.thirdparty.common.css.compiler.ast.GssParserException;
+import com.google.gwt.thirdparty.guava.common.base.Joiner;
import junit.framework.TestCase;
diff --git a/user/test/com/google/gwt/resources/gss/BooleanConditionCollectorTest.java b/user/test/com/google/gwt/resources/gss/BooleanConditionCollectorTest.java
index 41390c8..c4b852c 100644
--- a/user/test/com/google/gwt/resources/gss/BooleanConditionCollectorTest.java
+++ b/user/test/com/google/gwt/resources/gss/BooleanConditionCollectorTest.java
@@ -16,9 +16,9 @@
package com.google.gwt.resources.gss;
-import com.google.common.css.compiler.ast.CssTree;
-import com.google.common.css.compiler.ast.ErrorManager;
-import com.google.common.css.compiler.passes.CreateConditionalNodes;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssTree;
+import com.google.gwt.thirdparty.common.css.compiler.ast.ErrorManager;
+import com.google.gwt.thirdparty.common.css.compiler.passes.CreateConditionalNodes;
import java.util.Set;
diff --git a/user/test/com/google/gwt/resources/gss/ClassNamesCollectorTest.java b/user/test/com/google/gwt/resources/gss/ClassNamesCollectorTest.java
index 0392001..ca24695 100644
--- a/user/test/com/google/gwt/resources/gss/ClassNamesCollectorTest.java
+++ b/user/test/com/google/gwt/resources/gss/ClassNamesCollectorTest.java
@@ -19,11 +19,11 @@
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import com.google.common.css.compiler.ast.CssClassSelectorNode;
-import com.google.common.css.compiler.ast.CssTree;
-import com.google.common.css.compiler.ast.VisitController;
import com.google.gwt.core.ext.typeinfo.JClassType;
import com.google.gwt.resources.client.CssResource.ImportedWithPrefix;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssClassSelectorNode;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssTree;
+import com.google.gwt.thirdparty.common.css.compiler.ast.VisitController;
import junit.framework.TestCase;
diff --git a/user/test/com/google/gwt/resources/gss/CssPrinterTest.java b/user/test/com/google/gwt/resources/gss/CssPrinterTest.java
index cf463c1..1b5e676 100644
--- a/user/test/com/google/gwt/resources/gss/CssPrinterTest.java
+++ b/user/test/com/google/gwt/resources/gss/CssPrinterTest.java
@@ -19,16 +19,16 @@
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import com.google.common.css.compiler.ast.CssTree;
-import com.google.common.css.compiler.ast.ErrorManager;
-import com.google.common.css.compiler.ast.GssFunction;
-import com.google.common.css.compiler.ast.MutatingVisitController;
-import com.google.common.css.compiler.passes.CreateConditionalNodes;
-import com.google.common.css.compiler.passes.CreateStandardAtRuleNodes;
-import com.google.common.css.compiler.passes.ResolveCustomFunctionNodes;
import com.google.gwt.core.ext.GeneratorContext;
import com.google.gwt.core.ext.typeinfo.TypeOracle;
import com.google.gwt.resources.ext.ResourceContext;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssTree;
+import com.google.gwt.thirdparty.common.css.compiler.ast.ErrorManager;
+import com.google.gwt.thirdparty.common.css.compiler.ast.GssFunction;
+import com.google.gwt.thirdparty.common.css.compiler.ast.MutatingVisitController;
+import com.google.gwt.thirdparty.common.css.compiler.passes.CreateConditionalNodes;
+import com.google.gwt.thirdparty.common.css.compiler.passes.CreateStandardAtRuleNodes;
+import com.google.gwt.thirdparty.common.css.compiler.passes.ResolveCustomFunctionNodes;
import java.util.HashSet;
import java.util.Map;
diff --git a/user/test/com/google/gwt/resources/gss/ExtendedEliminateConditionalNodesTest.java b/user/test/com/google/gwt/resources/gss/ExtendedEliminateConditionalNodesTest.java
index c524659..34f038a 100644
--- a/user/test/com/google/gwt/resources/gss/ExtendedEliminateConditionalNodesTest.java
+++ b/user/test/com/google/gwt/resources/gss/ExtendedEliminateConditionalNodesTest.java
@@ -16,11 +16,11 @@
package com.google.gwt.resources.gss;
-import com.google.common.collect.Sets;
-import com.google.common.css.compiler.ast.CssConditionalBlockNode;
-import com.google.common.css.compiler.ast.CssTree;
-import com.google.common.css.compiler.ast.ErrorManager;
-import com.google.common.css.compiler.passes.CreateConditionalNodes;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssConditionalBlockNode;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssTree;
+import com.google.gwt.thirdparty.common.css.compiler.ast.ErrorManager;
+import com.google.gwt.thirdparty.common.css.compiler.passes.CreateConditionalNodes;
+import com.google.gwt.thirdparty.guava.common.collect.Sets;
import java.util.Set;
diff --git a/user/test/com/google/gwt/resources/gss/ExternalClassesCollectorTest.java b/user/test/com/google/gwt/resources/gss/ExternalClassesCollectorTest.java
index 3b9fda7..0ed6a1a 100644
--- a/user/test/com/google/gwt/resources/gss/ExternalClassesCollectorTest.java
+++ b/user/test/com/google/gwt/resources/gss/ExternalClassesCollectorTest.java
@@ -21,16 +21,16 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
-import com.google.common.css.compiler.ast.CssClassSelectorNode;
-import com.google.common.css.compiler.ast.CssCompositeValueNode;
-import com.google.common.css.compiler.ast.CssLiteralNode;
-import com.google.common.css.compiler.ast.CssStringNode;
-import com.google.common.css.compiler.ast.CssUnknownAtRuleNode;
-import com.google.common.css.compiler.ast.CssValueNode;
-import com.google.common.css.compiler.ast.ErrorManager;
-import com.google.common.css.compiler.ast.MutatingVisitController;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssClassSelectorNode;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssCompositeValueNode;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssLiteralNode;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssStringNode;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssUnknownAtRuleNode;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssValueNode;
+import com.google.gwt.thirdparty.common.css.compiler.ast.ErrorManager;
+import com.google.gwt.thirdparty.common.css.compiler.ast.MutatingVisitController;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
+import com.google.gwt.thirdparty.guava.common.collect.Sets;
import junit.framework.TestCase;
diff --git a/user/test/com/google/gwt/resources/gss/ImageSpriteCreatorTest.java b/user/test/com/google/gwt/resources/gss/ImageSpriteCreatorTest.java
index c1ad50f..7971872 100644
--- a/user/test/com/google/gwt/resources/gss/ImageSpriteCreatorTest.java
+++ b/user/test/com/google/gwt/resources/gss/ImageSpriteCreatorTest.java
@@ -23,9 +23,6 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-import com.google.common.css.compiler.ast.CssTree;
-import com.google.common.css.compiler.ast.ErrorManager;
-import com.google.common.css.compiler.ast.GssError;
import com.google.gwt.core.ext.GeneratorContext;
import com.google.gwt.core.ext.typeinfo.JClassType;
import com.google.gwt.core.ext.typeinfo.JMethod;
@@ -36,6 +33,9 @@
import com.google.gwt.resources.client.ImageResource.RepeatStyle;
import com.google.gwt.resources.ext.ResourceContext;
import com.google.gwt.resources.gss.ImageSpriteCreator.MethodByPathHelper;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssTree;
+import com.google.gwt.thirdparty.common.css.compiler.ast.ErrorManager;
+import com.google.gwt.thirdparty.common.css.compiler.ast.GssError;
/**
* Test class for {@link ImageSpriteCreator}.
diff --git a/user/test/com/google/gwt/resources/gss/PermutationsCollectorTest.java b/user/test/com/google/gwt/resources/gss/PermutationsCollectorTest.java
index 7a62ad9..3635331 100644
--- a/user/test/com/google/gwt/resources/gss/PermutationsCollectorTest.java
+++ b/user/test/com/google/gwt/resources/gss/PermutationsCollectorTest.java
@@ -16,9 +16,9 @@
package com.google.gwt.resources.gss;
-import com.google.common.css.compiler.ast.CssTree;
-import com.google.common.css.compiler.ast.ErrorManager;
-import com.google.common.css.compiler.passes.CreateConditionalNodes;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssTree;
+import com.google.gwt.thirdparty.common.css.compiler.ast.ErrorManager;
+import com.google.gwt.thirdparty.common.css.compiler.passes.CreateConditionalNodes;
import java.util.List;
diff --git a/user/test/com/google/gwt/resources/gss/RecordingBidiFlipperTest.java b/user/test/com/google/gwt/resources/gss/RecordingBidiFlipperTest.java
index 9d1ff64..996bc47 100644
--- a/user/test/com/google/gwt/resources/gss/RecordingBidiFlipperTest.java
+++ b/user/test/com/google/gwt/resources/gss/RecordingBidiFlipperTest.java
@@ -16,7 +16,7 @@
package com.google.gwt.resources.gss;
-import com.google.common.css.compiler.ast.CssTree;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssTree;
/**
* Test class for {@link RecordingBidiFlipper}.
diff --git a/user/test/com/google/gwt/resources/gss/RenamingSubstitutionMapTest.java b/user/test/com/google/gwt/resources/gss/RenamingSubstitutionMapTest.java
index 90217ba..e2d044c 100644
--- a/user/test/com/google/gwt/resources/gss/RenamingSubstitutionMapTest.java
+++ b/user/test/com/google/gwt/resources/gss/RenamingSubstitutionMapTest.java
@@ -15,7 +15,7 @@
*/
package com.google.gwt.resources.gss;
-import com.google.common.collect.ImmutableMap;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableMap;
import junit.framework.TestCase;
diff --git a/user/test/com/google/gwt/resources/gss/ResourceUrlFunctionTest.java b/user/test/com/google/gwt/resources/gss/ResourceUrlFunctionTest.java
index e8c0c0d..0dbe206 100644
--- a/user/test/com/google/gwt/resources/gss/ResourceUrlFunctionTest.java
+++ b/user/test/com/google/gwt/resources/gss/ResourceUrlFunctionTest.java
@@ -23,14 +23,6 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-import com.google.common.collect.ImmutableList;
-import com.google.common.css.SourceCodeLocation;
-import com.google.common.css.compiler.ast.CssFunctionArgumentsNode;
-import com.google.common.css.compiler.ast.CssFunctionNode;
-import com.google.common.css.compiler.ast.CssValueNode;
-import com.google.common.css.compiler.ast.ErrorManager;
-import com.google.common.css.compiler.ast.GssError;
-import com.google.common.css.compiler.ast.GssFunctionException;
import com.google.gwt.core.ext.GeneratorContext;
import com.google.gwt.core.ext.typeinfo.JClassType;
import com.google.gwt.core.ext.typeinfo.NotFoundException;
@@ -40,6 +32,14 @@
import com.google.gwt.resources.ext.ResourceContext;
import com.google.gwt.resources.gss.ResourceUrlFunction.MethodByPathHelper;
import com.google.gwt.resources.gss.ast.CssJavaExpressionNode;
+import com.google.gwt.thirdparty.common.css.SourceCodeLocation;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssFunctionArgumentsNode;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssFunctionNode;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssValueNode;
+import com.google.gwt.thirdparty.common.css.compiler.ast.ErrorManager;
+import com.google.gwt.thirdparty.common.css.compiler.ast.GssError;
+import com.google.gwt.thirdparty.common.css.compiler.ast.GssFunctionException;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableList;
import junit.framework.TestCase;
diff --git a/user/test/com/google/gwt/resources/gss/RuntimeConditionalBlockCollectorTest.java b/user/test/com/google/gwt/resources/gss/RuntimeConditionalBlockCollectorTest.java
index b1bece6..d3529e5 100644
--- a/user/test/com/google/gwt/resources/gss/RuntimeConditionalBlockCollectorTest.java
+++ b/user/test/com/google/gwt/resources/gss/RuntimeConditionalBlockCollectorTest.java
@@ -16,10 +16,10 @@
package com.google.gwt.resources.gss;
-import com.google.common.css.compiler.ast.CssConditionalBlockNode;
-import com.google.common.css.compiler.ast.CssTree;
-import com.google.common.css.compiler.ast.ErrorManager;
-import com.google.common.css.compiler.passes.CreateConditionalNodes;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssConditionalBlockNode;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssTree;
+import com.google.gwt.thirdparty.common.css.compiler.ast.ErrorManager;
+import com.google.gwt.thirdparty.common.css.compiler.passes.CreateConditionalNodes;
import java.util.Set;
diff --git a/user/test/com/google/gwt/resources/gss/ValidateRuntimeConditionalNodeTest.java b/user/test/com/google/gwt/resources/gss/ValidateRuntimeConditionalNodeTest.java
index eeddd0f..b2a7a47 100644
--- a/user/test/com/google/gwt/resources/gss/ValidateRuntimeConditionalNodeTest.java
+++ b/user/test/com/google/gwt/resources/gss/ValidateRuntimeConditionalNodeTest.java
@@ -22,13 +22,13 @@
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
-import com.google.common.collect.Sets;
-import com.google.common.css.compiler.ast.CssTree;
-import com.google.common.css.compiler.ast.ErrorManager;
-import com.google.common.css.compiler.ast.GssError;
-import com.google.common.css.compiler.ast.MutatingVisitController;
-import com.google.common.css.compiler.passes.CreateConditionalNodes;
-import com.google.common.css.compiler.passes.CreateDefinitionNodes;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssTree;
+import com.google.gwt.thirdparty.common.css.compiler.ast.ErrorManager;
+import com.google.gwt.thirdparty.common.css.compiler.ast.GssError;
+import com.google.gwt.thirdparty.common.css.compiler.ast.MutatingVisitController;
+import com.google.gwt.thirdparty.common.css.compiler.passes.CreateConditionalNodes;
+import com.google.gwt.thirdparty.common.css.compiler.passes.CreateDefinitionNodes;
+import com.google.gwt.thirdparty.guava.common.collect.Sets;
import org.mockito.verification.VerificationMode;
diff --git a/user/test/com/google/gwt/resources/gss/ValueFunctionTest.java b/user/test/com/google/gwt/resources/gss/ValueFunctionTest.java
index acd3f6f..7532a0f 100644
--- a/user/test/com/google/gwt/resources/gss/ValueFunctionTest.java
+++ b/user/test/com/google/gwt/resources/gss/ValueFunctionTest.java
@@ -19,12 +19,12 @@
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableList.Builder;
-import com.google.common.css.SourceCodeLocation;
-import com.google.common.css.compiler.ast.CssValueNode;
-import com.google.common.css.compiler.ast.GssFunctionException;
import com.google.gwt.resources.gss.ast.CssDotPathNode;
+import com.google.gwt.thirdparty.common.css.SourceCodeLocation;
+import com.google.gwt.thirdparty.common.css.compiler.ast.CssValueNode;
+import com.google.gwt.thirdparty.common.css.compiler.ast.GssFunctionException;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableList;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableList.Builder;
import junit.framework.TestCase;
diff --git a/user/test/com/google/gwt/validation/rebind/GwtSpecificValidatorCreatorTest.java b/user/test/com/google/gwt/validation/rebind/GwtSpecificValidatorCreatorTest.java
index 8644977..ae62513 100644
--- a/user/test/com/google/gwt/validation/rebind/GwtSpecificValidatorCreatorTest.java
+++ b/user/test/com/google/gwt/validation/rebind/GwtSpecificValidatorCreatorTest.java
@@ -1,12 +1,12 @@
/*
* Copyright 2010 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
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -17,8 +17,8 @@
import static com.google.gwt.validation.rebind.GwtSpecificValidatorCreator.getValidatorForType;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableList;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableSet;
import com.google.gwt.validation.client.constraints.SizeValidatorForCollection;
import com.google.gwt.validation.client.constraints.SizeValidatorForString;
diff --git a/user/test/com/google/gwt/validation/rebind/UtilTest.java b/user/test/com/google/gwt/validation/rebind/UtilTest.java
index 2199cd5..1e42976 100644
--- a/user/test/com/google/gwt/validation/rebind/UtilTest.java
+++ b/user/test/com/google/gwt/validation/rebind/UtilTest.java
@@ -1,12 +1,12 @@
/*
* Copyright 2010 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
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -17,11 +17,11 @@
import static com.google.gwt.validation.rebind.Util.findBestMatches;
-import com.google.common.base.Function;
-import com.google.common.base.Functions;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Iterables;
+import com.google.gwt.thirdparty.guava.common.base.Function;
+import com.google.gwt.thirdparty.guava.common.base.Functions;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableList;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableSet;
+import com.google.gwt.thirdparty.guava.common.collect.Iterables;
import junit.framework.TestCase;
diff --git a/user/test/org/hibernate/jsr303/tck/util/TckTestSuiteWrapper.java b/user/test/org/hibernate/jsr303/tck/util/TckTestSuiteWrapper.java
index 329f229..608d454 100644
--- a/user/test/org/hibernate/jsr303/tck/util/TckTestSuiteWrapper.java
+++ b/user/test/org/hibernate/jsr303/tck/util/TckTestSuiteWrapper.java
@@ -15,14 +15,14 @@
*/
package org.hibernate.jsr303.tck.util;
-import static com.google.common.base.Predicates.and;
-import static com.google.common.base.Predicates.not;
-import static com.google.common.base.Predicates.or;
-import static com.google.common.collect.ImmutableList.copyOf;
-import static com.google.common.collect.Iterables.filter;
+import static com.google.gwt.thirdparty.guava.common.base.Predicates.and;
+import static com.google.gwt.thirdparty.guava.common.base.Predicates.not;
+import static com.google.gwt.thirdparty.guava.common.base.Predicates.or;
+import static com.google.gwt.thirdparty.guava.common.collect.ImmutableList.copyOf;
+import static com.google.gwt.thirdparty.guava.common.collect.Iterables.filter;
import com.google.gwt.junit.tools.GWTTestSuite;
-import com.google.common.base.Predicate;
+import com.google.gwt.thirdparty.guava.common.base.Predicate;
import junit.framework.Test;
@@ -55,7 +55,7 @@
private static final Predicate<Method> EXCLUDE_NON_TCK_TEST = createHasProperty(NonTckTest.EXCLUDE);
@SuppressWarnings("unchecked")
- private static final Predicate<Method> METHOD_FILTER =
+ private static final Predicate<Method> METHOD_FILTER =
and(
or(INCLUDE_NOT_SUPPORTED, not(HAS_NOT_SUPPORTED)),
or(INCLUDE_TEST_NOT_COMPATIBLE, not(HAS_TEST_NOT_COMPATIBLE)),
