HasHTML extends HasText, so there is no need for these widgets to declare both
interfaces. And the fact that they do makes UiBinder treat their content as text
rather than HTML. The UiBinder fix would be hard, maybe even completely
impractical. Fixing the widgets is easy, so...
Reviewed by jgw
git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@6645 8db76d5a-ed1c-0410-87a9-c151d255dfc7
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 6e0d800..89a6278 100644
--- a/user/src/com/google/gwt/user/client/ui/Anchor.java
+++ b/user/src/com/google/gwt/user/client/ui/Anchor.java
@@ -37,7 +37,7 @@
* @see Hyperlink
*/
public class Anchor extends FocusWidget implements HasHorizontalAlignment,
- HasName, HasText, HasHTML, HasWordWrap, HasDirection {
+ HasName, HasHTML, HasWordWrap, HasDirection {
/**
* Creates an Anchor widget that wraps an existing <a> element.
diff --git a/user/src/com/google/gwt/user/client/ui/CustomButton.java b/user/src/com/google/gwt/user/client/ui/CustomButton.java
index dbcd510..c97d615 100644
--- a/user/src/com/google/gwt/user/client/ui/CustomButton.java
+++ b/user/src/com/google/gwt/user/client/ui/CustomButton.java
@@ -105,7 +105,7 @@
* Represents a button's face. Each face is associated with its own style
* modifier and, optionally, its own contents html, text, or image.
*/
- public abstract class Face implements HasHTML, HasText {
+ public abstract class Face implements HasHTML {
private static final String STYLENAME_HTML_FACE = "html-face";
private final Face delegateTo;
private Element face;
@@ -827,7 +827,7 @@
}
}
- void fireClickListeners(Event nativeEvent) {
+ void fireClickListeners(@SuppressWarnings("unused") Event nativeEvent) {
// TODO(ecc) Once event triggering is committed, should fire a native click event instead.
fireEvent(new ClickEvent() {
});
diff --git a/user/src/com/google/gwt/user/client/ui/DialogBox.java b/user/src/com/google/gwt/user/client/ui/DialogBox.java
index 3eb76cb..f347cb6 100644
--- a/user/src/com/google/gwt/user/client/ui/DialogBox.java
+++ b/user/src/com/google/gwt/user/client/ui/DialogBox.java
@@ -81,7 +81,7 @@
* </p>
*/
@SuppressWarnings("deprecation")
-public class DialogBox extends DecoratedPopupPanel implements HasHTML, HasText,
+public class DialogBox extends DecoratedPopupPanel implements HasHTML,
MouseListener {
/**
* Set of characteristic interfaces supported by the {@link DialogBox} caption
diff --git a/user/test/com/google/gwt/uibinder/test/client/WidgetBasedUi.ui.xml b/user/test/com/google/gwt/uibinder/test/client/WidgetBasedUi.ui.xml
index e1c8d1a..ebb7b56 100644
--- a/user/test/com/google/gwt/uibinder/test/client/WidgetBasedUi.ui.xml
+++ b/user/test/com/google/gwt/uibinder/test/client/WidgetBasedUi.ui.xml
@@ -184,7 +184,8 @@
<p>
Here is a similarly clickable
<demo:ClickyLink text="hyperlink based on a custom widget"
- ui:field="customLinkWidget" popupText="That tickles! "/>.
+ ui:field="customLinkWidget" popupText="That tickles! "/>. And an
+ <gwt:Anchor><i>Anchor to nowhere</i></gwt:Anchor>.
</p>
<p>I bet you like babies in your Image widgets.</p>
