Skip to content
Snippets Groups Projects
Commit 9acfa2f7 authored by Dominique Marcadet's avatar Dominique Marcadet
Browse files

Merge branch '6-path-to-main-class-is-wrong-in-pom-xml' into 'master'

Resolve "path to main class is wrong in pom.xml"

Closes #6

See merge request RiseClipseGroup/RiseClipseValidator_SCL2003!6
parents 7b98b910 84bb21b2
No related branches found
No related tags found
1 merge request!6Resolve "path to main class is wrong in pom.xml"
Pipeline #1261 passed
......@@ -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>
......
......@@ -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 ));
}
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment