fixed bug in reference with empty values

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/reports@86277 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.6.6-SNAPSHOT/WEB-INF/classes" path="src/main/java">
+	<classpathentry kind="src" output="target/reports-4.6.7-SNAPSHOT/WEB-INF/classes" path="src/main/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
@@ -31,5 +31,5 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="com.google.gwt.eclipse.core.GWT_CONTAINER"/>
-	<classpathentry kind="output" path="target/reports-4.6.6-SNAPSHOT/WEB-INF/classes"/>
+	<classpathentry kind="output" path="target/reports-4.6.7-SNAPSHOT/WEB-INF/classes"/>
 </classpath>

.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.6.6-SNAPSHOT
+lastWarOutDir=/Users/massi/Documents/workspace/reports/target/reports-4.6.7-SNAPSHOT
 warSrcDir=src/main/webapp
 warSrcDirIsOutput=false

pom.xml

@@ -12,7 +12,7 @@
 	<groupId>org.gcube.portlets.user</groupId>
 	<artifactId>reports</artifactId>
 	<packaging>war</packaging>
-	<version>4.6.6-SNAPSHOT</version>
+	<version>4.6.7-SNAPSHOT</version>
 	<name>gCube Reports Manager</name>
 	<description>
 		gCube Reports Portlet.
@@ -119,12 +119,7 @@
 		<dependency>
 			<groupId>com.allen-sauer.gwt.log</groupId>
 			<artifactId>gwt-log</artifactId>
