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 2003/09/02 15:16:13 UTC
cvs commit: cocoon-lenya/src/java/org/apache/lenya/cms/cocoon/transformation WorkflowMenuTransformer.java
andreas 2003/09/02 06:16:13
Modified: src/java/org/apache/lenya/cms/cocoon/transformation
WorkflowMenuTransformer.java
Log:
removed insertion of state and is_live variable value
Revision Changes Path
1.21 +8 -38 cocoon-lenya/src/java/org/apache/lenya/cms/cocoon/transformation/WorkflowMenuTransformer.java
Index: WorkflowMenuTransformer.java
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/cms/cocoon/transformation/WorkflowMenuTransformer.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- WorkflowMenuTransformer.java 28 Aug 2003 10:11:09 -0000 1.20
+++ WorkflowMenuTransformer.java 2 Sep 2003 13:16:13 -0000 1.21
@@ -128,43 +128,9 @@
super.startElement(uri, localName, raw, attr);
}
- if (hasWorkflow() && localName.equals(MENU_ELEMENT)) {
- String prefix = "";
-
- if (raw.indexOf(":") != -1) {
- prefix = raw.substring(0, raw.indexOf(":")) + ":";
- }
-
- super.startElement(
- uri,
- "workflow-state",
- prefix + "workflow-state",
- new AttributesImpl());
-
- char[] characters = instance.getCurrentState().toString().toCharArray();
- super.characters(characters, 0, characters.length);
- super.endElement(uri, "workflow-state", prefix + "workflow-state");
-
- if (Arrays.asList(instance.getWorkflow().getVariableNames()).contains("is-live")) {
- super.startElement(
- uri,
- "is-live",
- prefix + "is-live",
- new AttributesImpl());
-
- try {
- characters = Boolean.toString(instance.getValue("is_live")).toCharArray();
- } catch (WorkflowException e) {
- throw new SAXException(e);
- }
- super.characters(characters, 0, characters.length);
- super.endElement(uri, "is-live", prefix + "is-live");
- }
-
- }
}
- /** (non-Javadoc)
+ /**
* @see org.apache.cocoon.sitemap.SitemapModelComponent#setup(org.apache.cocoon.environment.SourceResolver, java.util.Map, java.lang.String, org.apache.avalon.framework.parameters.Parameters)
*/
public void setup(SourceResolver resolver, Map objectModel, String src, Parameters parameters)
@@ -192,8 +158,12 @@
} catch (Exception e) {
throw new ProcessingException(e);
}
-
- this.events = getInstance().getExecutableEvents(situation);
+
+ try {
+ this.events = getInstance().getExecutableEvents(situation);
+ } catch (WorkflowException e) {
+ throw new ProcessingException(e);
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org