Author: jmorliaguet
Date: Wed Mar 22 16:37:47 2006
New Revision: 2690

Modified:
   cpsskins/branches/jmo-perspectives/browser/configure.zcml
   cpsskins/branches/jmo-perspectives/browser/manager/configure.zcml
   cpsskins/branches/jmo-perspectives/configure.zcml
   cpsskins/branches/jmo-perspectives/interfaces.py
   cpsskins/branches/jmo-perspectives/tests/setup.py
   cpsskins/branches/jmo-perspectives/tests/test_thememanager.py
   cpsskins/branches/jmo-perspectives/thememanager.py
   cpsskins/branches/jmo-perspectives/ui/standard/displays/boxgroup.py
   cpsskins/branches/jmo-perspectives/utils.py
Log:


- renamed ThemeManagement as ThemeManagementFolder



Modified: cpsskins/branches/jmo-perspectives/browser/configure.zcml
==============================================================================
--- cpsskins/branches/jmo-perspectives/browser/configure.zcml   (original)
+++ cpsskins/branches/jmo-perspectives/browser/configure.zcml   Wed Mar 22 
16:37:47 2006
@@ -33,12 +33,12 @@
   <addMenuItem
       title="Theme Management Folder"
       description="A Theme Management utility"
-      class="..thememanager.ThemeManagement"
+      class="..thememanager.ThemeManagementFolder"
       permission="zope.ManageServices"
   />
 
   <containerViews
-      for="..interfaces.IThemeManagement"
+      for="..interfaces.IThemeManagementFolder"
       contents="zope.ManageContent"
       index="zope.View"
       add="zope.ManageContent"

Modified: cpsskins/branches/jmo-perspectives/browser/manager/configure.zcml
==============================================================================
--- cpsskins/branches/jmo-perspectives/browser/manager/configure.zcml   
(original)
+++ cpsskins/branches/jmo-perspectives/browser/manager/configure.zcml   Wed Mar 
22 16:37:47 2006
@@ -3,7 +3,7 @@
     xmlns:zope="http://namespaces.zope.org/zope";>
 
   <page
-      for="cpsskins.interfaces.IThemeManagement"
+      for="cpsskins.interfaces.IThemeManagementFolder"
       name="themes-manager.html"
       menu="zmi_views"
       title="Themes"
@@ -13,7 +13,7 @@
   />
 
   <pages
-      for="cpsskins.interfaces.IThemeManagement"
+      for="cpsskins.interfaces.IThemeManagementFolder"
       permission="zope.ManageContent"
       class=".ThemeManagerView">
 

Modified: cpsskins/branches/jmo-perspectives/configure.zcml
==============================================================================
--- cpsskins/branches/jmo-perspectives/configure.zcml   (original)
+++ cpsskins/branches/jmo-perspectives/configure.zcml   Wed Mar 22 16:37:47 2006
@@ -14,12 +14,12 @@
 
   <!-- Theme management utility -->
 
-  <localUtility class=".thememanager.ThemeManagement">
+  <localUtility class=".thememanager.ThemeManagementFolder">
 
     <require
         permission="zope.ManageSite"
-        interface=".interfaces.IThemeManagement"
-        set_schema=".interfaces.IThemeManagement"
+        interface=".interfaces.IThemeManagementFolder"
+        set_schema=".interfaces.IThemeManagementFolder"
         />
 
     <require
@@ -30,7 +30,7 @@
   </localUtility>
 
   <subscriber
-      for=".interfaces.IThemeManagement
+      for=".interfaces.IThemeManagementFolder
            zope.app.container.interfaces.IObjectAddedEvent"
       handler=".thememanager.added"
       />

Modified: cpsskins/branches/jmo-perspectives/interfaces.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/interfaces.py    (original)
+++ cpsskins/branches/jmo-perspectives/interfaces.py    Wed Mar 22 16:37:47 2006
@@ -27,7 +27,7 @@
 
 # Theme management
 
