From c087e182e6ce2f328713f74ebad2d929ff1e3f9a Mon Sep 17 00:00:00 2001 From: Massimiliano Assante Date: Wed, 3 Sep 2014 13:52:14 +0000 Subject: [PATCH] open url with double click implemented, changed icons for html and links, updated revision git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace-tree-widget@99428 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../client/AppControllerExplorer.java | 85 +++++++++--------- .../workspace/client/resources/Icons.java | 6 +- .../workspace/client/resources/Resources.java | 8 +- .../client/resources/icons/mime/html.gif | Bin 265 -> 0 bytes .../client/resources/icons/mime/ico_htm.gif | Bin 0 -> 229 bytes .../client/resources/icons/openURL.png | Bin 0 -> 1281 bytes 6 files changed, 54 insertions(+), 45 deletions(-) delete mode 100644 src/main/java/org/gcube/portlets/user/workspace/client/resources/icons/mime/html.gif create mode 100644 src/main/java/org/gcube/portlets/user/workspace/client/resources/icons/mime/ico_htm.gif create mode 100644 src/main/java/org/gcube/portlets/user/workspace/client/resources/icons/openURL.png diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/AppControllerExplorer.java b/src/main/java/org/gcube/portlets/user/workspace/client/AppControllerExplorer.java index 8afa6b7..c9746ff 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/AppControllerExplorer.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/AppControllerExplorer.java @@ -181,16 +181,18 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt private boolean selectRootItem; private FileUploader fileUploader; public static String myLogin; + + private static AppControllerExplorer singleton; public AppControllerExplorer() { Registry.register(ConstantsExplorer.RPC_WORKSPACE_SERVICE, rpcWorkspaceService); subscribers = new HashMap>(); bind(); - + singleton = this; } - public AppControllerExplorer getInstance() { - return this; + public static AppControllerExplorer getInstance() { + return singleton; } public static HandlerManager getEventBus() { @@ -1633,45 +1635,7 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt public void onClickUrl(OpenUrlEvent openUrlEvent) { doClickUrl(openUrlEvent); - } - - private void doClickUrl(OpenUrlEvent openUrlEvent) { - - final FileModel fileModel = openUrlEvent.getSourceFileModel(); - - if(fileModel==null) - return; - - rpcWorkspaceService.getUrlById(fileModel.getIdentifier(), fileModel.getGXTFolderItemType().equals(GXTFolderItemTypeEnum.URL_DOCUMENT), false, new AsyncCallback() { - - @Override - public void onFailure(Throwable caught) { - explorerPanel.getAsycTreePanel().unmask(); - new MessageBoxAlert("Error", ConstantsExplorer.SERVER_ERROR + " clicking url.", null); - explorerPanel.getAsycTreePanel().removeAllAndRecoveryRoot(); - - } - - @Override - public void onSuccess(GWTWorkspaceItem result) { - - - if(fileModel.getGXTFolderItemType().equals(GXTFolderItemTypeEnum.URL_DOCUMENT)){ - new WindowOpenUrl(((GWTUrlDocument) result).getUrl(), "_blank", ""); - GWT.log("URL_DOCUMENT Open " + ((GWTUrlDocument) result).getUrl()); - } - else{ - new WindowOpenUrl(((GWTExternalUrl) result).getUrl(), "_blank", ""); - GWT.log("ExternalUrl Open " + ((GWTExternalUrl) result).getUrl()); - } - - } - - }); - - // com.google.gwt.user.client.Window.open(ConstantsExplorer.DOWNLOAD_WORKSPACE_SERVICE+"?id="+fileModel.getIdentifier()+"&viewContent=true", fileModel.getName(), ""); - - } + } }); @@ -2528,4 +2492,41 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt explorerPanel.getAsycTreePanel().setSearch(isSearch); } + public void doClickUrl(OpenUrlEvent openUrlEvent) { + + final FileModel fileModel = openUrlEvent.getSourceFileModel(); + + if(fileModel==null) + return; + + rpcWorkspaceService.getUrlById(fileModel.getIdentifier(), fileModel.getGXTFolderItemType().equals(GXTFolderItemTypeEnum.URL_DOCUMENT), false, new AsyncCallback() { + + @Override + public void onFailure(Throwable caught) { + explorerPanel.getAsycTreePanel().unmask(); + new MessageBoxAlert("Error", ConstantsExplorer.SERVER_ERROR + " clicking url.", null); + explorerPanel.getAsycTreePanel().removeAllAndRecoveryRoot(); + + } + + @Override + public void onSuccess(GWTWorkspaceItem result) { + + + if(fileModel.getGXTFolderItemType().equals(GXTFolderItemTypeEnum.URL_DOCUMENT)){ + new WindowOpenUrl(((GWTUrlDocument) result).getUrl(), "_blank", ""); + GWT.log("URL_DOCUMENT Open " + ((GWTUrlDocument) result).getUrl()); + } + else{ + new WindowOpenUrl(((GWTExternalUrl) result).getUrl(), "_blank", ""); + GWT.log("ExternalUrl Open " + ((GWTExternalUrl) result).getUrl()); + } + + } + + }); + + // com.google.gwt.user.client.Window.open(ConstantsExplorer.DOWNLOAD_WORKSPACE_SERVICE+"?id="+fileModel.getIdentifier()+"&viewContent=true", fileModel.getName(), ""); + + } } diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/resources/Icons.java b/src/main/java/org/gcube/portlets/user/workspace/client/resources/Icons.java index 98fe8d9..dd39b9f 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/resources/Icons.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/resources/Icons.java @@ -32,7 +32,7 @@ public interface Icons extends ClientBundle { @Source("icons/mime/xml.gif") ImageResource xml(); - @Source("icons/mime/html.gif") + @Source("icons/mime/ico_htm.gif") ImageResource html(); @Source("icons/mime/java.gif") @@ -284,6 +284,10 @@ public interface Icons extends ClientBundle { @Source("icons/link-try.png") ImageResource shareLink(); + + @Source("icons/openURL.png") + ImageResource extLink(); + @Source("icons/sharelink.png") ImageResource publicLink(); diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/resources/Resources.java b/src/main/java/org/gcube/portlets/user/workspace/client/resources/Resources.java index 81fa851..283854a 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/resources/Resources.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/resources/Resources.java @@ -55,6 +55,10 @@ public class Resources { return AbstractImagePrototype.create(ICONS.undo()); } + public static AbstractImagePrototype getIconLink(){ + return AbstractImagePrototype.create(ICONS.extLink()); + } + public static AbstractImagePrototype getIconShareLink(){ return AbstractImagePrototype.create(ICONS.shareLink()); @@ -625,7 +629,7 @@ public class Resources { }else if(itemType.equals(GXTFolderItemTypeEnum.EXTERNAL_PDF_FILE)){ return Resources.getIconPdf(); }else if(itemType.equals(GXTFolderItemTypeEnum.EXTERNAL_URL)){ - return Resources.getIconHtml(); + return Resources.getIconLink(); }else if(itemType.equals(GXTFolderItemTypeEnum.IMAGE_DOCUMENT)){ return Resources.getIconPng(); }else if(itemType.equals(GXTFolderItemTypeEnum.METADATA)){ @@ -641,7 +645,7 @@ public class Resources { }else if(itemType.equals(GXTFolderItemTypeEnum.REPORT_TEMPLATE)){ return Resources.getIconReportTemplate(); }else if(itemType.equals(GXTFolderItemTypeEnum.URL_DOCUMENT)){ - return Resources.getIconHtml(); + return Resources.getIconLink(); }else if(itemType.equals(GXTFolderItemTypeEnum.WORKFLOW_REPORT)){ return Resources.getIconWorkflowReport(); }else if(itemType.equals(GXTFolderItemTypeEnum.WORKFLOW_TEMPLATE)){ diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/resources/icons/mime/html.gif b/src/main/java/org/gcube/portlets/user/workspace/client/resources/icons/mime/html.gif deleted file mode 100644 index 093f8a1e711ce657570e32f25a170cf5b4bff6a0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 265 zcmZ?wbhEHb6krfwIKlt|5)u*&i42B`3_*cG#f8O&^B4@z8yfykW?=YlnE0Pz-hadM z{|*2DZ)t0pGHuGSrx40b~CCkrD3gBXJjNE&3P18ds? z)h@S8jmH@g?HdgGmY(qvvTZTtIlkbCCdY&jrXxZgPgo{xUZb-2ZW5b>rUq}DS=h`_ zrUwndO%@VKo1bj5G;+H4!F+d0qg2g`E1RFc_$?c1B*JaS9V6NyAeN!3Zy?q&k)M@? oO(=kgsl7um+m9nPeZm~kc}ffnoQA?{*7|5Fv25DBMUlZ80Pi|nC;$Ke diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/resources/icons/mime/ico_htm.gif b/src/main/java/org/gcube/portlets/user/workspace/client/resources/icons/mime/ico_htm.gif new file mode 100644 index 0000000000000000000000000000000000000000..8ae273632f8a74e7034d18c22ae3ef589ecb9004 GIT binary patch literal 229 zcmZ?wbhEHb6krfwIKseSY;1hy%$cW8pE9KVFDfef&+s1z($dmq&Ybz~-MiM-)~i>q zE?TsxuCDIew{N|@z4z|jV;}`6{$yblVPIv@0cir+$-tVFplIarQ-gP5SI$9+0v=)a z*HTXFq*<7@=u4h)WRQsDn3KoO%ro!8iYu8CA<1DGQ)j(Bv?jXXYBg{C{KuPbcAslo nTJXYuiGd2s_f!W1eUmrk0s`FJjMcUE-d#01ZhigziVW5OxpPg9 literal 0 HcmV?d00001 diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/resources/icons/openURL.png b/src/main/java/org/gcube/portlets/user/workspace/client/resources/icons/openURL.png new file mode 100644 index 0000000000000000000000000000000000000000..827c9955467f34961ffbcf38fc6e48e51ce859ca GIT binary patch literal 1281 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+n3Xa^B1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxKsVXI%s|1+P|wiV z#N6CmN5ROz&_Lh7NZ-&%*U;R`*vQJjKmiJrfVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8EkR}&8R-I5=oVMzl_XZ^<`pZ$OmImpPAEg{v+u2}(t{7puX=A(aKG z`a!A1`K3k4z=%sz23b{L-^Aq1JP;qO z-q+X4Gq1QLF)umQ)5TT^Xo6m5W{Q=mn~|fXnT4B?lZCUPp{t3Lsk5bpsi~>4n~}4b zo2fZWuSMv>2~2MaT(6}8PQ9R{kXrz>*(J3ovn(~mttdZN0qkX~Ox$j9!D${; zZwgMgSh(WUs}FRHJ}6?5A{r(HOg$hbJlO&{@Pwb52Tbinz-0Z?mLuj^m=$X>5rUYDQt?u=#e^E(1|v9;`7;A+N>>FeW&Psj+q<9ckVD_4&=#t+@x`( z&s+KT+(rID372_Je7a-J|25I${Pa21=|KtCeYW!ne%@Ow@qNTg)c`pEIndIn~O6KA}=ny3D72Ng=5u6{1-oD!M<5jW2P literal 0 HcmV?d00001