Author: objectiser Date: 2008-06-20 08:53:28 -0400 (Fri, 20 Jun 2008) New Revision: 42 Modified: trunk/tools/jbossesb/src/org/jboss/internal/soa/overlord/jbossesb/model/ESBLanguageModel.java trunk/tools/jbossesb/src/org/jboss/internal/soa/overlord/jbossesb/model/actions/ParallelAction.java trunk/tools/jbossesb/src/org/jboss/internal/soa/overlord/jbossesb/model/actions/ReceiveMessageAction.java trunk/tools/jbossesb/src/org/jboss/internal/soa/overlord/jbossesb/model/actions/SendMessageAction.java Log: Filter out parallel actions if no paths with interactions. Record location information with derived 'receive' and 'send' actions. Modified: trunk/tools/jbossesb/src/org/jboss/internal/soa/overlord/jbossesb/model/ESBLanguageModel.java =================================================================== --- trunk/tools/jbossesb/src/org/jboss/internal/soa/overlord/jbossesb/model/ESBLanguageModel.java 2008-06-20 11:58:43 UTC (rev 41) +++ trunk/tools/jbossesb/src/org/jboss/internal/soa/overlord/jbossesb/model/ESBLanguageModel.java 2008-06-20 12:53:28 UTC (rev 42) @@ -272,6 +272,10 @@ props.put(ModelListener.REFERENCE_MODEL, m_source); props.put(ModelListener.REFERENCE_MODEL_START_POSITION, src.getSource().getStartPosition()); props.put(ModelListener.REFERENCE_MODEL_END_POSITION, src.getSource().getEndPosition()); + if (src.getSource().getComponent() != null) { + props.put(ModelListener.REFERENCE_MODEL_COMPONENT, + src.getSource().getComponent()); + } m_listener.error(src, mesg, props); } @@ -285,6 +289,10 @@ props.put(ModelListener.REFERENCE_MODEL, m_source); props.put(ModelListener.REFERENCE_MODEL_START_POSITION, src.getSource().getStartPosition()); props.put(ModelListener.REFERENCE_MODEL_END_POSITION, src.getSource().getEndPosition()); + if (src.getSource().getComponent() != null) { + props.put(ModelListener.REFERENCE_MODEL_COMPONENT, + src.getSource().getComponent()); + } m_listener.warning(src, mesg, props); } Modified: trunk/tools/jbossesb/src/org/jboss/internal/soa/overlord/jbossesb/model/actions/ParallelAction.java =================================================================== --- trunk/tools/jbossesb/src/org/jboss/internal/soa/overlord/jbossesb/model/actions/ParallelAction.java 2008-06-20 11:58:43 UTC (rev 41) +++ trunk/tools/jbossesb/src/org/jboss/internal/soa/overlord/jbossesb/model/actions/ParallelAction.java 2008-06-20 12:53:28 UTC (rev 42) @@ -90,13 +90,16 @@ String name=((org.w3c.dom.Element)n).getAttribute(SERVICE_NAME); Block block=new Block(); - parallel.getBlocks().add(block); ESBService service=getService().getModel().getService(category, name); if (service != null) { service.convert(block.getContents()); } + + if (block.getContents().size() > 0) { + parallel.getBlocks().add(block); + } } else if (n.getNodeName().equals(JOIN)) { String category=((org.w3c.dom.Element)n).getAttribute(SERVICE_CATEGORY); String name=((org.w3c.dom.Element)n).getAttribute(SERVICE_NAME); @@ -111,6 +114,11 @@ } } } + + // Only add parallel activity if it has paths + if (parallel.getBlocks().size() == 0) { + activities.remove(parallel); + } } } Modified: trunk/tools/jbossesb/src/org/jboss/internal/soa/overlord/jbossesb/model/actions/ReceiveMessageAction.java =================================================================== --- trunk/tools/jbossesb/src/org/jboss/internal/soa/overlord/jbossesb/model/actions/ReceiveMessageAction.java 2008-06-20 11:58:43 UTC (rev 41) +++ trunk/tools/jbossesb/src/org/jboss/internal/soa/overlord/jbossesb/model/actions/ReceiveMessageAction.java 2008-06-20 12:53:28 UTC (rev 42) @@ -43,6 +43,8 @@ ConversationInteraction recv=new ConversationInteraction(); activities.add(recv); + recv.derivedFrom(this); + MessageSignature ms=new MessageSignature(); recv.setMessageSignature(ms); @@ -66,6 +68,8 @@ ref.setLocalpart(local); ref.setNamespace(ns); + ref.derivedFrom(this); + ms.getTypes().add(ref); } Modified: trunk/tools/jbossesb/src/org/jboss/internal/soa/overlord/jbossesb/model/actions/SendMessageAction.java =================================================================== --- trunk/tools/jbossesb/src/org/jboss/internal/soa/overlord/jbossesb/model/actions/SendMessageAction.java 2008-06-20 11:58:43 UTC (rev 41) +++ trunk/tools/jbossesb/src/org/jboss/internal/soa/overlord/jbossesb/model/actions/SendMessageAction.java 2008-06-20 12:53:28 UTC (rev 42) @@ -104,6 +104,8 @@ ref.setLocalpart(local); ref.setNamespace(ns); + ref.derivedFrom(this); + ms.getTypes().add(ref); }