Changeset 3676

Timestamp:

28/11/08 15:00:35 (6 weeks ago)

Author:

dmeyer

Message:

autoregister to candyxml using metaclass

Location:

trunk/candy/src

Files:

• candyxml.py (modified) (4 diffs)
• core.py (modified) (4 diffs)
• eventhandler.py (modified) (1 diff)
• widgets/container.py (modified) (1 diff)
• widgets/grid.py (modified) (1 diff)
• widgets/image.py (modified) (1 diff)
• widgets/label.py (modified) (1 diff)
• widgets/progressbar.py (modified) (1 diff)
• widgets/rectangle.py (modified) (1 diff)
• widgets/reflection.py (modified) (1 diff)
• widgets/text.py (modified) (1 diff)
• widgets/widget.py (modified) (3 diffs)

trunk/candy/src/candyxml.py

@@ -68 +68 @@
       def candyxml_parse(cls, element):
           ...
-
-  # register
-  Foo.candyxml_register()
-  SimpleBar.candyxml_register()
-  ComplexBar.candyxml_register()
 
 XML example::
@@ -151 +146 @@
 """
 
-__all__ = [ 'parse', 'register', 'get_class', 'STYLE_HANDLER' ]
+__all__ = [ 'parse', 'register', 'get_class' ]
 
 # python imports
@@ -160 +155 @@
 # kaa.candy imports
 import core
-
-STYLE_HANDLER = 'STYLE_HANDLER'
 
 # get logging object
@@ -404 +397 @@
 _parser = {}
 
-def register(cls, style=None):
-    """
-    Register a class with the given style.
-    @param cls: class with candyxml variables and functions
-    @param style: optional style if there is more than one parser for the node
+def register(cls):
+    """
+    Register a class
     """
     name = cls.candyxml_name
-    style = style or getattr(cls, 'candyxml_style', None)
     parser = _parser
-    if style != STYLE_HANDLER:
+    if not isinstance(cls, Styles):
         if not name in parser:
             parser[name] = Styles()
-        parser, name = parser[name], style
+        parser, name = parser[name], getattr(cls, 'candyxml_style', None)
     if name in parser:
         raise RuntimeError('%s already registered' % name)
     parser[name] = cls
 
-def get_class(name, style=None):
-    """
-    Get the class registered to the given name.
-    @param name: parser name
-    @param style: style of the parser if there is more than one for the name
-    @returns: class of the parser (e.g. Widget)
-    """
-    result = _parser.get(name)
-    if isinstance(result, dict):
-        return result.get(style)
-    return result
+def get_class(name, style):
+    """
+    Get the class registered to the given name and style
+    """
+    return _parser.get(name).get(style)

trunk/candy/src/core.py

@@ -188 +188 @@
             size += 1
 
+
 class Modifier(object):
     """
@@ -194 +195 @@
     to change. Examples are Properties and ReflectionModifier.
     """
-    __modifier = {}
+
+    class __metaclass__(type):
+        def __new__(meta, name, bases, attrs):
+            cls = type.__new__(meta, name, bases, attrs)
+            if 'candyxml_name' in attrs.keys():
+                if cls.candyxml_name in Modifier._candyxml_modifier:
+                    raise RuntimeError('%s already defined' % cls.candyxml_name)
+                Modifier._candyxml_modifier[cls.candyxml_name] = cls
+            return cls
+    
+    _candyxml_modifier = {}
 
     def modify(self, widget):
@@ -213 +224 @@
             implementation variant, not the other way around.
         """
-        cls = Modifier.__modifier.get(element.node)
+        cls = Modifier._candyxml_modifier.get(element.node)
         if cls is None:
             return cls
         return cls.candyxml_create(element)
-
-    @classmethod
-    def candyxml_register(cls):
-        """
-        Register class to candyxml. This function can only be called
-        once when the class is loaded.
-        """
-        Modifier.__modifier[cls.candyxml_name] = cls
 
 
@@ -273 +276 @@
             properties[key] = value
         return properties
-
-# register Properties modifier
-Properties.candyxml_register()

trunk/candy/src/eventhandler.py

@@ -120 +120 @@
         eventhandler.condition = element.condition
         return eventhandler
-
-# register Properties modifier
-Eventhandler.candyxml_register()

trunk/candy/src/widgets/container.py

@@ -425 +425 @@
         return super(Container, cls).candyxml_parse(element).update(
             dependency=dependency, widgets=widgets)
-
-
-# register widget to candyxml
-Container.candyxml_register()

trunk/candy/src/widgets/grid.py

@@ -533 +533 @@
         return super(SelectionGrid, cls).candyxml_parse(element).update(
             selection=selection)
-
-
-# register widgets to candyxml
-Grid.candyxml_register()
-SelectionGrid.candyxml_register()

trunk/candy/src/widgets/image.py

@@ -322 +322 @@
         return Imlib2Texture.candyxml_parse(element).update(
             thumbnail=element.thumbnail, default=element.default)
-
-
-# register widgets to candyxml
-Image.candyxml_register()
-Thumbnail.candyxml_register()

trunk/candy/src/widgets/label.py

@@ -186 +186 @@
         return super(Label, cls).candyxml_parse(element).update(
             font=element.font, color=element.color, text=element.content)
-
-
-# register widget to candyxml
-Label.candyxml_register()

trunk/candy/src/widgets/progressbar.py

@@ -101 +101 @@
         return super(Progressbar, cls).candyxml_parse(element).update(
             progress=element[0].xmlcreate())
-
-
-# register widget to candyxml
-Progressbar.candyxml_register()

trunk/candy/src/widgets/rectangle.py

@@ -172 +172 @@
             radius=int(element.radius or 0), border_size=float(element.border_size or 0),
             color=element.color, border_color=element.border_color)
-
-
-# register widget to candyxml
-Rectangle.candyxml_register()

trunk/candy/src/widgets/reflection.py

@@ -149 +149 @@
         """
         return cls(opacity = int(element.opacity or 50))
-
-# register widget to candyxml
-ReflectionModifier.candyxml_register()

trunk/candy/src/widgets/text.py

@@ -186 +186 @@
             text=element.content, align=element.align, color=element.color,
             font=element.font)
-
-
-# register widget to candyxml
-Text.candyxml_register()

trunk/candy/src/widgets/widget.py

@@ -107 +107 @@
         """
         Parse the candyxml element for parameter and create a Template.
-
-        @param element: kaa.candy.candyxml.Element with widget information
-        @returns: Template object
         """
         modifier = []
@@ -134 +131 @@
         depends on the context.
     """
+
+    class __metaclass__(type):
+        def __new__(meta, name, bases, attrs):
+            cls = type.__new__(meta, name, bases, attrs)
+            if 'candyxml_name' in attrs.keys() or 'candyxml_style' in attrs.keys():
+                candyxml.register(cls)
+            return cls
 
     #: set if the object reacts on context
@@ -611 +615 @@
         return _dict(pos=element.pos, size=(element.width, element.height))
 
-    @classmethod
-    def candyxml_register(cls, style=None):
-        """
-        Register class to candyxml. This function can only be called
-        once when the class is loaded.
-        """
-        candyxml.register(cls, style)
-
 #     def __del__(self):
 #         print '__del__', self