User: kz Date: 2008-05-05 15:29:40+0000 Modified: dba/reportdesign/java/com/sun/star/report/pentaho/styles/StyleMapperXmlFactoryModule.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]: StyleMapperXmlFactoryModule.java Url: http://dba.openoffice.org/source/browse/dba/reportdesign/java/com/sun/star/report/pentaho/styles/StyleMapperXmlFactoryModule.java?r1=1.3&r2=1.4 Delta lines: +22 -26 --------------------- --- StyleMapperXmlFactoryModule.java 2008-04-10 18:02:00+0000 1.3 +++ StyleMapperXmlFactoryModule.java 2008-05-05 15:29:37+0000 1.4 @@ -27,8 +27,6 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ - - package com.sun.star.report.pentaho.styles; import org.jfree.xmlns.parser.XmlDocumentInfo; @@ -43,6 +41,7 @@ */ public class StyleMapperXmlFactoryModule implements XmlFactoryModule { + public static final String NAMESPACE = "http://jfreereport.sourceforge.net/namespaces/engine/openoffice/stylemapper";; @@ -58,13 +57,10 @@ public int getDocumentSupport(final XmlDocumentInfo documentInfo) { final String rootNamespace = documentInfo.getRootElementNameSpace(); - if (StyleMapperXmlFactoryModule.NAMESPACE.equals(rootNamespace) == false) + if (StyleMapperXmlFactoryModule.NAMESPACE.equals(rootNamespace) && + "style-mapper-definition".equals(documentInfo.getRootElement())) { - return XmlFactoryModule.NOT_RECOGNIZED; - } - if ("style-mapper-definition".equals(documentInfo.getRootElement())) - { return XmlFactoryModule.RECOGNIZED_BY_NAMESPACE; } return XmlFactoryModule.NOT_RECOGNIZED; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
