Author: bpapez
Date: Fri Sep 14 11:53:35 2007
New Revision: 18442
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18442&repname=
=3Djahia
Log:
fix due to JDK 1.4 compliance
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/b=
igtext_field.jsp
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/sh=
ared/bigtext_field.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/engines/shared/bigtext_field.jsp&rev=3D18=
442&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/b=
igtext_field.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/b=
igtext_field.jsp Fri Sep 14 11:53:35 2007
@@ -24,16 +24,18 @@
<%@ page import=3D"org.jahia.services.htmleditors.HtmlEditorCSS" %>
<%@ page import=3D"org.jahia.services.sites.JahiaSite" %>
<%@ page import=3D"java.util.*" %>
+<%@ page import=3D"java.util.regex.Pattern"%>
<%@ page import=3D"org.jahia.services.pages.JahiaPageDefinition"%>
<%@ page import=3D"org.jahia.services.pages.ContentPage"%>
<%@ page import=3D"org.jahia.engines.JahiaEngine"%>
<%@ page import=3D"org.jahia.engines.EngineLanguageHelper"%>
+<%@ page import=3D"org.jahia.data.fields.JahiaFieldDefinitionProperties"%>
<%@ taglib uri=3D"JahiaLib" prefix=3D"jahia" %>
<%@ taglib uri=3D"contentLib" prefix=3D"content" %>
<%@ taglib uri=3D"/WEB-INF/etc/struts/struts-bean" prefix=3D"bean" %>
<%@ taglib uri=3D"/WEB-INF/etc/struts/struts-html" prefix=3D"html" %>
<%@ taglib uri=3D"/WEB-INF/etc/struts/struts-logic" prefix=3D"logic" %>
-<[EMAIL PROTECTED]
import=3D"org.jahia.data.fields.JahiaFieldDefinitionProperties"%>
+
<jahia:i18n/>
=
<%
@@ -115,8 +117,12 @@
if (siteWildcardIndex !=3D -1) {
htmlEditorCSSUrl =3D htmlEditorCSSUrl.replace("%SITE_NAME%=
", =
jParams.getSiteKey());
- htmlEditorCSSDef =3D htmlEditorCSSDef.replace("%SITE_NAME%=
", =
- jParams.getSiteKey());
+ // TODO: use String.replace() once we drop Java 1.4 compli=
ance
+ Pattern siteNamePattern =3D Pattern.compile("%SITE_NAME%");
+ htmlEditorCSSUrl =3D siteNamePattern.matcher(
+
htmlEditorCSSUrl).replaceAll(jParams.getSiteKey());
+ htmlEditorCSSDef =3D siteNamePattern.matcher(
+
htmlEditorCSSDef).replaceAll(jParams.getSiteKey());
}
engineMap.put("htmlEditorCSS", htmlEditorCSS);
engineMap.put("htmlEditorCSSUrl", htmlEditorCSSUrl); =
=
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
