From ac006adb3beaa0da184d91d3f3ba7530474252a7 Mon Sep 17 00:00:00 2001 From: Guillotin Damien Date: Fri, 15 Oct 2021 12:29:29 +0200 Subject: [PATCH] pretinet xmi nom des arcs --- eclipse-workspace/.metadata/.log | 40 ++++++++++++++++++ .../.indexes/e4/47/f/history.index | Bin 389 -> 581 bytes .../.safetable/org.eclipse.core.resources | Bin 1161 -> 1170 bytes .../org.eclipse.e4.workbench/workbench.xmi | 19 ++++++--- .../org.eclipse.jdt.core/1612303704.index | Bin 13154 -> 13297 bytes .../org.eclipse.jdt.core/externalFilesCache | Bin 12004 -> 20064 bytes .../externalLibsTimeStamps | Bin 11474 -> 11474 bytes .../org.eclipse.jdt.launching/.install.xml | 2 +- .../QualifiedTypeNameHistory.xml | 4 +- .../.cache/clean-cache.properties | 2 +- .../.extensions/.manager/.fileTable.7 | 4 +- .../.extensions/.manager/.fileTable.8 | 4 +- .../SavedExternalPluginList.txt | 2 +- .../dialog_settings.xml | 5 ++- eclipse-workspace/.metadata/version.ini | 2 +- .../petrinet/provider/ArcItemProvider.java | 14 +++++- 16 files changed, 77 insertions(+), 21 deletions(-) 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 4b994346f6dc93d79e8265a4f79b6a73072abdaa..4e0da2a54d80461b31d1a7f3688a341bbe579378 100644 GIT binary patch delta 205 zcmZo=KFTt|xL!cPw`=nvT?QEm{d?Od&3%_B7G2+5!^ps}AR=lLvUsv1L|kEO?mA@g z;^lQ<^$u4)OhXpe_koBj2(fe`i%9+f;}|La|CNvW7!1Yrq-| TnBE5=i@)J;1B-7o31kES1cy&# delta 12 TcmX@g(#kx+n2}@Smq11U8y5r> 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 3ac9b3526f8f1ab1df31c5744c6f3bdfc0ab3982..df9d58928351eaaa818f9c7948be8371f623452d 100644 GIT binary patch delta 126 zcmeC=oWwanm*2?J%D_ay*)=#s!N|bKaPmY(iHRZh?8fFMCWhuHaG 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 914d2f8a24dc8f664415507f897543a7e73452ef..efe33bbe73a91d9b808031d7fcd7dad71089493d 100644 GIT binary patch delta 1837 zcmZWq%WoTH5dYTpI*y&hZXF!QN%OMPB+kPRBrZsmw$3(P)mdAPp%)~xS$}o5tar`s zCRHR*FZ=;b=h_S6%B3J~h{qYJ5+@`oUOjMtQ$Yf$qBZkZ{|0@89%!5 zxN~PJ@cNtgr@vSbR^jgA#)X*fP|c%~qZf+(e*Xy>(b`(iE0po$KRB1oK`}Q2|1PBA z^2$nV%y1RU^)yST@ZoBHW1>U7D;R(1P-VMNB7}%U2#8@4#RsLUbtpH6h#-dH+G+;Y zRhKprCgGdJB)pr8o)@)tn&Q&`agOFxz#_(Yn;5PN9r20Rc!zktPEenWVw8%xxxe3T3~kq`(K+z^ zEUbS&2;m8tf;(eVqxgdbghcpxrBoiruBwLXQ46aqF}_K{p`NHTX*auqdkmZ-JsuqDiF%k@X1y&JEGg&u4b{qd=kSJ13E^7KW6wipSn0I?_Q~! zhaJO0)Th2Y{nVq9<7me$Ka@AJ@D8TFS4yYjb?P~Wh0@e?&vsZwCV&(?NT#4aCdNZY zw!wghI4A3CdlRbMyk2WuYqiwcw!DX6eG=Ck{gr;A>>a(NU77PReik?|^+|Y-;ddal zo`XL&mtmnan}{gtUQ<#lGU5i2dH7{x{^YYsm=IrM@`ns&_Ty3JAkhlUuJ_-L6^TCv&!nv(!_`8r6(x3*? zQG6drI0Ju*8F;W3h5p9uTKE=UL>?dM`AWdAA-Sm`7w~v2c{{lyt8zoBwBDAgZ^hU4ABzYC=NDXe0Z!ZBmV^1nU&})}nimghUdR+U?5eVsaJr*zLo2 zLK6Ivpuqf-&)Q-xQ9ibMRpR0%&@Gnk<|l8DH~2AoF;JrG$63jw3sGN)CRgi3T}Lxx^nHvaSQze zY?;xKSh0X5qtS?h*dYyT7Ndb*0PJ7|J2aGrdvDTCfSq;j@pry+zVDnrdcPb!m~&Jf zU(SD%<(9!%T!VwfM2c5bwOB?7xe@1Z@owZ%RHbhhE5qUN3bMj{#;0n7zB$0f5)Gkn z58KsaO;@+EVxL(UWMLk-wKzP_=Hc5lArv492UzPJ+r<*WMbOEua0$3vNWf3IK!DV% zYXch_*n;Kg*cSUNm$7TXQx|rv0CeN+RfdXyicD0g5Awj)-N}=NK_UZH4?i< z0cnd3TRGG*!}u&8fB03j9IBe9r;4Gr6pOTNV~f=0No`U&)TLrr*cj_EAWsesLd7Nc zvygPgB^g@&XqciQr)l+WSi?>!JLebos+|twM&byis5GxhUM_r7gu2IV|PjTra?Rtqx47|fJXbzWBvu}(5ZKH!qiex<*=4bULvSJp6ulnTx}-NF0V!{2Ku_or9XR^H!VWAT%S_ z+6T?OU7{G#jmkJgd{tKlgArTv@C0{llE{_`f_K-r7&QGc7k!3L%ITcHYU(=4(HNDR zoeMO~b3B$9HaF97Rk{O>e5n%{+lCNfra`U~n#Dll0Q(i{^LG8@Z5*SV?D z$av7874r+Tl4Rr4I(1FUGS4-YZIg?hKlpMp6?QZ37ZZOC*JE${uq5xdMY%efo*VIO z@7O5G5>l5_*a<{-m2QsZXf>!HX?V(|Um^doifHzmNt~@^_MVSi zQ`wR5-eACWJ{fg4|K&Ymji3mZg-FOd!P`lig!}hCO@4&@K5*j-C22roE9br HZT-nVBm~&-{;uLj)_12AHUb< z?W2$0rz~AvU0d*Ud2(=8VD}_(NWv`p* zIP;EA-T3Shtc|FydR|=4YmFuSskX5tz&GAj1uOjL_rY1W1CH1gZ)KsNWoiv=K};`| zTE}5yC_o(}Z5q@l)cRByWqNyzr_vA)_jp{*wnMDv&2rZq3L1+6iRa)k^(Nf3;@{rR z5pQ@DsQ7GVsn>l0ssZWVgYZ(nb2H#2W97QHs50t43r}|2hg)5b$3;0NiITV+lVXyT ziYZY!AyJj6gf8rsXT>4aA z??m9HIR)n3EWAozqE4at=3u^$Yb{Dcv5$oZgBX-au=K02k7Z$Ij}0F5gqnw$1_kTG zv}ZA2)E4TCi(1uS0XAF$Bqx&LLV7v9BIe5&d1E~ptwxrU6j_Q(@GE@)X4wg|JJX%d z!oU8V2qAh?WZ^KQHgB_jiYh@mqIyb;VyU6U#A1G-lO{af)k(LB_nk=r?r~?R(+1}4 zst$M!9X@B>KrMBFVJ1DCIUt-0^aIiuTGs~0Z2_XFWTaiZt&5)KSGER4NW@Adl5l4# zrBbDAfN@+V^|r%p&75@%p>5i|Iam!c&-8xgw=Z}FPCIJGj2qEc^>4Tfrx#k5|i3kq2?`*vsIsh}hBSwG6J^j!ypS^_n$*F7O6Et@b&PBN$_QV zkgRv!FCq4b_2Fb-H+(Thu+Srj28_Zrhl+~PFgt019|MC}`W%XnR?8!FkR42ED)kQN=++gv8m11 zarR*EKMWqDNcen7w;lK$Ef7tj$b$<511$sY61+1}|%_8ABEQ#FDq;>=d7REkEyH+Bg`Pe?Yf)n{vpyMO71`+G2g?cz^@JoPeq zJppR?IvMUc_>i|6inzrK&F!$e8>WH^JRNgdFw}61!V)Uj5KHA-LW;C2@w^(9e0}8;(Wx^ofywiBr=}2>*R{1bf#J{ zI+5!I^MbR^Iq??8)uqQzTYkkJ0j%f>S|4WMr-=|2tF0p_;7nA28y-Wzf3}?ViC}dZ zd!i_bi|C>W`FunLw^?qa<5^Oa&6tVD;?bDgx@=Dn{#T+QlK(A(IK<4!bU9~aV`w0V zI_e0%N2(*JjQuc@_+w;!xDCyfVF7y`0rtI{i=dARV-l3>DKpoTIPMZsj9mJ9G}N@E R8q&23GLx+CvyZiU|`+UCN${gDtwpuKf(&Rmi zof3G%X5h6YFmH`uKdGYdd+I<95XZ&O(P>Cy8KKr<86j3oA zjbgeZi~ErldT5B*u^H7!%*fiX)EXkNE-NvWp0_Qam~zXX@oS_-`_OjyccBqOOyIk( z7TXtpldid&97+B-gb%45b7UG)c3=L=;7gk&UEGGX4(d!wt6rs?_LV^faq>BJzNG$uaq>iA$I0&{IVL~R(nPYgSW9E_Ce13wVz8z@QGv~=+PRDX(cMPI delta 207 zcmcZocvyrW3rgC8c=njj{D?gO6rVpAbp!_m9H~SE|7Mg zq^8ao4HU7M+^ebsw8xRdXL5;}24mLbi!APwW7Tygf8@2Cd_jO?@?ABH$&;iUC+kXZ tY`&!afRV8PtfWtrfAT9WWsn8zc3^9>wKOJg(kx;uhRO?UPSwt31OP~TL|6a- 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));