ThemeResource now works in Link

svn changeset:2854/svn branch:trunk

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ILink.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/ILink.java
index bdebf5a454cde4a45bcd0ad4c29bdaaaf9794a80..f6390309b49106fb56f2848c0dea2e0f1f161287 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ILink.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/ILink.java
@@ -11,99 +11,107 @@ import com.itmill.toolkit.terminal.gwt.client.UIDL;
 
 public class ILink extends HTML implements Paintable, ClickListener {
 
-       public static final String CLASSNAME = "i-link";
-
-       private static final int BORDER_STYLE_DEFAULT = 0;
-       private static final int BORDER_STYLE_MINIMAL = 1;
-       private static final int BORDER_STYLE_NONE = 2;
-
-       private String src;
-
-       private String target;
-
-       private int borderStyle = BORDER_STYLE_DEFAULT;
-
-       private boolean enabled;
-
-       private boolean readonly;
-
-       private int width;
-
-       private int height;
-
-       public ILink() {
-               super();
-               addClickListener(this);
-               setStyleName(CLASSNAME);
-       }
-
-       public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
-
-               if (client.updateComponent(this, uidl, false))
-                       return;
-
-               enabled = uidl.hasAttribute("disabled") ? false : true;
-               readonly = uidl.hasAttribute("readonly") ? true : false;
-
-               if (uidl.hasAttribute("target"))
-                       target = uidl.getStringAttribute(target);
-               if (uidl.hasAttribute("src")) {
-                       // TODO theme soure
-                       src = uidl.getStringAttribute("src");
-               }
-
-               if (uidl.hasAttribute("border")) {
-                       if ("none".equals(uidl.getStringAttribute("border")))
-                               borderStyle = BORDER_STYLE_NONE;
-                       else
-                               borderStyle = BORDER_STYLE_MINIMAL;
-               } else {
-                       borderStyle = BORDER_STYLE_DEFAULT;
-               }
-
-               height = uidl.hasAttribute("height") ? uidl.getIntAttribute("height")
-                               : -1;
-               width = uidl.hasAttribute("width") ? uidl.getIntAttribute("width") : -1;
-
-               DOM.setInnerHTML(getElement(), uidl.getStringAttribute("caption"));
-
-               if (readonly)
-                       addStyleName("readonly");
-               else
-                       removeStyleName("readonly");
-               if (enabled)
-                       addStyleName("enabled");
-               else
-                       removeStyleName("enabled");
-       }
-
-       public void onClick(Widget sender) {
-               if (enabled && !readonly) {
-                       if (target == null)
-                               target = "_blank";
-                       String features;
-                       switch (borderStyle) {
-                       case BORDER_STYLE_NONE:
-                               features = "menubar=no,location=no,status=no";
-                               break;
-                       case BORDER_STYLE_MINIMAL:
-                               features = "menubar=yes,location=no,status=no";
-                               break;
-                       default:
-                               features = "menubar=yes,location=yes,scrollbars=yes,status=yes";
-                               break;
-                       }
-                       if (width > 0 || height > 0) {
-                               features += ",resizable=no";
-                               if (width > 0)
-                                       features += ",width=" + width;
-                               if (height > 0)
-                                       features += ",height=" + height;
-                       } else {
-                               features += ",resizable=yes";
-                       }
-                       Window.open(src, target, features);
-               }
-       }
+    public static final String CLASSNAME = "i-link";
+
+    private static final int BORDER_STYLE_DEFAULT = 0;
+    private static final int BORDER_STYLE_MINIMAL = 1;
+    private static final int BORDER_STYLE_NONE = 2;
+
+    private String src;
+
+    private String target;
+
+    private int borderStyle = BORDER_STYLE_DEFAULT;
+
+    private boolean enabled;
+
+    private boolean readonly;
+
+    private int width;
+
+    private int height;
+
+    public ILink() {
+        super();
+        addClickListener(this);
+        setStyleName(CLASSNAME);
+    }
+
+    public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
+
+        if (client.updateComponent(this, uidl, false)) {
+            return;
+        }
+
+        enabled = uidl.hasAttribute("disabled") ? false : true;
+        readonly = uidl.hasAttribute("readonly") ? true : false;
+
+        if (uidl.hasAttribute("target")) {
+            target = uidl.getStringAttribute(target);
+        }
+        if (uidl.hasAttribute("src")) {
+            // TODO theme soure
+            src = client.translateToolkitUri(uidl.getStringAttribute("src"));
+        }
+
+        if (uidl.hasAttribute("border")) {
+            if ("none".equals(uidl.getStringAttribute("border"))) {
+                borderStyle = BORDER_STYLE_NONE;
+            } else {
+                borderStyle = BORDER_STYLE_MINIMAL;
+            }
+        } else {
+            borderStyle = BORDER_STYLE_DEFAULT;
+        }
+
+        height = uidl.hasAttribute("height") ? uidl.getIntAttribute("height")
+                : -1;
+        width = uidl.hasAttribute("width") ? uidl.getIntAttribute("width") : -1;
+
+        DOM.setInnerHTML(getElement(), uidl.getStringAttribute("caption"));
+
+        if (readonly) {
+            addStyleName("readonly");
+        } else {
+            removeStyleName("readonly");
+        }
+        if (enabled) {
+            addStyleName("enabled");
+        } else {
+            removeStyleName("enabled");
+        }
+    }
+
+    public void onClick(Widget sender) {
+        if (enabled && !readonly) {
+            if (target == null) {
+                target = "_blank";
+            }
+            String features;
+            switch (borderStyle) {
+            case BORDER_STYLE_NONE:
+                features = "menubar=no,location=no,status=no";
+                break;
+            case BORDER_STYLE_MINIMAL:
+                features = "menubar=yes,location=no,status=no";
+                break;
+            default:
+                features = "menubar=yes,location=yes,scrollbars=yes,status=yes";
+                break;
+            }
+            if (width > 0 || height > 0) {
+                features += ",resizable=no";
+                if (width > 0) {
+                    features += ",width=" + width;
+                }
+                if (height > 0) {
+                    features += ",height=" + height;
+                }
+            } else {
+                features += ",resizable=yes";
+            }
+            Window.open(src, target, features);
+        }
+    }
 
 }