Merge pull request #33 from riseclipse/develop

update versions and use Pair from Apache lang3
riseclipse · Mar 22, 2023 · 854c5c3 · 854c5c3
2 parents eae50a1 + e5d42aa
commit 854c5c3
Show file tree

Hide file tree

Showing 27 changed files with 50 additions and 26 deletions.
diff --git a/...ntralesupelec.edf.riseclipse.iec61850.scl.edit/.settings/org.eclipse.core.resources.prefs b/...ntralesupelec.edf.riseclipse.iec61850.scl.edit/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/.settings/org.eclipse.core.runtime.prefs b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/META-INF/MANIFEST.MF b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/META-INF/MANIFEST.MF
@@ -4,14 +4,14 @@ Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-SymbolicName: fr.centralesupelec.edf.riseclipse.iec61850.scl.edit;singleton:=true
 Automatic-Module-Name: fr.centralesupelec.edf.riseclipse.iec61850.scl.edit
-Bundle-Version: 1.2.5
+Bundle-Version: 1.2.6
 Bundle-ClassPath: .
 Bundle-Activator: fr.centralesupelec.edf.riseclipse.iec61850.scl.provider.SCLEditPlugin$Implementation
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: fr.centralesupelec.edf.riseclipse.iec61850.scl.provider
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.edit;visibility:=reexport,
- fr.centralesupelec.edf.riseclipse.iec61850.scl;bundle-version="1.2.5";visibility:=reexport,
- fr.centralesupelec.edf.riseclipse.main;bundle-version="[1.2.6,1.3.0)"
+ fr.centralesupelec.edf.riseclipse.iec61850.scl;bundle-version="1.2.6";visibility:=reexport,
+ fr.centralesupelec.edf.riseclipse.main;bundle-version="[1.2.7,1.3.0)"
 Bundle-ActivationPolicy: lazy
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/plugin.xml b/fr.centralesupelec.edf.riseclipse.iec61850.scl.edit/plugin.xml
@@ -3,7 +3,7 @@
 
 <!--
 *************************************************************************
-**  Copyright (c) 2016-2021 CentraleSupélec & EDF.
+**  Copyright (c) 2016-2023 CentraleSupélec & EDF.
 **  All rights reserved. This program and the accompanying materials
 **  are made available under the terms of the Eclipse Public License v2.0
 **  which accompanies this distribution, and is available at

diff --git a/...esupelec.edf.riseclipse.iec61850.scl.utilities/.settings/org.eclipse.core.resources.prefs b/...esupelec.edf.riseclipse.iec61850.scl.utilities/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/...alesupelec.edf.riseclipse.iec61850.scl.utilities/.settings/org.eclipse.core.runtime.prefs b/...alesupelec.edf.riseclipse.iec61850.scl.utilities/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.utilities/META-INF/MANIFEST.MF b/fr.centralesupelec.edf.riseclipse.iec61850.scl.utilities/META-INF/MANIFEST.MF
@@ -3,10 +3,10 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-SymbolicName: fr.centralesupelec.edf.riseclipse.iec61850.scl.utilities
-Bundle-Version: 1.2.5
+Bundle-Version: 1.2.6
 Automatic-Module-Name: fr.centralesupelec.edf.riseclipse.iec61850.scl.utilities
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.eclipse.emf.ecore,
- fr.centralesupelec.edf.riseclipse.iec61850.scl;bundle-version="1.2.5",
- fr.centralesupelec.edf.riseclipse.main;bundle-version="[1.2.6,1.3.0)"
+ fr.centralesupelec.edf.riseclipse.iec61850.scl;bundle-version="1.2.6",
+ fr.centralesupelec.edf.riseclipse.main;bundle-version="[1.2.7,1.3.0)"
 Export-Package: fr.centralesupelec.edf.riseclipse.iec61850.scl.utilities
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl.utilities/build.properties b/fr.centralesupelec.edf.riseclipse.iec61850.scl.utilities/build.properties
@@ -1,5 +1,5 @@
 # *************************************************************************
