Merge branch '7-at-least-minor-version-number-should-be-change-for-nsd-support' into 'master'

Resolve "at least minor version number should be change for NSD support"

Closes #7

See merge request RiseClipseGroup/RiseClipseValidator_SCL2003!7

fr.centralesupelec.edf.riseclipse.iec61850.scl.tools/META-INF/MANIFEST.MF

@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: RiseClipse IEC61850 SCL Validator
 Bundle-Vendor: CentraleSupélec & EDF
 Bundle-SymbolicName: fr.centralesupelec.edf.riseclipse.iec61850.scl.validator
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.1.0.qualifier
 Export-Package: fr.centralesupelec.edf.riseclipse.iec61850.scl.validator
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.core.runtime,

fr.centralesupelec.edf.riseclipse.iec61850.scl.tools/pom.xml

@@ -4,17 +4,17 @@
  
   <groupId>fr.centralesupelec.edf.riseclipse</groupId>
   <artifactId>fr.centralesupelec.edf.riseclipse.iec61850.scl.tools</artifactId>
-  <version>1.0.2-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <parent>
     <groupId>fr.centralesupelec.edf.riseclipse</groupId>
     <artifactId>RiseClipseValidator_SCL2003</artifactId>
-    <version>1.0.2-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
   </parent>
 
   <properties>
-    <toolName>RiseClipseSCLValidator</toolName>
+    <toolName>RiseClipseValidatorSCL</toolName>
   </properties>
 
   <build>

fr.centralesupelec.edf.riseclipse.iec61850.scl.tools/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/RiseClipseValidatorSCL.java

@@ -43,6 +43,7 @@ import org.eclipse.emf.ecore.EValidator.SubstitutionLabelProvider;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.util.Diagnostician;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
+import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.ocl.pivot.validation.ComposedEValidator;
 
 public class RiseClipseValidatorSCL {
@@ -56,7 +57,7 @@ public class RiseClipseValidatorSCL {
     private static boolean oclValidation = false;
     private static boolean nsdValidation = false;
 
-    private static final IRiseClipseConsole console = new TextRiseClipseConsole();
+    @NonNull private static final IRiseClipseConsole console = new TextRiseClipseConsole();
 
     private static void usage() {
         console.setLevel( IRiseClipseConsole.INFO_LEVEL );
@@ -68,7 +69,7 @@ public class RiseClipseValidatorSCL {
         System.exit( -1 );
     }
 
-    public static void main( String[] args ) {
+    public static void main( @NonNull String[] args ) {
 
         if( args.length == 0 ) usage();
 
@@ -106,9 +107,9 @@ public class RiseClipseValidatorSCL {
         
         console.doNotDisplayIdenticalMessages();
 
-        ArrayList< String > oclFiles = new ArrayList<>();
-        ArrayList< String > nsdFiles = new ArrayList<>();
-        ArrayList< String > sclFiles = new ArrayList<>();
+        ArrayList< @NonNull String > oclFiles = new ArrayList<>();
+        ArrayList< @NonNull String > nsdFiles = new ArrayList<>();
+        ArrayList< @NonNull String > sclFiles = new ArrayList<>();
         for( int i = posFiles; i < args.length; ++i ) {
             if( args[i].endsWith( ".ocl" ) ) {
                 oclFiles.add( args[i] );
@@ -146,11 +147,11 @@ public class RiseClipseValidatorSCL {
         console.info( "Web site:" );
         console.info( "    http://wdi.supelec.fr/software/RiseClipse/" );
         console.info( "" );
-        console.info( "RiseClipseValidatorSCL version: 1.0.0 (2 april 2019)" );
+        console.info( "RiseClipseValidatorSCL version: 1.1.0 (11 april 2019)" );
         console.info( "" );
     }
 
-    private static void prepare( ArrayList< String > oclFiles, ArrayList< String > nsdFiles ) {
+    private static void prepare( ArrayList< @NonNull String > oclFiles, ArrayList< @NonNull String > nsdFiles ) {
         SclPackage sclPg = SclPackage.eINSTANCE;
         if( sclPg == null ) {
             throw new RiseClipseFatalException( "SCL package not found", null );
@@ -180,7 +181,7 @@ public class RiseClipseValidatorSCL {
 
     }
 
-    private static void run( boolean make_explicit_links, String sclFile ) {
+    private static void run( boolean make_explicit_links, @NonNull String sclFile ) {
         sclLoader.reset();
         Resource resource = sclLoader.loadWithoutValidation( sclFile );
         if( make_explicit_links ) {
@@ -193,7 +194,7 @@ public class RiseClipseValidatorSCL {
         }
     }
 
-    private static void validate( Resource resource, final AdapterFactory adapter ) {
+    private static void validate( @NonNull Resource resource, final AdapterFactory adapter ) {
         Map< Object, Object > context = new HashMap< Object, Object >();
         SubstitutionLabelProvider substitutionLabelProvider = new EValidator.SubstitutionLabelProvider() {
 

pom.xml

@@ -4,7 +4,7 @@
  
   <groupId>fr.centralesupelec.edf.riseclipse</groupId>
   <artifactId>RiseClipseValidator_SCL2003</artifactId>
-  <version>1.0.2-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   
   <parent>