[savara-commits] savara SVN: r69 - tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change.
Author: objectiser
Date: 2009-10-31 08:35:22 -0400 (Sat, 31 Oct 2009)
New Revision: 69
Modified:
tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ConversationInteractionModelChangeRule.java
tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/IfModelChangeRule.java
Log:
Add namespace prefix to faultName in catch and reply.
Modified:
tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ConversationInteractionModelChangeRule.java
===================================================================
---
tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ConversationInteractionModelChangeRule.java 2009-10-31
10:51:56 UTC (rev 68)
+++
tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ConversationInteractionModelChangeRule.java 2009-10-31
12:35:22 UTC (rev 69)
@@ -96,6 +96,7 @@
Role role=null;
String portType=null;
String varName=InteractionPatterns.getVariableName(interaction);
+ Interface intf=null;
if (interaction.getEnclosingDefinition() != null) {
role = interaction.getEnclosingDefinition().
@@ -115,17 +116,19 @@
// Assume that contract only has one interface for now
if (contract.getInterfaces().size() > 0) {
- Interface intf=contract.getInterfaces().get(0);
-
- portType = intf.getName();
-
- String prefix=bpelModel.getBPELProcess().addNamespace(intf.getNamespace());
-
- if (prefix != null) {
- portType = prefix+":"+portType;
- }
+ intf = contract.getInterfaces().get(0);
}
}
+
+ if (intf != null) {
+ portType = intf.getName();
+
+ String prefix=bpelModel.getBPELProcess().addNamespace(intf.getNamespace());
+
+ if (prefix != null) {
+ portType = prefix+":"+portType;
+ }
+ }
// Check if send or receive
if (InteractionUtil.isSend(interaction)) {
@@ -176,7 +179,18 @@
//portType = role.getName()+"PT";
if (InteractionPatterns.isFaultResponse(interaction)) {
- ((Reply)act).setFaultName(InteractionPatterns.getFaultName(interaction));
+ String faultName=InteractionPatterns.getFaultName(interaction);
+
+ // Find namespace prefix
+ if (intf != null) {
+ String prefix=bpelModel.getBPELProcess().addNamespace(intf.getNamespace());
+
+ if (prefix != null) {
+ faultName = prefix+":"+faultName;
+ }
+ }
+
+ ((Reply)act).setFaultName(faultName);
}
if (varName != null) {
Modified:
tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/IfModelChangeRule.java
===================================================================
---
tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/IfModelChangeRule.java 2009-10-31
10:51:56 UTC (rev 68)
+++
tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/IfModelChangeRule.java 2009-10-31
12:35:22 UTC (rev 69)
@@ -114,7 +114,6 @@
String faultVarName=InteractionPatterns.getVariableName((Interaction)act);
Catch c=new Catch(bpelModel);
- c.setFaultName(faultName);
c.setFaultVariable(faultVarName);
// Define fault message type
@@ -127,9 +126,11 @@
if (prefix != null) {
mesgType = prefix+":"+mesgType;
+ faultName = prefix+":"+faultName;
}
}
+ c.setFaultName(faultName);
c.setFaultMessageType(mesgType);
// Add catch to fault handler