[savara-commits] savara SVN: r74 - tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change.

[do-not-reply at jboss.org]

Author: objectiser
Date: 2009-11-06 18:20:02 -0500 (Fri, 06 Nov 2009)
New Revision: 74

Modified:
   tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/IfModelChangeRule.java
Log:
Define correct port type.

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-11-05 23:22:06 UTC (rev 73)
+++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/IfModelChangeRule.java	2009-11-06 23:20:02 UTC (rev 74)
@@ -23,6 +23,7 @@
 import org.scribble.model.*;
 import org.scribble.model.change.*;
 import org.scribble.contract.model.Contract;
+import org.scribble.contract.model.Interface;
 import org.scribble.extensions.RegistryInfo;
 
 /**
@@ -248,7 +249,21 @@
 					
 					pl.setPartnerLinkType(plt);
 
-					portType = role.getName()+"PT";
+					if (role.getAnnotations().containsKey(Contract.class.getName())) {
+						Contract contract=(Contract)role.getAnnotations().get(Contract.class.getName());
+						
+						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;
+							}
+						}
+					}
 				} else {
 					pl.setMyRole(role.getName()+"Requester");
 					pl.setPartnerRole(recv.getFromRole().getName()+"Service");
@@ -262,8 +277,25 @@
 					
 					pl.setPartnerLinkType(plt);
 
-					portType = role.getName()+
-							recv.getFromRole().getName()+"CallbackPT";				
+					//portType = role.getName()+
+					//		recv.getFromRole().getName()+"CallbackPT";				
+
+					if (recv.getFromRole().getAnnotations().containsKey(Contract.class.getName())) {
+						Contract contract=(Contract)recv.getFromRole().getAnnotations().get(Contract.class.getName());
+						
+						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;
+							}
+						}
+					}
+
 				}
 				
 				// Create partner link