From 33f033f2dba851156e676f978c562c79e102ee97 Mon Sep 17 00:00:00 2001
From: Massimiliano Assante <massimiliano.assante@isti.cnr.it>
Date: Mon, 30 Jun 2014 10:15:19 +0000
Subject: [PATCH] rich text editor works

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/reports@98012 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 +-
 .../client/model/TemplateComponent.java             |  2 ++
 .../client/targets/BasicTextArea.java               |  3 ++-
 .../client/targets/D4sRichTextarea.java             | 13 ++++++++++++-
 7 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/.classpath b/.classpath
index 1dc1ff2..a55761e 100644
--- a/.classpath
+++ b/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/reports-4.9.1-SNAPSHOT/WEB-INF/classes" path="src/main/java">
+	<classpathentry kind="src" output="target/reports-4.9.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.9.1-SNAPSHOT/WEB-INF/classes"/>
+	<classpathentry kind="output" path="target/reports-4.9.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 4c1b630..8c59cc5 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.9.1-SNAPSHOT
+lastWarOutDir=/Users/massi/Documents/workspace/reports/target/reports-4.9.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 6dab25b..e835890 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -10,9 +10,6 @@
         <dependent-module archiveName="gcube-reporting-library-3.5.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/gcube-reporting-library/gcube-reporting-library">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-        <dependent-module archiveName="fileupload-progress-bar-1.2.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/fileupload-progress-bar/fileupload-progress-bar">
-            <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>
diff --git a/pom.xml b/pom.xml
index 4315203..f048535 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.9.1-SNAPSHOT</version>
+	<version>4.9.2-SNAPSHOT</version>
 	<name>gCube Reports Manager</name>
 	<description>
 		gCube Reports Portlet.
diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/client/model/TemplateComponent.java b/src/main/java/org/gcube/portlets/user/reportgenerator/client/model/TemplateComponent.java
index be101b6..514921f 100644
--- a/src/main/java/org/gcube/portlets/user/reportgenerator/client/model/TemplateComponent.java
+++ b/src/main/java/org/gcube/portlets/user/reportgenerator/client/model/TemplateComponent.java
@@ -233,6 +233,7 @@ public class TemplateComponent {
 				height = 40;
 				D4sRichTextarea ta = new D4sRichTextarea(sc.getId(), sc.getType(), presenter, sc.getX(), sc.getY(),width, height, getUserComments() != null, showClose, owner);
 				ta.setHTML((String) sc.getPossibleContent());
+				ta.setMetadata(sc.getMetadata());
 				//ta.setStyleName("cw-RichText");
 				ta.setPixelSize(width, height);
 				this.content = ta;
@@ -441,6 +442,7 @@ public class TemplateComponent {
 			else {
 				content = ((D4sRichTextarea) this.content).getHTML();
 				id = ((D4sRichTextarea) this.content).getId();
+				metas = ((D4sRichTextarea) this.content).getMetadata();
 			}
 			break;
 		case HEADING_1:
diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/client/targets/BasicTextArea.java b/src/main/java/org/gcube/portlets/user/reportgenerator/client/targets/BasicTextArea.java
index b740374..be497aa 100644
--- a/src/main/java/org/gcube/portlets/user/reportgenerator/client/targets/BasicTextArea.java
+++ b/src/main/java/org/gcube/portlets/user/reportgenerator/client/targets/BasicTextArea.java
@@ -54,7 +54,8 @@ public class BasicTextArea extends TextArea {
 		addFocusHandler(new FocusHandler() {			
 			@Override
 			public void onFocus(FocusEvent event) {
-				autoSizeIt(myId, height);				
+				autoSizeIt(myId, height);	
+				presenter.addTextToolBar(false);
 			}
 		});
 	}
diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/client/targets/D4sRichTextarea.java b/src/main/java/org/gcube/portlets/user/reportgenerator/client/targets/D4sRichTextarea.java
index ce8d811..cf60d2b 100644
--- a/src/main/java/org/gcube/portlets/user/reportgenerator/client/targets/D4sRichTextarea.java
+++ b/src/main/java/org/gcube/portlets/user/reportgenerator/client/targets/D4sRichTextarea.java
@@ -1,6 +1,9 @@
 package org.gcube.portlets.user.reportgenerator.client.targets;
 
+import java.util.List;
+
 import org.gcube.portlets.d4sreporting.common.shared.ComponentType;
+import org.gcube.portlets.d4sreporting.common.shared.Metadata;
 import org.gcube.portlets.user.reportgenerator.client.ReportGenerator;
 import org.gcube.portlets.user.reportgenerator.client.Presenter.Presenter;
 
@@ -30,7 +33,8 @@ import com.google.gwt.user.client.ui.Widget;
  * @version October 2008 (0.2) 
  */
 public class D4sRichTextarea extends ReportTextArea {
-
+	//the properties associated
+	private List<Metadata> metas;
 	/**
 	 * the text area 
 	 */
@@ -145,7 +149,14 @@ public class D4sRichTextarea extends ReportTextArea {
 			currHeight = height + 20;
 		}
 	}
+	public List<Metadata> getMetadata() {
+		return metas;
+	}
 
+
+	public void setMetadata(List<Metadata> metas) {
+		this.metas = metas;
+	}
 	/**
 	 * 
 	 * @return .