Author: objectiser Date: 2009-04-11 17:39:18 -0400 (Sat, 11 Apr 2009) New Revision: 581 Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/export/BPELLanguageModelStreamExportRule.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/generator/Generator.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/BPELLanguageModel.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/DefaultBPELLanguageModel.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/GeneratorTest.java Log: Renamed 'getBPELProcess' to 'getBPELProcessElement', to allow for method returning the equivalent model object (when defined) - instead of just returning a 'sequence'. Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/export/BPELLanguageModelStreamExportRule.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/export/BPELLanguageModelStreamExportRule.java 2009-04-11 21:37:43 UTC (rev 580) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/export/BPELLanguageModelStreamExportRule.java 2009-04-11 21:39:18 UTC (rev 581) @@ -62,7 +62,7 @@ BPELLanguageModel model=(BPELLanguageModel)modelObject; try { - String text=XMLUtils.toText(model.getBPELProcess()); + String text=XMLUtils.toText(model.getBPELProcessElement()); context.getFormatter().record(text.getBytes()); } catch(Exception e) { Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/generator/Generator.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/generator/Generator.java 2009-04-11 21:37:43 UTC (rev 580) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/generator/Generator.java 2009-04-11 21:39:18 UTC (rev 581) @@ -147,7 +147,7 @@ lcm); generateRoleProject(projectName, - target.getBPELProcess(), + target.getBPELProcessElement(), lcm, target); } else { logger.error("Unable to find model generator"); Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/BPELLanguageModel.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/BPELLanguageModel.java 2009-04-11 21:37:43 UTC (rev 580) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/BPELLanguageModel.java 2009-04-11 21:39:18 UTC (rev 581) @@ -64,6 +64,6 @@ * * @return The BPEL process */ - public org.w3c.dom.Element getBPELProcess(); + public org.w3c.dom.Element getBPELProcessElement(); } Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/DefaultBPELLanguageModel.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/DefaultBPELLanguageModel.java 2009-04-11 21:37:43 UTC (rev 580) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/DefaultBPELLanguageModel.java 2009-04-11 21:39:18 UTC (rev 581) @@ -162,7 +162,7 @@ * * @return The BPEL Process */ - public org.w3c.dom.Element getBPELProcess() { + public org.w3c.dom.Element getBPELProcessElement() { return(m_bpelProcess); } Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/GeneratorTest.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/GeneratorTest.java 2009-04-11 21:37:43 UTC (rev 580) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/GeneratorTest.java 2009-04-11 21:39:18 UTC (rev 581) @@ -97,9 +97,9 @@ model.getModelName().getLocatedRole(), target, model); - if (target.getBPELProcess() != null) { + if (target.getBPELProcessElement() != null) { try { - String text=XMLUtils.toText(target.getBPELProcess()); + String text=XMLUtils.toText(target.getBPELProcessElement()); checkResults(result, text); } catch(Exception e) { result.addError(this, e);