diff --git a/src/main/jastadd/flatter/rewrites/ServiceRewrites.jadd b/src/main/jastadd/flatter/rewrites/ServiceRewrites.jadd index 1409454705c307531bb2e4c003a4f3b1c8a0ba42..739554db51bb17eb1e2dc5fb576037284068ff68 100644 --- a/src/main/jastadd/flatter/rewrites/ServiceRewrites.jadd +++ b/src/main/jastadd/flatter/rewrites/ServiceRewrites.jadd @@ -1,5 +1,15 @@ aspect ServiceRewrites { + syn boolean PetriNet.hasServerPrototypePages() { + + for(Page p : this.allPages()){ + if(p.getType().equals(PnmlConstants.PAGE_TYPE_SERVER)){ + return false; + } + } + return true; + } + rewrite Page { when ( getType() != null && getType().equals(PnmlConstants.PAGE_TYPE_SERVER) && !getId().endsWith(PnmlConstants.PAGE_SERVER_INSTANCE_SUFFIX) ) to Page { diff --git a/src/main/jastadd/flatter/rewrites/TopicRewrites.jadd b/src/main/jastadd/flatter/rewrites/TopicRewrites.jadd index 26d9266e16f34ebfe7e97344d796843adcb6bf64..046f15e6cae20f60964571f63073fdd2c018d672 100644 --- a/src/main/jastadd/flatter/rewrites/TopicRewrites.jadd +++ b/src/main/jastadd/flatter/rewrites/TopicRewrites.jadd @@ -4,7 +4,7 @@ import de.tudresden.inf.st.pnml.flatter.transform.*; aspect TopicRewrites { rewrite DinerosTransition { - when ( getStaticTransitionInformation().isTopicTransitionInformation() ) + when ( !petriNet().hasServerPrototypePages() && getStaticTransitionInformation().isTopicTransitionInformation() ) to Page { Page res = new Page();