From c5c002c804e0f843b725d113745329458b3869cb Mon Sep 17 00:00:00 2001 From: Francesco Mangiacrapa Date: Mon, 11 Feb 2013 09:38:16 +0000 Subject: [PATCH] updated pom and resources git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace-tree-widget@69076 82a268e6-3cf1-43bd-a215-b396298e98cf --- pom.xml | 4 ++-- .../user/workspace/client/resources/Icons.java | 3 +++ .../workspace/client/resources/Resources.java | 14 +++++++++++++- .../workspace/client/resources/icons/mime/csv.gif | Bin 0 -> 156 bytes .../client/view/tree/ContextMenuTree.java | 2 ++ .../workspace/server/GWTWorkspaceBuilder.java | 1 + 6 files changed, 21 insertions(+), 3 deletions(-) create mode 100644 src/main/java/org/gcube/portlets/user/workspace/client/resources/icons/mime/csv.gif diff --git a/pom.xml b/pom.xml index 38f5a66..fb99e3c 100644 --- a/pom.xml +++ b/pom.xml @@ -76,13 +76,13 @@ org.gcube.portlets.user home-library [4.3.0-SNAPSHOT, 5.0.0-SNAPSHOT) - + provided org.gcube.portlets.user home-library-jcr [1.3.0-SNAPSHOT, 2.0.0-SNAPSHOT) - + provided commons-fileupload 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 ef553ab..41c9d0a 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 @@ -253,5 +253,8 @@ public interface Icons extends ClientBundle { @Source("icons/info-icon.png") ImageResource info(); + + @Source("icons/mime/csv.gif") + ImageResource csv(); } 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 d0c0e53..22abf12 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 @@ -17,6 +17,7 @@ public class Resources { private static final String XML = "xml"; private static final String JAVA = "java"; private static final String HTML = "html"; + private static final String XHTLXML = "xhtml+xml"; private static final String GIF = "gif"; private static final String PNG = "png"; private static final String JPEG = "jpeg"; @@ -31,7 +32,8 @@ public class Resources { private static final String MPEG = "mpeg"; private static final String SWF = "swf"; private static final String FLV = "flv"; - private static final String AVI = "avi"; + private static final String AVI = "avi"; + private static final Object CSV = "csv"; public static AbstractImagePrototype getIconTable(){ @@ -52,6 +54,12 @@ public class Resources { return AbstractImagePrototype.create(ICONS.sharedFolder()); } + + public static AbstractImagePrototype getIconCsv(){ + + return AbstractImagePrototype.create(ICONS.csv()); + } + public static AbstractImagePrototype getCloseIcon(){ @@ -431,10 +439,14 @@ public class Resources { return Resources.getIconMovie(); } else if (JPEG.equals(fileExtension) || JPG.equals(fileExtension)) { return Resources.getIconJpeg(); + } else if (XHTLXML.equals(fileExtension)) { + return Resources.getIconXml(); } else if (MSWORD.equals(fileExtension) || MSWORD.equals(fileExtension)) { return Resources.getIconDoc(); } else if (XML.equals(fileExtension)) { return Resources.getIconXml(); + } else if (CSV.equals(fileExtension)) { + return Resources.getIconCsv(); } else if (JAVA.equals(fileExtension)) { return Resources.getIconJava(); } else if (HTML.equals(fileExtension)) { diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/resources/icons/mime/csv.gif b/src/main/java/org/gcube/portlets/user/workspace/client/resources/icons/mime/csv.gif new file mode 100644 index 0000000000000000000000000000000000000000..4348b7fa4ab9a23339de7f321710734ababa98a2 GIT binary patch literal 156 zcmZ?wbhEHb6krfw*v!E2|Nnob1q{oUEo*CQn>caeoH=t|zI?f5%a$KMeq6nJ_4n`J z-@kunKmv+CS-?CU5D7AafyGlm#c{Q%0(0Y*`|Q&==exH>24=agW;*igsAKMZ3xSO4 xZMSzR6hsKW>e_cdup;{36uY>I9jld+jd;bhqZPJAGB`EL&N!c8qQJyp4FI)+JuCnK literal 0 HcmV?d00001 diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/tree/ContextMenuTree.java b/src/main/java/org/gcube/portlets/user/workspace/client/view/tree/ContextMenuTree.java index 93c364a..bdbb028 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/view/tree/ContextMenuTree.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/tree/ContextMenuTree.java @@ -583,6 +583,8 @@ public class ContextMenuTree { contextMenu.getItemByItemId(ConstantsExplorer.UPA).setVisible(false); //set invisible upload archive contextMenu.getItemByItemId(ConstantsExplorer.CLK).setVisible(false); //set invisible add url contextMenu.getItemByItemId(ConstantsExplorer.RFH).setVisible(false); //set invisible refresh +// contextMenu.getItemByItemId(ConstantsExplorer.SHR).setVisible(false); //set invisible share +// contextMenu.getItemByItemId(ConstantsExplorer.USHR).setVisible(false); //set invisible unshare contextMenu.showAt(posX, posY); } // treePanel.fireEvent(Events.ContextMenu); diff --git a/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceBuilder.java b/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceBuilder.java index d356640..25be691 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceBuilder.java +++ b/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceBuilder.java @@ -1518,6 +1518,7 @@ public class GWTWorkspaceBuilder { listContactsModel.add(new InfoContactModel("2", "Antonio.Test", "Antonio Gioia")); listContactsModel.add(new InfoContactModel("3", "Fabio.Test", "Fabio Sinibaldi")); listContactsModel.add(new InfoContactModel("4", Util.TEST_USER, Util.TEST_USER)); + listContactsModel.add(new InfoContactModel("5", "Massimiliano.Assante", "Massimiliano Assante")); return listContactsModel; }