ready for testing

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/reports@71299 82a268e6-3cf1-43bd-a215-b396298e98cf

.classpath

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/reports-4.0.4-SNAPSHOT/WEB-INF/classes" path="src/main/java">
+	<classpathentry kind="src" output="target/reports-4.0.5-SNAPSHOT/WEB-INF/classes" path="src/main/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
@@ -30,5 +30,5 @@
 			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="output" path="target/reports-4.0.4-SNAPSHOT/WEB-INF/classes"/>
+	<classpathentry kind="output" path="target/reports-4.0.5-SNAPSHOT/WEB-INF/classes"/>
 </classpath>

.settings/com.google.gdt.eclipse.core.prefs

@@ -1,4 +1,8 @@
+#Wed Mar 13 11:54:06 CET 2013
+=\=\=\=\=\=\=
+<<<<<<<=.mine
+>>>>>>>=.r71295
 eclipse.preferences.version=1
-lastWarOutDir=/home/gioia/workspace/reports/target/reports-4.0.4-SNAPSHOT
+lastWarOutDir=/Users/massi/Documents/workspace/reports/target/reports-4.0.5-SNAPSHOT
 warSrcDir=src/main/webapp
 warSrcDirIsOutput=false

.settings/org.eclipse.wst.common.component

@@ -5,12 +5,6 @@
     <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="gcube-docx-generator-1.2.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/gcube-docx-generator/gcube-docx-generator">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="report-exporter-widget-1.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/report-exporter-widget/report-exporter-widget">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
     <property name="java-output-path" value="/${module}/target/www/WEB-INF/classes"/>
         <property name="context-root" value="reports"/>
   </wb-module>

pom.xml

@@ -12,7 +12,7 @@
 	<groupId>org.gcube.portlets.user</groupId>
 	<artifactId>reports</artifactId>
 	<packaging>war</packaging>
-	<version>4.0.4-SNAPSHOT</version>
+	<version>4.0.5-SNAPSHOT</version>
 	<name>gCube Reports Portlet</name>
 	<description>
 		gCube Reports Portlet.

src/main/java/org/gcube/portlets/user/reportgenerator/client/Headerbar.java

@@ -53,7 +53,7 @@ public class Headerbar extends Composite{
 	private static final String EXPORT_OPENXML = "Export to OpenXML (docx)";
 	private static final String EXPORT_HTML = "Export to HTML";
 	private static final String EXPORT_FIMES = "Export to FiMES XML";
-	private static final String EXPORT_ENCRYPTED_REPORT = "Export crypted Reports";
+	private static final String EXPORT_ENCRYPTED_REPORT = "Save Encrypted Version to Desktop";
 	
 	private static final String VIEW_USER_COMMENTS = "View user comments";
 

src/main/java/org/gcube/portlets/user/reportgenerator/client/model/TemplateComponent.java

@@ -251,8 +251,12 @@ public class TemplateComponent {
 		case ATTRIBUTE_MULTI:
 			AttributeMultiSelection ta = null;
 			if (sc.getPossibleContent() instanceof AttributeArea) {
-				AttributeArea sata = (AttributeArea) sc.getPossibleContent();  
+				AttributeArea sata = (AttributeArea) sc.getPossibleContent();
-				ta = new AttributeMultiSelection(presenter, sc.getX(), sc.getY(), width, height, sata);
+				//in the metadata in this case there an attribute for diplayType
+				if (sc.getMetadata() != null && sc.getMetadata().size() > 0) {
+					
+				}
+				ta = new AttributeMultiSelection(presenter, sc.getX(), sc.getY(), width, height, sata, false);
 			}
 			else {
 				ta = new AttributeMultiSelection(presenter, sc.getX(), sc.getY(), width, height, sc.getPossibleContent().toString());

src/main/java/org/gcube/portlets/user/reportgenerator/client/targets/AttributeMultiSelection.java

@@ -51,7 +51,7 @@ public class AttributeMultiSelection extends Composite {
 	/**
 	 * Coming form a report constructor 
 	 */
-	public AttributeMultiSelection(final Presenter presenter, int left, int top, int width,  final int height, AttributeArea sata) {
+	public AttributeMultiSelection(final Presenter presenter, int left, int top, int width,  final int height, AttributeArea sata, boolean displayBlock) {
 		myPanel = new HorizontalPanel();
 		myPanel.setTitle("Attribute Area");
 		myPanel.setVerticalAlignment(HasVerticalAlignment.ALIGN_BOTTOM);

src/main/webapp/ReportGenerator.css

@@ -482,6 +482,8 @@ tableBorder td {
 .setVisibilityOn {
 	margin-top: 1px;
 	visibility: visible;
+	cursor: pointer;
+	cursor: hand;
 }
 
 .templateFrame {