[MMBASE CVS] contributions/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/flash FlashTag.java

[avleeuwen]

Update of 
/var/cvs/contributions/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/flash
In directory 
james.mmbase.org:/tmp/cvs-serv2786/cmsc/taglib/src/java/com/finalist/cmsc/taglib/flash

Modified Files:
      Tag: b1_5
        FlashTag.java 
Log Message:
CMSC-1238 - The flash tag library doesn't allow percent values in width/height 
attribute


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/flash
See also: http://www.mmbase.org/jira/browse/CMSC-1238


Index: FlashTag.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/flash/FlashTag.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -b -r1.2 -r1.2.2.1
--- FlashTag.java       1 Jul 2008 08:21:31 -0000       1.2
+++ FlashTag.java       12 Jan 2009 17:51:16 -0000      1.2.2.1
@@ -1,5 +1,7 @@
 package com.finalist.cmsc.taglib.flash;
 
+import static org.apache.commons.lang.StringEscapeUtils.escapeJavaScript;
+
 import java.io.IOException;
 import java.io.StringWriter;
 import java.io.UnsupportedEncodingException;
@@ -14,7 +16,6 @@
 import javax.servlet.jsp.tagext.JspFragment;
 import javax.servlet.jsp.tagext.SimpleTagSupport;
 
-import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -41,8 +42,8 @@
 
    // REQUIRED ATTRIBUTES
    private String swfUrl;
-   private int width;
-   private int height;
+   private String width;
+   private String height;
 
    // OPTIONAL ATTRIBUTES
    private String version = "9.0.0";
@@ -144,18 +145,18 @@
       builder.append("swfobject.embedSWF(");
 
       // required
-      
builder.append("'").append(StringEscapeUtils.escapeJavaScript(getSwfUrl())).append("'");
-      builder.append(", 
'").append(StringEscapeUtils.escapeJavaScript(getId())).append("'");
-      builder.append(", 
'").append(StringEscapeUtils.escapeJavaScript(Integer.toString(getWidth()))).append("'");
-      builder.append(", 
'").append(StringEscapeUtils.escapeJavaScript(Integer.toString(getHeight()))).append("'");
-      builder.append(", 
'").append(StringEscapeUtils.escapeJavaScript(getVersion())).append("'");
+      builder.append("'").append(escapeJavaScript(getSwfUrl())).append("'");
+      builder.append(", '").append(escapeJavaScript(getId())).append("'");
+      builder.append(", '").append(escapeJavaScript(getWidth())).append("'");
+      builder.append(", '").append(escapeJavaScript(getHeight())).append("'");
+      builder.append(", '").append(escapeJavaScript(getVersion())).append("'");
 
       // optional, but we have to keep the order intact
       String installSwfUrl = getExpressInstallSwfUrl();
       if (installSwfUrl == null) {
          builder.append(", ").append(false);
       } else {
-         builder.append(", 
'").append(StringEscapeUtils.escapeJavaScript(installSwfUrl)).append("'");
+         builder.append(", 
'").append(escapeJavaScript(installSwfUrl)).append("'");
       }
       builder.append(", ").append(toObjectNotation(flashVars));
       builder.append(", ").append(toObjectNotation(params));
@@ -214,7 +215,7 @@
 
             if (value != null) {
                builder.append(entry.getKey()).append(": ");
-               
builder.append("'").append(StringEscapeUtils.escapeJavaScript(value)).append("'");
+               builder.append("'").append(escapeJavaScript(value)).append("'");
                builder.append(delimeter);
             }
          }
@@ -258,7 +259,7 @@
     *
     * @return the width
     */
-   public int getWidth() {
+   public String getWidth() {
       return width;
    }
 
@@ -268,7 +269,7 @@
     * @param width
     *           the width to set
     */
-   public void setWidth(int width) {
+   public void setWidth(String width) {
       this.width = width;
    }
 
@@ -277,7 +278,7 @@
     *
     * @return the height
     */
-   public int getHeight() {
+   public String getHeight() {
       return height;
    }
 
@@ -287,7 +288,7 @@
     * @param height
     *           the height to set
     */
-   public void setHeight(int height) {
+   public void setHeight(String height) {
       this.height = height;
    }
 
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs