diff --git a/src/data/java/de/tudresden/inf/st/pnml/base/constants/PnmlConstants.java b/src/data/java/de/tudresden/inf/st/pnml/base/constants/PnmlConstants.java index 03873825ee8113208e4d7acd78896aeb5a6e5631..fc6c5d5f0cf84e0db605d207e5de494d31130740 100644 --- a/src/data/java/de/tudresden/inf/st/pnml/base/constants/PnmlConstants.java +++ b/src/data/java/de/tudresden/inf/st/pnml/base/constants/PnmlConstants.java @@ -59,6 +59,7 @@ public final class PnmlConstants { public static final String TOPIC_SUBSCRIBER = "topicSub"; public static final String SERVICE_CLIENT = "serviceClient"; public static final String SERVICE_SERVER = "serviceServer"; + public static final String TEMPLATE_NET = "DinerosTemplate"; // arc types public static final String ARC_TYPE_KEY = "type"; diff --git a/src/main/jastadd/base/Navigation.jrag b/src/main/jastadd/base/Navigation.jrag index 5f2cd9ea4d7ce36b076419000b23c809254d3644..e79db4bcbbb77aa80abd44e1e9b075536054c8b4 100644 --- a/src/main/jastadd/base/Navigation.jrag +++ b/src/main/jastadd/base/Navigation.jrag @@ -114,13 +114,19 @@ aspect Navigation { syn Transition TransitionNode.asTransition() = null; eq Transition.asTransition() = this; + syn Node PnObject.asNode() = null; + eq Node.asNode() = this; + syn TransitionNode Node.asTransitionNode() = null; eq TransitionNode.asTransitionNode() = this; syn DinerosTransition Transition.asDinerosTransition() = null; eq DinerosTransition.asDinerosTransition() = this; - syn DinerosPlace Place.asDinerosPlace() = null; + syn Page PnObject.asPage() = null; + eq Page.asPage() = this; + + syn DinerosPlace PnObject.asDinerosPlace() = null; eq DinerosPlace.asDinerosPlace() = this; syn TopicTransitionInformation TransitionInformation.asTopicTransitionInformation() = null; diff --git a/src/main/resources/nets/TestNet1.pnml b/src/main/resources/nets/TestNet1.pnml index 30e4c57e2dca82a54342ff54e3d1b32502a3ac10..92bd6d01a847b1f9c212842f1cbb8cf46600c573 100644 --- a/src/main/resources/nets/TestNet1.pnml +++ b/src/main/resources/nets/TestNet1.pnml @@ -23,9 +23,9 @@ </graphics> </place> </page> - <transition id="sampleTopic"> + <transition id="sampleTopicTrans"> <toolspecific tool="de.tudresden.inf.st.pnml.distributedPN" version="0.1"> - <type>topic</type> + <type>topicTransitionType</type> <topicName>sampleTopic</topicName> <publishers> <publisher>