Change-Id: I9e20fa21ae2f503a8d34740fcef860c66b369c7btags/7.6.0.alpha7
@@ -2241,7 +2241,7 @@ public abstract class AbstractSelect extends AbstractField<Object> implements | |||
} | |||
String itemId; | |||
String caption = DesignFormatter.unencodeFromTextNode(child.html()); | |||
String caption = DesignFormatter.decodeFromTextNode(child.html()); | |||
if (child.hasAttr("item-id")) { | |||
itemId = child.attr("item-id"); | |||
addItem(itemId); |
@@ -584,7 +584,7 @@ public class Button extends AbstractFocusable implements | |||
} else { | |||
// content is not intended to be interpreted as HTML, | |||
// so html entities need to be decoded | |||
content = DesignFormatter.unencodeFromTextNode(design.html()); | |||
content = DesignFormatter.decodeFromTextNode(design.html()); | |||
} | |||
setCaption(content); | |||
if (attr.hasKey("icon-alt")) { |
@@ -2354,7 +2354,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier, | |||
} | |||
} else { | |||
// text – need to unescape HTML entities | |||
setText(DesignFormatter.unencodeFromTextNode(cellElement | |||
setText(DesignFormatter.decodeFromTextNode(cellElement | |||
.html())); | |||
} | |||
} |
@@ -594,7 +594,7 @@ public class Label extends AbstractComponent implements Property<String>, | |||
} | |||
if (innerHtml != null && !"".equals(innerHtml)) { | |||
if (plainText) { | |||
innerHtml = DesignFormatter.unencodeFromTextNode(innerHtml); | |||
innerHtml = DesignFormatter.decodeFromTextNode(innerHtml); | |||
} | |||
setValue(innerHtml); | |||
} |
@@ -283,7 +283,7 @@ public class OptionGroup extends AbstractSelect implements | |||
// like '>', '<' and '&'; in case HTML content is allowed this is | |||
// undesirable so we need to unencode entities. Entities other than | |||
// '<' and '>' will be taken care by Jsoup. | |||
elem.html(DesignFormatter.unencodeFromTextNode(elem.html())); | |||
elem.html(DesignFormatter.decodeFromTextNode(elem.html())); | |||
} | |||
return elem; |
@@ -6217,7 +6217,7 @@ public class Table extends AbstractSelect implements Action.Container, | |||
} | |||
Iterator<?> propertyIt = propertyIds.iterator(); | |||
for (Element e : elems) { | |||
String columnValue = DesignFormatter.unencodeFromTextNode(e | |||
String columnValue = DesignFormatter.decodeFromTextNode(e | |||
.html()); | |||
Object propertyId = propertyIt.next(); | |||
if (header) { | |||
@@ -6259,7 +6259,7 @@ public class Table extends AbstractSelect implements Action.Container, | |||
} | |||
Object[] data = new String[cells.size()]; | |||
for (int c = 0; c < cells.size(); ++c) { | |||
data[c] = DesignFormatter.unencodeFromTextNode(cells.get(c).html()); | |||
data[c] = DesignFormatter.decodeFromTextNode(cells.get(c).html()); | |||
} | |||
Object itemId = addItem(data, |
@@ -146,7 +146,7 @@ public class TextArea extends AbstractTextField { | |||
@Override | |||
public void readDesign(Element design, DesignContext designContext) { | |||
super.readDesign(design, designContext); | |||
setValue(DesignFormatter.unencodeFromTextNode(design.html()), false, | |||
setValue(DesignFormatter.decodeFromTextNode(design.html()), false, | |||
true); | |||
} | |||
@@ -403,11 +403,11 @@ public class DesignFormatter implements Serializable { | |||
* unencodes more characters than {@link #encodeForTextNode(String)} encodes | |||
* </p> | |||
* | |||
* @since 7.5.7 | |||
* @since | |||
* @param input | |||
* @return | |||
*/ | |||
public static String unencodeFromTextNode(String input) { | |||
public static String decodeFromTextNode(String input) { | |||
return Parser.unescapeEntities(input, false); | |||
} | |||