Changeset 29

Timestamp:

02/29/08 08:20:45 (10 months ago)

Author:

skit

Message:

Commit du taf des vacances

Files:

• project/trunk/src/pyxoo/command.py (modified) (1 diff)
• project/trunk/src/pyxoo/core.py (modified) (6 diffs)
• project/trunk/src/pyxoo/event.py (modified) (11 diffs)
• project/trunk/src/pyxoo/exceptions.py (modified) (2 diffs)
• project/trunk/src/pyxoo/plugin.py (modified) (5 diffs)
• project/trunk/src/pyxoo/utils/interface.py (modified) (4 diffs)
• project/trunk/src/pyxoo/view.py (modified) (4 diffs)
• project/trunk/test/commands/TestFrontController.py (modified) (1 diff)
• project/trunk/test/events/TestChannelBroadcaster.py (modified) (1 diff)
• project/trunk/test/events/TestEventBroadcaster.py (modified) (5 diffs)
• project/trunk/test/plugin/TestAbstractPlugin.py (added)
• project/trunk/test/view/TestViewLocator.py (modified) (2 diffs)

project/trunk/src/pyxoo/command.py

@@ -518 +518 @@
-        """
-        Registers the passed-in command to be triggered at each time
->
+
-
-        If there is already a class or a command associated with the passed-in

project/trunk/src/pyxoo/core.py

@@ -172 +172 @@
-            self.register( key, value )
- 
-self, object
+ self, object 
-        """
-        Verify that the passed-in object type match the current 
@@ -181 +181 @@
-        return isinstance( object, self.getType() ) or object is None
-    
-self
+ self 
-        """
-        Return the class type of elements in this container.
@@ -191 +191 @@
-        return self.__type
-    
-self
+ self 
-        """
-        Returns true if this container perform a verification
@@ -231 +231 @@
-        return self.__eventBroadcaster.removeEventListener( eventType, listener )
-    
-self
+ self 
-        """
-        Returns an list view of the keys contained in this locator.
@@ -238 +238 @@
-        return self._elements.getKeys()
-    
-self
+ self 
-        """
-        Returns an list view of the values contained in this locator.
@@ -254 +254 @@
-                
-                
+                
+class Accessor( pyxoo.utils.Interface ):
+    """
+    The Accessor interface defines common rules
+    to create abstract access to properties or methods of an 
+    object. That interface allow tweens to get and set both
+    properties and methods of an object in a transparent way. 
+
+    An Accessor could access to only one property or
+    getter/setter pair of methods for an object. To access many
+    properties/methods in one time see the AccessorComposer
+    interface.
+
+    In order to the accessor to get or set value with methods, an accessor
+    must know both getter and setter methods name. If one of these information
+    is not available, the accessor must throw an exception in order to prevent
+    the tween to work on unavailable data.
+
+    There isn't any method to dynamically bind an accessor to a new property or
+    a new getter/setter pair of method. You have to create a new accessor if you
+    need to change the property you want to access.
+
+    Note : Of course, only public members of the target object could be accessed
+    by an accessor instance.
+    """
+    
+    def getValue( self ):
+        """
+        Retreives the value from the target property.
+        If the type of the data stored by this object is not
+        a number type, the call must fail with an exception.
+        @rtype: int, float, long
+        @return: current value stored in the target property
+        @raise TypeError: The target getter method doesn't return a number.
+        """
+        
+    def setValue( self, value ):
+        """
+        Defines the new value for the target property.
+        If the type of the data stored by this object is not
+        a number type, the call must fail with an exception.
+        @param value: new numeric value for the target property
+        @type value: int, float, long
+        """
+        
+    def getTarget( self ):
+        """
+        Returns the target object onto which this accessor operate.
+        @rtype: Object
+        @return: the object onto which this accessor operate
+        """
+        
+    def getGetterHelper( self ):
+        """
+        Returns the string name of the getter access used
+        by this accessor to retreive data from its target object.
+        @rtype: String
+        @return: the string name of the getter access used by this accessor
+        """
+        
+    def getSetterHelper( self ):
+        """
+        Returns the string name of the setter access used
+        by this accessor to defines new data to its target object.
+        @rtype: String
+        @return: the string name of the setter access used by this accessor
+        """
+        
+        
+class MethodAccessor( Accessor ):
+    """
+    The MethodAccessor provides read and write access 
+    to the specified method of an object. 
+    """
+    
+    def __init__( self, target, setter, getter ):
+        """
+        Creates a new MethodAccessor instance which
+        allow access to the specified getter and
+        setter methods of the passed-in object.
+        @param target: object onto which access methods
+        @type target: Object
+        @param setter: name of the setter method on the object
+        @type setter: String
+        @param getter: name of the getter method on the object
+        @type getter: String
+        @raise pyxoo.exceptions.NullPointerException: Can't create an accessor on a null object
+        @raise pyxoo.exceptions.NoSuchMethodException: There is no setter method of the specified name
+        @raise pyxoo.exceptions.NoSuchMethodException: There is no getter method of the specified name
+        """
+        if not target:
+            raise pyxoo.exceptions.NullPointerException( "Can't create an accessor on a null object" )
+        elif not hasattr( target, setter ):
+            raise pyxoo.exceptions.NoSuchMethodException( "%s doesn't own any setter method called '%s'"%( target, setter ) )
+        elif not hasattr( target, getter ):
+            raise pyxoo.exceptions.NoSuchMethodException( "%s doesn't own any getter method called '%s'"%( target, getter ) )
+        self.__target = target
+        self.__setter = setter
+        self.__getter = getter
+        self.__Fsetter = getattr( target, setter )
+        self.__Fgetter = getattr( target, getter )
+    
+    def getValue ( self ):
+        """
+        Retreives the value from the target property.
+        If the type of the data stored by this object is not
+        a number type, the call must fail with an exception.
+        @rtype: int, float, long
+        @return: current value stored in the target property
+        @raise TypeError: The target getter method doesn't return a number.
+        """
+        n = self.__Fgetter()
+        if not pyxoo.utils.Type.isNumber( n ):
+            raise TypeError( "%s.%s() doesn't return a number"%( self.__target, self.__getter ) )
+        return n
+        
+    def setValue( self, value ):
+        """
+        Defines the new value for the target property.
+        If the type of the data stored by this object is not
+        a number type, the call must fail with an exception.
+        @param value: new numeric value for the target property
+        @type value: int, float, long
+        """
+        self.__Fsetter( value )
+        
+    def getTarget( self ):
+        """
+        Returns the target object onto which this accessor operate.
+        @rtype: Object
+        @return: the object onto which this accessor operate
+        """
+        return self.__target
+        
+    def getGetterHelper( self ):
+        """
+        Returns the string name of the getter access used
+        by this accessor to retreive data from its target object.
+        @rtype: String
+        @return: the string name of the getter access used by this accessor
+        """
+        return self.__getter
+        
+    def getSetterHelper( self ):
+        """
+        Returns the string name of the setter access used
+        by this accessor to defines new data to its target object.
+        @rtype: String
+        @return: the string name of the setter access used by this accessor
+        """
+        return self.__setter
+    
+    def __str__( self ):
+        """__str__():String
+        Returns the string representation of this instance."""
+        return pyxoo.utils.PyxooStringifier.stringify( self )
+
+    
+class PropertyAccessor( Accessor ):
+    """
+    The PropertyAccessor provides read and write access 
+    to the specified property of an object. 
+    """
+    def __init__( self, target, property ):
+        if not target:
+            raise pyxoo.exceptions.NullPointerException( "Can't create an accessor on a null object" )
+        elif not hasattr( target, property ):
+            raise pyxoo.exceptions.NoSuchFieldException( "%s doesn't own any property called '%s'"%( target, property ) )
+        self.__target = target
+        self.__property = property
+        
+        
+    def getValue( self ):
+        """
+        Retreives the value from the target property.
+        If the type of the data stored by this object is not
+        a number type, the call must fail with an exception.
+        @rtype: int, float, long
+        @return: current value stored in the target property
+        @raise TypeError: The target getter method doesn't return a number.
+        """
+        n = getattr( self.__target, self.__property )
+        if not pyxoo.utils.Type.isNumber( n ):
+            raise TypeError( "%s.%s() doesn't return a number"%( self.__target, self.__getter ) )
+        return n
+        
+    def setValue( self, value ):
+        """
+        Defines the new value for the target property.
+        If the type of the data stored by this object is not
+        a number type, the call must fail with an exception.
+        @param value: new numeric value for the target property
+        @type value: int, float, long
+        """
+        
+        setattr( self.__target, self.__property, value )
+        
+    def getTarget( self ):
+        """
+        Returns the target object onto which this accessor operate.
+        @rtype: Object
+        @return: the object onto which this accessor operate
+        """
+        return self.__target
+        
+    def getGetterHelper( self ):
+        """
+        Returns the string name of the getter access used
+        by this accessor to retreive data from its target object.
+        @rtype: String
+        @return: the string name of the getter access used by this accessor
+        """
+        return self.__property
+        
+    def getSetterHelper( self ):
+        """
+        Returns the string name of the setter access used
+        by this accessor to defines new data to its target object.
+        @rtype: String
+        @return: the string name of the setter access used by this accessor
+        """
+        return self.__property
+    
+    def getProperty( self ):
+        """
+        Returns the property's name onto which this accessor operate.
+        """
+        return self.__property
+    
+    def __str__( self ):
+        """__str__():String
+        Returns the string representation of this instance."""
+        return pyxoo.utils.PyxooStringifier.stringify( self )
+                
+                
+class AccessorFactory:
+    """
+    A factory for Accessor and AccessorComposer creation.
+    With the AccessorFactory, you don't have to know if you attempt to
+    access to a property or to a method. The creational methods of the factory
+    will return the corresponding concret accessor.
+    """
+    
+    @classmethod
+    def getAccessor( cls, target , setter, getter=None ):
+        """
+        Returns an accessor object for the passed-in property or methods of the
+        specified target object. The concret type of the accessor cannot be
+        known before the call, as for any other factories.
+
+        In the case of accessing to method member, the setter and 
+        getter arguments must be set.
+        @param target: the object onto which access member(s)
+        @type target: Object
+        @param setter: name of the setter property on the target
+        @type setter: String
+        @param getter: name of the getter property on the target, used only if the setter property is a function
+        @type getter: String
+        @rtype: pyxoo.core.Accessor
+        @raise pyxoo.exceptions.NullPointerException: Can't create an accessor on a null object
+        @raise pyxoo.exceptions.NoSuchFieldException: The target object doesn't own any field named as setter
+        @raise pyxoo.exceptions.NoSuchMethodExceptio: There'is no getter method to associate with the corresponding setter
+        """
+        if not target:
+            raise pyxoo.exceptions.NullPointerException( "Can't create an accessor on a null object" )        
+        if not hasattr( target, setter ):
+            raise pyxoo.exceptions.NoSuchFieldException( "%s doesn't own any property called '%s'"%( target, setter ) )
+        elif callable( getattr( target, setter ) ):
+            if not getter or not hasattr( target, getter ):
+                raise pyxoo.exceptions.NoSuchMethodException( "%s doesn't own any getter method named %s"%( target, getter ) )
+            return MethodAccessor( target, setter, getter )
+        else:
+            return PropertyAccessor( target, setter )
+        
+        

