[overlord-commits] Overlord SVN: r596 - in cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb: generator and 1 other directory.

[overlord-commits at lists.jboss.org]

Author: objectiser
Date: 2009-04-26 11:37:02 -0400 (Sun, 26 Apr 2009)
New Revision: 596

Modified:
   cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/dialogs/GenerateDialog.java
   cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/Generator.java
Log:
Switch over to use local model references from global model, which also includes the sub-definition path.

Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/dialogs/GenerateDialog.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/dialogs/GenerateDialog.java	2009-04-25 22:59:25 UTC (rev 595)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/dialogs/GenerateDialog.java	2009-04-26 15:37:02 UTC (rev 596)
@@ -83,7 +83,7 @@
 						m_conversationModel = (ConversationModel)
 								models.get(i).getModel();
 						
-						m_roles = m_conversationModel.getRoles();
+						m_localModelRefs = m_conversationModel.getLocalModelReferences(ref);
 					}
 				}
 			}
@@ -151,10 +151,10 @@
 
 		if (m_conversationModel != null) {
 
-			for (int i=0; i < m_roles.size(); i++) {
+			for (int i=0; i < m_localModelRefs.size(); i++) {
 				
 				Button button=new Button(group, SWT.CHECK);
-				button.setText(m_roles.get(i).getName());
+				button.setText(m_localModelRefs.get(i).getLocatedRole());
 				button.setSelection(true);
 				
 				gd = new GridData();
@@ -196,7 +196,7 @@
 				
 				Text projectName=new Text(group, SWT.NONE);
 				
-				String prjName=m_roles.get(i).getName();
+				String prjName=m_localModelRefs.get(i).getLocatedRole();
 				
 				if (m_conversationModel.getModelName() != null) {
 					prjName = m_conversationModel.getModelName().getName()+"-"+prjName;
@@ -380,10 +380,10 @@
 			Generator generator=new Generator(m_file,
 						context);
 			
-			for (int i=0; i < m_roles.size(); i++) {
+			for (int i=0; i < m_localModelRefs.size(); i++) {
 				
 				if (m_roleButtons.get(i).getSelection()) {
-					generator.generateRole(m_roles.get(i),
+					generator.generateRole(m_localModelRefs.get(i),
 							m_statelessButtons.get(i).getSelection(),
 							m_projectNames.get(i).getText());
 				}
@@ -425,7 +425,7 @@
 
 	private IFile m_file=null;
 	private ConversationModel m_conversationModel=null;
-	private java.util.List<Role> m_roles=null;
+	private java.util.List<ModelReference> m_localModelRefs=null;
 	private java.util.List<Button> m_roleButtons=new java.util.Vector<Button>();
 	private java.util.List<Button> m_statelessButtons=new java.util.Vector<Button>();
 	private java.util.List<Text> m_projectNames=new java.util.Vector<Text>();

Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/Generator.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/Generator.java	2009-04-25 22:59:25 UTC (rev 595)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/Generator.java	2009-04-26 15:37:02 UTC (rev 596)
@@ -121,16 +121,17 @@
 	 * This method generates the project associated with the
 	 * supplied role.
 	 * 
-	 * @param role The role
+	 * @param localModelRef The local model reference
 	 * @param stateless Whether the generated role should be stateless
 	 * @param projectName The project name
 	 * @throws Exception Failed to generate role
 	 */
-	public void generateRole(Role role, boolean stateless, String projectName)
+	public void generateRole(ModelReference localModelRef,
+					boolean stateless, String projectName)
 						throws Exception {
 		
 		if (logger.isLoggable(Level.FINEST)) {
-			logger.finest("Generate role '"+role+"' for: "+
+			logger.finest("Generate local model '"+localModelRef+"' for: "+
 						m_conversationModel);
 		}
 		
@@ -141,10 +142,12 @@
 					org.scribble.projector.Projector.class, null);
 
 		if (projector != null) {
+			Role role=new Role(localModelRef.getLocatedRole());
+
 			ModelReference ref=new ModelReference(ConversationNotation.NOTATION_CODE);
 			
 			Model localModel=projector.project(ref,
-					m_conversationModel,
+					m_conversationModel, localModelRef.getSubDefinitionPath(),
 					role, new DefaultModelListener());
 			
 			if (localModel instanceof ConversationModel &&