commit 5e77caee6b54a58b59686575518726f9ce887ce8
author Shawn O. Pearce <sop@google.com> Fri May 15 15:40:57 2009 -0700
committer Shawn O. Pearce <sop@google.com> Fri May 15 15:41:08 2009 -0700
tree 0f0796c8bfc5ff2987dde0b0a75df28a4c65d1fd
parent 77f65d5148421f4e1b797e131a2b4cc2edce701d

Add methods to obtain the current HTML as a SafeHtml

This way an application can append more text onto the
existing, already safe HTML data, and then put it back
into the widget, without causing double escaping on the
existing content.

Signed-off-by: Shawn O. Pearce <sop@google.com>

src/main/java/com/google/gwtexpui/safehtml/client/SafeHtml.java

diff --git a/src/main/java/com/google/gwtexpui/safehtml/client/SafeHtml.java b/src/main/java/com/google/gwtexpui/safehtml/client/SafeHtml.java
index a14a8c4..af7602f 100644
--- a/src/main/java/com/google/gwtexpui/safehtml/client/SafeHtml.java
+++ b/src/main/java/com/google/gwtexpui/safehtml/client/SafeHtml.java
@@ -24,18 +24,33 @@
 
 /** Immutable string safely placed as HTML without further escaping. */
 public abstract class SafeHtml {
+  /** @return the existing HTML property of a widget. */
+  public static SafeHtml get(final HasHTML t) {
+    return new SafeHtmlString(t.getHTML());
+  }
+
   /** Set the HTML property of a widget. */
   public static <T extends HasHTML> T set(final T e, final SafeHtml str) {
     e.setHTML(str.asString());
     return e;
   }
 
+  /** @return the existing inner HTML of any element. */
+  public static SafeHtml get(final Element e) {
+    return new SafeHtmlString(DOM.getInnerHTML(e));
+  }
+
   /** Set the inner HTML of any element. */
   public static Element set(final Element e, final SafeHtml str) {
     DOM.setInnerHTML(e, str.asString());
     return e;
   }
 
+  /** @return the existing inner HTML of a table cell. */
+  public static SafeHtml get(final HTMLTable t, final int row, final int col) {
+    return new SafeHtmlString(t.getHTML(row, col));
+  }
+
   /** Set the inner HTML of a table cell. */
   public static <T extends HTMLTable> T set(final T t, final int row,
       final int col, final SafeHtml str) {
@@ -50,7 +65,9 @@
 
   /** Convert bare http:// and https:// URLs into &lt;a href&gt; tags. */
   public SafeHtml linkify() {
-    return replaceAll("(https?://[a-zA-Z0-9$_.+!*',%;:@&=?#/()-]{1,}[a-zA-Z0-9$_.+!*',%;:@&=?#/-])", "<a href=\"$1\">$1</a>");
+    return replaceAll(
+        "(https?://[a-zA-Z0-9$_.+!*',%;:@&=?#/()-]{1,}[a-zA-Z0-9$_.+!*',%;:@&=?#/-])",
+        "<a href=\"$1\">$1</a>");
   }
 
   /**
@@ -78,7 +95,7 @@
           r.br();
         }
         r.closeElement("p");
-        
+
       } else if (isList(p)) {
         r.openElement("ul");
         r.setStyleName("gwtexpui-SafeHtml-WikiList");
@@ -91,7 +108,7 @@
           r.closeElement("li");
         }
         r.closeElement("ul");
-        
+
       } else {
         r.openElement("p");
         r.append(new SafeHtmlString(p));