Author: jmorliaguet
Date: Mon May 15 21:40:33 2006
New Revision: 3140
Modified:
cpsskins/branches/paris-sprint-2006/setup/manager.py
Log:
- simplifications. fewer lines of code
Modified: cpsskins/branches/paris-sprint-2006/setup/manager.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/setup/manager.py (original)
+++ cpsskins/branches/paris-sprint-2006/setup/manager.py Mon May 15
21:40:33 2006
@@ -47,22 +47,18 @@
"""Register the setting as a utility.
"""
settings = getThemeManager(context).getSettings()
- # register as a global utility
+ chooser = INameChooser(settings)
+ name = name or chooser.chooseName(title, context)
if context is None:
- setting = GlobalSetting(name=name, title=title,
- resource=resource, filename=filename)
- uri = IIdentifiable(setting).getURI()
- settings.registerUtility(setting, ISetting, uri)
-
- # register as a local utility
+ setting = GlobalSetting(name=name, title=title, resource=resource,
+ filename=filename)
else:
- chooser = INameChooser(settings)
- name = name or chooser.chooseName(title, context)
setting = LocalSetting(name=name, title=title, resource=resource)
setting.custom = custom
- uri = IIdentifiable(setting).getURI()
- settings[uri] = setting
- settings.registerUtility(setting, ISetting, uri)
+
+ uri = IIdentifiable(setting).getURI()
+ settings[uri] = setting
+ settings.registerUtility(setting, ISetting, uri)
return setting
def unregister(self, uri=u'', context=None):
@@ -164,15 +160,14 @@
setting = global_settings.queryUtility(ISetting, uri)
if setting is None:
raise ValueError("No such setting: '%s'." % uri)
- return IGlobalSetting.providedBy(setting)
+ return setting.isGlobal()
def isLocal(self, uri=u'', context=None):
settings = getThemeManager(context).getSettings()
setting = settings.queryUtility(ISetting, uri)
-
if setting is None:
raise ValueError("No such setting: '%s'." % uri)
- return ILocalSetting.providedBy(setting)
+ return setting.isLocal()
def isCustom(self, uri=u'', context=None):
settings = getThemeManager(context).getSettings()
--
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins
