From f8fec4df8f8cd1d28319dab50aa4724dab9d1d06 Mon Sep 17 00:00:00 2001
From: Francesco Mangiacrapa <francesco.mangiacrapa@isti.cnr.it>
Date: Fri, 12 Jun 2015 13:07:02 +0000
Subject: [PATCH] 219: Workspace: modify the WorkspaceItem properties

Task-Url: https://support.d4science.org/issues/219

Updated Dialog Edit Permission
Updated Icons and Css

git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace-tree-widget@115351 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .../user/workspace/client/resources/Icons.java  |   3 +++
 .../workspace/client/resources/Resources.java   |   5 +++++
 .../workspace/client/resources/icons/edit16.png | Bin 0 -> 522 bytes
 .../view/windows/DialogEditProperties.java      |   4 ++--
 .../client/view/windows/DialogGetInfo.java      |  16 +++++++++++-----
 .../user/workspace/public/workspacetree.css     |   4 ++++
 .../workspace/server/GWTWorkspaceBuilder.java   |  12 +++++++++---
 .../server/GWTWorkspaceServiceImpl.java         |   7 +++++--
 8 files changed, 39 insertions(+), 12 deletions(-)
 create mode 100644 src/main/java/org/gcube/portlets/user/workspace/client/resources/icons/edit16.png

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 bd60f92..6d5049c 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
@@ -378,5 +378,8 @@ public interface Icons extends ClientBundle {
 	
 	@Source("icons/pencil16.png")
 	ImageResource pencil();
+	
+	@Source("icons/edit16.png")
+	ImageResource edit();
 }
 
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 2253829..3de1a50 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
@@ -299,6 +299,11 @@ public class Resources {
 		return AbstractImagePrototype.create(ICONS.pencil());  
 	} 
 	
