incubator-odf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From devin...@apache.org
Subject svn commit: r1172455 - in /incubator/odf/trunk/validator/src/org/odftoolkit/odfvalidator: MetaInformation.java ODFPackageErrorHandler.java ODFPackageValidator.java
Date Mon, 19 Sep 2011 05:38:15 GMT
Author: devinhan
Date: Mon Sep 19 05:38:14 2011
New Revision: 1172455

URL: http://svn.apache.org/viewvc?rev=1172455&view=rev
Log:
changeset:   24:d5c3b6591dd7
user:        Svante Schubert <svanteschubert@odftoolkit.org>
date:        Tue Dec 07 17:40:57 2010 +0100
Fix OdfValidator to use streams original from the ZIP and update to new ODFDOM API  of 0.8.7-SNAPSHOT
of 6th December

Modified:
    incubator/odf/trunk/validator/src/org/odftoolkit/odfvalidator/MetaInformation.java
    incubator/odf/trunk/validator/src/org/odftoolkit/odfvalidator/ODFPackageErrorHandler.java
    incubator/odf/trunk/validator/src/org/odftoolkit/odfvalidator/ODFPackageValidator.java

Modified: incubator/odf/trunk/validator/src/org/odftoolkit/odfvalidator/MetaInformation.java
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/validator/src/org/odftoolkit/odfvalidator/MetaInformation.java?rev=1172455&r1=1172454&r2=1172455&view=diff
==============================================================================
--- incubator/odf/trunk/validator/src/org/odftoolkit/odfvalidator/MetaInformation.java (original)
+++ incubator/odf/trunk/validator/src/org/odftoolkit/odfvalidator/MetaInformation.java Mon
Sep 19 05:38:14 2011
@@ -60,7 +60,7 @@ public class MetaInformation {
     {
         try
         {
-            InputStream aInStream = aDocFile.getInputStream(OdfPackage.OdfFile.MANIFEST.getPath());
+            InputStream aInStream = aDocFile.getInputStream(OdfPackage.OdfFile.MANIFEST.getPath(),
true);
             Logger aLogger = new Logger(aDocFile.getBaseURI(),OdfPackage.OdfFile.MANIFEST.getPath(),m_aOut,
Logger.LogLevel.INFO);
         
             getInformation( aInStream, aLogger );

Modified: incubator/odf/trunk/validator/src/org/odftoolkit/odfvalidator/ODFPackageErrorHandler.java
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/validator/src/org/odftoolkit/odfvalidator/ODFPackageErrorHandler.java?rev=1172455&r1=1172454&r2=1172455&view=diff
==============================================================================
--- incubator/odf/trunk/validator/src/org/odftoolkit/odfvalidator/ODFPackageErrorHandler.java
(original)
+++ incubator/odf/trunk/validator/src/org/odftoolkit/odfvalidator/ODFPackageErrorHandler.java
Mon Sep 19 05:38:14 2011
@@ -105,7 +105,7 @@ class ODFPackageErrorHandler implements 
                 } else if (constraint instanceof OdfSchemaConstraint) {
                     switch (((OdfSchemaConstraint) constraint)) {
                         case DOCUMENT_WITHOUT_ODF_MIMETYPE:
-                        case PACKAGE_SHALL_CONTAIN_CONTENT_OR_STYLES_XML:
+                        case DOCUMENT_WITHOUT_CONTENT_NOR_STYLES_XML:
                             manifestLogger.logError(e.getMessage());
                             bRet = true;
                             continue LOOP;

Modified: incubator/odf/trunk/validator/src/org/odftoolkit/odfvalidator/ODFPackageValidator.java
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/validator/src/org/odftoolkit/odfvalidator/ODFPackageValidator.java?rev=1172455&r1=1172454&r2=1172455&view=diff
==============================================================================
--- incubator/odf/trunk/validator/src/org/odftoolkit/odfvalidator/ODFPackageValidator.java
(original)
+++ incubator/odf/trunk/validator/src/org/odftoolkit/odfvalidator/ODFPackageValidator.java
Mon Sep 19 05:38:14 2011
@@ -218,7 +218,7 @@ public abstract class ODFPackageValidato
         InputStream aInStream = null;
         try
         {
-            aInStream = aPkg.getInputStream(aEntryName);
+            aInStream = aPkg.getInputStream(aEntryName, true);
         }
         catch( Exception e )
         {
@@ -338,7 +338,7 @@ public abstract class ODFPackageValidato
         InputStream aInStream = null;
         try
         {
-            aInStream = getPackage(aLogger).getInputStream(aEntryName);
+            aInStream = getPackage(aLogger).getInputStream(aEntryName, true);
         }
         catch( Exception e )
         {
@@ -447,11 +447,11 @@ public abstract class ODFPackageValidato
         try
         {
             OdfPackage aPkg = getPackage(aLogger);
-            aInStream = aPkg.getInputStream(getStreamName(OdfDocument.OdfXMLFile.META.getFileName()));
+            aInStream = aPkg.getInputStream(getStreamName(OdfDocument.OdfXMLFile.META.getFileName()),
true);
             if( aInStream == null )
-                aInStream = aPkg.getInputStream(getStreamName(OdfDocument.OdfXMLFile.SETTINGS.getFileName()));
+                aInStream = aPkg.getInputStream(getStreamName(OdfDocument.OdfXMLFile.SETTINGS.getFileName()),
true);
             if( aInStream == null )
-                aInStream = aPkg.getInputStream(getStreamName(OdfDocument.OdfXMLFile.CONTENT.getFileName()));
+                aInStream = aPkg.getInputStream(getStreamName(OdfDocument.OdfXMLFile.CONTENT.getFileName()),
true);
             if (aInStream == null) { return null; }
         }
         catch( Exception e )



Mime
View raw message