Add $entry to code only present in Vaadin 7 (#8699)

diff --git a/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java b/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java
index 170e949116815408d249e5aa6d9af159a625a534..ff77c5904acce641f02e945e2b725096e5577234 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java
+++ b/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java
@@ -69,6 +69,7 @@ public class ApplicationConfiguration implements EntryPoint {
             if (value === null || value === undefined) {
                 return null;
             } else {
+                 // $entry not needed as function is not exported
                 return @java.lang.Boolean::valueOf(Z)(value);
             } 
         }-*/;
@@ -89,6 +90,7 @@ public class ApplicationConfiguration implements EntryPoint {
             if (value === null || value === undefined) {
                 return null;
             } else {
+                 // $entry not needed as function is not exported
                 return @java.lang.Integer::valueOf(I)(value);
             } 
         }-*/;
@@ -589,7 +591,7 @@ public class ApplicationConfiguration implements EntryPoint {
      */
     public native static void registerCallback(String widgetsetName)
     /*-{
-        var callbackHandler = @com.vaadin.terminal.gwt.client.ApplicationConfiguration::startApplication(Ljava/lang/String;);
+        var callbackHandler = $entry(@com.vaadin.terminal.gwt.client.ApplicationConfiguration::startApplication(Ljava/lang/String;));
         $wnd.vaadin.registerWidgetset(widgetsetName, callbackHandler);
     }-*/;
 

diff --git a/src/com/vaadin/terminal/gwt/client/ui/upload/UploadIFrameOnloadStrategy.java b/src/com/vaadin/terminal/gwt/client/ui/upload/UploadIFrameOnloadStrategy.java
index 18cfc643d3f574262ba2dc0231170428f8ce06cd..174a4b88ca1d5e09bf3addd95e9b2c8df75bc7ac 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/upload/UploadIFrameOnloadStrategy.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/upload/UploadIFrameOnloadStrategy.java
@@ -8,9 +8,9 @@ public class UploadIFrameOnloadStrategy {
     native void hookEvents(com.google.gwt.dom.client.Element iframe,
             VUpload upload)
     /*-{
-        iframe.onload = function() {
+        iframe.onload = $entry(function() {
             upload.@com.vaadin.terminal.gwt.client.ui.upload.VUpload::onSubmitComplete()();
-        };
+        });
     }-*/;
 
     /**

diff --git a/src/com/vaadin/terminal/gwt/client/ui/upload/UploadIFrameOnloadStrategyIE.java b/src/com/vaadin/terminal/gwt/client/ui/upload/UploadIFrameOnloadStrategyIE.java
index 19d38a8a95c06f08e5ffd2137b00c893fc4cc302..17a7e46bd51dfdf771655607d861e460fb45720b 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/upload/UploadIFrameOnloadStrategyIE.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/upload/UploadIFrameOnloadStrategyIE.java
@@ -13,11 +13,11 @@ public class UploadIFrameOnloadStrategyIE extends UploadIFrameOnloadStrategy {
     @Override
     native void hookEvents(Element iframe, VUpload upload)
     /*-{
-      iframe.onreadystatechange = function() {
+      iframe.onreadystatechange = $entry(function() {
         if (iframe.readyState == 'complete') {
           upload.@com.vaadin.terminal.gwt.client.ui.upload.VUpload::onSubmitComplete()();
         }
-      };
+      });
     }-*/;
 
     @Override