User: kz      
Date: 2008-05-05 15:29:58+0000
Modified:
   
dba/reportdesign/java/com/sun/star/report/pentaho/styles/StyleMappingDocumentReadHandler.java

Log:
 INTEGRATION: CWS dba30beta (1.3.6); FILE MERGED
 2008/04/22 10:30:34 oj 1.3.6.1: #i88503# merge changes from rptchart02

File Changes:

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

File [changed]: StyleMappingDocumentReadHandler.java
Url: 
http://dba.openoffice.org/source/browse/dba/reportdesign/java/com/sun/star/report/pentaho/styles/StyleMappingDocumentReadHandler.java?r1=1.3&r2=1.4
Delta lines:  +52 -58
---------------------
--- StyleMappingDocumentReadHandler.java        2008-04-10 18:02:42+0000        
1.3
+++ StyleMappingDocumentReadHandler.java        2008-05-05 15:29:55+0000        
1.4
@@ -27,12 +27,11 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
-
 package com.sun.star.report.pentaho.styles;
 
 import java.util.ArrayList;
 
+import java.util.List;
 import org.jfree.xmlns.parser.AbstractXmlReadHandler;
 import org.jfree.xmlns.parser.XmlReadHandler;
 import org.xml.sax.SAXException;
@@ -46,8 +45,9 @@
  */
 public class StyleMappingDocumentReadHandler extends AbstractXmlReadHandler
 {
-  private StyleMapper styleMapper;
-  private ArrayList mappings;
+
+    private final StyleMapper styleMapper;
+    private final List mappings;
 
   public StyleMappingDocumentReadHandler()
   {
@@ -55,7 +55,6 @@
     this.styleMapper = new StyleMapper();
   }
 
-
   /**
    * Returns the handler for a child element.
    *
@@ -70,11 +69,7 @@
                                               final Attributes atts)
       throws SAXException
   {
-    if (isSameNamespace(uri) == false)
-    {
-      return null;
-    }
-    if ("mapping".equals(tagName))
+        if (isSameNamespace(uri) && "mapping".equals(tagName))
     {
       final StyleMappingReadHandler smr = new StyleMappingReadHandler();
       mappings.add(smr);
@@ -83,7 +78,6 @@
     return null;
   }
 
-
   /**
    * Done parsing.
    *




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

Reply via email to