-# **  Copyright (c) 2016-2021 CentraleSupélec & EDF.
+# **  Copyright (c) 2016-2023 CentraleSupélec & EDF.
 # **  All rights reserved. This program and the accompanying materials
 # **  are made available under the terms of the Eclipse Public License v2.0
 # **  which accompanies this distribution, and is available at

diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/.settings/org.eclipse.core.resources.prefs b/fr.centralesupelec.edf.riseclipse.iec61850.scl/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/.settings/org.eclipse.core.runtime.prefs b/fr.centralesupelec.edf.riseclipse.iec61850.scl/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/META-INF/MANIFEST.MF b/fr.centralesupelec.edf.riseclipse.iec61850.scl/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-SymbolicName: fr.centralesupelec.edf.riseclipse.iec61850.scl;singleton:=true
 Automatic-Module-Name: fr.centralesupelec.edf.riseclipse.iec61850.scl
-Bundle-Version: 1.2.5
+Bundle-Version: 1.2.6
 Bundle-ClassPath: .
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-11
@@ -16,5 +16,6 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore.xmi;visibility:=reexport,
  org.eclipse.jdt.annotation,
  org.eclipse.jface,
- fr.centralesupelec.edf.riseclipse.main;bundle-version="[1.2.6,1.3.0)"
+ org.apache.commons.lang3,
+ fr.centralesupelec.edf.riseclipse.main;bundle-version="[1.2.7,1.3.0)"
 Bundle-ActivationPolicy: lazy
diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/build.properties b/fr.centralesupelec.edf.riseclipse.iec61850.scl/build.properties
@@ -1,5 +1,5 @@
 # *************************************************************************
-# **  Copyright (c) 2016-2021 CentraleSupélec & EDF.
+# **  Copyright (c) 2016-2023 CentraleSupélec & EDF.
 # **  All rights reserved. This program and the accompanying materials
 # **  are made available under the terms of the Eclipse Public License v2.0
 # **  which accompanies this distribution, and is available at

diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/plugin.xml b/fr.centralesupelec.edf.riseclipse.iec61850.scl/plugin.xml
@@ -3,7 +3,7 @@
 
 <!--
 *************************************************************************
-**  Copyright (c) 2016-2021 CentraleSupélec & EDF.
+**  Copyright (c) 2016-2023 CentraleSupélec & EDF.
 **  All rights reserved. This program and the accompanying materials
 **  are made available under the terms of the Eclipse Public License v2.0
 **  which accompanies this distribution, and is available at

diff --git a/fr.centralesupelec.edf.riseclipse.iec61850.scl/pom.xml b/fr.centralesupelec.edf.riseclipse.iec61850.scl/pom.xml
@@ -54,7 +54,7 @@
     <dependency>
       <groupId>io.github.riseclipse</groupId>
       <artifactId>fr.centralesupelec.edf.riseclipse.main</artifactId>
-      <version>1.2.6</version>
+      <version>1.2.7</version>
     </dependency>
   </dependencies>
 

diff --git a/...iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AssociationImpl.java b/...iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/AssociationImpl.java
@@ -20,6 +20,8 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.impl;
 
+import org.apache.commons.lang3.tuple.Pair;
+
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
 import org.eclipse.emf.ecore.EClass;
@@ -40,7 +42,6 @@
 import fr.centralesupelec.edf.riseclipse.iec61850.scl.Server;
 import fr.centralesupelec.edf.riseclipse.iec61850.scl.util.SclUtilities;
 import fr.centralesupelec.edf.riseclipse.util.IRiseClipseConsole;
