diff --git a/eclipse-workspace/.metadata/.log b/eclipse-workspace/.metadata/.log index 0c507b9..5c90f71 100644 --- a/eclipse-workspace/.metadata/.log +++ b/eclipse-workspace/.metadata/.log @@ -4886,3 +4886,43 @@ java.lang.InterruptedException 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) +!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) diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet.edit/.indexes/e4/47/f/history.index b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet.edit/.indexes/e4/47/f/history.index index 4b99434..4e0da2a 100644 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet.edit/.indexes/e4/47/f/history.index and b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/fr.n7.petrinet.edit/.indexes/e4/47/f/history.index differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources index 3ac9b35..df9d589 100644 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources and b/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi b/eclipse-workspace/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi index 47ac1de..ca06b8a 100644 --- a/eclipse-workspace/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi +++ b/eclipse-workspace/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi @@ -1,6 +1,6 @@ - + activeSchemeId:org.eclipse.ui.defaultAcceleratorConfiguration @@ -206,7 +206,7 @@ categoryTag:Plug-in Development - + @@ -450,11 +450,10 @@ categoryTag:Help - + org.eclipse.e4.primaryDataStack EditorStack active - noFocus Editor @@ -478,6 +477,12 @@ Editor removeOnHide org.eclipse.emf.ecore.presentation.EcoreEditorID + + + + Editor + removeOnHide + org.eclipse.jdt.ui.CompilationUnitEditor active activeOnClose @@ -694,7 +699,7 @@ Draggable - + toolbarSeparator @@ -716,7 +721,7 @@ Draggable - + Draggable @@ -725,7 +730,7 @@ Draggable - + toolbarSeparator diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.jdt.core/1612303704.index b/eclipse-workspace/.metadata/.plugins/org.eclipse.jdt.core/1612303704.index index 914d2f8..efe33bb 100644 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.jdt.core/1612303704.index and b/eclipse-workspace/.metadata/.plugins/org.eclipse.jdt.core/1612303704.index differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.jdt.core/externalFilesCache b/eclipse-workspace/.metadata/.plugins/org.eclipse.jdt.core/externalFilesCache index 9884a65..34f2d10 100644 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.jdt.core/externalFilesCache and b/eclipse-workspace/.metadata/.plugins/org.eclipse.jdt.core/externalFilesCache differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps b/eclipse-workspace/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps index c402795..2e68e8e 100644 Binary files a/eclipse-workspace/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps and b/eclipse-workspace/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps differ diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.jdt.launching/.install.xml b/eclipse-workspace/.metadata/.plugins/org.eclipse.jdt.launching/.install.xml index 6bde150..252dde4 100644 --- a/eclipse-workspace/.metadata/.plugins/org.eclipse.jdt.launching/.install.xml +++ b/eclipse-workspace/.metadata/.plugins/org.eclipse.jdt.launching/.install.xml @@ -1,4 +1,4 @@ - + diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml b/eclipse-workspace/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml index 8dda5a3..92b5471 100644 --- a/eclipse-workspace/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml +++ b/eclipse-workspace/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml @@ -2,8 +2,8 @@ - - + + diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties b/eclipse-workspace/.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties index db94443..a14ef43 100644 --- a/eclipse-workspace/.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties +++ b/eclipse-workspace/.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties @@ -1,2 +1,2 @@ #Cached timestamps -#Fri Oct 15 12:07:47 CEST 2021 +#Fri Oct 15 12:29:04 CEST 2021 diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.pde.core/.extensions/.manager/.fileTable.7 b/eclipse-workspace/.metadata/.plugins/org.eclipse.pde.core/.extensions/.manager/.fileTable.7 index d203034..8c31332 100644 --- a/eclipse-workspace/.metadata/.plugins/org.eclipse.pde.core/.extensions/.manager/.fileTable.7 +++ b/eclipse-workspace/.metadata/.plugins/org.eclipse.pde.core/.extensions/.manager/.fileTable.7 @@ -1,5 +1,5 @@ #safe table -#Fri Oct 15 12:07:47 CEST 2021 +#Fri Oct 15 12:29:04 CEST 2021 .orphans=0 .mainData=0 .contributors=0 @@ -7,4 +7,4 @@ .extraData=0 .contributions=0 .table=0 -.crc2352a5f3.v1 +.crcbf378ead.v1 diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.pde.core/.extensions/.manager/.fileTable.8 b/eclipse-workspace/.metadata/.plugins/org.eclipse.pde.core/.extensions/.manager/.fileTable.8 index ec7e366..d9eb054 100644 --- a/eclipse-workspace/.metadata/.plugins/org.eclipse.pde.core/.extensions/.manager/.fileTable.8 +++ b/eclipse-workspace/.metadata/.plugins/org.eclipse.pde.core/.extensions/.manager/.fileTable.8 @@ -1,5 +1,5 @@ #safe table -#Fri Oct 15 12:07:47 CEST 2021 +#Fri Oct 15 12:29:05 CEST 2021 .orphans=1 .mainData=1 .contributors=1 @@ -7,4 +7,4 @@ .extraData=1 .contributions=1 .table=1 -.crcec209fc8.v1 +.crc7cfb747b.v1 diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.pde.core/SavedExternalPluginList.txt b/eclipse-workspace/.metadata/.plugins/org.eclipse.pde.core/SavedExternalPluginList.txt index 882b396..4d65540 100644 --- a/eclipse-workspace/.metadata/.plugins/org.eclipse.pde.core/SavedExternalPluginList.txt +++ b/eclipse-workspace/.metadata/.plugins/org.eclipse.pde.core/SavedExternalPluginList.txt @@ -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.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 diff --git a/eclipse-workspace/.metadata/.plugins/org.eclipse.ui.workbench.texteditor/dialog_settings.xml b/eclipse-workspace/.metadata/.plugins/org.eclipse.ui.workbench.texteditor/dialog_settings.xml index 398f2ec..5475f87 100644 --- a/eclipse-workspace/.metadata/.plugins/org.eclipse.ui.workbench.texteditor/dialog_settings.xml +++ b/eclipse-workspace/.metadata/.plugins/org.eclipse.ui.workbench.texteditor/dialog_settings.xml @@ -6,8 +6,9 @@ - + + @@ -20,7 +21,7 @@
- + diff --git a/eclipse-workspace/.metadata/version.ini b/eclipse-workspace/.metadata/version.ini index 1e7ac2e..50a3298 100644 --- a/eclipse-workspace/.metadata/version.ini +++ b/eclipse-workspace/.metadata/version.ini @@ -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.platform=4.17.0.v20200902-1800 diff --git a/eclipse-workspace/fr.n7.petrinet.edit/src/petrinet/provider/ArcItemProvider.java b/eclipse-workspace/fr.n7.petrinet.edit/src/petrinet/provider/ArcItemProvider.java index 4e5a23d..4aa20a5 100644 --- a/eclipse-workspace/fr.n7.petrinet.edit/src/petrinet/provider/ArcItemProvider.java +++ b/eclipse-workspace/fr.n7.petrinet.edit/src/petrinet/provider/ArcItemProvider.java @@ -24,6 +24,8 @@ import org.eclipse.emf.edit.provider.ViewerNotification; import petrinet.Arc; import petrinet.PetrinetPackage; +import petrinet.Place; +import petrinet.Transition; /** * This is the item provider adapter for a {@link petrinet.Arc} object. @@ -153,7 +155,13 @@ public class ArcItemProvider @Override public String getText(Object 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}. * * - * @generated + * @generated NOT */ @Override public void notifyChanged(Notification notification) { updateChildren(notification); switch (notification.getFeatureID(Arc.class)) { + case PetrinetPackage.ARC__PLACE: + case PetrinetPackage.ARC__TRANSITION: case PetrinetPackage.ARC__WEIGHT: case PetrinetPackage.ARC__OUTGOING: fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));