edited composite

Author: Sean-Bradley

composite/classes.dot

@@ -1,9 +1,9 @@
 digraph "classes" {
 charset="utf-8"
 rankdir=BT
-"0" [label="{CompositeGraphic|child_graphics : list\l|add()\lprint()\l}", shape="record"];
-"1" [label="{Ellipse|\l|print()\l}", shape="record"];
-"2" [label="{IGraphic|\l|print()\l}", shape="record"];
+"0" [label="{Composite|entities : list\l|add()\lfunc()\l}", shape="record"];
+"1" [label="{Entity|\l|func()\l}", shape="record"];
+"2" [label="{IEntity|\l|func()\l}", shape="record"];
 "0" -> "2" [arrowhead="empty", arrowtail="none"];
 "1" -> "2" [arrowhead="empty", arrowtail="none"];
 }

composite/composite.png

@@ -1,64 +1,47 @@
 from abc import ABCMeta, abstractmethod
 
-
 class IGraphic(metaclass=ABCMeta):
-    """Component"""
-
     @staticmethod
     @abstractmethod
     def print():
         """print information"""
 
+class Ellipse(IGraphic):
+    def print(self):
+        print("Ellipse")
 
-class CompositeGraphic(IGraphic):
-    """Composite"""
+class Circle(IGraphic):
+    def print(self):
+        print("Circle")
 
+class CompositeGraphic(IGraphic):
     def __init__(self):
         self.child_graphics = []
 
     def add(self, graphic):
         self.child_graphics.append(graphic)
-
+    
     def print(self):
         for g in self.child_graphics:
             g.print()
 
 
-class Ellipse(IGraphic):
-    """leaf"""
-
-    def print(self):
-        print("Ellipse")
-
-
-class Circle(IGraphic):
-    def print(self):
-        print("Circle")
-
-
-"""client"""
 ELLIPSE1 = Ellipse()
-ELLIPSE2 = Ellipse()
-ELLIPSE3 = Ellipse()
-ELLIPSE4 = Ellipse()
 CIRCLE1 = Circle()
 
-COMPOSITE4 = CompositeGraphic()
-COMPOSITE4.add(ELLIPSE1)
-COMPOSITE4.add(ELLIPSE2)
-COMPOSITE4.add(ELLIPSE3)
+COMPOSITE1 = CompositeGraphic()
+COMPOSITE1.add(ELLIPSE1)
 
 COMPOSITE2 = CompositeGraphic()
-COMPOSITE2.add(ELLIPSE4)
 COMPOSITE2.add(CIRCLE1)
+COMPOSITE2.add(COMPOSITE1)
+
+COMPOSITE2.print()
+
+
+
+# ELLIPSE1.print()
+# CIRCLE1.print()
 
-COMPOSITE3 = CompositeGraphic()
-COMPOSITE3.add(COMPOSITE4)
-COMPOSITE3.add(COMPOSITE2)
 
-COMPOSITE1 = CompositeGraphic()
-COMPOSITE1.add(ELLIPSE1)
-COMPOSITE1.add(COMPOSITE3)
-# COMPOSITE3.print()
 
-COMPOSITE1.print()