-import fr.centralesupelec.edf.riseclipse.util.Pair;
 
 /**
  * <!-- begin-user-doc -->

diff --git a/...se.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ClientLNImpl.java b/...se.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ClientLNImpl.java
@@ -20,6 +20,8 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.impl;
 
+import org.apache.commons.lang3.tuple.Pair;
+
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
 import org.eclipse.emf.ecore.EClass;
@@ -40,7 +42,6 @@
 import fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage;
 import fr.centralesupelec.edf.riseclipse.iec61850.scl.util.SclUtilities;
 import fr.centralesupelec.edf.riseclipse.util.IRiseClipseConsole;
-import fr.centralesupelec.edf.riseclipse.util.Pair;
 
 /**
  * <!-- begin-user-doc -->

diff --git a/...iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ConnectedAPImpl.java b/...iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ConnectedAPImpl.java
@@ -22,6 +22,8 @@
 
 import java.util.Collection;
 
+import org.apache.commons.lang3.tuple.Pair;
+
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
 import org.eclipse.emf.common.util.EList;
@@ -44,7 +46,6 @@
 import fr.centralesupelec.edf.riseclipse.iec61850.scl.SubNetwork;
 import fr.centralesupelec.edf.riseclipse.iec61850.scl.util.SclUtilities;
 import fr.centralesupelec.edf.riseclipse.util.IRiseClipseConsole;
-import fr.centralesupelec.edf.riseclipse.util.Pair;
 
 /**
  * <!-- begin-user-doc -->

diff --git a/...ec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ControlBlockImpl.java b/...ec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ControlBlockImpl.java
@@ -25,6 +25,8 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
+import org.apache.commons.lang3.tuple.Pair;
+
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
 import org.eclipse.emf.common.util.EList;
@@ -43,7 +45,6 @@
 import fr.centralesupelec.edf.riseclipse.iec61850.scl.util.SclUtilities;
 import fr.centralesupelec.edf.riseclipse.util.AbstractRiseClipseConsole;
 import fr.centralesupelec.edf.riseclipse.util.IRiseClipseConsole;
-import fr.centralesupelec.edf.riseclipse.util.Pair;
 
 /**
  * <!-- begin-user-doc -->

diff --git a/...ipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ExtRefImpl.java b/...ipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ExtRefImpl.java
@@ -24,6 +24,8 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
+import org.apache.commons.lang3.tuple.Pair;
+
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
 import org.eclipse.emf.ecore.EClass;
@@ -50,7 +52,6 @@
 import fr.centralesupelec.edf.riseclipse.iec61850.scl.ServiceType;
 import fr.centralesupelec.edf.riseclipse.iec61850.scl.util.SclUtilities;
 import fr.centralesupelec.edf.riseclipse.util.IRiseClipseConsole;
-import fr.centralesupelec.edf.riseclipse.util.Pair;
 
 /**
  * <!-- begin-user-doc -->

diff --git a/...clipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/FCDAImpl.java b/...clipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/FCDAImpl.java
@@ -26,6 +26,8 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import org.apache.commons.lang3.tuple.Pair;
+
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
 import org.eclipse.emf.common.util.EList;
@@ -53,7 +55,6 @@
 import fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage;
 import fr.centralesupelec.edf.riseclipse.iec61850.scl.util.SclUtilities;
 import fr.centralesupelec.edf.riseclipse.util.IRiseClipseConsole;
-import fr.centralesupelec.edf.riseclipse.util.Pair;
 
 /**
  * <!-- begin-user-doc -->

diff --git a/...pse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/IEDNameImpl.java b/...pse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/IEDNameImpl.java
@@ -20,6 +20,8 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.impl;
 
+import org.apache.commons.lang3.tuple.Pair;
+
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
 import org.eclipse.emf.ecore.EClass;
@@ -37,7 +39,6 @@
 import fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage;
 import fr.centralesupelec.edf.riseclipse.iec61850.scl.util.SclUtilities;
 import fr.centralesupelec.edf.riseclipse.util.IRiseClipseConsole;
-import fr.centralesupelec.edf.riseclipse.util.Pair;
 
 /**
  * <!-- begin-user-doc -->

diff --git a/...eclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/KDCImpl.java b/...eclipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/KDCImpl.java
@@ -20,6 +20,8 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.impl;
 
+import org.apache.commons.lang3.tuple.Pair;
+
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
 import org.eclipse.emf.ecore.EClass;
@@ -34,7 +36,6 @@
 import fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage;
 import fr.centralesupelec.edf.riseclipse.iec61850.scl.util.SclUtilities;
 import fr.centralesupelec.edf.riseclipse.util.IRiseClipseConsole;
-import fr.centralesupelec.edf.riseclipse.util.Pair;
 
 /**
  * <!-- begin-user-doc -->

diff --git a/...lipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/LNodeImpl.java b/...lipse.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/LNodeImpl.java
@@ -23,6 +23,8 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
+import org.apache.commons.lang3.tuple.Pair;
+
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
 import org.eclipse.emf.ecore.EClass;
@@ -41,7 +43,6 @@
 import fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage;
 import fr.centralesupelec.edf.riseclipse.iec61850.scl.util.SclUtilities;
 import fr.centralesupelec.edf.riseclipse.util.IRiseClipseConsole;
-import fr.centralesupelec.edf.riseclipse.util.Pair;
 
 /**
  * <!-- begin-user-doc -->

diff --git a/....iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/LogControlImpl.java b/....iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/LogControlImpl.java
@@ -23,6 +23,8 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
+import org.apache.commons.lang3.tuple.Pair;
+
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
 import org.eclipse.emf.ecore.EClass;
@@ -39,7 +41,6 @@
 import fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage;
 import fr.centralesupelec.edf.riseclipse.iec61850.scl.util.SclUtilities;
 import fr.centralesupelec.edf.riseclipse.util.IRiseClipseConsole;
-import fr.centralesupelec.edf.riseclipse.util.Pair;
 
 /**
  * <!-- begin-user-doc -->

diff --git a/...se.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ServerAtImpl.java b/...se.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/impl/ServerAtImpl.java
@@ -20,6 +20,8 @@
 */
 package fr.centralesupelec.edf.riseclipse.iec61850.scl.impl;
 
