1 files changed, 29 insertions, 30 deletions
diff --git a/lib_nodes.py b/lib_nodes.py
index a3e08ec..20b5c66 100644
--- a/lib_nodes.py
+++ b/lib_nodes.py
@@ -6,27 +6,28 @@
 """Node library incl. visual aspects"""
 
 from lib import LibNode
+from lib_attributes import *
 
 
 class Program(LibNode):
-    def __init__(self, *args, **kwargs):
-        kwargs.setdefault('shape', 'box')
-        kwargs.setdefault('style', 'filled')
-        super(Program, self).__init__(*args, **kwargs)
+    defaults = dict((
+        SHAPE.box,
+        STYLE.filled,
+    ))
 
 
 class Agent(Program):
-    def __init__(self, *args, **kwargs):
-        kwargs.setdefault('fillcolor', 'lavenderblush')
-        kwargs.setdefault('style', 'filled')
-        super(Agent, self).__init__(*args, **kwargs)
+    defaults = dict((
+        FILLCOLOR.lavenderblush,
+        STYLE.filled,
+    ))
 
 
 class Library(Program):
-    def __init__(self, *args, **kwargs):
-        kwargs.setdefault('fillcolor', 'lavenderblush')
-        kwargs.setdefault('style', 'filled')
-        super(Library, self).__init__(*args, **kwargs)
+    defaults = dict((
+        FILLCOLOR.lavenderblush,
+        STYLE.filled,
+    ))
 
 
 class Executable(Program):
@@ -34,33 +35,31 @@ class Executable(Program):
 
 
 class Daemon(Executable):
-    def __init__(self, *args, **kwargs):
-        kwargs.setdefault('fillcolor', 'cornsilk')
-        kwargs.setdefault('style', 'filled')
-        super(Daemon, self).__init__(*args, **kwargs)
+    defaults = dict((
+        FILLCOLOR.cornsilk,
+        STYLE.filled,
+    ))
 
 
 class Artefact(LibNode):
-    def __init__(self, *args, **kwargs):
-        kwargs.setdefault('shape', 'box3d')
-        kwargs.setdefault('fillcolor', 'wheat')
-        kwargs.setdefault('style', 'filled')
-        super(Artefact, self).__init__(*args, **kwargs)
+    defaults = dict((
+        SHAPE.box3d,
+        FILLCOLOR.wheat,
+        STYLE.filled,
+    ))
 
 
 class Device(LibNode):
-    def __init__(self, *args, **kwargs):
-        kwargs.setdefault('shape', 'box3d')
-        kwargs.setdefault('fillcolor', 'wheat')
-        kwargs.setdefault('style', 'filled')
-        super(Device, self).__init__(*args, **kwargs)
+    defaults = dict((
+        SHAPE.box3d,
+        FILLCOLOR.wheat,
+        STYLE.filled,
+    ))
 
 
 class StorageDevice(Device):
-    def __init__(self, *args, **kwargs):
-        super(StorageDevice, self).__init__(*args, **kwargs)
+    pass
 
 
 class FenceDevice(Device):
-    def __init__(self, *args, **kwargs):
-        super(FenceDevice, self).__init__(*args, **kwargs)
+    pass