Author: objectiser
Date: 2009-03-30 15:51:42 -0400 (Mon, 30 Mar 2009)
New Revision: 560
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/AbstractBPELModelChangeRule.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/change/RunModelChangeRule.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/SpawnModelChangeRule.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/WhenModelChangeRule.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/WhileModelChangeRule.java
Log:
Refactoring to remove 'activity' distinction, and additional tests around the
model for if/elseif/else constructs, built from DOM and also programmatically.
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/AbstractBPELModelChangeRule.java
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/AbstractBPELModelChangeRule.java 2009-03-30
17:06:51 UTC (rev 559)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/AbstractBPELModelChangeRule.java 2009-03-30
19:51:42 UTC (rev 560)
@@ -20,7 +20,7 @@
import org.scribble.model.*;
import org.scribble.model.change.*;
import org.jboss.tools.overlord.cdl.bpel.model.*;
-import org.jboss.tools.overlord.cdl.bpel.model.activities.SequenceActivity;
+import org.jboss.tools.overlord.cdl.bpel.model.component.Sequence;
/**
* This is the abstract ESB model change rule.
@@ -43,7 +43,7 @@
Model model, ModelObject mobj, ModelObject ref) {
boolean ret=false;
- if (context.getParent() instanceof SequenceActivity &&
+ if (context.getParent() instanceof Sequence &&
model instanceof BPELLanguageModel) {
ret = true;
}
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-03-30
17:06:51 UTC (rev 559)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/ConversationInteractionModelChangeRule.java 2009-03-30
19:51:42 UTC (rev 560)
@@ -19,7 +19,7 @@
import org.jboss.tools.overlord.cdl.bpel.model.*;
import org.jboss.tools.overlord.cdl.bpel.model.util.*;
-import org.jboss.tools.overlord.cdl.bpel.model.activities.*;
+import org.jboss.tools.overlord.cdl.bpel.model.component.*;
import org.scribble.model.*;
import org.scribble.model.change.*;
import org.scribble.conversation.model.*;
@@ -94,11 +94,11 @@
if (InteractionUtil.isSend(interaction)) {
if (InteractionUtil.isRequest(interaction)) {
- InvokeActivity act=new InvokeActivity(bpelModel,
+ Invoke act=new Invoke(bpelModel,
interaction);
- if (context.getParent() instanceof SequenceActivity) {
- ((SequenceActivity)context.getParent()).addActivity(act, -1);
+ if (context.getParent() instanceof Sequence) {
+ ((Sequence)context.getParent()).addActivity(act, -1);
ret = true;
}
@@ -110,22 +110,22 @@
// possibly wrapped around, or contained within the
// invoke.
} else {
- ReplyActivity act=new ReplyActivity(bpelModel,
+ Reply act=new Reply(bpelModel,
interaction);
- if (context.getParent() instanceof SequenceActivity) {
- ((SequenceActivity)context.getParent()).addActivity(act, -1);
+ if (context.getParent() instanceof Sequence) {
+ ((Sequence)context.getParent()).addActivity(act, -1);
ret = true;
}
}
} else {
if (InteractionUtil.isRequest(interaction)) {
- ReceiveActivity act=new ReceiveActivity(bpelModel,
+ Receive act=new Receive(bpelModel,
interaction);
- if (context.getParent() instanceof SequenceActivity) {
- ((SequenceActivity)context.getParent()).addActivity(act, -1);
+ if (context.getParent() instanceof Sequence) {
+ ((Sequence)context.getParent()).addActivity(act, -1);
ret = true;
}
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-03-30
17:06:51 UTC (rev 559)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/ConversationModelChangeRule.java 2009-03-30
19:51:42 UTC (rev 560)
@@ -18,7 +18,7 @@
package org.jboss.tools.overlord.cdl.bpel.model.change;
import org.jboss.tools.overlord.cdl.bpel.model.*;
-import org.jboss.tools.overlord.cdl.bpel.model.activities.*;
+import org.jboss.tools.overlord.cdl.bpel.model.component.*;
import org.scribble.model.*;
import org.scribble.model.change.*;
import org.scribble.conversation.model.*;
@@ -89,7 +89,7 @@
DefaultBPELLanguageModel bpelModel=(DefaultBPELLanguageModel)model;
Conversation conv=(Conversation)mobj;
- SequenceActivity seq=new SequenceActivity(bpelModel);
+ Sequence seq=new Sequence(bpelModel);
// Check if root conversation
if (conv.getParent() instanceof Model) {
@@ -97,9 +97,9 @@
// Add sequence to model
bpelModel.setActivity(seq);
- } else if (context.getParent() instanceof SequenceActivity) {
+ } else if (context.getParent() instanceof Sequence) {
- ((SequenceActivity)context.getParent()).addActivity(seq, -1);
+ ((Sequence)context.getParent()).addActivity(seq, -1);
}
// Process the activities within the conversation
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-03-30
17:06:51 UTC (rev 559)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/IfModelChangeRule.java 2009-03-30
19:51:42 UTC (rev 560)
@@ -18,10 +18,9 @@
package org.jboss.tools.overlord.cdl.bpel.model.change;
import org.jboss.tools.overlord.cdl.bpel.model.*;
-import org.jboss.tools.overlord.cdl.bpel.model.activities.*;
+import org.jboss.tools.overlord.cdl.bpel.model.component.*;
import org.scribble.model.*;
import org.scribble.model.change.*;
-import org.scribble.conversation.model.*;
import org.scribble.extensions.RegistryInfo;
/**
@@ -46,7 +45,7 @@
Model model, ModelObject mobj, ModelObject ref) {
boolean ret=false;
- if (mobj instanceof If &&
+ if (mobj instanceof org.scribble.conversation.model.If &&
model instanceof DefaultBPELLanguageModel) {
ret = true;
}
@@ -85,25 +84,29 @@
public boolean insert(ModelChangeContext context,
Model model, ModelObject mobj, ModelObject ref) {
DefaultBPELLanguageModel bpelModel=(DefaultBPELLanguageModel)model;
- If elem=(If)mobj;
+ org.scribble.conversation.model.If elem=
+ (org.scribble.conversation.model.If)mobj;
- IfActivity act=new IfActivity(bpelModel);
+ If act=new If(bpelModel);
- if (context.getParent() instanceof SequenceActivity) {
- ((SequenceActivity)context.getParent()).addActivity(act, -1);
+ if (context.getParent() instanceof Sequence) {
+ ((Sequence)context.getParent()).addActivity(act, -1);
}
for (int i=0; i < elem.getPaths().size(); i++) {
Block path=elem.getPaths().get(i);
- SequenceActivity seq=new SequenceActivity(bpelModel);
+ Sequence seq=new Sequence(bpelModel);
if (i == 0) {
- act.setConditionPath(seq);
+ act.setActivity(seq);
} else if (i == elem.getPaths().size()-1) {
- act.setElsePath(seq);
+ Else construct=new Else(bpelModel);
+ construct.setActivity(seq);
+
+ act.setElsePath(construct);
} else {
- ElseIfConstruct construct=new ElseIfConstruct(bpelModel);
+ Elseif construct=new Elseif(bpelModel);
construct.setActivity(seq);
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/RunModelChangeRule.java
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/RunModelChangeRule.java 2009-03-30
17:06:51 UTC (rev 559)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/RunModelChangeRule.java 2009-03-30
19:51:42 UTC (rev 560)
@@ -18,7 +18,7 @@
package org.jboss.tools.overlord.cdl.bpel.model.change;
import org.jboss.tools.overlord.cdl.bpel.model.*;
-import org.jboss.tools.overlord.cdl.bpel.model.activities.*;
+import org.jboss.tools.overlord.cdl.bpel.model.component.*;
import org.scribble.model.*;
import org.scribble.model.change.*;
import org.scribble.conversation.model.*;
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/SpawnModelChangeRule.java
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/SpawnModelChangeRule.java 2009-03-30
17:06:51 UTC (rev 559)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/SpawnModelChangeRule.java 2009-03-30
19:51:42 UTC (rev 560)
@@ -18,7 +18,7 @@
package org.jboss.tools.overlord.cdl.bpel.model.change;
import org.jboss.tools.overlord.cdl.bpel.model.*;
-import org.jboss.tools.overlord.cdl.bpel.model.activities.*;
+import org.jboss.tools.overlord.cdl.bpel.model.component.*;
import org.scribble.model.*;
import org.scribble.model.change.*;
import org.scribble.conversation.model.*;
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/WhenModelChangeRule.java
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/WhenModelChangeRule.java 2009-03-30
17:06:51 UTC (rev 559)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/WhenModelChangeRule.java 2009-03-30
19:51:42 UTC (rev 560)
@@ -18,7 +18,7 @@
package org.jboss.tools.overlord.cdl.bpel.model.change;
import org.jboss.tools.overlord.cdl.bpel.model.*;
-import org.jboss.tools.overlord.cdl.bpel.model.activities.*;
+import org.jboss.tools.overlord.cdl.bpel.model.component.*;
import org.scribble.model.*;
import org.scribble.model.change.*;
import org.scribble.conversation.model.*;
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/WhileModelChangeRule.java
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/WhileModelChangeRule.java 2009-03-30
17:06:51 UTC (rev 559)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/WhileModelChangeRule.java 2009-03-30
19:51:42 UTC (rev 560)
@@ -18,10 +18,9 @@
package org.jboss.tools.overlord.cdl.bpel.model.change;
import org.jboss.tools.overlord.cdl.bpel.model.*;
-import org.jboss.tools.overlord.cdl.bpel.model.activities.*;
+import org.jboss.tools.overlord.cdl.bpel.model.component.*;
import org.scribble.model.*;
import org.scribble.model.change.*;
-import org.scribble.conversation.model.*;
import org.scribble.extensions.RegistryInfo;
/**
@@ -46,7 +45,7 @@
Model model, ModelObject mobj, ModelObject ref) {
boolean ret=false;
- if (mobj instanceof While &&
+ if (mobj instanceof org.scribble.conversation.model.While &&
model instanceof DefaultBPELLanguageModel) {
ret = true;
}
@@ -85,15 +84,16 @@
public boolean insert(ModelChangeContext context,
Model model, ModelObject mobj, ModelObject ref) {
DefaultBPELLanguageModel bpelModel=(DefaultBPELLanguageModel)model;
- While elem=(While)mobj;
+ org.scribble.conversation.model.While elem=
+ (org.scribble.conversation.model.While)mobj;
- WhileActivity act=new WhileActivity(bpelModel);
+ While act=new While(bpelModel);
- SequenceActivity seq=new SequenceActivity(bpelModel);
- act.setContainedActivity(seq);
+ Sequence seq=new Sequence(bpelModel);
+ act.setActivity(seq);
- if (context.getParent() instanceof SequenceActivity) {
- ((SequenceActivity)context.getParent()).addActivity(act, -1);
+ if (context.getParent() instanceof Sequence) {
+ ((Sequence)context.getParent()).addActivity(act, -1);
}
// Process the activities within the conversation