Author: objectiser
Date: 2008-10-10 16:39:15 -0400 (Fri, 10 Oct 2008)
New Revision: 375
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/dialogs/GenerateDialog.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/generator/Generator.java
Log:
Partial implementation of solution for dealing with multiple models per resource, and
multiple concrete models associated with an abstract reference.
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/dialogs/GenerateDialog.java
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/dialogs/GenerateDialog.java 2008-10-09
11:15:09 UTC (rev 374)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/dialogs/GenerateDialog.java 2008-10-10
20:39:15 UTC (rev 375)
@@ -68,13 +68,16 @@
ModelRepository.class, null);
if (mrep != null) {
- Model model=mrep.getModel(ref,
+ java.util.List<Model> models=mrep.getModels(ref,
new DefaultModelListener());
- if (model instanceof ConversationModel) {
- m_conversationModel = (ConversationModel)model;
-
- m_roles = m_conversationModel.getRoles();
+ for (int i=0; m_conversationModel == null &&
+ i < models.size(); i++) {
+ if (models.get(i) instanceof ConversationModel) {
+ m_conversationModel = (ConversationModel)models.get(i);
+
+ m_roles = m_conversationModel.getRoles();
+ }
}
}
}
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/generator/Generator.java
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/generator/Generator.java 2008-10-09
11:15:09 UTC (rev 374)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/generator/Generator.java 2008-10-10
20:39:15 UTC (rev 375)
@@ -83,13 +83,16 @@
ModelRepository.class, null);
if (mrep != null) {
- Model model=mrep.getModel(ref,
- new DefaultModelListener());
-
- if (model instanceof ConversationModel) {
- m_conversationModel = (ConversationModel)model;
+ java.util.List<Model> models=mrep.getModels(ref,
+ new DefaultModelListener());
+
+ for (int i=0; m_conversationModel == null &&
+ i < models.size(); i++) {
+ if (models.get(i) instanceof ConversationModel) {
+ m_conversationModel = (ConversationModel)models.get(i);
- m_roles = m_conversationModel.getRoles();
+ m_roles = m_conversationModel.getRoles();
+ }
}
}
}
Show replies by date