[overlord-commits] Overlord SVN: r652 - in cdl/trunk/tools/plugins: org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change and 9 other directories.
overlord-commits at lists.jboss.org
overlord-commits at lists.jboss.org
Mon Jun 29 18:34:28 EDT 2009
Author: objectiser
Date: 2009-06-29 18:34:27 -0400 (Mon, 29 Jun 2009)
New Revision: 652
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/model/change/ConversationInteractionModelChangeRule.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/ConversationModelChangeRule.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/IfModelChangeRule.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/component/Process.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/util/InteractionUtil.java
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/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/DefaultESBLanguageModel.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/DefaultESBService.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateful/ConversationModelChangeRule.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateless/IfModelChangeRule.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/util/ConversationUtil.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/util/InteractionUtil.java
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/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateful/ConversationInteractionModelChangeRuleTest.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateful/ParallelModelChangeRuleTest.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateful/RunModelChangeRuleTest.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateful/SpawnModelChangeRuleTest.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateful/WhileModelChangeRuleTest.java
Log:
Refactored to clarify located name as a concept rather than the previous 'ModelName', as the name is not really associated with the model, but the definition.
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-06-29 21:50:30 UTC (rev 651)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/generator/Generator.java 2009-06-29 22:34:27 UTC (rev 652)
@@ -171,7 +171,7 @@
IPath bpelPath=proj.getFullPath().append(
new Path(getBuildSystem().getBPELFilePath())).
append(localcm.getModelName().getName()+"_"+
- localcm.getModelName().getLocatedRole().getName()+".bpel");
+ localcm.getModelName().getRole().getName()+".bpel");
IFile bpelFile=proj.getProject().getWorkspace().getRoot().getFile(bpelPath);
GeneratorUtil.createParentFolder(bpelFile);
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/ConversationInteractionModelChangeRule.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/ConversationInteractionModelChangeRule.java 2009-06-29 21:50:30 UTC (rev 651)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/ConversationInteractionModelChangeRule.java 2009-06-29 22:34:27 UTC (rev 652)
@@ -97,7 +97,7 @@
if (interaction.getEnclosingDefinition() != null) {
role = interaction.getEnclosingDefinition().
- getModelName().getLocatedRole();
+ getLocatedName().getRole();
}
// Check if send or receive
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/ConversationModelChangeRule.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/ConversationModelChangeRule.java 2009-06-29 21:50:30 UTC (rev 651)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/ConversationModelChangeRule.java 2009-06-29 22:34:27 UTC (rev 652)
@@ -95,8 +95,8 @@
if (conv.getParent() instanceof Model) {
// Set the name of the process
- bpelModel.getBPELProcess().setName(conv.getModelName().getName()+"_"+
- conv.getModelName().getLocatedRole().getName());
+ bpelModel.getBPELProcess().setName(conv.getLocatedName().getName()+"_"+
+ conv.getLocatedName().getRole().getName());
bpelModel.getBPELProcess().setConversationType(bpelModel.getModelReference().toText());
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/IfModelChangeRule.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/IfModelChangeRule.java 2009-06-29 21:50:30 UTC (rev 651)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/IfModelChangeRule.java 2009-06-29 22:34:27 UTC (rev 652)
@@ -175,7 +175,7 @@
if (elem.getEnclosingDefinition() != null) {
role = elem.getEnclosingDefinition().
- getModelName().getLocatedRole();
+ getLocatedName().getRole();
}
for (int i=0; i < paths.size(); i++) {
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/component/Process.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/component/Process.java 2009-06-29 21:50:30 UTC (rev 651)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/component/Process.java 2009-06-29 22:34:27 UTC (rev 652)
@@ -654,10 +654,10 @@
ret.getBlock().derivedFrom(this);
// Configure model name
- ModelName modelName=new ModelName();
+ LocatedName modelName=new LocatedName();
modelName.setName(getName());
- ret.setModelName(modelName);
+ ret.setLocatedName(modelName);
// Define implements reference for conversation type
String convType=getConversationType();
@@ -679,7 +679,7 @@
iref.setLocatedRole(role);
// Need to locate the model name
- modelName.setLocatedRole(new Role(iref.getLocatedRole()));
+ modelName.setRole(new Role(iref.getLocatedRole()));
String mainpart=convType.substring(0, index);
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/util/InteractionUtil.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/util/InteractionUtil.java 2009-06-29 21:50:30 UTC (rev 651)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/util/InteractionUtil.java 2009-06-29 22:34:27 UTC (rev 652)
@@ -40,7 +40,7 @@
if (interaction.getEnclosingDefinition() != null) {
role = interaction.getEnclosingDefinition().
- getModelName().getLocatedRole();
+ getLocatedName().getRole();
}
if (role != null && ((interaction.getFromRole() != null &&
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-29 21:50:30 UTC (rev 651)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/GeneratorTest.java 2009-06-29 22:34:27 UTC (rev 652)
@@ -116,14 +116,14 @@
ModelReference targetRef=
new ModelReference(BPELNotation.NOTATION_CODE);
- targetRef.setAlias(defn.getModelName().getName());
- targetRef.setLocatedRole(defn.getModelName().getLocatedRole().getName());
+ targetRef.setAlias(defn.getLocatedName().getName());
+ targetRef.setLocatedRole(defn.getLocatedName().getRole().getName());
DefaultBPELLanguageModel target=
new DefaultBPELLanguageModel(targetRef);
generator.generate(targetRef,
- defn.getModelName().getLocatedRole(),
+ defn.getLocatedName().getRole(),
target, model);
if (target.getBPELProcess().getDOMElement() != null) {
@@ -344,7 +344,7 @@
new DefaultBPELLanguageModel(targetRef);
generator.generate(targetRef,
- defn.getModelName().getLocatedRole(),
+ defn.getLocatedName().getRole(),
target, projected);
if (target.getBPELProcess().getDOMElement() != null) {
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/DefaultESBLanguageModel.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/DefaultESBLanguageModel.java 2009-06-29 21:50:30 UTC (rev 651)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/DefaultESBLanguageModel.java 2009-06-29 22:34:27 UTC (rev 652)
@@ -140,7 +140,7 @@
org.scribble.extensions.RegistryFactory.getRegistry().getExtension(
org.scribble.model.admin.DependencyManager.class, null);
- ModelName mname=new ModelName();
+ LocatedName mname=new LocatedName();
mname.setName(m_source.getLocalpart());
setModelName(mname);
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/DefaultESBService.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/DefaultESBService.java 2009-06-29 21:50:30 UTC (rev 651)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/DefaultESBService.java 2009-06-29 22:34:27 UTC (rev 652)
@@ -706,10 +706,10 @@
ret.setStateless(isStateless());
// Configure model name
- ModelName modelName=new ModelName();
+ LocatedName modelName=new LocatedName();
modelName.setName(getServiceDescriptionName());
- ret.setModelName(modelName);
+ ret.setLocatedName(modelName);
String convType=getConversationType();
String role=null;
@@ -730,7 +730,7 @@
iref.setLocatedRole(role);
// Need to locate the model name
- modelName.setLocatedRole(new Role(iref.getLocatedRole()));
+ modelName.setRole(new Role(iref.getLocatedRole()));
String mainpart=convType.substring(0, index);
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateful/ConversationModelChangeRule.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateful/ConversationModelChangeRule.java 2009-06-29 21:50:30 UTC (rev 651)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateful/ConversationModelChangeRule.java 2009-06-29 22:34:27 UTC (rev 652)
@@ -114,8 +114,8 @@
sdname = "{"+namespace+"}";
}
- sdname += conv.getModelName().getName()+"-"+
- conv.getModelName().getLocatedRole().getName();
+ sdname += conv.getLocatedName().getName()+"-"+
+ conv.getLocatedName().getRole().getName();
mra.setServiceDescriptionName(sdname);
@@ -153,8 +153,8 @@
// Set conversation type based on conversation
// namespace and name
ctype = namespace+"."+
- conv.getModelName().getName()+"@"+
- conv.getModelName().getLocatedRole().getName();
+ conv.getLocatedName().getName()+"@"+
+ conv.getLocatedName().getRole().getName();
}
if (ctype != null) {
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateless/IfModelChangeRule.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateless/IfModelChangeRule.java 2009-06-29 21:50:30 UTC (rev 651)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateless/IfModelChangeRule.java 2009-06-29 22:34:27 UTC (rev 652)
@@ -195,8 +195,8 @@
sdname = "{"+namespace+"}";
}
- sdname += conv.getModelName().getName()+"-"+
- conv.getModelName().getLocatedRole().getName();
+ sdname += conv.getLocatedName().getName()+"-"+
+ conv.getLocatedName().getRole().getName();
switchAction.setServiceDescriptionName(sdname);
@@ -217,8 +217,8 @@
// Set conversation type based on conversation
// namespace and name
ctype = namespace+"."+
- conv.getModelName().getName()+"@"+
- conv.getModelName().getLocatedRole().getName();
+ conv.getLocatedName().getName()+"@"+
+ conv.getLocatedName().getRole().getName();
}
if (ctype != null) {
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/util/ConversationUtil.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/util/ConversationUtil.java 2009-06-29 21:50:30 UTC (rev 651)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/util/ConversationUtil.java 2009-06-29 22:34:27 UTC (rev 652)
@@ -58,8 +58,8 @@
ret = "";
}
- if (conversation.getModelName().getLocatedRole() != null) {
- ret += conversation.getModelName().getLocatedRole();
+ if (conversation.getLocatedName().getRole() != null) {
+ ret += conversation.getLocatedName().getRole();
}
ret = ret.toLowerCase();
@@ -75,7 +75,7 @@
* @return The business object type class name
*/
public static String getBusinessObjectTypeClassName(Conversation conversation) {
- String ret=conversation.getModelName().getName();
+ String ret=conversation.getLocatedName().getName();
return(ret);
}
@@ -141,8 +141,8 @@
* @return The service name
*/
public static String getServiceName(Conversation conv) {
- String ret=conv.getModelName().getName()+"_"+
- conv.getModelName().getLocatedRole().getName();
+ String ret=conv.getLocatedName().getName()+"_"+
+ conv.getLocatedName().getRole().getName();
return(ret);
}
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/util/InteractionUtil.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/util/InteractionUtil.java 2009-06-29 21:50:30 UTC (rev 651)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/util/InteractionUtil.java 2009-06-29 22:34:27 UTC (rev 652)
@@ -59,7 +59,7 @@
if (interaction.getEnclosingDefinition() != null) {
role = interaction.getEnclosingDefinition().
- getModelName().getLocatedRole();
+ getLocatedName().getRole();
}
if (role != null && ((interaction.getFromRole() != 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-29 21:50:30 UTC (rev 651)
+++ 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 22:34:27 UTC (rev 652)
@@ -117,7 +117,7 @@
cm.getConversation().isStateless());
generator.generate(targetRef,
- defn.getModelName().getLocatedRole(),
+ defn.getLocatedName().getRole(),
target, model);
if (target.getESBConfiguration() != null) {
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateful/ConversationInteractionModelChangeRuleTest.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateful/ConversationInteractionModelChangeRuleTest.java 2009-06-29 21:50:30 UTC (rev 651)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateful/ConversationInteractionModelChangeRuleTest.java 2009-06-29 22:34:27 UTC (rev 652)
@@ -59,9 +59,9 @@
context.setRole(role);
Conversation conv=new Conversation();
- ModelName mname=new ModelName();
- mname.setLocatedRole(role);
- conv.setModelName(mname);
+ LocatedName mname=new LocatedName();
+ mname.setRole(role);
+ conv.setLocatedName(mname);
ConversationInteraction mobj=new ConversationInteraction();
mobj.setToRole(role);
@@ -143,9 +143,9 @@
context.setRole(role);
Conversation conv=new Conversation();
- ModelName mname=new ModelName();
- mname.setLocatedRole(role);
- conv.setModelName(mname);
+ LocatedName mname=new LocatedName();
+ mname.setRole(role);
+ conv.setLocatedName(mname);
ConversationInteraction mobj=new ConversationInteraction();
mobj.setToRole(role);
@@ -226,9 +226,9 @@
context.setRole(role);
Conversation conv=new Conversation();
- ModelName mname=new ModelName();
- mname.setLocatedRole(role);
- conv.setModelName(mname);
+ LocatedName mname=new LocatedName();
+ mname.setRole(role);
+ conv.setLocatedName(mname);
ConversationInteraction mobj1=new ConversationInteraction();
mobj1.setToRole(role);
@@ -378,9 +378,9 @@
context.setRole(role);
Conversation conv=new Conversation();
- ModelName mname=new ModelName();
- mname.setLocatedRole(role);
- conv.setModelName(mname);
+ LocatedName mname=new LocatedName();
+ mname.setRole(role);
+ conv.setLocatedName(mname);
ConversationInteraction mobj1=new ConversationInteraction();
mobj1.setToRole(role);
@@ -627,9 +627,9 @@
context.setRole(role);
Conversation conv=new Conversation();
- ModelName mname=new ModelName();
- mname.setLocatedRole(role);
- conv.setModelName(mname);
+ LocatedName mname=new LocatedName();
+ mname.setRole(role);
+ conv.setLocatedName(mname);
ConversationInteraction mobj1=new ConversationInteraction();
mobj1.setToRole(role);
@@ -880,9 +880,9 @@
context.setRole(role);
Conversation conv=new Conversation();
- ModelName mname=new ModelName();
- mname.setLocatedRole(role);
- conv.setModelName(mname);
+ LocatedName mname=new LocatedName();
+ mname.setRole(role);
+ conv.setLocatedName(mname);
ConversationInteraction mobj1=new ConversationInteraction();
mobj1.setFromRole(role);
@@ -1080,9 +1080,9 @@
context.setRole(toRole);
Conversation conv=new Conversation();
- ModelName mname=new ModelName();
- mname.setLocatedRole(toRole);
- conv.setModelName(mname);
+ LocatedName mname=new LocatedName();
+ mname.setRole(toRole);
+ conv.setLocatedName(mname);
ConversationInteraction mobj=new ConversationInteraction();
mobj.setFromRole(fromRole);
@@ -1145,9 +1145,9 @@
context.setRole(role);
Conversation conv=new Conversation();
- ModelName mname=new ModelName();
- mname.setLocatedRole(role);
- conv.setModelName(mname);
+ LocatedName mname=new LocatedName();
+ mname.setRole(role);
+ conv.setLocatedName(mname);
ConversationInteraction mobj=new ConversationInteraction();
mobj.setFromRole(role);
@@ -1210,9 +1210,9 @@
context.setRole(role);
Conversation conv=new Conversation();
- ModelName mname=new ModelName();
- mname.setLocatedRole(role);
- conv.setModelName(mname);
+ LocatedName mname=new LocatedName();
+ mname.setRole(role);
+ conv.setLocatedName(mname);
ConversationInteraction mobj=new ConversationInteraction();
mobj.setFromRole(role);
@@ -1306,9 +1306,9 @@
context.setRole(fromRole);
Conversation conv=new Conversation();
- ModelName mname=new ModelName();
- mname.setLocatedRole(fromRole);
- conv.setModelName(mname);
+ LocatedName mname=new LocatedName();
+ mname.setRole(fromRole);
+ conv.setLocatedName(mname);
ConversationInteraction mobj=new ConversationInteraction();
mobj.setFromRole(fromRole);
@@ -1387,9 +1387,9 @@
context.setRole(fromRole);
Conversation conv=new Conversation();
- ModelName mname=new ModelName();
- mname.setLocatedRole(fromRole);
- conv.setModelName(mname);
+ LocatedName mname=new LocatedName();
+ mname.setRole(fromRole);
+ conv.setLocatedName(mname);
ConversationInteraction mobj=new ConversationInteraction();
mobj.setFromRole(fromRole);
@@ -1458,9 +1458,9 @@
context.setRole(role);
Conversation conv=new Conversation();
- ModelName mname=new ModelName();
- mname.setLocatedRole(role);
- conv.setModelName(mname);
+ LocatedName mname=new LocatedName();
+ mname.setRole(role);
+ conv.setLocatedName(mname);
ConversationInteraction mobj=new ConversationInteraction();
mobj.setToRole(role);
@@ -1585,9 +1585,9 @@
context.setRole(role);
Conversation conv=new Conversation();
- ModelName mname=new ModelName();
- mname.setLocatedRole(role);
- conv.setModelName(mname);
+ LocatedName mname=new LocatedName();
+ mname.setRole(role);
+ conv.setLocatedName(mname);
ConversationInteraction mobj1=new ConversationInteraction();
mobj1.setToRole(role);
@@ -1764,9 +1764,9 @@
context.setRole(role);
Conversation conv=new Conversation();
- ModelName mname=new ModelName();
- mname.setLocatedRole(role);
- conv.setModelName(mname);
+ LocatedName mname=new LocatedName();
+ mname.setRole(role);
+ conv.setLocatedName(mname);
ConversationInteraction mobj1=new ConversationInteraction();
mobj1.setFromRole(role);
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateful/ParallelModelChangeRuleTest.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateful/ParallelModelChangeRuleTest.java 2009-06-29 21:50:30 UTC (rev 651)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateful/ParallelModelChangeRuleTest.java 2009-06-29 22:34:27 UTC (rev 652)
@@ -291,10 +291,10 @@
context.setRole(role);
Conversation conv=new Conversation();
- ModelName mname=new ModelName();
- conv.setModelName(mname);
+ LocatedName mname=new LocatedName();
+ conv.setLocatedName(mname);
- mname.setLocatedRole(role);
+ mname.setRole(role);
Parallel mobj=new Parallel();
conv.getBlock().getContents().add(mobj);
@@ -417,10 +417,10 @@
context.setRole(role);
Conversation conv=new Conversation();
- ModelName mname=new ModelName();
- conv.setModelName(mname);
+ LocatedName mname=new LocatedName();
+ conv.setLocatedName(mname);
- mname.setLocatedRole(role);
+ mname.setRole(role);
Parallel mobj=new Parallel();
conv.getBlock().getContents().add(mobj);
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateful/RunModelChangeRuleTest.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateful/RunModelChangeRuleTest.java 2009-06-29 21:50:30 UTC (rev 651)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateful/RunModelChangeRuleTest.java 2009-06-29 22:34:27 UTC (rev 652)
@@ -58,17 +58,17 @@
ns.setName("ns");
Conversation conv=new Conversation();
- ModelName mname=new ModelName();
- mname.setLocatedRole(role);
- conv.setModelName(mname);
+ LocatedName mname=new LocatedName();
+ mname.setRole(role);
+ conv.setLocatedName(mname);
cm.setConversation(conv);
Conversation subconv=new Conversation();
- ModelName submname=new ModelName();
+ LocatedName submname=new LocatedName();
submname.setName(runName);
- submname.setLocatedRole(role);
- subconv.setModelName(mname);
+ submname.setRole(role);
+ subconv.setLocatedName(mname);
Run mobj=new Run();
mobj.setInlineDefinition(subconv);
@@ -184,17 +184,17 @@
ns.setName("ns");
Conversation conv=new Conversation();
- ModelName mname=new ModelName();
- mname.setLocatedRole(role);
- conv.setModelName(mname);
+ LocatedName mname=new LocatedName();
+ mname.setRole(role);
+ conv.setLocatedName(mname);
cm.setConversation(conv);
Conversation subconv=new Conversation();
- ModelName submname=new ModelName();
+ LocatedName submname=new LocatedName();
submname.setName(runName);
- submname.setLocatedRole(role);
- subconv.setModelName(mname);
+ submname.setRole(role);
+ subconv.setLocatedName(mname);
Run mobj=new Run();
mobj.setInlineDefinition(subconv);
@@ -316,17 +316,17 @@
ns.setName("ns");
Conversation conv=new Conversation();
- ModelName mname=new ModelName();
- mname.setLocatedRole(role);
- conv.setModelName(mname);
+ LocatedName mname=new LocatedName();
+ mname.setRole(role);
+ conv.setLocatedName(mname);
cm.setConversation(conv);
Conversation subconv=new Conversation();
- ModelName submname=new ModelName();
+ LocatedName submname=new LocatedName();
submname.setName(runName);
- submname.setLocatedRole(role);
- subconv.setModelName(mname);
+ submname.setRole(role);
+ subconv.setLocatedName(mname);
Run mobj=new Run();
mobj.setInlineDefinition(subconv);
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateful/SpawnModelChangeRuleTest.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateful/SpawnModelChangeRuleTest.java 2009-06-29 21:50:30 UTC (rev 651)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateful/SpawnModelChangeRuleTest.java 2009-06-29 22:34:27 UTC (rev 652)
@@ -59,17 +59,17 @@
ns.setName("ns");
Conversation conv=new Conversation();
- ModelName mname=new ModelName();
- mname.setLocatedRole(role);
- conv.setModelName(mname);
+ LocatedName mname=new LocatedName();
+ mname.setRole(role);
+ conv.setLocatedName(mname);
cm.setConversation(conv);
Conversation subconv=new Conversation();
- ModelName submname=new ModelName();
+ LocatedName submname=new LocatedName();
submname.setName(runName);
- submname.setLocatedRole(role);
- subconv.setModelName(mname);
+ submname.setRole(role);
+ subconv.setLocatedName(mname);
Spawn mobj=new Spawn();
mobj.setInlineDefinition(subconv);
@@ -154,17 +154,17 @@
ns.setName("ns");
Conversation conv=new Conversation();
- ModelName mname=new ModelName();
- mname.setLocatedRole(role);
- conv.setModelName(mname);
+ LocatedName mname=new LocatedName();
+ mname.setRole(role);
+ conv.setLocatedName(mname);
cm.setConversation(conv);
Conversation subconv=new Conversation();
- ModelName submname=new ModelName();
+ LocatedName submname=new LocatedName();
submname.setName(runName);
- submname.setLocatedRole(role);
- subconv.setModelName(mname);
+ submname.setRole(role);
+ subconv.setLocatedName(mname);
Spawn mobj=new Spawn();
mobj.setInlineDefinition(subconv);
@@ -251,17 +251,17 @@
ns.setName("ns");
Conversation conv=new Conversation();
- ModelName mname=new ModelName();
- mname.setLocatedRole(role);
- conv.setModelName(mname);
+ LocatedName mname=new LocatedName();
+ mname.setRole(role);
+ conv.setLocatedName(mname);
cm.setConversation(conv);
Conversation subconv=new Conversation();
- ModelName submname=new ModelName();
+ LocatedName submname=new LocatedName();
submname.setName(runName);
- submname.setLocatedRole(role);
- subconv.setModelName(mname);
+ submname.setRole(role);
+ subconv.setLocatedName(mname);
Spawn mobj=new Spawn();
mobj.setInlineDefinition(subconv);
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateful/WhileModelChangeRuleTest.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateful/WhileModelChangeRuleTest.java 2009-06-29 21:50:30 UTC (rev 651)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/change/stateful/WhileModelChangeRuleTest.java 2009-06-29 22:34:27 UTC (rev 652)
@@ -70,10 +70,10 @@
context.setRole(role);
Conversation conv=new Conversation();
- ModelName mname=new ModelName();
- conv.setModelName(mname);
+ LocatedName mname=new LocatedName();
+ conv.setLocatedName(mname);
- mname.setLocatedRole(role);
+ mname.setRole(role);
While mobj=new While();
conv.getBlock().getContents().add(mobj);
@@ -200,10 +200,10 @@
context.setRole(role);
Conversation conv=new Conversation();
- ModelName mname=new ModelName();
- conv.setModelName(mname);
+ LocatedName mname=new LocatedName();
+ conv.setLocatedName(mname);
- mname.setLocatedRole(role);
+ mname.setRole(role);
While mobj=new While();
conv.getBlock().getContents().add(mobj);
@@ -330,10 +330,10 @@
context.setRole(role);
Conversation conv=new Conversation();
- ModelName mname=new ModelName();
- conv.setModelName(mname);
+ LocatedName mname=new LocatedName();
+ conv.setLocatedName(mname);
- mname.setLocatedRole(role);
+ mname.setRole(role);
While mobj=new While();
conv.getBlock().getContents().add(mobj);
@@ -466,10 +466,10 @@
context.setRole(role);
Conversation conv=new Conversation();
- ModelName mname=new ModelName();
- conv.setModelName(mname);
+ LocatedName mname=new LocatedName();
+ conv.setLocatedName(mname);
- mname.setLocatedRole(role);
+ mname.setRole(role);
While mobj=new While();
conv.getBlock().getContents().add(mobj);
@@ -642,10 +642,10 @@
context.setRole(role);
Conversation conv=new Conversation();
- ModelName mname=new ModelName();
- conv.setModelName(mname);
+ LocatedName mname=new LocatedName();
+ conv.setLocatedName(mname);
- mname.setLocatedRole(role);
+ mname.setRole(role);
While mobj=new While();
conv.getBlock().getContents().add(mobj);
More information about the overlord-commits
mailing list