From 07d76274388f641f4b5fafae222ea5a48efbca06 Mon Sep 17 00:00:00 2001 From: Francesco Mangiacrapa Date: Thu, 11 Jul 2013 13:37:35 +0000 Subject: [PATCH] public link, icon changed git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace-tree-widget@78976 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../client/resources/icons/public-link.png | Bin 913 -> 1783 bytes .../client/view/tree/ContextMenuTree.java | 4 ++-- .../client/view/windows/DialogPublicLink.java | 2 +- .../server/GWTWorkspaceServiceImpl.java | 12 ++++++------ 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/resources/icons/public-link.png b/src/main/java/org/gcube/portlets/user/workspace/client/resources/icons/public-link.png index 400c68dbf5ab1d474db6c9cce770a596775eb4ca..85f47cdedc466d12f299f4770d1d87b583eaa1dd 100644 GIT binary patch literal 1783 zcmaJ?c~BE)99;+sg*alVBcQEoXmKo(Y=R*s62lRYC_x0KrfLg07D!{VAz4hckO);q zi-OvYctPsa+oGn}(W#ISV?`^6iV_7h1r@cZ7y<_6*ltv`f0XXb?tZ^--h02}dpo;1 zC3(>#-(X(=04DJgxvBWu-+lW`1OShm{$>{*1flT)G!4l@H9{2(#7Gbk4D#f{Y&aDb zO4jCHhNA$0K$4~lPys)QB}U|Ap&LWi%9S`90HQcrrBEz`QBVYDOBHNV?>RFGluFp7 z<#ay8SH{6P(!_NtIBi{Wx_F&T%#@Hg3&AKY3m1^Xs1Vf3S1Z&kEt~XOmxZt0+Y}P` z8iLB$q&Gzg_$go844Fekq{V3B~v5jF&K=wAPu5I6o^Kl(!!|>Rs@X&LEzhq zglAJpvRJ9ygtxiyh)v2tQ6-B)(P%VeO#~THWmBk3Cey7!qlM#$aP?XRD%6H6)FERE zTv#nuNtLJ+QGjkmp$N%C*(AKuH!aAO?_?F~w`0NwM$rnD6e<~Vw=@Ri^Zy?zm%l@+ z(Ny?-z5gk!PG75pDXFj;$y15(gUbqWr&6-wRIm_5ROtw^dTfd*IS7iVa}XsMmqrKq zLa|igj$h;Xd=^ikMuiG7%;U02xB^)!m9VH>F2soAQsZfKh>AaB>C6}=#GJ>BkD$lX z;$z3STtu8FhZX1;SMr`q8<*?0f?SDb=E5rJ8d#E`Lge7i;TyON!PZChB1so@PP__ zUUn5kczAA_5_-NSzRO|>SlZZ4@bV`lN?Ncuj33$&`K+d2>?z<~EpP3pn4@xl2LTT+ z8-b8idHC21yX36X{P$q_=0gDrzf*y`<^=!Iq{zwwy69=Or9XU<*r_ z1D%7p()EDn-cC)GqanCzu{d&KWbtS__A&X+$OXO2VQb--^!g@G+O60n%Od)c+wa)Q z?K9CG_;Q+ov}C>LVkQToRZj2$iTa-ip?29;YV<3NQk;RslvXjF5f|24 z{AM42Tn75;YKM%IALSO85euN3WkN?EJ{uI#7SO zD60R-Xiw=(yXk3U>iuf(z6AnP?eN?@L+8!Il%)&1q3UWVf1Qim?HqCy_3hX*F*D3$ z9&U4XIqIz(dqMAD-y_0z6=xhG{sQ(rHN(L6Sn1J!w|ja-vmdWs)@O8{V(vRvXQ^wv zT&H|`kwn8LZ6e`ULIYKf-n>P}{pa{K-~ z*PiOIRbg8SyNF>FJM%f#YhM~oIKQg#!09ay=I{QbcI27vo~8Ujbk*Kjx_k#S#$e@k z&$7yjgGv|`ut-dEWUL^3AJgulWYB<$g3|9wdOC{l*e3tJa!&9jXEiYLVp;I*^@MD@ zT|DYC6jrR<=N#$rJ6SWDkJWD2Sdw?S>|}=JXpgOI=IjIThJ!N;US6qhc;3@qUN+NU zsRgz?-RTTyHeEYO`yq2#w{Y9?duqKAGu|DNA#3y_{hMPJG+fzLvh~_v=a8NFOUGQI z&DOhc0Bbgg&U#?jC;Ceg=qN&Smm@MjUQ|(_fKlt006?={l+gZ1$4WAMZEZA?uppUqJIFl)$Jev delta 898 zcmV-|1AYAW4Uq?s9De{G^Z#K000US_L_t(|+I5p_OjBnV$Nz6n52x)Z6lzN;6+yvn za!D5zT@|xA2a;*r6=j-`qDJGC;3d%noiiFq{Ge>{lEu`8?1NJ@PIrk@m|J2e8nSsQ zDv5&KEVtgU!0F+%=bU=rgE8oy%DEE+iMMudk(al5k*w>rF-%Jy~?W`;gqu!HY?0r;j8 zOsXThtxs~4ZGUi8z&wS<=bO*MYS!b(o<)Gb1M(OKf*jl}Uf48GJR^7g@7MnZVFGY* zuW8$zVBV2+Yd=G_nTCoYxN!La4xPM-;(~N+T4jeLUk4J8;Aw9N%|HE%xjE78EA|aE zkviq|8M#>154_*}IXQ1uIe@N94%$udf%&BVBmg|tY-GwG2zggsHI=ZL8Tk4}K&gP~Rtg_&zmE2ML-@*NLDf5H(5vHsDBx*- z45zP+pnu2^svzzS)M7uMcWw2mcadvJQEZiwLdp2^pFwPGdZ@q%W*5--w$22ePe7#r zdi*h*_lzP(A9#-(sKRtLZT)+8S!u?Sxkd}3JuL6T-sxXfsvq= z1hn3cq4O~}BqsXjO#H&BTH`N)lxfShEK64k5Py`L1Zs~*QMWt;3+yVa`FaRTiWLtQ zslg5NIMyn{s*V1-?qqoR1mI{DRnAeCD<&gN);MX%Gy|7Aj`|N+IP(dvcO`J5HI7p? zK+CNJf{}QV6$h5qos(K$bYgQ2yMItLf5|GYf9OcU7uDbmD^bdpA() { public void componentSelected(MenuEvent ce) { @@ -132,7 +132,7 @@ public class ContextMenuTree { MenuItem openReport = new MenuItem(); openReport.setId(WorkspaceOperation.OPEN_REPORT.getId()); openReport.setText(ConstantsExplorer.MESSAGE_OPEN_REPORT); - openReport.setIcon(Resources.getIconOpenUrl()); + openReport.setIcon(Resources.getIconShow()); openReport.addSelectionListener(new SelectionListener() { public void componentSelected(MenuEvent ce) { diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogPublicLink.java b/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogPublicLink.java index 3059f3e..eb56fca 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogPublicLink.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogPublicLink.java @@ -28,7 +28,7 @@ public class DialogPublicLink extends Dialog { public DialogPublicLink(String headingTxt, final String itemId) { setButtonAlign(HorizontalAlignment.CENTER); - setIcon(Resources.getIconShareLink()); + setIcon(Resources.getIconPublicLink()); vp.setHorizontalAlign(HorizontalAlignment.CENTER); vp.setVerticalAlign(VerticalAlignment.MIDDLE); vp.getElement().getStyle().setPadding(1, Unit.PX); diff --git a/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceServiceImpl.java b/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceServiceImpl.java index e104424..fba2dab 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceServiceImpl.java +++ b/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceServiceImpl.java @@ -1724,9 +1724,9 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT workspaceLogger.trace("shareFolder "+ folder.getIdentifier() + " name: "+ folder.getName() - + " parent name: " + folder.getParentFileModel().getName() +// + " parent name: " + folder.getParentFileModel().getName() + " listContacts size: " + listContacts.size()); - + // //DEBUG //System.out.println("shareFolder "+ folder.getIdentifier() + " name: "+ folder.getName() + " parent name: " + folder.getParentFileModel().getName() + " listContacts size: " + listContacts.size()); @@ -2275,11 +2275,11 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT else throw new Exception("Sorry, The Uri resolver service is temporarily unavailable. Please try again later"); + }else{ + workspaceLogger.warn("ItemId: "+ itemId +" is not a folder item, sent exception Public Link unavailable"); + throw new Exception("Sorry, The Public Link for selected file is unavailable"); } - - workspaceLogger.warn("ItemId: "+ itemId +" is not a folder item, return empty public link"); - return ""; - + }catch (Exception e) { workspaceLogger.error("Error getPublicLinkForFolderItemId for item: "+itemId); throw new Exception(e.getMessage());