incubator-odf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From svanteschub...@apache.org
Subject svn commit: r1759340 - /incubator/odf/trunk/validator/src/main/java/org/odftoolkit/odfvalidator/Main.java
Date Mon, 05 Sep 2016 18:38:10 GMT
Author: svanteschubert
Date: Mon Sep  5 18:38:10 2016
New Revision: 1759340

URL: http://svn.apache.org/viewvc?rev=1759340&view=rev
Log:
#ODFTOOLKIT-438# ODFValidator: always honour input file on cmd line, by Vasily Melenchuk

Signed-off-by: Svante Schubert <svanteschubert@apache.org>

Modified:
    incubator/odf/trunk/validator/src/main/java/org/odftoolkit/odfvalidator/Main.java

Modified: incubator/odf/trunk/validator/src/main/java/org/odftoolkit/odfvalidator/Main.java
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/validator/src/main/java/org/odftoolkit/odfvalidator/Main.java?rev=1759340&r1=1759339&r2=1759340&view=diff
==============================================================================
--- incubator/odf/trunk/validator/src/main/java/org/odftoolkit/odfvalidator/Main.java (original)
+++ incubator/odf/trunk/validator/src/main/java/org/odftoolkit/odfvalidator/Main.java Mon
Sep  5 18:38:10 2016
@@ -226,8 +226,16 @@ public class Main {
                     System.out.println("error reading " + aConfigFile.getAbsolutePath() +
": " + e.getLocalizedMessage() );
                     return;
                 }
+
+                // Permit input file override from command line, even
+                // if config file is given
+                if( aFileNames.size() > 0 )
+                {
+                    // But just one for the while...
+                    aConfig.setProperty( Configuration.PATH, aFileNames.get(0) );
+                }
             }
-            
+
             if( aSchemaFileName != null )
             {
                 aConfig = new Configuration();



Mime
View raw message