project/trunk/src/pyxoo/event.py

@@ -143 +143 @@
-        parameter.
-        """
-_
-_
+
+
-        self.setListenerType( listenerType )
-        self.__init()
@@ -367 +367 @@
-        if not isinstance( event, IEvent ):
-            raise TypeError( "event param must be an instance of IEvent class." )   
-pyxoo.utils.Type.isNone( event.getTarget() 
-_
+not event.getTarget(
+
-        if self.hasListenerCollection( event.getType() ):
-_
-_
+
+
-            
-
+
+
-        for listener in listeners:
-.getType() ) and callable( getattr( listener, event.getType()
-.getType()
+Type ) and callable( getattr( listener, eventType
+Type
-            elif hasattr( listener, "handleEvent" ) and callable( getattr( listener, "handleEvent" ) ):
-                listener.handleEvent( event )
-            else:
-.getType()
+Type
-    
-    def __storeRef( self, type, listener ):
@@ -711 +712 @@
-        if privateAccess is not self.__PRIVATE:
-            raise IllegalAccessException( "Constructor of ApplicationBroadcaster is private." )
-_Internal
+pyxoo.plugin.Plugin
-
-    def getChannelDispatcher( self, eventChannel=None, owner=None ):
@@ -729 +730 @@
-
-
-
-
-
+
+
-        for listener in listeners:
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
@@ -815 +816 @@
-class BooleanEvent( BasicEvent ):
-    """BooleanEvent defines specific event structure to work with Boolean value"""    
-valu
+target=None, value=Non
-        """__init__(String, Boolean)
-        Constructs a new BooleanEvent instance."""
-
+, target
-        if not Type.isBoolean( value ):
-            raise TypeError( "value must be a boolean" )
@@ -832 +833 @@
-class IntegerEvent( BasicEvent ):
-    """IntegerEvent defines specific event structure to work with Integer value"""    
-valu
+target=None, value=Non
-        """Constructs a new IntegerEvent instance."""
-
-
+, target
+value is not None and 
-            raise TypeError( "value must be an integer" )
-        self.__integer = value
@@ -847 +848 @@
-class LongEvent( BasicEvent ):
-    """LongEvent defines specific event structure to work with Long Integer value"""    
-valu
+target=None, value=Non
-        """Constructs a new IntegerEvent instance."""
-
+, target
-        if not pyxoo.utils.Type.isLong( value ):
-            raise TypeError( "value must be a long integer" )
@@ -862 +863 @@
-class FloatEvent( BasicEvent ):
-    """FloatEvent defines specific event structure to work with Float value"""    
-valu
+target=None, value=Non
-        """Constructs a new FloatEvent instance."""   
-
+, target
-        if not Type.isFloat( value ):
-            raise TypeError( "value must be a float" )
@@ -877 +878 @@
-class StringEvent( BasicEvent ): 
-    """StringEvent defines specific event structure to work with String value"""       
-valu
+target=None, value=Non
-        """Constructs a new StringEvent instance."""
-
-not 
+, target
+value and not pyxoo.utils.
-            raise TypeError( "value must be a String" )
-        self.__string = value
@@ -892 +893 @@
-class ValueObjectEvent( BasicEvent ):
-    """ValueObjectEvent defines specific event structure to work with ValueObject value"""       
-valu
+target=None, value=Non
-        """Constructs a new ValueObjectEvent instance."""
-
+, target
-        if not isinstance( value, ValueObject ):
-            raise TypeError( "value must be a ValueObject" )
@@ -964 +965 @@
-            time.sleep( self.__delay )
-    
-self
+ self 
-        self.__running = True
-self
+ self 
-     
-    def stop( self ):

project/trunk/src/pyxoo/exceptions.py

@@ -11 +11 @@
-
-class NoSuchElementException( Exception ):
+    pass
+
+class NoSuchMethodException( Exception ):
+    pass
+
+class NoSuchFieldException( Exception ):
+    pass
+
+class IndexOutOfBoundsException( Exception ):
-    pass
-
@@ -32 +41 @@
-    pass
-
-
-class NullPointerException( Exception ):
-    pass

project/trunk/src/pyxoo/plugin.py

@@ -43 +43 @@
-        self.__modelLocator = pyxoo.model.ModelLocator.getInstance( self )
-        self.__viewLocator  = pyxoo.view.ViewLocator.getInstance( self )
-
-
+
-        self.__ebPublic     = pyxoo.event.ApplicationBroadcaster.getInstance().getChannelDispatcher( self.getChannel(), self )
-
-
-
+
-        if self.__ebPublic:
-            self.__ebPublic.addListener( self )
@@ -79 +76 @@
-        """fireExternalEvent(IEvent, EventChannel):void"""
-        if eventChannel != self.getChannel():
-self.__ebExternal
+pyxoo.event.ApplicationBroadcaster.getInstance()
-    
-    def firePublicEvent( self, event ):
-        """firePublicEvent(IEvent):void"""
-        if self.__ebPublic:
-broadcastEvent( event
+firePublicEvent( event, self
-    
-    def firePrivateEvent( self, event ):
-        """firePrivateEvent(IEvent):void"""
-ebPrivate.broadcast
+controller.handle
-        
-    def handleEvent( self, event=None ):
@@ -135 +132 @@
-            return self.__ebPublic.removeEventListener( type, listener )
-        return False
-
+
+
-class PluginChannel( pyxoo.event.EventChannel ):
-    __instances = pyxoo.utils.HashMap()
@@ -228 +226 @@
-
-
-
-
-class NullPlugin( Plugin ):
-    __instance = None
@@ -277 +273 @@
-        """getViewLocator():ViewLocator"""
-        return pyxoo.view.ViewLocator.getInstance( self )
+    
+    
+class PluginBroadcaster( pyxoo.event.EventBroadcaster ):
+    
+    def firePublicEvent(self, event, owner):
+        if not event.getTarget():
+            event.setTarget( self._target )
+        eventType = event.getType()
+        if self.hasListenerCollection( eventType ):
+            for listener in self.getListenerCollection( eventType ):
+                if listener != owner:
+                    if hasattr( listener, eventType ) and callable( getattr( listener, eventType ) ):
+                        getattr( listener, eventType )( event )
+                    elif hasattr( listener, "handleEvent" ) and callable( getattr( listener, "handleEvent" ) ):
+                        listener.handleEvent( event )
+                    else:
+                        raise pyxoo.exceptions.UnsupportedOperationError( "EventBroadcaster.broadcastEvent() failed, you must implement '%s' method in '%s' class."%( eventType, listener.__class__.__name__ ) )
+        for listener in self.getListenerCollection():
+            if listener != owner:
+                if hasattr( listener, eventType ) and callable( getattr( listener, eventType ) ):
+                    getattr( listener, eventType )( event )
+                elif hasattr( listener, "handleEvent" ) and callable( getattr( listener, "handleEvent" ) ):
+                    listener.handleEvent( event )
+                else:
+                    raise pyxoo.exceptions.UnsupportedOperationError( "EventBroadcaster.broadcastEvent() failed, you must implement '%s' method in '%s' class."%( eventType, listener.__class__.__name__ ) )
+    
+                
+        

project/trunk/src/pyxoo/utils/interface.py

@@ -13 +13 @@
-    def __init__( self, name, parents, attributs ):
-        if len( parents ) == 0:return
-n
+interfaceN
-        self.__parents   = list( parents )
-        self.__attributs = attributs        
@@ -26 +26 @@
-            if type( att ) == types.FunctionType:
-                if self.__isInterface and att.__name__ == "__init__":
-n
+interfaceN
-                self.__methods[att.__name__] = att
-        
@@ -48 +48 @@
-                        try:
-                            if self.__methods[parent_method_name].func_code.co_argcount != parent_method.func_code.co_argcount:
-n
+interfaceN
-                        except( KeyError ):
-n
+interfaceN
-
-    def getInterfaceName( self ):
-n
+interfaceN
-    
-    def getParents( self ):
@@ -68 +68 @@
-    
-    def __str__(self):
-n
+interfaceN
-
-

project/trunk/src/pyxoo/view.py

@@ -11 +11 @@
-    __owner = None
-    __name  = None
+    onInitEVENT = "onInit"
+    onReleaseEVENT = "onRelease"
-    
-    def __init__( self, owner=None, name=None ):
@@ -23 +25 @@
-    
-    def onInit( self ):
-
-
+
+
+
-    
+    def onRelease(self):
+        """
+        """
+        self.notifyChanged( pyxoo.event.StringEvent( AbstractView.onReleaseEVENT, self, self.getName() ) )
+        
-    def notifyChanged( self, event ):
-        """notifyChanged(IEvent):void"""
@@ -34 +42 @@
-        self._getBroadcaster().removeAllListeners()
-        pyxoo.view.ViewLocator.getInstance( self.getOwner() ).unregister( self.getName() )
+        self.onRelease()
+        self.__name = None
-    
-    def getOwner( self ):
@@ -57 +67 @@
-            raise TypeError( "name param must be a String" ) 
-        locator = pyxoo.view.ViewLocator.getInstance( self.getOwner() )
-
-
+                     
+                
-                locator.unregister( self.getName() )
-if locator.register( name, self ):
-    
+locator.register( name, self )
+
-        
-    def addListener( self, listener ):

project/trunk/test/commands/TestFrontController.py

@@ -39 +39 @@
-
-    def testHandleEvent( self ):
-
+None, 
-        command = MyCommand()
-        self.instance.pushCommandInstance( "azerty", command )

project/trunk/test/events/TestChannelBroadcaster.py

@@ -33 +33 @@
-        self.instance = pyxoo.event.ChannelBroadcaster( None, self.channel1 )
-        self.type     = "notify"
-
+None, 
-        self.listener = self
-        self.__model  = 0

project/trunk/test/events/TestEventBroadcaster.py

@@ -152 +152 @@
-    def testBroadcastEvent( self ):
-        self.instance.addEventListener( self.eventType, self )
-
+None, 
-        self.instance.broadcastEvent( myEvent )
-        self.assertEquals( myEvent.getTarget(), self.instance )        
@@ -158 +158 @@
-        class A:pass
-        a = A()
-
+None, 
-        myEvent.setTarget( a )
-        self.instance.broadcastEvent( myEvent )
@@ -165 +165 @@
-    def testBroadcastEventFail( self ):
-        self.instance.addListener( self )
-
+None, 
-        self.assertRaises( pyxoo.exceptions.UnsupportedOperationError, self.instance.broadcastEvent, event )
-        
-    def testAnotherBroadcastEvent( self ):
-        self.instance.addListener( self )
-
+None, 
-        self.instance.broadcastEvent( myEvent )
-        self.assertEquals( myEvent.getTarget(), self.instance )        
@@ -189 +189 @@
-        self.assertTrue( self.instance.isRegistered( myFunction, "coucou" ) )
-        
-
+None, 
-        self.instance.broadcastEvent( myEvent )
-        self.assertEquals( self.instance, myEvent.getTarget() )
@@ -200 +200 @@
-        self.assertTrue( self.instance.isRegistered( myFunction, "coucou" ) )
-        self.assertTrue( self.instance.removeEventListener( "coucou", myFunction ) )
-
+None, 
-        self.instance.broadcastEvent( myEvent )
-        self.assertEquals( 0, myEvent.getInteger() )

project/trunk/test/view/TestViewLocator.py

@@ -52 +52 @@
-    def testUnregisterView( self ):
-        self.instance.register( "v1", self.view )
-
+
+
-        self.assertTrue( self.instance.isRegistered( "v1" ) )
-        self.assertTrue( self.instance.isRegistered( "v2" ) )
@@ -58 +59 @@
-        self.assertFalse( self.instance.isRegistered( "v1" ) )
-        self.assertTrue( self.instance.isRegistered( "v2" ) )
+        
+        self.assertRaises( pyxoo.exceptions.NoSuchElementException, self.instance.locate, "v1" )
+        self.assertEquals( view, self.instance.locate( "v2" ) )
-        
-    def testLocate( self ):