summaryrefslogtreecommitdiffstats
path: root/src/com/vaadin
diff options
context:
space:
mode:
authorLeif Åstrand <leif@vaadin.com>2012-04-25 07:14:56 +0000
committerLeif Åstrand <leif@vaadin.com>2012-04-25 07:14:56 +0000
commit4e795bc38ff7ee8a41bd3885eea9ce5de2c281f1 (patch)
tree6422f9acac84151d1e20fd5fc58c27f5faf2e648 /src/com/vaadin
parent935850bc41d42e29b75279a718312dbefc70f405 (diff)
downloadvaadin-framework-4e795bc38ff7ee8a41bd3885eea9ce5de2c281f1.tar.gz
vaadin-framework-4e795bc38ff7ee8a41bd3885eea9ce5de2c281f1.zip
Add test for $entry and make it ignore some false positives (#8699)
svn changeset:23626/svn branch:6.8
Diffstat (limited to 'src/com/vaadin')
-rw-r--r--src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java1
-rw-r--r--src/com/vaadin/terminal/gwt/client/CSSRule.java4
-rw-r--r--src/com/vaadin/terminal/gwt/client/ComponentDetailMap.java1
-rw-r--r--src/com/vaadin/terminal/gwt/client/ComputedStyle.java1
-rw-r--r--src/com/vaadin/terminal/gwt/client/HistoryImplIEVaadin.java4
-rw-r--r--src/com/vaadin/terminal/gwt/client/ui/VView.java1
6 files changed, 12 insertions, 0 deletions
diff --git a/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java b/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java
index a60fb808a1..21ecfe2776 100644
--- a/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java
+++ b/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java
@@ -270,6 +270,7 @@ public class ApplicationConfiguration implements EntryPoint {
var j;
for(j in $wnd.vaadin.vaadinConfigurations) {
if(!$wnd.vaadin.vaadinConfigurations[j].initialized) {
+ // $entry not needed as function is not exported
list.@java.util.Collection::add(Ljava/lang/Object;)(j);
}
}
diff --git a/src/com/vaadin/terminal/gwt/client/CSSRule.java b/src/com/vaadin/terminal/gwt/client/CSSRule.java
index 4d9196c8d6..c36b0611e8 100644
--- a/src/com/vaadin/terminal/gwt/client/CSSRule.java
+++ b/src/com/vaadin/terminal/gwt/client/CSSRule.java
@@ -33,6 +33,7 @@ public class CSSRule {
for(var i = 0; i < sheets.length; i++) {
var sheet = sheets[i];
if(sheet.href && sheet.href.indexOf("VAADIN/themes")>-1) {
+ // $entry not needed as function is not exported
this.@com.vaadin.terminal.gwt.client.CSSRule::rules = @com.vaadin.terminal.gwt.client.CSSRule::searchForRule(Lcom/google/gwt/core/client/JavaScriptObject;Ljava/lang/String;Z)(sheet, selector, deep);
return;
}
@@ -58,6 +59,7 @@ public class CSSRule {
// IE handles imported sheet differently
if(deep && sheet.imports && sheet.imports.length > 0) {
for(var i=0; i < sheet.imports.length; i++) {
+ // $entry not needed as function is not exported
var imports = @com.vaadin.terminal.gwt.client.CSSRule::searchForRule(Lcom/google/gwt/core/client/JavaScriptObject;Ljava/lang/String;Z)(sheet.imports[i], selector, deep);
allMatches.concat(imports);
}
@@ -83,6 +85,7 @@ public class CSSRule {
}
} else if(deep && r.type == 3) {
// Search @import stylesheet
+ // $entry not needed as function is not exported
var imports = @com.vaadin.terminal.gwt.client.CSSRule::searchForRule(Lcom/google/gwt/core/client/JavaScriptObject;Ljava/lang/String;Z)(r.styleSheet, selector, deep);
allMatches = allMatches.concat(imports);
}
@@ -102,6 +105,7 @@ public class CSSRule {
/*-{
var j = this.@com.vaadin.terminal.gwt.client.CSSRule::rules.length;
for(var i=0; i<j; i++) {
+ // $entry not needed as function is not exported
var value = this.@com.vaadin.terminal.gwt.client.CSSRule::rules[i].style[propertyName];
if(value)
return value;
diff --git a/src/com/vaadin/terminal/gwt/client/ComponentDetailMap.java b/src/com/vaadin/terminal/gwt/client/ComponentDetailMap.java
index 3405d838a7..dfbcf9d38b 100644
--- a/src/com/vaadin/terminal/gwt/client/ComponentDetailMap.java
+++ b/src/com/vaadin/terminal/gwt/client/ComponentDetailMap.java
@@ -62,6 +62,7 @@ final class ComponentDetailMap extends JavaScriptObject {
private final native void fillWithValues(Collection<ComponentDetail> list)
/*-{
for(var key in this) {
+ // $entry not needed as function is not exported
list.@java.util.Collection::add(Ljava/lang/Object;)(this[key]);
}
}-*/;
diff --git a/src/com/vaadin/terminal/gwt/client/ComputedStyle.java b/src/com/vaadin/terminal/gwt/client/ComputedStyle.java
index e994e47d63..4db3db2adf 100644
--- a/src/com/vaadin/terminal/gwt/client/ComputedStyle.java
+++ b/src/com/vaadin/terminal/gwt/client/ComputedStyle.java
@@ -179,6 +179,7 @@ public class ComputedStyle {
if (isNaN(number))
return null;
else
+ // $entry not needed as function is not exported
return @java.lang.Integer::valueOf(I)(number);
}-*/;
diff --git a/src/com/vaadin/terminal/gwt/client/HistoryImplIEVaadin.java b/src/com/vaadin/terminal/gwt/client/HistoryImplIEVaadin.java
index 0571959339..2e55b4d115 100644
--- a/src/com/vaadin/terminal/gwt/client/HistoryImplIEVaadin.java
+++ b/src/com/vaadin/terminal/gwt/client/HistoryImplIEVaadin.java
@@ -123,6 +123,7 @@ public class HistoryImplIEVaadin extends HistoryImpl {
// Assume an empty token.
var token = '';
// Get the initial token from the url's hash component.
+ // $entry not needed as function is not exported
var hash = @com.vaadin.terminal.gwt.client.HistoryImplIEVaadin::getLocationHash()();
if (hash.length > 0) {
try {
@@ -146,6 +147,7 @@ public class HistoryImplIEVaadin extends HistoryImpl {
protected native void navigateFrame(String token)
/*-{
+ // $entry not needed as function is not exported
var escaped = @com.vaadin.terminal.gwt.client.HistoryImplIEVaadin::escapeHtml(Ljava/lang/String;)(token);
var doc = this.@com.vaadin.terminal.gwt.client.HistoryImplIEVaadin::historyFrame.contentWindow.document;
doc.open();
@@ -155,6 +157,7 @@ public class HistoryImplIEVaadin extends HistoryImpl {
protected native void updateHash(String token)
/*-{
+ // $entry not needed as function is not exported
$wnd.location.hash = this.@com.google.gwt.user.client.impl.HistoryImpl::encodeFragment(Ljava/lang/String;)(token);
}-*/;
@@ -169,6 +172,7 @@ public class HistoryImplIEVaadin extends HistoryImpl {
var historyImplRef = this;
var urlChecker = function() {
$wnd.setTimeout(urlChecker, 250);
+ // $entry not needed as function is not exported
var hash = @com.vaadin.terminal.gwt.client.HistoryImplIEVaadin::getLocationHash()();
if (hash.length > 0) {
var token = '';
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VView.java b/src/com/vaadin/terminal/gwt/client/ui/VView.java
index 07ade6a8b1..c03652f259 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VView.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VView.java
@@ -657,6 +657,7 @@ public class VView extends SimplePanel implements Container, ResizeHandler,
/*-{
var j;
for(j in $wnd.vaadin.vaadinConfigurations) {
+ // $entry not needed as function is not exported
list.@java.util.Collection::add(Ljava/lang/Object;)(j);
}
}-*/;