From ae903f229a7d5ebb6a084409efe24d98fb26bcfa Mon Sep 17 00:00:00 2001 From: Dominique Marcadet <Dominique.Marcadet@centralesupelec.fr> Date: Mon, 11 Feb 2019 14:56:16 +0100 Subject: [PATCH] verbose() used when appropriate --- .../edf/riseclipse/iec61850/nsd/impl/AnyLNClassImpl.java | 2 +- .../riseclipse/iec61850/nsd/impl/DataAttributeImpl.java | 8 ++++---- .../edf/riseclipse/iec61850/nsd/impl/DataObjectImpl.java | 6 +++--- .../edf/riseclipse/iec61850/nsd/impl/DependsOnImpl.java | 2 +- .../edf/riseclipse/iec61850/nsd/impl/EnumerationImpl.java | 2 +- .../iec61850/nsd/impl/SubDataAttributeImpl.java | 2 +- .../riseclipse/iec61850/nsd/impl/SubDataObjectImpl.java | 8 ++++---- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AnyLNClassImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AnyLNClassImpl.java index 9044f7d..acb7be8 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AnyLNClassImpl.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/AnyLNClassImpl.java @@ -526,7 +526,7 @@ public abstract class AnyLNClassImpl extends TitledClassImpl implements AnyLNCla + ") in NS (id:" + lNClasses.getNS().getId() + ") is unknown" ); } else { - console.info( "AbstractLNClass (name: " + getBase() + ") refers by AnyLNClass (name: " + getName() + console.verbose( "AbstractLNClass (name: " + getBase() + ") refers by AnyLNClass (name: " + getName() + ") in NS (id:" + lNClasses.getNS().getId() + ") found in NS (id:" + getRefersToAbstractLNClass().getLNClasses().getNS().getId() + ")" ); } diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/DataAttributeImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/DataAttributeImpl.java index 553906b..07adc46 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/DataAttributeImpl.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/DataAttributeImpl.java @@ -2904,7 +2904,7 @@ public class DataAttributeImpl extends DocumentedClassImpl implements DataAttrib + getName() + ") in NS (id:" + getCDC().getCDCs().getNS().getId() + ") is unknown" ); } else { - console.info( "FunctionalConstraint (abbreviation: " + getFc() + ") refers by DataAttribute (name: " + console.verbose( "FunctionalConstraint (abbreviation: " + getFc() + ") refers by DataAttribute (name: " + getName() + ") in NS (id:" + getCDC().getCDCs().getNS().getId() + ") found in NS (id:" + getRefersToFunctionalConstraint().getFunctionalConstraints().getNS().getId() + ")" ); } @@ -2917,7 +2917,7 @@ public class DataAttributeImpl extends DocumentedClassImpl implements DataAttrib + getName() + ") in NS (id:" + getCDC().getCDCs().getNS().getId() + ") is unknown" ); } else { - console.info( "PresenceCondition (name: " + getPresCond() + ") refers by DataAttribute (name: " + console.verbose( "PresenceCondition (name: " + getPresCond() + ") refers by DataAttribute (name: " + getName() + ") in NS (id:" + getCDC().getCDCs().getNS().getId() + ") found in NS (id:" + getRefersToPresenceCondition().getPresenceConditions().getNS().getId() + ")" ); } @@ -2932,7 +2932,7 @@ public class DataAttributeImpl extends DocumentedClassImpl implements DataAttrib + getCDC().getCDCs().getNS().getId() + ") is unknown" ); } else { - console.info( "DataAttribute (name: " + getSizeAttribute() + console.verbose( "DataAttribute (name: " + getSizeAttribute() + ") refers as sizeAttribute by DataAttribute (name: " + getName() + ") in NS (id:" + getCDC().getCDCs().getNS().getId() + ") found" ); } @@ -2947,7 +2947,7 @@ public class DataAttributeImpl extends DocumentedClassImpl implements DataAttrib + getCDC().getCDCs().getNS().getId() + ") is unknown" ); } else { - console.info( "DataAttribute (name: " + getMaxIndexAttribute() + console.verbose( "DataAttribute (name: " + getMaxIndexAttribute() + ") refers as maxIndexAttribute by DataAttribute (name: " + getName() + ") in NS (id:" + getCDC().getCDCs().getNS().getId() + ") found" ); } diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/DataObjectImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/DataObjectImpl.java index 7a8fe98..b844222 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/DataObjectImpl.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/DataObjectImpl.java @@ -1848,7 +1848,7 @@ public class DataObjectImpl extends DocumentedClassImpl implements DataObject { + getAnyLNClass().getLNClasses().getNS().getId() + ") is unknown" ); } else { - console.info( "CDC (name: " + getType() + ") refers by DataObject (name: " + getName() + ") in NS (id:" + console.verbose( "CDC (name: " + getType() + ") refers by DataObject (name: " + getName() + ") in NS (id:" + getAnyLNClass().getLNClasses().getNS().getId() + ") found in NS (id:" + getRefersToCDC().getCDCs().getNS().getId() + ")" ); } @@ -1863,7 +1863,7 @@ public class DataObjectImpl extends DocumentedClassImpl implements DataObject { + ") in NS (id:" + getAnyLNClass().getLNClasses().getNS().getId() + ") is unknown" ); } else { - console.info( "PresenceCondition (name: " + getPresCond() + ") refers by DataObject (name: " + getName() + console.verbose( "PresenceCondition (name: " + getPresCond() + ") refers by DataObject (name: " + getName() + ") in NS (id:" + getAnyLNClass().getLNClasses().getNS().getId() + ") found in NS (id:" + getRefersToPresenceCondition().getPresenceConditions().getNS().getId() + ")" ); } @@ -1878,7 +1878,7 @@ public class DataObjectImpl extends DocumentedClassImpl implements DataObject { + ") in NS (id:" + getAnyLNClass().getLNClasses().getNS().getId() + ") is unknown" ); } else { - console.info( "PresenceCondition (name: " + getDsPresCond() + ") refers by DataObject (name: " + console.verbose( "PresenceCondition (name: " + getDsPresCond() + ") refers by DataObject (name: " + getName() + ") in NS (id:" + getAnyLNClass().getLNClasses().getNS().getId() + ") found in NS (id:" + getRefersToPresenceConditionDerivedStatistics().getPresenceConditions().getNS().getId() diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/DependsOnImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/DependsOnImpl.java index b3ca771..34323b1 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/DependsOnImpl.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/DependsOnImpl.java @@ -898,7 +898,7 @@ public class DependsOnImpl extends NsdObjectImpl implements DependsOn { "NS (id: " + getId() + ") and refers by DependsOn in NS (id:" + getNS().getId() + ") is unknown" ); } else { - console.info( "NS (id: " + getId() + ") and refers by DependsOn in NS (id:" + getNS().getId() + ") found" ); + console.verbose( "NS (id: " + getId() + ") and refers by DependsOn in NS (id:" + getNS().getId() + ") found" ); } return false; } diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/EnumerationImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/EnumerationImpl.java index d4650b0..25c6edd 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/EnumerationImpl.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/EnumerationImpl.java @@ -716,7 +716,7 @@ public class EnumerationImpl extends TitledClassImpl implements Enumeration { + getName() + ") in NS (id:" + getEnumerations().getNS().getId() + ") is unknown" ); } else { - console.info( "Enumeration (name: " + getInheritedFrom() + ") refers by Enumeration (name: " + getName() + console.verbose( "Enumeration (name: " + getInheritedFrom() + ") refers by Enumeration (name: " + getName() + ") in NS (id:" + getEnumerations().getNS().getId() + ") found in NS (id:" + getRefersToBaseEnumeration().getEnumerations().getNS().getId() + ")" ); } diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/SubDataAttributeImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/SubDataAttributeImpl.java index 30147ad..a46aef8 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/SubDataAttributeImpl.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/SubDataAttributeImpl.java @@ -1770,7 +1770,7 @@ public class SubDataAttributeImpl extends DocumentedClassImpl implements SubData + getConstructedAttribute().getConstructedAttributes().getNS().getId() + ") is unknown" ); } else { - console.info( "PresenceCondition (name: " + getPresCond() + ") refers by SubDataAttribute (name: " + console.verbose( "PresenceCondition (name: " + getPresCond() + ") refers by SubDataAttribute (name: " + getName() + ") in NS (id:" + getConstructedAttribute().getConstructedAttributes().getNS().getId() + ") found in NS (id:" + getRefersToPresenceCondition().getPresenceConditions().getNS().getId() + ")" ); diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/SubDataObjectImpl.java b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/SubDataObjectImpl.java index 9916873..ec0402d 100644 --- a/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/SubDataObjectImpl.java +++ b/fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/SubDataObjectImpl.java @@ -2001,7 +2001,7 @@ public class SubDataObjectImpl extends DocumentedClassImpl implements SubDataObj + ") in NS (id:" + getCDC().getCDCs().getNS().getId() + ") is unknown" ); } else { - console.info( "CDC (name: " + getType() + ") refers by SubDataObject (name: " + getName() + console.verbose( "CDC (name: " + getType() + ") refers by SubDataObject (name: " + getName() + ") in NS (id:" + getCDC().getCDCs().getNS().getId() + ") found in NS (id:" + getRefersToCDC().getCDCs().getNS().getId() + ")" ); } @@ -2014,7 +2014,7 @@ public class SubDataObjectImpl extends DocumentedClassImpl implements SubDataObj + getName() + ") in NS (id:" + getCDC().getCDCs().getNS().getId() + ") is unknown" ); } else { - console.info( "PresenceCondition (name: " + getPresCond() + ") refers by SubDataObject (name: " + console.verbose( "PresenceCondition (name: " + getPresCond() + ") refers by SubDataObject (name: " + getName() + ") in NS (id:" + getCDC().getCDCs().getNS().getId() + ") found in NS (id:" + getRefersToPresenceCondition().getPresenceConditions().getNS().getId() + ")" ); } @@ -2029,7 +2029,7 @@ public class SubDataObjectImpl extends DocumentedClassImpl implements SubDataObj + getCDC().getCDCs().getNS().getId() + ") is unknown" ); } else { - console.info( "DataAttribute (name: " + getSizeAttribute() + console.verbose( "DataAttribute (name: " + getSizeAttribute() + ") refers as sizeAttribute by SubDataObject (name: " + getName() + ") in NS (id:" + getCDC().getCDCs().getNS().getId() + ") found" ); } @@ -2044,7 +2044,7 @@ public class SubDataObjectImpl extends DocumentedClassImpl implements SubDataObj + getCDC().getCDCs().getNS().getId() + ") is unknown" ); } else { - console.info( "DataAttribute (name: " + getMaxIndexAttribute() + console.verbose( "DataAttribute (name: " + getMaxIndexAttribute() + ") refers as maxIndexAttribute by SubDataObject (name: " + getName() + ") in NS (id:" + getCDC().getCDCs().getNS().getId() + ") found" ); } -- GitLab