From cbb59e97e23a0bff44dd1dd872e10df6914af591 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Tue, 22 Dec 2015 16:55:55 +0000 Subject: [PATCH] 1452: Implement a GUI for StatMan Algorithms Importer Task-Url: https://support.d4science.org/issues/1452 Updated UI behavior git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/statistical-algorithms-importer@122078 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../client/codeparser/CodeParser.java | 41 +++++++++-------- .../client/maindata/CodeEditPanel.java | 2 +- .../client/project/ProjectManager.java | 43 +++++++++++++++++- .../resource/StatAlgoImporterResources.java | 6 ++- .../client/resource/add_16.png | Bin 520 -> 509 bytes .../client/resource/add_24.png | Bin 803 -> 758 bytes .../client/resource/save_16.png | Bin 0 -> 501 bytes .../client/resource/save_24.png | Bin 0 -> 720 bytes .../client/ribbon/HomeToolBar.java | 12 ++--- .../input/EnvironmentVariablesPanel.java | 31 ++++++++++++- .../tools/input/InputVariablePanel.java | 14 ++++-- .../tools/input/InputVariableTabPanel.java | 16 +++++++ .../client/tools/input/SelectedRowsPanel.java | 8 ++++ .../client/resource/add_16.png | Bin 520 -> 509 bytes .../client/resource/add_24.png | Bin 803 -> 758 bytes .../client/resource/save_16.png | Bin 0 -> 501 bytes .../client/resource/save_24.png | Bin 0 -> 720 bytes 17 files changed, 138 insertions(+), 35 deletions(-) create mode 100644 src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/resource/save_16.png create mode 100644 src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/resource/save_24.png create mode 100644 src/main/resources/org/gcube/portlets/user/statisticalalgorithmsimporter/client/resource/save_16.png create mode 100644 src/main/resources/org/gcube/portlets/user/statisticalalgorithmsimporter/client/resource/save_24.png diff --git a/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/codeparser/CodeParser.java b/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/codeparser/CodeParser.java index f8279a8..5fbe065 100644 --- a/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/codeparser/CodeParser.java +++ b/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/codeparser/CodeParser.java @@ -1,11 +1,11 @@ package org.gcube.portlets.user.statisticalalgorithmsimporter.client.codeparser; -import java.util.regex.Pattern; - import org.gcube.portlets.user.statisticalalgorithmsimporter.shared.input.DataType; import org.gcube.portlets.user.statisticalalgorithmsimporter.shared.input.IOType; import org.gcube.portlets.user.statisticalalgorithmsimporter.shared.input.SelectedRowsVariables; +import com.google.gwt.regexp.shared.RegExp; + /** * * @author Giancarlo Panichi email: () { @@ -335,7 +368,7 @@ public class ProjectManager { @Override public void onSuccess(Void result) { project.setMainCode(new MainCode(itemDescription)); - fireProjectStatusUpdateEvent(); + fireProjectStatusMainCodeSetEvent(); } }); @@ -408,6 +441,14 @@ public class ProjectManager { eventBus.fireEvent(projectStatusEvent); Log.debug("ProjectStatusEvent fired! " + projectStatusEvent); } + + protected void fireProjectStatusMainCodeSetEvent() { + ProjectStatusEvent projectStatusEvent = new ProjectStatusEvent( + ProjectStatusEventType.MAIN_CODE_SET, project); + eventBus.fireEvent(projectStatusEvent); + Log.debug("ProjectStatusEvent fired! " + projectStatusEvent); + } + protected void fireProjectStatusStartEvent() { ProjectStatusEvent projectStatusEvent = new ProjectStatusEvent( diff --git a/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/resource/StatAlgoImporterResources.java b/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/resource/StatAlgoImporterResources.java index f0ed591..0efd501 100644 --- a/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/resource/StatAlgoImporterResources.java +++ b/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/resource/StatAlgoImporterResources.java @@ -96,5 +96,9 @@ public interface StatAlgoImporterResources extends ClientBundle { @Source("delete_16.png") ImageResource delete16(); - + @Source("save_24.png") + ImageResource save24(); + + @Source("save_16.png") + ImageResource save16(); } diff --git a/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/resource/add_16.png b/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/resource/add_16.png index 9a17af8d7b43854f8418edfbb60a53c158140bac..77490aa5ebe0dccf44f93e82f3755ce58cf3ba42 100644 GIT binary patch delta 437 zcmV;m0ZRUe1pNb$Qhy8<4iprj)XzEq00D|gL_t(I%bk-yZsJfF#D5Pv2tx6lYf?^r!q5+V=Wd7&1N%g zHk(tUr=y9RM|uQCln_M`^ZA@02p9|oG@H$Gc?3L4`dR^QPQ}M~j^p6EE*CHYZYsbv zVEBI+;MxW50S<=))>@4D?G=V0S(X7{t!2Gl7s+b18jVH+;NB>2<#M^i_x-;jM^RJ= zj>bunFdmPYPJgEW6znhzNz?Rf)+9*^gEURq?RG`Y1>S%!!{Lxlr&G)}iXwd9Ck#U- zlL?;ZAqh#e+ifIajCpf`2jIKsd3c^zIB&OGs?{p{{hnU0N4MKO7w(|~ya4*d6a>6f zfM?*>IYyeM7yFWHo?TwK?w!k0?`tQ zBZQU037lh4_yBZiIZko{q)j6E0*EvQ$+E=Kn8q|1`)y;8&9a-_CyoAJqxWXsj5Gj9 zqIz4B9wkjBZL=&>mSvK(t#Xf&T6Ilb+?Di0QYlGknkona1%E-HG)+~ZtT^4X)-f}x z#4GR}Fo4ZwLmbD%am;$Xrh-+RS4mwn!>KI20Ap$>iUKpEYQPo7z>B1o13X-d{}E&0 z!2#~iw(BsnuL>A&e+NA8_j{5gxroe+BuOsJBuQwu+x3Oh@Av6+I?r}E95kEFh~xOL z4zBkw7z~)t=YKfI_+P_I;;geg&$r9v^4n^)YINQ0b}SYP049?Op64~(4TnQU zqtQ>2$h8Q4|WpP`>ZW_kD$7sG=wuoU$w>X?h2InwebJZ4B+YZsYGb&To?d zpAPT=yx*Gh3%mm#j+y1a({&L^jkqCxGPB%~gqfv)4>`P5*6=)!UaxnFn(a5hH?#EC qMPAN1&+}~*MT(+Gd7l6AoPPn#b3p+yEiOg?0000F@6cz&TgeXzsg_&%|aY zU@vR&#TgYM8GrMVc?H;$G;DzxV3CiPMPSAP<9wcsTVUrkD`O0v=M~;NPEaq|F=_)h z3`35OkGq_WG2GtXa(Q`)Bt}O^Szcc5vTHV*tgf!Iu(0rd588)#e}B)>(NUq=)^W2I z&+{#Q)Xvp+1%WuQmGVRveps=0YgJWIm{P*z%FoXjA3A4fJ&u%-_kVY>guWm ziSPT2jem_11VQNnwn4Ys2i(1cYhGEWKG(gn(RUX316;i4ns~!iK^F6mHOAC|Z6Nx< z4UT|qV@%y<)%*qy@`8JH;hZCmW0EB4MUA=gAd6WboNpOfd@l<=IXTJt`Z~@zrl+TS zT@?oSl@Sh|g!3Y0K0Q6DR;%ge=0;%{$~pHY$|-y^>8EL`BuSJciPAKEKk0wgZ_7Wq Ws(nm!tPuoxw#eeVFA&G+o3k(HC zLX{A(k$wSo2wgj{6bY%{p=ztP>KDjV38`Hex>U;2fqVuCYnE}33Y)r_0p0>HfpR)| zzu)Kd^b~6?)>=+ZPU!dh*)^79?b|pOlJJc&3E^{05Ma{Eo12?E-bPWBYXtBbcmnJj zW3Y+mz>AnDoBV%l0#7Zld~e;xJT}R) z54-~ykH=hHUFEU{gF)`IoK6CuQmNp19>6;zNu$w-!^1<`?RM^JC2@IqIr-SuTIS~F zrgCew8V3gl6pKZCfaBw1TCEn=+6UR>oa5r+Vk)=QYJX9!R@vR%#dpq4EchF*r*V^c z84LzE=kSw~I-L%kPG@Ss(P%Ug8)GOIi@7{&Evu`m)M_;(VVraAFbp@(&(G=gdW^^8 zTdR{q7=|1j9TA2h06`G2x3@a8uo z7=t8wy?-9Q?@!+OzR$+S28)Y}6HZ#=`#zrMVT^h21HS+Yg#v{_A%85(cZa-GD&;=U z;Fkq{0%!Ma<&VG_@Y5P&egkiS!GBCJ0Nxm5e%si$AHcWNmit&F+HY~pTL;c7;8Wgq z{TDECj8{qJHq~a=zz5)K)~<57%-Y&oa;&nxzE)1DRLZmEYaHWx(ovboyax6qeUHzG z&7@;?c6OMZodsZPYb%@JEcW~d5ABxpZ%aIk>UO*8cDoA0P|mpr{kHr87gBJcnJ0fI?H zK~y-)t&>4&B0&^}ziz8Qq#GI+nzakJ9v}_`FEDrncNq|bzCZ}BJi(k}*19t01}=g- z-6RM#Hb{%mwtqI7X$`Z<%)cq>tM@(%svZE6IIULFouqq7ulkeM6T6dSi#^5Ws-&r; zqyC=bsit}@sY-g1r0sUAJkOORiIODI@pzPTPHCDJMNenR`P$R-Nw?e8;c!qK$BN@v zS(d5S>#5)GYqQxDB~wY(2X28jr>s^h#^W*0Ih=D$CKJ*$Ww~5391ba@4cvN??t!0Y z+G@23!;n1B0m$oO8_Q^P=R30UnCPTFYoOqE@RFG3)i3!C=5u9t?0(B*qvT zjRy64{h~4qLyR%kf}2kSpj0a1`~C&H-hXi5jj!j;2Oj@H@aO|CfX*b(bAllFR2c-p z$IF}|;KcyXzzp~X5JeH4PKW(|e<3KB%S2IBL^I&oJAY;1SC(b%#bUv3x5M+i3xOmm rl?u&f6Km}Z`0jb$@BcPTUmoXoeb{vw%sD3500000NkvXXu0mjf8vfbd literal 0 HcmV?d00001 diff --git a/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/resource/save_24.png b/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/client/resource/save_24.png new file mode 100644 index 0000000000000000000000000000000000000000..ac64822de8c5998bdfd0e16166a6f0d899ce0e60 GIT binary patch literal 720 zcmV;>0x$iEP)K?`$(8F_}qR7Wcp~^XASw=idA7dv{<2l185wByCG7OM28K9uwQP zq=hVwTu9o_AND3rfNQ(6Lh?2R%hbYoPVmKY2<(!*3&cLapU?N?Kx+FPC zy1l(sqtTEgou8k7xZmI3t5&P&>gsA-FdbZEvz0Y_PropY?OuTw6U@qIs2;O*^=>+5Seoepsv zQz#V1MUFgRGf!Z3b(M{c4Lr}wjj-8l=6MgW=}p^wzVA~k7Nvc9UD2G&9r@5 z;9p^Z<`?oeEpYsW0>>6;=Z0rzXK= sm = new GridSelectionModel(); @@ -229,6 +231,22 @@ public class EnvironmentVariablesPanel extends ContentPanel { if (addStatus) { addStatus = false; } + + List listSelected=storeEnvironmentVariable.getAll(); + List listNewSelected= new ArrayList(); + for(int i=0; ix6lYf?^r!q5+V=Wd7&1N%g zHk(tUr=y9RM|uQCln_M`^ZA@02p9|oG@H$Gc?3L4`dR^QPQ}M~j^p6EE*CHYZYsbv zVEBI+;MxW50S<=))>@4D?G=V0S(X7{t!2Gl7s+b18jVH+;NB>2<#M^i_x-;jM^RJ= zj>bunFdmPYPJgEW6znhzNz?Rf)+9*^gEURq?RG`Y1>S%!!{Lxlr&G)}iXwd9Ck#U- zlL?;ZAqh#e+ifIajCpf`2jIKsd3c^zIB&OGs?{p{{hnU0N4MKO7w(|~ya4*d6a>6f zfM?*>IYyeM7yFWHo?TwK?w!k0?`tQ zBZQU037lh4_yBZiIZko{q)j6E0*EvQ$+E=Kn8q|1`)y;8&9a-_CyoAJqxWXsj5Gj9 zqIz4B9wkjBZL=&>mSvK(t#Xf&T6Ilb+?Di0QYlGknkona1%E-HG)+~ZtT^4X)-f}x z#4GR}Fo4ZwLmbD%am;$Xrh-+RS4mwn!>KI20Ap$>iUKpEYQPo7z>B1o13X-d{}E&0 z!2#~iw(BsnuL>A&e+NA8_j{5gxroe+BuOsJBuQwu+x3Oh@Av6+I?r}E95kEFh~xOL z4zBkw7z~)t=YKfI_+P_I;;geg&$r9v^4n^)YINQ0b}SYP049?Op64~(4TnQU zqtQ>2$h8Q4|WpP`>ZW_kD$7sG=wuoU$w>X?h2InwebJZ4B+YZsYGb&To?d zpAPT=yx*Gh3%mm#j+y1a({&L^jkqCxGPB%~gqfv)4>`P5*6=)!UaxnFn(a5hH?#EC qMPAN1&+}~*MT(+Gd7l6AoPPn#b3p+yEiOg?0000F@6cz&TgeXzsg_&%|aY zU@vR&#TgYM8GrMVc?H;$G;DzxV3CiPMPSAP<9wcsTVUrkD`O0v=M~;NPEaq|F=_)h z3`35OkGq_WG2GtXa(Q`)Bt}O^Szcc5vTHV*tgf!Iu(0rd588)#e}B)>(NUq=)^W2I z&+{#Q)Xvp+1%WuQmGVRveps=0YgJWIm{P*z%FoXjA3A4fJ&u%-_kVY>guWm ziSPT2jem_11VQNnwn4Ys2i(1cYhGEWKG(gn(RUX316;i4ns~!iK^F6mHOAC|Z6Nx< z4UT|qV@%y<)%*qy@`8JH;hZCmW0EB4MUA=gAd6WboNpOfd@l<=IXTJt`Z~@zrl+TS zT@?oSl@Sh|g!3Y0K0Q6DR;%ge=0;%{$~pHY$|-y^>8EL`BuSJciPAKEKk0wgZ_7Wq Ws(nm!tPuoxw#eeVFA&G+o3k(HC zLX{A(k$wSo2wgj{6bY%{p=ztP>KDjV38`Hex>U;2fqVuCYnE}33Y)r_0p0>HfpR)| zzu)Kd^b~6?)>=+ZPU!dh*)^79?b|pOlJJc&3E^{05Ma{Eo12?E-bPWBYXtBbcmnJj zW3Y+mz>AnDoBV%l0#7Zld~e;xJT}R) z54-~ykH=hHUFEU{gF)`IoK6CuQmNp19>6;zNu$w-!^1<`?RM^JC2@IqIr-SuTIS~F zrgCew8V3gl6pKZCfaBw1TCEn=+6UR>oa5r+Vk)=QYJX9!R@vR%#dpq4EchF*r*V^c z84LzE=kSw~I-L%kPG@Ss(P%Ug8)GOIi@7{&Evu`m)M_;(VVraAFbp@(&(G=gdW^^8 zTdR{q7=|1j9TA2h06`G2x3@a8uo z7=t8wy?-9Q?@!+OzR$+S28)Y}6HZ#=`#zrMVT^h21HS+Yg#v{_A%85(cZa-GD&;=U z;Fkq{0%!Ma<&VG_@Y5P&egkiS!GBCJ0Nxm5e%si$AHcWNmit&F+HY~pTL;c7;8Wgq z{TDECj8{qJHq~a=zz5)K)~<57%-Y&oa;&nxzE)1DRLZmEYaHWx(ovboyax6qeUHzG z&7@;?c6OMZodsZPYb%@JEcW~d5ABxpZ%aIk>UO*8cDoA0P|mpr{kHr87gBJcnJ0fI?H zK~y-)t&>4&B0&^}ziz8Qq#GI+nzakJ9v}_`FEDrncNq|bzCZ}BJi(k}*19t01}=g- z-6RM#Hb{%mwtqI7X$`Z<%)cq>tM@(%svZE6IIULFouqq7ulkeM6T6dSi#^5Ws-&r; zqyC=bsit}@sY-g1r0sUAJkOORiIODI@pzPTPHCDJMNenR`P$R-Nw?e8;c!qK$BN@v zS(d5S>#5)GYqQxDB~wY(2X28jr>s^h#^W*0Ih=D$CKJ*$Ww~5391ba@4cvN??t!0Y z+G@23!;n1B0m$oO8_Q^P=R30UnCPTFYoOqE@RFG3)i3!C=5u9t?0(B*qvT zjRy64{h~4qLyR%kf}2kSpj0a1`~C&H-hXi5jj!j;2Oj@H@aO|CfX*b(bAllFR2c-p z$IF}|;KcyXzzp~X5JeH4PKW(|e<3KB%S2IBL^I&oJAY;1SC(b%#bUv3x5M+i3xOmm rl?u&f6Km}Z`0jb$@BcPTUmoXoeb{vw%sD3500000NkvXXu0mjf8vfbd literal 0 HcmV?d00001 diff --git a/src/main/resources/org/gcube/portlets/user/statisticalalgorithmsimporter/client/resource/save_24.png b/src/main/resources/org/gcube/portlets/user/statisticalalgorithmsimporter/client/resource/save_24.png new file mode 100644 index 0000000000000000000000000000000000000000..ac64822de8c5998bdfd0e16166a6f0d899ce0e60 GIT binary patch literal 720 zcmV;>0x$iEP)K?`$(8F_}qR7Wcp~^XASw=idA7dv{<2l185wByCG7OM28K9uwQP zq=hVwTu9o_AND3rfNQ(6Lh?2R%hbYoPVmKY2<(!*3&cLapU?N?Kx+FPC zy1l(sqtTEgou8k7xZmI3t5&P&>gsA-FdbZEvz0Y_PropY?OuTw6U@qIs2;O*^=>+5Seoepsv zQz#V1MUFgRGf!Z3b(M{c4Lr}wjj-8l=6MgW=}p^wzVA~k7Nvc9UD2G&9r@5 z;9p^Z<`?oeEpYsW0>>6;=Z0rzXK=