diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.tools/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/AnyLNValidator.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.tools/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/AnyLNValidator.java index 52e90548293764c201ff6fe31e553b9d6ef95821..fca7c7e285b07419e8fcf2a13125250a8a7acc0a 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.tools/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/AnyLNValidator.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.tools/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/AnyLNValidator.java @@ -55,7 +55,7 @@ public class AnyLNValidator { } - public void generateValidators( HashMap< String, DataObject > doMap, HashMap< String, DOIValidator > cdcMap, AnyLNClass lnClass ) { + private void generateValidators( HashMap< String, DataObject > doMap, HashMap< String, DOIValidator > cdcMap, AnyLNClass lnClass ) { for( DataObject dObj : lnClass.getDataObject() ) { doMap.put( dObj.getName(), dObj ); if( dObj.getRefersToCDC() != null ) { @@ -110,7 +110,7 @@ public class AnyLNValidator { return res; } - public boolean checkCompulsory( AnyLN ln, DataObject dataObject, HashSet< String > checkedDO, DiagnosticChain diagnostics ) { + private boolean checkCompulsory( AnyLN ln, DataObject dataObject, HashSet< String > checkedDO, DiagnosticChain diagnostics ) { switch( dataObject.getPresCond() ) { case "M": if( ! checkedDO.contains( dataObject.getName() ) ) { @@ -122,11 +122,15 @@ public class AnyLNValidator { new Object[] { ln } )); return false; } + break; + default: + AbstractRiseClipseConsole.getConsole().info( "NOT IMPLEMENTED: AnyLNValidator.checkCompulsory( " + dataObject.getPresCond() + " )" ); + break; } return true; } - public boolean updateCompulsory( DOI doi, HashSet< String > checkedDO, DiagnosticChain diagnostics ) { + private boolean updateCompulsory( DOI doi, HashSet< String > checkedDO, DiagnosticChain diagnostics ) { switch( doMap.get( doi.getName() ).getPresCond() ) { case "M": case "O": @@ -149,11 +153,14 @@ public class AnyLNValidator { "DO " + doi + " is forbidden in LN at line " + doi.getParentAnyLN().getLineNumber(), new Object[] { doi } )); return false; + default: + AbstractRiseClipseConsole.getConsole().info( "NOT IMPLEMENTED: AnyLNValidator.updateCompulsory( " + doMap.get( doi.getName() ).getPresCond() + " )" ); + break; } return true; } - public boolean validateDOI( DOI doi, DiagnosticChain diagnostics ) { + private boolean validateDOI( DOI doi, DiagnosticChain diagnostics ) { AbstractRiseClipseConsole.getConsole().verbose( "found DO " + doi.getName() + " in LNClass " + lnClass ); diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.tools/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/DOIValidator.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.tools/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/DOIValidator.java index 7f0d30695d9afca2f916d4795ce2dede4980eed6..a75df404eec3b5575462cf213c86ac0ea778a1e6 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.tools/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/DOIValidator.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.tools/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/DOIValidator.java @@ -102,6 +102,10 @@ public class DOIValidator { new Object[] { da } )); return false; } + break; + default: + AbstractRiseClipseConsole.getConsole().info( "NOT IMPLEMENTED: DOIValidator.checkCompulsory( " + da.getPresCond() + " )" ); + break; } return true; } @@ -131,6 +135,9 @@ public class DOIValidator { "DAI " + dai.getName() + " (line " + dai.getLineNumber() + ") is forbidden", new Object[] { dai } )); return false; + default: + AbstractRiseClipseConsole.getConsole().info( "NOT IMPLEMENTED: DOIValidator.updateCompulsory( " + daMap.get( dai.getName() ).getPresCond() + " )" ); + break; } return true; } @@ -247,6 +254,7 @@ public class DOIValidator { } } + @SuppressWarnings( "unused" ) private void testValidateVal() { log( "\n--\tSTART TEST\t--\n" ); assertTrue( validateVal( "0", "BOOLEAN" ) ); diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.tools/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/NsdEObjectValidator.java b/fr.centralesupelec.edf.riseclipse.iec61850.scl.tools/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/NsdEObjectValidator.java index fa2ef5eaec29ce8f402b377bb2dd85a8c65c7fac..fd57da4b0c38740da71e662438523c0880f46da2 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.scl.tools/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/NsdEObjectValidator.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.scl.tools/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/NsdEObjectValidator.java @@ -89,7 +89,7 @@ public class NsdEObjectValidator implements EValidator { return true; } - public boolean validateLN( AnyLN ln, DiagnosticChain diagnostics ) { + private boolean validateLN( AnyLN ln, DiagnosticChain diagnostics ) { AbstractRiseClipseConsole.getConsole().verbose( "" ); AbstractRiseClipseConsole.getConsole().verbose( "NsdEObjectValidator.validateLN( " + ln.getLnClass() + " )" );