[overlord-commits] Overlord SVN: r651 - in cdl/trunk/tools/plugins: org.jboss.tools.overlord.cdl.runtime.jbossesb/src/plugintest/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator and 1 other directory.

Author: objectiser Date: 2009-06-29 17:50:30 -0400 (Mon, 29 Jun 2009) New Revision: 651 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.runtime.jbossesb/src/plugintest/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/GeneratorTest.java Log: Updated to take into account modelName is not associated with model, as a model can contain multiple conversations - and the modelName is really associated with the conversation. 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-06-23 22:35:38 UTC (rev 650) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/GeneratorTest.java 2009-06-29 21:50:30 UTC (rev 651) @@ -28,6 +28,7 @@ import org.scribble.conversation.model.ConversationNotation; import org.pi4soa.scribble.cdm.model.CDMNotation; import org.scribble.extensions.RegistryFactory; +import org.scribble.model.Definition; import org.scribble.model.ModelReference; import org.scribble.model.SubDefinitionPath; import org.scribble.model.change.ModelGenerator; @@ -104,18 +105,25 @@ RegistryFactory.getRegistry().getExtension( ModelGenerator.class, null); - if (generator != null) { + java.util.List<Definition> defns=model.getDefinitions(); + Definition defn=null; + + if (defns.size() == 1) { + defn = defns.get(0); + } + + if (generator != null && defn != null) { ModelReference targetRef= new ModelReference(BPELNotation.NOTATION_CODE); - targetRef.setAlias(model.getModelName().getName()); - targetRef.setLocatedRole(model.getModelName().getLocatedRole().getName()); + targetRef.setAlias(defn.getModelName().getName()); + targetRef.setLocatedRole(defn.getModelName().getLocatedRole().getName()); DefaultBPELLanguageModel target= new DefaultBPELLanguageModel(targetRef); generator.generate(targetRef, - model.getModelName().getLocatedRole(), + defn.getModelName().getLocatedRole(), target, model); if (target.getBPELProcess().getDOMElement() != null) { @@ -319,7 +327,14 @@ RegistryFactory.getRegistry().getExtension( ModelGenerator.class, null); - if (generator != null) { + java.util.List<Definition> defns=model.getDefinitions(); + Definition defn=null; + + if (defns.size() == 1) { + defn = defns.get(0); + } + + if (generator != null && defn != null) { ModelReference targetRef= new ModelReference(BPELNotation.NOTATION_CODE); targetRef.setAlias(m_name); @@ -329,7 +344,7 @@ new DefaultBPELLanguageModel(targetRef); generator.generate(targetRef, - model.getModelName().getLocatedRole(), + defn.getModelName().getLocatedRole(), target, projected); if (target.getBPELProcess().getDOMElement() != null) { Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/plugintest/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/GeneratorTest.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/plugintest/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/GeneratorTest.java 2009-06-23 22:35:38 UTC (rev 650) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/plugintest/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/GeneratorTest.java 2009-06-29 21:50:30 UTC (rev 651) @@ -24,6 +24,7 @@ import org.scribble.conversation.model.*; import org.scribble.extensions.RegistryFactory; +import org.scribble.model.Definition; import org.scribble.model.ModelReference; import org.scribble.model.change.ModelGenerator; import org.w3c.dom.Node; @@ -100,7 +101,14 @@ RegistryFactory.getRegistry().getExtension( ModelGenerator.class, null); - if (generator != null) { + java.util.List<Definition> defns=model.getDefinitions(); + Definition defn=null; + + if (defns.size() == 1) { + defn = defns.get(0); + } + + if (generator != null && defn != null) { ModelReference targetRef= new ModelReference(JBossESBNotation.NOTATION_CODE); @@ -109,7 +117,7 @@ cm.getConversation().isStateless()); generator.generate(targetRef, - model.getModelName().getLocatedRole(), + defn.getModelName().getLocatedRole(), target, model); if (target.getESBConfiguration() != null) {