[overlord-commits] Overlord SVN: r598 - in cdl/trunk/tools/plugins: org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/generator and 2 other directories.

[overlord-commits at lists.jboss.org]

Author: objectiser
Date: 2009-04-26 13:53:56 -0400 (Sun, 26 Apr 2009)
New Revision: 598

Modified:
   cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/dialogs/GenerateDialog.java
   cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/generator/Generator.java
   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:
Refactor to use local model references rather than just roles.

Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/dialogs/GenerateDialog.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/dialogs/GenerateDialog.java	2009-04-26 16:27:20 UTC (rev 597)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/dialogs/GenerateDialog.java	2009-04-26 17:53:56 UTC (rev 598)
@@ -79,7 +79,7 @@
 						m_conversationModel = (ConversationModel)
 								models.get(i).getModel();
 						
-						m_localModelRefs = m_conversationModel.getLocalModelReferences(ref);
+						m_localModelRefs = m_conversationModel.getLocalModels(ref);
 					}
 				}
 			}

Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/generator/Generator.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/generator/Generator.java	2009-04-26 16:27:20 UTC (rev 597)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/generator/Generator.java	2009-04-26 17:53:56 UTC (rev 598)
@@ -78,7 +78,7 @@
 						m_conversationModel = (ConversationModel)
 									models.get(i).getModel();
 					
-						m_roles = m_conversationModel.getRoles();
+						m_localModelRefs = m_conversationModel.getLocalModels(ref);
 					}
 				}
 			}
@@ -91,12 +91,13 @@
 	}
 	
 	/**
-	 * This method returns the roles that can be generated.
+	 * This method returns the local model references that
+	 * can be generated.
 	 * 
-	 * @return The roles
+	 * @return The local model references
 	 */
-	public java.util.List<Role> getRoles() {
-		return(m_roles);
+	public java.util.List<ModelReference> getLocalModels() {
+		return(m_localModelRefs);
 	}
 	
 	/**
@@ -208,7 +209,7 @@
 	private static Logger logger = Logger.getLogger(Generator.class);
 
 	private IFile m_file=null;
-	private java.util.List<Role> m_roles=null;
+	private java.util.List<ModelReference> m_localModelRefs=null;
 	private ConversationModel m_conversationModel=null;
 	private BuildSystem m_buildSystem=null;
 }

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-26 16:27:20 UTC (rev 597)
+++ 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 17:53:56 UTC (rev 598)
@@ -83,7 +83,7 @@
 						m_conversationModel = (ConversationModel)
 								models.get(i).getModel();
 						
-						m_localModelRefs = m_conversationModel.getLocalModelReferences(ref);
+						m_localModelRefs = m_conversationModel.getLocalModels(ref);
 					}
 				}
 			}

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-26 16:27:20 UTC (rev 597)
+++ 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 17:53:56 UTC (rev 598)
@@ -96,7 +96,7 @@
 						m_conversationModel = (ConversationModel)
 									models.get(i).getModel();
 					
-						m_roles = m_conversationModel.getRoles();
+						m_localModelRefs = m_conversationModel.getLocalModels(ref);
 					}
 				}
 			}
@@ -109,12 +109,12 @@
 	}
 	
 	/**
-	 * This method returns the roles that can be generated.
+	 * This method returns the local models that can be generated.
 	 * 
-	 * @return The roles
+	 * @return The local models
 	 */
-	public java.util.List<Role> getRoles() {
-		return(m_roles);
+	public java.util.List<ModelReference> getLocalModels() {
+		return(m_localModelRefs);
 	}
 	
 	/**
@@ -510,7 +510,7 @@
 	private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.cdl.runtime.jbossesb.generator");
 
 	private IFile m_file=null;
-	private java.util.List<Role> m_roles=null;
+	private java.util.List<ModelReference> m_localModelRefs=null;
 	private ConversationModel m_conversationModel=null;
 	private GeneratorContext m_context=null;
 	private java.util.List<ConversationBasedGenerator> m_conversationBasedGen=