corrections after rebase (changing package mostly)

Signed-off-by: RALAMBOTIANA MIORA <miora.ralambotiana@rte-france.com>
powsybl · May 16, 2019 · 63e9d9e · 63e9d9e
1 parent 5b41a2e
commit 63e9d9e
Show file tree

Hide file tree

Showing 14 changed files with 15 additions and 20 deletions.
diff --git a/cgmes/cgmes-converter/src/main/java/com/powsybl/cgmes/converter/Context.java b/cgmes/cgmes-converter/src/main/java/com/powsybl/cgmes/converter/Context.java
@@ -11,9 +11,6 @@
 import java.util.Map;
 import java.util.Objects;
 
-import com.powsybl.iidm.api.Generator;
-import com.powsybl.iidm.api.Identifiable;
-import com.powsybl.iidm.api.Terminal;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/cgmes/cgmes-converter/src/main/java/com/powsybl/cgmes/converter/CountryConversion.java b/cgmes/cgmes-converter/src/main/java/com/powsybl/cgmes/converter/CountryConversion.java
@@ -10,7 +10,7 @@
 import java.util.Optional;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import com.powsybl.cgmes.converter.elements.AbstractIdentifiedObjectConversion;
+
 import com.powsybl.iidm.api.Country;
 
 /**

diff --git a/.../conversion/RegulatingControlMapping.java → ...s/converter/RegulatingControlMapping.java b/.../conversion/RegulatingControlMapping.java → ...s/converter/RegulatingControlMapping.java
@@ -4,9 +4,9 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-package com.powsybl.cgmes.conversion;
+package com.powsybl.cgmes.converter;
 
-import com.powsybl.iidm.network.*;
+import com.powsybl.iidm.api.*;
 import com.powsybl.triplestore.api.PropertyBag;
 
 import java.util.*;

diff --git a/...nverter/src/main/java/com/powsybl/cgmes/converter/elements/PhaseTapChangerConversion.java b/...nverter/src/main/java/com/powsybl/cgmes/converter/elements/PhaseTapChangerConversion.java
@@ -16,7 +16,7 @@
 
 import com.powsybl.cgmes.converter.Context;
 import com.powsybl.cgmes.model.CgmesNames;
-import com.powsybl.iidm.api.PhaseTapChanger;
+
 import com.powsybl.iidm.api.PhaseTapChangerAdder;
 import com.powsybl.iidm.api.Terminal;
 import com.powsybl.iidm.api.ThreeWindingsTransformer;

diff --git a/...r/src/test/java/com/powsybl/cgmes/converter/test/cim14/Cim14SmallCasesNetworkCatalog.java b/...r/src/test/java/com/powsybl/cgmes/converter/test/cim14/Cim14SmallCasesNetworkCatalog.java
@@ -16,7 +16,6 @@
 import com.powsybl.commons.datasource.ResourceDataSource;
 import com.powsybl.commons.datasource.ResourceSet;
 import com.powsybl.iidm.api.Bus;
-import com.powsybl.iidm.api.Country;
 import com.powsybl.iidm.api.Generator;
 import com.powsybl.iidm.api.Line;
 import com.powsybl.iidm.api.Network;

diff --git a/...sybl/cgmes/converter/test/conformity/modified/CgmesConformity1ModifiedConversionTest.java b/...sybl/cgmes/converter/test/conformity/modified/CgmesConformity1ModifiedConversionTest.java
@@ -5,7 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 package com.powsybl.cgmes.converter.test.conformity.modified;
-import static com.powsybl.iidm.network.PhaseTapChanger.RegulationMode.CURRENT_LIMITER;
+import static com.powsybl.iidm.api.PhaseTapChanger.RegulationMode.CURRENT_LIMITER;
 import static org.junit.Assert.*;
 
 import java.io.IOException;

diff --git a/iidm/iidm-dsv-converter/pom.xml b/iidm/iidm-dsv-converter/pom.xml
@@ -13,7 +13,7 @@
 
     <parent>
         <groupId>com.powsybl</groupId>
-        <artifactId>powsybl-core</artifactId>
+        <artifactId>powsybl-iidm</artifactId>
         <version>3.0.0-SNAPSHOT</version>
     </parent>
 

diff --git a/...analysis-api/src/main/java/com/powsybl/security/distributed/ExternalSecurityAnalysis.java b/...analysis-api/src/main/java/com/powsybl/security/distributed/ExternalSecurityAnalysis.java
@@ -11,7 +11,6 @@
 import com.powsybl.computation.ExecutionEnvironment;
 import com.powsybl.contingency.ContingenciesProvider;
 import com.powsybl.iidm.api.Network;
-import com.powsybl.iidm.xml.NetworkXml;
 import com.powsybl.security.SecurityAnalysis;
 import com.powsybl.security.SecurityAnalysisParameters;
 import com.powsybl.security.SecurityAnalysisResult;

diff --git a/...-api/src/main/java/com/powsybl/security/distributed/SecurityAnalysisExecutionHandler.java b/...-api/src/main/java/com/powsybl/security/distributed/SecurityAnalysisExecutionHandler.java
@@ -8,7 +8,7 @@
 
 import com.google.common.io.ByteSource;
 import com.powsybl.computation.*;
-import com.powsybl.iidm.network.Network;
+import com.powsybl.iidm.api.Network;
 import com.powsybl.iidm.xml.NetworkXml;
 import com.powsybl.security.SecurityAnalysisParameters;
 import com.powsybl.security.execution.NetworkVariant;

diff --git a/...is/security-analysis-api/src/main/java/com/powsybl/security/execution/NetworkVariant.java b/...is/security-analysis-api/src/main/java/com/powsybl/security/execution/NetworkVariant.java
@@ -6,7 +6,7 @@
  */
 package com.powsybl.security.execution;
 
