From c7231dcba83fea5a08b94a559cc3ef8d96b6e1f6 Mon Sep 17 00:00:00 2001 From: UrsZeidler Date: Sun, 26 Apr 2015 14:29:31 +0200 Subject: [PATCH] some minor update --- .../shr5Resource/shr5-1.shr5 | 28 ++++++++++++++---- .../pages/BeschreibbarContainterPage.java | 5 +++- .../ecp/editor/pages/TransactionsPage.java | 1 + .../icons/full/obj16/GruntGroup.gif | Bin 129 -> 899 bytes .../icons/full/obj16/Sensor.gif | Bin 129 -> 892 bytes .../icons/full/obj16/SourceBook.gif | Bin 129 -> 895 bytes .../icons/full/obj16/Toxin.gif | Bin 129 -> 887 bytes de.urszeidler.shr5.model.feature/feature.xml | 2 +- .../shadowrun.product | 2 +- de.urszeidler.shr5.product/plugin.xml | 2 +- 10 files changed, 31 insertions(+), 9 deletions(-) diff --git a/de.urszeidler.shr5.ecp/shr5Resource/shr5-1.shr5 b/de.urszeidler.shr5.ecp/shr5Resource/shr5-1.shr5 index 0e00b9dbf..cbdbe5429 100644 --- a/de.urszeidler.shr5.ecp/shr5Resource/shr5-1.shr5 +++ b/de.urszeidler.shr5.ecp/shr5Resource/shr5-1.shr5 @@ -2211,7 +2211,7 @@ - + @@ -2408,7 +2408,7 @@ - + @@ -2578,7 +2578,7 @@ - + @@ -8664,7 +8664,7 @@ - + @@ -8679,9 +8679,21 @@ - + + + + + + + + + + + + + @@ -8798,6 +8810,12 @@ + + + + + + diff --git a/de.urszeidler.shr5.ecp/src/de/urszeidler/shr5/ecp/editor/pages/BeschreibbarContainterPage.java b/de.urszeidler.shr5.ecp/src/de/urszeidler/shr5/ecp/editor/pages/BeschreibbarContainterPage.java index f2e8816ef..f179d57e1 100644 --- a/de.urszeidler.shr5.ecp/src/de/urszeidler/shr5/ecp/editor/pages/BeschreibbarContainterPage.java +++ b/de.urszeidler.shr5.ecp/src/de/urszeidler/shr5/ecp/editor/pages/BeschreibbarContainterPage.java @@ -14,6 +14,7 @@ import de.urszeidler.eclipse.shr5.Beschreibbar; import de.urszeidler.eclipse.shr5.util.AdapterFactoryUtil; +import de.urszeidler.eclipse.shr5Management.PlayerManagement; import de.urszeidler.eclipse.shr5Management.Shr5managementFactory; import de.urszeidler.emf.commons.ui.util.EmfFormBuilder.ReferenceManager; import de.urszeidler.shr5.ecp.editor.actions.ActionM2TDialog; @@ -95,7 +96,9 @@ protected void createFormContent(IManagedForm managedForm) { form.getToolBarManager().add(new ActionM2TDialog(form.getShell(), object)); form.getToolBarManager().add(new ExportObjectAction(form.getShell(), object)); form.getToolBarManager().add(new ImportObjectAction(form.getShell(), object)); - form.getToolBarManager().add(new ImportChummerAction(form.getShell(), object)); + if (object instanceof PlayerManagement) { + form.getToolBarManager().add(new ImportChummerAction(form.getShell(), object)); + } addValidationResult(form.getToolBarManager(), object); form.getToolBarManager().update(true); diff --git a/de.urszeidler.shr5.ecp/src/de/urszeidler/shr5/ecp/editor/pages/TransactionsPage.java b/de.urszeidler.shr5.ecp/src/de/urszeidler/shr5/ecp/editor/pages/TransactionsPage.java index c65df12fe..8f8794ab8 100644 --- a/de.urszeidler.shr5.ecp/src/de/urszeidler/shr5/ecp/editor/pages/TransactionsPage.java +++ b/de.urszeidler.shr5.ecp/src/de/urszeidler/shr5/ecp/editor/pages/TransactionsPage.java @@ -705,6 +705,7 @@ public void doubleClick(DoubleClickEvent event) { tableViewer_1.addFilter(sourceFilter); } + @SuppressWarnings("unchecked") private void addSelectedObjectsToList() { StructuredSelection selection = (StructuredSelection)tableViewer_1.getSelection(); for (EObject eo : ShadowrunTools.toIterable(selection.iterator())) { diff --git a/de.urszeidler.shr5.management.model.edit/icons/full/obj16/GruntGroup.gif b/de.urszeidler.shr5.management.model.edit/icons/full/obj16/GruntGroup.gif index 83afb9b3c9a3c3e261dd043d2232d39254ac8e4a..bbd0458643f0e7ae2a7e59d262e29bc8b789cd02 100644 GIT binary patch literal 899 zcmV-}1AP2PNk%w1VGsZi0Ou+I000010RaL60s{jB1Ox;H1qB8M1_uWR2nYxX2?+`c z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7 zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}? zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z} zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5( zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p zxVX5vxw*Q!y1To(yu7@dCU$jHda z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1lt)=I7_<=;-L_>FMg~>g((4 z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg= z{r&#_{{R2~A^s6Va%Ew3Wn>_CX>@2HM@dak03rDV0SW;B04x9i000mG5C8xOO91}~ z97wRBL4g1O95k5lpTdO$8$N`Ha3aNr77r%en6aY6jSfE+(vM1&<#R+I?xBSw%M ZT~37A(B;UPFD=#->G5PlodN>_06UUxs$u{D literal 129 zcmZ?wbhEHb6krfw*vtS14M4Jip`qcxfddT<4GjN*-2XuK|Nmgt|NqyTt{n?Lw#ITz zn@*eJPZmZ722KVYkWP>p3@myECp}m1wRrvIn+pHKLf7r4thZ7UycR6{YNPjYn%Y&f W@}8BN{JP5-JKc^<6cT1+um%9V)-T`y diff --git a/de.urszeidler.shr5.model.edit/icons/full/obj16/Sensor.gif b/de.urszeidler.shr5.model.edit/icons/full/obj16/Sensor.gif index 7bac4fd3808df6247660dfb8d76e15609f279841..22196538a2b8fb9a503c9f07df68a0757840968b 100644 GIT binary patch literal 892 zcmV-?1B3iWNk%w1VGsZi0Ou+I000010RaL60s{jB1Ox;H1qB8M1_uWR2nYxX2?+`c z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7 zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}? zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z} zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5( zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p zxVX5vxw*Q!y1To(yu7@dCU$jHda z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1lt)=I7_<=;-L_>FMg~>g((4 z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg= z{r&#_{{R2~A^s6Va%Ew3Wn>_CX>@2HM@dak03rDV0SW;B04x9i000mG5C8xOL;(K@ z97wR>KmZ5<7&M4bV8ey~5M3JF@27_pp3@myECp}m1wRrvIn+pHKLf7r4thZ7UycR6{YNPjYn%Y&f W@}8BN{JP5-JKc^<6cT1+um%9tY%ntb diff --git a/de.urszeidler.shr5.model.edit/icons/full/obj16/SourceBook.gif b/de.urszeidler.shr5.model.edit/icons/full/obj16/SourceBook.gif index badaab0664ae45de5d990f64638197daeabf31bf..315f3970e8ac508c4c9756608417651375b1856b 100644 GIT binary patch literal 895 zcmV-_1AzQTNk%w1VGsZi0Ou+I000010RaL60s{jB1Ox;H1qB8M1_uWR2nYxX2?+`c z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7 zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}? zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z} zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5( zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p zxVX5vxw*Q!y1To(yu7@dCU$jHda z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1lt)=I7_<=;-L_>FMg~>g((4 z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg= z{r&#_{{R2~A^s6Va%Ew3Wn>_CX>@2HM@dak03rDV0SW;B04x9i000mG5C8xOM*#l` z97wR>KmZ66Dl7;+|z`)6%1JVgHgMmfQ;H2m3y%w*(d{g0nSm?Ull=W6hg4cqDUv2b0PE)&T WR^GExlV5i^W2f7Zi9*7R4Auasq%#Zv diff --git a/de.urszeidler.shr5.model.edit/icons/full/obj16/Toxin.gif b/de.urszeidler.shr5.model.edit/icons/full/obj16/Toxin.gif index b3643da048a40135b62eed5100cac5afe1ecef3c..fe8e8efc9718cc46bbb104fb67f07a903fee0b02 100644 GIT binary patch literal 887 zcmV--1Bm=bNk%w1VGsZi0Ou+I000010RaL60s{jB1Ox;H1qB8M1_uWR2nYxX2?+`c z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7 zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}? zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z} zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5( zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p zxVX5vxw*Q!y1To(yu7@dCU$jHda z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1lt)=I7_<=;-L_>FMg~>g((4 z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg= z{r&#_{{R2~A^s6Va%Ew3Wn>_CX>@2HM@dak03rDV0SW;B04x9i000mG5C8xOKLGy; z97wRB!G8b}0ytPu;X;NG4?Z+Fao|IT5HDhsC~%=dh7&)6Bv_H6#gYvXhD3?5rOJdH NBa&pvQs%#a06Sy}q=o{h>#dXouLTRg+UR|prgqh= Vyl15*zwUCzPPZcyg@hRytO0?AFBSj* diff --git a/de.urszeidler.shr5.model.feature/feature.xml b/de.urszeidler.shr5.model.feature/feature.xml index e11121c08..41351b6f3 100644 --- a/de.urszeidler.shr5.model.feature/feature.xml +++ b/de.urszeidler.shr5.model.feature/feature.xml @@ -5,7 +5,7 @@ version="0.2.8.qualifier"> - [Enter Feature Description here.] + The model plugins as an api provider. diff --git a/de.urszeidler.shr5.product.feature/shadowrun.product b/de.urszeidler.shr5.product.feature/shadowrun.product index 72cf684dc..96d1e7166 100755 --- a/de.urszeidler.shr5.product.feature/shadowrun.product +++ b/de.urszeidler.shr5.product.feature/shadowrun.product @@ -10,7 +10,7 @@ under Eclipse Public License, version 1.0. (c) Urs Zeidler -sample images are from http://openclipart.org/ +sample images are from http://openclipart.org/ and http://game-icons.net/ Shadowrun is © 2013 The Topps Company, Inc, Catalyst Game Labs http://www.shadowruntabletop.com/ diff --git a/de.urszeidler.shr5.product/plugin.xml b/de.urszeidler.shr5.product/plugin.xml index 73f8dfc0b..5787e1a55 100644 --- a/de.urszeidler.shr5.product/plugin.xml +++ b/de.urszeidler.shr5.product/plugin.xml @@ -13,7 +13,7 @@ + value="The shadowrun 5 IDE client. under Eclipse Public License, version 1.0. (c) Urs Zeidler sample images are from http://openclipart.org/ and http://game-icons.net/ Shadowrun is © 2013 The Topps Company, Inc, Catalyst Game Labs http://www.shadowruntabletop.com/ This software also contains software from pdfBox (https://pdfbox.apache.org) and apache fop (http://xmlgraphics.apache.org/fop/).">