pretinet xmi nom des arcs

This commit is contained in:
Guillotin Damien 2021-10-15 12:29:29 +02:00
parent 591dfb9d3b
commit ac006adb3b
16 changed files with 77 additions and 21 deletions

View file

@ -4886,3 +4886,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 12:22:22.416 -----------------------------------------------
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 12:29:05.095
!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,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<dirs> <dirs>
<entry loc="/usr/lib/jvm/java-11-openjdk-amd64" stamp="1626701536013"/> <entry loc="/usr/lib/jvm/java-11-openjdk-amd64" stamp="1626789585273"/>
</dirs> </dirs>

View file

@ -2,8 +2,8 @@
<qualifiedTypeNameHistroy> <qualifiedTypeNameHistroy>
<fullyQualifiedTypeName name="petrinet.PetrinetPackage"/> <fullyQualifiedTypeName name="petrinet.PetrinetPackage"/>
<fullyQualifiedTypeName name="petrinet.Network"/> <fullyQualifiedTypeName name="petrinet.Network"/>
<fullyQualifiedTypeName name="petrinet.Place"/>
<fullyQualifiedTypeName name="petrinet.Transition"/>
<fullyQualifiedTypeName name="petrinet.Arc"/> <fullyQualifiedTypeName name="petrinet.Arc"/>
<fullyQualifiedTypeName name="simplepdl.WorkSequenceType"/> <fullyQualifiedTypeName name="simplepdl.WorkSequenceType"/>
<fullyQualifiedTypeName name="petrinet.Transition"/>
<fullyQualifiedTypeName name="petrinet.Place"/>
</qualifiedTypeNameHistroy> </qualifiedTypeNameHistroy>

View file

@ -1,2 +1,2 @@
#Cached timestamps #Cached timestamps
#Fri Oct 15 12:07:47 CEST 2021 #Fri Oct 15 12:29:04 CEST 2021

View file

@ -1,5 +1,5 @@
#safe table #safe table
#Fri Oct 15 12:07:47 CEST 2021 #Fri Oct 15 12:29:04 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
.crc2352a5f3.v1 .crcbf378ead.v1

View file

@ -1,5 +1,5 @@
#safe table #safe table
#Fri Oct 15 12:07:47 CEST 2021 #Fri Oct 15 12:29:05 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
.crcec209fc8.v1 .crc7cfb747b.v1

View file

@ -1,4 +1,4 @@
# List of external plug-in models previously loaded. Timestamp: 1634289352883 # List of external plug-in models previously loaded. Timestamp: 1634293348394
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

@ -6,8 +6,9 @@
<item key="wholeword" value="false"/> <item key="wholeword" value="false"/>
<item key="incremental" value="false"/> <item key="incremental" value="false"/>
<item key="isRegEx" value="false"/> <item key="isRegEx" value="false"/>
<item key="selection" value="petriNet.ecore"/> <item key="selection" value="getText"/>
<list key="findhistory"> <list key="findhistory">
<item value="getText"/>
<item value="petriNET.ecore"/> <item value="petriNET.ecore"/>
<item value="args"/> <item value="args"/>
<item value="SimplePDL"/> <item value="SimplePDL"/>
@ -20,7 +21,7 @@
</section> </section>
<section name="org.eclipse.ui.texteditor.FindReplaceDialog_dialogBounds"> <section name="org.eclipse.ui.texteditor.FindReplaceDialog_dialogBounds">
<item key="DIALOG_X_ORIGIN" value="817"/> <item key="DIALOG_X_ORIGIN" value="817"/>
<item key="DIALOG_Y_ORIGIN" value="561"/> <item key="DIALOG_Y_ORIGIN" value="513"/>
<item key="DIALOG_WIDTH" value="465"/> <item key="DIALOG_WIDTH" value="465"/>
<item key="DIALOG_HEIGHT" value="440"/> <item key="DIALOG_HEIGHT" value="440"/>
<item key="DIALOG_FONT_NAME" value="1|Ubuntu|11.0|0|GTK|1|"/> <item key="DIALOG_FONT_NAME" value="1|Ubuntu|11.0|0|GTK|1|"/>

View file

@ -1,3 +1,3 @@
#Fri Oct 15 11:15:47 CEST 2021 #Fri Oct 15 12:22:23 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

@ -24,6 +24,8 @@ import org.eclipse.emf.edit.provider.ViewerNotification;
import petrinet.Arc; import petrinet.Arc;
import petrinet.PetrinetPackage; import petrinet.PetrinetPackage;
import petrinet.Place;
import petrinet.Transition;
/** /**
* This is the item provider adapter for a {@link petrinet.Arc} object. * This is the item provider adapter for a {@link petrinet.Arc} object.
@ -153,7 +155,13 @@ public class ArcItemProvider
@Override @Override
public String getText(Object object) { public String getText(Object object) {
Arc arc = (Arc)object; Arc arc = (Arc)object;
return getString("_UI_Arc_type") + " " + arc.getWeight(); Transition transition = arc.getTransition();
Place place = arc.getPlace();
int weight = arc.getWeight();
boolean outgoing = arc.isOutgoing();
return (outgoing) ?
transition.getName() + " --" + weight + "--> " + place.getName():
place.getName() + " --" + weight + "--> " + transition.getName();
} }
@ -162,13 +170,15 @@ public class ArcItemProvider
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}. * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc --> * <!-- begin-user-doc -->
* <!-- end-user-doc --> * <!-- end-user-doc -->
* @generated * @generated NOT
*/ */
@Override @Override
public void notifyChanged(Notification notification) { public void notifyChanged(Notification notification) {
updateChildren(notification); updateChildren(notification);
switch (notification.getFeatureID(Arc.class)) { switch (notification.getFeatureID(Arc.class)) {
case PetrinetPackage.ARC__PLACE:
case PetrinetPackage.ARC__TRANSITION:
case PetrinetPackage.ARC__WEIGHT: case PetrinetPackage.ARC__WEIGHT:
case PetrinetPackage.ARC__OUTGOING: case PetrinetPackage.ARC__OUTGOING:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));