User: kz Date: 2008-05-05 14:55:19+0000 Modified: dba/reportdesign/java/com/sun/star/report/pentaho/parser/StarXmlFactoryModule.java
Log: INTEGRATION: CWS dba30beta (1.3.6); FILE MERGED 2008/04/22 10:30:29 oj 1.3.6.1: #i88503# merge changes from rptchart02 File Changes: Directory: /dba/reportdesign/java/com/sun/star/report/pentaho/parser/ ===================================================================== File [changed]: StarXmlFactoryModule.java Url: http://dba.openoffice.org/source/browse/dba/reportdesign/java/com/sun/star/report/pentaho/parser/StarXmlFactoryModule.java?r1=1.3&r2=1.4 Delta lines: +18 -27 --------------------- --- StarXmlFactoryModule.java 2008-04-10 17:43:34+0000 1.3 +++ StarXmlFactoryModule.java 2008-05-05 14:55:15+0000 1.4 @@ -27,8 +27,6 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ - - package com.sun.star.report.pentaho.parser; import org.jfree.xmlns.parser.XmlDocumentInfo; @@ -39,28 +37,21 @@ public class StarXmlFactoryModule implements XmlFactoryModule { - public StarXmlFactoryModule () + + public StarXmlFactoryModule() { } - public XmlReadHandler createReadHandler (final XmlDocumentInfo documentInfo) + public XmlReadHandler createReadHandler(final XmlDocumentInfo documentInfo) { return new DocumentContentReadHandler(); } - public int getDocumentSupport (final XmlDocumentInfo documentInfo) + public int getDocumentSupport(final XmlDocumentInfo documentInfo) { final String rootNamespace = documentInfo.getRootElementNameSpace(); - if (OfficeNamespaces.OFFICE_NS.equals(rootNamespace) == false) - { - return XmlFactoryModule.NOT_RECOGNIZED; - } - - if ("document-content".equals(documentInfo.getRootElement())) - { - return XmlFactoryModule.RECOGNIZED_BY_NAMESPACE; - } - if ("document".equals(documentInfo.getRootElement())) + if (OfficeNamespaces.OFFICE_NS.equals(rootNamespace) && + ("document-content".equals(documentInfo.getRootElement()) || "document".equals(documentInfo.getRootElement()))) { return XmlFactoryModule.RECOGNIZED_BY_NAMESPACE; } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
