Просмотр исходного кода

Renames ConnectionImplementation to ConnectionPerformance

Andreas T. Meyer-Berg 5 лет назад
Родитель
Сommit
8dd285f4f1

+ 3 - 3
src/main/java/de/tu_darmstadt/tk/SmartHomeNetworkSim/Main.java

@@ -3,7 +3,7 @@ package de.tu_darmstadt.tk.SmartHomeNetworkSim;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.control.ConfigurationController;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.control.Controller;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.Connection;
-import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.ConnectionImplementation;
+import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.ConnectionPerformance;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.Link;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.Model;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.Port;
@@ -98,7 +98,7 @@ public class Main {
 		b.setStatus(Port.SENDING);
 		B.addPort(b);
 		
-		Connection s = new ConnectionImplementation(link, new SimpleProtocol(a, b));
+		Connection s = new ConnectionPerformance(link, new SimpleProtocol(a, b));
 		s.setPacketLossProbability(0.01);//1% Packet loss probability
 		a.setConnection(s);
 		b.setConnection(s);
@@ -131,7 +131,7 @@ public class Main {
 		
 		Protocol protocol = new MQTT_protocol(brokerPort);
 		
-		Connection con = new ConnectionImplementation(link, protocol);
+		Connection con = new ConnectionPerformance(link, protocol);
 		con.setPacketLossProbability(0.01);//1% Packet loss probability
 		con.addSmartDevice(brokerPort);
 		brokerPort.setConnection(con);

+ 14 - 3
src/main/java/de/tu_darmstadt/tk/SmartHomeNetworkSim/core/ConnectionImplementation.java → src/main/java/de/tu_darmstadt/tk/SmartHomeNetworkSim/core/ConnectionPerformance.java

@@ -3,7 +3,12 @@ package de.tu_darmstadt.tk.SmartHomeNetworkSim.core;
 import java.util.Collection;
 import java.util.LinkedList;
 
-public class ConnectionImplementation implements Connection {
+/**
+ * Implementation of the Connection Interface
+ *
+ * @author Andreas T. Meyer-Berg
+ */
+public class ConnectionPerformance implements Connection {
 
 	private Link link;
 	private LinkedList<Port> participants;
@@ -14,14 +19,20 @@ public class ConnectionImplementation implements Connection {
 	private boolean changed = false;
 	private String name;
 	
-	public ConnectionImplementation(Link l, Protocol p) {
+	/**
+	 * Initializes the connection, adds participants of the protocol
+	 * 
+	 * @param l Link which this connection uses
+	 * @param p Protocol of the connection
+	 */
+	public ConnectionPerformance(Link l, Protocol p) {
 		link = l;
 		participants=new LinkedList<Port>();
 		removedParticipants = new LinkedList<Port>();
 		this.protocol = p;
 		status =Connection.ACTIVE;
 		if(p==null)
-			name = "unspecified";
+			name = "unspecified-connection";
 		else
 			name = p.getName()+"-connection";
 	}

+ 1 - 1
src/main/java/de/tu_darmstadt/tk/SmartHomeNetworkSim/core/Model.java

@@ -82,7 +82,7 @@ public class Model extends Observable{
 		
 		standardSmartDevices.add(SmartDevice.class);
 		
-		standardConnections.add(ConnectionImplementation.class);
+		standardConnections.add(ConnectionPerformance.class);
 	}
 
 	/**

+ 1 - 1
src/main/java/de/tu_darmstadt/tk/SmartHomeNetworkSim/core/Port.java

@@ -25,7 +25,7 @@ public class Port {
 	public static final short SENDING = 2;
 
 	/**
-	 * Status of the Port, wethere it is CLOSED, OPEN or SENDING
+	 * Status of the Port, whether it is CLOSED, OPEN or SENDING
 	 */
 	private short status;
 

+ 2 - 2
src/main/java/de/tu_darmstadt/tk/SmartHomeNetworkSim/view/VisualisationInteractor.java

@@ -17,7 +17,7 @@ import javax.swing.event.MouseInputListener;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.control.ConfigurationController;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.control.Controller;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.Connection;
-import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.ConnectionImplementation;
+import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.ConnectionPerformance;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.Link;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.Model;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.Packet;
@@ -435,7 +435,7 @@ public class VisualisationInteractor implements MouseInputListener,
 			l.addDevice(connectionTo);
 			Port p1 = new Port(connectionFrom, (short) 1);
 			Port p2 = new Port(connectionTo, (short) 2);
-			Connection c = new ConnectionImplementation(l, new SimpleProtocol(p1, p2));
+			Connection c = new ConnectionPerformance(l, new SimpleProtocol(p1, p2));
 			c.addSmartDevice(p1);
 			c.addSmartDevice(p2);
 			p1.setConnection(c);

+ 2 - 2
src/main/java/de/tu_darmstadt/tk/SmartHomeNetworkSim/view/popups/ConnectionCreationPanel.java

@@ -16,7 +16,7 @@ import java.util.concurrent.ThreadLocalRandom;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.control.Controller;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.control.ImportController;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.Connection;
-import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.ConnectionImplementation;
+import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.ConnectionPerformance;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.Link;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.Model;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.Port;
@@ -125,7 +125,7 @@ public class ConnectionCreationPanel extends JScrollPane {
 	public ConnectionCreationPanel(Collection<Port> ports, Link l,
 			Controller controller) {
 		this.controller = controller;
-		connection = new ConnectionImplementation(l, new MQTT_protocol());
+		connection = new ConnectionPerformance(l, new MQTT_protocol());
 		this.ports = new Port[ports.size()];
 		int i = 0;
 		for (Port d : ports) {

+ 2 - 2
src/main/java/de/tu_darmstadt/tk/SmartHomeNetworkSim/view/popups/PortEditorPanel.java

@@ -13,7 +13,7 @@ import javax.swing.event.*;
 
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.control.Controller;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.Connection;
-import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.ConnectionImplementation;
+import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.ConnectionPerformance;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.Link;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.Model;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.Port;
@@ -277,7 +277,7 @@ public class PortEditorPanel extends JPanel
         testProtocol.addDeviceOfRole(p2, 1);
         Link test_link = new SimpleLink("Test");
         test_link.addDevice(test);
-        Connection con = new ConnectionImplementation(test_link, testProtocol);
+        Connection con = new ConnectionPerformance(test_link, testProtocol);
         p1.setConnection(con);
         p2.setConnection(con);
         con.addSmartDevice(p1);