Asociar equipos

src/Entities/Equipment/Equipment.java

@@ -1,9 +1,9 @@
 package Entities.Equipment;
 
 import java.util.ArrayList;
-
 import Entities.Network.IMessaging;
 import Entities.Network.IPAddressV4;
+import Exceptions.AssociateEquipmentError;
 
 /**
  * Created by efridman on 14/11/15.
@@ -21,11 +21,9 @@ public void setAssociatedIp(IPAddressV4 associatedIp) {
 		this.associatedIp = associatedIp;
 	}
 
-	public boolean associateEquipment(Equipment equipment)
-	{
+	public void associateEquipment(Equipment equipment) throws AssociateEquipmentError{
 		this.equipments.add(equipment);
-		equipment.equipments.add(this);
-		return true;
+		equipment.associateEquipment(this);
 	}
 
 }

src/Entities/Equipment/Hub.java

@@ -6,29 +6,13 @@
 /**
  * Created by efridman on 14/11/15.
  */
-public class Hub extends Equipment {
-
-	private int connectionsNumber;	
+public class Hub extends NetEquipment {
 
 		public Hub(int connectionsNumber) {
 		super();
 		this.connectionsNumber = connectionsNumber;
 	}
 
-	@Override
-	public boolean associateEquipment(Equipment equipment) {
-		boolean associated = false;
-		if(this.equipments.size() < connectionsNumber)
-		{
-			if(equipment.associateEquipment(this)){
-				this.equipments.add(equipment);				
-				associated = true;
-			}
-
-		}
-		return associated;
-	}
-
 	@Override
 	public void sendPacket(Packet<PacketType> packet) {
 		for (Equipment equipment : equipments) {
@@ -39,18 +23,6 @@ public void sendPacket(Packet<PacketType> packet) {
 	@Override
 	public void receivePacket(Packet<PacketType> packet) {
 		this.sendPacket(packet);
-	}
-
-	public int getConnectionsNumber() {
-		return connectionsNumber;
-	}
-
-	public void setConnectionsNumber(int connectionsNumber) {
-		this.connectionsNumber = connectionsNumber;
 	}	
 
-	private boolean isConnNumberExceeded(){
-		return this.equipments.size() > this.connectionsNumber;
-
-	}
 }

src/Entities/Equipment/NetEquipment.java

@@ -0,0 +1,40 @@
+package Entities.Equipment;
+
+import Entities.Packages.Packet;
+import Entities.Packages.PacketType;
+import Exceptions.AssociateEquipmentError;
+
+public abstract class NetEquipment extends Equipment{
+
+	protected int connectionsNumber;
+
+	public int getConnectionsNumber() {
+		return connectionsNumber;
+	}
+
+	public void setConnectionsNumber(int connectionsNumber) {
+		this.connectionsNumber = connectionsNumber;
+	}
+
+	public abstract void sendPacket(Packet<PacketType> packet);
+
+	public abstract void receivePacket(Packet<PacketType> packet);
+
+	@Override
+	public void associateEquipment(Equipment equipment) throws AssociateEquipmentError{
+
+		if(this.isConnNumberExceeded())
+		{
+			throw new AssociateEquipmentError();
+		}else{
+			this.equipments.add(equipment);
+			equipment.associateEquipment(this);
+		}
+
+	}
+
+	private boolean isConnNumberExceeded(){
+		return this.equipments.size() > this.connectionsNumber;
+	}
+
+}

src/Entities/Equipment/Router.java

@@ -15,11 +15,10 @@
 /**
  * Created by efridman on 14/11/15.
  */
-public class Router extends Equipment {
+public class Router extends NetEquipment {
 
 	private Map<Integer, IPAddressV4> routingTable;
 	private Integer defaultPort; // boca por defecto?
-	private int connectionsNumber;
 	private NetworkOs operatingSystem;
 
 	public void updateRoutingTable(Integer port, IPAddressV4 newIp) {
@@ -61,5 +60,6 @@ public void receivePacket(Packet packet) {
 		// TODO Auto-generated method stub
 
 
-	}	
+	}
+
 }

src/Exceptions/AssociateEquipmentError.java

@@ -0,0 +1,8 @@
+package Exceptions;
+
+public class AssociateEquipmentError extends Exception {
+
+	public AssociateEquipmentError(){
+		super("Can not associate equipment, connections numbers exceeded");
+	}
+}