5:59 p.m.
Author: objectiser
Date: 2009-04-25 18:59:25 -0400 (Sat, 25 Apr 2009)
New Revision: 595
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
Log:
Updated to use model references, rather than just roles, to enable roles associated with
sub-definitions within a global model to be projected to local models specific to that
scope.
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-23
19:37:51 UTC (rev 594)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/dialogs/GenerateDialog.java 2009-04-25
22:59:25 UTC (rev 595)
@@ -79,7 +79,7 @@
m_conversationModel = (ConversationModel)
models.get(i).getModel();
- m_roles = m_conversationModel.getRoles();
+ m_localModelRefs = m_conversationModel.getLocalModelReferences(ref);
}
}
}
@@ -139,10 +139,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();
@@ -164,7 +164,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;
@@ -332,10 +332,10 @@
Generator generator=new Generator(m_file,
getSelectedBuildSystem());
- 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_projectNames.get(i).getText());
}
}
@@ -372,7 +372,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<Text> m_projectNames=new java.util.Vector<Text>();
private Combo m_build=null;
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-23
19:37:51 UTC (rev 594)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/generator/Generator.java 2009-04-25
22:59:25 UTC (rev 595)
@@ -101,17 +101,18 @@
/**
* This method generates the project associated with the
- * supplied role.
+ * supplied role (and optional sub-definition path) contained
+ * in the local model reference.
*
- * @param role The role
+ * @param localModelRef The local model reference
* @param projectName The project name
* @throws Exception Failed to generate role
*/
- public void generateRole(Role role, String projectName)
+ public void generateRole(ModelReference localModelRef, String projectName)
throws Exception {
if (logger.isDebugEnabled()) {
- logger.debug("Generate role '"+role+"' for: "+
+ logger.debug("Generate local model '"+localModelRef+"' for:
"+
m_conversationModel);
}
@@ -122,11 +123,14 @@
org.scribble.projector.Projector.class, null);
if (projector != null) {
+ Role role=new Role(localModelRef.getLocatedRole());
+
ModelReference srcRef=
new ModelReference(ConversationNotation.NOTATION_CODE);
Model localModel=projector.project(srcRef, m_conversationModel,
- role, new DefaultModelListener());
+ localModelRef.getSubDefinitionPath(), role,
+ new DefaultModelListener());
if (localModel instanceof ConversationModel &&
((ConversationModel)localModel).getConversation() != null) {