+import org.apache.commons.lang3.tuple.Pair;
+
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
 import org.eclipse.emf.ecore.EClass;
@@ -34,7 +36,6 @@
 import fr.centralesupelec.edf.riseclipse.iec61850.scl.ServerAt;
 import fr.centralesupelec.edf.riseclipse.iec61850.scl.util.SclUtilities;
 import fr.centralesupelec.edf.riseclipse.util.IRiseClipseConsole;
-import fr.centralesupelec.edf.riseclipse.util.Pair;
 
 /**
  * <!-- begin-user-doc -->

diff --git a/...se.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/util/SclUtilities.java b/...se.iec61850.scl/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/util/SclUtilities.java
@@ -24,6 +24,7 @@
 import java.util.Objects;
 import java.util.stream.Collectors;
 
+import org.apache.commons.lang3.tuple.Pair;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.jdt.annotation.NonNull;
 
@@ -35,7 +36,6 @@
 import fr.centralesupelec.edf.riseclipse.iec61850.scl.SCL;
 import fr.centralesupelec.edf.riseclipse.iec61850.scl.SclObject;
 import fr.centralesupelec.edf.riseclipse.util.AbstractRiseClipseConsole;
-import fr.centralesupelec.edf.riseclipse.util.Pair;
 
 public class SclUtilities {
 

diff --git a/pom.xml b/pom.xml
@@ -32,7 +32,7 @@
   <parent>
     <groupId>io.github.riseclipse</groupId>
     <artifactId>fr.centralesupelec.edf.riseclipse.developer.maven</artifactId>
-    <version>1.2.4</version>
+    <version>1.2.7</version>
   </parent>
 
   <scm>