From 6cabe58f9ffee3d3961e10e585a0f2ededb78886 Mon Sep 17 00:00:00 2001 From: helmutm Date: Wed, 2 Aug 2006 19:22:43 +0000 Subject: [PATCH] reorganize cybertools.process git-svn-id: svn://svn.cy55.de/Zope3/src/loops/trunk@1282 fd906abe-77d9-0310-91a1-e0d9ade77398 --- process/README.txt | 8 ++++---- process/configure.zcml | 10 +++++----- process/definition.py | 12 ++++++------ process/setup.py | 6 +++--- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/process/README.txt b/process/README.txt index 47edceb..9542dc5 100644 --- a/process/README.txt +++ b/process/README.txt @@ -53,9 +53,9 @@ Manage processes The classes used in this package are just adapters to IConcept. - >>> from loops.process.definition import ProcessDefinition - >>> from cybertools.process.interfaces import IProcessDefinition - >>> component.provideAdapter(ProcessDefinition, (IConcept,), IProcessDefinition) + >>> from loops.process.definition import Process + >>> from cybertools.process.interfaces import IProcess + >>> component.provideAdapter(Process, (IConcept,), IProcess) We start with creating a process definition. Note that in order to discern the concepts created @@ -65,7 +65,7 @@ the variables: >>> from loops.concept import Concept >>> myProcessC = concepts['myProcess'] = Concept(u'A Simple Process') >>> myProcessC.conceptType = process - >>> myProcess = IProcessDefinition(myProcessC) + >>> myProcess = IProcess(myProcessC) Fin de partie diff --git a/process/configure.zcml b/process/configure.zcml index 0827d61..a406305 100644 --- a/process/configure.zcml +++ b/process/configure.zcml @@ -8,15 +8,15 @@ - - + + interface="cybertools.process.interfaces.IProcess" /> + set_schema="cybertools.process.interfaces.IProcess" /> diff --git a/process/definition.py b/process/definition.py index 86afe3f..4179b45 100644 --- a/process/definition.py +++ b/process/definition.py @@ -30,15 +30,15 @@ from zope.interface import implements from zope.cachedescriptors.property import Lazy from cybertools.typology.interfaces import IType -from cybertools.process.interfaces import IProcessDefinition -from cybertools.process.definition import ProcessDefinition as BaseProcessDefinition +from cybertools.process.interfaces import IProcess +from cybertools.process.definition import Process as BaseProcess from loops.interfaces import IConcept from loops.type import TypeInterfaceSourceList, AdapterBase # register type interfaces - (TODO: use a function for this) -TypeInterfaceSourceList.typeInterfaces += (IProcessDefinition,) +TypeInterfaceSourceList.typeInterfaces += (IProcess,) class ProcessAdapterMixin(object): @@ -49,12 +49,12 @@ class ProcessAdapterMixin(object): @Lazy def successorPred(self): - return self.conceptManager['successor'] + return self.conceptManager['follows'] -class ProcessDefinition(AdapterBase, BaseProcessDefinition, ProcessAdapterMixin): +class Process(AdapterBase, BaseProcess, ProcessAdapterMixin): """ A typeInterface adapter for concepts of type 'process'. """ - implements(IProcessDefinition) + implements(IProcess) diff --git a/process/setup.py b/process/setup.py index cd722a6..dd5d993 100644 --- a/process/setup.py +++ b/process/setup.py @@ -25,7 +25,7 @@ $Id$ from zope.component import adapts from zope.interface import implements, Interface -from cybertools.process.interfaces import IProcessDefinition +from cybertools.process.interfaces import IProcess from loops.concept import Concept from loops.interfaces import ITypeConcept from loops.setup import SetupManager as BaseSetupManager @@ -42,9 +42,9 @@ class SetupManager(BaseSetupManager): conceptType=type) processTypeAdapter = ITypeConcept(process) if not processTypeAdapter.typeInterface: - processTypeAdapter.typeInterface = IProcessDefinition + processTypeAdapter.typeInterface = IProcess # predicates: - successor = self.addObject(concepts, Concept, 'successor', title=u'successor', + follows = self.addObject(concepts, Concept, 'follows', title=u'follows', conceptType=predicate)