Author: jmorliaguet
Date: Sat Dec 17 12:46:14 2005
New Revision: 2041
Modified:
cpsskins/branches/jmo-perspectives/elements/configure.zcml
cpsskins/branches/jmo-perspectives/elements/element.py
cpsskins/branches/jmo-perspectives/elements/slot.py
cpsskins/branches/jmo-perspectives/elements/theme.py
cpsskins/branches/jmo-perspectives/setup/adapters.py
cpsskins/branches/jmo-perspectives/setup/configure.zcml
Log:
- we register adapters inline
Modified: cpsskins/branches/jmo-perspectives/elements/configure.zcml
==============================================================================
--- cpsskins/branches/jmo-perspectives/elements/configure.zcml (original)
+++ cpsskins/branches/jmo-perspectives/elements/configure.zcml Sat Dec 17
12:46:14 2005
@@ -8,61 +8,48 @@
<!-- name chooser for elements -->
<adapter
- for=".interfaces.IElement"
- factory=".ElementNameChooser"
- provides="zope.app.container.interfaces.INameChooser"
+ factory=".element.ElementNameChooser"
/>
<!-- this adapter makes elements relatable -->
<adapter
- for=".interfaces.IElement"
- factory=".Relatable"
- provides="cpsskins.relations.interfaces.IRelatable"
+ factory=".element.Relatable"
/>
<!-- this adapter makes elements identifiable -->
<adapter
- for=".interfaces.IElement"
factory=".element.Identifiable"
- provides="cpsskins.elements.interfaces.IIdentifiable"
/>
<adapter
- for=".interfaces.ISlot"
factory=".slot.Relatable"
- provides="cpsskins.relations.interfaces.IRelatable"
/>
<!-- this adapter makes it possible to get the types of an element -->
<adapter
- for=".interfaces.IElement"
- factory=".Type"
- provides=".interfaces.IType"
+ factory=".element.Type"
/>
<adapter
name="type"
provides="zope.app.traversing.interfaces.IPathAdapter"
for=".interfaces.IElement"
- factory=".Type"
+ factory=".element.Type"
/>
<!-- these adapters make nodes traversable -->
<adapter
- for=".interfaces.INode"
factory=".NodeTraverser"
/>
<adapter
- for=".interfaces.ITheme"
factory=".theme.NodeTraverser"
/>
<adapter
- for=".interfaces.ISlot"
factory=".slot.NodeTraverser"
/>
Modified: cpsskins/branches/jmo-perspectives/elements/element.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/elements/element.py (original)
+++ cpsskins/branches/jmo-perspectives/elements/element.py Sat Dec 17
12:46:14 2005
@@ -23,7 +23,6 @@
from zope.app.container.interfaces import INameChooser
from zope.app.content.interfaces import IContentType
from zope.app.interface import queryType
-from zope.app.traversing.interfaces import IPathAdapter
from zope.component import adapts
from zope.interface import implements
@@ -57,8 +56,9 @@
return str(id)
class Identifiable(object):
- """This adapter makes resources uniquely identifiable.
+ """This adapter makes elements uniquely identifiable.
"""
+ adapts(IElement)
implements(IIdentifiable)
def __init__(self, element):
@@ -116,7 +116,7 @@
class ElementNameChooser:
"""An adapter to choose names for elements.
"""
-
+ adapts(IElement)
implements(INameChooser)
__used_for__ = IElement
@@ -125,7 +125,7 @@
"""Adapter that gets the content type of an element.
"""
adapts(IElement)
- implements(IType, IPathAdapter)
+ implements(IType)
def __init__(self, element):
self.element = element
Modified: cpsskins/branches/jmo-perspectives/elements/slot.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/elements/slot.py (original)
+++ cpsskins/branches/jmo-perspectives/elements/slot.py Sat Dec 17 12:46:14 2005
@@ -89,7 +89,7 @@
class NodeTraverser(object):
"""This adapter makes slot nodes traversable.
"""
- adapts(INode)
+ adapts(ISlot)
implements(INodeTraverser)
def __init__(self, node):
Modified: cpsskins/branches/jmo-perspectives/elements/theme.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/elements/theme.py (original)
+++ cpsskins/branches/jmo-perspectives/elements/theme.py Sat Dec 17
12:46:14 2005
@@ -64,7 +64,7 @@
class NodeTraverser(object):
"""This adapter makes theme nodes traversable.
"""
- adapts(INode)
+ adapts(ITheme)
implements(INodeTraverser)
def __init__(self, node):
Modified: cpsskins/branches/jmo-perspectives/setup/adapters.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/setup/adapters.py (original)
+++ cpsskins/branches/jmo-perspectives/setup/adapters.py Sat Dec 17
12:46:14 2005
@@ -20,12 +20,13 @@
from zope.component import adapts
from zope.interface import implements
-from cpsskins.setup.interfaces import IResource, ISettings
+from cpsskins.relations.interfaces import IRelatable
+from cpsskins.setup.interfaces import IResource, ISetting
class Resource(object):
"""This adapts settings to resources
"""
- adapts(ISettings)
+ adapts(ISetting)
implements(IResource)
def __init__(self, context):
@@ -37,6 +38,9 @@
class Relatable(object):
"""This adapter makes settings relatable.
"""
+ adapts(ISetting)
+ implements(IRelatable)
+
def __init__(self, context):
self.context = context
Modified: cpsskins/branches/jmo-perspectives/setup/configure.zcml
==============================================================================
--- cpsskins/branches/jmo-perspectives/setup/configure.zcml (original)
+++ cpsskins/branches/jmo-perspectives/setup/configure.zcml Sat Dec 17
12:46:14 2005
@@ -12,16 +12,12 @@
<!-- this adapter makes settings relatable -->
<adapter
- for=".interfaces.ISetting"
factory="cpsskins.setup.adapters.Relatable"
- provides="cpsskins.relations.interfaces.IRelatable"
/>
<!-- this adapter make it possible to extract resource data from settings -->
<adapter
- for="cpsskins.setup.interfaces.ISetting"
factory="cpsskins.setup.adapters.Resource"
- provides="cpsskins.setup.interfaces.IResource"
/>
<!-- register global application settings -->
--
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins
