[68][164] Activation used LDevice and Deactivation unused LDevice (#163)

Signed-off-by: Aliou DIAITE <[email protected]>
Signed-off-by: Samir Romdhani <[email protected]>
Signed-off-by: Aliou DIAITE <[email protected]>

Author: samirromdhani

sct-commons/src/main/java/org/lfenergy/compas/sct/commons/scl/SclRootAdapter.java

@@ -18,6 +18,7 @@
 import org.lfenergy.compas.sct.commons.scl.sstation.SubstationAdapter;
 
 import java.util.List;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 /**

sct-commons/src/main/java/org/lfenergy/compas/sct/commons/scl/com/CommunicationAdapter.java

@@ -58,14 +58,11 @@ public boolean amChildElementRef() {
         return currentElem == parentAdapter.getCurrentElem().getCommunication();
     }
 
-<<<<<<< HEAD
     @Override
     protected String elementXPath() {
         return "Communication";
     }
 
-=======
->>>>>>> update docs and init javadocs (#157)
     /**
      * Add Subnetwork node in Communication one.
      * For that :

sct-commons/src/main/java/org/lfenergy/compas/sct/commons/scl/com/ConnectedAPAdapter.java

@@ -6,7 +6,6 @@
 
 import org.lfenergy.compas.scl2007b4.model.SCL;
 import org.lfenergy.compas.scl2007b4.model.TConnectedAP;
-import org.lfenergy.compas.scl2007b4.model.TPrivate;
 import org.lfenergy.compas.sct.commons.scl.SclElementAdapter;
 import org.lfenergy.compas.sct.commons.util.Utils;
 

sct-commons/src/main/java/org/lfenergy/compas/sct/commons/scl/dtt/DAAdapter.java

@@ -58,6 +58,13 @@ protected boolean amChildElementRef() {
         return parentAdapter.getCurrentElem().getSDOOrDA().contains(currentElem);
     }
 
+    @Override
+    protected String elementXPath() {
+        return String.format("DA[name=%s and type=%s]",
+                Utils.xpathAttributeFilter("name", currentElem.isSetName() ? currentElem.getName() : null),
+                Utils.xpathAttributeFilter("type", currentElem.isSetType() ? currentElem.getType() : null));
+    }
+
     /**
      * Updates DA Type Name
      * @param daTypeName DA Type Name to update

sct-commons/src/main/java/org/lfenergy/compas/sct/commons/scl/dtt/DOAdapter.java

@@ -54,6 +54,13 @@ protected boolean amChildElementRef() {
         return parentAdapter.getCurrentElem().getDO().contains(currentElem);
     }
 
+    @Override
+    protected String elementXPath() {
+        return String.format("DO[%s and %s]",
+                Utils.xpathAttributeFilter("name", currentElem.isSetName() ? currentElem.getName() : null),
+                Utils.xpathAttributeFilter("type", currentElem.isSetType() ? currentElem.getType() : null));
+    }
+
     /**
      * Gets linked DataTypeTemplateAdapter as parent
      * @return <em>DataTypeTemplateAdapter</em> object

sct-commons/src/main/java/org/lfenergy/compas/sct/commons/scl/dtt/DataTypeTemplateAdapter.java

@@ -13,7 +13,6 @@
 import org.lfenergy.compas.sct.commons.exception.ScdException;
 import org.lfenergy.compas.sct.commons.scl.SclElementAdapter;
 import org.lfenergy.compas.sct.commons.scl.SclRootAdapter;
-import org.lfenergy.compas.sct.commons.scl.ied.IEDAdapter;
 
 import java.util.*;
 import java.util.stream.Collectors;

sct-commons/src/main/java/org/lfenergy/compas/sct/commons/scl/dtt/LNodeTypeAdapter.java

@@ -72,6 +72,13 @@ protected boolean amChildElementRef() {
         return parentAdapter.getCurrentElem().getLNodeType().contains(currentElem);
     }
 
+    @Override
+    protected String elementXPath() {
+        return String.format("LNodeType[%s and %s]",
+                Utils.xpathAttributeFilter("id", currentElem.isSetId() ? currentElem.getId() : null),
+                Utils.xpathAttributeFilter("lnClass", currentElem.isSetLnClass() ? currentElem.getLnClass() : null));
+    }
+
     /**
      * Compares current LNodeType and given LNodeType
      * @param tlNodeType LNodeType to compare with

sct-commons/src/main/java/org/lfenergy/compas/sct/commons/scl/ied/DOIAdapter.java

@@ -57,6 +57,12 @@ protected boolean amChildElementRef() {
         return parentAdapter.getCurrentElem().getDOI().contains(currentElem);
     }
 
+    @Override
+    protected String elementXPath() {
+        return String.format("DOI[%s]",
+                Utils.xpathAttributeFilter("name", currentElem.isSetName() ? currentElem.getName() : null));
+    }
+
     /**
      * Gets SDI by name from current DOI
      * @param sName name of SDI to get

sct-commons/src/main/java/org/lfenergy/compas/sct/commons/scl/ied/LN0Adapter.java

@@ -5,7 +5,6 @@
 package org.lfenergy.compas.sct.commons.scl.ied;
 
 
-
 import org.apache.commons.lang3.tuple.Pair;
 import org.lfenergy.compas.scl2007b4.model.*;
 import org.lfenergy.compas.sct.commons.dto.*;
@@ -88,17 +87,14 @@ protected boolean amChildElementRef() {
         return currentElem == parentAdapter.getCurrentElem().getLN0();
     }
 
-    /**
-     * Gets current LN0 class type
-     * @return <em>LN0.class</em>
-     */
     @Override
     protected String elementXPath() {
         return String.format("LN[lnClass=\"LLN0\" and %s and %s]",
                 Utils.xpathAttributeFilter("inst", currentElem.isSetInst() ? currentElem.getInst() : null),
                 Utils.xpathAttributeFilter("lnType", currentElem.isSetLnType() ? currentElem.getLnType() : null));
     }
 
+
     /**
      * Gets current LN0 class type
      * @return <em>LN0.class</em>

sct-commons/src/main/java/org/lfenergy/compas/sct/commons/scl/ied/LNAdapter.java

@@ -114,6 +114,7 @@ public String getPrefix() {
         return currentElem.getPrefix();
     }
 
+
     /**
      * Check if node is child of the reference node
      * @return link parent child existence