diff options
Diffstat (limited to 'src')
11 files changed, 63 insertions, 55 deletions
diff --git a/src/com/vaadin/demo/coverflow/gwt/client/ui/VCoverflow.java b/src/com/vaadin/demo/coverflow/gwt/client/ui/VCoverflow.java index ad92de3d83..35a7118fb0 100644 --- a/src/com/vaadin/demo/coverflow/gwt/client/ui/VCoverflow.java +++ b/src/com/vaadin/demo/coverflow/gwt/client/ui/VCoverflow.java @@ -113,7 +113,7 @@ public class VCoverflow extends Composite implements Paintable { // Get information - set.put("icon", client.translateToolkitUri(imgUidl + set.put("icon", client.translateVaadinUri(imgUidl .getStringAttribute("icon"))); set.put("caption", imgUidl.getStringAttribute("caption")); @@ -201,23 +201,23 @@ public class VCoverflow extends Composite implements Paintable { * id */ public native void initializeMethods(String id) /*-{ - var app = this; - - if($wnd.vaadin.coverflow == null) - var coverflow = []; - else - var coverflow = $wnd.vaadin.coverflow; - - coverflow['getCovers_' + id] = function() { - app.@com.vaadin.demo.coverflow.gwt.client.ui.VCoverflow::getCovers()(); - }; - - coverflow['setCurrent_' + id] = function(selected) { - app.@com.vaadin.demo.coverflow.gwt.client.ui.VCoverflow::setCover(Ljava/lang/String;)(selected); - }; - - $wnd.vaadin.coverflow = coverflow; - }-*/; + var app = this; + + if($wnd.vaadin.coverflow == null) + var coverflow = []; + else + var coverflow = $wnd.vaadin.coverflow; + + coverflow['getCovers_' + id] = function() { + app.@com.vaadin.demo.coverflow.gwt.client.ui.VCoverflow::getCovers()(); + }; + + coverflow['setCurrent_' + id] = function(selected) { + app.@com.vaadin.demo.coverflow.gwt.client.ui.VCoverflow::setCover(Ljava/lang/String;)(selected); + }; + + $wnd.vaadin.coverflow = coverflow; + }-*/; /** * This function sends all covers to the flash. We cannot do this directly @@ -259,14 +259,14 @@ public class VCoverflow extends Composite implements Paintable { * @param icon */ public native void addCover(String id, String caption, String icon) /*-{ - try { - $doc['fxcoverflow' + id].addCover(caption.toString(), icon.toString()); - } - catch(e) { - $wnd.alert(e.message); - } - - }-*/; + try { + $doc['fxcoverflow' + id].addCover(caption.toString(), icon.toString()); + } + catch(e) { + $wnd.alert(e.message); + } + + }-*/; /** * This function tells the flash which cover should be selected. @@ -275,21 +275,21 @@ public class VCoverflow extends Composite implements Paintable { * @param key */ public native void selectCover(String id, String key) /*-{ - $doc["fxcoverflow" + id].selectCover(key.toString()); - }-*/; + $doc["fxcoverflow" + id].selectCover(key.toString()); + }-*/; public native void setBackgroundColor(String id, String startGradient, String endGradient) /*-{ - $doc["fxcoverflow" + id].setBackgroundColor("0x" + startGradient.toString(), "0x" + endGradient.toString()); - }-*/; + $doc["fxcoverflow" + id].setBackgroundColor("0x" + startGradient.toString(), "0x" + endGradient.toString()); + }-*/; public native void toggleScrollbarVisibility(String id, boolean visibility) /*-{ - $doc["fxcoverflow" + id].toggleScrollbarVisibility(visibility); - }-*/; + $doc["fxcoverflow" + id].toggleScrollbarVisibility(visibility); + }-*/; public native void removeCover(String id, String key) /*-{ - $doc["fxcoverflow" + id].removeCover(key); - }-*/; + $doc["fxcoverflow" + id].removeCover(key); + }-*/; /** * Set the HTML coding of the flash movie. This isn't done until the diff --git a/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java b/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java index 1d6fe6d0eb..f878e732b2 100755 --- a/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java +++ b/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java @@ -1473,28 +1473,36 @@ public class ApplicationConnection { } /** - * Translates custom protocols in UIRL URI's to be recognizable by browser. + * @deprecated Use {@link #translateVaadinUri(String)} instead. + */ + @Deprecated + public String translateToolkitUri(String vaadinUri) { + return translateVaadinUri(vaadinUri); + } + + /** + * Translates custom protocols in UIDL URI's to be recognizable by browser. * All uri's from UIDL should be routed via this method before giving them * to browser due URI's in UIDL may contain custom protocols like theme://. * - * @param toolkitUri - * toolkit URI from uidl + * @param uidlUri + * Vaadin URI from uidl * @return translated URI ready for browser */ - public String translateToolkitUri(String toolkitUri) { - if (toolkitUri == null) { + public String translateVaadinUri(String uidlUri) { + if (uidlUri == null) { return null; } - if (toolkitUri.startsWith("theme://")) { + if (uidlUri.startsWith("theme://")) { final String themeUri = configuration.getThemeUri(); if (themeUri == null) { console .error("Theme not set: ThemeResource will not be found. (" - + toolkitUri + ")"); + + uidlUri + ")"); } - toolkitUri = themeUri + toolkitUri.substring(7); + uidlUri = themeUri + uidlUri.substring(7); } - return toolkitUri; + return uidlUri; } public String getThemeUri() { diff --git a/src/com/vaadin/terminal/gwt/client/ui/Icon.java b/src/com/vaadin/terminal/gwt/client/ui/Icon.java index 854d95b1ed..1ee19c1d17 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/Icon.java +++ b/src/com/vaadin/terminal/gwt/client/ui/Icon.java @@ -35,7 +35,7 @@ public class Icon extends UIObject { */ sinkEvents(Event.ONLOAD); - String uri = client.translateToolkitUri(uidlUri); + String uri = client.translateVaadinUri(uidlUri); DOM.setElementProperty(getElement(), "src", uri); myUri = uidlUri; } diff --git a/src/com/vaadin/terminal/gwt/client/ui/VEmbedded.java b/src/com/vaadin/terminal/gwt/client/ui/VEmbedded.java index 64052ca5fe..b946896ed3 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VEmbedded.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VEmbedded.java @@ -168,7 +168,7 @@ public class VEmbedded extends HTML implements Paintable { * @return */ private String getSrc(UIDL uidl, ApplicationConnection client) { - String url = client.translateToolkitUri(uidl.getStringAttribute("src")); + String url = client.translateVaadinUri(uidl.getStringAttribute("src")); if (url == null) { return ""; } diff --git a/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java b/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java index ee1d657f29..d333f6537a 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java @@ -54,7 +54,7 @@ public class VFilterSelect extends Composite implements Paintable, Field, key = uidl.getStringAttribute("key"); caption = uidl.getStringAttribute("caption"); if (uidl.hasAttribute("icon")) { - iconUri = client.translateToolkitUri(uidl + iconUri = client.translateVaadinUri(uidl .getStringAttribute("icon")); } } diff --git a/src/com/vaadin/terminal/gwt/client/ui/VLink.java b/src/com/vaadin/terminal/gwt/client/ui/VLink.java index 714e4000fb..790f8cbf5e 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VLink.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VLink.java @@ -76,7 +76,7 @@ public class VLink extends HTML implements Paintable, ClickListener { anchor.setAttribute("target", target); } if (uidl.hasAttribute("src")) { - src = client.translateToolkitUri(uidl.getStringAttribute("src")); + src = client.translateVaadinUri(uidl.getStringAttribute("src")); anchor.setAttribute("href", src); } diff --git a/src/com/vaadin/terminal/gwt/client/ui/VMenuBar.java b/src/com/vaadin/terminal/gwt/client/ui/VMenuBar.java index caced98ac4..ce3f34313c 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VMenuBar.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VMenuBar.java @@ -104,7 +104,7 @@ public class VMenuBar extends Widget implements Paintable, PopupListener { UIDL options = uidl.getChildUIDL(0); if (options.hasAttribute("submenuIcon")) { - submenuIcon = client.translateToolkitUri(uidl.getChildUIDL(0) + submenuIcon = client.translateVaadinUri(uidl.getChildUIDL(0) .getStringAttribute("submenuIcon")); } else { submenuIcon = null; diff --git a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java index 9f840fadd9..2bc747fbc8 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java @@ -308,7 +308,7 @@ public class VScrollTable extends FlowPanel implements Table, ScrollListener { actionMap.put(key + "_c", caption); if (action.hasAttribute("icon")) { // TODO need some uri handling ?? - actionMap.put(key + "_i", client.translateToolkitUri(action + actionMap.put(key + "_i", client.translateVaadinUri(action .getStringAttribute("icon"))); } } @@ -2832,8 +2832,8 @@ public class VScrollTable extends FlowPanel implements Table, ScrollListener { String s = uidl.getStringAttribute("caption"); if (uidl.hasAttribute("icon")) { s = "<img src=\"" - + client.translateToolkitUri(uidl - .getStringAttribute("icon")) + + client + .translateVaadinUri(uidl.getStringAttribute("icon")) + "\" alt=\"icon\" class=\"v-icon\">" + s; } return s; diff --git a/src/com/vaadin/terminal/gwt/client/ui/VTree.java b/src/com/vaadin/terminal/gwt/client/ui/VTree.java index d037232d18..6f676441e7 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VTree.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VTree.java @@ -69,7 +69,7 @@ public class VTree extends FlowPanel implements Paintable { actionMap.put(key + "_c", caption); if (action.hasAttribute("icon")) { // TODO need some uri handling ?? - actionMap.put(key + "_i", client.translateToolkitUri(action + actionMap.put(key + "_i", client.translateVaadinUri(action .getStringAttribute("icon"))); } } diff --git a/src/com/vaadin/terminal/gwt/client/ui/VView.java b/src/com/vaadin/terminal/gwt/client/ui/VView.java index 08e9e3cf56..d23dbb39de 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VView.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VView.java @@ -258,7 +258,7 @@ public class VView extends SimplePanel implements Container, String html = ""; if (notification.hasAttribute("icon")) { final String parsedUri = client - .translateToolkitUri(notification + .translateVaadinUri(notification .getStringAttribute("icon")); html += "<IMG src=\"" + parsedUri + "\" />"; } diff --git a/src/com/vaadin/terminal/gwt/client/ui/VWindow.java b/src/com/vaadin/terminal/gwt/client/ui/VWindow.java index 5556d7970f..87bd272af3 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VWindow.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VWindow.java @@ -284,7 +284,7 @@ public class VWindow extends VToolkitOverlay implements Container, while ("open".equals(childUidl.getTag())) { // TODO multiple opens with the same target will in practice just // open the last one - should we fix that somehow? - final String parsedUri = client.translateToolkitUri(childUidl + final String parsedUri = client.translateVaadinUri(childUidl .getStringAttribute("src")); if (!childUidl.hasAttribute("name")) { final Frame frame = new Frame(); @@ -639,7 +639,7 @@ public class VWindow extends VToolkitOverlay implements Container, public void setCaption(String c, String icon) { String html = Util.escapeHTML(c); if (icon != null) { - icon = client.translateToolkitUri(icon); + icon = client.translateVaadinUri(icon); html = "<img src=\"" + icon + "\" class=\"v-icon\" />" + html; } DOM.setInnerHTML(headerText, html); |