From 7eccf40188a2326bec49d67f92ce0ca3d8919cec Mon Sep 17 00:00:00 2001
From: Jan Pokorný <jpokorny@redhat.com>
Date: Tue, 24 Sep 2013 23:46:20 +0200
Subject: Refactor attributes handling: conciseness and flexibility
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
---
 lib_edges.py | 111 ++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 56 insertions(+), 55 deletions(-)

(limited to 'lib_edges.py')

diff --git a/lib_edges.py b/lib_edges.py
index c1c8201..19617eb 100644
--- a/lib_edges.py
+++ b/lib_edges.py
@@ -6,107 +6,108 @@
 """Edge library incl. visual aspects"""
 
 from lib import LibEdge
+from lib_attributes import *
 
 
 class DBUS(LibEdge):
-    def __init__(self, *args, **kwargs):
-        kwargs.setdefault('style', 'dotted')
-        super(DBUS, self).__init__(*args, **kwargs)
+    defaults = dict((
+        STYLE.dotted,
+    ))
 
 
 class OddjobExec(DBUS):
-    def __init__(self, *args, **kwargs):
-        kwargs.setdefault('label', 'oddjob\nexec')
-        super(OddjobExec, self).__init__(*args, **kwargs)
+    defaults = dict((
+        LABEL('oddjob\nexec'),
+    ))
 
 
 class HTTPS(LibEdge):
-    def __init__(self, *args, **kwargs):
-        kwargs.setdefault('style', 'bold')
-        super(HTTPS, self).__init__(*args, **kwargs)
+    defaults = dict((
+        STYLE.bold,
+    ))
 
 
-class LuciHTTPS(HTTPS):
-    def __init__(self, *args, **kwargs):
-        kwargs.setdefault('label', 'port 8084')
-        super(LuciHTTPS, self).__init__(*args, **kwargs)
+class  LuciHTTPS(HTTPS):
+    defaults = dict((
+        LABEL('port 8084'),
+    ))
 
 
 class ApplicationSpecificProtocol(LibEdge):
-    def __init__(self, *args, **kwargs):
-        kwargs.setdefault('style', 'dashed')
-        super(ApplicationSpecificProtocol, self).__init__(*args, **kwargs)
+    defaults = dict((
+        STYLE.dashed,
+    ))
 
 
 class RICCIRPC(ApplicationSpecificProtocol):
-    def __init__(self, *args, **kwargs):
-        kwargs.setdefault('label', 'port 11111')
-        super(RICCIRPC, self).__init__(*args, **kwargs)
+    defaults = dict((
+        LABEL('port 11111'),
+    ))
 
 
 class SNMP(ApplicationSpecificProtocol):
-    def __init__(self, *args, **kwargs):
-        kwargs.setdefault('label', 'port 161')
-        super(SNMP, self).__init__(*args, **kwargs)
+    defaults = dict((
+        LABEL('port 161'),
+    ))
 
 
 class CIM(ApplicationSpecificProtocol):
-    def __init__(self, *args, **kwargs):
-        kwargs.setdefault('label', 'port 898[89]')
-        super(CIM, self).__init__(*args, **kwargs)
+    defaults = dict((
+        LABEL('port 898[89]'),
+    ))
 
 
 class Consume(LibEdge):
-    def __init__(self, *args, **kwargs):
-        kwargs.setdefault('color', 'darkgreen')
-        kwargs.setdefault('fontcolor', 'darkgreen')
-        super(Consume, self).__init__(*args, **kwargs)
+    defaults = dict((
+        COLOR.darkgreen,
+        FONTCOLOR.darkgreen,
+    ))
 
 
 class ConsumeReversed(Consume):
-    def __init__(self, *args, **kwargs):
-        kwargs.setdefault('dir', 'back')
-        super(ConsumeReversed, self).__init__(*reversed(args), **kwargs)
+    defaults = dict((
+        DIR.back,
+    ))
 
 
 class Produce(LibEdge):
-    def __init__(self, *args, **kwargs):
-        kwargs.setdefault('color', 'orangered')
-        kwargs.setdefault('fontcolor', 'orangered')
-        super(Produce, self).__init__(*args, **kwargs)
+    defaults = dict((
+        COLOR.orangered,
+        FONTCOLOR.orangered,
+    ))
 
 
 class Delegate(LibEdge):
-    def __init__(self, *args, **kwargs):
-        kwargs.setdefault('color', 'navy')
-        kwargs.setdefault('fontcolor', 'navy')
-        #kwargs.setdefault('dir', 'both')
-        super(Delegate, self).__init__(*args, **kwargs)
+    defaults = dict((
+        COLOR.navy,
+        FONTCOLOR.navy,
+        #DIR.both,
+    ))
 
 
 class FencedBy(LibEdge):
-    def __init__(self, *args, **kwargs):
-        kwargs.setdefault('color', 'red')
-        kwargs.setdefault('dir', 'back')
-        super(FencedBy, self).__init__(*args, **kwargs)
+    defaults = dict((
+        COLOR.red,
+        DIR.back,
+    ))
 
 
 # peer-to-peer (1:1 hence constraint='false')
 class Exchange(LibEdge):
-    def __init__(self, *args, **kwargs):
-        kwargs.setdefault('color', 'saddlebrown')
-        kwargs.setdefault('fontcolor', 'saddlebrown')
-        kwargs.setdefault('dir', 'both')
-        kwargs.setdefault('constraint', 'false')
-        super(Exchange, self).__init__(*args, **kwargs)
+    defaults = dict((
+        COLOR.saddlebrown,
+        FONTCOLOR.saddlebrown,
+        DIR.both,
+        CONSTRAINT.false,
+    ))
 
 
 # data bus
 class Databus(Exchange):
-    def __init__(self, *args, **kwargs):
-        kwargs.setdefault('color', 'saddlebrown')
-        kwargs.setdefault('fontcolor', 'saddlebrown')
-        super(Databus, self).__init__(*args, **kwargs)
+    defaults = dict((
+        COLOR.saddlebrown,
+        FONTCOLOR.saddlebrown,
+    ))
 
 
 # mixing
-- 
cgit