Reviewers: skybrian, tbroyer,
Description:
Replace instances of element.setInnerHTML(safeHtml.asString())
with element.setInnerSafeHtml(safeHtml).
Please review this at http://gwt-code-reviews.appspot.com/1857803/
Affected files:
M
samples/showcase/src/com/google/gwt/sample/showcase/client/ContentWidgetView.java
M user/src/com/google/gwt/cell/client/AbstractCell.java
M user/src/com/google/gwt/cell/client/ImageLoadingCell.java
M user/src/com/google/gwt/dom/builder/client/DomBuilderImpl.java
M user/src/com/google/gwt/dom/builder/shared/HtmlBuilderImpl.java
M user/src/com/google/gwt/user/cellview/client/AbstractCellTable.java
M user/src/com/google/gwt/user/cellview/client/AbstractHasData.java
M user/src/com/google/gwt/user/cellview/client/CellBrowser.java
M user/src/com/google/gwt/user/cellview/client/CellTreeNodeView.java
M user/src/com/google/gwt/user/cellview/client/CellWidget.java
M user/src/com/google/gwt/user/client/ui/RenderablePanel.java
M user/src/com/google/gwt/user/client/ui/impl/ClippedImageImpl.java
M user/test/com/google/gwt/cell/client/ImageLoadingCellTest.java
M user/test/com/google/gwt/uibinder/test/client/UiRendererEventsTest.java
M user/test/com/google/gwt/uibinder/test/client/UiRendererTest.java
Index:
samples/showcase/src/com/google/gwt/sample/showcase/client/ContentWidgetView.java
===================================================================
---
samples/showcase/src/com/google/gwt/sample/showcase/client/ContentWidgetView.java
(revision 11343)
+++
samples/showcase/src/com/google/gwt/sample/showcase/client/ContentWidgetView.java
(working copy)
@@ -56,7 +56,7 @@
}
public void setDescription(SafeHtml html) {
- descElem.setInnerHTML(html.asString());
+ descElem.setInnerSafeHtml(html);
}
public void setExample(Widget widget) {
Index: user/src/com/google/gwt/cell/client/AbstractCell.java
===================================================================
--- user/src/com/google/gwt/cell/client/AbstractCell.java (revision 11343)
+++ user/src/com/google/gwt/cell/client/AbstractCell.java (working copy)
@@ -135,7 +135,7 @@
public void setValue(Context context, Element parent, C value) {
SafeHtmlBuilder sb = new SafeHtmlBuilder();
render(context, value, sb);
- parent.setInnerHTML(sb.toSafeHtml().asString());
+ parent.setInnerSafeHtml(sb.toSafeHtml());
}
/**
Index: user/src/com/google/gwt/cell/client/ImageLoadingCell.java
===================================================================
--- user/src/com/google/gwt/cell/client/ImageLoadingCell.java (revision
11343)
+++ user/src/com/google/gwt/cell/client/ImageLoadingCell.java (working copy)
@@ -195,8 +195,7 @@
imgWrapper.getStyle().setProperty("overflow", "auto");
} else if (BrowserEvents.ERROR.equals(type) &&
eventOccurredOnImage(event, parent)) {
// Replace the loading indicator with an error message.
- parent.getFirstChildElement().setInnerHTML(
- errorRenderer.render(value).asString());
+
parent.getFirstChildElement().setInnerSafeHtml(errorRenderer.render(value));
}
}
Index: user/src/com/google/gwt/dom/builder/client/DomBuilderImpl.java
===================================================================
--- user/src/com/google/gwt/dom/builder/client/DomBuilderImpl.java
(revision 11343)
+++ user/src/com/google/gwt/dom/builder/client/DomBuilderImpl.java (working
copy)
@@ -568,7 +568,7 @@
@Override
protected void doHtmlImpl(SafeHtml html) {
- getCurrentElement().setInnerHTML(html.asString());
+ getCurrentElement().setInnerSafeHtml(html);
}
@Override
Index: user/src/com/google/gwt/dom/builder/shared/HtmlBuilderImpl.java
===================================================================
--- user/src/com/google/gwt/dom/builder/shared/HtmlBuilderImpl.java
(revision 11343)
+++ user/src/com/google/gwt/dom/builder/shared/HtmlBuilderImpl.java
(working copy)
@@ -654,7 +654,7 @@
@Override
protected Element doFinishImpl() {
Element tmp = Document.get().createDivElement();
- tmp.setInnerHTML(asSafeHtml().asString());
+ tmp.setInnerSafeHtml(asSafeHtml());
return tmp.getFirstChildElement();
}
Index: user/src/com/google/gwt/user/cellview/client/AbstractCellTable.java
===================================================================
--- user/src/com/google/gwt/user/cellview/client/AbstractCellTable.java
(revision 11343)
+++ user/src/com/google/gwt/user/cellview/client/AbstractCellTable.java
(working copy)
@@ -475,11 +475,11 @@
*/
sectionTag = sectionTag.toLowerCase();
if ("tbody".equals(sectionTag)) {
- tmpElem.setInnerHTML(template.tbody(rowHtml).asString());
+ tmpElem.setInnerSafeHtml(template.tbody(rowHtml));
} else if ("thead".equals(sectionTag)) {
- tmpElem.setInnerHTML(template.thead(rowHtml).asString());
+ tmpElem.setInnerSafeHtml(template.thead(rowHtml));
} else if ("tfoot".equals(sectionTag)) {
- tmpElem.setInnerHTML(template.tfoot(rowHtml).asString());
+ tmpElem.setInnerSafeHtml(template.tfoot(rowHtml));
} else {
throw new IllegalArgumentException("Invalid table section tag: " +
sectionTag);
}
@@ -633,7 +633,7 @@
*/
protected void replaceAllRowsImpl(AbstractCellTable<?> table,
TableSectionElement section,
SafeHtml html) {
- section.setInnerHTML(html.asString());
+ section.setInnerSafeHtml(html);
}
}
Index: user/src/com/google/gwt/user/cellview/client/AbstractHasData.java
===================================================================
--- user/src/com/google/gwt/user/cellview/client/AbstractHasData.java
(revision 11343)
+++ user/src/com/google/gwt/user/cellview/client/AbstractHasData.java
(working copy)
@@ -363,7 +363,7 @@
// cached images.
DOM.setEventListener(tmpElem, widget);
- tmpElem.setInnerHTML(html.asString());
+ tmpElem.setInnerSafeHtml(html);
// Detach the event listener.
DOM.setEventListener(tmpElem, null);
@@ -386,7 +386,7 @@
}
// Render the HTML.
-
childContainer.setInnerHTML(CellBasedWidgetImpl.get().processHtml(html).asString());
+
childContainer.setInnerSafeHtml(CellBasedWidgetImpl.get().processHtml(html));
// Detach the event listener.
if (!widget.isAttached()) {
Index: user/src/com/google/gwt/user/cellview/client/CellBrowser.java
===================================================================
--- user/src/com/google/gwt/user/cellview/client/CellBrowser.java (revision
11343)
+++ user/src/com/google/gwt/user/cellview/client/CellBrowser.java (working
copy)
@@ -375,7 +375,7 @@
} else {
image = closedImageHtml;
}
- tmpElem.setInnerHTML(image.asString());
+ tmpElem.setInnerSafeHtml(image);
elem.replaceChild(tmpElem.getFirstChildElement(),
elem.getFirstChildElement());
// Update the open state.
Index: user/src/com/google/gwt/user/cellview/client/CellTreeNodeView.java
===================================================================
--- user/src/com/google/gwt/user/cellview/client/CellTreeNodeView.java
(revision 11343)
+++ user/src/com/google/gwt/user/cellview/client/CellTreeNodeView.java
(working copy)
@@ -1394,7 +1394,7 @@
html = LEAF_IMAGE;
}
Element tmp = Document.get().createDivElement();
- tmp.setInnerHTML(html.asString());
+ tmp.setInnerSafeHtml(html);
Element imageElem = tmp.getFirstChildElement();
Element oldImg = getImageElement();
Index: user/src/com/google/gwt/user/cellview/client/CellWidget.java
===================================================================
--- user/src/com/google/gwt/user/cellview/client/CellWidget.java (revision
11343)
+++ user/src/com/google/gwt/user/cellview/client/CellWidget.java (working
copy)
@@ -204,7 +204,7 @@
public void redraw() {
SafeHtmlBuilder sb = new SafeHtmlBuilder();
cell.render(createContext(), value, sb);
- getElement().setInnerHTML(sb.toSafeHtml().asString());
+ getElement().setInnerSafeHtml(sb.toSafeHtml());
/*
* The rendered Cell should fill the root element so height and width
styles
@@ -282,4 +282,4 @@
private Object getKey(C value) {
return (keyProvider == null || value == null) ? value :
keyProvider.getKey(value);
}
-}
\ No newline at end of file
+}
Index: user/src/com/google/gwt/user/client/ui/RenderablePanel.java
===================================================================
--- user/src/com/google/gwt/user/client/ui/RenderablePanel.java (revision
11343)
+++ user/src/com/google/gwt/user/client/ui/RenderablePanel.java (working
copy)
@@ -233,7 +233,7 @@
// Build the div that'll container the panel's HTML.
Element element = Document.get().createDivElement();
- element.setInnerHTML(getInnerHtml().asString());
+ element.setInnerSafeHtml(getInnerHtml());
// TODO(rdcastro): Implement something like
// element.mergeFrom(getElement());
Index: user/src/com/google/gwt/user/client/ui/impl/ClippedImageImpl.java
===================================================================
--- user/src/com/google/gwt/user/client/ui/impl/ClippedImageImpl.java
(revision 11343)
+++ user/src/com/google/gwt/user/client/ui/impl/ClippedImageImpl.java
(working copy)
@@ -63,7 +63,7 @@
public Element createStructure(SafeUri url, int left, int top, int
width, int height) {
Element tmp = Document.get().createSpanElement();
- tmp.setInnerHTML(getSafeHtml(url, left, top, width,
height).asString());
+ tmp.setInnerSafeHtml(getSafeHtml(url, left, top, width, height));
return tmp.getFirstChildElement();
}
Index: user/test/com/google/gwt/cell/client/ImageLoadingCellTest.java
===================================================================
--- user/test/com/google/gwt/cell/client/ImageLoadingCellTest.java
(revision 11343)
+++ user/test/com/google/gwt/cell/client/ImageLoadingCellTest.java (working
copy)
@@ -36,7 +36,7 @@
// Render the html.
Element elem = Document.get().createDivElement();
- elem.setInnerHTML(sb.toSafeHtml().asString());
+ elem.setInnerSafeHtml(sb.toSafeHtml());
// Verify the image.
assertEquals(2, elem.getChildCount());
@@ -56,7 +56,7 @@
// Render the html.
Element elem = Document.get().createDivElement();
- elem.setInnerHTML(sb.toSafeHtml().asString());
+ elem.setInnerSafeHtml(sb.toSafeHtml());
// Verify the image.
assertEquals(2, elem.getChildCount());
Index:
user/test/com/google/gwt/uibinder/test/client/UiRendererEventsTest.java
===================================================================
--- user/test/com/google/gwt/uibinder/test/client/UiRendererEventsTest.java
(revision 11343)
+++ user/test/com/google/gwt/uibinder/test/client/UiRendererEventsTest.java
(working copy)
@@ -170,7 +170,7 @@
bazReceiver = new MockBazReceiver();
uiParent = Document.get().createDivElement();
- uiParent.setInnerHTML(renderedUi.asString());
+ uiParent.setInnerSafeHtml(renderedUi);
Document.get().getBody().appendChild(uiParent);
uiRoot = Element.as(uiParent.getChild(0));
Index: user/test/com/google/gwt/uibinder/test/client/UiRendererTest.java
===================================================================
--- user/test/com/google/gwt/uibinder/test/client/UiRendererTest.java
(revision 11343)
+++ user/test/com/google/gwt/uibinder/test/client/UiRendererTest.java
(working copy)
@@ -51,7 +51,7 @@
renderer = UiRendererUi.getRenderer();
docDiv = Document.get().createDivElement();
- docDiv.setInnerHTML(renderedHtml.asString());
+ docDiv.setInnerSafeHtml(renderedHtml);
Document.get().getBody().appendChild(docDiv);
}
--
http://groups.google.com/group/Google-Web-Toolkit-Contributors
