From 92a551d98243751e9ab636d4b031d07b8c4acb66 Mon Sep 17 00:00:00 2001
From: Massimiliano Assante <massimiliano.assante@isti.cnr.it>
Date: Thu, 14 Feb 2013 14:08:18 +0000
Subject: [PATCH] temporary commit for Antonio

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/reports@69255 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .../client/ReportGenerator.java               |  2 +-
 .../client/model/TemplateComponent.java       | 21 ++++++++++++++-
 .../client/targets/AttributeArea.java         |  2 +-
 .../client/targets/BasicTextArea.java         | 27 -------------------
 src/main/webapp/ReportGenerator.css           |  4 +--
 5 files changed, 23 insertions(+), 33 deletions(-)

diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/client/ReportGenerator.java b/src/main/java/org/gcube/portlets/user/reportgenerator/client/ReportGenerator.java
index e6e9fbf..ac64802 100644
--- a/src/main/java/org/gcube/portlets/user/reportgenerator/client/ReportGenerator.java
+++ b/src/main/java/org/gcube/portlets/user/reportgenerator/client/ReportGenerator.java
@@ -173,7 +173,7 @@ public class ReportGenerator implements EntryPoint {
 		
 				});
 
-		 showGuidedTour() ;
+		 //showGuidedTour() ;
 
 	}
 	private void showGuidedTour() {		
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 70d17c6..837cfa9 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
@@ -316,6 +316,7 @@ public class TemplateComponent {
 			
 			RepeatableSequence rps = new RepeatableSequence(presenter, serializableRepeatableSequence);
 			this.content = rps;
+			break;
 		}
 	}
 	/**
@@ -373,6 +374,8 @@ public class TemplateComponent {
 		case HEADING_1:
 		case HEADING_2:
 		case HEADING_3:
+		case HEADING_4:
+		case HEADING_5:
 		case TITLE:
 			if (this.isLocked()) {
 				content = ((HTML) this.content).getText();
@@ -405,11 +408,27 @@ public class TemplateComponent {
 		case INSTRUCTION:
 			content = ((HTML) this.content).getHTML();
 			break;
+		case REPEAT_SEQUENCE:
+			RepeatableSequence repSeq = (RepeatableSequence) this.content;
+			SerializableRepeatableSequence toStore = new SerializableRepeatableSequence(getSerializableSequence(repSeq), height);
+			content = toStore;			
+			break;
 		}			
 		return new SerializableComponent(x, y, width, height, templatePage, type, idInBasket, "param empty", content,  this.doubleColLayout, isLocked(),  metadata);
 	}
 
-
+	/**
+	 * this method constructs a SerializableRepeatableSequence sequence that can be serializable
+	 * @param repSeq
+	 * @return
+	 */
+	private ArrayList<SerializableComponent> getSerializableSequence(RepeatableSequence repSeq) {
+		ArrayList<SerializableComponent> sComps = new ArrayList<SerializableComponent>();
+		for (TemplateComponent tc : repSeq.getGroupedComponents()) {
+			sComps.add(tc.getSerializable());
+		}
+		return sComps;
+	}
 
 	/**
 	 * @return .
diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/client/targets/AttributeArea.java b/src/main/java/org/gcube/portlets/user/reportgenerator/client/targets/AttributeArea.java
index 09df17b..d581d91 100644
--- a/src/main/java/org/gcube/portlets/user/reportgenerator/client/targets/AttributeArea.java
+++ b/src/main/java/org/gcube/portlets/user/reportgenerator/client/targets/AttributeArea.java
@@ -58,7 +58,7 @@ public class AttributeArea extends Composite {
 		myPanel.addStyleName("attributeArea");
 
 		attrName = new HTML(sata.getAttrName(), true);
-		attrName.getElement().getStyle().setMarginLeft(10, Unit.PX);
+		attrName.getElement().getStyle().setMarginLeft(25, Unit.PX);
 		attrName.getElement().getStyle().setMarginRight(5, Unit.PX);
 		HorizontalPanel boxesPanel = new HorizontalPanel();
 		boxesPanel.add(attrName);
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 7ee704c..2ff9643 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
@@ -81,34 +81,7 @@ public class BasicTextArea extends ReportTextArea {
 
 			}
 		});
-
-		textArea.addKeyUpHandler(new KeyUpHandler() {
-
-			public void onKeyUp(KeyUpEvent event) {
-				HTML div = ReportGenerator.get().getDivHidden();
-				GWT.log("element.getHTML():\n" + textArea.getText(), null);
-				div.setHTML(textArea.getText());
-				int newHeight = div.getOffsetHeight();
-				if (newHeight > height-10 && newHeight != currHeight) {
-					resizeMe(myPanel.getOffsetWidth(), newHeight);
-				}
-
-			}
-		});
-
-
 	}
-	/**
-	 * resize the panel
-	 * @param w
-	 * @param h
-	 */
-	private void resizeMe(int w, int h) {
-		resizePanel(w, h);
-		//Window.alert("myInstance.top: " + myInstance.top);
-		presenter.resizeTemplateComponentInModel(this, myPanel.getOffsetWidth(), h+5);
-	}
-
 	public String getText() {
 		return textArea.getText();
 	}
diff --git a/src/main/webapp/ReportGenerator.css b/src/main/webapp/ReportGenerator.css
index 9b66cd7..48198ba 100644
--- a/src/main/webapp/ReportGenerator.css
+++ b/src/main/webapp/ReportGenerator.css
@@ -217,10 +217,8 @@ tableBorder td {
 	font-family: "Courier New", Courier, monospace;
 	font-size: 11px;
 	color: #666;
-	height: 16px;
 	padding-left: 25px;
-	padding-top: 5px;
-	overflow:auto;
+	padding-top: 3px;
 }
 
 .gridAttribute {