Attachable->IsRenderable rename step 1: Renaming the base interface.
Review at http://gwt-code-reviews.appspot.com/1447806
git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@10205 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/user/src/com/google/gwt/uibinder/elementparsers/AttachableHTMLPanelParser.java b/user/src/com/google/gwt/uibinder/elementparsers/AttachableHTMLPanelParser.java
index c175330..4a640d8 100644
--- a/user/src/com/google/gwt/uibinder/elementparsers/AttachableHTMLPanelParser.java
+++ b/user/src/com/google/gwt/uibinder/elementparsers/AttachableHTMLPanelParser.java
@@ -34,10 +34,10 @@
assert writer.useLazyWidgetBuilders();
/*
- * Gathers up elements that indicate nested Attachable objects.
+ * Gathers up elements that indicate nested IsRenderable objects.
*/
- AttachableInterpreter attachableInterpreter = null;
- attachableInterpreter = new AttachableInterpreter(
+ IsRenderableInterpreter isRenderableInterpreter = null;
+ isRenderableInterpreter = new IsRenderableInterpreter(
fieldName, writer);
/*
@@ -58,7 +58,7 @@
final InterpreterPipe interpreters;
interpreters = InterpreterPipe.newPipe(
- attachableInterpreter, widgetInterpreter, htmlInterpreter);
+ isRenderableInterpreter, widgetInterpreter, htmlInterpreter);
String html = elem.consumeInnerHtml(interpreters);
writer.endAttachedSection();
diff --git a/user/src/com/google/gwt/uibinder/elementparsers/AttachableInterpreter.java b/user/src/com/google/gwt/uibinder/elementparsers/IsRenderableInterpreter.java
similarity index 85%
rename from user/src/com/google/gwt/uibinder/elementparsers/AttachableInterpreter.java
rename to user/src/com/google/gwt/uibinder/elementparsers/IsRenderableInterpreter.java
index ca6853a..7758b03 100644
--- a/user/src/com/google/gwt/uibinder/elementparsers/AttachableInterpreter.java
+++ b/user/src/com/google/gwt/uibinder/elementparsers/IsRenderableInterpreter.java
@@ -22,18 +22,17 @@
import com.google.gwt.uibinder.rebind.XMLElement;
/**
- * Used by {@link AttachableHTMLPanelParser} to interpret Attachable elements.
- * Declares the appropriate Attachable, and returns the correct HTML
- * to be inlined in the AttachableHTMLPanel. If the Attachable happens to be a
- * Widget, also adds that widget to the AttachableHTMLPanel.
+ * Used by {@link AttachableHTMLPanelParser} to interpret renderable elements.
+ * Declares the appropriate {@link IsRenderable}, and returns the correct HTML
+ * to be inlined in the AttachableHTMLPanel.
*/
-class AttachableInterpreter implements XMLElement.Interpreter<String> {
+class IsRenderableInterpreter implements XMLElement.Interpreter<String> {
private final String fieldName;
private final UiBinderWriter uiWriter;
- public AttachableInterpreter(String fieldName, UiBinderWriter writer) {
+ public IsRenderableInterpreter(String fieldName, UiBinderWriter writer) {
this.fieldName = fieldName;
this.uiWriter = writer;
assert writer.useLazyWidgetBuilders();
@@ -41,7 +40,7 @@
public String interpretElement(XMLElement elem)
throws UnableToCompleteException {
- if (!uiWriter.isAttachableElement(elem)) {
+ if (!uiWriter.isRenderableElement(elem)) {
return null;
}
diff --git a/user/src/com/google/gwt/uibinder/rebind/UiBinderWriter.java b/user/src/com/google/gwt/uibinder/rebind/UiBinderWriter.java
index 7c14f42..7fde6a6 100644
--- a/user/src/com/google/gwt/uibinder/rebind/UiBinderWriter.java
+++ b/user/src/com/google/gwt/uibinder/rebind/UiBinderWriter.java
@@ -40,7 +40,7 @@
import com.google.gwt.uibinder.rebind.model.ImplicitCssResource;
import com.google.gwt.uibinder.rebind.model.OwnerClass;
import com.google.gwt.uibinder.rebind.model.OwnerField;
-import com.google.gwt.user.client.ui.Attachable;
+import com.google.gwt.user.client.ui.IsRenderable;
import com.google.gwt.user.client.ui.IsWidget;
import org.w3c.dom.Document;
@@ -199,7 +199,7 @@
private final JClassType uiRootType;
- private final JClassType attachableClassType;
+ private final JClassType isRenderableClassType;
private final JClassType lazyDomElementClass;
@@ -283,7 +283,7 @@
uiRootType = typeArgs[0];
uiOwnerType = typeArgs[1];
- attachableClassType = oracle.findType(Attachable.class.getCanonicalName());
+ isRenderableClassType = oracle.findType(IsRenderable.class.getCanonicalName());
lazyDomElementClass = oracle.findType(LazyDomElement.class.getCanonicalName());
ownerClass = new OwnerClass(uiOwnerType, logger, uiBinderCtx);
@@ -691,9 +691,9 @@
return gwtPrefix + ":field";
}
- public boolean isAttachableElement(XMLElement elem)
+ public boolean isRenderableElement(XMLElement elem)
throws UnableToCompleteException {
- return findFieldType(elem).isAssignableTo(attachableClassType);
+ return findFieldType(elem).isAssignableTo(isRenderableClassType);
}
public boolean isBinderElement(XMLElement elem) {
diff --git a/user/src/com/google/gwt/user/client/ui/AttachableComposite.java b/user/src/com/google/gwt/user/client/ui/AttachableComposite.java
index f807e1e..3cd4a3c 100644
--- a/user/src/com/google/gwt/user/client/ui/AttachableComposite.java
+++ b/user/src/com/google/gwt/user/client/ui/AttachableComposite.java
@@ -32,8 +32,10 @@
* itself, but is still under active development.
* The only reason why this isn't a subclass of {@link Composite} is to avoid
* messing up it's API, since {@link Composite} is very often subclassed.
+ *
+ * TODO(rdcastro): Rename this RenderableComposite.
*/
-public abstract class AttachableComposite extends Widget implements Attachable {
+public abstract class AttachableComposite extends Widget implements IsRenderable {
interface HTMLTemplates extends SafeHtmlTemplates {
@Template("<span id=\"{0}\"></span>")
@@ -44,7 +46,7 @@
private Widget widget;
- private Attachable attachable;
+ private IsRenderable attachable;
private Element elementToWrap;
@@ -156,10 +158,10 @@
// Logical attach.
this.widget = widget;
- if (widget instanceof Attachable) {
- // In case the Widget being wrapped is an Attachable, we delay finishing
+ if (widget instanceof IsRenderable) {
+ // In case the Widget being wrapped is an IsRenderable, we delay finishing
// the initialization until the performDetachedInitialization() is called.
- this.attachable = (Attachable) widget;
+ this.attachable = (IsRenderable) widget;
return;
}
diff --git a/user/src/com/google/gwt/user/client/ui/AttachableHTMLPanel.java b/user/src/com/google/gwt/user/client/ui/AttachableHTMLPanel.java
index dfb388d..a79c64c 100644
--- a/user/src/com/google/gwt/user/client/ui/AttachableHTMLPanel.java
+++ b/user/src/com/google/gwt/user/client/ui/AttachableHTMLPanel.java
@@ -31,8 +31,10 @@
* should be merged into {@link HTMLPanel}.
* The only reason this class doesn't extend {@link HTMLPanel} is because it
* doesn't provide any way to build the panel lazily (which is needed here).
+ *
+ * TODO(rdcastro): Rename this RenderablePanel.
*/
-public class AttachableHTMLPanel extends ComplexPanel implements Attachable {
+public class AttachableHTMLPanel extends ComplexPanel implements IsRenderable {
private static Element hiddenDiv;
@@ -160,7 +162,7 @@
* No-op if called with an Attachable that isn't also IsWidget,
* but safe to call with such as a convenience.
*/
- public void logicalAdd(Attachable attachable) {
+ public void logicalAdd(IsRenderable attachable) {
if (!(attachable instanceof IsWidget)) {
// Nothing to do if not a Widget.
return;
diff --git a/user/src/com/google/gwt/user/client/ui/Attachable.java b/user/src/com/google/gwt/user/client/ui/IsRenderable.java
similarity index 95%
rename from user/src/com/google/gwt/user/client/ui/Attachable.java
rename to user/src/com/google/gwt/user/client/ui/IsRenderable.java
index 6eff6f9..840f81c 100644
--- a/user/src/com/google/gwt/user/client/ui/Attachable.java
+++ b/user/src/com/google/gwt/user/client/ui/IsRenderable.java
@@ -26,7 +26,7 @@
* API is likely to change. Very likely. In fact, it will definitely change.
* You've been warned.
*/
-public interface Attachable extends SafeHtmlRenderer<String> {
+public interface IsRenderable extends SafeHtmlRenderer<String> {
/**
* Replace the previous contents of the receiver with the given element,
