petrinet ocl uniqNames

This commit is contained in:
Guillotin Damien 2021-10-15 08:32:59 +02:00
parent 4acc5b9d5d
commit 15818ed0ce
20 changed files with 61 additions and 19 deletions

View file

@ -1159,3 +1159,43 @@ java.lang.InterruptedException
at org.eclipse.osgi.container.SystemModule.stop(SystemModule.java:207) at org.eclipse.osgi.container.SystemModule.stop(SystemModule.java:207)
at org.eclipse.osgi.internal.framework.EquinoxBundle$SystemBundle$EquinoxSystemModule$1.run(EquinoxBundle.java:220) at org.eclipse.osgi.internal.framework.EquinoxBundle$SystemBundle$EquinoxSystemModule$1.run(EquinoxBundle.java:220)
at java.base/java.lang.Thread.run(Thread.java:829) at java.base/java.lang.Thread.run(Thread.java:829)
!SESSION 2021-10-15 08:21:32.512 -----------------------------------------------
eclipse.buildId=4.17.0.I20200902-1800
java.version=11.0.11
java.vendor=Ubuntu
BootLoader constants: OS=linux, ARCH=x86_64, WS=gtk, NL=fr_FR
Framework arguments: -product org.eclipse.epp.package.modeling.product
Command-line arguments: -os linux -ws gtk -arch x86_64 -product org.eclipse.epp.package.modeling.product
!ENTRY org.eclipse.emf.cdo.explorer 4 0 2021-10-15 08:32:30.508
!MESSAGE InterruptedException
!STACK 0
java.lang.InterruptedException
at java.base/java.util.concurrent.locks.AbstractQueuedSynchronizer.acquireSharedInterruptibly(AbstractQueuedSynchronizer.java:1343)
at java.base/java.util.concurrent.Semaphore.acquire(Semaphore.java:318)
at org.eclipse.net4j.util.lifecycle.Lifecycle.lock(Lifecycle.java:312)
at org.eclipse.net4j.util.lifecycle.Lifecycle.internalDeactivate(Lifecycle.java:118)
at org.eclipse.net4j.util.lifecycle.ShareableLifecycle.internalDeactivate(ShareableLifecycle.java:52)
at org.eclipse.net4j.util.lifecycle.Lifecycle.deactivate(Lifecycle.java:170)
at org.eclipse.net4j.util.lifecycle.LifecycleUtil.deactivate(LifecycleUtil.java:235)
at org.eclipse.net4j.util.lifecycle.LifecycleUtil.deactivate(LifecycleUtil.java:225)
at org.eclipse.emf.cdo.internal.explorer.bundle.OM.disposeManagers(OM.java:83)
at org.eclipse.emf.cdo.internal.explorer.bundle.OM$Activator.doStop(OM.java:136)
at org.eclipse.net4j.util.om.OSGiActivator.stop(OSGiActivator.java:92)
at org.eclipse.osgi.internal.framework.BundleContextImpl$3.run(BundleContextImpl.java:871)
at org.eclipse.osgi.internal.framework.BundleContextImpl$3.run(BundleContextImpl.java:1)
at java.base/java.security.AccessController.doPrivileged(Native Method)
at org.eclipse.osgi.internal.framework.BundleContextImpl.stop(BundleContextImpl.java:863)
at org.eclipse.osgi.internal.framework.EquinoxBundle.stopWorker0(EquinoxBundle.java:1025)
at org.eclipse.osgi.internal.framework.EquinoxBundle$EquinoxModule.stopWorker(EquinoxBundle.java:370)
at org.eclipse.osgi.container.Module.doStop(Module.java:660)
at org.eclipse.osgi.container.Module.stop(Module.java:521)
at org.eclipse.osgi.container.ModuleContainer$ContainerStartLevel.decStartLevel(ModuleContainer.java:1886)
at org.eclipse.osgi.container.ModuleContainer$ContainerStartLevel.doContainerStartLevel(ModuleContainer.java:1761)
at org.eclipse.osgi.container.SystemModule.stopWorker(SystemModule.java:275)
at org.eclipse.osgi.internal.framework.EquinoxBundle$SystemBundle$EquinoxSystemModule.stopWorker(EquinoxBundle.java:202)
at org.eclipse.osgi.container.Module.doStop(Module.java:660)
at org.eclipse.osgi.container.Module.stop(Module.java:521)
at org.eclipse.osgi.container.SystemModule.stop(SystemModule.java:207)
at org.eclipse.osgi.internal.framework.EquinoxBundle$SystemBundle$EquinoxSystemModule$1.run(EquinoxBundle.java:220)
at java.base/java.lang.Thread.run(Thread.java:829)

