[dba-cvs] CVS update: /dba/reportdesign/java/com/sun/star/report/pentaho/parser/text/NoCDATATextContentReadHandler.java

[kz]

User: kz      
Date: 2008-05-05 15:28:42+0000
Modified:
   
dba/reportdesign/java/com/sun/star/report/pentaho/parser/text/NoCDATATextContentReadHandler.java

Log:
 INTEGRATION: CWS dba30beta (1.3.18); FILE MERGED
 2008/04/22 10:30:33 oj 1.3.18.1: #i88503# merge changes from rptchart02

File Changes:

Directory: /dba/reportdesign/java/com/sun/star/report/pentaho/parser/text/
==========================================================================

File [changed]: NoCDATATextContentReadHandler.java
Url: 
http://dba.openoffice.org/source/browse/dba/reportdesign/java/com/sun/star/report/pentaho/parser/text/NoCDATATextContentReadHandler.java?r1=1.3&r2=1.4
Delta lines:  +7 -5
-------------------
--- NoCDATATextContentReadHandler.java  2008-03-05 17:48:40+0000        1.3
+++ NoCDATATextContentReadHandler.java  2008-05-05 15:28:39+0000        1.4
@@ -10,7 +10,9 @@
 import com.sun.star.report.pentaho.parser.rpt.FormattedTextReadHandler;
 import com.sun.star.report.pentaho.parser.rpt.ImageReadHandler;
 import com.sun.star.report.pentaho.OfficeNamespaces;
+import com.sun.star.report.OfficeToken;
 import com.sun.star.report.pentaho.parser.rpt.SubDocumentReadHandler;
+import java.util.List;
 import org.jfree.report.structure.Section;
 import org.jfree.report.structure.Element;
 import org.jfree.report.structure.StaticText;
@@ -28,7 +30,7 @@
 {
 
     private Section section;
-    private ArrayList children;
+    private List children;
     private boolean copyType;
 
     public NoCDATATextContentReadHandler(final Section section,
@@ -93,7 +95,7 @@
                 children.add(formattedTextReadHandler);
                 return formattedTextReadHandler;
             }
-            if ("image".equals(tagName))
+            if (OfficeToken.IMAGE.equals(tagName))
             {
                 final ImageReadHandler imageReadHandler = new 
ImageReadHandler();
                 children.add(imageReadHandler);
@@ -108,8 +110,8 @@
         }
         if (OfficeNamespaces.DRAWING_NS.equals(uri))
         {
-            XmlReadHandler readHandler = null;
-            if ("image".equals(tagName))
+            final XmlReadHandler readHandler;
+            if (OfficeToken.IMAGE.equals(tagName))
             {
                 readHandler = new ImageReadHandler();
             }
@@ -128,7 +130,7 @@
         }
     }
 
-    public ArrayList getChildren()
+    public List getChildren()
     {
         return children;
     }




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]