You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2005/01/03 14:10:47 UTC
svn commit: r123963 - /lenya/trunk/src/java/org/apache/lenya/cms/usecase/AbstractUsecase.java /lenya/trunk/src/java/org/apache/lenya/cms/usecase/DocumentUsecase.java
Author: andreas
Date: Mon Jan 3 05:10:46 2005
New Revision: 123963
URL: http://svn.apache.org/viewcvs?view=rev&rev=123963
Log:
moved triggerWorkflow() one level up as it can apply to multiple documents
Modified:
lenya/trunk/src/java/org/apache/lenya/cms/usecase/AbstractUsecase.java
lenya/trunk/src/java/org/apache/lenya/cms/usecase/DocumentUsecase.java
Modified: lenya/trunk/src/java/org/apache/lenya/cms/usecase/AbstractUsecase.java
Url: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/usecase/AbstractUsecase.java?view=diff&rev=123963&p1=lenya/trunk/src/java/org/apache/lenya/cms/usecase/AbstractUsecase.java&r1=123962&p2=lenya/trunk/src/java/org/apache/lenya/cms/usecase/AbstractUsecase.java&r2=123963
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/usecase/AbstractUsecase.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/usecase/AbstractUsecase.java Mon Jan 3 05:10:46 2005
@@ -30,9 +30,13 @@
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.servlet.multipart.Part;
import org.apache.lenya.cms.cocoon.workflow.WorkflowHelper;
+import org.apache.lenya.cms.publication.Document;
+import org.apache.lenya.cms.workflow.WorkflowFactory;
import org.apache.lenya.util.ServletHelper;
+import org.apache.lenya.workflow.Event;
import org.apache.lenya.workflow.Situation;
import org.apache.lenya.workflow.WorkflowException;
+import org.apache.lenya.workflow.WorkflowInstance;
/**
* Abstract usecase implementation.
@@ -390,4 +394,32 @@
protected void deleteParameter(String name) {
this.parameters.remove(name);
}
+
+ /**
+ * Triggers a workflow event on a document.
+ * @param event The event.
+ * @param document The document.
+ */
+ protected void triggerWorkflow(String event, Document document) {
+ WorkflowFactory factory = WorkflowFactory.newInstance();
+ try {
+ WorkflowInstance instance = factory.buildInstance(document);
+ Event[] events = instance.getExecutableEvents(getSituation());
+ Event executableEvent = null;
+ for (int i = 0; i < events.length; i++) {
+ if (events[i].getName().equals(event)) {
+ executableEvent = events[i];
+ }
+ }
+
+ if (executableEvent == null) {
+ throw new RuntimeException("The event [" + event
+ + "] is not executable on document [" + document + "]");
+ }
+ instance.invoke(getSituation(), executableEvent);
+ } catch (WorkflowException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
}
Modified: lenya/trunk/src/java/org/apache/lenya/cms/usecase/DocumentUsecase.java
Url: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/usecase/DocumentUsecase.java?view=diff&rev=123963&p1=lenya/trunk/src/java/org/apache/lenya/cms/usecase/DocumentUsecase.java&r1=123962&p2=lenya/trunk/src/java/org/apache/lenya/cms/usecase/DocumentUsecase.java&r2=123963
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/usecase/DocumentUsecase.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/usecase/DocumentUsecase.java Mon Jan 3 05:10:46 2005
@@ -19,11 +19,7 @@
import org.apache.lenya.cms.publication.Document;
import org.apache.lenya.cms.publication.DocumentBuildException;
-import org.apache.lenya.cms.workflow.WorkflowFactory;
-import org.apache.lenya.workflow.Event;
import org.apache.lenya.workflow.Situation;
-import org.apache.lenya.workflow.WorkflowException;
-import org.apache.lenya.workflow.WorkflowInstance;
/**
*
@@ -122,33 +118,6 @@
*/
protected void triggerWorkflow(String event) {
triggerWorkflow(event, getSourceDocument());
- }
-
- /**
- * Triggers a workflow event on a document.
- * @param event The event.
- * @param document The document.
- */
- protected void triggerWorkflow(String event, Document document) {
- WorkflowFactory factory = WorkflowFactory.newInstance();
- try {
- WorkflowInstance instance = factory.buildInstance(document);
- Event[] events = instance.getExecutableEvents(getSituation());
- Event executableEvent = null;
- for (int i = 0; i < events.length; i++) {
- if (events[i].getName().equals(event)) {
- executableEvent = events[i];
- }
- }
-
- if (executableEvent == null) {
- throw new RuntimeException("The event [" + event
- + "] is not executable on document [" + document + "]");
- }
- instance.invoke(getSituation(), executableEvent);
- } catch (WorkflowException e) {
- throw new RuntimeException(e);
- }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org