incubator-odf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From devin...@apache.org
Subject svn commit: r1172441 - in /incubator/odf/trunk/validator: schema.properties src/org/odftoolkit/odfvalidator/ContentFilter.java src/org/odftoolkit/odfvalidator/ForeignContentFilter.java src/org/odftoolkit/odfvalidator/MetaFilter.java
Date Mon, 19 Sep 2011 05:34:23 GMT
Author: devinhan
Date: Mon Sep 19 05:34:23 2011
New Revision: 1172441

URL: http://svn.apache.org/viewvc?rev=1172441&view=rev
Log:
changeset:   10:a5c719dedf4e
user:        bei
date:        Fri Feb 26 17:43:30 2010 +0100
odfdom-0.8 and odf1.2-cd04 schema

Modified:
    incubator/odf/trunk/validator/schema.properties
    incubator/odf/trunk/validator/src/org/odftoolkit/odfvalidator/ContentFilter.java
    incubator/odf/trunk/validator/src/org/odftoolkit/odfvalidator/ForeignContentFilter.java
    incubator/odf/trunk/validator/src/org/odftoolkit/odfvalidator/MetaFilter.java

Modified: incubator/odf/trunk/validator/schema.properties
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/validator/schema.properties?rev=1172441&r1=1172440&r2=1172441&view=diff
==============================================================================
--- incubator/odf/trunk/validator/schema.properties (original)
+++ incubator/odf/trunk/validator/schema.properties Mon Sep 19 05:34:23 2011
@@ -5,5 +5,5 @@ opendocument.v10.schema.state=-os
 opendocument.v11.schema.state=
 
 # State of the OpenDocument v1.2 specification
-opendocument.v12.part1.schema.state=-cd03-rev02
+opendocument.v12.part1.schema.state=-cd04
 opendocument.v12.part3.schema.state=-cd1

Modified: incubator/odf/trunk/validator/src/org/odftoolkit/odfvalidator/ContentFilter.java
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/validator/src/org/odftoolkit/odfvalidator/ContentFilter.java?rev=1172441&r1=1172440&r2=1172441&view=diff
==============================================================================
--- incubator/odf/trunk/validator/src/org/odftoolkit/odfvalidator/ContentFilter.java (original)
+++ incubator/odf/trunk/validator/src/org/odftoolkit/odfvalidator/ContentFilter.java Mon Sep
19 05:34:23 2011
@@ -34,12 +34,12 @@ class ContentFilter extends NamespaceFil
     private static final String CD2_SMIL_NAMESPACE_URI = "http://www.w3.org/2001/SMIL20/";
     private static final String BASE_OFFICE_NAMESPACE_URI = "http://openoffice.org/2004/office";
     private static final String BASE_DB_NAMESPACE_URI = "http://openoffice.org/2004/database";
-    private static final String SVG_NAMESPACE_URI = OdfNamespaceNames.SVG.getNamespaceUri();
-    private static final String XSL_NAMESPACE_URI = OdfNamespaceNames.FO.getNamespaceUri();
-    private static final String SMIL_NAMESPACE_URI = OdfNamespaceNames.SMIL.getNamespaceUri();
-    private static final String DRAW_NAMESPACE_URI = OdfNamespaceNames.DRAW.getNamespaceUri();
-    private static final String OFFICE_NAMESPACE_URI = OdfNamespaceNames.OFFICE.getNamespaceUri();
-    private static final String DB_NAMESPACE_URI = OdfNamespaceNames.DB.getNamespaceUri();
+    private static final String SVG_NAMESPACE_URI = OdfNamespaceNames.SVG.getUri();
+    private static final String XSL_NAMESPACE_URI = OdfNamespaceNames.FO.getUri();
+    private static final String SMIL_NAMESPACE_URI = OdfNamespaceNames.SMIL.getUri();
+    private static final String DRAW_NAMESPACE_URI = OdfNamespaceNames.DRAW.getUri();
+    private static final String OFFICE_NAMESPACE_URI = OdfNamespaceNames.OFFICE.getUri();
+    private static final String DB_NAMESPACE_URI = OdfNamespaceNames.DB.getUri();
     private static final String BASE_OFFICE_NAMESPACE_PREFIX = "office";
     private static final String POLYGON = "polygon";
     private static final String CONTOUR_POLYGON = "contour-polygon";

