From 95bdba3053c553686436d1d25f106729684761b2 Mon Sep 17 00:00:00 2001
From: Massimiliano Assante <massimiliano.assante@isti.cnr.it>
Date: Mon, 13 Oct 2014 13:30:24 +0000
Subject: [PATCH] fixed VME-DB radio in sequences

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/reports@100641 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .classpath                                             |  4 ++--
 .settings/com.google.gdt.eclipse.core.prefs            |  2 +-
 .settings/org.eclipse.wst.common.component             |  3 +++
 pom.xml                                                |  2 +-
 .../reportgenerator/client/targets/SequenceWidget.java | 10 ++++++++--
 .../user/reportgenerator/ReportGenerator.gwt.xml       |  1 -
 6 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/.classpath b/.classpath
index 51b1a3e..98f2333 100644
--- a/.classpath
+++ b/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/reports-4.11.1-SNAPSHOT/WEB-INF/classes" path="src/main/java">
+	<classpathentry kind="src" output="target/reports-4.11.2-SNAPSHOT/WEB-INF/classes" path="src/main/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
@@ -31,5 +31,5 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="output" path="target/reports-4.11.1-SNAPSHOT/WEB-INF/classes"/>
+	<classpathentry kind="output" path="target/reports-4.11.2-SNAPSHOT/WEB-INF/classes"/>
 </classpath>
diff --git a/.settings/com.google.gdt.eclipse.core.prefs b/.settings/com.google.gdt.eclipse.core.prefs
index 2d813b3..51e07ea 100644
--- a/.settings/com.google.gdt.eclipse.core.prefs
+++ b/.settings/com.google.gdt.eclipse.core.prefs
@@ -2,6 +2,6 @@
 <<<<<<<=.mine
 >>>>>>>=.r71295
 eclipse.preferences.version=1
-lastWarOutDir=/Users/massi/Documents/workspace/reports/target/reports-4.11.1-SNAPSHOT
+lastWarOutDir=/Users/massi/Documents/workspace/reports/target/reports-4.11.2-SNAPSHOT
 warSrcDir=src/main/webapp
 warSrcDirIsOutput=false
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index fa1497d..e3cf779 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -4,6 +4,9 @@
     <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
     <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/target/generated-sources/gwt"/>
+        <dependent-module archiveName="workspace-light-tree-2.13.1-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/workspace-light-tree/workspace-light-tree">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
         <dependent-module archiveName="document-workflow-library-1.4.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/document-workflow-library/document-workflow-library">
             <dependency-type>uses</dependency-type>
         </dependent-module>
diff --git a/pom.xml b/pom.xml
index d11d7e5..ec4eb4d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>org.gcube.portlets.user</groupId>
 	<artifactId>reports</artifactId>
 	<packaging>war</packaging>
-	<version>4.11.1-SNAPSHOT</version>
+	<version>4.11.2-SNAPSHOT</version>
 	<name>gCube Reports Manager</name>
 	<description>
 		gCube Reports Portlet.
diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/client/targets/SequenceWidget.java b/src/main/java/org/gcube/portlets/user/reportgenerator/client/targets/SequenceWidget.java
index d27ef53..1f9a715 100644
--- a/src/main/java/org/gcube/portlets/user/reportgenerator/client/targets/SequenceWidget.java
+++ b/src/main/java/org/gcube/portlets/user/reportgenerator/client/targets/SequenceWidget.java
@@ -74,10 +74,16 @@ public class SequenceWidget extends Composite {
 					sComp.getType() == ComponentType.BODY_NOT_FORMATTED ||  
 					sComp.getType() == ComponentType.DYNA_IMAGE) ) {
 				sComp.setPossibleContent("");
+				//copy the metadata and signal is new
 				sComp.setMetadata(setPropertiesForRSG(sComp.getMetadata()));
 			}
-
-
+			
+			//copy the metadata and signal is new
+			if (isNew && (sComp.getType() == ComponentType.ATTRIBUTE_MULTI || sComp.getType() == ComponentType.ATTRIBUTE_UNIQUE)) {
+				sComp.setMetadata(setPropertiesForRSG(sComp.getMetadata()));
+			}
+			
+	
 			TemplateComponent toAdd = new TemplateComponent(p.getModel(), sComp, p, false, null);
 			if (isNew && sComp.getType() == ComponentType.REPORT_REFERENCE ) { //when adding a new Sequence blanks the Ref 
 				GWT.log("Ref j=" + j);
diff --git a/src/main/resources/org/gcube/portlets/user/reportgenerator/ReportGenerator.gwt.xml b/src/main/resources/org/gcube/portlets/user/reportgenerator/ReportGenerator.gwt.xml
index 68e5e93..e9dbb18 100644
--- a/src/main/resources/org/gcube/portlets/user/reportgenerator/ReportGenerator.gwt.xml
+++ b/src/main/resources/org/gcube/portlets/user/reportgenerator/ReportGenerator.gwt.xml
@@ -4,7 +4,6 @@
 	<!-- Inherit the core Web Toolkit stuff. -->
 	<inherits name='com.google.gwt.user.User' />
 	<!-- To Comment out -->
-	<!-- <set-property name="user.agent" value="gecko1_8" /> -->
 	<set-property name="user.agent" value="safari,gecko1_8,ie9" />
 	<inherits
 		name='org.gcube.portlets.widgets.lighttree.WorkspacePortletLightTree' />