[overlord-commits] Overlord SVN: r349 - cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change.
overlord-commits at lists.jboss.org
overlord-commits at lists.jboss.org
Sat Sep 27 08:26:19 EDT 2008
Author: objectiser
Date: 2008-09-27 08:26:19 -0400 (Sat, 27 Sep 2008)
New Revision: 349
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/ConversationInteractionModelChangeRule.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/ConversationModelChangeRule.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/IfModelChangeRule.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/LanguageToConversationModelChangeRule.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/ParallelModelChangeRule.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/RunModelChangeRule.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/SpawnModelChangeRule.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/WhenModelChangeRule.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/WhileModelChangeRule.java
Log:
Updated ModelChangeRule interface to check if referenced model object is appropriate for insertion.
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/ConversationInteractionModelChangeRule.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/ConversationInteractionModelChangeRule.java 2008-09-26 15:50:54 UTC (rev 348)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/ConversationInteractionModelChangeRule.java 2008-09-27 12:26:19 UTC (rev 349)
@@ -41,15 +41,20 @@
* @param context The context
* @param model The model
* @param mobj The model object being inserted
+ * @param ref The optional reference model object
* @return Whether the rule supports the supplied information
*/
@Override
public boolean isInsertSupported(ModelChangeContext context,
- Model model, ModelObject mobj) {
+ Model model, ModelObject mobj,
+ ModelObject ref) {
boolean ret=false;
if (mobj instanceof ConversationInteraction &&
- context.getParent() instanceof ESBService &&
+ (context.getParent() instanceof ESBService ||
+ (ref != null && ref.getSource().getObject()
+ instanceof AbstractESBAction &&
+ ((AbstractESBAction)ref.getSource().getObject()).getService() != null)) &&
model instanceof ESBLanguageModel) {
ret = true;
}
@@ -329,7 +334,7 @@
endService.addAction(action, endPos);
- if (((ESBService)context.getParent()).getFirstSessionBasedAction() == action &&
+ if (endService.getFirstSessionBasedAction() == action &&
interaction.getEnclosingDefinition() instanceof Conversation) {
action.setBusinessObjectType(ConversationUtil.getBusinessObjectType(
((Conversation)interaction.getEnclosingDefinition())));
@@ -365,14 +370,14 @@
}
// Check if existing actions need to be moved
- if (pos != -1) {
+ if (pos != -1 && service != endService) {
for (int i=pos+1; i < service.getActions().size();) {
- ESBService extraService=(ESBService)context.getParent();
+ //ESBService extraService=(ESBService)context.getParent();
ESBAction act=service.getActions().get(i);
service.getActions().remove(i);
- extraService.addAction(act, -1);
+ endService.addAction(act, -1);
}
}
@@ -391,8 +396,8 @@
new java.util.Vector<MessageSignature>();
mtypes.add(interaction.getMessageSignature());
- mra.addRoute(((ESBService)context.getParent()).getCategory(),
- ((ESBService)context.getParent()).getName(),
+ mra.addRoute(endService.getCategory(),
+ endService.getName(),
service.isRoot(), mtypes);
}
}
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/ConversationModelChangeRule.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/ConversationModelChangeRule.java 2008-09-26 15:50:54 UTC (rev 348)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/ConversationModelChangeRule.java 2008-09-27 12:26:19 UTC (rev 349)
@@ -41,11 +41,12 @@
* @param context The context
* @param model The model
* @param mobj The model object causing the change
+ * @param ref The optional reference model object
* @return Whether the rule supports the supplied information
*/
@Override
public boolean isInsertSupported(ModelChangeContext context,
- Model model, ModelObject mobj) {
+ Model model, ModelObject mobj, ModelObject ref) {
boolean ret=false;
if (mobj instanceof Conversation &&
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/IfModelChangeRule.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/IfModelChangeRule.java 2008-09-26 15:50:54 UTC (rev 348)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/IfModelChangeRule.java 2008-09-27 12:26:19 UTC (rev 349)
@@ -43,11 +43,12 @@
* @param context The context
* @param model The model
* @param mobj The model object being inserted
+ * @param ref The optional reference model object
* @return Whether the rule supports the supplied information
*/
@Override
public boolean isInsertSupported(ModelChangeContext context,
- Model model, ModelObject mobj) {
+ Model model, ModelObject mobj, ModelObject ref) {
boolean ret=false;
if (mobj instanceof If &&
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/LanguageToConversationModelChangeRule.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/LanguageToConversationModelChangeRule.java 2008-09-26 15:50:54 UTC (rev 348)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/LanguageToConversationModelChangeRule.java 2008-09-27 12:26:19 UTC (rev 349)
@@ -39,11 +39,12 @@
* @param context The context
* @param model The model
* @param mobj The model object being inserted
+ * @param ref The optional reference model object
* @return Whether the rule supports the supplied information
*/
@Override
public boolean isInsertSupported(ModelChangeContext context,
- Model model, ModelObject mobj) {
+ Model model, ModelObject mobj, ModelObject ref) {
boolean ret=false;
if (mobj instanceof ConversationModel &&
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/ParallelModelChangeRule.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/ParallelModelChangeRule.java 2008-09-26 15:50:54 UTC (rev 348)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/ParallelModelChangeRule.java 2008-09-27 12:26:19 UTC (rev 349)
@@ -42,11 +42,12 @@
* @param context The context
* @param model The model
* @param mobj The model object being inserted
+ * @param ref The optional reference model object
* @return Whether the rule supports the supplied information
*/
@Override
public boolean isInsertSupported(ModelChangeContext context,
- Model model, ModelObject mobj) {
+ Model model, ModelObject mobj, ModelObject ref) {
boolean ret=false;
if (mobj instanceof Parallel &&
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/RunModelChangeRule.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/RunModelChangeRule.java 2008-09-26 15:50:54 UTC (rev 348)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/RunModelChangeRule.java 2008-09-27 12:26:19 UTC (rev 349)
@@ -42,11 +42,12 @@
* @param context The context
* @param model The model
* @param mobj The model object being inserted
+ * @param ref The optional reference model object
* @return Whether the rule supports the supplied information
*/
@Override
public boolean isInsertSupported(ModelChangeContext context,
- Model model, ModelObject mobj) {
+ Model model, ModelObject mobj, ModelObject ref) {
boolean ret=false;
if (mobj instanceof Run &&
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/SpawnModelChangeRule.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/SpawnModelChangeRule.java 2008-09-26 15:50:54 UTC (rev 348)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/SpawnModelChangeRule.java 2008-09-27 12:26:19 UTC (rev 349)
@@ -41,11 +41,12 @@
* @param context The context
* @param model The model
* @param mobj The model object being inserted
+ * @param ref The optional reference model object
* @return Whether the rule supports the supplied information
*/
@Override
public boolean isInsertSupported(ModelChangeContext context,
- Model model, ModelObject mobj) {
+ Model model, ModelObject mobj, ModelObject ref) {
boolean ret=false;
if (mobj instanceof Spawn &&
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/WhenModelChangeRule.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/WhenModelChangeRule.java 2008-09-26 15:50:54 UTC (rev 348)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/WhenModelChangeRule.java 2008-09-27 12:26:19 UTC (rev 349)
@@ -42,11 +42,12 @@
* @param context The context
* @param model The model
* @param mobj The model object being inserted
+ * @param ref The optional reference model object
* @return Whether the rule supports the supplied information
*/
@Override
public boolean isInsertSupported(ModelChangeContext context,
- Model model, ModelObject mobj) {
+ Model model, ModelObject mobj, ModelObject ref) {
boolean ret=false;
if (mobj instanceof When &&
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/WhileModelChangeRule.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/WhileModelChangeRule.java 2008-09-26 15:50:54 UTC (rev 348)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/change/WhileModelChangeRule.java 2008-09-27 12:26:19 UTC (rev 349)
@@ -42,11 +42,12 @@
* @param context The context
* @param model The model
* @param mobj The model object being inserted
+ * @param ref The optional reference model object
* @return Whether the rule supports the supplied information
*/
@Override
public boolean isInsertSupported(ModelChangeContext context,
- Model model, ModelObject mobj) {
+ Model model, ModelObject mobj, ModelObject ref) {
boolean ret=false;
if (mobj instanceof While &&
More information about the overlord-commits
mailing list