-		</dependency>
+		</dependency>		
-		<dependency>
-			<groupId>org.gcube.portlets.widgets</groupId>
-			<artifactId>user-selection-dialog</artifactId>
-			<version>[1.0.1-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
-		</dependency>
 		<dependency>
 			<groupId>org.gcube.application</groupId>
 			<artifactId>gcube-reporting-modeler</artifactId>

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

@@ -463,11 +463,11 @@ public class Headerbar extends Composite{
 //		optionEncryptedModel.setHTML(EXPORT_ENCRYPTED_REPORT);
 
 		//
-		importModel.setHTML("Import from Template or Report");
+//		importModel.setHTML("Import from Template or Report");
-		importModel.setScheduledCommand(importModelOrReport);
+//		importModel.setScheduledCommand(importModelOrReport);
-
+//
-		viewMetadata.setHTML("View Metadata");
+//		viewMetadata.setHTML("View Metadata");
-		viewMetadata.setScheduledCommand(openMetadata);
+//		viewMetadata.setScheduledCommand(openMetadata);
 		
 
 //		discardSection.setHTML("Discard current");

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

@@ -5,7 +5,6 @@ import java.util.List;
 
 import org.gcube.portlets.d4sreporting.common.client.uicomponents.richtext.RichTextToolbar;
 import org.gcube.portlets.d4sreporting.common.shared.BasicSection;
-import org.gcube.portlets.d4sreporting.common.shared.ComponentType;
 import org.gcube.portlets.d4sreporting.common.shared.Metadata;
 import org.gcube.portlets.d4sreporting.common.shared.Model;
 import org.gcube.portlets.d4sreporting.common.shared.ReportReferences;
@@ -62,7 +61,6 @@ import org.gcube.portlets.widgets.exporter.client.event.ExportingCompletedEventH
 import org.gcube.portlets.widgets.exporter.client.event.ReportExporterEvent;
 import org.gcube.portlets.widgets.exporter.client.event.ReportExporterEventHandler;
 import org.gcube.portlets.widgets.exporter.shared.TypeExporter;
-import org.gcube.portlets.widgets.userselection.client.UserSelectionDialog;
 
 import com.extjs.gxt.ui.client.widget.MessageBox;
 import com.google.gwt.core.client.GWT;
@@ -138,8 +136,6 @@ public class Presenter {
 	}
 
 
-	private UserSelectionDialog itemSelectionDialog;
-
 	private void handleEvents() {
 
 		eventBus.addHandler(SelectedReportEvent.TYPE, new SelectedReportEventHandler() {			

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

@@ -8,7 +8,6 @@ import org.gcube.portlets.d4sreporting.common.shared.RepeatableSequence;
 import org.gcube.portlets.user.reportgenerator.client.Presenter.Presenter;
 import org.gcube.portlets.user.reportgenerator.client.model.TemplateComponent;
 
-import com.google.gwt.core.client.GWT;
 import com.google.gwt.user.client.ui.Composite;
 import com.google.gwt.user.client.ui.VerticalPanel;
 
@@ -99,7 +98,6 @@ public class ClientRepeatableSequence extends Composite implements ClientSequenc
 	public void add(TemplateComponent toAdd) {
 		if (toAdd.getType() != ComponentType.REPEAT_SEQUENCE_INNER) {
 			groupedComponents.add(toAdd);
-			GWT.log("ToAdd= getType " + toAdd.getType());
 			myPanel.add(toAdd.getContent());
 		}
 	}

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

@@ -67,14 +67,13 @@ public class ClientReportReference extends Composite implements ClientSequence {
 	}
 
 	private boolean isTupleEmpty(Tuple toCheck) {
-		boolean toReturn = false;
+		boolean toReturn = true;
 		for (BasicComponent bc : toCheck.getGroupedComponents()) {
-			if (bc.getPossibleContent() == null) 
+			if (bc.getPossibleContent() != null) 
-				return true;
+				return false;
 			
 		}
 		return toReturn;
-
 	}
 
 	public ArrayList<Tuple> getTupleList() {

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

@@ -173,7 +173,6 @@ public class SequenceWidget extends Composite {
 		if (toAdd.getType() != ComponentType.REPEAT_SEQUENCE_INNER) {
 			owner.getGroupedComponents().add(toAdd);
 			seqGroupedComponents.add(toAdd);
-			GWT.log("ToAdd= getType " + toAdd.getType());
 			myPanel.add(toAdd.getContent());
 		}
 	}

src/main/java/org/gcube/portlets/user/reportgenerator/server/servlet/ReportServiceImpl.java

@@ -93,7 +93,6 @@ import org.gcube.portlets.user.reportgenerator.shared.VMETypeIdentifier;
 import org.gcube.portlets.widgets.exporter.shared.SaveReportFileException;
 import org.gcube.portlets.widgets.exporter.shared.SaveReportFileExistException;
 import org.gcube.portlets.widgets.exporter.shared.TypeExporter;
-import org.gcube.portlets.widgets.userselection.shared.ItemSelectableBean;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -103,8 +102,6 @@ import com.liferay.portal.service.LockLocalServiceUtil;
 import com.liferay.portal.service.UserLocalServiceUtil;
 import com.liferay.portlet.documentlibrary.model.DLFileEntry;
 
-import edu.emory.mathcs.backport.java.util.Arrays;
-
 
 
 /**
@@ -376,6 +373,12 @@ public class ReportServiceImpl  extends RemoteServiceServlet implements ReportSe
 					OpenReportLogEntry logEntry = new OpenReportLogEntry(toReturn.getTemplateName(), templateObjectID);
 					log.logEntry(getASLSession().getUsername(), getASLSession().getScopeName(), logEntry);
 
+					try {
+						ReportsReader.readReportStructure(toReturn);
+					} catch (Exception e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
 					return toReturn;
 				}
 			}

src/main/resources/org/gcube/portlets/user/reportgenerator/ReportGenerator.gwt.xml

@@ -6,7 +6,6 @@
 	<!-- To Comment out -->
 <!-- 	<set-property name="user.agent" value="gecko1_8" /> -->
 
-	<inherits name='org.gcube.portlets.widgets.userselection.UserSelection' />
 	<inherits
 		name='org.gcube.portlets.widgets.lighttree.WorkspacePortletLightTree' />
 	<inherits name='org.gcube.portlets.user.gcubewidgets.WidgetFactory' />