Author: hfnukal Date: 2011-08-02 01:53:57 -0400 (Tue, 02 Aug 2011) New Revision: 6970 Modified: epp/portal/branches/EPP_5_1_Branch/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIGadgetEditor.java epp/portal/branches/EPP_5_1_Branch/webui/core/src/main/java/org/exoplatform/webui/form/UIFormTextAreaInput.java Log: JBEPP-1023 JBEPP-1028 Remove EntityEncoder Modified: epp/portal/branches/EPP_5_1_Branch/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIGadgetEditor.java =================================================================== --- epp/portal/branches/EPP_5_1_Branch/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIGadgetEditor.java 2011-08-02 05:52:00 UTC (rev 6969) +++ epp/portal/branches/EPP_5_1_Branch/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIGadgetEditor.java 2011-08-02 05:53:57 UTC (rev 6970) @@ -123,6 +123,8 @@ UIFormStringInput uiInputName = getUIStringInput(FIELD_NAME); String encoded = StringEscapeUtils.escapeHtml(StringEscapeUtils.unescapeHtml(uiInputSource.getValue())); uiInputSource.setValue(encoded); + //uiInputSource.setValue(uiInputSource.getValue()); + if(this.isEdit()) { uiInputName.setEditable(false); } Modified: epp/portal/branches/EPP_5_1_Branch/webui/core/src/main/java/org/exoplatform/webui/form/UIFormTextAreaInput.java =================================================================== --- epp/portal/branches/EPP_5_1_Branch/webui/core/src/main/java/org/exoplatform/webui/form/UIFormTextAreaInput.java 2011-08-02 05:52:00 UTC (rev 6969) +++ epp/portal/branches/EPP_5_1_Branch/webui/core/src/main/java/org/exoplatform/webui/form/UIFormTextAreaInput.java 2011-08-02 05:53:57 UTC (rev 6970) @@ -21,8 +21,6 @@ import org.exoplatform.webui.application.WebuiRequestContext; import org.exoplatform.commons.serialization.api.annotations.Serialized; -import org.gatein.common.text.EntityEncoder; - import java.io.Writer; /** @@ -42,11 +40,6 @@ */ private int columns = 30; - /** - * HTML Entity Encoder - */ - private EntityEncoder entityEncoder = EntityEncoder.FULL; - public UIFormTextAreaInput() { } @@ -78,7 +71,9 @@ w.append(" cols=\"").append(String.valueOf(columns)).append("\""); w.write(">"); if (value != null) - w.write(entityEncoder.encode(value)); + //TODO: remove from other components and than encode here + //w.write(org.gatein.common.text.EntityEncoder.FULL.encode(value)); + w.write(value); w.write("</textarea>"); if (this.isMandatory()) w.write(" *");