Extra node attributes don't throw exceptions anymore (#253)

thpar · Dec 23, 2014 · ac73825 · ac73825
1 parent d179f89
commit ac73825
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/diffany/src/main/java/be/svlandeg/diffany/core/networks/Network.java b/diffany/src/main/java/be/svlandeg/diffany/core/networks/Network.java
@@ -352,8 +352,7 @@ public void addNode(Node node)
 		}
 		for (Attribute nodeAttribute : nodeAttributes)
 		{
-			Object value = node.getAttribute(nodeAttribute.getName());
-			if (value == null)
+			if (!node.getAllAttributeNames().contains(nodeAttribute.getName()))
 			{
 				String errormsg = "The node " + node.ID + " does not contain the required attribute " + nodeAttribute + "!";
 				throw new IllegalArgumentException(errormsg);

diff --git a/diffany/src/main/java/be/svlandeg/diffany/core/networks/Node.java b/diffany/src/main/java/be/svlandeg/diffany/core/networks/Node.java
@@ -113,6 +113,8 @@ public void setAttribute(String attributeName, Object value)
 		}
 		if (name == null)
 		{
+			//FIXME: is this checking the name and not the attribute value on purpose?
+			//Attributes SHOULD be allowed to be null though...
 			String errormsg = "The attribute value should not be null!";
 			throw new IllegalArgumentException(errormsg);
 		}