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

[kz]

User: kz      
Date: 2008-05-05 15:27:31+0000
Modified:
   
dba/reportdesign/java/com/sun/star/report/pentaho/parser/table/TableReadHandler.java

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

File Changes:

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

File [changed]: TableReadHandler.java
Url: 
http://dba.openoffice.org/source/browse/dba/reportdesign/java/com/sun/star/report/pentaho/parser/table/TableReadHandler.java?r1=1.4&r2=1.5
Delta lines:  +29 -38
---------------------
--- TableReadHandler.java       2008-04-10 17:59:49+0000        1.4
+++ TableReadHandler.java       2008-05-05 15:27:27+0000        1.5
@@ -32,9 +32,11 @@
 import java.util.ArrayList;
 
 import com.sun.star.report.pentaho.OfficeNamespaces;
+import com.sun.star.report.OfficeToken;
 import com.sun.star.report.pentaho.model.OfficeTableSection;
 import com.sun.star.report.pentaho.parser.ElementReadHandler;
 import 
com.sun.star.report.pentaho.parser.rpt.ConditionalPrintExpressionReadHandler;
+import java.util.List;
 import org.jfree.report.structure.Element;
 import org.jfree.report.structure.Section;
 import org.jfree.xmlns.parser.XmlReadHandler;
@@ -49,13 +51,12 @@
 public class TableReadHandler extends ElementReadHandler
 {
 
-    private TableColumnsReadHandler columns;
-    private ArrayList tableRows;
-    private Section table;
+    private final List children;
+    private final Section table;
 
     public TableReadHandler()
     {
-        tableRows = new ArrayList();
+        children = new ArrayList();
         table = new OfficeTableSection();
     }
 
@@ -70,7 +71,7 @@
     {
         super.startParsing(attrs);
         final String enabled = attrs.getValue(OfficeNamespaces.OOREPORT_NS, 
"visible");
-        if (enabled == null || "true".equals(enabled))
+        if (enabled == null || OfficeToken.TRUE.equals(enabled))
         {
             table.setEnabled(true);
         }
@@ -94,36 +95,31 @@
             final Attributes atts)
             throws SAXException
     {
-        if (OfficeNamespaces.OOREPORT_NS.equals(uri))
-        {
-            if ("conditional-print-expression".equals(tagName))
+        if (OfficeNamespaces.OOREPORT_NS.equals(uri) && 
"conditional-print-expression".equals(tagName))
             {
                 return new ConditionalPrintExpressionReadHandler(table);
             }
-            return null;
-        }
-
-        if (OfficeNamespaces.TABLE_NS.equals(uri) == false)
+        else if (OfficeNamespaces.TABLE_NS.equals(uri))
         {
-            return null;
-        }
-        if ("table-columns".equals(tagName) || 
"table-header-columns".equals(tagName))
+            if (OfficeToken.TABLE_COLUMNS.equals(tagName) || 
OfficeToken.TABLE_HEADER_COLUMNS.equals(tagName))
         {
-            columns = new TableColumnsReadHandler();
+                final TableColumnsReadHandler columns = new 
TableColumnsReadHandler();
+                children.add(columns);
             return columns;
         }
-        if ("table-row".equals(tagName))
+            else if (OfficeToken.TABLE_ROW.equals(tagName))
         {
             final TableRowReadHandler rowHandler = new TableRowReadHandler();
-            tableRows.add(rowHandler);
+                children.add(rowHandler);
             return rowHandler;
         }
-        if ("table-rows".equals(tagName) || 
"table-header-rows".equals(tagName))
+            else if (OfficeToken.TABLE_ROWS.equals(tagName) || 
OfficeToken.TABLE_HEADER_ROWS.equals(tagName))
         {
             final TableRowsReadHandler rowsHandler = new 
TableRowsReadHandler();
-            tableRows.add(rowsHandler);
+                children.add(rowsHandler);
             return rowsHandler;
         }
+        }
         return null;
     }
 
@@ -134,14 +130,9 @@
      */
     protected void doneParsing() throws SAXException
     {
-        if (columns != null)
-        {
-            table.addNode(columns.getElement());
-        }
-
-        for (int i = 0; i < tableRows.size(); i++)
+        for (int i = 0; i < children.size(); i++)
         {
-            final TableRowReadHandler handler = (TableRowReadHandler) 
tableRows.get(i);
+            final ElementReadHandler handler = (ElementReadHandler) 
children.get(i);
             table.addNode(handler.getElement());
         }
     }




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