diff --git a/.classpath b/.classpath
index 06d096f..fd1828f 100644
--- a/.classpath
+++ b/.classpath
@@ -1,6 +1,6 @@
-
+
@@ -31,5 +31,5 @@
-
+
diff --git a/.settings/com.google.gdt.eclipse.core.prefs b/.settings/com.google.gdt.eclipse.core.prefs
index b3aab8d..e119591 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.6.6-SNAPSHOT
+lastWarOutDir=/Users/massi/Documents/workspace/reports/target/reports-4.6.7-SNAPSHOT
warSrcDir=src/main/webapp
warSrcDirIsOutput=false
diff --git a/pom.xml b/pom.xml
index c55bae7..7240118 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
org.gcube.portlets.user
reports
war
- 4.6.6-SNAPSHOT
+ 4.6.7-SNAPSHOT
gCube Reports Manager
gCube Reports Portlet.
@@ -119,12 +119,7 @@
com.allen-sauer.gwt.log
gwt-log
-
-
- org.gcube.portlets.widgets
- user-selection-dialog
- [1.0.1-SNAPSHOT, 2.0.0-SNAPSHOT)
-
+
org.gcube.application
gcube-reporting-modeler
diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/client/Headerbar.java b/src/main/java/org/gcube/portlets/user/reportgenerator/client/Headerbar.java
index 861e9a0..bf7eb5d 100644
--- a/src/main/java/org/gcube/portlets/user/reportgenerator/client/Headerbar.java
+++ b/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.setScheduledCommand(importModelOrReport);
-
- viewMetadata.setHTML("View Metadata");
- viewMetadata.setScheduledCommand(openMetadata);
+// importModel.setHTML("Import from Template or Report");
+// importModel.setScheduledCommand(importModelOrReport);
+//
+// viewMetadata.setHTML("View Metadata");
+// viewMetadata.setScheduledCommand(openMetadata);
// discardSection.setHTML("Discard current");
diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/client/Presenter/Presenter.java b/src/main/java/org/gcube/portlets/user/reportgenerator/client/Presenter/Presenter.java
index f8e1c5b..b879c99 100644
--- a/src/main/java/org/gcube/portlets/user/reportgenerator/client/Presenter/Presenter.java
+++ b/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() {
diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/client/targets/ClientRepeatableSequence.java b/src/main/java/org/gcube/portlets/user/reportgenerator/client/targets/ClientRepeatableSequence.java
index 8ffa596..98364d7 100644
--- a/src/main/java/org/gcube/portlets/user/reportgenerator/client/targets/ClientRepeatableSequence.java
+++ b/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());
}
}
diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/client/targets/ClientReportReference.java b/src/main/java/org/gcube/portlets/user/reportgenerator/client/targets/ClientReportReference.java
index 26710bf..ece756c 100644
--- a/src/main/java/org/gcube/portlets/user/reportgenerator/client/targets/ClientReportReference.java
+++ b/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)
- return true;
+ if (bc.getPossibleContent() != null)
+ return false;
}
return toReturn;
-
}
public ArrayList getTupleList() {
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 6dc5a90..9ef7cee 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
@@ -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());
}
}
diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/server/servlet/ReportServiceImpl.java b/src/main/java/org/gcube/portlets/user/reportgenerator/server/servlet/ReportServiceImpl.java
index 35d4f3a..534c758 100644
--- a/src/main/java/org/gcube/portlets/user/reportgenerator/server/servlet/ReportServiceImpl.java
+++ b/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;
}
}
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 827c2c1..088eb8c 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
@@ -6,7 +6,6 @@
-