Revision: 6324 Author: [email protected] Date: Thu Oct 8 10:32:14 2009 Log: Merge r6323 into snapshot branch. $ svn merge -c 6323 https://google-web-toolkit.googlecode.com/svn/trunk
http://code.google.com/p/google-web-toolkit/source/detail?r=6324 Modified: /branches/snapshot-2009.10.06-r6307 /branches/snapshot-2009.10.06-r6307/dev/core/src/com/google/gwt/core/ext/ServletContainer.java /branches/snapshot-2009.10.06-r6307/dev/core/src/com/google/gwt/core/ext/ServletContainerLauncher.java /branches/snapshot-2009.10.06-r6307/dev/core/src/com/google/gwt/dev/javac/ArtificialRescueChecker.java /branches/snapshot-2009.10.06-r6307/dev/core/src/com/google/gwt/dev/shell/rewrite/RewriteSingleJsoImplDispatches.java /branches/snapshot-2009.10.06-r6307/dev/core/src/com/google/gwt/dev/util/arg/ArgHandlerDisableAggressiveOptimization.java /branches/snapshot-2009.10.06-r6307/dev/core/src/com/google/gwt/dev/util/arg/ArgHandlerEnableAssertions.java /branches/snapshot-2009.10.06-r6307/dev/core/src/com/google/gwt/dev/util/arg/ArgHandlerOutDir.java /branches/snapshot-2009.10.06-r6307/dev/core/src/com/google/gwt/dev/util/arg/ArgHandlerWorkDirOptional.java /branches/snapshot-2009.10.06-r6307/dev/core/src/com/google/gwt/dev/util/arg/ArgHandlerWorkDirRequired.java /branches/snapshot-2009.10.06-r6307/dev/core/test/com/google/gwt/dev/AboutTest.java /branches/snapshot-2009.10.06-r6307/distro-source/linux/src/webAppCreator /branches/snapshot-2009.10.06-r6307/distro-source/mac/src/webAppCreator /branches/snapshot-2009.10.06-r6307/distro-source/windows/src/webAppCreator.cmd /branches/snapshot-2009.10.06-r6307/eclipse/samples/Hello/Hello-gwtc.launch /branches/snapshot-2009.10.06-r6307/samples/dynatable/war/DynaTable.css /branches/snapshot-2009.10.06-r6307/samples/dynatable/war/DynaTable.html /branches/snapshot-2009.10.06-r6307/samples/hello/war/Hello.html /branches/snapshot-2009.10.06-r6307/samples/i18n/war/I18N.css /branches/snapshot-2009.10.06-r6307/samples/i18n/war/I18N.html /branches/snapshot-2009.10.06-r6307/samples/json/war/JSON.css /branches/snapshot-2009.10.06-r6307/samples/json/war/JSON.html /branches/snapshot-2009.10.06-r6307/samples/mail/war/Mail.css /branches/snapshot-2009.10.06-r6307/samples/mail/war/Mail.html /branches/snapshot-2009.10.06-r6307/samples/mail/war/gradient.gif /branches/snapshot-2009.10.06-r6307/samples/mail/war/leftCorner.gif /branches/snapshot-2009.10.06-r6307/samples/mail/war/rightCorner.gif /branches/snapshot-2009.10.06-r6307/samples/showcase/war/Showcase.html /branches/snapshot-2009.10.06-r6307/samples/simplerpc/war/SimpleRPC.css /branches/snapshot-2009.10.06-r6307/samples/simplerpc/war/SimpleRPC.html /branches/snapshot-2009.10.06-r6307/samples/simplexml/war/SimpleXML.css /branches/snapshot-2009.10.06-r6307/samples/simplexml/war/SimpleXML.html /branches/snapshot-2009.10.06-r6307/user/src/com/google/gwt/core/client/HttpThrowableReporter.java /branches/snapshot-2009.10.06-r6307/user/src/com/google/gwt/core/client/JsonUtils.java /branches/snapshot-2009.10.06-r6307/user/src/com/google/gwt/event/dom/client/HandlesAllFocusEvents.java /branches/snapshot-2009.10.06-r6307/user/src/com/google/gwt/event/dom/client/HandlesAllKeyEvents.java /branches/snapshot-2009.10.06-r6307/user/src/com/google/gwt/event/dom/client/HandlesAllMouseEvents.java /branches/snapshot-2009.10.06-r6307/user/src/com/google/gwt/event/dom/client/KeyCodes.java /branches/snapshot-2009.10.06-r6307/user/src/com/google/gwt/event/dom/client/PrivateMap.java /branches/snapshot-2009.10.06-r6307/user/src/com/google/gwt/event/logical/shared/HasValueChangeHandlers.java /branches/snapshot-2009.10.06-r6307/user/src/com/google/gwt/event/logical/shared/ValueChangeEvent.java /branches/snapshot-2009.10.06-r6307/user/src/com/google/gwt/event/logical/shared/ValueChangeHandler.java /branches/snapshot-2009.10.06-r6307/user/src/com/google/gwt/event/shared/DefaultHandlerRegistration.java /branches/snapshot-2009.10.06-r6307/user/src/com/google/gwt/event/shared/GwtEvent.java /branches/snapshot-2009.10.06-r6307/user/src/com/google/gwt/event/shared/HandlerRegistration.java /branches/snapshot-2009.10.06-r6307/user/src/com/google/gwt/resources /branches/snapshot-2009.10.06-r6307/user/src/com/google/gwt/resources/client/ClientBundle.java /branches/snapshot-2009.10.06-r6307/user/src/com/google/gwt/resources/ext/ClientBundleFields.java /branches/snapshot-2009.10.06-r6307/user/src/com/google/gwt/resources/ext/ClientBundleRequirements.java /branches/snapshot-2009.10.06-r6307/user/src/com/google/gwt/resources/rebind/context/AbstractClientBundleGenerator.java /branches/snapshot-2009.10.06-r6307/user/src/com/google/gwt/resources/rebind/context/InlineClientBundleGenerator.java /branches/snapshot-2009.10.06-r6307/user/src/com/google/gwt/resources/rebind/context/StaticClientBundleGenerator.java /branches/snapshot-2009.10.06-r6307/user/src/com/google/gwt/rpc/rebind/RpcProxyCreator.java /branches/snapshot-2009.10.06-r6307/user/src/com/google/gwt/rpc/server/CommandServerSerializationStreamReader.java /branches/snapshot-2009.10.06-r6307/user/src/com/google/gwt/user/RemoteServiceObfuscateTypeNames.gwt.xml /branches/snapshot-2009.10.06-r6307/user/src/com/google/gwt/user/client/ui/ListenerWrapper.java /branches/snapshot-2009.10.06-r6307/user/src/com/google/gwt/user/rebind/StringSourceWriter.java /branches/snapshot-2009.10.06-r6307/user/src/com/google/gwt/user/tools/WebAppCreator.java /branches/snapshot-2009.10.06-r6307/user/test/com/google/gwt/core/client/HttpThrowableReporterTest.java /branches/snapshot-2009.10.06-r6307/user/test/com/google/gwt/dev/jjs/test/jsoimpls/UnreferencedImplOfJsoInterface.java /branches/snapshot-2009.10.06-r6307/user/test/com/google/gwt/dev/jjs/test/jsointfs/JsoInterfaceWithUnreferencedImpl.java /branches/snapshot-2009.10.06-r6307/user/test/com/google/gwt/event/dom/client/DomEventTest.java /branches/snapshot-2009.10.06-r6307/user/test/com/google/gwt/event/logical/shared/LogicalEventsTest.java /branches/snapshot-2009.10.06-r6307/user/test/com/google/gwt/junit/NonGwtTestSuite.java /branches/snapshot-2009.10.06-r6307/user/test/com/google/gwt/resources /branches/snapshot-2009.10.06-r6307/user/test/com/google/gwt/user/RPCSuiteWithObfuscation.gwt.xml /branches/snapshot-2009.10.06-r6307/user/test/com/google/gwt/user/client/rpc/CollectionsTestWithTypeObfuscation.java /branches/snapshot-2009.10.06-r6307/user/test/com/google/gwt/user/client/rpc/CustomFieldSerializerTestWithTypeObfuscation.java /branches/snapshot-2009.10.06-r6307/user/test/com/google/gwt/user/client/rpc/EnumsTestWithTypeObfuscation.java /branches/snapshot-2009.10.06-r6307/user/test/com/google/gwt/user/client/rpc/InheritanceTestWithTypeObfuscation.java /branches/snapshot-2009.10.06-r6307/user/test/com/google/gwt/user/client/rpc/ObjectGraphTestWithTypeObfuscation.java /branches/snapshot-2009.10.06-r6307/user/test/com/google/gwt/user/client/rpc/RemoteServiceServletTestWithTypeObfuscation.java /branches/snapshot-2009.10.06-r6307/user/test/com/google/gwt/user/client/rpc/UnicodeEscapingTestWithTypeObfuscation.java /branches/snapshot-2009.10.06-r6307/user/test/com/google/gwt/user/client/rpc/ValueTypesTestWithTypeObfuscation.java ======================================= --- /branches/snapshot-2009.10.06-r6307/dev/core/src/com/google/gwt/dev/javac/ArtificialRescueChecker.java Mon Jul 6 14:45:31 2009 +++ /branches/snapshot-2009.10.06-r6307/dev/core/src/com/google/gwt/dev/javac/ArtificialRescueChecker.java Thu Oct 8 10:32:14 2009 @@ -102,6 +102,15 @@ if (collectTypes) { referencedTypes = Lists.add(referencedTypes, className); } + + boolean isArray = false; + while (className.endsWith("[]")) { + className = className.substring(0, className.length() - 2); + if (collectTypes) { + referencedTypes = Lists.add(referencedTypes, className); + } + isArray = true; + } if (!reportErrors) { // Nothing else to do @@ -110,11 +119,6 @@ // Goal (2) // Strip off any array-like extensions and just find base type - boolean isArray = false; - while (className.endsWith("[]")) { - className = className.substring(0, className.length() - 2); - isArray = true; - } // Fix JSNI primitive type names to something JDT will understand if (isArray && className.length() == 1) { ======================================= --- /branches/snapshot-2009.10.06-r6307/samples/mail/war/leftCorner.gif Mon Mar 16 16:27:28 2009 +++ /branches/snapshot-2009.10.06-r6307/samples/mail/war/leftCorner.gif Thu Oct 8 10:32:14 2009 Binary file, no diff available. ======================================= --- /branches/snapshot-2009.10.06-r6307/samples/mail/war/rightCorner.gif Mon Mar 16 16:27:28 2009 +++ /branches/snapshot-2009.10.06-r6307/samples/mail/war/rightCorner.gif Thu Oct 8 10:32:14 2009 Binary file, no diff available. ======================================= ***Additional files exist in this changeset.*** --~--~---------~--~----~------------~-------~--~----~ http://groups.google.com/group/Google-Web-Toolkit-Contributors -~----------~----~----~----~------~----~------~--~---
