User: kz Date: 2008-03-05 17:42:57+0000 Modified: dba/reportdesign/java/com/sun/star/report/pentaho/parser/rpt/FunctionReadHandler.java
Log: INTEGRATION: CWS rptchart01_DEV300 (1.2.70); FILE MERGED 2008/02/21 09:57:25 oj 1.2.70.2: #i85225# fixes found with PMD 2008/02/20 10:52:57 oj 1.2.70.1: format changes File Changes: Directory: /dba/reportdesign/java/com/sun/star/report/pentaho/parser/rpt/ ========================================================================= File [changed]: FunctionReadHandler.java Url: http://dba.openoffice.org/source/browse/dba/reportdesign/java/com/sun/star/report/pentaho/parser/rpt/FunctionReadHandler.java?r1=1.2&r2=1.3 Delta lines: +58 -67 --------------------- --- FunctionReadHandler.java 2007-07-09 11:56:09+0000 1.2 +++ FunctionReadHandler.java 2008-03-05 17:42:54+0000 1.3 @@ -33,8 +33,6 @@ * MA 02111-1307 USA * ************************************************************************/ - - package com.sun.star.report.pentaho.parser.rpt; import org.jfree.xmlns.parser.AbstractXmlReadHandler; @@ -44,7 +42,6 @@ import org.jfree.report.expressions.FormulaExpression; import org.xml.sax.SAXException; import org.xml.sax.Attributes; -import com.sun.star.report.pentaho.parser.StarXmlFactoryModule; import com.sun.star.report.pentaho.OfficeNamespaces; /** @@ -55,6 +52,7 @@ */ public class FunctionReadHandler extends AbstractXmlReadHandler { + private Expression expression; public FunctionReadHandler() @@ -70,26 +68,19 @@ protected void startParsing(final Attributes attrs) throws SAXException { - final String formula = attrs.getValue - (OfficeNamespaces.OOREPORT_NS, "formula"); + final String formula = attrs.getValue(OfficeNamespaces.OOREPORT_NS, "formula"); if (formula == null) { - throw new ParseException - ("Required attribute 'formula' is missing", getLocator()); + throw new ParseException("Required attribute 'formula' is missing", getLocator()); } - final String initialFormula = attrs.getValue - (OfficeNamespaces.OOREPORT_NS, "initial-formula"); - final String name = attrs.getValue - (OfficeNamespaces.OOREPORT_NS, "name"); + final String initialFormula = attrs.getValue(OfficeNamespaces.OOREPORT_NS, "initial-formula"); + final String name = attrs.getValue(OfficeNamespaces.OOREPORT_NS, "name"); if (name == null) { - throw new ParseException - ("Required attribute 'name' is missing", getLocator()); + throw new ParseException("Required attribute 'name' is missing", getLocator()); } - final String preEvaluated = attrs.getValue - (OfficeNamespaces.OOREPORT_NS, "pre-evaluated"); - final String deepTraversing = attrs.getValue - (OfficeNamespaces.OOREPORT_NS, "deep-traversing"); + final String preEvaluated = attrs.getValue(OfficeNamespaces.OOREPORT_NS, "pre-evaluated"); + final String deepTraversing = attrs.getValue(OfficeNamespaces.OOREPORT_NS, "deep-traversing"); if (initialFormula != null) { --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
