|
@@ -43,7 +43,7 @@ public class NetworkController {
|
|
|
*/
|
|
|
public void validateDevicePosition() {
|
|
|
// Update all device positions
|
|
|
- for (SmartDevice d : controller.model.getDevices()) {
|
|
|
+ for (SmartDevice d : model.getDevices()) {
|
|
|
d.setX(controller.getControllerConfiguration().scalePos(d.getX(), 1.0, controller.getControllerConfiguration().getWidth()));
|
|
|
d.setY(controller.getControllerConfiguration().scalePos(d.getY(), 1.0, controller.getControllerConfiguration().getHeight()));
|
|
|
d.setZ(controller.getControllerConfiguration().scalePos(d.getZ(), 1.0, controller.getControllerConfiguration().getDepth()));
|
|
@@ -58,13 +58,13 @@ public class NetworkController {
|
|
|
* SmartDevice which should be added to the model
|
|
|
*/
|
|
|
public void addSmartDevice(SmartDevice sd) {
|
|
|
- if (controller.model.getDevices().contains(sd))
|
|
|
+ if (model.getDevices().contains(sd))
|
|
|
return;
|
|
|
- controller.model.addDevices(sd);
|
|
|
+ model.addDevices(sd);
|
|
|
// validate Position
|
|
|
- sd.setX(controller.scalePos(sd.getX(), 1.0, controller.model.getWidth()));
|
|
|
- sd.setY(controller.scalePos(sd.getY(), 1.0, controller.model.getHeight()));
|
|
|
- sd.setZ(controller.scalePos(sd.getZ(), 1.0, controller.model.getDepth()));
|
|
|
+ sd.setX(controller.getControllerConfiguration().scalePos(sd.getX(), 1.0, controller.getControllerConfiguration().getWidth()));
|
|
|
+ sd.setY(controller.getControllerConfiguration().scalePos(sd.getY(), 1.0, controller.getControllerConfiguration().getHeight()));
|
|
|
+ sd.setZ(controller.getControllerConfiguration().scalePos(sd.getZ(), 1.0, controller.getControllerConfiguration().getDepth()));
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -82,10 +82,10 @@ public class NetworkController {
|
|
|
*/
|
|
|
public void createSmartDevice(String name, int x_pos, int y_pos, int z_pos) {
|
|
|
SmartDevice sd = new SmartDevice(name);
|
|
|
- sd.setX(controller.scalePos(x_pos, 1.0, controller.model.getWidth()));
|
|
|
- sd.setY(controller.scalePos(y_pos, 1.0, controller.model.getHeight()));
|
|
|
- sd.setZ(controller.scalePos(z_pos, 1.0, controller.model.getDepth()));
|
|
|
- controller.model.addDevices(sd);
|
|
|
+ sd.setX(controller.getControllerConfiguration().scalePos(x_pos, 1.0, controller.getControllerConfiguration().getWidth()));
|
|
|
+ sd.setY(controller.getControllerConfiguration().scalePos(y_pos, 1.0, controller.getControllerConfiguration().getHeight()));
|
|
|
+ sd.setZ(controller.getControllerConfiguration().scalePos(z_pos, 1.0, controller.getControllerConfiguration().getDepth()));
|
|
|
+ model.addDevices(sd);
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -103,7 +103,7 @@ public class NetworkController {
|
|
|
for (Port p : toDelete.getPorts()) {
|
|
|
//Skip ports that are not connected
|
|
|
if(p.getConnection()==null)continue;
|
|
|
- controller.removeDeviceFromConnection(p, p.getConnection());
|
|
|
+ removeDeviceFromConnection(p, p.getConnection());
|
|
|
|
|
|
/**
|
|
|
* Connection of the current port
|
|
@@ -128,14 +128,14 @@ public class NetworkController {
|
|
|
// Remove from Links
|
|
|
LinkedList<Link> links = new LinkedList<Link>(toDelete.getLinks());
|
|
|
for (Link link : links)
|
|
|
- controller.removeSmartDeviceFromLink(toDelete, link);
|
|
|
+ removeSmartDeviceFromLink(toDelete, link);
|
|
|
links.clear();
|
|
|
// Remove Links from Device
|
|
|
toDelete.getLinks().clear();
|
|
|
|
|
|
//Remove all ports from the device
|
|
|
toDelete.getPorts().clear();
|
|
|
- controller.model.getDevices().remove(toDelete);
|
|
|
+ model.getDevices().remove(toDelete);
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -148,7 +148,7 @@ public class NetworkController {
|
|
|
if(link != null){
|
|
|
link.removeDevice(toRemove);
|
|
|
if(link.getDevices().size()==0)
|
|
|
- controller.deleteLink(link);
|
|
|
+ deleteLink(link);
|
|
|
}
|
|
|
if(toRemove!=null)
|
|
|
toRemove.removeLink(link);
|
|
@@ -178,7 +178,7 @@ public class NetworkController {
|
|
|
* @param link link to add
|
|
|
*/
|
|
|
public void addLink(Link link){
|
|
|
- controller.model.addConnectionNetwork(link);
|
|
|
+ model.addConnectionNetwork(link);
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -186,23 +186,23 @@ public class NetworkController {
|
|
|
* @param link link to remove
|
|
|
*/
|
|
|
public void removeLink(Link link){
|
|
|
- controller.model.getConnectionNetworks().remove(link);
|
|
|
+ model.getConnectionNetworks().remove(link);
|
|
|
}
|
|
|
|
|
|
public Collection<Link> getLinks(){
|
|
|
- return controller.model.getConnectionNetworks();
|
|
|
+ return model.getConnectionNetworks();
|
|
|
}
|
|
|
|
|
|
public void addConnection(Connection connection){
|
|
|
- controller.model.addConnection(connection);
|
|
|
+ model.addConnection(connection);
|
|
|
}
|
|
|
|
|
|
public void removeConnection(Connection connection){
|
|
|
- controller.model.getConnections().remove(connection);
|
|
|
+ model.getConnections().remove(connection);
|
|
|
}
|
|
|
|
|
|
public Collection<Connection> getConnections(){
|
|
|
- return controller.model.getConnections();
|
|
|
+ return model.getConnections();
|
|
|
}
|
|
|
|
|
|
public void addLinkToDevice(Link newLink, SmartDevice smartDevice) {
|
|
@@ -219,7 +219,7 @@ public class NetworkController {
|
|
|
if(link!=null){
|
|
|
link.removeDevice(smartDevice);
|
|
|
if(link.getDevices().size()==0)
|
|
|
- controller.deleteLink(link);
|
|
|
+ deleteLink(link);
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -228,7 +228,7 @@ public class NetworkController {
|
|
|
* If false is returned, the device will no longer be part of this connection.
|
|
|
*
|
|
|
* @param protocol protocol which should be edited
|
|
|
- * @param con TODO
|
|
|
+ * @param con Connection, which contains the protocol
|
|
|
* @param device device which should be added
|
|
|
* @param newRole new role of the device
|
|
|
* @return true if new role was set, false if not
|
|
@@ -236,7 +236,7 @@ public class NetworkController {
|
|
|
public boolean changeRoleOfDevice(Protocol protocol, Connection con, Port device, int newRole){
|
|
|
if(newRole < 0 || newRole >= protocol.getNumberOfRoles()){
|
|
|
protocol.removeDevice(device);
|
|
|
- controller.removeDeviceFromConnection(device, con);
|
|
|
+ removeDeviceFromConnection(device, con);
|
|
|
return false;
|
|
|
} else if(protocol.getDevicesWithRole(newRole).contains(device)){
|
|
|
if(!con.getParticipants().contains(device))
|
|
@@ -277,7 +277,7 @@ public class NetworkController {
|
|
|
if(connection.getProtocol()!=null)
|
|
|
connection.getProtocol().removeDevice(p);
|
|
|
if(connection.getParticipants().size() == 0)
|
|
|
- controller.deleteConnection(connection);
|
|
|
+ deleteConnection(connection);
|
|
|
}
|
|
|
if(p!=null)
|
|
|
p.setConnection(null);
|
|
@@ -322,7 +322,7 @@ public class NetworkController {
|
|
|
connection.setLink(newLink);
|
|
|
for(Port p:connection.getParticipants()){
|
|
|
if(p.getOwner()!=null&& !newLink.getDevices().contains(p.getOwner())){
|
|
|
- controller.addLinkToDevice(newLink, p.getOwner());
|
|
|
+ addLinkToDevice(newLink, p.getOwner());
|
|
|
}
|
|
|
}
|
|
|
connection.setLink(newLink);
|
|
@@ -378,10 +378,10 @@ public class NetworkController {
|
|
|
}
|
|
|
return null;
|
|
|
}
|
|
|
- if(controller.getConnections().contains(connection)){
|
|
|
- controller.removeConnection(connection);
|
|
|
+ if(getConnections().contains(connection)){
|
|
|
+ removeConnection(connection);
|
|
|
}
|
|
|
- controller.addConnection(newCon);
|
|
|
+ addConnection(newCon);
|
|
|
controller.getControllerConfiguration().getConfigurationManager().getSelectionModel().clickedConnection.clear();
|
|
|
|
|
|
|
|
@@ -405,23 +405,23 @@ public class NetworkController {
|
|
|
/**
|
|
|
* Devices which should be deleted
|
|
|
*/
|
|
|
- LinkedList<SmartDevice> devicesToDelete = new LinkedList<SmartDevice>(controller.model.getDevices());
|
|
|
+ LinkedList<SmartDevice> devicesToDelete = new LinkedList<SmartDevice>(model.getDevices());
|
|
|
for(SmartDevice d: devicesToDelete)
|
|
|
- controller.deleteSmartDevice(d);
|
|
|
+ deleteSmartDevice(d);
|
|
|
devicesToDelete.clear();
|
|
|
/**
|
|
|
* Connections which should be deleted
|
|
|
*/
|
|
|
- LinkedList<Connection> connectionsToDelete = new LinkedList<Connection>(controller.model.getConnections());
|
|
|
+ LinkedList<Connection> connectionsToDelete = new LinkedList<Connection>(model.getConnections());
|
|
|
for(Connection c: connectionsToDelete)
|
|
|
- controller.deleteConnection(c);
|
|
|
+ deleteConnection(c);
|
|
|
connectionsToDelete.clear();
|
|
|
/**
|
|
|
- * Links which should be delted
|
|
|
+ * Links which should be deleted
|
|
|
*/
|
|
|
- LinkedList<Link> linksToDelete = new LinkedList<Link>(controller.model.getConnectionNetworks());
|
|
|
- for(Link l: controller.model.getConnectionNetworks())
|
|
|
- controller.deleteLink(l);
|
|
|
+ LinkedList<Link> linksToDelete = new LinkedList<Link>(model.getConnectionNetworks());
|
|
|
+ for(Link l: model.getConnectionNetworks())
|
|
|
+ deleteLink(l);
|
|
|
linksToDelete.clear();
|
|
|
/**
|
|
|
* Update the GUI
|
|
@@ -437,30 +437,29 @@ public class NetworkController {
|
|
|
if(c == null)return;
|
|
|
LinkedList<Port> ports = new LinkedList<Port>(c.getParticipants());
|
|
|
for(Port p:ports)
|
|
|
- controller.removeDeviceFromConnection(p, c);
|
|
|
+ removeDeviceFromConnection(p, c);
|
|
|
ports.clear();
|
|
|
- controller.removeConnectionFromLink(c, c.getLink());
|
|
|
+ removeConnectionFromLink(c, c.getLink());
|
|
|
c.setStatus(Connection.TERMINATED);
|
|
|
- controller.removeConnection(c);
|
|
|
+ removeConnection(c);
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
* Deletes Link l and all references
|
|
|
- * @param controller TODO
|
|
|
* @param l Link to be deleted
|
|
|
*/
|
|
|
public void deleteLink(Link l) {
|
|
|
if(l==null)return;
|
|
|
LinkedList<SmartDevice> devices = new LinkedList<SmartDevice>(l.getDevices());
|
|
|
for(SmartDevice d : devices)
|
|
|
- controller.removeLinkFromDevice(l, d);
|
|
|
+ removeLinkFromDevice(l, d);
|
|
|
devices.clear();
|
|
|
LinkedList<Connection> connections = new LinkedList<Connection>(l.getConnections());
|
|
|
for(Connection c:connections)
|
|
|
- controller.removeConnectionFromLink(c,l);
|
|
|
+ removeConnectionFromLink(c,l);
|
|
|
connections.clear();
|
|
|
l.getPackets().clear();
|
|
|
- controller.removeLink(l);
|
|
|
+ removeLink(l);
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -501,15 +500,15 @@ public class NetworkController {
|
|
|
// Set old Name
|
|
|
newLink.setName(oldLink.getName());
|
|
|
// Add to Mode
|
|
|
- if(controller.getLinks().contains(oldLink)){
|
|
|
- controller.removeLink(oldLink);
|
|
|
- controller.addLink(newLink);
|
|
|
+ if(getLinks().contains(oldLink)){
|
|
|
+ removeLink(oldLink);
|
|
|
+ addLink(newLink);
|
|
|
}
|
|
|
// Add devices to the new Link
|
|
|
LinkedList<SmartDevice> devices= new LinkedList<>(oldLink.getDevices());
|
|
|
for(SmartDevice device:devices){
|
|
|
- controller.removeLinkFromDevice(oldLink, device);
|
|
|
- controller.addLinkToDevice(newLink, device);
|
|
|
+ removeLinkFromDevice(oldLink, device);
|
|
|
+ addLinkToDevice(newLink, device);
|
|
|
}
|
|
|
return newLink;
|
|
|
}
|