File diff suppressed because one or more lines are too long

View file

@ -1,2 +1,2 @@
#Cached timestamps #Cached timestamps
#Thu Oct 14 20:36:27 CEST 2021 #Fri Oct 15 08:32:30 CEST 2021

View file

@ -1,5 +1,5 @@
#safe table #safe table
#Thu Oct 14 20:36:27 CEST 2021 #Fri Oct 15 08:32:30 CEST 2021
.orphans=0 .orphans=0
.mainData=0 .mainData=0
.contributors=0 .contributors=0
@ -7,4 +7,4 @@
.extraData=0 .extraData=0
.contributions=0 .contributions=0
.table=0 .table=0
.crcef3af7ef.v1 .crcfcf7e95e.v1

View file

@ -1,5 +1,5 @@
#safe table #safe table
#Thu Oct 14 20:36:27 CEST 2021 #Fri Oct 15 08:32:30 CEST 2021
.orphans=1 .orphans=1
.mainData=1 .mainData=1
.contributors=1 .contributors=1
@ -7,4 +7,4 @@
.extraData=1 .extraData=1
.contributions=1 .contributions=1
.table=1 .table=1
.crc2048cdd4.v1 .crc3385d365.v1

View file

@ -1,4 +1,4 @@
# List of external plug-in models previously loaded. Timestamp: 1634228228002 # List of external plug-in models previously loaded. Timestamp: 1634278900011
file:/mnt/n7fs/ens/tp_cregut/eclipse-gls-2020-09/plugins/com.google.guava_27.1.0.v20190517-1946.jar file:/mnt/n7fs/ens/tp_cregut/eclipse-gls-2020-09/plugins/com.google.guava_27.1.0.v20190517-1946.jar
file:/mnt/n7fs/ens/tp_cregut/eclipse-gls-2020-09/plugins/com.google.inject_3.0.0.v201605172100.jar file:/mnt/n7fs/ens/tp_cregut/eclipse-gls-2020-09/plugins/com.google.inject_3.0.0.v201605172100.jar
file:/mnt/n7fs/ens/tp_cregut/eclipse-gls-2020-09/plugins/com.ibm.icu_67.1.0.v20200706-1749.jar file:/mnt/n7fs/ens/tp_cregut/eclipse-gls-2020-09/plugins/com.ibm.icu_67.1.0.v20200706-1749.jar

View file

@ -1,3 +1,3 @@
#Thu Oct 14 18:17:03 CEST 2021 #Fri Oct 15 08:21:33 CEST 2021
org.eclipse.core.runtime=2 org.eclipse.core.runtime=2
org.eclipse.platform=4.17.0.v20200902-1800 org.eclipse.platform=4.17.0.v20200902-1800

View file

@ -5,6 +5,8 @@ package petrinet
context Network context Network
inv validName('Invalid name: ' + self.name): inv validName('Invalid name: ' + self.name):
self.name.matches('[A-Za-z_][A-Za-z0-9_]*') self.name.matches('[A-Za-z_][A-Za-z0-9_]*')
inv uniqNamesNode: self.nodes
->forAll(n1, n2 | n1 = n2 or n1.name <> n2.name)
context Node context Node
inv nameMin2Char: self.name.matches('..+') inv nameMin2Char: self.name.matches('..+')