From 50779d65664fa970b0e2384774a6d6bed3a37c80 Mon Sep 17 00:00:00 2001
From: SebastianEbert <sebastian.ebert@tu-dresden.de>
Date: Thu, 22 Jun 2023 17:43:10 +0200
Subject: [PATCH] new constants for pnml parsing, updated nav, updated testnet1
---
.../inf/st/pnml/base/constants/PnmlConstants.java | 1 +
src/main/jastadd/base/Navigation.jrag | 8 +++++++-
src/main/resources/nets/TestNet1.pnml | 4 ++--
3 files changed, 10 insertions(+), 3 deletions(-)
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 0387382..fc6c5d5 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 5f2cd9e..e79db4b 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 30e4c57..92bd6d0 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>
--
GitLab