+	public static AbstractImagePrototype getIconEdit(){
+		
+		return AbstractImagePrototype.create(ICONS.edit());  
+	} 
+	
 	public static AbstractImagePrototype getIconHistory(){
 		
 		return AbstractImagePrototype.create(ICONS.history());  
diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/resources/icons/edit16.png b/src/main/java/org/gcube/portlets/user/workspace/client/resources/icons/edit16.png
new file mode 100644
index 0000000000000000000000000000000000000000..13be83bf311dad36eb6438053d77c25517ab2c0d
GIT binary patch
literal 522
zcmV+l0`>igP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0005eNkl<Zc${PW
z|NlQD0~GxF^OvJ--K|xJZ@%+kKm$w+4F5EwdCpY_sYOT#aNdK7Gr|n`_2(}~^V*wh
zj@^3iRqCspWvM2#0oi~*fB&;AI`p{V%a1<-wZR%8FmV=i%?u0-3|wr?ANaZ0UZA_e
zN=<0X*?S*c{{H>T^7id#2{AE&CoJfi@c|7fo)gMKET=*uyU*RY`BWz|+;$F2+xpup
z&^7aNvcAJ+z@HyK7?RSa?7DsDxfTNh1H+cBr=wU7-+1d+>Z_c^#m4*rrrA(YU>CaP
zw{Jg5B&JQ-1JlgFz`)?|XTFGqfq{X+QcY+BHb3Lj928)&q`WvVkBN}KacOR>jYwi)
zVg7^HfDa$Oir~}Cz`($O*MJS1P9~shZm5k&gK5TVz{{5(<k;C+{=xVmL6(b3N<+$~
z?z%q>Sse>50~RekP;ltTRgd1Tgd`zB-e+beDtk`f{or@+<u@&Y27LMQUEt2$=X$wW
z-VM%<y6c#k5l%)2EDQ_`4FCS2dWD^x_1ny;nJ&0Ap%@@5%yDo3wbv1jTB0kMm>A%G
zX88RJMd6>n|5=XRdgmj`$MytSobl4b501TC?#y}o_J<Nan{Z`k05gE%bb}R7+yDRo
M07*qoM6N<$f({A)7ytkO

literal 0
HcmV?d00001

diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogEditProperties.java b/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogEditProperties.java
index ff4a5a7..f2fef3c 100644
--- a/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogEditProperties.java
+++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogEditProperties.java
@@ -53,7 +53,7 @@ public class DialogEditProperties extends Dialog{
 		layout.setDefaultWidth(300);
 		setLayout(layout);
 
-		setHeading("Set Properties: "+item.getName());
+		setHeading("Edit Properties: "+item.getName());
 		setButtonAlign(HorizontalAlignment.RIGHT);
 		setModal(true);
 		// setBodyBorder(true);
@@ -111,7 +111,7 @@ public class DialogEditProperties extends Dialog{
 			public void onSuccess(Void result) {
 				commad.execute();
 				if(closeOnSuccess)
-				DialogEditProperties.this.hide();
+					DialogEditProperties.this.hide();
 			}
 		});
 		
diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogGetInfo.java b/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogGetInfo.java
index e315227..43a4846 100644
--- a/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogGetInfo.java
+++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogGetInfo.java
@@ -18,6 +18,7 @@ import com.extjs.gxt.ui.client.widget.Dialog;
 import com.extjs.gxt.ui.client.widget.HorizontalPanel;
 import com.extjs.gxt.ui.client.widget.Html;
 import com.extjs.gxt.ui.client.widget.Label;
+import com.extjs.gxt.ui.client.widget.LayoutContainer;
 import com.extjs.gxt.ui.client.widget.form.TextArea;
 import com.extjs.gxt.ui.client.widget.form.TextField;
 import com.extjs.gxt.ui.client.widget.layout.FormLayout;
@@ -110,10 +111,16 @@ public class DialogGetInfo extends Dialog {
     	hpGcubeProperties.add(labelProperties);
     	loadGcubeItemProperties(fileModel.getIdentifier());
     	htmlPropertiesWidget.setHeight(heightTextArea);
-    	htmlPropertiesWidget.setWidth("270px");
+    	htmlPropertiesWidget.setWidth("275px");
     	
-    	Image imgProperties = Resources.getIconPencil().createImage(); //EDIT PROPERTIES
-    	hpGcubeProperties.add(imgProperties);
+    	LayoutContainer lc = new LayoutContainer();
+    	lc.addStyleName("editPermissions");
+    	
+    	Image imgProperties = Resources.getIconEdit().createImage(); //EDIT PROPERTIES
+    	imgProperties.setTitle("Edit Properties");
+    	lc.add(imgProperties);
+    	
+    	hpGcubeProperties.add(lc);
 
     	final Command cmdReloadProperties = new Command() {
 			
@@ -325,8 +332,7 @@ public class DialogGetInfo extends Dialog {
 				htmlPropertiesWidget.unmask();
 				GWT.log("an error occured in load properties by Id "+itemId + " "+caught.getMessage());
 				setVisibleGcubeProperties(true);
-				htmlPropertiesWidget.setHtml("Error on recovering properties");
-				
+				htmlPropertiesWidget.setHtml("Error on recovering properties");	
 			}
 
 			@Override
diff --git a/src/main/java/org/gcube/portlets/user/workspace/public/workspacetree.css b/src/main/java/org/gcube/portlets/user/workspace/public/workspacetree.css
index f49ba88..63aaf9c 100644
--- a/src/main/java/org/gcube/portlets/user/workspace/public/workspacetree.css
+++ b/src/main/java/org/gcube/portlets/user/workspace/public/workspacetree.css
@@ -163,4 +163,8 @@ table.userssuggest th {
 	height: 30px;
 	border-collapse: collapse;
 	border-spacing: 0px;
+}
+
+.editPermissions :hover{
+	cursor: pointer;
 }
\ No newline at end of file
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 5c8321f..9a5fa0b 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
@@ -2604,7 +2604,7 @@ public class GWTWorkspaceBuilder {
 			
 			for (String key : properties.keySet()) {
 				String value = properties.get(key);
-				
+				logger.trace("Getting property: ["+key+","+properties.get(key)+"]");
 				html+="<span style=\"font-weight:bold; padding-top: 5px;\">"+key+": </span>";
 				html+="<span style=\"font-weight:normal;\">";
 				html+=value;
@@ -2630,12 +2630,18 @@ public class GWTWorkspaceBuilder {
 		if(item instanceof GCubeItem){
 			GCubeItem gItem = (GCubeItem) item;
 			try {
-				return gItem.getProperties().getProperties();
+				if(gItem.getProperties()!=null){
+					Map<String, String> map = gItem.getProperties().getProperties();
+					HashMap<String, String> properties = new HashMap<String, String>(map.size()); //TO PREVENT GWT SERIALIZATION ERROR
+					for (String key : map.keySet())
+						properties.put(key, map.get(key));
+					
+					return properties;
+				}
 			} catch (InternalErrorException e) {
 				logger.error("Error in server getItemProperties: ", e);
 				return null;
 			}
-			
 		}
 		return null;
 	}
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 0b35181..247cee9 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
@@ -3827,9 +3827,12 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
 			Workspace workspace = getWorkspace();
 			WorkspaceItem item = workspace.getItem(itemId);
 			if(item instanceof GCubeItem){
+				workspaceLogger.info("Adding "+properties.size()+" properties to GCubeItem: "+itemId);
 				GCubeItem gItem = (GCubeItem) item;
-				for (String key : properties.keySet()) //ADD PROPERTIES
-					gItem.getProperties().addProperty(key, properties.get(key)); 
+				for (String key : properties.keySet()) {//ADD PROPERTIES
+					workspaceLogger.trace("Adding property: ["+key+","+properties.get(key)+"]");
+					gItem.getProperties().addProperty(key, properties.get(key));
+				}
 			}else
 				throw new NoGcubeItemTypeException("The item is not a Gcube Item");