-import com.powsybl.iidm.network.Network;
+import com.powsybl.iidm.api.Network;
 
 import static java.util.Objects.requireNonNull;
 

diff --git a/...ysis-api/src/main/java/com/powsybl/security/execution/SecurityAnalysisExecutionInput.java b/...ysis-api/src/main/java/com/powsybl/security/execution/SecurityAnalysisExecutionInput.java
@@ -7,7 +7,7 @@
 package com.powsybl.security.execution;
 
 import com.google.common.io.ByteSource;
-import com.powsybl.iidm.network.Network;
+import com.powsybl.iidm.api.Network;
 import com.powsybl.security.LimitViolationType;
 import com.powsybl.security.SecurityAnalysisParameters;
 

diff --git a/...src/test/java/com/powsybl/security/distributed/SecurityAnalysisExecutionHandlersTest.java b/...src/test/java/com/powsybl/security/distributed/SecurityAnalysisExecutionHandlersTest.java
@@ -16,8 +16,8 @@
 import com.powsybl.computation.ExecutionHandler;
 import com.powsybl.computation.SimpleCommand;
 import com.powsybl.contingency.Contingency;
-import com.powsybl.iidm.network.VariantManagerConstants;
-import com.powsybl.iidm.network.test.EurostagTutorialExample1Factory;
+import com.powsybl.iidm.api.VariantManagerConstants;
+import com.powsybl.iidm.api.test.EurostagTutorialExample1Factory;
 import com.powsybl.security.*;
 import com.powsybl.security.converter.JsonSecurityAnalysisResultExporter;
 import com.powsybl.security.execution.SecurityAnalysisExecutionInput;

diff --git a/...ecurity-analysis-api/src/test/java/com/powsybl/security/execution/NetworkVariantTest.java b/...ecurity-analysis-api/src/test/java/com/powsybl/security/execution/NetworkVariantTest.java
@@ -7,9 +7,9 @@
 package com.powsybl.security.execution;
 
 import com.google.common.collect.ImmutableList;
-import com.powsybl.iidm.network.Network;
-import com.powsybl.iidm.network.VariantManagerConstants;
-import com.powsybl.iidm.network.test.EurostagTutorialExample1Factory;
+import com.powsybl.iidm.api.Network;
+import com.powsybl.iidm.api.VariantManagerConstants;
+import com.powsybl.iidm.api.test.EurostagTutorialExample1Factory;
 import org.junit.Test;
 
 import static org.junit.Assert.*;

diff --git a/...-api/src/test/java/com/powsybl/security/execution/SecurityAnalysisExecutionInputTest.java b/...-api/src/test/java/com/powsybl/security/execution/SecurityAnalysisExecutionInputTest.java
@@ -9,7 +9,7 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.io.ByteSource;
-import com.powsybl.iidm.network.Network;
+import com.powsybl.iidm.api.Network;
 import com.powsybl.security.LimitViolationType;
 import com.powsybl.security.SecurityAnalysisParameters;
 import org.junit.Test;