Fix generic types in network api and impl

itesla · Sep 6, 2016 · 1b7a964 · 1b7a964
1 parent eb4fec3
commit 1b7a964
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/iidm-network-api/src/main/java/eu/itesla_project/iidm/network/Connectable.java b/iidm-network-api/src/main/java/eu/itesla_project/iidm/network/Connectable.java
@@ -13,7 +13,7 @@
  *
  * @author Geoffroy Jamgotchian <geoffroy.jamgotchian at rte-france.com>
  */
-public interface Connectable<I extends Identifiable<I>> extends Identifiable<I> {
+public interface Connectable<I extends Connectable<I>> extends Identifiable<I> {
 
     /**
      * Get the connectable type.

diff --git a/iidm-network-api/src/main/java/eu/itesla_project/iidm/network/SingleTerminalConnectable.java b/iidm-network-api/src/main/java/eu/itesla_project/iidm/network/SingleTerminalConnectable.java
@@ -11,7 +11,7 @@
  *
  * @author Geoffroy Jamgotchian <geoffroy.jamgotchian at rte-france.com>
  */
-public interface SingleTerminalConnectable<I extends Identifiable<I>> extends Connectable<I> {
+public interface SingleTerminalConnectable<I extends SingleTerminalConnectable<I>> extends Connectable<I> {
 
     /**
      * Get the terminal.

diff --git a/iidm-network-api/src/main/java/eu/itesla_project/iidm/network/TwoTerminalsConnectable.java b/iidm-network-api/src/main/java/eu/itesla_project/iidm/network/TwoTerminalsConnectable.java
@@ -11,7 +11,7 @@
  *
  * @author Geoffroy Jamgotchian <geoffroy.jamgotchian at rte-france.com>
  */
-public interface TwoTerminalsConnectable<I extends Identifiable<I>> extends Connectable<I> {
+public interface TwoTerminalsConnectable<I extends TwoTerminalsConnectable<I>> extends Connectable<I> {
 
     enum Side {
         ONE,

diff --git a/...pl/src/main/java/eu/itesla_project/iidm/network/impl/AbstractTwoTerminalsConnectable.java b/...pl/src/main/java/eu/itesla_project/iidm/network/impl/AbstractTwoTerminalsConnectable.java
@@ -15,7 +15,7 @@
  *
  * @author Geoffroy Jamgotchian <geoffroy.jamgotchian at rte-france.com>
  */
-abstract class AbstractTwoTerminalsConnectable<I extends Identifiable<I>> extends ConnectableImpl<I> implements CurrentLimitsOwner<Side> {
+abstract class AbstractTwoTerminalsConnectable<I extends Connectable<I>> extends ConnectableImpl<I> implements CurrentLimitsOwner<Side> {
 
     private CurrentLimits limits1;
 

diff --git a/iidm-network-impl/src/main/java/eu/itesla_project/iidm/network/impl/ConnectableImpl.java b/iidm-network-impl/src/main/java/eu/itesla_project/iidm/network/impl/ConnectableImpl.java
@@ -16,7 +16,7 @@
  *
  * @author Geoffroy Jamgotchian <geoffroy.jamgotchian at rte-france.com>
  */
-abstract class ConnectableImpl<I extends Identifiable<I>> extends IdentifiableImpl<I> implements Connectable<I>, Stateful {
+abstract class ConnectableImpl<I extends Connectable<I>> extends IdentifiableImpl<I> implements Connectable<I>, Stateful {
 
     protected final List<TerminalExt> terminals = new ArrayList<>();
 

diff --git a/iidm-xml-import-export/src/main/java/eu/itesla_project/iidm/xml/ExtensionXml.java b/iidm-xml-import-export/src/main/java/eu/itesla_project/iidm/xml/ExtensionXml.java
@@ -15,7 +15,7 @@
 /**
  * @author Geoffroy Jamgotchian <geoffroy.jamgotchian at rte-france.com>
  */
-public interface ExtensionXml<I extends Identifiable<I>, E extends Identifiable.Extension<I>> {
+public interface ExtensionXml<I extends Identifiable, E extends Identifiable.Extension<I>> {
 
     String getExtensionName();
 
@@ -31,5 +31,5 @@ public interface ExtensionXml<I extends Identifiable<I>, E extends Identifiable.
 
     void write(E extension, XmlWriterContext context) throws XMLStreamException;
 
-    E read(I identifiable, XMLStreamReader reader);
+    E read(I identifiable, XMLStreamReader reader) throws XMLStreamException;
 }