-
+
@@ -124,7 +124,7 @@
-
+
diff --git a/eclipse/dev/.classpath b/eclipse/dev/.classpath
index ac771cbca58..a84d801f71e 100644
--- a/eclipse/dev/.classpath
+++ b/eclipse/dev/.classpath
@@ -21,7 +21,7 @@
-
+
diff --git a/eclipse/dev/codeserver/.classpath b/eclipse/dev/codeserver/.classpath
index 88a6968b93b..bc64bf5c128 100644
--- a/eclipse/dev/codeserver/.classpath
+++ b/eclipse/dev/codeserver/.classpath
@@ -3,7 +3,7 @@
-
+
diff --git a/eclipse/settings/code-style/gwt-checkstyle-suppressions.xml b/eclipse/settings/code-style/gwt-checkstyle-suppressions.xml
deleted file mode 100644
index c5181f9688f..00000000000
--- a/eclipse/settings/code-style/gwt-checkstyle-suppressions.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/eclipse/settings/code-style/gwt-checkstyle-tests.xml b/eclipse/settings/code-style/gwt-checkstyle-tests.xml
index a9b5a73977f..9b6bfb18dd5 100644
--- a/eclipse/settings/code-style/gwt-checkstyle-tests.xml
+++ b/eclipse/settings/code-style/gwt-checkstyle-tests.xml
@@ -7,13 +7,13 @@ Checkstyle-Configuration: GWT Checks for Tests
Description:
A more lenient set of style checks for test cases, needed because test often need to do funkier stuff.
-->
-
+
-
+
@@ -23,7 +23,6 @@ A more lenient set of style checks for test cases, needed because test often nee
-
@@ -90,20 +89,17 @@ A more lenient set of style checks for test cases, needed because test often nee
-
-
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
@@ -215,33 +211,30 @@ A more lenient set of style checks for test cases, needed because test often nee
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/eclipse/settings/code-style/gwt-checkstyle.xml b/eclipse/settings/code-style/gwt-checkstyle.xml
index 2455ce28a60..222dfb5b7fd 100644
--- a/eclipse/settings/code-style/gwt-checkstyle.xml
+++ b/eclipse/settings/code-style/gwt-checkstyle.xml
@@ -7,13 +7,13 @@ Checkstyle-Configuration: GWT Checks
Description:
-->
-
+
-
+
@@ -21,13 +21,12 @@ Description:
+
+
+
+
-
-
-
-
-
-
+
@@ -40,6 +39,7 @@ Description:
+
@@ -53,7 +53,7 @@ Description:
-
+
@@ -86,20 +86,17 @@ Description:
-
-
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
@@ -198,33 +195,31 @@ Description:
-
-
-
-
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
-
-
-
-
-
+
+
-
-
-
diff --git a/eclipse/user/.classpath b/eclipse/user/.classpath
index 75f936204d0..1fa63d0ffcc 100644
--- a/eclipse/user/.classpath
+++ b/eclipse/user/.classpath
@@ -44,7 +44,7 @@
-
+
diff --git a/maven/google-poms/gwt/pom-template.xml b/maven/google-poms/gwt/pom-template.xml
index dc7f26bd3d5..777f51ed37f 100644
--- a/maven/google-poms/gwt/pom-template.xml
+++ b/maven/google-poms/gwt/pom-template.xml
@@ -22,7 +22,7 @@
9.4.44.v20210927
- 9.2
+ 9.6
diff --git a/maven/poms/gwt/pom-template.xml b/maven/poms/gwt/pom-template.xml
index 0f288bae1e9..0825e6cf471 100644
--- a/maven/poms/gwt/pom-template.xml
+++ b/maven/poms/gwt/pom-template.xml
@@ -22,7 +22,7 @@
9.4.44.v20210927
- 9.2
+ 9.6
diff --git a/requestfactory/build.xml b/requestfactory/build.xml
index c835c86da4e..8a78f446fb7 100755
--- a/requestfactory/build.xml
+++ b/requestfactory/build.xml
@@ -41,10 +41,14 @@
+
+
+
+
diff --git a/samples/validation/src/main/java/com/google/gwt/sample/validation/shared/Person.java b/samples/validation/src/main/java/com/google/gwt/sample/validation/shared/Person.java
index c24ef952c19..6724a112a5f 100644
--- a/samples/validation/src/main/java/com/google/gwt/sample/validation/shared/Person.java
+++ b/samples/validation/src/main/java/com/google/gwt/sample/validation/shared/Person.java
@@ -16,7 +16,6 @@
package com.google.gwt.sample.validation.shared;
import com.google.gwt.sample.validation.server.ServerConstraint;
-
import com.google.gwt.user.client.rpc.IsSerializable;
import java.util.Map;
diff --git a/servlet/build.xml b/servlet/build.xml
index 47d554892f1..9f23dfcdf5f 100644
--- a/servlet/build.xml
+++ b/servlet/build.xml
@@ -24,11 +24,11 @@
-
-
+
+
+
-
@@ -70,11 +70,11 @@
-
-
+
+
+
-
diff --git a/tools/api-checker/config/gwt211_212userapi.conf b/tools/api-checker/config/gwt211_212userapi.conf
new file mode 100644
index 00000000000..ecd503d03df
--- /dev/null
+++ b/tools/api-checker/config/gwt211_212userapi.conf
@@ -0,0 +1,156 @@
+#existing API
+
+# dirRoot_old is missing because refJars are being supplied
+name_old gwt211userApi
+#sourceFiles is specified as colon-separated list of files
+sourceFiles_old com/google/gwt\
+:com/google/web\
+:javax/validation\
+
+#excludedFiles is specified as colon-separated ant patterns
+# The entries for javax and org exclude the validation stuff.
+# Bug: http://code.google.com/p/google-web-toolkit/issues/detail?id=5566
+excludedFiles_old **/linker/**\
+:**/rebind/**\
+:**/server/**\
+:**/tools/**\
+:**/vm/**\
+:com/google/gwt/core/client/impl/JavaScriptExceptionBase.java\
+:com/google/gwt/core/client/impl/WeakMapping.java\
+:com/google/gwt/core/shared/impl/StringCase.java\
+:com/google/gwt/core/shared/impl/ThrowableTypeResolver.java\
+:com/google/gwt/core/ext/**\
+:com/google/gwt/dev/*.java\
+:com/google/gwt/dev/asm/**\
+:com/google/gwt/dev/cfg/**\
+:com/google/gwt/dev/codeserver/**\
+:com/google/gwt/dev/common/**\
+:com/google/gwt/dev/generator/**\
+:com/google/gwt/dev/javac/**\
+:com/google/gwt/dev/jdt/**\
+:com/google/gwt/dev/jjs/*.java\
+:com/google/gwt/dev/jjs/ast/**\
+:com/google/gwt/dev/jjs/impl/**\
+:com/google/gwt/dev/js/**\
+:com/google/gwt/dev/json/**\
+:com/google/gwt/dev/resource/**\
+:com/google/gwt/dev/shell/**\
+:com/google/gwt/dev/ui/**\
+:com/google/gwt/dev/url/**\
+:com/google/gwt/dev/util/**\
+:com/google/gwt/i18n/**/impl/cldr/**\
+:com/google/gwt/junit/*.java\
+:com/google/gwt/junit/client/GWTTestCase.java\
+:com/google/gwt/junit/client/impl/GWTRunner.java\
+:com/google/gwt/junit/client/impl/GWTTestAccessor.java\
+:com/google/gwt/junit/remote/**\
+:com/google/gwt/regexp/shared/**\
+:com/google/gwt/resources/css/**\
+:com/google/gwt/resources/gss/**\
+:com/google/gwt/resources/converter/**\
+:com/google/gwt/resources/ext/**\
+:com/google/gwt/resources/rg/**\
+:com/google/gwt/safecss/shared/SafeStylesHostedModeUtils.java\
+:com/google/gwt/safehtml/shared/SafeHtmlHostedModeUtils.java\
+:com/google/gwt/safehtml/shared/SafeUriHostedModeUtils.java\
+:com/google/gwt/soyc/**\
+:com/google/gwt/typedarrays/super/com/google/gwt/typedarrays/shared/TypedArraysFactory.java\
+:com/google/gwt/user/client/rpc/core/**\
+:com/google/gwt/user/client/rpc/impl/**\
+:com/google/gwt/uibinder/attributeparsers/**\
+:com/google/gwt/uibinder/client/impl/**\
+:com/google/gwt/uibinder/elementparsers/**\
+:com/google/gwt/uibinder/testing/**\
+:com/google/gwt/util/**\
+:com/google/gwt/validation/**\
+:com/google/web/bindery/autobean/shared/ValueCodexHelper.java\
+:com/google/web/bindery/autobean/**/impl/**\
+:com/google/web/bindery/requestfactory/apt/**\
+:com/google/web/bindery/requestfactory/gwt/client/RequestBatcher.java\
+:com/google/web/bindery/requestfactory/gwt/client/impl/**\
+:com/google/web/bindery/requestfactory/server/impl/**\
+:com/google/web/bindery/requestfactory/shared/impl/**\
+:com/google/web/bindery/requestfactory/vm/**\
+:javax/**\
+:org/**\
+
+##############################################
+#new Api
+
+dirRoot_new ./
+name_new gwt28userApi
+#sourceFiles is specified as colon-separated list of files
+sourceFiles_new dev/core/super\
+:user/src\
+:user/super\
+
+#excludedFiles is specified as colon-separated ant patterns
+# The entries for javax and org exclude the validation stuff.
+# Bug: http://code.google.com/p/google-web-toolkit/issues/detail?id=5566
+excludedFiles_new **/linker/**\
+:**/rebind/**\
+:**/server/**\
+:**/tools/**\
+:**/vm/**\
+:user/src/com/google/gwt/core/client/impl/JavaScriptExceptionBase.java\
+:user/src/com/google/gwt/core/client/impl/WeakMapping.java\
+:user/src/com/google/gwt/core/shared/impl/ThrowableTypeResolver.java\
+:user/src/com/google/gwt/i18n/**/impl/cldr/**\
+:user/src/com/google/gwt/junit/*.java\
+:user/src/com/google/gwt/junit/client/GWTTestCase.java\
+:user/src/com/google/gwt/junit/client/impl/GWTRunner.java\
+:user/src/com/google/gwt/junit/client/impl/GWTTestAccessor.java\
+:user/src/com/google/gwt/regexp/shared/**\
+:user/src/com/google/gwt/resources/css/**\
+:user/src/com/google/gwt/resources/gss/**\
+:user/src/com/google/gwt/resources/converter/**\
+:user/src/com/google/gwt/resources/ext/**\
+:user/src/com/google/gwt/resources/rg/**\
+:user/src/com/google/gwt/safecss/shared/SafeStylesHostedModeUtils.java\
+:user/src/com/google/gwt/safehtml/shared/SafeHtmlHostedModeUtils.java\
+:user/src/com/google/gwt/safehtml/shared/SafeUriHostedModeUtils.java\
+:user/src/com/google/gwt/user/client/rpc/core/**\
+:user/src/com/google/gwt/user/client/rpc/impl/**\
+:user/src/com/google/gwt/uibinder/attributeparsers/**\
+:user/src/com/google/gwt/uibinder/client/impl/**\
+:user/src/com/google/gwt/uibinder/elementparsers/**\
+:user/src/com/google/gwt/uibinder/testing/**\
+:user/src/com/google/gwt/util/**\
+:user/src/com/google/gwt/validation/**\
+:user/src/com/google/web/bindery/autobean/shared/ValueCodexHelper.java\
+:user/src/com/google/web/bindery/autobean/**/impl/**\
+:user/src/com/google/web/bindery/requestfactory/apt/**\
+:user/src/com/google/web/bindery/requestfactory/gwt/client/RequestBatcher.java\
+:user/src/com/google/web/bindery/requestfactory/gwt/client/impl/**\
+:user/src/com/google/web/bindery/requestfactory/server/impl/**\
+:user/src/com/google/web/bindery/requestfactory/shared/impl/**\
+:user/src/com/google/web/bindery/requestfactory/vm/**\
+:user/src/javax/**\
+:user/src/org/**\
+:user/super/com/google/gwt/typedarrays/super/com/google/gwt/typedarrays/shared/TypedArraysFactory.java\
+
+##############################################
+#excluded packages colon separated list
+excludedPackages com.google.gwt.core.client.impl\
+:com.google.gwt.core.shared.impl\
+:com.google.gwt.core.client.js.impl\
+:com.google.gwt.editor.client.impl\
+:com.google.gwt.i18n.client.impl\
+:com.google.gwt.junit.client.impl\
+:com.google.gwt.lang\
+:com.google.gwt.logging.impl\
+:com.google.gwt.resources.client.impl\
+:com.google.gwt.rpc.client.impl\
+:com.google.gwt.user.client.impl\
+:com.google.gwt.user.client.ui.impl\
+:com.google.gwt.xml.client.impl\
+:javaemul.internal\
+
+##############################################
+#Api whitelist
+# when adding to the white-list, include comments as to why the addition is
+# being made.
+
+# java.io.Reader missing IOException throws for read methods
+java.io.Reader::read([C) OVERRIDABLE_METHOD_EXCEPTION_TYPE_CHANGE new method has more exceptions: [Ljava/io/IOException;]
+java.io.Reader::read([CII) OVERRIDABLE_METHOD_EXCEPTION_TYPE_CHANGE new method has more exceptions: [Ljava/io/IOException;]
diff --git a/tools/api-checker/src/com/google/gwt/tools/apichecker/ApiCompatibilityChecker.java b/tools/api-checker/src/com/google/gwt/tools/apichecker/ApiCompatibilityChecker.java
index 313037c1aa8..2bfe463048f 100644
--- a/tools/api-checker/src/com/google/gwt/tools/apichecker/ApiCompatibilityChecker.java
+++ b/tools/api-checker/src/com/google/gwt/tools/apichecker/ApiCompatibilityChecker.java
@@ -24,12 +24,11 @@
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.apache.ant.types.ZipScanner;
import com.google.gwt.util.tools.ArgHandlerFlag;
import com.google.gwt.util.tools.ArgHandlerString;
import com.google.gwt.util.tools.ToolBase;
-import com.google.gwt.thirdparty.apache.ant.types.ZipScanner;
-
import java.io.BufferedInputStream;
import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
diff --git a/user/build.xml b/user/build.xml
index d627a8078cd..2af156012ff 100755
--- a/user/build.xml
+++ b/user/build.xml
@@ -14,27 +14,16 @@
-
-
-
-
+
+
-
-
-
-
-
-
+
+
-
-
-
+
@@ -59,7 +48,6 @@
-->
-
-
-
-
-
+
+ release="11">
+
+
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/user/src/com/google/gwt/cell/client/CheckboxCell.java b/user/src/com/google/gwt/cell/client/CheckboxCell.java
index 8e9c46200e2..77eda41a440 100644
--- a/user/src/com/google/gwt/cell/client/CheckboxCell.java
+++ b/user/src/com/google/gwt/cell/client/CheckboxCell.java
@@ -46,6 +46,7 @@ public class CheckboxCell extends AbstractEditableCell {
/**
* Construct a new {@link CheckboxCell}.
*/
+ @SuppressWarnings("BoxedPrimitiveEquality")
public CheckboxCell() {
this(false);
}
@@ -91,7 +92,8 @@ public boolean isEditing(Context context, Element parent, Boolean value) {
}
@Override
- public void onBrowserEvent(Context context, Element parent, Boolean value,
+ @SuppressWarnings("BoxedPrimitiveEquality")
+ public void onBrowserEvent(Context context, Element parent, Boolean value,
NativeEvent event, ValueUpdater valueUpdater) {
String type = event.getType();
diff --git a/user/src/com/google/gwt/core/CompilerParameters.gwt.xml b/user/src/com/google/gwt/core/CompilerParameters.gwt.xml
index df4aca4b873..fdeb60705fc 100644
--- a/user/src/com/google/gwt/core/CompilerParameters.gwt.xml
+++ b/user/src/com/google/gwt/core/CompilerParameters.gwt.xml
@@ -96,6 +96,12 @@
+
+
+
+
diff --git a/user/src/com/google/gwt/core/CoreWithUserAgent.gwt.xml b/user/src/com/google/gwt/core/CoreWithUserAgent.gwt.xml
index 48fa48ed1dd..38a9dbe1f55 100644
--- a/user/src/com/google/gwt/core/CoreWithUserAgent.gwt.xml
+++ b/user/src/com/google/gwt/core/CoreWithUserAgent.gwt.xml
@@ -15,20 +15,4 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/user/src/com/google/gwt/core/StackTrace.gwt.xml b/user/src/com/google/gwt/core/StackTrace.gwt.xml
index 879dbe42164..024183c50d2 100644
--- a/user/src/com/google/gwt/core/StackTrace.gwt.xml
+++ b/user/src/com/google/gwt/core/StackTrace.gwt.xml
@@ -45,9 +45,14 @@
-
+
+
+
+
+
+
diff --git a/user/src/com/google/gwt/core/server/StackTraceDeobfuscator.java b/user/src/com/google/gwt/core/server/StackTraceDeobfuscator.java
index 776e4cfd964..25d851c7c0c 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.gwt.thirdparty.debugging.sourcemap.OriginalMapping;
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;
@@ -26,6 +26,7 @@
import java.io.InputStream;
import java.io.InputStreamReader;
import java.net.URL;
+import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
@@ -186,9 +187,9 @@ public final StackTraceElement[] resymbolize(StackTraceElement[] st, String stro
return null;
}
// Warm the symbol cache for all symbols in this stack trace.
- Set requiredSymbols = new HashSet();
+ Set requiredSymbols = new HashSet<>();
for (StackTraceElement ste : st) {
- requiredSymbols.add(ste.getMethodName());
+ requiredSymbols.add(normalizeSymbol(ste.getMethodName()));
}
loadSymbolMap(strongName, requiredSymbols);
@@ -199,6 +200,17 @@ public final StackTraceElement[] resymbolize(StackTraceElement[] st, String stro
return newSt;
}
+ /**
+ * Helper to clean up client-provided symbols.
+ */
+ private static String normalizeSymbol(String symbol) {
+ // Chrome prefixes "new " for constructor calls, eliminate the prefix
+ if (symbol.startsWith("new ")) {
+ symbol = symbol.substring(4);
+ }
+ return symbol;
+ }
+
/**
* Best effort resymbolization of a single stack trace element.
*
@@ -299,13 +311,19 @@ public final StackTraceElement resymbolize(StackTraceElement ste, String strongN
if (sourceMapCapable && fragmentId != -1 && column != -1) {
SourceMapping sourceMapping = loadSourceMap(strongName, fragmentId);
if (sourceMapping != null && ste.getLineNumber() > -1) {
- Mapping.OriginalMapping mappingForLine = sourceMapping
+ OriginalMapping mappingForLine = sourceMapping
.getMappingForLine(jsLineNumber, column);
if (mappingForLine != null) {
if (declaringClass == null || declaringClass.equals(ste.getClassName())) {
declaringClass = mappingForLine.getOriginalFile();
- methodName = mappingForLine.getIdentifier();
+ if (mappingForLine.getIdentifier().isPresent()) {
+ // Only overwrite the name if the sourcemap had an explicit identifier
+ methodName = mappingForLine.getIdentifier().get();
+ } else if (methodName == null) {
+ // No other name was provided by symbolMaps, fall back to JS name
+ methodName = ste.getMethodName();
+ }
}
fileName = mappingForLine.getOriginalFile();
lineNumber = mappingForLine.getLineNumber();
@@ -366,9 +384,8 @@ private String loadStreamAsString(InputStream stream) {
}
private String loadOneSymbol(String strongName, String symbol) {
- Set symbolSet = new HashSet();
- symbolSet.add(symbol);
- Map symbolMap = loadSymbolMap(strongName, symbolSet);
+ symbol = normalizeSymbol(symbol);
+ Map symbolMap = loadSymbolMap(strongName, Collections.singleton(symbol));
return symbolMap.get(symbol);
}
diff --git a/user/src/com/google/gwt/dom/client/BrowserEvents.java b/user/src/com/google/gwt/dom/client/BrowserEvents.java
index 18523a86385..c8be19c053b 100644
--- a/user/src/com/google/gwt/dom/client/BrowserEvents.java
+++ b/user/src/com/google/gwt/dom/client/BrowserEvents.java
@@ -53,7 +53,9 @@ public class BrowserEvents {
public static final String MOUSEOUT = "mouseout";
public static final String MOUSEOVER = "mouseover";
public static final String MOUSEUP = "mouseup";
+ @Deprecated
public static final String MOUSEWHEEL = "mousewheel";
+ public static final String WHEEL = "wheel";
public static final String PROGRESS = "progress";
public static final String SCROLL = "scroll";
public static final String TOUCHCANCEL = "touchcancel";
diff --git a/user/src/com/google/gwt/dom/client/DOMImpl.java b/user/src/com/google/gwt/dom/client/DOMImpl.java
index b6df16551da..a4d5a8d5717 100644
--- a/user/src/com/google/gwt/dom/client/DOMImpl.java
+++ b/user/src/com/google/gwt/dom/client/DOMImpl.java
@@ -138,7 +138,9 @@ public native boolean eventGetMetaKey(NativeEvent evt) /*-{
return !!evt.metaKey;
}-*/;
- public abstract int eventGetMouseWheelVelocityY(NativeEvent evt);
+ public int eventGetMouseWheelVelocityY(NativeEvent evt) {
+ return (int) Math.signum(evt.getDeltaY());
+ }
public abstract EventTarget eventGetRelatedTarget(NativeEvent nativeEvent);
diff --git a/user/src/com/google/gwt/dom/client/DOMImplMozilla.java b/user/src/com/google/gwt/dom/client/DOMImplMozilla.java
index 100d7d020b5..1c48b0b3b0e 100644
--- a/user/src/com/google/gwt/dom/client/DOMImplMozilla.java
+++ b/user/src/com/google/gwt/dom/client/DOMImplMozilla.java
@@ -124,11 +124,6 @@ public NativeEvent createKeyPressEvent(Document doc, boolean ctrlKey,
shiftKey, metaKey, 0, charCode);
}
- @Override
- public native int eventGetMouseWheelVelocityY(NativeEvent evt) /*-{
- return evt.detail || 0;
- }-*/;
-
@Override
public native EventTarget eventGetRelatedTarget(NativeEvent evt) /*-{
// Hack around Mozilla bug 497780 (relatedTarget sometimes returns XUL
diff --git a/user/src/com/google/gwt/dom/client/DOMImplStandardBase.java b/user/src/com/google/gwt/dom/client/DOMImplStandardBase.java
index 115cca81d7d..1ba6dd3357d 100644
--- a/user/src/com/google/gwt/dom/client/DOMImplStandardBase.java
+++ b/user/src/com/google/gwt/dom/client/DOMImplStandardBase.java
@@ -204,11 +204,6 @@ public native EventTarget eventGetCurrentTarget(NativeEvent event) /*-{
return event.currentTarget || $wnd;
}-*/;
- @Override
- public native int eventGetMouseWheelVelocityY(NativeEvent evt) /*-{
- return Math.round(-evt.wheelDelta / 40) || 0;
- }-*/;
-
@Override
public int getAbsoluteLeft(Element elem) {
ClientRect rect = getBoundingClientRect(elem);
diff --git a/user/src/com/google/gwt/dom/client/NativeEvent.java b/user/src/com/google/gwt/dom/client/NativeEvent.java
index d5a14e029e6..3d3b19fa0a8 100644
--- a/user/src/com/google/gwt/dom/client/NativeEvent.java
+++ b/user/src/com/google/gwt/dom/client/NativeEvent.java
@@ -158,23 +158,40 @@ public final boolean getMetaKey() {
}
/**
- * Gets the velocity of the mouse wheel associated with the event along the Y
+ * Gets the sign of the velocity of the mouse wheel associated with the event along the Y
* axis.
*
- * The velocity of the event is an artificial measurement for relative
- * comparisons of wheel activity. It is affected by some non-browser factors,
- * including choice of input hardware and mouse acceleration settings. The
- * sign of the velocity measurement agrees with the screen coordinate system;
- * negative values are towards the origin and positive values are away from
- * the origin. Standard scrolling speed is approximately ten units per event.
+ * In previous versions of GWT this returned the velocity normalized to a small integer.
+ * Unfortunately for some devices such normalization rounded non-trivial velocities to 0.
+ * To maintain compatibility with that implementation, this still returns an integer,
+ * but using the sign function
*
*
- * @return The velocity of the mouse wheel.
+ * @return The velocity of the mouse wheel: -1 for scrolling up, 1 for scrolling down,
+ * 0 if not scrolled at all
+ * @deprecated use getDeltaY() instead
*/
+ @Deprecated
public final int getMouseWheelVelocityY() {
return DOMImpl.impl.eventGetMouseWheelVelocityY(this);
}
+ /**
+ * Gets the native velocity of the mouse wheel in Y direction.
+ * @return The velocity of the mouse wheel
+ */
+ public final native double getDeltaY() /*-{
+ return this.deltaY;
+ }-*/;
+
+ /**
+ * Gets the native velocity of the mouse wheel in X direction.
+ * @return The velocity of the mouse wheel
+ */
+ public final native double getDeltaX() /*-{
+ return this.deltaX;
+ }-*/;
+
/**
* Gets the related target for this event.
*
diff --git a/user/src/com/google/gwt/event/dom/client/MouseWheelEvent.java b/user/src/com/google/gwt/event/dom/client/MouseWheelEvent.java
index 647c07f89be..7236357eb65 100644
--- a/user/src/com/google/gwt/event/dom/client/MouseWheelEvent.java
+++ b/user/src/com/google/gwt/event/dom/client/MouseWheelEvent.java
@@ -27,16 +27,7 @@ public class MouseWheelEvent extends MouseEvent {
* this event.
*/
private static final Type TYPE = new Type(
- BrowserEvents.MOUSEWHEEL, new MouseWheelEvent());
-
- static {
- /**
- * Hidden type used to ensure DOMMouseScroll gets registered in the type map.
- * This is the special name used on Mozilla browsers for what everyone else
- * calls 'mousewheel'.
- */
- new Type("DOMMouseScroll", new MouseWheelEvent());
- }
+ BrowserEvents.WHEEL, new MouseWheelEvent());
/**
* Gets the event type associated with mouse wheel events.
@@ -61,18 +52,30 @@ public final Type getAssociatedType() {
}
/**
- * Get the change in the mouse wheel position along the Y-axis; negative if
- * the mouse wheel is moving north (toward the top of the screen) or positive
+ * Get the sign of the change in the mouse wheel position along the Y-axis; -1 if
+ * the mouse wheel is moving north (toward the top of the screen) or 1
* if the mouse wheel is moving south (toward the bottom of the screen).
*
- * Note that delta values are not normalized across browsers or OSes.
- *
- * @return the delta of the mouse wheel along the y axis
+ * @return the sign of the delta of the mouse wheel along the y axis
+ * @deprecated use getNativeDeltaY() instead
*/
+ @Deprecated
public int getDeltaY() {
return getNativeEvent().getMouseWheelVelocityY();
}
+ /**
+ * Get the change in the mouse wheel position along the Y-axis; -1 if
+ * the mouse wheel is moving north (toward the top of the screen) or 1
+ * if the mouse wheel is moving south (toward the bottom of the screen).
+ * Note that the return values are not normalized for browsers and OSs.
+ *
+ * @return the sign of the delta of the mouse wheel along the y axis
+ */
+ public double getNativeDeltaY() {
+ return getNativeEvent().getDeltaY();
+ }
+
/**
* Convenience method that returns true if {@link #getDeltaY()}
* is a negative value (ie, the velocity is directed toward the top of the
@@ -81,7 +84,7 @@ public int getDeltaY() {
* @return true if the velocity is directed toward the top of the screen
*/
public boolean isNorth() {
- return getDeltaY() < 0;
+ return getNativeDeltaY() < 0;
}
/**
@@ -92,7 +95,7 @@ public boolean isNorth() {
* @return true if the velocity is directed toward the bottom of the screen
*/
public boolean isSouth() {
- return getDeltaY() > 0;
+ return getNativeDeltaY() > 0;
}
@Override
diff --git a/user/src/com/google/gwt/i18n/shared/DateTimeFormat.java b/user/src/com/google/gwt/i18n/shared/DateTimeFormat.java
index 59c8fdb125c..f66fe02cb25 100644
--- a/user/src/com/google/gwt/i18n/shared/DateTimeFormat.java
+++ b/user/src/com/google/gwt/i18n/shared/DateTimeFormat.java
@@ -1906,9 +1906,10 @@ private boolean subParse(String text, int[] pos, PatternPart part,
cal.setTzOffset(0);
return true;
}
- // $FALL-THROUGH$
+ // CHECKSTYLE_OFF: Fall through
case 'z': // time zone offset
case 'v': // time zone generic
+ // CHECKSTYLE_ON
return subParseTimeZoneInGMT(text, start, pos, cal);
default:
return false;
diff --git a/user/src/com/google/gwt/junit/JUnitShell.java b/user/src/com/google/gwt/junit/JUnitShell.java
index 277613cad0e..53f67a7cb2f 100644
--- a/user/src/com/google/gwt/junit/JUnitShell.java
+++ b/user/src/com/google/gwt/junit/JUnitShell.java
@@ -38,7 +38,6 @@
import com.google.gwt.dev.shell.jetty.JettyLauncher;
import com.google.gwt.dev.util.arg.ArgHandlerClosureFormattedOutput;
import com.google.gwt.dev.util.arg.ArgHandlerDeployDir;
-import com.google.gwt.dev.util.arg.ArgHandlerDeprecatedDisableUpdateCheck;
import com.google.gwt.dev.util.arg.ArgHandlerDeprecatedOptimizeDataflow;
import com.google.gwt.dev.util.arg.ArgHandlerDisableCastChecking;
import com.google.gwt.dev.util.arg.ArgHandlerDisableClassMetadata;
@@ -291,7 +290,6 @@ public int handle(String[] args, int tagIndex) {
registerHandler(new ArgHandlerDisableOrdinalizeEnums(options));
registerHandler(new ArgHandlerDisableRemoveDuplicateFunctions(options));
registerHandler(new ArgHandlerDisableRunAsync(options));
- registerHandler(new ArgHandlerDeprecatedDisableUpdateCheck());
registerHandler(new ArgHandlerDraftCompile(options));
registerHandler(new ArgHandlerLocalWorkers(options));
registerHandler(new ArgHandlerNamespace(options));
diff --git a/user/src/com/google/gwt/uibinder/elementparsers/BeanParser.java b/user/src/com/google/gwt/uibinder/elementparsers/BeanParser.java
index 730aa37e5ba..47e4f357a75 100644
--- a/user/src/com/google/gwt/uibinder/elementparsers/BeanParser.java
+++ b/user/src/com/google/gwt/uibinder/elementparsers/BeanParser.java
@@ -46,6 +46,7 @@ public class BeanParser implements ElementParser {
* methods that extend the normal bean naming pattern. So, that implementations of
* {@link IsWidget} behave like UIObjects, they have to be translated.
*/
+ @SuppressWarnings("DoubleBraceInitialization")
private static final Map ADD_PROPERTY_TO_SETTER_MAP =
new HashMap() { {
put("addStyleNames", "addStyleName");
diff --git a/user/src/com/google/gwt/user/client/Window.java b/user/src/com/google/gwt/user/client/Window.java
index 2fb2789f482..972f16d3107 100644
--- a/user/src/com/google/gwt/user/client/Window.java
+++ b/user/src/com/google/gwt/user/client/Window.java
@@ -506,6 +506,7 @@ public HandlerManager getHandlers() {
// Package protected for testing.
static WindowHandlers handlers;
private static boolean closeHandlersInitialized;
+ private static boolean beforeCloseHandlersInitialized;
private static boolean scrollHandlersInitialized;
private static boolean resizeHandlersInitialized;
private static int lastResizeWidth;
@@ -518,7 +519,10 @@ public HandlerManager getHandlers() {
*
* @param handler the handler
* @return returns the handler registration
+ * @deprecated This method requires the use of the {@code unload} browser event, which is
+ * deprecated in all browsers.
*/
+ @Deprecated
public static HandlerRegistration addCloseHandler(CloseHandler handler) {
maybeInitializeCloseHandlers();
return addHandler(CloseEvent.getType(), handler);
@@ -531,7 +535,6 @@ public static HandlerRegistration addCloseHandler(CloseHandler handler)
* @return returns the handler registration
*/
public static HandlerRegistration addResizeHandler(ResizeHandler handler) {
- maybeInitializeCloseHandlers();
maybeInitializeResizeHandlers();
return addHandler(ResizeEvent.getType(), handler);
}
@@ -556,7 +559,7 @@ public static void addWindowCloseListener(WindowCloseListener listener) {
*/
public static HandlerRegistration addWindowClosingHandler(
ClosingHandler handler) {
- maybeInitializeCloseHandlers();
+ maybeInitializeBeforeCloseHandlers();
return addHandler(Window.ClosingEvent.getType(), handler);
}
@@ -579,7 +582,6 @@ public static void addWindowResizeListener(WindowResizeListener listener) {
*/
public static HandlerRegistration addWindowScrollHandler(
Window.ScrollHandler handler) {
- maybeInitializeCloseHandlers();
maybeInitializeScrollHandlers();
return addHandler(Window.ScrollEvent.getType(), handler);
}
@@ -910,13 +912,21 @@ private static WindowHandlers getHandlers() {
return handlers;
}
+ @Deprecated
private static void maybeInitializeCloseHandlers() {
if (GWT.isClient() && !closeHandlersInitialized) {
- impl.initWindowCloseHandler();
+ impl.initWindowUnloadHandler();
closeHandlersInitialized = true;
}
}
+ private static void maybeInitializeBeforeCloseHandlers() {
+ if (GWT.isClient() && !beforeCloseHandlersInitialized) {
+ impl.initWindowBeforeUnloadHandler();
+ beforeCloseHandlersInitialized = true;
+ }
+ }
+
private static void maybeInitializeResizeHandlers() {
if (GWT.isClient() && !resizeHandlersInitialized) {
impl.initWindowResizeHandler();
diff --git a/user/src/com/google/gwt/user/client/impl/DOMImpl.java b/user/src/com/google/gwt/user/client/impl/DOMImpl.java
index b006c414f47..ebc584d865a 100644
--- a/user/src/com/google/gwt/user/client/impl/DOMImpl.java
+++ b/user/src/com/google/gwt/user/client/impl/DOMImpl.java
@@ -102,7 +102,7 @@ public native int eventGetTypeInt(String eventType) /*-{
case "scroll": return 0x04000;
case "error": return 0x10000;
case "mousewheel": return 0x20000;
- case "DOMMouseScroll": return 0x20000;
+ case "wheel": return 0x20000;
case "contextmenu": return 0x40000;
case "paste": return 0x80000;
case "touchstart": return 0x100000;
diff --git a/user/src/com/google/gwt/user/client/impl/DOMImplMozilla.java b/user/src/com/google/gwt/user/client/impl/DOMImplMozilla.java
index b5c51b10854..16bd41394f4 100644
--- a/user/src/com/google/gwt/user/client/impl/DOMImplMozilla.java
+++ b/user/src/com/google/gwt/user/client/impl/DOMImplMozilla.java
@@ -15,36 +15,11 @@
*/
package com.google.gwt.user.client.impl;
-import com.google.gwt.dom.client.Element;
-
/**
* Mozilla implementation of StandardBrowser.
*/
class DOMImplMozilla extends DOMImplStandard {
- static {
- addMozillaCaptureEventDispatchers();
- }
-
- @SuppressWarnings("deprecation")
- private static native void addMozillaCaptureEventDispatchers() /*-{
- @com.google.gwt.user.client.impl.DOMImplStandard::captureEventDispatchers['DOMMouseScroll'] =
- @com.google.gwt.user.client.impl.DOMImplStandard::dispatchCapturedMouseEvent(*);
- }-*/;
-
- @Override
- public void sinkEvents(Element elem, int bits) {
- super.sinkEvents(elem, bits);
- sinkEventsMozilla(elem, bits);
- }
-
- @SuppressWarnings("deprecation")
- public native void sinkEventsMozilla(Element elem, int bits) /*-{
- if (bits & 0x20000) {
- elem.addEventListener('DOMMouseScroll', @com.google.gwt.user.client.impl.DOMImplStandard::dispatchEvent, false);
- }
- }-*/;
-
@Override
protected void initEventSystem() {
super.initEventSystem();
diff --git a/user/src/com/google/gwt/user/client/impl/DOMImplStandard.java b/user/src/com/google/gwt/user/client/impl/DOMImplStandard.java
index d0176f4f127..ea7c9e8ae98 100644
--- a/user/src/com/google/gwt/user/client/impl/DOMImplStandard.java
+++ b/user/src/com/google/gwt/user/client/impl/DOMImplStandard.java
@@ -292,7 +292,7 @@ protected native void sinkEventsImpl(Element elem, int bits) /*-{
@com.google.gwt.user.client.impl.DOMImplStandard::dispatchUnhandledEvent : null;
if (chMask & 0x10000) elem.onerror = (bits & 0x10000) ?
@com.google.gwt.user.client.impl.DOMImplStandard::dispatchEvent : null;
- if (chMask & 0x20000) elem.onmousewheel = (bits & 0x20000) ?
+ if (chMask & 0x20000) elem.onwheel = (bits & 0x20000) ?
@com.google.gwt.user.client.impl.DOMImplStandard::dispatchEvent : null;
if (chMask & 0x40000) elem.oncontextmenu = (bits & 0x40000) ?
@com.google.gwt.user.client.impl.DOMImplStandard::dispatchEvent : null;
diff --git a/user/src/com/google/gwt/user/client/impl/WindowImpl.java b/user/src/com/google/gwt/user/client/impl/WindowImpl.java
index 4854d617b83..fc7b78b3361 100644
--- a/user/src/com/google/gwt/user/client/impl/WindowImpl.java
+++ b/user/src/com/google/gwt/user/client/impl/WindowImpl.java
@@ -29,11 +29,30 @@ public native String getHash() /*-{
public native String getQueryString() /*-{
return $wnd.location.search;
}-*/;
-
- public native void initWindowCloseHandler() /*-{
+
+ @Deprecated
+ public void initWindowCloseHandler() {
+ initWindowUnloadHandler();
+ initWindowBeforeUnloadHandler();
+ }
+
+ @Deprecated
+ public native void initWindowUnloadHandler() /*-{
+ var oldOnUnload = $wnd.onunload;
+
+ $wnd.onunload = $entry(function(evt) {
+ try {
+ @com.google.gwt.user.client.Window::onClosed()();
+ } finally {
+ oldOnUnload && oldOnUnload(evt);
+ $wnd.onunload = null;
+ }
+ });
+ }-*/;
+
+ public native void initWindowBeforeUnloadHandler() /*-{
var oldOnBeforeUnload = $wnd.onbeforeunload;
- var oldOnUnload = $wnd.onunload;
-
+
// Old mozilla doesn't like $entry's explicit return statement and
// will always pop up a confirmation dialog. This is worked around by
// just wrapping the call to onClosing(), which still has the semantics
@@ -55,18 +74,6 @@ public native void initWindowCloseHandler() /*-{
}
// returns undefined.
};
-
- $wnd.onunload = $entry(function(evt) {
- try {
- @com.google.gwt.user.client.Window::onClosed()();
- } finally {
- oldOnUnload && oldOnUnload(evt);
- $wnd.onresize = null;
- $wnd.onscroll = null;
- $wnd.onbeforeunload = null;
- $wnd.onunload = null;
- }
- });
}-*/;
public native void initWindowResizeHandler() /*-{
diff --git a/user/src/com/google/gwt/user/client/ui/Anchor.java b/user/src/com/google/gwt/user/client/ui/Anchor.java
index 02ecaef6761..77d4a8b37f1 100644
--- a/user/src/com/google/gwt/user/client/ui/Anchor.java
+++ b/user/src/com/google/gwt/user/client/ui/Anchor.java
@@ -73,7 +73,7 @@ public class Anchor extends FocusWidget implements HasHorizontalAlignment,
*
* This element must already be attached to the document. If the element is
* removed from the document, you must call
- * {@link RootPanel#detachNow(Widget)}.
+ * {@link Widget#removeFromParent()}.
*
* @param element the element to be wrapped
*/
diff --git a/user/src/com/google/gwt/user/client/ui/Button.java b/user/src/com/google/gwt/user/client/ui/Button.java
index b1e5aec0585..d31f6e17869 100644
--- a/user/src/com/google/gwt/user/client/ui/Button.java
+++ b/user/src/com/google/gwt/user/client/ui/Button.java
@@ -47,7 +47,7 @@ public class Button extends ButtonBase {
*
* This element must already be attached to the document. If the element is
* removed from the document, you must call
- * {@link RootPanel#detachNow(Widget)}.
+ * {@link Widget#removeFromParent()}.
*
* @param element the element to be wrapped
*/
diff --git a/user/src/com/google/gwt/user/client/ui/FileUpload.java b/user/src/com/google/gwt/user/client/ui/FileUpload.java
index 228fae0a4dd..53b205e620d 100644
--- a/user/src/com/google/gwt/user/client/ui/FileUpload.java
+++ b/user/src/com/google/gwt/user/client/ui/FileUpload.java
@@ -54,7 +54,7 @@ public class FileUpload extends FocusWidget implements HasName, HasChangeHandler
*
* This element must already be attached to the document. If the element is
* removed from the document, you must call
- * {@link RootPanel#detachNow(Widget)}.
+ * {@link Widget#removeFromParent()}.
*
* @param element the element to be wrapped
*/
diff --git a/user/src/com/google/gwt/user/client/ui/FormPanel.java b/user/src/com/google/gwt/user/client/ui/FormPanel.java
index 396f8d609bf..a64f85e3315 100644
--- a/user/src/com/google/gwt/user/client/ui/FormPanel.java
+++ b/user/src/com/google/gwt/user/client/ui/FormPanel.java
@@ -253,7 +253,7 @@ interface IFrameTemplate extends SafeHtmlTemplates {
*
* This element must already be attached to the document. If the element is
* removed from the document, you must call
- * {@link RootPanel#detachNow(Widget)}.
+ * {@link Widget#removeFromParent()}.
*
*
* The specified form element's target attribute will not be set, and the
@@ -280,7 +280,7 @@ public static FormPanel wrap(Element element) {
*
* This element must already be attached to the document. If the element is
* removed from the document, you must call
- * {@link RootPanel#detachNow(Widget)}.
+ * {@link Widget#removeFromParent()}.
*
*
* If the createIFrame parameter is set to true, then the wrapped
diff --git a/user/src/com/google/gwt/user/client/ui/Frame.java b/user/src/com/google/gwt/user/client/ui/Frame.java
index 1d0f7bca9bd..4cdf92eb9a8 100644
--- a/user/src/com/google/gwt/user/client/ui/Frame.java
+++ b/user/src/com/google/gwt/user/client/ui/Frame.java
@@ -52,7 +52,7 @@ public class Frame extends Widget implements HasLoadHandlers {
*
* This element must already be attached to the document. If the element is
* removed from the document, you must call
- * {@link RootPanel#detachNow(Widget)}.
+ * {@link Widget#removeFromParent()}.
*
* @param element the element to be wrapped
*/
diff --git a/user/src/com/google/gwt/user/client/ui/HTML.java b/user/src/com/google/gwt/user/client/ui/HTML.java
index 25dc24a6954..b6704a35201 100644
--- a/user/src/com/google/gwt/user/client/ui/HTML.java
+++ b/user/src/com/google/gwt/user/client/ui/HTML.java
@@ -61,7 +61,7 @@ public class HTML extends Label
*
* This element must already be attached to the document. If the element is
* removed from the document, you must call
- * {@link RootPanel#detachNow(Widget)}.
+ * {@link Widget#removeFromParent()}.
*
* @param element the element to be wrapped
*/
diff --git a/user/src/com/google/gwt/user/client/ui/HTMLPanel.java b/user/src/com/google/gwt/user/client/ui/HTMLPanel.java
index 580f0815a1c..926424e7416 100644
--- a/user/src/com/google/gwt/user/client/ui/HTMLPanel.java
+++ b/user/src/com/google/gwt/user/client/ui/HTMLPanel.java
@@ -50,7 +50,7 @@ public static String createUniqueId() {
*
* This element must already be attached to the document. If the element is
* removed from the document, you must call
- * {@link RootPanel#detachNow(Widget)}.
+ * {@link Widget#removeFromParent()}.
*
* @param element the element to be wrapped
*/
diff --git a/user/src/com/google/gwt/user/client/ui/Hidden.java b/user/src/com/google/gwt/user/client/ui/Hidden.java
index d9f1466f8fa..e8807f49d77 100644
--- a/user/src/com/google/gwt/user/client/ui/Hidden.java
+++ b/user/src/com/google/gwt/user/client/ui/Hidden.java
@@ -34,7 +34,7 @@ public class Hidden extends Widget implements HasName, TakesValue, IsEdi
*
* This element must already be attached to the document. If the element is
* removed from the document, you must call
- * {@link RootPanel#detachNow(Widget)}.
+ * {@link Widget#removeFromParent()}.
*
* @param element the element to be wrapped
*/
diff --git a/user/src/com/google/gwt/user/client/ui/Image.java b/user/src/com/google/gwt/user/client/ui/Image.java
index 2c7587941a9..c00cfecda02 100644
--- a/user/src/com/google/gwt/user/client/ui/Image.java
+++ b/user/src/com/google/gwt/user/client/ui/Image.java
@@ -484,7 +484,7 @@ public static void prefetch(SafeUri url) {
*
* This element must already be attached to the document. If the element is
* removed from the document, you must call
- * {@link RootPanel#detachNow(Widget)}.
+ * {@link Widget#removeFromParent()}.
*
* @param element the element to be wrapped
*/
diff --git a/user/src/com/google/gwt/user/client/ui/InlineHTML.java b/user/src/com/google/gwt/user/client/ui/InlineHTML.java
index 625f274d47b..9b0cf234e52 100644
--- a/user/src/com/google/gwt/user/client/ui/InlineHTML.java
+++ b/user/src/com/google/gwt/user/client/ui/InlineHTML.java
@@ -55,7 +55,7 @@ public class InlineHTML extends HTML {
*
* This element must already be attached to the document. If the element is
* removed from the document, you must call
- * {@link RootPanel#detachNow(Widget)}.
+ * {@link Widget#removeFromParent()}.
*
* @param element the element to be wrapped
*/
diff --git a/user/src/com/google/gwt/user/client/ui/InlineLabel.java b/user/src/com/google/gwt/user/client/ui/InlineLabel.java
index d84123630e1..f1ac5544727 100644
--- a/user/src/com/google/gwt/user/client/ui/InlineLabel.java
+++ b/user/src/com/google/gwt/user/client/ui/InlineLabel.java
@@ -46,7 +46,7 @@ public class InlineLabel extends Label {
*
* This element must already be attached to the document. If the element is
* removed from the document, you must call
- * {@link RootPanel#detachNow(Widget)}.
+ * {@link Widget#removeFromParent()}.
*
* @param element the element to be wrapped
*/
diff --git a/user/src/com/google/gwt/user/client/ui/Label.java b/user/src/com/google/gwt/user/client/ui/Label.java
index a5910a64671..3759a39382c 100644
--- a/user/src/com/google/gwt/user/client/ui/Label.java
+++ b/user/src/com/google/gwt/user/client/ui/Label.java
@@ -115,7 +115,7 @@ public class Label extends LabelBase implements HasDirectionalText,
*
* This element must already be attached to the document. If the element is
* removed from the document, you must call
- * {@link RootPanel#detachNow(Widget)}.
+ * {@link Widget#removeFromParent()}.
*
* @param element the element to be wrapped
*/
diff --git a/user/src/com/google/gwt/user/client/ui/ListBox.java b/user/src/com/google/gwt/user/client/ui/ListBox.java
index fb9f97861c8..78cfd105f2a 100644
--- a/user/src/com/google/gwt/user/client/ui/ListBox.java
+++ b/user/src/com/google/gwt/user/client/ui/ListBox.java
@@ -99,7 +99,7 @@ public class ListBox extends FocusWidget implements SourcesChangeEvents,
*
* This element must already be attached to the document. If the element is
* removed from the document, you must call
- * {@link RootPanel#detachNow(Widget)}.
+ * {@link Widget#removeFromParent()}.
*
* @param element the element to be wrapped
* @return list box
diff --git a/user/src/com/google/gwt/user/client/ui/PasswordTextBox.java b/user/src/com/google/gwt/user/client/ui/PasswordTextBox.java
index 646e44e63df..d1060a33eea 100644
--- a/user/src/com/google/gwt/user/client/ui/PasswordTextBox.java
+++ b/user/src/com/google/gwt/user/client/ui/PasswordTextBox.java
@@ -46,7 +46,7 @@ public class PasswordTextBox extends TextBox {
*
* This element must already be attached to the document. If the element is
* removed from the document, you must call
- * {@link RootPanel#detachNow(Widget)}.
+ * {@link Widget#removeFromParent()}.
*
* @param element the element to be wrapped
*/
diff --git a/user/src/com/google/gwt/user/client/ui/ResetButton.java b/user/src/com/google/gwt/user/client/ui/ResetButton.java
index 59ef767d406..75c5a99fe78 100644
--- a/user/src/com/google/gwt/user/client/ui/ResetButton.java
+++ b/user/src/com/google/gwt/user/client/ui/ResetButton.java
@@ -38,7 +38,7 @@ public class ResetButton extends Button {
*
* This element must already be attached to the document. If the element is
* removed from the document, you must call
- * {@link RootPanel#detachNow(Widget)}.
+ * {@link Widget#removeFromParent()}.
*
* @param element the element to be wrapped
*/
diff --git a/user/src/com/google/gwt/user/client/ui/RootPanel.java b/user/src/com/google/gwt/user/client/ui/RootPanel.java
index cc571e07c61..7397544b394 100644
--- a/user/src/com/google/gwt/user/client/ui/RootPanel.java
+++ b/user/src/com/google/gwt/user/client/ui/RootPanel.java
@@ -18,13 +18,10 @@
import com.google.gwt.dom.client.BodyElement;
import com.google.gwt.dom.client.Document;
import com.google.gwt.dom.client.Element;
-import com.google.gwt.event.logical.shared.CloseEvent;
-import com.google.gwt.event.logical.shared.CloseHandler;
import com.google.gwt.i18n.client.BidiUtils;
import com.google.gwt.i18n.client.HasDirection;
import com.google.gwt.i18n.client.LocaleInfo;
import com.google.gwt.user.client.Event;
-import com.google.gwt.user.client.Window;
import java.util.HashMap;
import java.util.HashSet;
@@ -92,11 +89,13 @@ public void execute(Widget w) {
* This method may only be called per widget, and only for widgets that were
* originally passed to {@link #detachOnWindowClose(Widget)}.
*
- *
+ *
* @param widget the widget that no longer needs to be cleaned up when the
* page closes
* @see #detachOnWindowClose(Widget)
+ * @deprecated Instead, use {@link Widget#removeFromParent()}.
*/
+ @Deprecated
public static void detachNow(Widget widget) {
assert widgetsToDetach.contains(widget) : "detachNow() called on a widget "
+ "not currently in the detach list";
@@ -111,25 +110,30 @@ public static void detachNow(Widget widget) {
/**
* Adds a widget to the detach list. This is the list of widgets to be
* detached when the page unloads.
- *
+ *
*
* This method must be called for all widgets that have no parent widgets.
* These are most commonly {@link RootPanel RootPanels}, but can also be any
* widget used to wrap an existing element on the page. Failing to do this may
* cause these widgets to leak memory. This method is called automatically by
* widgets' wrap methods (e.g.
- * {@link Button#wrap(com.google.gwt.dom.client.Element)}).
+ * {@link Button#wrap(Element)}).
*
- *
+ *
*
* This method may not be called on any widget whose element is
* contained in another widget. This is to ensure that the DOM and Widget
* hierarchies cannot get into an inconsistent state.
*
- *
+ *
* @param widget the widget to be cleaned up when the page closes
* @see #detachNow(Widget)
+ * @deprecated While originally introduced to combat memory leaks in old browsers, this is no
+ * longer necessary, and the unload event used by this method is being removed from browsers.
+ * Additionally, it is unreliable as a means to ensure calls to {@link Widget#onUnload()}. See
+ * Issue 9908 for more information.
*/
+ @Deprecated
public static void detachOnWindowClose(Widget widget) {
assert !widgetsToDetach.contains(widget) : "detachOnUnload() called twice "
+ "for the same widget";
@@ -188,8 +192,6 @@ public static RootPanel get(String id) {
// on the first RootPanel.get(String) or RootPanel.get()
// call.
if (rootPanels.size() == 0) {
- hookWindowClosing();
-
// If we're in a RTL locale, set the RTL directionality
// on the entire document.
if (LocaleInfo.getCurrentLocale().isRTL()) {
@@ -223,16 +225,37 @@ public static native com.google.gwt.user.client.Element getBodyElement() /*-{
/**
* Determines whether the given widget is in the detach list.
- *
+ *
+ * Note that modern browsers do not have the memory leaks that originally required use of this
+ * feature - it is retained only to support application-specific detach events.
+ *
+ *
* @param widget the widget to be checked
* @return true if the widget is in the detach list
+ * @deprecated Use of the detach list requires the unload event, which is planned to be removed
+ * in future browser updates. See notice on {@link #detachOnWindowClose(Widget)} and
+ * Issue 9908 for more information.
*/
+ @Deprecated
public static boolean isInDetachList(Widget widget) {
return widgetsToDetach.contains(widget);
}
- // Package-protected for use by unit tests. Do not call this method directly.
- static void detachWidgets() {
+ /**
+ * Detaches all widgets that were set to be detached on window close by a call to
+ * {@link #detachOnWindowClose}. Formerly was package-protected, now can be called by projects
+ * that required the old behavior and are willing to set up their own onclose handler on the
+ * window.
+ *
+ * Note that modern browsers do not have the memory leaks that originally required use of this
+ * feature - it is retained only to support application-specific detach events.
+ *
+ *
+ * @deprecated See notice on {@link #detachOnWindowClose(Widget)} and
+ * Issue 9908 for more information.
+ */
+ @Deprecated
+ public static void detachWidgets() {
// When the window is closing, detach all widgets that need to be
// cleaned up. This will cause all of their event listeners
// to be unhooked, which will avoid potential memory leaks.
@@ -258,15 +281,6 @@ private static native Element getRootElement() /*-{
return $doc;
}-*/;
- private static void hookWindowClosing() {
- // Catch the window closing event.
- Window.addCloseHandler(new CloseHandler() {
- public void onClose(CloseEvent closeEvent) {
- detachWidgets();
- }
- });
- }
-
/*
* Checks to see whether the given element has any parent element that
* belongs to a widget. This is not terribly efficient, and is thus only used
diff --git a/user/src/com/google/gwt/user/client/ui/SimpleCheckBox.java b/user/src/com/google/gwt/user/client/ui/SimpleCheckBox.java
index 2e493ba2f3f..0e71670717a 100644
--- a/user/src/com/google/gwt/user/client/ui/SimpleCheckBox.java
+++ b/user/src/com/google/gwt/user/client/ui/SimpleCheckBox.java
@@ -45,7 +45,7 @@ public class SimpleCheckBox extends FocusWidget implements HasName,
*
* This element must already be attached to the document. If the element is
* removed from the document, you must call
- * {@link RootPanel#detachNow(Widget)}.
+ * {@link Widget#removeFromParent()}.
*
* @param element the element to be wrapped
*/
diff --git a/user/src/com/google/gwt/user/client/ui/SimpleRadioButton.java b/user/src/com/google/gwt/user/client/ui/SimpleRadioButton.java
index 5d415fef058..4a7b8982420 100644
--- a/user/src/com/google/gwt/user/client/ui/SimpleRadioButton.java
+++ b/user/src/com/google/gwt/user/client/ui/SimpleRadioButton.java
@@ -36,7 +36,7 @@ public class SimpleRadioButton extends SimpleCheckBox {
*
* This element must already be attached to the document. If the element is
* removed from the document, you must call
- * {@link RootPanel#detachNow(Widget)}.
+ * {@link Widget#removeFromParent()}.
*
* @param element the element to be wrapped
*/
diff --git a/user/src/com/google/gwt/user/client/ui/SubmitButton.java b/user/src/com/google/gwt/user/client/ui/SubmitButton.java
index 82a770e358e..199c3808eb2 100644
--- a/user/src/com/google/gwt/user/client/ui/SubmitButton.java
+++ b/user/src/com/google/gwt/user/client/ui/SubmitButton.java
@@ -39,7 +39,7 @@ public class SubmitButton extends Button {
*
* This element must already be attached to the document. If the element is
* removed from the document, you must call
- * {@link RootPanel#detachNow(Widget)}.
+ * {@link Widget#removeFromParent()}.
*
* @param element the element to be wrapped
*/
diff --git a/user/src/com/google/gwt/user/client/ui/SuggestBox.java b/user/src/com/google/gwt/user/client/ui/SuggestBox.java
index c366ab79378..55fa3383290 100644
--- a/user/src/com/google/gwt/user/client/ui/SuggestBox.java
+++ b/user/src/com/google/gwt/user/client/ui/SuggestBox.java
@@ -635,7 +635,7 @@ public void setSuggestion(Suggestion suggestion) {
*
* This element must already be attached to the document. If the element is
* removed from the document, you must call
- * {@link RootPanel#detachNow(Widget)}.
+ * {@link Widget#removeFromParent()}.
*
* @param oracle the suggest box oracle to use
* @param element the element to be wrapped
diff --git a/user/src/com/google/gwt/user/client/ui/TextArea.java b/user/src/com/google/gwt/user/client/ui/TextArea.java
index 0efdb67e7dc..e2f9e404502 100644
--- a/user/src/com/google/gwt/user/client/ui/TextArea.java
+++ b/user/src/com/google/gwt/user/client/ui/TextArea.java
@@ -52,7 +52,7 @@ public class TextArea extends TextBoxBase {
*
* This element must already be attached to the document. If the element is
* removed from the document, you must call
- * {@link RootPanel#detachNow(Widget)}.
+ * {@link Widget#removeFromParent()}.
*
* @param element the element to be wrapped
*/
diff --git a/user/src/com/google/gwt/user/client/ui/TextBox.java b/user/src/com/google/gwt/user/client/ui/TextBox.java
index 0143c88666b..97d2dcbabf9 100644
--- a/user/src/com/google/gwt/user/client/ui/TextBox.java
+++ b/user/src/com/google/gwt/user/client/ui/TextBox.java
@@ -54,7 +54,7 @@ public class TextBox extends TextBoxBase {
*
* This element must already be attached to the document. If the element is
* removed from the document, you must call
- * {@link RootPanel#detachNow(Widget)}.
+ * {@link Widget#removeFromParent()}.
*
* @param element the element to be wrapped
*/
diff --git a/user/src/com/google/gwt/user/client/ui/ValueBox.java b/user/src/com/google/gwt/user/client/ui/ValueBox.java
index 33b75e86017..08e1741858f 100644
--- a/user/src/com/google/gwt/user/client/ui/ValueBox.java
+++ b/user/src/com/google/gwt/user/client/ui/ValueBox.java
@@ -35,7 +35,7 @@ public class ValueBox extends ValueBoxBase {
*
* This element must already be attached to the document. If the element is
* removed from the document, you must call
- * {@link RootPanel#detachNow(Widget)}.
+ * {@link Widget#removeFromParent()}.
*
* @param element the element to be wrapped
*/
diff --git a/user/src/com/google/gwt/user/client/ui/ValueLabel.java b/user/src/com/google/gwt/user/client/ui/ValueLabel.java
index 9607da3c0d3..d5f4fe56f08 100644
--- a/user/src/com/google/gwt/user/client/ui/ValueLabel.java
+++ b/user/src/com/google/gwt/user/client/ui/ValueLabel.java
@@ -45,7 +45,7 @@ public class ValueLabel extends LabelBase implements TakesValue,
*
* This element must already be attached to the document. If the element is
* removed from the document, you must call
- * {@link RootPanel#detachNow(Widget)}.
+ * {@link Widget#removeFromParent()}.
*
* @param element the element to be wrapped
* @param renderer the renderer used to render values into the element
@@ -72,7 +72,7 @@ public static ValueLabel wrap(Element element,
*
* This element must already be attached to the document. If the element is
* removed from the document, you must call
- * {@link RootPanel#detachNow(Widget)}.
+ * {@link Widget#removeFromParent()}.
*
* @param element the element to be wrapped
* @param renderer the renderer used to render values into the element
diff --git a/user/src/com/google/gwt/user/server/rpc/impl/SerializabilityUtil.java b/user/src/com/google/gwt/user/server/rpc/impl/SerializabilityUtil.java
index febcb1a863e..be870671058 100644
--- a/user/src/com/google/gwt/user/server/rpc/impl/SerializabilityUtil.java
+++ b/user/src/com/google/gwt/user/server/rpc/impl/SerializabilityUtil.java
@@ -915,6 +915,19 @@ private static void generateSerializationSignature(Class instanceType, CRC32
for (Enum constant : constants) {
crc.update(constant.name().getBytes(StandardCharsets.UTF_8));
}
+ } else if (Enum.class.equals(instanceType)) {
+ // Edge case around Java 21 where a new non-final field was added to Enum. While the Enum
+ // class is rarely serialized itself (see the block above to deal with enum types), it can
+ // happen - this code ensures that the server always treats the Enum type the same way,
+ // regardless of JRE changes.
+ // See https://github.com/gwtproject/gwt/issues/9912
+ if (policy.shouldSerializeFinalFields()) {
+ crc.update("name".getBytes(StandardCharsets.UTF_8));
+ crc.update(getSerializedTypeName(String.class).getBytes(StandardCharsets.UTF_8));
+ crc.update("ordinal".getBytes(StandardCharsets.UTF_8));
+ crc.update(getSerializedTypeName(int.class).getBytes(StandardCharsets.UTF_8));
+ }
+ generateSerializationSignature(Object.class, crc, policy);
} else if (!instanceType.isPrimitive()) {
Field[] fields = applyFieldSerializationPolicy(instanceType, policy);
Set clientFieldNames = policy.getClientFieldNamesForEnhancedClass(instanceType);
diff --git a/user/src/com/google/gwt/user/server/rpc/impl/ServerSerializationStreamWriter.java b/user/src/com/google/gwt/user/server/rpc/impl/ServerSerializationStreamWriter.java
index 5e29935e368..bc9e5286842 100644
--- a/user/src/com/google/gwt/user/server/rpc/impl/ServerSerializationStreamWriter.java
+++ b/user/src/com/google/gwt/user/server/rpc/impl/ServerSerializationStreamWriter.java
@@ -48,11 +48,13 @@ public final class ServerSerializationStreamWriter extends
* array literals.
*/
public static class LengthConstrainedArray {
- public static final int MAXIMUM_ARRAY_LENGTH = 1 << 15;
+ public static final int MAXIMUM_ARRAY_LENGTH_DEFAULT = 1 << 15;
private static final String POSTLUDE = "])";
private static final String PRELUDE = "].concat([";
private final StringBuffer buffer;
+ private final int maximumArrayLength = Integer.getInteger("gwt.rpc.maxPayloadChunkSize",
+ MAXIMUM_ARRAY_LENGTH_DEFAULT);
private int count = 0;
private boolean needsComma = false;
private int total = 0;
@@ -68,8 +70,8 @@ public LengthConstrainedArray(int capacityGuess) {
public void addToken(CharSequence token) {
total++;
- if (count++ == MAXIMUM_ARRAY_LENGTH) {
- if (total == MAXIMUM_ARRAY_LENGTH + 1) {
+ if (count++ == maximumArrayLength) {
+ if (total == maximumArrayLength + 1) {
buffer.append(PRELUDE);
javascript = true;
} else {
@@ -106,7 +108,7 @@ public void setJavaScript(boolean javascript) {
@Override
public String toString() {
- if (total > MAXIMUM_ARRAY_LENGTH) {
+ if (total > maximumArrayLength) {
return "[" + buffer.toString() + POSTLUDE;
} else {
return "[" + buffer.toString() + "]";
@@ -343,7 +345,8 @@ abstract void write(ServerSerializationStreamWriter stream, Object instance)
* This exists to work around a Rhino parser bug in the hosted mode client
* that limits string node lengths to 64KB.
*/
- private static final int MAX_STRING_NODE_LENGTH = 0xFFFF;
+ private static final int MAX_STRING_NODE_LENGTH =
+ Integer.getInteger("gwt.rpc.maxStringNodeLength", 0xFFFF);
static {
/*
diff --git a/user/src/com/google/gwt/user/tools/WebAppCreator.java b/user/src/com/google/gwt/user/tools/WebAppCreator.java
index b787baaf97f..72126560b0d 100644
--- a/user/src/com/google/gwt/user/tools/WebAppCreator.java
+++ b/user/src/com/google/gwt/user/tools/WebAppCreator.java
@@ -24,7 +24,6 @@
import com.google.gwt.dev.util.collect.HashSet;
import com.google.gwt.user.tools.util.ArgHandlerIgnore;
import com.google.gwt.user.tools.util.ArgHandlerOverwrite;
-import com.google.gwt.user.tools.util.CreatorUtilities;
import com.google.gwt.util.tools.ArgHandlerExtra;
import com.google.gwt.util.tools.ArgHandlerFlag;
import com.google.gwt.util.tools.ArgHandlerOutDir;
@@ -180,7 +179,7 @@ public boolean addExtraArg(String arg) {
return false;
}
- if (!CreatorUtilities.isValidModuleName(arg)) {
+ if (!isValidModuleName(arg)) {
System.err.println("'"
+ arg
+ "' does not appear to be a valid fully-qualified Java class name.");
@@ -665,16 +664,8 @@ public Map getReplacements(String installPath, String theModuleN
return replacements;
}
- /**
- * Create the sample app.
- *
- * @throws IOException if any disk write fails
- * @throws WebAppCreatorException if any tag expansion of template processing fails
- * @deprecated as of GWT 2.1, replaced by {@link #doRun(String)}
- */
- @Deprecated
- protected void doRun() throws IOException, WebAppCreatorException {
- doRun(Utility.getInstallPath());
+ private static boolean isValidModuleName(String moduleName) {
+ return moduleName.matches("[\\w]+(\\.[\\w]+)+");
}
/**
diff --git a/user/src/com/google/gwt/user/tools/util/ArgHandlerAddToClassPath.java b/user/src/com/google/gwt/user/tools/util/ArgHandlerAddToClassPath.java
deleted file mode 100644
index 38331154f61..00000000000
--- a/user/src/com/google/gwt/user/tools/util/ArgHandlerAddToClassPath.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * 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
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package com.google.gwt.user.tools.util;
-
-import com.google.gwt.util.tools.ArgHandlerString;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.StringTokenizer;
-
-/**
- * Parse the -addToClassPath argument. Appends a .jar or classpath to the
- * generated launch scripts.
- */
-public class ArgHandlerAddToClassPath extends ArgHandlerString {
- private List extraClassPathList = new ArrayList();
-
- public List getExtraClassPathList() {
- return extraClassPathList;
- }
-
- @Override
- public String getPurpose() {
- return "Adds extra elements to the class path.";
- }
-
- @Override
- public String getTag() {
- return "-addToClassPath";
- }
-
- @Override
- public String[] getTagArgs() {
- return new String[] {"classPathEntry"};
- }
-
- @Override
- public boolean setString(String str) {
-
- StringTokenizer st = new StringTokenizer(str, ",");
- while (st.hasMoreTokens()) {
- extraClassPathList.add(st.nextToken().trim());
- }
- return true;
- }
-}
diff --git a/user/src/com/google/gwt/user/tools/util/CreatorUtilities.java b/user/src/com/google/gwt/user/tools/util/CreatorUtilities.java
deleted file mode 100644
index 39d567bb7fd..00000000000
--- a/user/src/com/google/gwt/user/tools/util/CreatorUtilities.java
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- * 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
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package com.google.gwt.user.tools.util;
-
-import com.google.gwt.dev.cfg.ModuleDefLoader;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-
-/**
- * Utility methods used by ApplicationCreator.
- *
- */
-public class CreatorUtilities {
-
- /**
- * Create a PATH style string separated by the specified delimiter (';' for
- * windows, ':' for UNIX) Note that this method prepends the delimiter to the
- * front of the string. There is an existing path we want to append to.
- *
- * @param delimiter The delimiter string to place between variables.
- * @param paths The list of paths to concatenate together.
- * @return the concatenated list of paths as a single string.
- */
- public static String appendPaths(String delimiter, List paths) {
- if (paths == null) {
- return "";
- }
- StringBuilder buf = new StringBuilder();
- for (String value : paths) {
- buf.append(delimiter);
- buf.append(value);
- }
- return buf.toString();
- }
-
- /**
- * Create the extra path entries for an Eclipse '.launch' file in XML format.
- *
- * @param extraClassPaths a list of paths/.jar files to add to the class path
- * @return A string formatted to include in the .launch file
- */
- public static String createEclipseExtraLaunchPaths(
- List extraClassPaths) throws FileNotFoundException {
-
- if (extraClassPaths == null) {
- return "";
- }
-
- // Create an entry for an Eclipse launch file additional classpath entry.
- StringBuilder buf = new StringBuilder();
- for (String path : extraClassPaths) {
- File f = new File(path);
-
- if (!f.exists()) {
- throw new FileNotFoundException("extraClassPath: " + path
- + "Must be present before .launch file can be created");
- }
-
- String lcPath = path.toLowerCase(Locale.ROOT);
-
- if (f.isDirectory()) {
- // For a directory, we assume it contains compiled class files
- buf.append("");
- buf.append("\n");
- } else if (lcPath.endsWith(".jar") || lcPath.endsWith(".zip")) {
- // Any plain file we assume is an external library (e.g. a .jar file)
- buf.append("");
- buf.append("\n");
- } else {
- throw new RuntimeException("Don't know how to handle path: " + path
- + ". It doesn't appear to be a directory or a .jar/.zip file");
- }
- }
- return buf.toString();
- }
-
- /**
- * Returns true if moduleName is a valid module
- * name.
- */
- public static boolean isValidModuleName(String moduleName) {
- return moduleName.matches("[\\w]+(\\.[\\w]+)+");
- }
-
- /**
- * Check to see that the userJar and pathList files all exist, and that the
- * moduleList entries can be found within the jars.
- *
- * @param userJar The full path to gwt-user.jar
- * @param pathList A list of jar files to add to the class path.
- * @param moduleList A list of GWT module names to add as 'inherits' tags
- * @return true if all validations pass.
- */
- public static boolean validatePathsAndModules(String userJar,
- List pathList, List moduleList) {
- List urlList = new ArrayList();
-
- if (!addURL(urlList, userJar)) {
- return false;
- }
- if (pathList != null) {
- for (String path : pathList) {
- if (!addURL(urlList, path)) {
- return false;
- }
- }
- }
-
- /*
- * Create a class loader from the extra class paths and the current class
- * loader. The assumption is that if the userJar isn't available right now,
- * that the current class loader will contain the same gwt.xml module def
- * files.
- */
- final URL urlArray[] = urlList.toArray(new URL[urlList.size()]);
- URLClassLoader classLoader = AccessController.doPrivileged(
- new PrivilegedAction() {
- public URLClassLoader run() {
- return new URLClassLoader(urlArray,
- CreatorUtilities.class.getClassLoader());
- }
- });
- if (moduleList != null) {
- for (String module : moduleList) {
- String modulePath = module.replace(".", "/")
- + ModuleDefLoader.GWT_MODULE_XML_SUFFIX;
- URL found = classLoader.getResource(modulePath);
- if (found == null) {
- System.err.println("Couldn't find module definition file "
- + modulePath + " in class path.");
- return false;
- }
- }
- }
- return true;
- }
-
- /**
- * Append a path to a list of URLs.
- *
- * @param urls list to append to
- * @param pathToAdd string to append as the last entry in the URL list.
- * @return true on success. false if an error
- * occurs (malformed URL or missing file.)
- */
- private static boolean addURL(List urls, String pathToAdd) {
- File f = new File(pathToAdd);
-
- // Ignore gwt-user.jar in the validation. This helps the build process
- // get by when overriding the location of the .jar with -Dgwt.devjar
- if (!pathToAdd.matches(".*gwt-user.jar") && !f.exists()) {
- System.err.println("Couldn't find library file or path " + pathToAdd);
- return false;
- }
- try {
- urls.add(f.toURI().toURL());
- } catch (MalformedURLException urlEx) {
- urlEx.printStackTrace();
- return false;
- }
- return true;
- }
-}
diff --git a/user/src/com/google/gwt/view/client/DefaultSelectionModel.java b/user/src/com/google/gwt/view/client/DefaultSelectionModel.java
index 588d1c71dcf..f7ac705102f 100644
--- a/user/src/com/google/gwt/view/client/DefaultSelectionModel.java
+++ b/user/src/com/google/gwt/view/client/DefaultSelectionModel.java
@@ -123,6 +123,7 @@ protected Map getExceptions(Map output) {
return output;
}
+ @SuppressWarnings("BoxedPrimitiveEquality")
private void resolveChanges() {
boolean changed = false;
for (Map.Entry> entry : selectionChanges.entrySet()) {
diff --git a/user/src/com/google/web/bindery/autobean/gwt/rebind/AutoBeanFactoryGenerator.java b/user/src/com/google/web/bindery/autobean/gwt/rebind/AutoBeanFactoryGenerator.java
index 6eac4e12736..9b09582314d 100644
--- a/user/src/com/google/web/bindery/autobean/gwt/rebind/AutoBeanFactoryGenerator.java
+++ b/user/src/com/google/web/bindery/autobean/gwt/rebind/AutoBeanFactoryGenerator.java
@@ -63,6 +63,8 @@
*/
public class AutoBeanFactoryGenerator extends Generator {
+ private static final int MAX_ENUMS_PER_METHOD = 2000;
+
private GeneratorContext context;
private String simpleSourceName;
private TreeLogger logger;
@@ -372,14 +374,37 @@ private void writeEnumSetup(SourceWriter sw) {
list.add(entry.getKey());
}
- sw.println("@Override protected void initializeEnumMap() {");
- sw.indent();
+ int methodCount = 0;
+ int enumPerMethodCount = MAX_ENUMS_PER_METHOD + MAX_ENUMS_PER_METHOD;
for (Map.Entry entry : model.getEnumTokenMap().entrySet()) {
+ if (enumPerMethodCount >= MAX_ENUMS_PER_METHOD) {
+ if (methodCount != 0) {
+ sw.outdent();
+ sw.println("}");
+ }
+ enumPerMethodCount = 0;
+ methodCount++;
+ sw.println("private void initializeEnumMap_%d() {", methodCount);
+ sw.indent();
+ }
+
// enumToStringMap.put(Enum.FOO, "FOO");
sw.println("enumToStringMap.put(%s.%s, \"%s\");", entry.getKey().getEnclosingType()
.getQualifiedSourceName(), entry.getKey().getName(), entry.getValue());
+
+ enumPerMethodCount++;
}
+
for (Map.Entry> entry : map.entrySet()) {
+ if (enumPerMethodCount >= MAX_ENUMS_PER_METHOD) {
+ sw.outdent();
+ sw.println("}");
+ enumPerMethodCount = 0;
+ methodCount++;
+ sw.println("private void initializeEnumMap_%d() {", methodCount);
+ sw.indent();
+ }
+
String listExpr;
if (entry.getValue().size() == 1) {
JEnumConstant e = entry.getValue().get(0);
@@ -405,6 +430,19 @@ private void writeEnumSetup(SourceWriter sw) {
listExpr = sb.toString();
}
sw.println("stringsToEnumsMap.put(\"%s\", %s);", entry.getKey(), listExpr);
+
+ enumPerMethodCount += entry.getValue().size();
+ }
+
+ if (methodCount != 0) {
+ sw.outdent();
+ sw.println("}");
+ }
+
+ sw.println("@Override protected void initializeEnumMap() {");
+ sw.indent();
+ for (int i = 1; i <= methodCount; i++) {
+ sw.println("initializeEnumMap_%d();", i);
}
sw.outdent();
sw.println("}");
diff --git a/user/src/com/google/web/bindery/autobean/vm/impl/ProxyAutoBean.java b/user/src/com/google/web/bindery/autobean/vm/impl/ProxyAutoBean.java
index fd9816e931d..620b796ee01 100644
--- a/user/src/com/google/web/bindery/autobean/vm/impl/ProxyAutoBean.java
+++ b/user/src/com/google/web/bindery/autobean/vm/impl/ProxyAutoBean.java
@@ -112,34 +112,38 @@ private static Map calculateData(Class beanType) {
if (toReturn == null) {
Map getters = new HashMap();
List setters = new ArrayList();
- for (Method method : beanType.getMethods()) {
- if (BeanMethod.GET.matches(method)) {
- // match methods on their name for now, to find the most specific
- // override
- String name = method.getName();
-
- Type genericReturnType = TypeUtils.resolveGenerics(beanType, method.getGenericReturnType());
- Class returnType = TypeUtils.ensureBaseType(genericReturnType);
-
- Data data = getters.get(name);
- if (data == null || data.type.isAssignableFrom(returnType)) {
- // no getter seen yet for the property, or a less specific one
- PropertyType propertyType;
- if (TypeUtils.isValueType(returnType)) {
- propertyType = PropertyType.VALUE;
- } else if (Collection.class.isAssignableFrom(returnType)) {
- propertyType = PropertyType.COLLECTION;
- } else if (Map.class.isAssignableFrom(returnType)) {
- propertyType = PropertyType.MAP;
- } else {
- propertyType = PropertyType.REFERENCE;
+ if (!(Collection.class.isAssignableFrom(beanType)
+ || Map.class.isAssignableFrom(beanType))) {
+ for (Method method : beanType.getMethods()) {
+ if (BeanMethod.GET.matches(method)) {
+ // match methods on their name for now, to find the most specific
+ // override
+ String name = method.getName();
+
+ Type genericReturnType = TypeUtils.resolveGenerics(beanType,
+ method.getGenericReturnType());
+ Class returnType = TypeUtils.ensureBaseType(genericReturnType);
+
+ Data data = getters.get(name);
+ if (data == null || data.type.isAssignableFrom(returnType)) {
+ // no getter seen yet for the property, or a less specific one
+ PropertyType propertyType;
+ if (TypeUtils.isValueType(returnType)) {
+ propertyType = PropertyType.VALUE;
+ } else if (Collection.class.isAssignableFrom(returnType)) {
+ propertyType = PropertyType.COLLECTION;
+ } else if (Map.class.isAssignableFrom(returnType)) {
+ propertyType = PropertyType.MAP;
+ } else {
+ propertyType = PropertyType.REFERENCE;
+ }
+ data = new Data(method, genericReturnType, returnType, propertyType);
+
+ getters.put(name, data);
}
- data = new Data(method, genericReturnType, returnType, propertyType);
-
- getters.put(name, data);
+ } else if (BeanMethod.SET.matches(method) || BeanMethod.SET_BUILDER.matches(method)) {
+ setters.add(method);
}
- } else if (BeanMethod.SET.matches(method) || BeanMethod.SET_BUILDER.matches(method)) {
- setters.add(method);
}
}
diff --git a/user/src/com/google/web/bindery/requestfactory/server/RequestFactoryJarExtractor.java b/user/src/com/google/web/bindery/requestfactory/server/RequestFactoryJarExtractor.java
index c7628acdc1f..a8c807e2962 100644
--- a/user/src/com/google/web/bindery/requestfactory/server/RequestFactoryJarExtractor.java
+++ b/user/src/com/google/web/bindery/requestfactory/server/RequestFactoryJarExtractor.java
@@ -18,7 +18,6 @@
import com.google.gwt.dev.util.Name;
import com.google.gwt.dev.util.Name.SourceOrBinaryName;
import com.google.gwt.dev.util.Util;
-
import com.google.web.bindery.event.shared.SimpleEventBus;
import com.google.web.bindery.requestfactory.apt.RfValidator;
import com.google.web.bindery.requestfactory.apt.ValidationTool;
@@ -99,7 +98,11 @@
/**
* Used to extract RequestFactory client jars from {@code gwt-user.jar}.
+ *
+ * @deprecated Will not be deleted from source, but will no longer be included in GWT artifacts, as
+ * this is only intended for use as a build tool.
*/
+@Deprecated
public class RequestFactoryJarExtractor {
/*
* The FooProcessor types are ASM visitors that traverse the bytecode, calling
@@ -844,6 +847,12 @@ public static void main(String[] args) throws IOException {
}
System.exit(1);
}
+ if (args.length != 3 || !"used-to-build-gwt".equals(args[2])) {
+ // Test for magic sentinel, warn if not present
+ System.err.println("RequestFactoryJarExtractor is deprecated for removal from build " +
+ "artifacts, if you have a use case that requires it please discuss at " +
+ "https://github.com/gwtproject/gwt/issues/9923.");
+ }
String target = args[0];
List> seeds = SEEDS.get(target);
if (seeds == null) {
diff --git a/user/super/com/google/gwt/emul/java/io/Reader.java b/user/super/com/google/gwt/emul/java/io/Reader.java
index 54137991e65..63216ad3a92 100644
--- a/user/super/com/google/gwt/emul/java/io/Reader.java
+++ b/user/super/com/google/gwt/emul/java/io/Reader.java
@@ -59,7 +59,7 @@ public int read() throws IOException {
/**
* Attempts to fill {@code buf} with characters up to the size of the array.
*/
- public int read(char[] buf) {
+ public int read(char[] buf) throws IOException {
return read(buf, 0, buf.length);
}
@@ -67,7 +67,7 @@ public int read(char[] buf) {
* Attempts to fill {@code buf} with up to {@code len} characters. Characters
* will be stored in {@code buf} starting at index {@code off}.
*/
- public abstract int read(char[] buf, int off, int len);
+ public abstract int read(char[] buf, int off, int len) throws IOException;
/**
* Returns whether the stream is ready for reading characters.
diff --git a/user/super/com/google/gwt/emul/java/lang/Boolean.java b/user/super/com/google/gwt/emul/java/lang/Boolean.java
index af7a3ae1804..4aafa9c1c66 100644
--- a/user/super/com/google/gwt/emul/java/lang/Boolean.java
+++ b/user/super/com/google/gwt/emul/java/lang/Boolean.java
@@ -18,9 +18,7 @@
import static javaemul.internal.InternalPreconditions.checkNotNull;
import java.io.Serializable;
-
import javaemul.internal.JsUtils;
-
import jsinterop.annotations.JsMethod;
/**
@@ -125,5 +123,5 @@ public String toString() {
protected static boolean $isInstance(Object instance) {
return "boolean".equals(JsUtils.typeOf(instance));
}
- //CHECKSTYLE_ON: End utility methods
+ // CHECKSTYLE_ON: End utility methods
}
diff --git a/user/super/com/google/gwt/emul/java/lang/CharSequence.java b/user/super/com/google/gwt/emul/java/lang/CharSequence.java
index dc76d004e30..560bd9f8751 100644
--- a/user/super/com/google/gwt/emul/java/lang/CharSequence.java
+++ b/user/super/com/google/gwt/emul/java/lang/CharSequence.java
@@ -22,9 +22,7 @@
import java.util.Spliterators;
import java.util.stream.IntStream;
import java.util.stream.StreamSupport;
-
import javaemul.internal.JsUtils;
-
import jsinterop.annotations.JsMethod;
/**
diff --git a/user/super/com/google/gwt/emul/java/lang/Character.java b/user/super/com/google/gwt/emul/java/lang/Character.java
index 4b01e4d43d3..d675b1719e6 100644
--- a/user/super/com/google/gwt/emul/java/lang/Character.java
+++ b/user/super/com/google/gwt/emul/java/lang/Character.java
@@ -322,7 +322,7 @@ private static boolean isWhitespace(String ch) {
// the Java definition includes separators.
whitespaceRegex =
new NativeRegExp(
- "[\\u1680\\u180E\\u2000-\\u2006\\u2008-\\u200A\\u2028\\u2029\\u205F\\u3000\\uFEFF]"
+ "[\\u1680\\u2000-\\u2006\\u2008-\\u200A\\u2028\\u2029\\u205F\\u3000]"
+ "|[\\t-\\r ]"
+ "|[\\x1C-\\x1F]");
}
diff --git a/user/super/com/google/gwt/emul/java/lang/Class.java b/user/super/com/google/gwt/emul/java/lang/Class.java
index fbca4e7aa12..c59eed0b6cc 100644
--- a/user/super/com/google/gwt/emul/java/lang/Class.java
+++ b/user/super/com/google/gwt/emul/java/lang/Class.java
@@ -18,7 +18,6 @@
import com.google.gwt.core.client.JavaScriptObject;
import java.lang.reflect.Type;
-
import javaemul.internal.annotations.DoNotInline;
/**
diff --git a/user/super/com/google/gwt/emul/java/lang/Comparable.java b/user/super/com/google/gwt/emul/java/lang/Comparable.java
index 73191d04f1b..d54dac31429 100644
--- a/user/super/com/google/gwt/emul/java/lang/Comparable.java
+++ b/user/super/com/google/gwt/emul/java/lang/Comparable.java
@@ -16,7 +16,6 @@
package java.lang;
import javaemul.internal.JsUtils;
-
import jsinterop.annotations.JsMethod;
/**
diff --git a/user/super/com/google/gwt/emul/java/lang/Double.java b/user/super/com/google/gwt/emul/java/lang/Double.java
index 8efc156ff9d..44f250523d0 100644
--- a/user/super/com/google/gwt/emul/java/lang/Double.java
+++ b/user/super/com/google/gwt/emul/java/lang/Double.java
@@ -219,5 +219,5 @@ public String toString() {
protected static boolean $isInstance(Object instance) {
return "number".equals(JsUtils.typeOf(instance));
}
- //CHECKSTYLE_ON: End utility methods
+ // CHECKSTYLE_ON: End utility methods
}
diff --git a/user/super/com/google/gwt/emul/java/lang/Enum.java b/user/super/com/google/gwt/emul/java/lang/Enum.java
index 13d01144e8a..b044a57b6cb 100644
--- a/user/super/com/google/gwt/emul/java/lang/Enum.java
+++ b/user/super/com/google/gwt/emul/java/lang/Enum.java
@@ -19,6 +19,7 @@
import static javaemul.internal.InternalPreconditions.checkNotNull;
import com.google.gwt.core.client.JavaScriptObject;
+
import java.io.Serializable;
import jsinterop.annotations.JsIgnore;
import jsinterop.annotations.JsNonNull;
diff --git a/user/super/com/google/gwt/emul/java/lang/Math.java b/user/super/com/google/gwt/emul/java/lang/Math.java
index 5bf6829ebab..4d9d5da6742 100644
--- a/user/super/com/google/gwt/emul/java/lang/Math.java
+++ b/user/super/com/google/gwt/emul/java/lang/Math.java
@@ -32,14 +32,6 @@ public final class Math {
// public static int getExponent (double d)
// public static int getExponent (float f)
// public static double IEEEremainder(double f1, double f2)
- // public static double nextAfter(double start, double direction)
- // public static float nextAfter(float start, float direction)
- // public static double nextUp(double start) {
- // return nextAfter(start, 1.0d);
- // }
- // public static float nextUp(float start) {
- // return nextAfter(start,1.0f);
- // }
public static final double E = 2.7182818284590452354;
public static final double PI = 3.14159265358979323846;
@@ -344,6 +336,75 @@ public static double toRadians(double x) {
return x * PI_OVER_180;
}
+ public static double nextAfter(double start, double direction) {
+ // Simple case described by Javadoc:
+ if (start == direction) {
+ return direction;
+ }
+
+ // NaN special case, if either is NaN, return NaN.
+ if (Double.isNaN(start) || Double.isNaN(direction)) {
+ return Double.NaN;
+ }
+
+ // The javadoc 'special cases' for infinities and min_value are handled already by manipulating
+ // the bits of the start value below. However, that approach used below doesn't work around
+ // zeros - we have two zero values to deal with (positive and negative) with very different bit
+ // representations (zero and Long.MIN_VALUE respectively).
+ if (start == 0) {
+ return direction > start ? Double.MIN_VALUE : -Double.MIN_VALUE;
+ }
+
+ // Convert to int bits and increment or decrement - the fact that two positive ieee754 float
+ // values can be compared as ints (or two negative values, with the comparison inverted) means
+ // that this trick works as naturally as A + 1 > A. NaNs and zeros were already handled above.
+ long bits = Double.doubleToLongBits(start);
+ bits += (direction > start) == (bits >= 0) ? 1 : -1;
+ return Double.longBitsToDouble(bits);
+ }
+
+ public static float nextAfter(float start, double direction) {
+ // Simple case described by Javadoc:
+ if (start == direction) {
+ return (float) direction;
+ }
+
+ // NaN special case, if either is NaN, return NaN.
+ if (Float.isNaN(start) || Double.isNaN(direction)) {
+ return Float.NaN;
+ }
+ // The javadoc 'special cases' for INFINITYs, MIN_VALUE, and MAX_VALUE are handled already by
+ // manipulating the bits of the start value below. However, that approach used below doesn't
+ // work around zeros - we have two zero values to deal with (positive and negative) with very
+ // different bit representations (zero and Integer.MIN_VALUE respectively).
+ if (start == 0) {
+ return direction > start ? Float.MIN_VALUE : -Float.MIN_VALUE;
+ }
+
+ // Convert to int bits and increment or decrement - the fact that two positive ieee754 float
+ // values can be compared as ints (or two negative values, with the comparison inverted) means
+ // that this trick works as naturally as A + 1 > A. NaNs and zeros were already handled above.
+ int bits = Float.floatToIntBits(start);
+ bits += (direction > start) == (bits >= 0) ? 1 : -1;
+ return Float.intBitsToFloat(bits);
+ }
+
+ public static double nextUp(double start) {
+ return nextAfter(start, Double.POSITIVE_INFINITY);
+ }
+
+ public static float nextUp(float start) {
+ return nextAfter(start, Double.POSITIVE_INFINITY);
+ }
+
+ public static double nextDown(double start) {
+ return nextAfter(start, Double.NEGATIVE_INFINITY);
+ }
+
+ public static float nextDown(float start) {
+ return nextAfter(start, Double.NEGATIVE_INFINITY);
+ }
+
private static boolean isSafeIntegerRange(double value) {
return Integer.MIN_VALUE <= value && value <= Integer.MAX_VALUE;
}
diff --git a/dev/core/src/com/google/gwt/dev/util/arg/ArgHandlerMissingDepsFile.java b/user/super/com/google/gwt/emul/java/lang/Record.java
similarity index 58%
rename from dev/core/src/com/google/gwt/dev/util/arg/ArgHandlerMissingDepsFile.java
rename to user/super/com/google/gwt/emul/java/lang/Record.java
index 9da95e328fd..bc9ee724f6a 100644
--- a/dev/core/src/com/google/gwt/dev/util/arg/ArgHandlerMissingDepsFile.java
+++ b/user/super/com/google/gwt/emul/java/lang/Record.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2014 Google Inc.
+ * Copyright 2024 GWT Project Authors
*
* 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
@@ -13,17 +13,19 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package com.google.gwt.dev.util.arg;
-
-import com.google.gwt.util.tools.ArgHandlerNoopDeprecatedFlag;
+package java.lang;
/**
- * Optionally specifies a file into which detailed missing dependency information will be written.
+ * Superclass of all Java records.
*/
-@Deprecated
-public final class ArgHandlerMissingDepsFile extends ArgHandlerNoopDeprecatedFlag {
+public abstract class Record {
+
+ protected Record() {
+ }
+
+ public abstract int hashCode();
+
+ public abstract boolean equals(Object other);
- public ArgHandlerMissingDepsFile() {
- super(1, "missingDepsFile");
- }
+ public abstract String toString();
}
diff --git a/user/super/com/google/gwt/emul/java/lang/String.java b/user/super/com/google/gwt/emul/java/lang/String.java
index 7b4872bb8ad..693f53bdc7f 100644
--- a/user/super/com/google/gwt/emul/java/lang/String.java
+++ b/user/super/com/google/gwt/emul/java/lang/String.java
@@ -16,6 +16,7 @@
package java.lang;
+import static javaemul.internal.InternalPreconditions.checkArgument;
import static javaemul.internal.InternalPreconditions.checkCriticalStringBounds;
import static javaemul.internal.InternalPreconditions.checkNotNull;
import static javaemul.internal.InternalPreconditions.checkStringBounds;
@@ -27,7 +28,12 @@
import java.nio.charset.UnsupportedCharsetException;
import java.util.Comparator;
import java.util.Locale;
+import java.util.Spliterator;
+import java.util.Spliterators;
import java.util.StringJoiner;
+import java.util.function.Consumer;
+import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
import javaemul.internal.ArrayHelper;
import javaemul.internal.Coercions;
import javaemul.internal.EmulatedCharset;
@@ -755,6 +761,91 @@ public String trim() {
return start > 0 || end < length ? substring(start, end) : this;
}
+ public String strip() {
+ int length = length();
+ int start = getLeadingWhitespaceLength();
+ if (start == length) {
+ return "";
+ }
+ return substring(start, length - getTrailingWhitespaceLength());
+ }
+
+ public String stripLeading() {
+ return substring(getLeadingWhitespaceLength());
+ }
+
+ public String stripTrailing() {
+ return substring(0, length() - getTrailingWhitespaceLength());
+ }
+
+ public boolean isBlank() {
+ return length() == getLeadingWhitespaceLength();
+ }
+
+ public Stream lines() {
+ return StreamSupport.stream(new LinesSpliterator(), false);
+ }
+
+ public String repeat(int count) {
+ checkArgument(count >= 0, "count is negative: " + count);
+ return asNativeString().repeat(count);
+ }
+
+ private int getLeadingWhitespaceLength() {
+ int length = length();
+ for (int i = 0; i < length; i++) {
+ if (!Character.isWhitespace(charAt(i))) {
+ return i;
+ }
+ }
+ return length;
+ }
+
+ private int getTrailingWhitespaceLength() {
+ int length = length();
+ for (int i = length - 1; i >= 0; i--) {
+ if (!Character.isWhitespace(charAt(i))) {
+ return length - 1 - i;
+ }
+ }
+ return length;
+ }
+
+ private class LinesSpliterator extends Spliterators.AbstractSpliterator {
+ private int nextIndex = 0;
+ private int rPosition = -1;
+ private int nPosition = -1;
+
+ private LinesSpliterator() {
+ super(Long.MAX_VALUE, Spliterator.IMMUTABLE | Spliterator.ORDERED);
+ }
+
+ @Override
+ public boolean tryAdvance(Consumer action) {
+ if (isEmpty()) {
+ return false;
+ }
+ if (rPosition < nextIndex) {
+ rPosition = cappedIndexOf('\r');
+ }
+ if (nPosition < nextIndex) {
+ nPosition = cappedIndexOf('\n');
+ }
+ int lineEnd = Math.min(nPosition, rPosition);
+ action.accept(substring(nextIndex, lineEnd));
+ nextIndex = lineEnd + 1;
+ if (nPosition == rPosition + 1) {
+ nextIndex++;
+ }
+ return nextIndex < length();
+ }
+
+ private int cappedIndexOf(char c) {
+ int index = indexOf(c, nextIndex);
+ return index == -1 ? length() : index;
+ }
+ }
+
@JsType(isNative = true, name = "String", namespace = "")
private static class NativeString {
public static native String fromCharCode(char x);
@@ -771,6 +862,7 @@ private static class NativeString {
public native String toLocaleUpperCase();
public native String toLowerCase();
public native String toUpperCase();
+ public native String repeat(int count);
}
// CHECKSTYLE_OFF: Utility Methods for unboxed String.
diff --git a/user/super/com/google/gwt/emul/java/lang/Throwable.java b/user/super/com/google/gwt/emul/java/lang/Throwable.java
index 60c8a1208c9..1492bb0f003 100644
--- a/user/super/com/google/gwt/emul/java/lang/Throwable.java
+++ b/user/super/com/google/gwt/emul/java/lang/Throwable.java
@@ -21,9 +21,7 @@
import java.io.PrintStream;
import java.io.Serializable;
-
import javaemul.internal.annotations.DoNotInline;
-
import jsinterop.annotations.JsMethod;
import jsinterop.annotations.JsNonNull;
import jsinterop.annotations.JsPackage;
diff --git a/user/super/com/google/gwt/emul/java/lang/annotation/ElementType.java b/user/super/com/google/gwt/emul/java/lang/annotation/ElementType.java
index 4d09dc7d9d9..6ec5dc9548e 100644
--- a/user/super/com/google/gwt/emul/java/lang/annotation/ElementType.java
+++ b/user/super/com/google/gwt/emul/java/lang/annotation/ElementType.java
@@ -21,6 +21,6 @@
* docs].
*/
public enum ElementType {
- ANNOTATION_TYPE, CONSTRUCTOR, FIELD, LOCAL_VARIABLE, METHOD, PACKAGE,
- PARAMETER, TYPE, TYPE_PARAMETER, TYPE_USE,
+ ANNOTATION_TYPE, CONSTRUCTOR, FIELD, LOCAL_VARIABLE, METHOD, MODULE, PACKAGE,
+ PARAMETER, RECORD_COMPONENT, TYPE, TYPE_PARAMETER, TYPE_USE,
}
diff --git a/user/src/com/google/gwt/user/tools/ProjectCreator.java b/user/super/com/google/gwt/emul/java/lang/runtime/ObjectMethods.java
similarity index 57%
rename from user/src/com/google/gwt/user/tools/ProjectCreator.java
rename to user/super/com/google/gwt/emul/java/lang/runtime/ObjectMethods.java
index 09438add230..5a42f844476 100644
--- a/user/src/com/google/gwt/user/tools/ProjectCreator.java
+++ b/user/super/com/google/gwt/emul/java/lang/runtime/ObjectMethods.java
@@ -1,29 +1,23 @@
/*
- * Copyright 2008 Google Inc.
- *
+ * Copyright 2024 GWT Project Authors
+ *
* 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
* License for the specific language governing permissions and limitations under
* the License.
*/
-package com.google.gwt.user.tools;
+package java.lang.runtime;
/**
- * Legacy ProjectCreator that will let users know that they should run
- * {@link WebAppCreator} instead.
+ * This class must exist for Record to compile, but has no emulated methods.
*/
-public final class ProjectCreator {
+public class ObjectMethods {
- public static void main(String[] args) {
- System.err.println("This application no longer exists!");
- System.err.println("Please see " + WebAppCreator.class.getName());
- System.exit(1);
- }
}
diff --git a/user/super/com/google/gwt/emul/java/math/BigInteger.java b/user/super/com/google/gwt/emul/java/math/BigInteger.java
index 8fe9f779996..807ca100912 100644
--- a/user/super/com/google/gwt/emul/java/math/BigInteger.java
+++ b/user/super/com/google/gwt/emul/java/math/BigInteger.java
@@ -260,16 +260,42 @@ private static void setFromString(BigInteger bi, String val, int radix) {
* @throws NumberFormatException if the length of {@code val} is zero.
*/
public BigInteger(byte[] val) {
+ this(val, 0, val.length);
+ }
+
+ /**
+ * Constructs a new {@code BigInteger} from the given two's complement
+ * representation. The most significant byte is the entry at index 0. The most
+ * significant bit of this entry determines the sign of the new {@code
+ * BigInteger} instance. The given array must not be empty.
+ *
+ * @param val two's complement representation of the new {@code BigInteger}.
+ * @param offset the start offset of the binary representation.
+ * @param length the number of bytes to use.
+ * @throws NullPointerException if {@code val == null}.
+ * @throws NumberFormatException if the length of {@code val} is zero.
+ */
+ public BigInteger(byte[] val, int offset, int length) {
if (val.length == 0) {
// math.12=Zero length BigInteger
throw new NumberFormatException("Zero length BigInteger"); //$NON-NLS-1$
}
- if (val[0] < 0) {
+ if (length < 0 || offset < 0 || length > val.length - offset) {
+ throw new IndexOutOfBoundsException("Range check failed: offset=" + offset + ", length="
+ + length + ", val.length=" + val.length);
+ }
+ if (length == 0) {
+ sign = 0;
+ numberLength = 1;
+ digits = new int[] {0};
+ return;
+ }
+ if (val[offset] < 0) {
sign = -1;
- putBytesNegativeToIntegers(val);
+ putBytesNegativeToIntegers(val, offset, length);
} else {
sign = 1;
- putBytesPositiveToIntegers(val);
+ putBytesPositiveToIntegers(val, offset, length);
}
cutOffLeadingZeroes();
}
@@ -289,27 +315,53 @@ public BigInteger(byte[] val) {
* sign is zero and the magnitude contains non-zero entries.
*/
public BigInteger(int signum, byte[] magnitude) {
+ this(signum, magnitude, 0, magnitude.length);
+ }
+
+ /**
+ * Constructs a new {@code BigInteger} instance with the given sign and the
+ * given magnitude. The sign is given as an integer (-1 for negative, 0 for
+ * zero, 1 for positive). The magnitude is specified as a byte array. The most
+ * significant byte is the entry at index 0.
+ *
+ * @param signum sign of the new {@code BigInteger} (-1 for negative, 0 for
+ * zero, 1 for positive).
+ * @param magnitude magnitude of the new {@code BigInteger} with the most
+ * significant byte first.
+ * @param offset the start offset of the binary representation.
+ * @param length the number of bytes to use.
+ * @throws NullPointerException if {@code magnitude == null}.
+ * @throws NumberFormatException if the sign is not one of -1, 0, 1 or if the
+ * sign is zero and the magnitude contains non-zero entries.
+ */
+ public BigInteger(int signum, byte[] magnitude, int offset, int length) {
checkNotNull(magnitude);
+ if (length < 0 || offset < 0 || length > magnitude.length - offset) {
+ throw new IndexOutOfBoundsException("Range check failed: offset=" + offset + ", length="
+ + length + ", val.length=" + magnitude.length);
+ }
+
if ((signum < -1) || (signum > 1)) {
// math.13=Invalid signum value
throw new NumberFormatException("Invalid signum value"); //$NON-NLS-1$
}
if (signum == 0) {
- for (byte element : magnitude) {
+ for (int index = offset; index < offset + length; index++) {
+ byte element = magnitude[index];
if (element != 0) {
// math.14=signum-magnitude mismatch
throw new NumberFormatException("signum-magnitude mismatch"); //$NON-NLS-1$
}
}
}
- if (magnitude.length == 0) {
+ if (length == 0) {
sign = 0;
numberLength = 1;
digits = new int[] {0};
} else {
sign = signum;
- putBytesPositiveToIntegers(magnitude);
+ putBytesPositiveToIntegers(magnitude, offset, length);
cutOffLeadingZeroes();
}
}
@@ -1477,8 +1529,8 @@ void unCache() {
/**
* Puts a big-endian byte array into a little-endian applying two complement.
*/
- private void putBytesNegativeToIntegers(byte[] byteValues) {
- int bytesLen = byteValues.length;
+ private void putBytesNegativeToIntegers(byte[] byteValues, int offset, int length) {
+ int bytesLen = length;
int highBytes = bytesLen & 3;
numberLength = (bytesLen >> 2) + ((highBytes == 0) ? 0 : 1);
digits = new int[numberLength];
@@ -1487,19 +1539,19 @@ private void putBytesNegativeToIntegers(byte[] byteValues) {
digits[numberLength - 1] = -1;
// Put bytes to the int array starting from the end of the byte array
while (bytesLen > highBytes) {
- digits[i] = (byteValues[--bytesLen] & 0xFF)
- | (byteValues[--bytesLen] & 0xFF) << 8
- | (byteValues[--bytesLen] & 0xFF) << 16
- | (byteValues[--bytesLen] & 0xFF) << 24;
+ digits[i] = (byteValues[--bytesLen + offset] & 0xFF)
+ | (byteValues[--bytesLen + offset] & 0xFF) << 8
+ | (byteValues[--bytesLen + offset] & 0xFF) << 16
+ | (byteValues[--bytesLen + offset] & 0xFF) << 24;
if (digits[i] != 0) {
digits[i] = -digits[i];
firstNonzeroDigit = i;
i++;
while (bytesLen > highBytes) {
- digits[i] = (byteValues[--bytesLen] & 0xFF)
- | (byteValues[--bytesLen] & 0xFF) << 8
- | (byteValues[--bytesLen] & 0xFF) << 16
- | (byteValues[--bytesLen] & 0xFF) << 24;
+ digits[i] = (byteValues[--bytesLen + offset] & 0xFF)
+ | (byteValues[--bytesLen + offset] & 0xFF) << 8
+ | (byteValues[--bytesLen + offset] & 0xFF) << 16
+ | (byteValues[--bytesLen + offset] & 0xFF) << 24;
digits[i] = ~digits[i];
i++;
}
@@ -1510,12 +1562,12 @@ private void putBytesNegativeToIntegers(byte[] byteValues) {
if (highBytes != 0) {
// Put the first bytes in the highest element of the int array
if (firstNonzeroDigit != -2) {
- for (int j = 0; j < bytesLen; j++) {
+ for (int j = offset; j < bytesLen + offset; j++) {
digits[i] = (digits[i] << 8) | (byteValues[j] & 0xFF);
}
digits[i] = ~digits[i];
} else {
- for (int j = 0; j < bytesLen; j++) {
+ for (int j = offset; j < bytesLen + offset; j++) {
digits[i] = (digits[i] << 8) | (byteValues[j] & 0xFF);
}
digits[i] = -digits[i];
@@ -1526,21 +1578,21 @@ private void putBytesNegativeToIntegers(byte[] byteValues) {
/**
* Puts a big-endian byte array into a little-endian int array.
*/
- private void putBytesPositiveToIntegers(byte[] byteValues) {
- int bytesLen = byteValues.length;
+ private void putBytesPositiveToIntegers(byte[] byteValues, int offset, int length) {
+ int bytesLen = length;
int highBytes = bytesLen & 3;
numberLength = (bytesLen >> 2) + ((highBytes == 0) ? 0 : 1);
digits = new int[numberLength];
int i = 0;
// Put bytes to the int array starting from the end of the byte array
while (bytesLen > highBytes) {
- digits[i++] = (byteValues[--bytesLen] & 0xFF)
- | (byteValues[--bytesLen] & 0xFF) << 8
- | (byteValues[--bytesLen] & 0xFF) << 16
- | (byteValues[--bytesLen] & 0xFF) << 24;
+ digits[i++] = (byteValues[--bytesLen + offset] & 0xFF)
+ | (byteValues[--bytesLen + offset] & 0xFF) << 8
+ | (byteValues[--bytesLen + offset] & 0xFF) << 16
+ | (byteValues[--bytesLen + offset] & 0xFF) << 24;
}
// Put the first bytes in the highest element of the int array
- for (int j = 0; j < bytesLen; j++) {
+ for (int j = offset; j < bytesLen + offset; j++) {
digits[i] = (digits[i] << 8) | (byteValues[j] & 0xFF);
}
}
diff --git a/user/super/com/google/gwt/emul/java/math/MathContext.java b/user/super/com/google/gwt/emul/java/math/MathContext.java
index 3522877af30..fa04a4d86b2 100644
--- a/user/super/com/google/gwt/emul/java/math/MathContext.java
+++ b/user/super/com/google/gwt/emul/java/math/MathContext.java
@@ -38,7 +38,6 @@
import static javaemul.internal.InternalPreconditions.checkNotNull;
import java.io.Serializable;
-
import javaemul.internal.NativeRegExp;
/**
diff --git a/user/super/com/google/gwt/emul/java/text/Normalizer.java b/user/super/com/google/gwt/emul/java/text/Normalizer.java
new file mode 100644
index 00000000000..a19cfbeaaab
--- /dev/null
+++ b/user/super/com/google/gwt/emul/java/text/Normalizer.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2024 GWT Project Authors
+ *
+ * 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
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package java.text;
+
+import javaemul.internal.JsUtils;
+import jsinterop.annotations.JsType;
+
+/**
+ * Emulation of java.text.Normalizer.
+ */
+public final class Normalizer {
+
+ public enum Form {
+ /** Canonical decomposition. */
+ NFD,
+ /** Canonical decomposition followed by composition. */
+ NFC,
+ /** Compatibility decomposition. */
+ NFKD,
+ /** Compatibility decomposition followed by composition. */
+ NFKC
+ }
+
+ public static String normalize(CharSequence input, Form form) {
+ return JsUtils.uncheckedCast(input.toString()).normalize(form.name());
+ }
+
+ public static boolean isNormalized(CharSequence input, Form form) {
+ String str = input.toString();
+ return str.equals(normalize(str, form));
+ }
+
+ @JsType(isNative = true, name = "String", namespace = "")
+ private static class NativeString {
+ public native String normalize(String form);
+ }
+}
+
diff --git a/user/super/com/google/gwt/emul/java/util/Collection.java b/user/super/com/google/gwt/emul/java/util/Collection.java
index 583efd50ce8..15c10ba8ed0 100644
--- a/user/super/com/google/gwt/emul/java/util/Collection.java
+++ b/user/super/com/google/gwt/emul/java/util/Collection.java
@@ -20,7 +20,6 @@
import java.util.function.Predicate;
import java.util.stream.Stream;
import java.util.stream.StreamSupport;
-
import jsinterop.annotations.JsIgnore;
import jsinterop.annotations.JsType;
diff --git a/user/super/com/google/gwt/emul/java/util/Collections.java b/user/super/com/google/gwt/emul/java/util/Collections.java
index ec35c326848..a5bfd207a4b 100644
--- a/user/super/com/google/gwt/emul/java/util/Collections.java
+++ b/user/super/com/google/gwt/emul/java/util/Collections.java
@@ -23,7 +23,6 @@
import java.io.Serializable;
import java.util.function.Predicate;
import java.util.function.UnaryOperator;
-
import jsinterop.annotations.JsNonNull;
/**
diff --git a/user/super/com/google/gwt/emul/java/util/Date.java b/user/super/com/google/gwt/emul/java/util/Date.java
index fe19568d63c..67a72fb905e 100644
--- a/user/super/com/google/gwt/emul/java/util/Date.java
+++ b/user/super/com/google/gwt/emul/java/util/Date.java
@@ -16,7 +16,6 @@
package java.util;
import java.io.Serializable;
-
import jsinterop.annotations.JsPackage;
import jsinterop.annotations.JsType;
diff --git a/user/super/com/google/gwt/emul/java/util/List.java b/user/super/com/google/gwt/emul/java/util/List.java
index d1d20110b82..115195390c3 100644
--- a/user/super/com/google/gwt/emul/java/util/List.java
+++ b/user/super/com/google/gwt/emul/java/util/List.java
@@ -18,8 +18,8 @@
import static javaemul.internal.InternalPreconditions.checkNotNull;
import java.util.function.UnaryOperator;
+import java.util.stream.Collectors;
import javaemul.internal.ArrayHelper;
-
import jsinterop.annotations.JsIgnore;
import jsinterop.annotations.JsMethod;
import jsinterop.annotations.JsNonNull;
@@ -164,4 +164,9 @@ default Spliterator spliterator() {
}
@JsNonNull List subList(int fromIndex, int toIndex);
+
+ static List copyOf(Collection coll) {
+ // TODO if the given collection is immutable and has no nulls, return it
+ return coll.stream().collect(Collectors.toUnmodifiableList());
+ }
}
diff --git a/user/super/com/google/gwt/emul/java/util/Map.java b/user/super/com/google/gwt/emul/java/util/Map.java
index fd3178b0411..06d057017be 100644
--- a/user/super/com/google/gwt/emul/java/util/Map.java
+++ b/user/super/com/google/gwt/emul/java/util/Map.java
@@ -22,7 +22,7 @@
import java.util.function.BiConsumer;
import java.util.function.BiFunction;
import java.util.function.Function;
-
+import java.util.stream.Collectors;
import jsinterop.annotations.JsIgnore;
import jsinterop.annotations.JsNonNull;
import jsinterop.annotations.JsType;
@@ -412,4 +412,10 @@ default void replaceAll(BiFunction function)
int size();
@JsNonNull Collection values();
+
+ static Map copyOf(Map map) {
+ // TODO if the given map is immutable and has no nulls, return it
+ return map.entrySet().stream().collect(Collectors.toUnmodifiableMap(Entry::getKey,
+ Entry::getValue));
+ }
}
diff --git a/user/super/com/google/gwt/emul/java/util/Set.java b/user/super/com/google/gwt/emul/java/util/Set.java
index eddd4dffe90..6ec721d989a 100644
--- a/user/super/com/google/gwt/emul/java/util/Set.java
+++ b/user/super/com/google/gwt/emul/java/util/Set.java
@@ -18,6 +18,7 @@
import static javaemul.internal.InternalPreconditions.checkArgument;
import static javaemul.internal.InternalPreconditions.checkNotNull;
+import java.util.stream.Collectors;
import jsinterop.annotations.JsIgnore;
import jsinterop.annotations.JsType;
@@ -98,4 +99,9 @@ static Set of(E... elements) {
default Spliterator spliterator() {
return Spliterators.spliterator(this, Spliterator.DISTINCT);
}
+
+ static Set copyOf(Collection coll) {
+ // TODO if the given collection is immutable and has no nulls, return it
+ return coll.stream().collect(Collectors.toUnmodifiableSet());
+ }
}
diff --git a/user/super/com/google/gwt/emul/java/util/Vector.java b/user/super/com/google/gwt/emul/java/util/Vector.java
index a71b5e3b33c..a43c07209a6 100644
--- a/user/super/com/google/gwt/emul/java/util/Vector.java
+++ b/user/super/com/google/gwt/emul/java/util/Vector.java
@@ -21,7 +21,6 @@
import java.util.function.Consumer;
import java.util.function.Predicate;
import java.util.function.UnaryOperator;
-
import jsinterop.annotations.JsNonNull;
/**
diff --git a/user/super/com/google/gwt/emul/java/util/function/BinaryOperator.java b/user/super/com/google/gwt/emul/java/util/function/BinaryOperator.java
index caf01d201e1..a7d21ffa43f 100644
--- a/user/super/com/google/gwt/emul/java/util/function/BinaryOperator.java
+++ b/user/super/com/google/gwt/emul/java/util/function/BinaryOperator.java
@@ -15,10 +15,10 @@
*/
package java.util.function;
-import java.util.Comparator;
-
import static javaemul.internal.InternalPreconditions.checkCriticalNotNull;
+import java.util.Comparator;
+
/**
* See
* the official Java API doc for details.
diff --git a/user/super/com/google/gwt/emul/java/util/function/Predicate.java b/user/super/com/google/gwt/emul/java/util/function/Predicate.java
index b9ad769b307..1e8caa6fb3f 100644
--- a/user/super/com/google/gwt/emul/java/util/function/Predicate.java
+++ b/user/super/com/google/gwt/emul/java/util/function/Predicate.java
@@ -15,10 +15,10 @@
*/
package java.util.function;
-import java.util.Objects;
-
import static javaemul.internal.InternalPreconditions.checkCriticalNotNull;
+import java.util.Objects;
+
/**
* See
* the official Java API doc for details.
diff --git a/user/super/com/google/gwt/emul/java/util/stream/Collectors.java b/user/super/com/google/gwt/emul/java/util/stream/Collectors.java
index 0509fb2fe87..519b375422f 100644
--- a/user/super/com/google/gwt/emul/java/util/stream/Collectors.java
+++ b/user/super/com/google/gwt/emul/java/util/stream/Collectors.java
@@ -177,13 +177,14 @@ public static Collector joining(CharSequence delimiter) {
return new CollectorImpl<>(
downstream.supplier(),
(A a, T t) -> {
- Stream stream = mapper.apply(t);
+ try (Stream stream = mapper.apply(t)) {
if (stream == null) {
return;
}
stream.forEach(u -> {
downstream.accumulator().accept(a, u);
});
+ }
},
downstream.combiner(),
downstream.finisher()
diff --git a/user/test-super/com/google/gwt/dev/jjs/super/com/google/gwt/dev/jjs/test/Java10Test.java b/user/test-super/com/google/gwt/dev/jjs/super/com/google/gwt/dev/jjs/test/Java10Test.java
deleted file mode 100644
index 165815343b8..00000000000
--- a/user/test-super/com/google/gwt/dev/jjs/super/com/google/gwt/dev/jjs/test/Java10Test.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * Copyright 2018 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
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package com.google.gwt.dev.jjs.test;
-
-import com.google.gwt.core.client.GwtScriptOnly;
-import com.google.gwt.junit.client.GWTTestCase;
-
-import java.util.ArrayList;
-import java.util.function.Supplier;
-
-import java.io.Serializable;
-
-/**
- * Tests Java 10 features. It is super sourced so that gwt can be compiled under Java 7.
- *
- * IMPORTANT: For each test here there must exist the corresponding method in the non super sourced
- * version.
- *
- * Eventually this test will graduate and not be super sourced.
- */
-@GwtScriptOnly
-public class Java10Test extends GWTTestCase {
-
- interface VarArgsFunction {
- R apply(T... args);
- }
-
- @Override
- public String getModuleName() {
- return "com.google.gwt.dev.jjs.Java10Test";
- }
-
- public void testLocalVarType_DenotableTypes() {
- var i = 42;
- assertEquals(42, i);
- var s = "42";
- assertEquals("42", s);
-
- Supplier initializer = () -> "37";
- var s2 = initializer.get();
- //to be sure that s2 was inferred as a string and not an Object
- String s3 = s2;
- assertEquals("37", s3);
- }
-
- public void testLocalVarType_Anonymous() {
- var o = new Object() {
- int i;
- String s;
- };
- o.i = 42;
- o.s = "42";
- assertEquals(42, o.i);
- assertEquals("42", o.s);
- }
-
- public void testLocalVarType_Ternary() {
- var value = true ? "a" : 'c';
- checkSerializableDispatch(value);
- checkComparableDispatch(value);
- assertEquals("a", value.toString());
- }
-
- private void checkSerializableDispatch(Object fail) {
- fail("should not be treated as object");
- }
-
- private void checkSerializableDispatch(Serializable pass) {
- // pass
- }
-
- private void checkComparableDispatch(Object fail) {
- fail("should not be treated as object");
- }
-
- private void checkComparableDispatch(Comparable pass) {
- // pass
- }
-
- public void testLocalVarType_LambdaCapture() {
- var s = "42";
- Supplier supplier = () -> s;
- assertEquals("42", supplier.get());
- }
-
- public void testLocalVarType_VarArg() {
- var args = new String[] {"4", "2"};
- VarArgsFunction f = arr -> arr[0] + arr[1];
- assertEquals("42", f.apply(args));
- }
-
- public void testLocalVarType_LocalClass() {
- var i = 37;
- class Local {
- int m() {
- var i = 40;
- return i + 2;
- }
-
- int fromOuterScope() {
- return i;
- }
- }
-
- var l = new Local();
- assertEquals(37, l.fromOuterScope());
- assertEquals(42, l.m());
- }
-
- public void testLocalVarType_ForLoop() {
- var a = new String[] {"4", "2"};
- var s = "";
- for (var i = 0; i < a.length; i++) {
- s += a[i];
- }
- assertEquals("42", s);
- }
-
- public void testLocalVarType_EnhancedForLoopArray() {
- var a = new String[] {"4", "2"};
- var str = "";
- for (var s : a) {
- str += s;
- }
- assertEquals("42", str);
- }
-
- public void testLocalVarType_EnhancedNestedForLoopArray() {
- var m = new int[][] {{1, 2}, {3, 4}};
- var summ = 0;
- for (var row : m) {
- for (var cell : row) {
- summ += cell;
- }
- }
- assertEquals(10, summ);
- }
-
- public void testLocalVarType_EnhancedForLoopIterable() {
- var list = new ArrayList();
- list.add("4");
- list.add("2");
- var str = "";
- for (var s : list) {
- str += s;
- }
- assertEquals("42", str);
- }
-}
diff --git a/user/test-super/com/google/gwt/dev/jjs/super/com/google/gwt/dev/jjs/test/Java11Test.java b/user/test-super/com/google/gwt/dev/jjs/super/com/google/gwt/dev/jjs/test/Java11Test.java
deleted file mode 100644
index 9e9c8f662c8..00000000000
--- a/user/test-super/com/google/gwt/dev/jjs/super/com/google/gwt/dev/jjs/test/Java11Test.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright 2019 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
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package com.google.gwt.dev.jjs.test;
-
-import com.google.gwt.core.client.GwtScriptOnly;
-import com.google.gwt.junit.client.GWTTestCase;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * Tests Java 11 features. It is super sourced so that gwt can be compiles under Java 8.
- *
- * IMPORTANT: For each test here there must exist the corresponding method in the non super sourced
- * version.
- *
- * Eventually this test will graduate and not be super sourced.
- */
-@GwtScriptOnly
-public class Java11Test extends GWTTestCase {
-
- @interface NotNull {
- }
-
- interface Lambda {
- T run(T a, T b);
- }
-
- @Override
- public String getModuleName() {
- return "com.google.gwt.dev.jjs.Java11Test";
- }
-
- public void testLambdaParametersVarType() {
- Lambda l = (@NotNull var x, var y) -> x + y;
- assertEquals("12", l.run("1", "2"));
- }
-
- public void testLambdaParametersVarType_function() {
- List l = Arrays.asList("a", "b");
- l = l.stream().map((var s) -> s.toUpperCase()).collect(Collectors.toList());
- assertEquals("A", l.get(0));
- assertEquals("B", l.get(1));
- }
-}
diff --git a/user/test-super/com/google/gwt/dev/jjs/super/com/google/gwt/dev/jjs/test/Java17Test.java b/user/test-super/com/google/gwt/dev/jjs/super/com/google/gwt/dev/jjs/test/Java17Test.java
new file mode 100644
index 00000000000..fc238a981b6
--- /dev/null
+++ b/user/test-super/com/google/gwt/dev/jjs/super/com/google/gwt/dev/jjs/test/Java17Test.java
@@ -0,0 +1,497 @@
+/*
+ * Copyright 2024 GWT Project Authors
+ *
+ * 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
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.google.gwt.dev.jjs.test;
+
+import com.google.gwt.core.client.GwtScriptOnly;
+import com.google.gwt.junit.client.GWTTestCase;
+
+import java.util.Arrays;
+import java.util.List;
+
+import jsinterop.annotations.*;
+
+/**
+ * Tests Java 17 features. It is super sourced so that gwt can be compiles under Java 11.
+ *
+ * IMPORTANT: For each test here there must exist the corresponding method in the non super sourced
+ * version.
+ *
+ * Eventually this test will graduate and not be super sourced.
+ */
+@GwtScriptOnly
+public class Java17Test extends GWTTestCase {
+
+ public interface TextBlock {
+ String text = """
+ line 1
+ line 2
+ line 3
+ """;
+ }
+
+ public sealed class Shape permits Square, Circle {
+ public static int count = 0;
+
+ public static Shape returnAndIncrement(Shape shape){
+ count++;
+ return shape;
+ }
+
+ }
+
+ public final class Square extends Shape {
+ public int getLength() {
+ return 10;
+ }
+ }
+
+ public final class Circle extends Shape {
+ public int getDiameter() {
+ return 10;
+ }
+ }
+
+ public interface TestSupplier {
+ boolean run();
+ }
+
+ public class Foo {
+ private Shape shape;
+
+ public Foo() {
+ shape = new Square();
+ }
+
+ public TestSupplier isSquare() {
+ return () -> shape instanceof Square square && square.getLength() > 0;
+ }
+ }
+
+ public class Bar {
+ private Shape shape;
+
+ public Bar() {
+ shape = new Square();
+ }
+
+ public boolean isSquare() {
+ return shape instanceof Square square && square.getLength() > 0;
+ }
+ }
+ @Override
+ public String getModuleName() {
+ return "com.google.gwt.dev.jjs.test.Java17Test";
+ }
+
+ public void testTextBlocks() {
+ List lines = Arrays.asList(TextBlock.text.split("\n"));
+ assertEquals(3, lines.size());
+ assertEquals("line 1", lines.get(0));
+ assertEquals("line 2", lines.get(1));
+ assertEquals("line 3", lines.get(2));
+ }
+
+ public void testSealedClassesPermitted() {
+ Shape square = new Square();
+ Shape circle = new Circle();
+
+ checkIfCompiled(square, circle);
+ }
+
+ private void checkIfCompiled(Shape square, Shape circle) {
+ assertTrue(square instanceof Square);
+ assertTrue(circle instanceof Circle);
+ }
+
+ /**
+ * Sample nested record. Has no components. Implements a single interface
+ */
+ record InnerRecord() implements Comparable {
+ /**
+ * Simple accessor-looking method to ensure it doesn't participate in hashcode/tostring.
+ */
+ public String value() {
+ return "Hello";
+ }
+
+ @Override
+ public int compareTo(InnerRecord other) {
+ return 0;
+ }
+ }
+
+ /**
+ * Record type that takes a record as a component
+ */
+ record RecordWithReferenceType(TopLevelRecord refType){}
+
+ public void testRecordClasses() {
+ /**
+ * Sample local record.
+ */
+ record LocalRecord() {
+ @Override
+ public String toString() {
+ return "Example";
+ }
+ }
+
+ assertTrue(new InnerRecord() instanceof Record);
+ assertTrue(new InnerRecord() instanceof Comparable);
+
+ assertFalse(new InnerRecord().toString().contains("Hello"));
+ assertTrue(new InnerRecord().toString().startsWith("InnerRecord"));
+ assertEquals(0, new InnerRecord().hashCode());
+ assertEquals(new InnerRecord(), new InnerRecord());
+
+ assertEquals("Example", new LocalRecord().toString());
+
+ TopLevelRecord withValues = new TopLevelRecord("Banana", 7);
+ assertTrue(withValues.toString().contains("7"));
+ assertTrue(withValues.toString().contains("Banana"));
+ assertEquals("Banana", withValues.name());
+ assertEquals(7, withValues.count());
+ // Under the current implementation this next line would fail - this is not inconsistent with the spec,
+ // but it is different than what the JVM does.
+// assertEquals(0, new TopLevelRecord("", 0).hashCode());
+ assertFalse(0 == new TopLevelRecord("", 7).hashCode());
+ assertFalse(0 == new TopLevelRecord("Pear", 0).hashCode());
+
+ assertFalse(new InnerRecord().equals(new LocalRecord()));
+ assertFalse(new InnerRecord().equals(null));
+ assertFalse(new LocalRecord().equals(null));
+
+ RecordWithReferenceType sameA = new RecordWithReferenceType(new TopLevelRecord("a", 1));
+ RecordWithReferenceType sameB = new RecordWithReferenceType(new TopLevelRecord("a", 1));
+ RecordWithReferenceType different = new RecordWithReferenceType(new TopLevelRecord("a", 2));
+ // check that an instance is equal to itself
+ assertEquals(sameA, sameA);
+ assertEquals(sameA.hashCode(), sameA.hashCode());
+ //check that an instance is equal to a different record instance with same values
+ assertEquals(sameA, sameB);
+ assertEquals(sameA.hashCode(), sameB.hashCode());
+
+ assertFalse(sameA.equals(different));
+ assertFalse(sameA.hashCode() == different.hashCode());
+
+ assertFalse(sameA.equals(null));
+ }
+
+ /**
+ * Simple record with one property accessor, one default method accessor
+ */
+ @JsType(namespace = "java17")
+ public record JsRecord1(@JsProperty String name, int value) { }
+
+ /**
+ * Simple native type to verify JsRecord1.
+ */
+ @JsType(name = "JsRecord1", namespace = "java17", isNative = true)
+ public static class JsObject1 {
+ public String name;
+ public native int value();
+ public JsObject1(String name, int value) { }
+ }
+
+ /**
+ * Record with explicit method accessor
+ */
+ @JsType(namespace = "java17")
+ public record JsRecord2(@JsMethod String name, int value) { }
+
+ /**
+ * Simple native type to verify JsRecord2.
+ */
+ @JsType(name = "JsRecord2", namespace = "java17", isNative = true)
+ public static class JsObject2 {
+ public JsObject2(String name, int value) { }
+
+ public native String name();
+ public native int value();
+ }
+
+ /**
+ * Record with exported properties and methods.
+ */
+ public record JsRecord3(String red, JsRecord1 green, JsRecord2 blue) {
+ @JsProperty
+ public String getFlavor() {
+ return "grape";
+ }
+ @JsMethod
+ public int countBeans() {
+ return 7;
+ }
+ }
+
+ /**
+ * Represented as an interface since there is no constructor to call or use to type check.
+ */
+ @JsType(isNative = true)
+ public interface JsObject3 {
+ @JsProperty
+ String getFlavor();
+ int countBeans();
+ }
+
+ public void testJsTypeRecords() {
+ // Test with default accessor (method) and a property accessor
+ JsRecord1 r1 = new JsRecord1("foo", 7);
+ assertEquals("foo", r1.name());
+ assertEquals(7, r1.value());
+ assertEquals(new JsRecord1("foo", 7), r1);
+
+ // Create an instance from JS, verify it is the same
+ JsObject1 o1 = new JsObject1("foo", 7);
+ assertEquals("foo", o1.name);
+ assertEquals(7, o1.value());
+ assertEquals(o1.toString(), r1.toString());
+ assertEquals(o1, r1);
+
+ // Repeat the test with methods explicitly configured for accessors
+ JsRecord2 r2 = new JsRecord2("foo", 7);
+ assertEquals("foo", r2.name());
+ assertEquals(7, r2.value());
+ assertEquals(new JsRecord2("foo", 7), r2);
+
+ // Create an instance from JS, verify it is the same
+ JsObject2 o2 = new JsObject2("foo", 7);
+ assertEquals("foo", o2.name());
+ assertEquals(7, o2.value());
+ assertEquals(o2.toString(), r2.toString());
+ assertEquals(o2, r2);
+
+ // Test an object with exposed properties and methods
+ JsRecord3 r3 = new JsRecord3("fork", r1, r2);
+ assertEquals("grape", r3.getFlavor());
+ assertEquals(7, r3.countBeans());
+
+ // Cast the instance to JS, verify it is the same
+ JsObject3 o3 = (JsObject3) (Object) r3;
+ assertEquals("grape", r3.getFlavor());
+ assertEquals(7, r3.countBeans());
+ }
+
+ public void testInstanceOfPatternMatching() {
+ Shape shape1 = new Circle();
+ if (shape1 instanceof Circle circle) {
+ circle.getDiameter();
+ assertTrue(true);
+ return;
+ }
+ fail();
+ }
+
+ public void testInstanceOfPatternMatchingWithSideEffectExpression() {
+ Shape shape1 = new Circle();
+ if (Shape.returnAndIncrement(shape1) instanceof Circle circle) {
+ circle.getDiameter();
+ assertTrue(true);
+ assertEquals(1, Shape.count);
+ return;
+ }
+ fail();
+ }
+
+ public void testInstanceOfPatternMatchingWithAnd() {
+ Shape shape1 = new Circle();
+ Shape shape2 = new Square();
+
+ if (shape1 instanceof Circle circle && shape2 instanceof Square square) {
+ circle.getDiameter();
+ square.getLength();
+ assertTrue(true);
+ return;
+ }
+ fail();
+ }
+
+ public void testInstanceOfPatternMatchingWithCondition() {
+ Shape shape2 = new Square();
+ if (shape2 instanceof Square square && square.getLength() > 0) {
+ square.getLength();
+ assertTrue(true);
+ return;
+ }
+ fail();
+ }
+
+ public void testInstanceOfPatternMatchingWithAsNotCondition() {
+ Shape shape1 = new Square();
+ if (!(shape1 instanceof Square square && square.getLength() > 10)) {
+ assertTrue(true);
+ return;
+ }
+ fail();
+ }
+
+ public void testMultipleInstanceOfPatternMatchingWithSameVariableName() {
+ Shape shape1 = new Square();
+ Shape shape2 = new Square();
+ boolean a = false;
+ boolean b = false;
+ if (shape1 instanceof Square square && square.getLength() > 0) {
+ a = true;
+ }
+ if (shape2 instanceof Square square && square.getLength() > 0) {
+ b = true;
+ }
+ assertTrue(a && b);
+ }
+
+ public void testMultipleInstanceOfPatternMatchingWithSameVariableNameWithDifferentTypes() {
+ Shape shape1 = new Square();
+ Shape shape2 = new Circle();
+ boolean a = false;
+ boolean b = false;
+ if (shape1 instanceof Square shp && shp.getLength() > 0) {
+ a = true;
+ }
+ if (shape2 instanceof Circle shp && shp.getDiameter() > 0) {
+ b = true;
+ }
+ assertTrue(a && b);
+ }
+
+ public void testInstanceOfPatternMatchingIsFalse() {
+ Shape shape1 = new Square();
+ if (shape1 instanceof Circle shp) {
+ fail("Should have not reached this point.");
+ }
+ assertTrue(true);
+ }
+
+ public void testInstanceOfPatternMatchingInLambda() {
+ Foo foo = new Foo();
+ assertTrue(foo.isSquare().run());
+ }
+
+ public void testInstanceOfPatternMatchingAsReturn() {
+ Bar bar = new Bar();
+ assertTrue(bar.isSquare());
+ }
+
+ public void testNegativeInstanceOfPatternOutsideIfScope() {
+ Object bar = new Bar();
+ if (!(bar instanceof Bar b)) {
+ throw new RuntimeException();
+ }
+ assertTrue(b.isSquare());
+ }
+
+ public void testSwitchExpressionOnConstant() {
+ int value = switch(0) {
+ default -> 17;
+ };
+ assertEquals(17, value);
+ }
+
+ public void testSwitchWithMultipleCaseValues() {
+ for (int i = 0; i < 5; i++) {
+ boolean reachedDefault = false;
+ boolean isEven = switch(i) {
+ case 0, 2:
+ yield true;
+ case 1, 3, 5:
+ yield false;
+ default:// default is required for switch exprs, and we will hit it for 4
+ reachedDefault = true;
+ yield true;
+ };
+ assertEquals(i == 4, reachedDefault);
+ assertEquals("" + i, i % 2 == 0, isEven);
+ }
+ }
+
+ public void testSwitchInSubExpr() {
+ double value = Math.random();// non-constant value between 0 and 1
+ boolean notCalled = true;
+ if ((int) value % 5 == 3 && switch ((int) value / 5) {
+ case 4:
+ notCalled = false;
+ yield true;
+ default:
+ notCalled = false;
+ yield false;
+ }) {
+ fail("should not be reached");
+ }
+ assertTrue(notCalled);
+
+ double result = (int) value % 7 == 2 ?
+ switch((int)value / 7) {
+ case 1:
+ notCalled = false;
+ yield 1.0;
+ default:
+ notCalled = false;
+ yield 2.0;
+ }
+ : 4.0;
+ assertTrue(notCalled);
+ }
+
+ public void testSwitchExprInlining() {
+ enum HasSwitchMethod {
+ A, RED, SUNDAY, JANUARY, ZERO;
+ public static final int which(HasSwitchMethod whichSwitch) {
+ return switch(whichSwitch) {
+ case A -> 1;
+ case RED -> 2;
+ case SUNDAY, JANUARY -> 4;
+ case ZERO -> 5;
+ };
+ }
+ public static final int pick(HasSwitchMethod whichSwitch) {
+ return 2 * switch(whichSwitch) {
+ case A -> 1;
+ case RED -> 2;
+ case SUNDAY, JANUARY -> 4;
+ case ZERO -> 5;
+ };
+ }
+ public static final String select(HasSwitchMethod whichSwitch) {
+ if (Math.random() > 2) {
+ return "none";
+ }
+ return switch(whichSwitch) {
+ case A -> "1";
+ case RED -> "2";
+ case SUNDAY, JANUARY -> "4";
+ case ZERO -> "5";
+ };
+ }
+ }
+
+ HasSwitchMethod uninlinedValue = Math.random() > 2 ? HasSwitchMethod.A : HasSwitchMethod.RED;
+ assertEquals(2, HasSwitchMethod.which(uninlinedValue));
+ assertEquals(4, HasSwitchMethod.pick(uninlinedValue));
+ assertEquals("hello 2", "hello " + HasSwitchMethod.select(uninlinedValue));
+ }
+
+ private static final String ONE = "1";
+ private static final String TWO = "2";
+ private static final String FOUR = "4";
+
+ public void testInlinedStringConstantsInCase() {
+ int value = switch(Math.random() > 2 ? "2" : "4") {
+ case ONE, TWO -> 2;
+ case FOUR -> 4;
+ default -> 0;
+ };
+ assertEquals(4, value);
+ }
+}
diff --git a/user/test-super/com/google/gwt/dev/jjs/super/com/google/gwt/dev/jjs/test/Java8Test.java b/user/test-super/com/google/gwt/dev/jjs/super/com/google/gwt/dev/jjs/test/Java8Test.java
deleted file mode 100644
index 9f3c4e02899..00000000000
--- a/user/test-super/com/google/gwt/dev/jjs/super/com/google/gwt/dev/jjs/test/Java8Test.java
+++ /dev/null
@@ -1,2044 +0,0 @@
-/*
- * Copyright 2014 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
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package com.google.gwt.dev.jjs.test;
-
-import com.google.gwt.core.client.GwtScriptOnly;
-import com.google.gwt.core.client.JavaScriptObject;
-import com.google.gwt.core.client.JsonUtils;
-import com.google.gwt.dev.jjs.test.defaultmethods.ImplementsWithDefaultMethodAndStaticInitializer;
-import com.google.gwt.dev.jjs.test.defaultmethods.SomeClass;
-import com.google.gwt.junit.client.GWTTestCase;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.function.BiFunction;
-import java.util.function.IntFunction;
-import java.util.function.Predicate;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
-
-import jsinterop.annotations.JsFunction;
-import jsinterop.annotations.JsOverlay;
-import jsinterop.annotations.JsPackage;
-import jsinterop.annotations.JsProperty;
-import jsinterop.annotations.JsType;
-
-/**
- * Tests Java 8 features. It is super sourced so that gwt can be compiles under Java 7.
- *
- * IMPORTANT: For each test here there must exist the corresponding method in the non super sourced
- * version.
- *
- * Eventually this test will graduate and not be super sourced.
- */
-@GwtScriptOnly
-public class Java8Test extends GWTTestCase {
- int local = 42;
-
- static abstract class SameClass {
- public int method1() { return 10; }
- public abstract int method2();
- }
-
- interface Lambda {
- T run(int a, int b);
- }
-
- interface Lambda2 {
- boolean run(String a, String b);
- }
-
- interface Lambda3 {
- boolean run(String a);
- }
-
- class AcceptsLambda {
- public T accept(Lambda foo) {
- return foo.run(10, 20);
- }
- public boolean accept2(Lambda2 foo) {
- return foo.run("a", "b");
- }
- public boolean accept3(Lambda3 foo) {
- return foo.run("hello");
- }
- }
-
- class Pojo {
- private final int x;
- private final int y;
-
- public Pojo(int x, int y) {
- this.x = x;
- this.y = y;
- }
-
- public int fooInstance(int a, int b) {
- return a + b + x + y;
- }
- }
-
- interface DefaultInterface {
- void method1();
- // CHECKSTYLE_OFF
- default int method2() { return 42; }
- default int redeclaredAsAbstract() {
- return 88;
- }
- default Integer addInts(int x, int y) { return x + y; }
- default String print() { return "DefaultInterface"; }
- // CHECKSTYLE_ON
- }
-
- interface DefaultInterface2 {
- void method3();
- // CHECKSTYLE_OFF
- default int method4() { return 23; }
- default int redeclaredAsAbstract() {
- return 77;
- }
- // CHECKSTYLE_ON
- }
-
- interface DefaultInterfaceSubType extends DefaultInterface {
- // CHECKSTYLE_OFF
- default int method2() { return 43; }
- default String print() {
- return "DefaultInterfaceSubType " + DefaultInterface.super.print();
- }
- // CHECKSTYLE_ON
- }
-
- static abstract class DualImplementorSuper implements DefaultInterface {
- public void method1() {
- }
-
- public abstract int redeclaredAsAbstract();
- }
-
- static class DualImplementorBoth extends VirtualUpRef implements DefaultInterface,
- DefaultInterface2 {
- public void method1() {
- }
- public void method3() {
- }
- }
-
- static class DualImplementor extends DualImplementorSuper implements DefaultInterface2 {
- public void method3() {
- }
-
- public int redeclaredAsAbstract() {
- return DefaultInterface2.super.redeclaredAsAbstract();
- }
- }
-
- // this doesn't implement DefaultInterface, but will provide implementation in subclasses
- static class VirtualUpRef {
- public int method2() {
- return 99;
- }
- public int redeclaredAsAbstract() {
- return 44;
- }
- }
-
- class Inner {
- int local = 22;
- public void run() {
- assertEquals(94, new AcceptsLambda().accept((a,b) -> Java8Test.this.local + local + a + b).intValue());
- }
- }
-
- static class Static {
- static int staticField;
- static {
- staticField = 99;
- }
- static Integer staticMethod(int x, int y) { return x + y + staticField; }
- }
-
- static class StaticFailIfClinitRuns {
- static {
- fail("clinit() shouldn't run from just taking a reference to a method");
- }
-
- public static Integer staticMethod(int x, int y) {
- return null;
- }
- }
-
- static class DefaultInterfaceImpl implements DefaultInterface {
- public void method1() {
- }
- }
-
- static class DefaultInterfaceImpl2 implements DefaultInterface {
- public void method1() {
- }
- public int method2() {
- return 100;
- }
- }
-
- static class DefaultInterfaceImplVirtualUpRef extends VirtualUpRef implements DefaultInterface {
- public void method1() {
- }
- }
-
- static class DefaultInterfaceImplVirtualUpRefTwoInterfaces extends VirtualUpRef
- implements DefaultInterfaceSubType {
- public void method1() {
- }
- // CHECKSTYLE_OFF
- public String print() { return "DefaultInterfaceImplVirtualUpRefTwoInterfaces"; }
- // CHECKSTYLE_ON
- }
-
- @Override
- public String getModuleName() {
- return "com.google.gwt.dev.jjs.Java8Test";
- }
-
- public void testLambdaNoCapture() {
- assertEquals(30, new AcceptsLambda().accept((a, b) -> a + b).intValue());
- }
-
- public void testLambdaCaptureLocal() {
- int x = 10;
- assertEquals(40, new AcceptsLambda().accept((a,b) -> x + a + b).intValue());
- }
-
- public void testLambdaCaptureLocalWithInnerClass() {
- int x = 10;
- Lambda l = (a,b) -> new Lambda() {
- @Override public Integer run(int a, int b) {
- int t = x;
- return t + a + b;
- }
- }.run(a,b);
- assertEquals(40, new AcceptsLambda().accept(l).intValue());
- }
-
- public void testLambdaCaptureLocalAndField() {
- int x = 10;
- assertEquals(82, new AcceptsLambda().accept((a,b) -> x + local + a + b).intValue());
- }
-
- public void testLambdaCaptureLocalAndFieldWithInnerClass() {
- int x = 10;
- Lambda l = (a,b) -> new Lambda() {
- @Override public Integer run(int j, int k) {
- int t = x;
- int s = local;
- return t + s + a + b;
- }
- }.run(a,b);
- assertEquals(82, new AcceptsLambda().accept(l).intValue());
- }
-
- public void testCompileLambdaCaptureOuterInnerField() throws Exception {
- new Inner().run();
- }
-
- public void testStaticReferenceBinding() throws Exception {
- assertEquals(129, new AcceptsLambda().accept(Static::staticMethod).intValue());
- // if this next line runs a clinit, it fails
- Lambda l = dummyMethodToMakeCheckStyleHappy(StaticFailIfClinitRuns::staticMethod);
- try {
- // but now it should fail
- l.run(1,2);
- fail("Clinit should have run for the first time");
- } catch (AssertionError ae) {
- // success, it was supposed to throw!
- }
- }
-
- private static Lambda dummyMethodToMakeCheckStyleHappy(Lambda l) {
- return l;
- }
-
- public void testInstanceReferenceBinding() throws Exception {
- Pojo instance1 = new Pojo(1, 2);
- Pojo instance2 = new Pojo(3, 4);
- assertEquals(33, new AcceptsLambda().accept(instance1::fooInstance).intValue());
- assertEquals(37, new AcceptsLambda().accept(instance2::fooInstance).intValue());
- }
-
- public void testImplicitQualifierReferenceBinding() throws Exception {
- assertFalse(new AcceptsLambda().accept2(String::equalsIgnoreCase));
- assertTrue(new AcceptsLambda().accept3("hello world"::contains));
- }
-
- public void testConstructorReferenceBinding() {
- assertEquals(30, new AcceptsLambda().accept(Pojo::new).fooInstance(0, 0));
- }
-
- public void testStaticInterfaceMethod() {
- assertEquals(99, (int) Static.staticMethod(0, 0));
- }
-
- interface ArrayCtor {
- ArrayElem [][][] copy(int i);
- }
-
- interface ArrayCtorBoxed {
- ArrayElem [][][] copy(Integer i);
- }
-
- static class ArrayElem {
- }
-
- public void testArrayConstructorReference() {
- ArrayCtor ctor = ArrayElem[][][]::new;
- ArrayElem[][][] array = ctor.copy(100);
- assertEquals(100, array.length);
- }
-
- public void testArrayConstructorReferenceBoxed() {
- ArrayCtorBoxed ctor = ArrayElem[][][]::new;
- ArrayElem[][][] array = ctor.copy(100);
- assertEquals(100, array.length);
- }
-
- interface ThreeArgs {
- int foo(int x, int y, int z);
- }
-
- interface ThreeVarArgs {
- int foo(int x, int y, int... z);
- }
-
- public static int addMany(int x, int y, int... nums) {
- int sum = x + y;
- for (int num : nums) {
- sum += num;
- }
- return sum;
- }
-
- public void testVarArgsReferenceBinding() {
- ThreeArgs t = Java8Test::addMany;
- assertEquals(6, t.foo(1,2,3));
- }
-
- public void testVarArgsPassthroughReferenceBinding() {
- ThreeVarArgs t = Java8Test::addMany;
- assertEquals(6, t.foo(1,2,3));
- }
-
- public void testVarArgsPassthroughReferenceBindingProvidedArray() {
- ThreeVarArgs t = Java8Test::addMany;
- assertEquals(6, t.foo(1,2, new int[] {3}));
- }
-
- interface I {
- int foo(Integer i);
- }
-
- public void testSuperReferenceExpression() {
- class Y {
- int foo(Integer i) {
- return 42;
- }
- }
-
- class X extends Y {
- int foo(Integer i) {
- return 23;
- }
-
- int goo() {
- I i = super::foo;
- return i.foo(0);
- }
- }
-
- assertEquals(42, new X().goo());
- }
-
- public void testQualifiedSuperReferenceExpression() {
- class Y {
- int foo(Integer i) {
- return 42;
- }
- }
-
- class X extends Y {
- int foo(Integer i) {
- return 23;
- }
-
- int goo() {
- I i = X.super::foo;
- return i.foo(0);
- }
- }
-
- assertEquals(42, new X().goo());
- }
-
- static class X2 {
- protected int field;
- void foo() {
- int local;
- class Y extends X2 {
- class Z extends X2 {
- void f() {
- Ctor c = X2::new;
- X2 x = c.makeX(123456);
- assertEquals(123456, x.field);
- c = Y::new;
- x = c.makeX(987654);
- x = new Y(987654);
- assertEquals(987655, x.field);
- c = Z::new;
- x = c.makeX(456789);
- x = new Z(456789);
- assertEquals(456791, x.field);
- }
- private Z(int z) {
- super(z + 2);
- }
- Z() {
- }
- }
-
- private Y(int y) {
- super(y + 1);
- }
-
- private Y() {
- }
- }
- new Y().new Z().f();
- }
-
- private X2(int x) {
- this.field = x;
- }
- X2() {
- }
- }
-
- public void testSuperReferenceExpressionWithVarArgs() {
- class Base {
- int foo(Object... objects) {
- return 0;
- }
- }
-
- class X extends Base {
- int foo(Object... objects) {
- throw new AssertionError();
- }
-
- void goo() {
- I i = super::foo;
- i.foo(10);
- }
- }
- new X().goo();
- }
-
- interface Ctor {
- X2 makeX(int x);
- }
-
- public void testPrivateConstructorReference() {
- new X2().foo();
- }
-
- public void testDefaultInterfaceMethod() {
- assertEquals(42, new DefaultInterfaceImpl().method2());
- }
-
- public void testDefaultInterfaceMethodVirtualUpRef() {
- assertEquals(99, new DefaultInterfaceImplVirtualUpRef().method2());
- assertEquals(99, new DefaultInterfaceImplVirtualUpRefTwoInterfaces().method2());
- assertEquals("SimpleB", new com.google.gwt.dev.jjs.test.package3.SimpleC().m());
- assertEquals("SimpleASimpleB", new com.google.gwt.dev.jjs.test.package1.SimpleD().m());
- }
-
- public void testDefaultInterfaceMethodMultiple() {
- assertEquals(42, new DualImplementor().method2());
- assertEquals(23, new DualImplementor().method4());
- assertEquals(77, new DualImplementor().redeclaredAsAbstract());
- assertEquals(44, new DualImplementorBoth().redeclaredAsAbstract());
- DefaultInterfaceImplVirtualUpRefTwoInterfaces instanceImplementInterfaceSubType =
- new DefaultInterfaceImplVirtualUpRefTwoInterfaces();
- DefaultInterfaceSubType interfaceSubType1 = instanceImplementInterfaceSubType;
- assertEquals("DefaultInterfaceImplVirtualUpRefTwoInterfaces",
- instanceImplementInterfaceSubType.print());
- assertEquals("DefaultInterfaceImplVirtualUpRefTwoInterfaces", interfaceSubType1.print());
- DefaultInterfaceSubType interfaceSubType2 = new DefaultInterfaceSubType() {
- @Override
- public void method1() { }
- };
- assertEquals("DefaultInterfaceSubType DefaultInterface",
- interfaceSubType2.print());
- DefaultInterfaceSubType interfaceSubType3 = () -> { };
- assertEquals("DefaultInterfaceSubType DefaultInterface",
- interfaceSubType3.print());
- }
-
- public void testDefenderMethodByInterfaceInstance() {
- DefaultInterfaceImpl2 interfaceImpl2 = new DefaultInterfaceImpl2();
- DefaultInterface interface1 = interfaceImpl2;
- assertEquals(100, interfaceImpl2.method2());
- assertEquals(100, interface1.method2());
- }
-
- public void testDefaultMethodReference() {
- DefaultInterfaceImplVirtualUpRef x = new DefaultInterfaceImplVirtualUpRef();
- assertEquals(30, (int) new AcceptsLambda().accept(x::addInts));
- }
-
- interface InterfaceWithTwoDefenderMethods {
- // CHECKSTYLE_OFF
- default String foo() { return "interface.foo"; }
- default String bar() { return this.foo() + " " + foo(); }
- // CHECKSTYLE_ON
- }
-
- class ClassImplementOneDefenderMethod implements InterfaceWithTwoDefenderMethods {
- public String foo() {
- return "class.foo";
- }
- }
-
- public void testThisRefInDefenderMethod() {
- ClassImplementOneDefenderMethod c = new ClassImplementOneDefenderMethod();
- InterfaceWithTwoDefenderMethods i1 = c;
- InterfaceWithTwoDefenderMethods i2 = new InterfaceWithTwoDefenderMethods() { };
- assertEquals("class.foo class.foo", c.bar());
- assertEquals("class.foo class.foo", i1.bar());
- assertEquals("interface.foo interface.foo", i2.bar());
- }
-
- interface InterfaceImplementOneDefenderMethod extends InterfaceWithTwoDefenderMethods {
- // CHECKSTYLE_OFF
- default String foo() { return "interface1.foo"; }
- // CHECKSTYLE_ON
- }
-
- interface InterfaceImplementZeroDefenderMethod extends InterfaceWithTwoDefenderMethods {
- }
-
- class ClassImplementsTwoInterfaces implements InterfaceImplementOneDefenderMethod,
- InterfaceImplementZeroDefenderMethod {
- }
-
- public void testClassImplementsTwoInterfacesWithSameDefenderMethod() {
- ClassImplementsTwoInterfaces c = new ClassImplementsTwoInterfaces();
- assertEquals("interface1.foo", c.foo());
- }
-
- abstract class AbstractClass implements InterfaceWithTwoDefenderMethods {
- }
-
- class Child1 extends AbstractClass {
- public String foo() {
- return super.foo() + " child1.foo";
- }
- }
-
- class Child2 extends AbstractClass {
- }
-
- public void testAbstractClassImplementsInterface() {
- Child1 child1 = new Child1();
- Child2 child2 = new Child2();
- assertEquals("interface.foo child1.foo", child1.foo());
- assertEquals("interface.foo", child2.foo());
- }
-
- interface InterfaceI {
- // CHECKSTYLE_OFF
- default String print() { return "interface1"; }
- // CHECKSTYLE_ON
- }
- interface InterfaceII {
- // CHECKSTYLE_OFF
- default String print() { return "interface2"; }
- // CHECKSTYLE_ON
- }
- class ClassI {
- public String print() {
- return "class1";
- }
- }
- class ClassII extends ClassI implements InterfaceI, InterfaceII {
- public String print() {
- return super.print() + " " + InterfaceI.super.print() + " " + InterfaceII.super.print();
- }
- }
-
- public void testSuperRefInDefenderMethod() {
- ClassII c = new ClassII();
- assertEquals("class1 interface1 interface2", c.print());
- }
-
- interface II {
- // CHECKSTYLE_OFF
- default String fun() { return "fun() in i: " + this.foo(); };
- default String foo() { return "foo() in i.\n"; };
- // CHECKSTYLE_ON
- }
- interface JJ extends II {
- // CHECKSTYLE_OFF
- default String fun() { return "fun() in j: " + this.foo() + II.super.fun(); };
- default String foo() { return "foo() in j.\n"; }
- // CHECKSTYLE_ON
- }
- class AA {
- public String fun() {
- return "fun() in a: " + this.foo();
- }
- public String foo() {
- return "foo() in a.\n";
- }
- }
- class BB extends AA implements JJ {
- public String fun() {
- return "fun() in b: " + this.foo() + super.fun() + JJ.super.fun();
- }
- public String foo() {
- return "foo() in b.\n";
- }
- }
- class CC extends BB implements JJ {
- public String fun() {
- return "fun() in c: " + super.fun();
- }
- }
-
- public void testSuperThisRefsInDefenderMethod() {
- CC c = new CC();
- II i1 = c;
- JJ j1 = c;
- BB b = new BB();
- II i2 = b;
- JJ j2 = b;
- JJ j3 = new JJ() { };
- II i3 = j3;
- II i4 = new II() { };
- String c_fun = "fun() in c: fun() in b: foo() in b.\n"
- + "fun() in a: foo() in b.\n"
- + "fun() in j: foo() in b.\n"
- + "fun() in i: foo() in b.\n";
- String b_fun = "fun() in b: foo() in b.\n"
- + "fun() in a: foo() in b.\n"
- + "fun() in j: foo() in b.\n"
- + "fun() in i: foo() in b.\n";
- String j_fun = "fun() in j: foo() in j.\n"
- + "fun() in i: foo() in j.\n";
- String i_fun = "fun() in i: foo() in i.\n";
- assertEquals(c_fun, c.fun());
- assertEquals(c_fun, i1.fun());
- assertEquals(c_fun, j1.fun());
- assertEquals(b_fun, b.fun());
- assertEquals(b_fun, i2.fun());
- assertEquals(b_fun, j2.fun());
- assertEquals(j_fun, j3.fun());
- assertEquals(j_fun, i3.fun());
- assertEquals(i_fun, i4.fun());
- }
-
- interface OuterInterface {
- // CHECKSTYLE_OFF
- default String m() {
- return "I.m;" + new InnerClass().n();
- }
- default String n() {
- return "I.n;" + this.m();
- }
- // CHECKSTYLE_ON
- class InnerClass {
- public String n() {
- return "A.n;" + m();
- }
- public String m() {
- return "A.m;";
- }
- }
- }
- class OuterClass {
- public String m() {
- return "B.m;";
- }
- public String n1() {
- OuterInterface i = new OuterInterface() { };
- return "B.n1;" + i.n() + OuterClass.this.m();
- }
- public String n2() {
- OuterInterface i = new OuterInterface() {
- @Override
- public String n() {
- return this.m() + OuterClass.this.m();
- }
- };
- return "B.n2;" + i.n() + OuterClass.this.m();
- }
- }
- public void testNestedInterfaceClass() {
- OuterClass outerClass = new OuterClass();
- assertEquals("B.n1;I.n;I.m;A.n;A.m;B.m;", outerClass.n1());
- assertEquals("B.n2;I.m;A.n;A.m;B.m;B.m;", outerClass.n2());
- }
-
- class EmptyA { }
- interface EmptyI { }
- interface EmptyJ { }
- class EmptyB extends EmptyA implements EmptyI { }
- class EmptyC extends EmptyA implements EmptyI, EmptyJ { }
- public void testBaseIntersectionCast() {
- EmptyA localB = new EmptyB();
- EmptyA localC = new EmptyC();
- EmptyB b2BI = (EmptyB & EmptyI) localB;
- EmptyC c2CIJ = (EmptyC & EmptyI & EmptyJ) localC;
- EmptyI ii1 = (EmptyB & EmptyI) localB;
- EmptyI ii2 = (EmptyC & EmptyI) localC;
- EmptyI ii3 = (EmptyC & EmptyJ) localC;
- EmptyI ii4 = (EmptyC & EmptyI & EmptyJ) localC;
- EmptyJ jj1 = (EmptyC & EmptyI & EmptyJ) localC;
- EmptyJ jj2 = (EmptyC & EmptyI) localC;
- EmptyJ jj3 = (EmptyC & EmptyJ) localC;
- EmptyJ jj4 = (EmptyI & EmptyJ) localC;
-
- try {
- EmptyC b2CIJ = (EmptyC & EmptyI & EmptyJ) localB;
- fail("Should have thrown a ClassCastException");
- } catch (ClassCastException e) {
- // Expected.
- }
- try {
- EmptyB c2BI = (EmptyB & EmptyI) localC;
- fail("Should have thrown a ClassCastException");
- } catch (ClassCastException e) {
- // Expected.
- }
- try {
- EmptyJ jj = (EmptyB & EmptyJ) localB;
- fail("Should have thrown a ClassCastException");
- } catch (ClassCastException e) {
- // Expected.
- }
- }
-
- interface SimpleI {
- int fun();
- }
- interface SimpleK {
- }
- public void testIntersectionCastWithLambdaExpr() {
- SimpleI simpleI1 = (SimpleI & EmptyI) () -> 11;
- assertEquals(11, simpleI1.fun());
- SimpleI simpleI2 = (EmptyI & SimpleI) () -> 22;
- assertEquals(22, simpleI2.fun());
- EmptyI emptyI = (EmptyI & SimpleI) () -> 33;
- assertEquals(55, ((SimpleI & SimpleK) () -> 55).fun());
- }
-
- class SimpleA {
- public int bar() {
- return 11;
- }
- }
-
- class SimpleB extends SimpleA implements SimpleI {
- public int fun() {
- return 22;
- }
- }
-
- class SimpleC extends SimpleA implements SimpleI {
- public int fun() {
- return 33;
- }
-
- public int bar() {
- return 44;
- }
- }
-
- public void testIntersectionCastPolymorphism() {
- SimpleA bb = new SimpleB();
- assertEquals(22, ((SimpleB & SimpleI) bb).fun());
- assertEquals(11, ((SimpleB & SimpleI) bb).bar());
- SimpleA cc = new SimpleC();
- assertEquals(33, ((SimpleC & SimpleI) cc).fun());
- assertEquals(44, ((SimpleC & SimpleI) cc).bar());
- assertEquals(33, ((SimpleA & SimpleI) cc).fun());
- SimpleI ii = (SimpleC & SimpleI) cc;
- assertEquals(33, ii.fun());
- }
-
- interface ClickHandler {
- int onClick(int a);
- }
- private int addClickHandler(ClickHandler clickHandler) {
- return clickHandler.onClick(1);
- }
- private int addClickHandler(int a) {
- return addClickHandler(x -> { int temp = a; return temp; });
- }
- public void testLambdaCaptureParameter() {
- assertEquals(2, addClickHandler(2));
- }
-
- interface TestLambda_Inner {
- void f();
- }
- interface TestLambda_Outer {
- void accept(TestLambda_Inner t);
- }
- public void testLambda_call(TestLambda_Outer a) {
- a.accept(() -> { });
- }
- public void testLambdaNestingCaptureLocal() {
- int[] success = new int[] {0};
- testLambda_call(sam1 -> { testLambda_call(sam2 -> { success[0] = 10; }); });
- assertEquals(10, success[0]);
- }
-
- public void testLambdaNestingInAnonymousCaptureLocal() {
- int[] x = new int[] {42};
- new Runnable() {
- public void run() {
- Lambda l = (a, b) -> x[0] = x[0] + a + b;
- l.run(1, 2);
- }
- }.run();
- assertEquals(45, x[0]);
- }
-
- public void testLambdaNestingInMultipleMixedAnonymousCaptureLocal() {
- // checks that lambda has access to local variable and arguments when placed in mixed scopes
- // Local Class -> Local Class -> Local Anonymous -> lambda -> Local Anonymous
- class A {
- int a() {
- int[] x = new int[] {42};
- class B {
- void b() {
- I i = new I() {
- public int foo(Integer arg) {
- Runnable r = () -> {
- new Runnable() {
- public void run() {
- Lambda l = (a, b) -> x[0] = x[0] + a + b + arg;
- l.run(1, 2);
- }
- }.run();
- };
- r.run();
- return x[0];
- }
- };
- i.foo(1);
- }
- }
- B b = new B();
- b.b();
- return x[0];
- }
- }
- A a = new A();
- assertEquals(46, a.a());
- }
-
- public void testLambdaNestingInMultipleMixedAnonymousCaptureLocal_withInterference() {
- // checks that lambda has access to NEAREST local variable and arguments when placed in mixed
- // scopes Local Class -> Local Class -> Local Anonymous -> lambda -> Local Anonymous
- class A {
- int a() {
- int[] x = new int[] {42};
- class B {
- int b() {
- int[] x = new int[] {22};
- I i = new I() {
- public int foo(Integer arg) {
- Runnable r = () -> {
- new Runnable() {
- public void run() {
- Lambda l = (a, b) -> x[0] = x[0] + a + b + arg;
- l.run(1, 2);
- }
- }.run();
- };
- r.run();
- return x[0];
- }
- };
- return i.foo(1);
- }
- }
- B b = new B();
- return b.b();
- }
- }
- A a = new A();
- assertEquals(26, a.a());
- }
-
- public void testLambdaNestingInMultipleMixedAnonymousCaptureLocalAndField() {
- // checks that lambda has access to local variable, field and arguments when placed in mixed
- // scopes - Local Class -> Local Class -> Local Anonymous -> lambda -> Local Anonymous
- class A {
- int fA = 1;
-
- int a() {
- int[] x = new int[] {42};
- class B {
- int fB = 2;
-
- int b() {
- I i = new I() {
- int fI = 3;
-
- public int foo(Integer arg) {
- Runnable r = () -> {
- new Runnable() {
- public void run() {
- Lambda l = (a, b) -> x[0] = x[0] + a + b + arg + fA + fB + fI;
- l.run(1, 2);
- }
- }.run();
- };
- r.run();
- return x[0];
- }
- };
- return i.foo(1);
- }
- }
- B b = new B();
- return b.b();
- }
- }
- A a = new A();
- assertEquals(52, a.a());
- }
-
- public void testLambdaNestingInMultipleAnonymousCaptureLocal() {
- // checks that lambda has access to local variable and arguments when placed in local anonymous
- // class with multile nesting
- int[] x = new int[] {42};
- int result = new I() {
- public int foo(Integer i1) {
- return new I() {
- public int foo(Integer i2) {
- return new I() {
- public int foo(Integer i3) {
- Lambda l = (a, b) -> x[0] = x[0] + a + b + i1 + i2 + i3;
- return l.run(1, 2);
- }
- }.foo(3);
- }
- }.foo(2);
- }
- }.foo(1);
- assertEquals(51, x[0]);
- }
-
- static class TestLambda_ClassA {
- int[] f = new int[] {42};
-
- class B {
- void m() {
- Runnable r = () -> f[0] = f[0] + 1;
- r.run();
- }
- }
-
- int a() {
- B b = new B();
- b.m();
- return f[0];
- }
- }
-
- public void testLambdaNestingCaptureField_InnerClassCapturingOuterClassVariable() {
- TestLambda_ClassA a = new TestLambda_ClassA();
- assertEquals(43, a.a());
- }
-
- public void testInnerClassCaptureLocalFromOuterLambda() {
- int[] x = new int[] {42};
- Lambda l = (a, b) -> {
- int[] x1 = new int[] {32};
- Lambda r = (rA, rB) -> {
- int[] x2 = new int[] {22};
- I i = new I() {
- public int foo(Integer arg) {
- x1[0] = x1[0] + 1;
- x[0] = x[0] + 1;
- return x2[0] = x2[0] + rA + rB + a + b;
- }
- };
- return i.foo(1);
- };
- return r.run(3, 4) + x1[0];
- };
-
- // x1[0](32) + 1 + x2[0](22) + rA(3) + rB(4) + a(1) + b(2)
- assertEquals(65, l.run(1, 2).intValue());
- assertEquals(43, x[0]);
- }
-
- static class TestLambda_Class {
- public int[] s = new int[] {0};
- public void call(TestLambda_Outer a) {
- a.accept(() -> { });
- }
- class TestLambda_InnerClass {
- public int[] s = new int[] {0};
- public int test() {
- int[] s = new int[] {0};
- TestLambda_Class.this.call(
- sam0 -> TestLambda_Class.this.call(
- sam1 -> {
- TestLambda_Class.this.call(
- sam2 -> {
- TestLambda_Class.this.s[0] = 10;
- this.s[0] = 20;
- s[0] = 30;
- });
- }));
- return s[0];
- }
- }
- }
-
- public void testLambdaNestingCaptureField() {
- TestLambda_Class a = new TestLambda_Class();
- a.call(sam1 -> { a.call(sam2 -> { a.s[0] = 20; }); });
- assertEquals(20, a.s[0]);
- }
-
- public void testLambdaMultipleNestingCaptureFieldAndLocal() {
- TestLambda_Class a = new TestLambda_Class();
- TestLambda_Class b = new TestLambda_Class();
- int [] s = new int [] {0};
- b.call(sam0 -> a.call(sam1 -> { a.call(sam2 -> { a.s[0] = 20; b.s[0] = 30; s[0] = 40; }); }));
- assertEquals(20, a.s[0]);
- assertEquals(30, b.s[0]);
- assertEquals(40, s[0]);
- }
-
- public void testLambdaMultipleNestingCaptureFieldAndLocalInnerClass() {
- TestLambda_Class a = new TestLambda_Class();
- TestLambda_Class.TestLambda_InnerClass b = a.new TestLambda_InnerClass();
- int result = b.test();
- assertEquals(10, a.s[0]);
- assertEquals(20, b.s[0]);
- assertEquals(30, result);
- }
-
- static class TestMF_A {
- public static String getId() {
- return "A";
- }
- public int getIdx() {
- return 1;
- }
- }
- static class TestMF_B {
- public static String getId() {
- return "B";
- }
- public int getIdx() {
- return 2;
- }
- }
- interface Function {
- T apply();
- }
- private String f(Function arg) {
- return arg.apply();
- }
- private int g(Function arg) {
- return arg.apply().intValue();
- }
-
- public void testMethodRefWithSameName() {
- assertEquals("A", f(TestMF_A::getId));
- assertEquals("B", f(TestMF_B::getId));
- TestMF_A a = new TestMF_A();
- TestMF_B b = new TestMF_B();
- assertEquals(1, g(a::getIdx));
- assertEquals(2, g(b::getIdx));
- }
-
- // Test particular scenarios involving multiple path to inherit defaults.
- interface ITop {
- default String m() {
- return "ITop.m()";
- }
- }
-
- interface IRight extends ITop {
- default String m() {
- return "IRight.m()";
- }
- }
-
- interface ILeft extends ITop { }
-
- public void testMultipleDefaults_fromInterfaces_left() {
- class A implements ILeft, IRight { }
-
- assertEquals("IRight.m()", new A().m());
- }
-
- public void testMultipleDefaults_fromInterfaces_right() {
- class A implements IRight, ILeft { }
-
- assertEquals("IRight.m()", new A().m());
- }
-
- public void testMultipleDefaults_superclass_left() {
- class A implements ITop { }
- class B extends A implements ILeft, IRight { }
-
- assertEquals("IRight.m()", new B().m());
- }
-
- public void testMultipleDefaults_superclass_right() {
- class A implements ITop { }
- class B extends A implements IRight, ILeft { }
-
- assertEquals("IRight.m()", new B().m());
- }
-
- static class DefaultTrumpsOverSyntheticAbstractStub {
- interface SuperInterface {
- String m();
- }
-
- interface SubInterface extends SuperInterface {
- default String m() {
- return "SubInterface.m()";
- }
- }
- }
-
- public void testMultipleDefaults_defaultShadowsOverSyntheticAbstractStub() {
- abstract class A implements DefaultTrumpsOverSyntheticAbstractStub.SuperInterface { }
- class B extends A implements DefaultTrumpsOverSyntheticAbstractStub.SubInterface { }
-
- assertEquals("SubInterface.m()", new B().m());
- }
-
- static class DefaultTrumpsOverDefaultOnSuperAbstract {
- interface SuperInterface {
- default String m() {
- return "SuperInterface.m()";
- }
- }
-
- interface SubInterface extends SuperInterface {
- default String m() {
- return "SubInterface.m()";
- }
- }
- }
-
- public void testMultipleDefaults_defaultShadowsOverDefaultOnSuperAbstract() {
- abstract class A implements DefaultTrumpsOverDefaultOnSuperAbstract.SuperInterface { }
- class B extends A implements DefaultTrumpsOverDefaultOnSuperAbstract.SubInterface { }
-
- assertEquals("SubInterface.m()", new B().m());
- }
-
- interface InterfaceWithThisReference {
- default String n() {
- return "default n";
- }
- default String callNUnqualified() {
- class Super implements InterfaceWithThisReference {
- public String n() {
- return "super n";
- }
- }
- return new Super() {
- public String callNUnqualified() {
- return "Object " + n();
- }
- }.callNUnqualified();
- }
- default String callNWithThis() {
- class Super implements InterfaceWithThisReference {
- public String n() {
- return "super n";
- }
- }
- return new Super() {
- public String callNWithThis() {
- return "Object " + this.n();
- }
- }.callNWithThis();
- }
- default String callNWithInterfaceThis() {
- class Super implements InterfaceWithThisReference {
- public String n() {
- return "super n";
- }
- }
- return new Super() {
- public String callNWithInterfaceThis() {
- // In this method this has interface Test as its type, but it refers to outer n();
- return "Object " + InterfaceWithThisReference.this.n();
- }
- }.callNWithInterfaceThis();
- }
- default String callNWithSuper() {
- class Super implements InterfaceWithThisReference {
- public String n() {
- return "super n";
- }
- }
- return new Super() {
- public String callNWithSuper() {
- // In this method this has interface Test as its type.
- return "Object " + super.n();
- }
- }.callNWithSuper();
- }
- default String callNWithInterfaceSuper() {
- return new InterfaceWithThisReference() {
- public String n() {
- return "this n";
- }
- public String callNWithInterfaceSuper() {
- // In this method this has interface Test as its type and refers to default n();
- return "Object " + InterfaceWithThisReference.super.n();
- }
- }.callNWithInterfaceSuper();
- }
- }
-
- public void testInterfaceThis() {
- class A implements InterfaceWithThisReference {
- public String n() {
- return "n";
- }
- }
- assertEquals("Object super n", new A().callNUnqualified());
- assertEquals("Object super n", new A().callNWithThis());
- assertEquals("Object n", new A().callNWithInterfaceThis());
- assertEquals("Object super n", new A().callNWithSuper());
- assertEquals("Object default n", new A().callNWithInterfaceSuper());
- }
-
- private static List initializationOrder;
-
- private static int get(String s) {
- initializationOrder.add(s);
- return 1;
- }
-
- interface A1 {
- int fa1 = get("A1");
-
- default void a1() { }
- }
-
- interface A2 {
- int fa2 = get("A2");
-
- default void a2() { }
- }
-
- interface A3 {
- int fa3 = get("A3");
-
- default void a3() { }
- }
-
- interface B1 extends A1 {
- int fb1 = get("B1");
-
- default void b1() { }
- }
-
- interface B2 extends A2 {
- int fb2 = get("B2");
-
- default void b2() { }
- }
-
- interface B3 extends A3 {
- int fb3 = get("B3");
- }
-
- static class C implements B1, A2 {
- static {
- get("C");
- }
- }
-
- static class D extends C implements B2, B3 {
- static {
- get("D");
- }
- }
-
- public void testInterfaceWithDefaultMethodsInitialization() {
- initializationOrder = new ArrayList();
- new D();
- assertContentsInOrder(initializationOrder, "A1", "B1", "A2", "C", "B2", "A3", "D");
- }
-
- /**
- * Regression test for issue 9214.
- */
- interface P {
- boolean apply(T obj);
- }
-
- static class B {
- public boolean getTrue() {
- return true;
- }
- }
- private static String getClassName(T obj) {
- return obj.getClass().getSimpleName();
- }
-
- public void testMethodReference_generics() {
- P p = B::getTrue;
- assertTrue(p.apply(new B()));
- // The next two method references must result in two different lambda implementations due
- // to generics, see bug # 9333.
- MyFunction1 f1 = Java8Test::getClassName;
- MyFunction1 f2 = Java8Test::getClassName;
-
- assertEquals(B.class.getSimpleName(), f1.apply(new B()));
- assertEquals(Double.class.getSimpleName(), f2.apply(new Double(2)));
- }
-
- public void testDefaultMethod_staticInitializer() {
- SomeClass.initializationOrder = new ArrayList();
- Object object = ImplementsWithDefaultMethodAndStaticInitializer.someClass;
- assertContentsInOrder(SomeClass.initializationOrder, "1", "2", "3", "4");
- }
-
- private void assertContentsInOrder(Iterable contents, String... elements) {
- assertEquals(Arrays.asList(elements).toString(), contents.toString());
- }
-
- @JsType(isNative = true)
- interface NativeJsTypeInterfaceWithStaticInitializationAndFieldAccess {
- @JsOverlay
- Object object = new Integer(3);
- }
-
- @JsType(isNative = true)
- interface NativeJsTypeInterfaceWithStaticInitializationAndStaticOverlayMethod {
- @JsOverlay
- Object object = new Integer(4);
-
- @JsOverlay
- static Object getObject() {
- return object;
- }
- }
-
- @JsType(isNative = true)
- interface NativeJsTypeInterfaceWithStaticInitializationAndInstanceOverlayMethod {
- @JsOverlay
- Object object = new Integer(5);
-
- int getA();
-
- @JsOverlay
- default Object getObject() {
- return ((int) object) + this.getA();
- }
- }
-
- private native NativeJsTypeInterfaceWithStaticInitializationAndInstanceOverlayMethod
- createNativeJsTypeInterfaceWithStaticInitializationAndInstanceOverlayMethod() /*-{
- return { getA: function() { return 1; } };
- }-*/;
-
- @JsType(isNative = true)
- interface NativeJsTypeInterfaceWithStaticInitialization {
- @JsOverlay
- Object object = new Integer(6);
- }
-
- @JsType(isNative = true)
- interface NativeJsTypeInterfaceWithComplexStaticInitialization {
- @JsOverlay
- Object object = (Integer) (((int) NativeJsTypeInterfaceWithStaticInitialization.object) + 1);
- }
-
- static class JavaTypeImplementingNativeJsTypeInterceWithDefaultMethod implements
- NativeJsTypeInterfaceWithStaticInitializationAndInstanceOverlayMethod {
- public int getA() {
- return 4;
- }
- }
-
- public void testNativeJsTypeWithStaticInitializer() {
- assertEquals(3, NativeJsTypeInterfaceWithStaticInitializationAndFieldAccess.object);
- assertEquals(
- 4, NativeJsTypeInterfaceWithStaticInitializationAndStaticOverlayMethod.getObject());
- assertEquals(6,
- createNativeJsTypeInterfaceWithStaticInitializationAndInstanceOverlayMethod()
- .getObject());
- assertEquals(7, NativeJsTypeInterfaceWithComplexStaticInitialization.object);
- assertEquals(9, new JavaTypeImplementingNativeJsTypeInterceWithDefaultMethod().getObject());
- }
-
- @JsFunction
- interface VarargsFunction {
- String f(int i, String... args);
- }
-
- private static native String callFromJSNI(VarargsFunction f) /*-{
- return f(2, "a", "b", "c");
- }-*/;
-
- public void testJsVarargsLambda() {
- VarargsFunction function = (i, args) -> args[i];
- assertSame("b", function.f(1, "a", "b", "c"));
- assertSame("c", callFromJSNI(function));
- String[] pars = new String[] {"a", "b", "c"};
- assertSame("a", function.f(0, pars));
- }
-
- private static T m(T s) {
- return s;
- }
-
- static class Some {
- T s;
- MyFunction2 combine;
- Some(T s, MyFunction2 combine) {
- this.s = s;
- this.combine = combine;
- }
- public T m(T s2) {
- return combine.apply(s, s2);
- }
- public T m1() {
- return s;
- }
- }
-
- @FunctionalInterface
- interface MyFunction1 {
- U apply(T t);
- }
-
- @FunctionalInterface
- interface MyFunction2 {
- V apply(T t, U u);
- }
-
- @FunctionalInterface
- interface MyFunction3 {
- W apply(T t, U u, V v);
- }
-
- @FunctionalInterface
- interface IntFunction1 {
- U apply(int t);
- }
-
- @FunctionalInterface
- interface IntFunction2 {
- V apply(int t, int u);
- }
-
- @FunctionalInterface
- interface IntFunction3 {
- W apply(int t, int u, int v);
- }
-
- public void testMethodReference_implementedInSuperclass() {
- MyFunction1 toString = StringBuilder::toString;
- assertEquals("Hello", toString.apply(new StringBuilder("Hello")));
- }
-
- static MyFunction2 concat = (s,t) -> s + t;
-
- public void testMethodReference_genericTypeParameters() {
- testMethodReference_genericTypeParameters(
- new Some("Hell", concat), "Hell", "o", concat);
- }
-
- static String concat(String... strs) {
- String result = "";
- for (String s : strs) {
- result += s;
- }
- return result;
- }
-
- static String anotherConcat(String s1, String s2, String... strs) {
- String result = s1 + s2;
- for (String s : strs) {
- result += s;
- }
- return result;
- }
-
- public String instanceConcat(String... strs) {
- String result = "";
- for (String s : strs) {
- result += s;
- }
- return result;
- }
-
- public String anotherInstanceConcat(String s1, String... strs) {
- String result = s1;
- for (String s : strs) {
- result += s;
- }
- return result;
- }
-
- private static class ClassWithVarArgsConstructor {
- private class Inner {
- private int sum;
- Inner(int i, Integer... nums) {
- this.sum = ClassWithVarArgsConstructor.this.sum + i;
- for (Integer n: nums) {
- sum += n;
- }
- }
- }
-
- private int sum;
- ClassWithVarArgsConstructor(int i, Integer... nums) {
- sum = i;
- for (Integer n: nums) {
- sum += n;
- }
- }
-
- private MyFunction1 createInner1Param() {
- return (MyFunction1) Inner::new;
- }
-
- private MyFunction2 createInner2Param() {
- return (MyFunction2) Inner::new;
- }
-
- private MyFunction3 createInner3Param() {
- return (MyFunction3) Inner::new;
- }
-
- private MyFunction2 createInner2ParamArray() {
- return (MyFunction2) Inner::new;
- }
-
- private IntFunction1 createInner1IntParam() {
- return (IntFunction1) Inner::new;
- }
-
- private IntFunction2 createInner2IntParam() {
- return (IntFunction2) Inner::new;
- }
-
- private IntFunction3 createInner3IntParam() {
- return (IntFunction3) Inner::new;
- }
- }
-
- public void testMethodReference_varargs() {
- // More functional arguments than varargs
- MyFunction2 concat = Java8Test::concat;
- assertEquals("ab", concat.apply("a", "b"));
-
- // Less functional arguments than varargs
- MyFunction2 anotherConcat = Java8Test::anotherConcat;
- assertEquals("ab", anotherConcat.apply("a", "b"));
-
- MyFunction2 instanceConcat = Java8Test::instanceConcat;
- assertEquals("a", instanceConcat.apply(this, "a"));
-
- MyFunction2 anotherInstanceConcat = Java8Test::anotherInstanceConcat;
- assertEquals("a", anotherInstanceConcat.apply(this, "a"));
-
- // constructor varargs
- MyFunction1 constructor1Param =
- ClassWithVarArgsConstructor::new;
- assertEquals(1, constructor1Param.apply(1).sum);
-
- MyFunction2 constructor2Param =
- ClassWithVarArgsConstructor::new;
- assertEquals(3, constructor2Param.apply(1, 2).sum);
-
- MyFunction3 constructor3Param =
- ClassWithVarArgsConstructor::new;
- assertEquals(6, constructor3Param.apply(1, 2, 3).sum);
-
- MyFunction2 constructor2ParamArray =
- ClassWithVarArgsConstructor::new;
- assertEquals(6, constructor2ParamArray.apply(1, new Integer[] {2, 3}).sum);
-
- // constructor varargs + autoboxing
- IntFunction1 constructor1IntParam =
- ClassWithVarArgsConstructor::new;
- assertEquals(1, constructor1IntParam.apply(1).sum);
-
- IntFunction2 constructor2IntParam =
- ClassWithVarArgsConstructor::new;
- assertEquals(3, constructor2IntParam.apply(1, 2).sum);
-
- IntFunction3 constructor3IntParam =
- ClassWithVarArgsConstructor::new;
- assertEquals(6, constructor3IntParam.apply(1, 2, 3).sum);
-
- ClassWithVarArgsConstructor outer = new ClassWithVarArgsConstructor(1);
-
- // inner class constructor varargs
- assertEquals(2, outer.createInner1Param().apply(1).sum);
- assertEquals(4, outer.createInner2Param().apply(1, 2).sum);
- assertEquals(7, outer.createInner3Param().apply(1, 2, 3).sum);
- assertEquals(7, outer.createInner2ParamArray().apply(1, new Integer[] {2, 3}).sum);
-
- // inner class constructor varargs + autoboxing
- assertEquals(2, outer.createInner1IntParam().apply(1).sum);
- assertEquals(4, outer.createInner2IntParam().apply(1, 2).sum);
- assertEquals(7, outer.createInner3IntParam().apply(1, 2, 3).sum);
- }
-
- private static void testMethodReference_genericTypeParameters(
- Some some, T t1, T t2, MyFunction2 combine) {
- T t1t2 = combine.apply(t1, t2);
-
- // Test all 4 flavours of methodReference
- // 1. Static method
- assertEquals(t1t2, ((MyFunction1) Java8Test::m).apply(t1t2));
- // 2. Qualified instance method
- assertEquals(t1t2, ((MyFunction1) some::m).apply(t2));
- // 3. Unqualified instance method
- assertEquals(t1, ((MyFunction1, T>) Some::m1).apply(some));
- assertEquals("Hello",
- ((MyFunction1, String>)
- Some::m1).apply(new Some<>("Hello", concat)));
- // 4. Constructor reference.
- assertEquals(t1t2,
- ((MyFunction2, Some>) Some::new).apply(t1t2, combine).m1());
- }
-
- static MyFunction2 addInteger = (s,t) -> s + t;
-
- @FunctionalInterface
- interface MyIntFunction1 {
- int apply(int t);
- }
-
- @FunctionalInterface
- interface MyIntFunction2 {
- int apply(int t, int u);
- }
-
- @FunctionalInterface
- interface MyIntFuncToSomeIntegeFunction2 {
- SomeInteger apply(int t, MyFunction2 u);
- }
-
- @FunctionalInterface
- interface MySomeIntegerFunction1 {
- int apply(SomeInteger t);
- }
-
- @FunctionalInterface
- interface MySomeIntegerIntFunction2 {
- int apply(SomeInteger t, int u);
- }
-
- static MyIntFunction2 addint = (s,t) -> s + t;
-
- static class SomeInteger {
- int s;
- MyFunction2 combine;
- SomeInteger(int s, MyFunction2 combine) {
- this.s = s;
- this.combine = combine;
- }
- public int m(int s2) {
- return combine.apply(s, s2);
- }
- public int m1() {
- return s;
- }
- }
-
- public void testMethodReference_autoboxing() {
- SomeInteger some = new SomeInteger(3, addInteger);
-
- // Test all 4 flavours of methodReference autoboxing parameters.
- // 1. Static method
- assertEquals((Integer) 5, ((MyFunction1) Java8Test::m).apply(5));
- // 2. Qualified instance method
- assertEquals((Integer) 5, ((MyFunction1) some::m).apply(2));
- // 3. Unqualified instance method
- assertEquals((Integer) 3, ((MyFunction1) SomeInteger::m1).apply(some));
- assertEquals((Integer) 5, ((MyFunction2)
- SomeInteger::m).apply(some, 2));
- assertEquals((Integer) 5,
- ((MyFunction1)
- SomeInteger::m1).apply(new SomeInteger(5, addInteger)));
- // 4. Constructor reference.
- assertEquals(5,
- ((MyFunction2, SomeInteger>)
- SomeInteger::new).apply(5, addInteger).m1());
-
- // Test all 4 flavours of methodReference (interface unboxed)
- // 1. Static method
- assertEquals(5, ((MyIntFunction1) Java8Test::m).apply(5));
- // 2. Qualified instance method
- assertEquals(5, ((MyIntFunction1) some::m).apply(2));
- // 3. Unqualified instance method
- assertEquals(3, ((MySomeIntegerFunction1) SomeInteger::m1).apply(some));
- // The next expression was the one that triggered bug #9346 where decisions on whether to
- // box/unbox were decided incorrectly due to differring number of parameters in the method
- // reference and the functional interface method.
- assertEquals(5, ((MySomeIntegerIntFunction2) SomeInteger::m).apply(some, 2));
- assertEquals(5,
- ((MySomeIntegerFunction1)
- SomeInteger::m1).apply(new SomeInteger(5, addInteger)));
- // 4. Constructor reference.
- assertEquals(5,
- ((MyIntFuncToSomeIntegeFunction2) SomeInteger::new).apply(5, addInteger).m1());
- }
-
- @JsType(isNative = true)
- private static class NativeClassWithJsOverlay {
- @JsOverlay
- public static String m(String s) {
- MyFunction1 id = (a) -> a;
- return id.apply(s);
- }
- }
- public void testNativeJsOverlay_lambda() {
- assertSame("Hello", NativeClassWithJsOverlay.m("Hello"));
- }
-
- interface IntefaceWithDefaultMethodAndLambda {
- boolean f();
-
- default BooleanPredicate fAsPredicate() {
- // This lambda will be defined as an instance method in the enclosing class, which is an
- // interface. In this case the methdod will be devirtualized.
- return () -> this.f();
- }
- }
-
- interface BooleanPredicate {
- boolean apply();
- }
-
- public void testLambdaCapturingThis_onDefaultMethod() {
- assertTrue(
- new IntefaceWithDefaultMethodAndLambda() {
- @Override
- public boolean f() {
- return true;
- }
- }.fAsPredicate().apply());
- }
-
- @JsFunction
- interface MyJsFunctionInterface {
- int foo(int a);
- }
-
- public void testJsFunction_lambda() {
- MyJsFunctionInterface jsFunctionInterface = a -> a + 2;
- assertEquals(12, callAsFunction(jsFunctionInterface, 10));
- assertEquals(12, jsFunctionInterface.foo(10));
- }
-
- private static native int callAsFunction(Object fn, int arg) /*-{
- return fn(arg);
- }-*/;
-
- @JsFunction
- interface MyJsFunctionInterfaceWithOverlay {
- Double m();
- @JsOverlay
- default Double callM() {
- return this.m();
- }
- }
-
- private static native MyJsFunctionInterfaceWithOverlay createNative() /*-{
- return function () { return 5; };
- }-*/;
-
- public void testJsFunction_withOverlay() {
- MyJsFunctionInterfaceWithOverlay f = new MyJsFunctionInterfaceWithOverlay() {
- @Override
- public Double m() {
- return new Double(2.0);
- }
- };
- assertEquals(2, f.callM().intValue());
- assertEquals(5, createNative().callM().intValue());
- }
-
- interface FunctionalExpressionBridges_I {
- T apply(T t);
- // TODO(rluble): uncomment the line below to when bridges for default methods are created
- // in functional expressions
- FunctionalExpressionBridges_I m(T t);
- }
-
- @FunctionalInterface
- interface FunctionalExpressionBridges_J
- extends FunctionalExpressionBridges_I {
- T apply(T t);
-
- // Overrides I.m() and specializes return type
- default FunctionalExpressionBridges_J m(T t) {
- return this;
- }
- }
-
- public static String identity(String s) {
- return s;
- }
-
- public void testFunctionalExpressionBridges() {
- FunctionalExpressionBridges_J ann = new FunctionalExpressionBridges_J() {
- @Override
- public String apply(String string) {
- return string;
- }
- };
-
- assertBrigdeDispatchIsCorrect(ann);
- assertBrigdeDispatchIsCorrect((String s) -> s + "");
- assertBrigdeDispatchIsCorrect(Java8Test::identity);
- }
-
- private void assertBrigdeDispatchIsCorrect(
- FunctionalExpressionBridges_J functionalExpression) {
- assertEquals("Hello", functionalExpression.m(null).apply("Hello"));
- assertEquals("Hello", functionalExpression.apply("Hello"));
- assertEquals("Hello",
- ((FunctionalExpressionBridges_I) functionalExpression).apply("Hello"));
- }
-
- static class ClassWithAVeryLoooooooooooooooooooooooooooooooooooongName {
- public static String m() {
- return null;
- }
- }
-
- // Regression test for bug: #9426.
- public void testCorrectNaming() {
- Function f = ClassWithAVeryLoooooooooooooooooooooooooooooooooooongName::m;
- assertNotNull(f);
- }
-
- @JsType(isNative = true)
- interface InterfaceWithOverlay {
-
- @JsProperty
- int getLength();
-
- @JsOverlay
- default int len() {
- return this.getLength();
- }
- }
-
- @JsType(isNative = true, name = "Object", namespace = JsPackage.GLOBAL)
- static abstract class SubclassImplementingInterfaceWithOverlay implements InterfaceWithOverlay {
- }
-
- // Regression test for bug: #9440
- public void testInterfaceWithOverlayAndNativeSubclass() {
- SubclassImplementingInterfaceWithOverlay object =
- (SubclassImplementingInterfaceWithOverlay) (Object) new int[]{1, 2, 3};
- assertEquals(3, object.len());
- }
-
- interface Producer {
- T get();
- }
-
- private static Producer