User: kz Date: 2008-05-05 15:06:41+0000 Modified: dba/reportdesign/java/com/sun/star/report/pentaho/parser/office/MasterStylesReadHandler.java
Log: INTEGRATION: CWS dba30beta (1.3.6); FILE MERGED 2008/04/22 10:30:30 oj 1.3.6.1: #i88503# merge changes from rptchart02 File Changes: Directory: /dba/reportdesign/java/com/sun/star/report/pentaho/parser/office/ ============================================================================ File [changed]: MasterStylesReadHandler.java Url: http://dba.openoffice.org/source/browse/dba/reportdesign/java/com/sun/star/report/pentaho/parser/office/MasterStylesReadHandler.java?r1=1.3&r2=1.4 Delta lines: +63 -66 --------------------- --- MasterStylesReadHandler.java 2008-04-10 17:46:29+0000 1.3 +++ MasterStylesReadHandler.java 2008-05-05 15:06:23+0000 1.4 @@ -27,8 +27,6 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ - - package com.sun.star.report.pentaho.parser.office; import java.util.ArrayList; @@ -38,6 +36,7 @@ import com.sun.star.report.pentaho.parser.style.MasterPageReadHandler; import com.sun.star.report.pentaho.model.OfficeMasterStyles; import com.sun.star.report.pentaho.OfficeNamespaces; +import java.util.List; import org.jfree.report.structure.Element; import org.jfree.xmlns.parser.XmlReadHandler; import org.xml.sax.Attributes; @@ -51,9 +50,10 @@ */ public class MasterStylesReadHandler extends ElementReadHandler { - private OfficeMasterStyles masterStyles; - private ArrayList otherHandlers; - private ArrayList masterPageHandlers; + + private final OfficeMasterStyles masterStyles; + private final List otherHandlers; + private final List masterPageHandlers; public MasterStylesReadHandler(final OfficeMasterStyles masterStyles) { @@ -81,15 +81,12 @@ final Attributes atts) throws SAXException { - if (OfficeNamespaces.STYLE_NS.equals(uri)) - { - if ("master-page".equals(tagName)) + if (OfficeNamespaces.STYLE_NS.equals(uri) && "master-page".equals(tagName)) { final MasterPageReadHandler mrh = new MasterPageReadHandler(); masterPageHandlers.add(mrh); return mrh; } - } final StyleDefinitionReadHandler readHandler = new StyleDefinitionReadHandler(); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
