[jbpm-commits] JBoss JBPM SVN: r5709 - in jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal: xml and 1 other directory.

Author: tom.baeyens(a)jboss.com Date: 2009-10-07 08:33:10 -0400 (Wed, 07 Oct 2009) New Revision: 5709 Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JavaBinding.java jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/MailBinding.java jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml/JpdlParser.java Log: removed static methods from JpdlParser Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JavaBinding.java =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JavaBinding.java 2009-10-07 12:24:14 UTC (rev 5708) +++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/JavaBinding.java 2009-10-07 12:33:10 UTC (rev 5709) @@ -62,7 +62,7 @@ } if (element.hasAttribute("class")) { - ObjectDescriptor objectDescriptor = JpdlParser.parseObjectDescriptor(element, parse); + ObjectDescriptor objectDescriptor = parser.parseObjectDescriptor(element, parse); Object target = WireContext.create(objectDescriptor); javaActivity.setTarget(target); Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/MailBinding.java =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/MailBinding.java 2009-10-07 12:24:14 UTC (rev 5708) +++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/MailBinding.java 2009-10-07 12:33:10 UTC (rev 5709) @@ -36,7 +36,7 @@ public Object parseJpdl(Element element, Parse parse, JpdlParser parser) { MailActivity activity = new MailActivity(); - activity.setMailProducer(JpdlParser.parseMailProducer(element, parse, null)); + activity.setMailProducer(parser.parseMailProducer(element, parse, null)); return activity; } } Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml/JpdlParser.java =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml/JpdlParser.java 2009-10-07 12:24:14 UTC (rev 5708) +++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml/JpdlParser.java 2009-10-07 12:33:10 UTC (rev 5709) @@ -567,7 +567,7 @@ return taskDefinition; } - public static ObjectDescriptor parseObjectDescriptor(Element element, Parse parse) { + public ObjectDescriptor parseObjectDescriptor(Element element, Parse parse) { ObjectDescriptor objectDescriptor = new ObjectDescriptor(); String className = XmlUtil.attribute(element, "class"); @@ -600,7 +600,7 @@ } - public static List<VariableDefinitionImpl> parseVariableDefinitions(Element element, Parse parse, boolean initRequired) { + public List<VariableDefinitionImpl> parseVariableDefinitions(Element element, Parse parse, boolean initRequired) { List<VariableDefinitionImpl> variableDefinitions = new ArrayList<VariableDefinitionImpl>(); for (Element inElement: XmlUtil.elements(element, "variable")) { @@ -637,7 +637,7 @@ return variableDefinitions; } - public static VariableOutDefinitionSet parseVariableOutDefinitionSet(Element element, Parse parse) { + public VariableOutDefinitionSet parseVariableOutDefinitionSet(Element element, Parse parse) { VariableOutDefinitionSet variableOutDefinitionSet = new VariableOutDefinitionSet(); for (Element inElement: XmlUtil.elements(element, "out-variable")) { @@ -655,7 +655,7 @@ return variableOutDefinitionSet; } - public static void parseMailEvent(Element element, Parse parse, + public void parseMailEvent(Element element, Parse parse, ObservableElementImpl observableElement, String eventName) { // obtain assign event EventImpl event = observableElement.getEvent(eventName); @@ -687,7 +687,7 @@ eventListener.setMailProducer(mailProducer); } - public static MailProducer parseMailProducer(Element element, Parse parse, String defaultTemplateName) { + public MailProducer parseMailProducer(Element element, Parse parse, String defaultTemplateName) { // check whether the element is a generic object descriptor if (ObjectBinding.isObjectDescriptor(element)) { // TODO test custom mail producer @@ -701,7 +701,7 @@ return mailProducer; } - private static MailTemplate parseMailTemplate(Element element, Parse parse, + private MailTemplate parseMailTemplate(Element element, Parse parse, String defaultTemplateName) { if (element.hasAttribute("template")) { // fetch template from configuration @@ -720,7 +720,7 @@ return null; } - private static MailTemplate findTemplate(Element element, Parse parse, String templateName) { + private MailTemplate findTemplate(Element element, Parse parse, String templateName) { MailTemplateRegistry templateRegistry = EnvironmentImpl.getFromCurrent(MailTemplateRegistry.class); if (templateRegistry != null) { MailTemplate template = templateRegistry.getTemplate(templateName);