Modified: incubator/odf/trunk/validator/src/org/odftoolkit/odfvalidator/ForeignContentFilter.java
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/validator/src/org/odftoolkit/odfvalidator/ForeignContentFilter.java?rev=1172441&r1=1172440&r2=1172441&view=diff
==============================================================================
--- incubator/odf/trunk/validator/src/org/odftoolkit/odfvalidator/ForeignContentFilter.java
(original)
+++ incubator/odf/trunk/validator/src/org/odftoolkit/odfvalidator/ForeignContentFilter.java
Mon Sep 19 05:34:23 2011
@@ -32,8 +32,8 @@ import org.xml.sax.helpers.XMLFilterImpl
 
 class ForeignContentFilter extends XMLFilterImpl {
 
-    private static final String OFFICE_NAMESPACE_URI = OdfNamespaceNames.OFFICE.getNamespaceUri();
-    private static final String TEXT_NAMESPACE_URI = OdfNamespaceNames.TEXT.getNamespaceUri();
+    private static final String OFFICE_NAMESPACE_URI = OdfNamespaceNames.OFFICE.getUri();
+    private static final String TEXT_NAMESPACE_URI = OdfNamespaceNames.TEXT.getUri();
 
     private static final String H = "h";
     private static final String P = "p";
@@ -68,30 +68,30 @@ class ForeignContentFilter extends XMLFi
         m_aParagraphAncestorElements = new Vector<Boolean>();
         
         m_aODFNamespaceSet = new HashSet<String>();
-        m_aODFNamespaceSet.add( OdfNamespaceNames.OFFICE.getNamespaceUri() );
-        m_aODFNamespaceSet.add( OdfNamespaceNames.STYLE.getNamespaceUri() );
-        m_aODFNamespaceSet.add( OdfNamespaceNames.TEXT.getNamespaceUri() );
-        m_aODFNamespaceSet.add( OdfNamespaceNames.TABLE.getNamespaceUri() );
-        m_aODFNamespaceSet.add( OdfNamespaceNames.DRAW.getNamespaceUri() );
-        m_aODFNamespaceSet.add( OdfNamespaceNames.FO.getNamespaceUri() );
-        m_aODFNamespaceSet.add( OdfNamespaceNames.DC.getNamespaceUri() );
-        m_aODFNamespaceSet.add( OdfNamespaceNames.META.getNamespaceUri() );
-        m_aODFNamespaceSet.add( OdfNamespaceNames.NUMBER.getNamespaceUri() );
-        m_aODFNamespaceSet.add( OdfNamespaceNames.SVG.getNamespaceUri() );
-        m_aODFNamespaceSet.add( OdfNamespaceNames.CHART.getNamespaceUri() );
-        m_aODFNamespaceSet.add( OdfNamespaceNames.DR3D.getNamespaceUri() );
-        m_aODFNamespaceSet.add( OdfNamespaceNames.FORM.getNamespaceUri() );
-        m_aODFNamespaceSet.add( OdfNamespaceNames.PRESENTATION.getNamespaceUri() );
-        m_aODFNamespaceSet.add( OdfNamespaceNames.SMIL.getNamespaceUri() );
-        m_aODFNamespaceSet.add( OdfNamespaceNames.CONFIG.getNamespaceUri() );
-        m_aODFNamespaceSet.add( OdfNamespaceNames.SCRIPT.getNamespaceUri() );
-        m_aODFNamespaceSet.add( OdfNamespaceNames.XLINK.getNamespaceUri() );
-        m_aODFNamespaceSet.add( OdfNamespaceNames.XFORMS.getNamespaceUri() );
+        m_aODFNamespaceSet.add( OdfNamespaceNames.OFFICE.getUri() );
+        m_aODFNamespaceSet.add( OdfNamespaceNames.STYLE.getUri() );
+        m_aODFNamespaceSet.add( OdfNamespaceNames.TEXT.getUri() );
+        m_aODFNamespaceSet.add( OdfNamespaceNames.TABLE.getUri() );
+        m_aODFNamespaceSet.add( OdfNamespaceNames.DRAW.getUri() );
+        m_aODFNamespaceSet.add( OdfNamespaceNames.FO.getUri() );
+        m_aODFNamespaceSet.add( OdfNamespaceNames.DC.getUri() );
+        m_aODFNamespaceSet.add( OdfNamespaceNames.META.getUri() );
+        m_aODFNamespaceSet.add( OdfNamespaceNames.NUMBER.getUri() );
+        m_aODFNamespaceSet.add( OdfNamespaceNames.SVG.getUri() );
+        m_aODFNamespaceSet.add( OdfNamespaceNames.CHART.getUri() );
+        m_aODFNamespaceSet.add( OdfNamespaceNames.DR3D.getUri() );
+        m_aODFNamespaceSet.add( OdfNamespaceNames.FORM.getUri() );
+        m_aODFNamespaceSet.add( OdfNamespaceNames.PRESENTATION.getUri() );
+        m_aODFNamespaceSet.add( OdfNamespaceNames.SMIL.getUri() );
+        m_aODFNamespaceSet.add( OdfNamespaceNames.CONFIG.getUri() );
+        m_aODFNamespaceSet.add( OdfNamespaceNames.SCRIPT.getUri() );
+        m_aODFNamespaceSet.add( OdfNamespaceNames.XLINK.getUri() );
+        m_aODFNamespaceSet.add( OdfNamespaceNames.XFORMS.getUri() );
         if( m_aVersion.compareTo( OdfVersion.V1_2 ) >= 0 )
         {
-            m_aODFNamespaceSet.add( OdfNamespaceNames.XHTML.getNamespaceUri() );
-            m_aODFNamespaceSet.add( OdfNamespaceNames.GRDDL.getNamespaceUri() );
-            m_aODFNamespaceSet.add( OdfNamespaceNames.DB.getNamespaceUri() );
+            m_aODFNamespaceSet.add( OdfNamespaceNames.XHTML.getUri() );
+            m_aODFNamespaceSet.add( OdfNamespaceNames.GRDDL.getUri() );
+            m_aODFNamespaceSet.add( OdfNamespaceNames.DB.getUri() );
             m_aODFNamespaceSet.add( javax.xml.XMLConstants.XML_NS_URI );
         }
     }

Modified: incubator/odf/trunk/validator/src/org/odftoolkit/odfvalidator/MetaFilter.java
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/validator/src/org/odftoolkit/odfvalidator/MetaFilter.java?rev=1172441&r1=1172440&r2=1172441&view=diff
==============================================================================
--- incubator/odf/trunk/validator/src/org/odftoolkit/odfvalidator/MetaFilter.java (original)
+++ incubator/odf/trunk/validator/src/org/odftoolkit/odfvalidator/MetaFilter.java Mon Sep
19 05:34:23 2011
@@ -33,8 +33,8 @@ class MetaFilter extends XMLFilterImpl {
     private String m_aGenerator = "";
     private boolean m_bRoot = true;
     
-    private static final String META_NAMESPACE_URI = OdfNamespaceNames.META.getNamespaceUri();
-    private static final String OFFICE_NAMESPACE_URI = OdfNamespaceNames.OFFICE.getNamespaceUri();
+    private static final String META_NAMESPACE_URI = OdfNamespaceNames.META.getUri();
+    private static final String OFFICE_NAMESPACE_URI = OdfNamespaceNames.OFFICE.getUri();
     private static final String GENERATOR = "generator";
     private static final String DOCUMENT_META = "document-meta";
 



Mime
View raw message