removed not needed constants, fixed toolspecifics parser

src/data/java/de/tudresden/inf/st/pnml/base/constants/PnmlConstants.java

@@ -22,12 +22,6 @@ public final class PnmlConstants {
     public static final String TRANSITION_TOPIC_SUBSCRIBERS_DEF_KEY = "subscribers";
     public static final String TRANSITION_TOPIC_SUBSCRIBER_DEF_KEY = "subscriber";
 
-    public static final String TRANSITION_TYPE_SERVICE_REQUEST_IN = "serviceTransitionRequestIn";
-    public static final String TRANSITION_TYPE_SERVICE_REQUEST_OUT = "serviceTransitionRequestOut";
-
-    public static final String TRANSITION_TYPE_SERVICE_RESPONSE_IN = "serviceTransitionResponseIn";
-    public static final String TRANSITION_TYPE_SERVICE_RESPONSE_OUT = "serviceTransitionResponseOut";
-
     // general properties
     public static final String NODE_KEY = "node";
     public static final String TYPE_KEY = "type";
@@ -48,6 +42,7 @@ public final class PnmlConstants {
     public static final String OUTPUT_LIMIT_KEY = "outputlimit";
     public static final String SUBNET_KEY = "subnet";
     public static final String TOPIC_KEY = "topic";
+    public static final String TOPIC_NAME = "topicName";
 
     // signal keys
     public static final String TRANSITION_ID_KEY = "transitionID";

src/main/jastadd/base/parsing/ToolSpecificsParser.jadd

@@ -219,11 +219,10 @@ aspect ToolSpecificsParser{
 
                     if (typeList.getLength() > 0 && typeList.item(0) != null) {
                         String type = typeList.item(0).getTextContent();
-                        if (type.equals(PnmlConstants.TRANSITION_TYPE_TOPIC_LIMITED_IN) || type.equals(PnmlConstants.TRANSITION_TYPE_TOPIC_LIMITED_OUT)
-                                || type.equals(PnmlConstants.TRANSITION_TYPE_TOPIC_UNLIMITED_IN) || type.equals(PnmlConstants.TRANSITION_TYPE_TOPIC_UNLIMITED_OUT)
-                                || type.equals(PnmlConstants.TRANSITION_TYPE_TOPIC)) {
 
-                            org.w3c.dom.NodeList topicList = doc.getElementsByTagName(PnmlConstants.TOPIC_KEY);
+                        if (type.equals(PnmlConstants.TRANSITION_TYPE_TOPIC)) {
+
+                            org.w3c.dom.NodeList topicList = doc.getElementsByTagName(PnmlConstants.TOPIC_NAME);
 
                             if (topicList.getLength() > 0 && topicList.item(0) != null) {
                                 return topicList.item(0).getTextContent();
@@ -273,11 +272,7 @@ aspect ToolSpecificsParser{
                     Document doc = parseToolSpecifics(toolInfos);
                     String transitionType = getTransitionTypeFromToolSpecifics(toolInfos);
 
-                    if ((transitionType != null && (transitionType.equals(PnmlConstants.TRANSITION_TYPE_TOPIC))) ||
-                            (transitionType != null && (transitionType.equals(PnmlConstants.TRANSITION_TYPE_TOPIC_LIMITED_IN))) ||
-                            (transitionType != null && (transitionType.equals(PnmlConstants.TRANSITION_TYPE_TOPIC_LIMITED_OUT))) ||
-                            (transitionType != null && (transitionType.equals(PnmlConstants.TRANSITION_TYPE_TOPIC_UNLIMITED_IN))) ||
-                            (transitionType != null && (transitionType.equals(PnmlConstants.TRANSITION_TYPE_TOPIC_UNLIMITED_OUT)))) {
+                    if (transitionType != null && transitionType.equals(PnmlConstants.TRANSITION_TYPE_TOPIC)) {
 
                         org.w3c.dom.NodeList limList = doc.getElementsByTagName(limitType);
 
@@ -362,10 +357,10 @@ aspect ToolSpecificsParser{
 
             if (getTransitionTopicFromToolSpecifics(toolInfos) != null) {
                 TopicTransitionInformation topicTransition = new TopicTransitionInformation();
-                topicTransition.setNode(getNodeFromToolSpecifics(toolInfos));
+                // topicTransition.setNode(getNodeFromToolSpecifics(toolInfos));
                 // topicTransition.setType(getTransitionTypeFromToolSpecifics(toolInfos));
                 topicTransition.setTopic(getTransitionTopicFromToolSpecifics(toolInfos));
-                topicTransition.setSubNet(getTransitionSubnetInfo(toolInfos));
+                // topicTransition.setSubNet(getTransitionSubnetInfo(toolInfos));
 
                 JastAddList<Port> pubPorts = getPorts(toolInfos,
                         PnmlConstants.TRANSITION_TOPIC_PUBLISHERS_DEF_KEY,
@@ -390,10 +385,10 @@ aspect ToolSpecificsParser{
 
             if (getTransitionServiceNameFromToolSpecifics(toolInfos) != null) {
                 ServiceTransitionInformation serviceTransition = new ServiceTransitionInformation();
-                serviceTransition.setNode(getNodeFromToolSpecifics(toolInfos));
+                // serviceTransition.setNode(getNodeFromToolSpecifics(toolInfos));
                 // serviceTransition.setType(getTransitionTypeFromToolSpecifics(toolInfos));
                 serviceTransition.setServiceName(getTransitionServiceNameFromToolSpecifics(toolInfos));
-                serviceTransition.setSubNet(getTransitionSubnetInfo(toolInfos));
+                // serviceTransition.setSubNet(getTransitionSubnetInfo(toolInfos));
 
                 JastAddList<Port> servicePorts = getPorts(toolInfos,
                         PnmlConstants.TRANSITION_SERVICE_CHANNELS_KEY,
@@ -404,6 +399,11 @@ aspect ToolSpecificsParser{
                     serviceTransition.addClientChannel(s.asServiceChannel());
                 }
 
+                ServiceChannel sc = new ServiceChannel();
+                sc.setRequestPlaceId(getServerInputFromToolSpecifics(toolInfos));
+                sc.setResponsePlaceId(getServerOutputFromToolSpecifics(toolInfos));
+                serviceTransition.setServerChannel(sc);
+
                 return serviceTransition;
             }