updated parsing for rewrites

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

@@ -79,4 +79,9 @@ public final class PnmlConstants {
     public static final String CHANNEL_PLACE_TYPE_SERVER_RES_KEY = "sres";
     public static final String CHANNEL_PLACE_TYPE_SERVER_REQ_KEY = "sreq";
 
+    // page properties
+    public static final String PAGE_TYPE_SERVER = "serverPrototype";
+    public static final String PAGE_SERVER_INSTANCE_SUFFIX = "INSTANCE";
+    public static final String PAGE_SERVER_CONTAINER_SUFFIX = "CONTAINER";
+
 }

src/main/jastadd/base/Navigation.jrag

@@ -160,6 +160,12 @@ aspect Navigation {
     to PetriNet.allTransitions()
     for petriNet();
 
+  coll java.util.Set<DinerosTransition> PetriNet.allDinerosTransitions() [new java.util.HashSet()] root PetriNet;
+  DinerosTransition contributes this
+    to PetriNet.allDinerosTransitions()
+    for petriNet();
+
+
         coll java.util.Set<Arc> PetriNet.allArcs() [new java.util.HashSet()] root PetriNet;
   Arc contributes this
     to PetriNet.allArcs()

src/main/jastadd/base/distribution/DistributedPN.jadd

@@ -23,6 +23,14 @@ aspect PnDistribution {
         return this.getMutablePlaceInformation();
     }
 
+    syn lazy String Page.getType() {
+        return ToolSpecificsParser.getPageTypeFromToolSpecifics(this.getToolspecificList());
+    }
+
+    syn lazy String Page.getServiceName() {
+        return ToolSpecificsParser.getServiceNameFromToolSpecifics(this.getToolspecificList());
+    }
+
     syn lazy String RefTransition.getNode() {
         return ToolSpecificsParser.getNodeFromToolSpecifics(this.getToolspecificList());
     }

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

@@ -194,6 +194,14 @@ aspect ToolSpecificsParser{
             return null;
         }
 
+        public static String getPageTypeFromToolSpecifics(JastAddList<ToolInfo> toolInfos) {
+            return getElementByKeyFromToolSpecifics(toolInfos, PnmlConstants.TYPE_KEY);
+        }
+
+        public static String getServiceNameFromToolSpecifics(JastAddList<ToolInfo> toolInfos) {
+            return getElementByKeyFromToolSpecifics(toolInfos, PnmlConstants.SERVICE_NAME);
+        }
+
         public static String getTransitionServiceNameFromToolSpecifics(JastAddList<ToolInfo> toolInfos) {
             return getElementByKeyFromToolSpecifics(toolInfos, PnmlConstants.SERVICE_NAME);
         }

src/main/java/de/tudresden/inf/st/pnml/base/Main.java

 package de.tudresden.inf.st.pnml.base;
 
-import beaver.Parser;
-import de.tudresden.inf.st.pnml.jastadd.model.InputSignalClause;
-import de.tudresden.inf.st.pnml.jastadd.parser.ExpressionParser;
-import de.tudresden.inf.st.pnml.jastadd.scanner.ExpressionScanner;
-
-import java.io.IOException;
-import java.io.StringReader;
-
 public class Main {
 
-    public static void main(String[] args) throws IOException, Parser.Exception {
+    public static void main(String[] args){
 
         // Nothing to do here
         // List<PetriNet> petriNets = PnmlParser.parsePnml("...");

src/main/resources/nets/TestNet2.pnml

@@ -18,7 +18,13 @@
             </communicators>
         </toolspecific>
         <page id="top">
+            <toolspecific tool="de.tudresden.inf.st.pnml.distributedPN" version="0.1">
+                <type>dinerosPage</type>
+            </toolspecific>
             <page id="sourcePage">
+                <toolspecific tool="de.tudresden.inf.st.pnml.distributedPN" version="0.1">
+                    <type>dinerosPage</type>
+                </toolspecific>
                 <place id="req1">
                     <toolspecific tool="de.tudresden.inf.st.pnml.distributedPN" version="0.1">
                         <node>n1</node>
@@ -56,6 +62,7 @@
                     <serviceName>sampleService</serviceName>
                     <serverInput>serverIn</serverInput>
                     <serverOutput>serverOut</serverOutput>
+                    <serverCapacity>16</serverCapacity>
                     <channels>
                         <channel>
                             <cid>c1</cid>
@@ -75,6 +82,10 @@
                 </graphics>
             </transition>
             <page id="targetPage">
+                <toolspecific tool="de.tudresden.inf.st.pnml.distributedPN" version="0.1">
+                    <type>serverPrototype</type>
+                    <serviceName>sampleService</serviceName>
+                </toolspecific>
                 <place id="serverIn">
                     <toolspecific tool="de.tudresden.inf.st.pnml.distributedPN" version="0.1">
                         <node>n2</node>