-class IThemeManagement(Interface):
+class IThemeManagementFolder(Interface):
     """Interface for theme management.
 
     The methods may be moved to other classes.

Modified: cpsskins/branches/jmo-perspectives/tests/setup.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/tests/setup.py   (original)
+++ cpsskins/branches/jmo-perspectives/tests/setup.py   Wed Mar 22 16:37:47 2006
@@ -23,7 +23,7 @@
 from zope.app.container.interfaces import IObjectAddedEvent, 
IObjectRemovedEvent
 from zope.configuration.xmlconfig import XMLConfig
 
-from cpsskins.thememanager import ThemeManagement
+from cpsskins.thememanager import ThemeManagementFolder
 from cpsskins import controllers
 from cpsskins import elements
 from cpsskins.elements.display import Displayable
@@ -36,7 +36,7 @@
 from cpsskins.relations.interfaces import IRelatable
 from cpsskins.relations.tool import RelationTool
 from cpsskins.relations.storage import RelationStorage
-from cpsskins.interfaces import IThemeManagement
+from cpsskins.interfaces import IThemeManagementFolder
 
 def setUp(test):
     ztapi.provideAdapter(IDisplay, IPathAdapter, Formattable, 'formattable')
@@ -62,13 +62,13 @@
                     controllers.elementModified)
 
 def addThemeManager(root):
-    tmutil = root[u'themes'] = ThemeManagement()
-    ztapi.provideUtility(IThemeManagement, tmutil, name=u'themes')
+    tmutil = root[u'themes'] = ThemeManagementFolder()
+    ztapi.provideUtility(IThemeManagementFolder, tmutil, name=u'themes')
     return tmutil
 
-def addThemeSkeleton(tmutil):
+def addThemeSkeleton(context):
     theme = elements.theme.Theme()
-    tmutil.addTheme(theme)
+    context.addTheme(theme)
     theme[u'page'] = elements.themepage.ThemePage()
     theme[u'page'][u'block'] = elements.pageblock.PageBlock()
     theme[u'page'][u'block'][u'cell'] = elements.cell.Cell()

Modified: cpsskins/branches/jmo-perspectives/tests/test_thememanager.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/tests/test_thememanager.py       
(original)
+++ cpsskins/branches/jmo-perspectives/tests/test_thememanager.py       Wed Mar 
22 16:37:47 2006
@@ -21,11 +21,11 @@
 
 from zope.testing.doctestunit import DocTestSuite
 
-from cpsskins.thememanager import ThemeManagement
+from cpsskins.thememanager import ThemeManagementFolder
 
 class Test:
     def makeTestObject(self):
-        return ThemeManagement()
+        return ThemeManagementFolder()
 
 def test_suite():
     return unittest.TestSuite((

Modified: cpsskins/branches/jmo-perspectives/thememanager.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/thememanager.py  (original)
+++ cpsskins/branches/jmo-perspectives/thememanager.py  Wed Mar 22 16:37:47 2006
@@ -36,7 +36,7 @@
 from cpsskins.ui.standard.displays.storage import DisplayStorage
 from cpsskins.ui.standard.formats.storage import IFormatStorage
 from cpsskins.ui.standard.formats.storage import FormatStorage
-from cpsskins.interfaces import IThemeManagement, IImageCache
+from cpsskins.interfaces import IThemeManagementFolder, IImageCache
 from cpsskins.ontology import isDefault, hasFormat, hasDisplay
 from cpsskins.perspectives import Perspective
 from cpsskins.perspectives.interfaces import IPerspective
@@ -53,25 +53,25 @@
 def added(object, event):
     object.registerUtilities()
 
-class ThemeManagement(SiteManagementFolder):
+class ThemeManagementFolder(SiteManagementFolder):
     """A theme management utility that can contain multiple .
     themes
 
     >>> from zope.interface.verify import verifyClass
-    >>> verifyClass(IThemeManagement, ThemeManagement)
+    >>> verifyClass(IThemeManagementFolder, ThemeManagementFolder)
     True
 
     >>> from zope.app.testing import ztapi
-    >>> from cpsskins.thememanager import ThemeManagement
-    >>> thememanager = ThemeManagement()
-    >>> from cpsskins.interfaces import IThemeManagement
-    >>> ztapi.provideUtility(IThemeManagement, thememanager, name=u'themes')
+    >>> from cpsskins.thememanager import ThemeManagementFolder
+    >>> thememanager = ThemeManagementFolder()
+    >>> from cpsskins.interfaces import IThemeManagementFolder
+    >>> ztapi.provideUtility(IThemeManagementFolder, thememanager, 
name=u'themes')
     """
 
-    implements(IThemeManagement, IThemeContainer)
+    implements(IThemeManagementFolder, IThemeContainer)
 
     def __init__(self):
-        super(ThemeManagement, self).__init__()
+        super(ThemeManagementFolder, self).__init__()
         self[u'uids'] = IntIds()
         self[u'imagecache'] = ImageCache()
         self[u'settings'] = Settings()

Modified: cpsskins/branches/jmo-perspectives/ui/standard/displays/boxgroup.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/ui/standard/displays/boxgroup.py 
(original)
+++ cpsskins/branches/jmo-perspectives/ui/standard/displays/boxgroup.py Wed Mar 
22 16:37:47 2006
@@ -46,10 +46,10 @@
     """A Box Group is used to display a group of portlets.
 
     >>> from zope.app.testing import ztapi
-    >>> from cpsskins.thememanager import ThemeManagement
-    >>> thememanager = ThemeManagement()
-    >>> from cpsskins.interfaces import IThemeManagement
-    >>> ztapi.provideUtility(IThemeManagement, thememanager, name=u'themes')
+    >>> from cpsskins.thememanager import ThemeManagementFolder
+    >>> thememanager = ThemeManagementFolder()
+    >>> from cpsskins.interfaces import IThemeManagementFolder
+    >>> ztapi.provideUtility(IThemeManagementFolder, thememanager, 
name=u'themes')
 
     >>> from cpsskins.elements.portlet import TestPortlet as Portlet
     >>> portlet1, portlet2 = (Portlet('portlet1'), Portlet('portlet2'))

Modified: cpsskins/branches/jmo-perspectives/utils.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/utils.py (original)
+++ cpsskins/branches/jmo-perspectives/utils.py Wed Mar 22 16:37:47 2006
@@ -19,10 +19,10 @@
 
 from zope.component import queryUtility
 
-from cpsskins.interfaces import IThemeManagement
+from cpsskins.interfaces import IThemeManagementFolder
 
 THEMES_MANAGER_NAME = 'themes'
 
 def getThemeManager():
-    return queryUtility(IThemeManagement, THEMES_MANAGER_NAME)
+    return queryUtility(IThemeManagementFolder, THEMES_MANAGER_NAME)
 
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

Reply via email to