Adds Link, Connection & SmartDevice Import functionality to the model

Extends the import Controller accordingly.

src/main/java/de/tu_darmstadt/tk/SmartHomeNetworkSim/control/ImportController.java

@@ -12,8 +12,11 @@ import java.util.LinkedList;
 import javax.tools.JavaCompiler;
 import javax.tools.ToolProvider;
 
+import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.Link;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.Model;
+import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.Connection;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.Protocol;
+import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.SmartDevice;
 
 /**
  * Controller which manages Imported Classes of the
@@ -38,14 +41,66 @@ public class ImportController {
 	}
 
 	/**
-	 * Returns the available Protocols of the model
+	 * Adds new Link to the model
 	 * 
-	 * @return available protocols
+	 * @param Link
+	 *            Link to be added
+	 * @return true if it was added
 	 */
-	public LinkedList<Class<? extends Protocol>> getProtocols() {
-		return model.getProtocols();
+	public boolean addLink(Class<? extends Link> Link) {
+		if (isValidLink(Link))
+			model.addLinkClass(Link);
+		else
+			return false;
+		return true;
+
 	}
 
+	/**
+	 * Removes Link from the model
+	 * 
+	 * @param Link
+	 *            Link to be removed
+	 */
+	public void removeLink(Class<? extends Link> Link) {
+		model.removeLinkClass(Link);
+	}
+	
+	/**
+	 * Returns the available Links of the model
+	 * 
+	 * @return available links
+	 */
+	public LinkedList<Class<? extends Link>> getLinks() {
+		return model.getLinkClasses();
+	}
+	
+	/**
+	 * Returns true if it is a Valid Link, false if not
+	 * 
+	 * @param link
+	 *            Link to be checked
+	 * @return true if it is a valid Link
+	 */
+	public boolean isValidLink(Class<? extends Link> link) {
+		try {
+			/**
+			 * Link to be tested
+			 */
+			Link l = link.newInstance();
+			// Empty constructor required, to create new instance
+			if (l == null)
+				throw new Exception("Link required an empty constructor");
+			// Name shall not be null or empty string
+			if (l.getName() == null || l.getName() == "")
+				throw new Exception(
+						"Link name shall not be null or empty string.");
+		} catch (Exception e) {
+			return false;
+		}
+		return true;
+	}
+	
 	/**
 	 * Adds new Protocol to the model
 	 * 
@@ -55,13 +110,13 @@ public class ImportController {
 	 */
 	public boolean addProtocol(Class<? extends Protocol> protocol) {
 		if (isValidProtocol(protocol))
-			model.addProtocol(protocol);
+			model.addProtocolClass(protocol);
 		else
 			return false;
 		return true;
-
+		
 	}
-
+	
 	/**
 	 * Removes protocol from the model
 	 * 
@@ -69,9 +124,18 @@ public class ImportController {
 	 *            protocol to be removed
 	 */
 	public void removeProtocol(Class<? extends Protocol> protocol) {
-		model.removeProtocol(protocol);
+		model.removeProtocolClass(protocol);
 	}
-
+	
+	/**
+	 * Returns the available Protocols of the model
+	 * 
+	 * @return available protocols
+	 */
+	public LinkedList<Class<? extends Protocol>> getProtocols() {
+		return model.getProtocolClasses();
+	}
+	
 	/**
 	 * Returns true if it is a Valid Protocol, false if not
 	 * 
@@ -103,6 +167,129 @@ public class ImportController {
 		}
 		return true;
 	}
+
+	/**
+	 * Adds new Connection to the model
+	 * 
+	 * @param connection
+	 *            Connection to be added
+	 * @return true if it was added
+	 */
+	public boolean addConnection(Class<? extends Connection> connection) {
+		if (isValidConnection(connection))
+			model.addConnectionClass(connection);
+		else
+			return false;
+		return true;
+		
+	}
+	
+	/**
+	 * Removes Connection from the model
+	 * 
+	 * @param connection
+	 *            Connection to be removed
+	 */
+	public void removeConnection(Class<? extends Connection> connection) {
+		model.removeConnectionClass(connection);
+	}
+	
+	/**
+	 * Returns the available Connections of the model
+	 * 
+	 * @return available Connections
+	 */
+	public LinkedList<Class<? extends Connection>> getConnections() {
+		return model.getConnectionClasses();
+	}
+	
+	/**
+	 * Returns true if it is a Valid Connection, false if not
+	 * 
+	 * @param connection
+	 *            Connection to be checked
+	 * @return true if it is a valid Connection
+	 */
+	public boolean isValidConnection(Class<? extends Connection> connection) {
+		try {
+			/**
+			 * Connection to be tested
+			 */
+			Connection p = connection.newInstance();
+			// Empty constructor required, to create new instance
+			if (p == null)
+				throw new Exception("Connection required an empty constructor");
+			// Name shall not be null or empty string
+			if (p.getName() == null || p.getName() == "")
+				throw new Exception(
+						"Connection name shall not be null or empty string.");
+		} catch (Exception e) {
+			return false;
+		}
+		return true;
+	}
+	
+	/**
+	 * Adds new SmartDevice to the model
+	 * 
+	 * @param smartDevice
+	 *            SmartDevice to be added
+	 * @return true if it was added
+	 */
+	public boolean addSmartDevice(Class<? extends SmartDevice> smartDevice) {
+		if (isValidSmartDevice(smartDevice))
+			model.addSmartDeviceClass(smartDevice);
+		else
+			return false;
+		return true;
+		
+	}
+	
+	/**
+	 * Removes SmartDevice from the model
+	 * 
+	 * @param smartDevice
+	 *            SmartDevice to be removed
+	 */
+	public void removeSmartDevice(Class<? extends SmartDevice> smartDevice) {
+		model.removeSmartDeviceClass(smartDevice);
+	}
+	
+	/**
+	 * Returns the available SmartDevices of the model
+	 * 
+	 * @return available SmartDevices
+	 */
+	public LinkedList<Class<? extends SmartDevice>> getSmartDevices() {
+		return model.getSmartDeviceClasses();
+	}
+	
+	/**
+	 * Returns true if it is a Valid SmartDevice, false if not
+	 * 
+	 * @param smartDevice
+	 *            SmartDevice to be checked
+	 * @return true if it is a valid SmartDevice
+	 */
+	public boolean isValidSmartDevice(Class<? extends SmartDevice> smartDevice) {
+		try {
+			/**
+			 * SmartDevice to be tested
+			 */
+			SmartDevice p = smartDevice.newInstance();
+			// Empty constructor required, to create new instance
+			if (p == null)
+				throw new Exception("SmartDevice required an empty constructor");
+			// Name shall not be null or empty string
+			if (p.getName() == null || p.getName() == "")
+				throw new Exception(
+						"SmartDevice name shall not be null or empty string.");
+		} catch (Exception e) {
+			return false;
+		}
+		return true;
+	}
+	
 	
 	/**
 	 * Imports the given .java File, compiles it and returns the 

src/main/java/de/tu_darmstadt/tk/SmartHomeNetworkSim/core/Model.java

@@ -5,6 +5,7 @@ import java.util.List;
 import java.util.Observable;
 
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.protocols.MQTT_protocol;
+import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.simpleImplementation.SimpleLink;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.simpleImplementation.SimpleProtocol;
 
 /**
@@ -18,9 +19,21 @@ public class Model extends Observable{
 	private List<Link> connectionNetworks;
 	private List<Connection> connections;
 	
+	/*
+	 * standard classes of the model, and user imported classes 
+	 */
 	private LinkedList<Class<? extends Protocol>> standardProtocols = new LinkedList<Class<? extends Protocol>>();
 	private LinkedList<Class<? extends Protocol>> importedProtocols = new LinkedList<Class<? extends Protocol>>();
 	
+	private LinkedList<Class<? extends Link>> standardLinks = new LinkedList<Class<? extends Link>>();
+	private LinkedList<Class<? extends Link>> importedLinks = new LinkedList<Class<? extends Link>>();
+	
+	private LinkedList<Class<? extends Connection>> standardConnections = new LinkedList<Class<? extends Connection>>();
+	private LinkedList<Class<? extends Connection>> importedConnections = new LinkedList<Class<? extends Connection>>();
+	
+	private LinkedList<Class<? extends SmartDevice>> standardSmartDevices = new LinkedList<Class<? extends SmartDevice>>();
+	private LinkedList<Class<? extends SmartDevice>> importedSmartDevices = new LinkedList<Class<? extends SmartDevice>>();
+	
 	/**
 	 * Width of the smart home model, 0 <= device.x < width
 	 */
@@ -60,8 +73,15 @@ public class Model extends Observable{
 		connectionNetworks = new LinkedList<Link>();
 		connections = new LinkedList<Connection>();
 		
+		//Add the default Classes
 		standardProtocols.add(MQTT_protocol.class);
 		standardProtocols.add(SimpleProtocol.class);
+		
+		standardLinks.add(SimpleLink.class);
+		
+		standardSmartDevices.add(SmartDevice.class);
+		
+		standardConnections.add(ConnectionImplementation.class);
 	}
 
 	/**
@@ -182,10 +202,10 @@ public class Model extends Observable{
 	}
 	
 	/**
-	 * Returns Protocols of the Model
-	 * @return available Protocols
+	 * Returns Protocol Classes of the Model
+	 * @return available Protocol Classes
 	 */
-	public LinkedList<Class<? extends Protocol>> getProtocols(){
+	public LinkedList<Class<? extends Protocol>> getProtocolClasses(){
 		LinkedList<Class<? extends Protocol>> export = new LinkedList<Class<? extends Protocol>>();
 		export.addAll(standardProtocols);
 		export.addAll(importedProtocols);
@@ -193,18 +213,99 @@ public class Model extends Observable{
 	}
 	
 	/**
-	 * Adds newProtocol to the available protocols
-	 * @param newProtocol new Protocol to be added
+	 * Adds newProtocol to the available protocol classes
+	 * @param newProtocol new Protocol Class to be added
 	 */
-	public void addProtocol(Class<? extends Protocol> newProtocol){
+	public void addProtocolClass(Class<? extends Protocol> newProtocol){
 		importedProtocols.add(newProtocol);
 	}
 	
 	/**
-	 * Removes Protocol from the available protocols
+	 * Removes Protocol from the available protocol classes
 	 * @param remove protocol to be removed
 	 */
-	public void removeProtocol(Class<? extends Protocol> remove){
+	public void removeProtocolClass(Class<? extends Protocol> remove){
 		importedProtocols.remove(remove);
 	}
+	
+	/**
+	 * Returns Link Classes of the Model
+	 * @return available Link classes
+	 */
+	public LinkedList<Class<? extends Link>> getLinkClasses(){
+		LinkedList<Class<? extends Link>> export = new LinkedList<Class<? extends Link>>();
+		export.addAll(standardLinks);
+		export.addAll(importedLinks);
+		return export;
+	}
+	
+	/**
+	 * Adds newLink to the available Link classes
+	 * @param newLink new Link class to be added
+	 */
+	public void addLinkClass(Class<? extends Link> newLink){
+		importedLinks.add(newLink);
+	}
+	
+	/**
+	 * Removes Link from the available Link classes
+	 * @param remove Link Class to be removed
+	 */
+	public void removeLinkClass(Class<? extends Link> remove){
+		importedLinks.remove(remove);
+	}
+	
+	/**
+	 * Returns Connection Classes of the Model
+	 * @return available Connections classes
+	 */
+	public LinkedList<Class<? extends Connection>> getConnectionClasses(){
+		LinkedList<Class<? extends Connection>> export = new LinkedList<Class<? extends Connection>>();
+		export.addAll(standardConnections);
+		export.addAll(importedConnections);
+		return export;
+	}
+	
+	/**
+	 * Adds Connection Class to the available Connection Classes
+	 * @param newConnection new Connection to be added
+	 */
+	public void addConnectionClass(Class<? extends Connection> newConnection){
+		importedConnections.add(newConnection);
+	}
+	
+	/**
+	 * Removes Connection Class from the available Connection Classes
+	 * @param remove Connection Class to be removed
+	 */
+	public void removeConnectionClass(Class<? extends Connection> remove){
+		importedConnections.remove(remove);
+	}
+	
+	/**
+	 * Returns SmartDevice Classes of the Model
+	 * @return available SmartDevice Classes
+	 */
+	public LinkedList<Class<? extends SmartDevice>> getSmartDeviceClasses(){
+		LinkedList<Class<? extends SmartDevice>> export = new LinkedList<Class<? extends SmartDevice>>();
+		export.addAll(standardSmartDevices);
+		export.addAll(importedSmartDevices);
+		return export;
+	}
+	
+	/**
+	 * Adds newSmartDevice Class to the available SmartDevice Classes
+	 * @param newSmartDevice new SmartDevice Class to be added
+	 */
+	public void addSmartDeviceClass(Class<? extends SmartDevice> newSmartDevice){
+		importedSmartDevices.add(newSmartDevice);
+	}
+	
+	/**
+	 * Removes SmartDevice Class from the available SmartDevice Classes
+	 * @param remove SmartDevice Class to be removed
+	 */
+	public void removeSmartDeviceClass(Class<? extends SmartDevice> remove){
+		importedSmartDevices.remove(remove);
+	}
 }