diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.tools/pom.xml b/fr.centralesupelec.edf.riseclipse.iec61850.scl.tools/pom.xml index fc5919a2cc4534fdb16da50733dee6e2b7499f3f..7af5f102ff92e8a4100763ee16b0a34db6061ce6 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.tools/pom.xml +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.tools/pom.xml @@ -39,7 +39,7 @@ <configuration> <transformers> <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"> - <mainClass>fr.centralesupelec.edf.riseclipse.iec61850.scl.tools.RiseClipseSCLValidator</mainClass> + <mainClass>fr.centralesupelec.edf.riseclipse.iec61850.scl.validator.RiseClipseValidatorSCL</mainClass> </transformer> <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer"> <resource>plugin.properties</resource> diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.tools/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/RiseClipseValidatorSCL.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.tools/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/RiseClipseValidatorSCL.java index 0830aa7891779a297220eae3209218e401c8740b..6618121a8f67a7985096a14b82004125508aa70b 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.tools/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/RiseClipseValidatorSCL.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.tools/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/RiseClipseValidatorSCL.java @@ -70,15 +70,10 @@ public class RiseClipseValidatorSCL { public static void main( String[] args ) { - console.setLevel( IRiseClipseConsole.INFO_LEVEL ); - displayLegal(); - console.setLevel( IRiseClipseConsole.WARNING_LEVEL ); - - console.doNotDisplayIdenticalMessages(); - if( args.length == 0 ) usage(); - boolean make_explicit_links = false; + boolean makeExplicitLinks = false; + boolean displayCopyright = true; int posFiles = 0; for( int i = 0; i < args.length; ++i ) { @@ -91,7 +86,10 @@ public class RiseClipseValidatorSCL { console.setLevel( IRiseClipseConsole.VERBOSE_LEVEL ); } else if( "--make-explicit-links".equals( args[i] ) ) { - make_explicit_links = true; + makeExplicitLinks = true; + } + else if( "--do-not-display-copyright".equals( args[i] ) ) { + displayCopyright = false; } else { console.error( "Unrecognized option " + args[i] ); @@ -100,6 +98,14 @@ public class RiseClipseValidatorSCL { } } + if( displayCopyright ) { + int level = console.setLevel( IRiseClipseConsole.INFO_LEVEL ); + displayLegal(); + console.setLevel( level ); + } + + console.doNotDisplayIdenticalMessages(); + ArrayList< String > oclFiles = new ArrayList<>(); ArrayList< String > nsdFiles = new ArrayList<>(); ArrayList< String > sclFiles = new ArrayList<>(); @@ -119,7 +125,7 @@ public class RiseClipseValidatorSCL { prepare( oclFiles, nsdFiles ); for( int i = 0; i < sclFiles.size(); ++i ) { - run( make_explicit_links, sclFiles.get( i )); + run( makeExplicitLinks, sclFiles.get( i )); } }