From d6cf4c782a4ae4d8d220c4021e80cb8a703ede3c Mon Sep 17 00:00:00 2001
From: Dominique Marcadet <Dominique.Marcadet@centralesupelec.fr>
Date: Wed, 15 May 2019 23:53:26 +0200
Subject: [PATCH] avoid NPE if nothing on command line
---
.../iec61850/scl/validator/RiseClipseValidatorSCL.java | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
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 dcb7d73..2be0403 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
@@ -63,7 +63,7 @@ public class RiseClipseValidatorSCL {
private static void usage() {
console.setLevel( IRiseClipseConsole.INFO_LEVEL );
console.info( "java -jar RiseClipseValidatorSCL.jar --help" );
- console.info( "java -jar RiseClipseValidatorSCL.jar [--verbose | --info | --warning | --error] [--make-explicit-links] (<oclFile> | <nsdFile> | <sclFile>)*" );
+ console.info( "java -jar RiseClipseValidatorSCL.jar [--verbose | --info | --warning | --error] [--make-explicit-links] (<oclFile> | <nsdFile> | <sclFile>)+" );
console.info( "Files ending with \".ocl\" are considered OCL files, "
+ "files ending with \".nsd\" are considered NSD files, "
+ "files ending with \".nsdoc\" are considered NSDoc files, "
@@ -102,7 +102,10 @@ public class RiseClipseValidatorSCL {
public static void main( @NonNull String[] args ) {
- if( args.length == 0 ) usage();
+ if( args.length == 0 ) {
+ console = new TextRiseClipseConsole( false );
+ usage();
+ }
boolean makeExplicitLinks = false;
boolean useColor = false;
--
GitLab