[jboss-svn-commits] JBoss Portal SVN: r5609 - in trunk/theme/src/main/org/jboss/portal/theme: . deployment/jboss metadata
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Nov 9 11:15:59 EST 2006
Author: roy.russo at jboss.com
Date: 2006-11-09 11:15:56 -0500 (Thu, 09 Nov 2006)
New Revision: 5609
Modified:
trunk/theme/src/main/org/jboss/portal/theme/ThemeInfo.java
trunk/theme/src/main/org/jboss/portal/theme/ThemeLink.java
trunk/theme/src/main/org/jboss/portal/theme/ThemeScript.java
trunk/theme/src/main/org/jboss/portal/theme/ThemeService.java
trunk/theme/src/main/org/jboss/portal/theme/deployment/jboss/PortalThemeMetaDataFactory.java
trunk/theme/src/main/org/jboss/portal/theme/metadata/ThemeScriptMetaData.java
Log:
JBPORTAL-1105 - fixed mangling of HTML resources of scripts/links
Modified: trunk/theme/src/main/org/jboss/portal/theme/ThemeInfo.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/ThemeInfo.java 2006-11-09 00:19:18 UTC (rev 5608)
+++ trunk/theme/src/main/org/jboss/portal/theme/ThemeInfo.java 2006-11-09 16:15:56 UTC (rev 5609)
@@ -32,6 +32,7 @@
/**
* @author <a href="mailto:mholzner at novell.com">Martin Holzner</a>
+ * @author <a href="mailto:roy at jboss.org">Roy Russo</a>
* @version $Revision$
*/
public final class ThemeInfo
@@ -67,7 +68,7 @@
for (int i = 0; i < scripts.size(); i++)
{
ThemeScriptMetaData scriptMD = (ThemeScriptMetaData)scripts.get(i);
- ThemeScript script = new ThemeScript(ctx.getContextPath(), scriptMD.getSrc(), scriptMD.getId(), scriptMD.getType(), scriptMD.getBodyContent());
+ ThemeScript script = new ThemeScript(ctx.getContextPath(), scriptMD.getSrc(), scriptMD.getId(), scriptMD.getType(), scriptMD.getBodyContent(), scriptMD.getCharset());
scripts.set(i, script);
}
for (int i = 0; i < links.size(); i++)
Modified: trunk/theme/src/main/org/jboss/portal/theme/ThemeLink.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/ThemeLink.java 2006-11-09 00:19:18 UTC (rev 5608)
+++ trunk/theme/src/main/org/jboss/portal/theme/ThemeLink.java 2006-11-09 16:15:56 UTC (rev 5609)
@@ -134,16 +134,16 @@
}
StringBuffer link = new StringBuffer();
- link.append("<link rel='").append(rel).append("'");
+ link.append("<link rel=\"").append(rel).append("\"");
if (type != null)
{
- link.append(" type='").append(type).append("'");
+ link.append(" type=\"").append(type).append("\"");
}
if (id != null && !"".equals(id))
{
- link.append(" id='").append(id).append("'");
+ link.append(" id=\"").append(id).append("\"");
}
if (href != null)
@@ -156,16 +156,16 @@
correctHREF.append(contextPath);
}
correctHREF.append(href);
- link.append(" href='").append(correctHREF).append("'");
+ link.append(" href=\"").append(correctHREF).append("\"");
}
if (title != null && !"".equals(title))
{
- link.append(" title='").append(title).append("'");
+ link.append(" title=\"").append(title).append("\"");
}
if (media != null && !"".equals(media))
{
- link.append(" media='").append(media).append("'");
+ link.append(" media=\"").append(media).append("\"");
}
link.append(" />");
Modified: trunk/theme/src/main/org/jboss/portal/theme/ThemeScript.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/ThemeScript.java 2006-11-09 00:19:18 UTC (rev 5608)
+++ trunk/theme/src/main/org/jboss/portal/theme/ThemeScript.java 2006-11-09 16:15:56 UTC (rev 5609)
@@ -29,6 +29,7 @@
* represents a single script tag in the response markup.</p>
*
* @author Martin Holzner
+ * @author <a href="mailto:roy at jboss.org">Roy Russo</a>
* @version $LastChangedRevision$, $LastChangedDate$
* @see org.jboss.portal.theme.ThemeElement
*/
@@ -40,6 +41,7 @@
private final String src;
private final String type;
private final String id;
+ private final String charset;
private final String script;
/**
@@ -49,7 +51,7 @@
* @param src the value of the src attribute
* @param type the value of the type attribute
*/
- public ThemeScript(String contextPath, String src, String id, String type, String bodyContent)
+ public ThemeScript(String contextPath, String src, String id, String type, String bodyContent, String charset)
{
if (log.isDebugEnabled())
{
@@ -58,7 +60,8 @@
this.src = src;
this.id = id;
this.type = type;
- script = buildScriptMarkup(contextPath, src, id, type, bodyContent);
+ this.charset = charset;
+ script = buildScriptMarkup(contextPath, src, id, type, bodyContent, charset);
}
/** @see org.jboss.portal.theme.ThemeScript#getScript */
@@ -97,17 +100,22 @@
return this.src;
}
+ if ("charset".equals(attributeName))
+ {
+ return this.charset;
+ }
+
return null;
}
- private static String buildScriptMarkup(String contextPath, String src, String id, String type, String bodyContent)
+ private static String buildScriptMarkup(String contextPath, String src, String id, String type, String bodyContent, String charset)
{
if (log.isDebugEnabled())
{
log.debug("build script markup...");
}
StringBuffer script = new StringBuffer();
- script.append("<script ");
+ script.append("<script");
// adopt the context and inject a theme id param for the theme
// servlet to be able to pick up the resource from the correct theme
if (src != null && !"".equals(src))
@@ -118,22 +126,28 @@
correctSRC.append(contextPath);
}
correctSRC.append(src);
- script.append(" src='").append(correctSRC).append("'");
+ script.append(" src=\"").append(correctSRC).append("\"");
}
if (id != null && !"".equals(id))
{
- script.append(" id='").append(id).append("'");
+ script.append(" id=\"").append(id).append("\"");
}
if (type != null && !"".equals(type))
{
- script.append(" type='").append(type).append("'");
+ script.append(" type=\"").append(type).append("\"");
}
+ if (charset != null && !"".equals(charset))
+ {
+ script.append(" charset=\"").append(charset).append("\"");
+ }
+
if (bodyContent == null || "".equals(bodyContent))
{
- script.append(" />");
+ //script.append(" />");
+ script.append("></script>");
}
else
{
Modified: trunk/theme/src/main/org/jboss/portal/theme/ThemeService.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/ThemeService.java 2006-11-09 00:19:18 UTC (rev 5608)
+++ trunk/theme/src/main/org/jboss/portal/theme/ThemeService.java 2006-11-09 16:15:56 UTC (rev 5609)
@@ -30,6 +30,7 @@
* manager, and query it for available themes.</P>
*
* @author <a href="mailto:mholzner at novell.com">Martin Holzner</a>.
+ * @author <a href="mailto:roy at jboss.org">Roy Russo</a>
* @version <tt>$Revision$</tt>
*/
public interface ThemeService extends ThemeServiceInfo
Modified: trunk/theme/src/main/org/jboss/portal/theme/deployment/jboss/PortalThemeMetaDataFactory.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/deployment/jboss/PortalThemeMetaDataFactory.java 2006-11-09 00:19:18 UTC (rev 5608)
+++ trunk/theme/src/main/org/jboss/portal/theme/deployment/jboss/PortalThemeMetaDataFactory.java 2006-11-09 16:15:56 UTC (rev 5609)
@@ -33,6 +33,7 @@
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
+ * @author <a href="mailto:roy at jboss.org">Roy Russo</a>
* @version $Revision$
*/
public class PortalThemeMetaDataFactory implements ObjectModelFactory
@@ -82,6 +83,7 @@
script.setSrc(attrs.getValue("src"));
script.setId(attrs.getValue("id"));
script.setType(attrs.getValue("type"));
+ script.setCharset(attrs.getValue("charset"));
return script;
}
else if ("link".equals(localName))
Modified: trunk/theme/src/main/org/jboss/portal/theme/metadata/ThemeScriptMetaData.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/metadata/ThemeScriptMetaData.java 2006-11-09 00:19:18 UTC (rev 5608)
+++ trunk/theme/src/main/org/jboss/portal/theme/metadata/ThemeScriptMetaData.java 2006-11-09 16:15:56 UTC (rev 5609)
@@ -22,7 +22,9 @@
******************************************************************************/
package org.jboss.portal.theme.metadata;
-/** @author Martin Holzner */
+/** @author Martin Holzner
+ * @author <a href="mailto:roy at jboss.org">Roy Russo</a>
+ * */
public final class ThemeScriptMetaData
{
@@ -38,6 +40,8 @@
/** . */
private String bodyContent;
+ private String charset;
+
public String getSrc()
{
return src;
@@ -77,4 +81,14 @@
{
this.bodyContent = bodyContent;
}
+
+ public String getCharset()
+ {
+ return charset;
+ }
+
+ public void setCharset(String charset)
+ {
+ this.charset = charset;
+ }
}
More information about the jboss-svn-commits
mailing list