diff --git a/.classpath b/.classpath
index fc0dc22..9a07555 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 8e5c4eb..1bd2e50 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.2-SNAPSHOT
+lastWarOutDir=/Users/massi/Documents/workspace/reports/target/reports-4.6.3-SNAPSHOT
warSrcDir=src/main/webapp
warSrcDirIsOutput=false
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index ad7b9c6..a7ced10 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -5,15 +5,12 @@
-
- uses
-
-
- uses
-
uses
+
+ uses
+
diff --git a/pom.xml b/pom.xml
index a492dcc..e9b749a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
org.gcube.portlets.user
reports
war
- 4.6.2-SNAPSHOT
+ 4.6.3-SNAPSHOT
gCube Reports Portlet
gCube Reports Portlet.
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 6683549..a2d49a5 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
@@ -10,6 +10,7 @@ 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.RepeatableSequence;
+import org.gcube.portlets.d4sreporting.common.shared.ReportReference;
import org.gcube.portlets.d4sreporting.common.shared.Tuple;
import org.gcube.portlets.user.reportgenerator.client.Headerbar;
import org.gcube.portlets.user.reportgenerator.client.ReportConstants;
@@ -43,7 +44,7 @@ import org.gcube.portlets.user.reportgenerator.client.targets.BasicTextArea;
import org.gcube.portlets.user.reportgenerator.client.targets.ClientImage;
import org.gcube.portlets.user.reportgenerator.client.targets.ClientRepeatableSequence;
import org.gcube.portlets.user.reportgenerator.client.targets.ClientSequence;
-import org.gcube.portlets.user.reportgenerator.client.targets.ClientTuple;
+import org.gcube.portlets.user.reportgenerator.client.targets.ClientReportReference;
import org.gcube.portlets.user.reportgenerator.client.targets.Coords;
import org.gcube.portlets.user.reportgenerator.client.targets.D4sRichTextarea;
import org.gcube.portlets.user.reportgenerator.client.targets.GenericTable;
@@ -1052,8 +1053,8 @@ public class Presenter {
ClientRepeatableSequence rps = (ClientRepeatableSequence) component.getContent();
wp.addComponentToLayout(rps, component.isDoubleColLayout());
break;
- case TUPLE:
- ClientTuple cmSeq = (ClientTuple) component.getContent();
+ case REPORT_REFERENCE:
+ ClientReportReference cmSeq = (ClientReportReference) component.getContent();
wp.addComponentToLayout(cmSeq, component.isDoubleColLayout());
break;
case BODY_TABLE_IMAGE:
@@ -1363,9 +1364,9 @@ public class Presenter {
//the Repeatable Seq must be in the 1st Section, second component. (because ReportsModeler put it that way)
BasicSection firstSection = reportRef.getSections().get(0);
if (firstSection.getComponents() != null && firstSection.getComponents().size()==2) {
- @SuppressWarnings("unchecked")
- ArrayList toPass = (ArrayList) firstSection.getComponents().get(1).getPossibleContent();
- clientSeqSelected.add(toPass.get(0).getKey(), toPass.get(0));
+
+ ReportReference toPass = (ReportReference) firstSection.getComponents().get(1).getPossibleContent();
+ clientSeqSelected.add(toPass.getTuples().get(0).getKey(), toPass.getTuples().get(0));
}
else {
Window.alert("Sorry, we could not locate the ReportRef correctly in the model instance");
@@ -1392,6 +1393,6 @@ public class Presenter {
return VMETypeIdentifier.FisheryAreasHistory;
else if (theType.equals("VmesHistory"))
return VMETypeIdentifier.VmesHistory;
- throw new Exception("Could not find any valid Report Ref, got " + theType + " should be any of " + VMETypeIdentifier.values());
+ throw new Exception("Could not find any valid Report Ref, got " + theType + " should be any of " + VMETypeIdentifier.values().toString());
}
}
diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/client/ToolboxPanel.java b/src/main/java/org/gcube/portlets/user/reportgenerator/client/ToolboxPanel.java
index a688deb..c2f1fa7 100644
--- a/src/main/java/org/gcube/portlets/user/reportgenerator/client/ToolboxPanel.java
+++ b/src/main/java/org/gcube/portlets/user/reportgenerator/client/ToolboxPanel.java
@@ -28,11 +28,11 @@ public class ToolboxPanel extends SimplePanel {
public static final int TOOLBOX_HEIGHT= 800;
public ToolboxPanel(AppControllerExplorer appController) {
- this.appController = appController;
- AsyncTreePanel tp = appController.getTree(TOOLBOX_WIDTH, TOOLBOX_HEIGHT);
- this.tp = tp;
- add(tp);
- this.appController.hideSharingFacilities(); //sharing disabled we have problems from Reports
+// this.appController = appController;
+// AsyncTreePanel tp = appController.getTree(TOOLBOX_WIDTH, TOOLBOX_HEIGHT);
+// this.tp = tp;
+// add(tp);
+// this.appController.hideSharingFacilities(); //sharing disabled we have problems from Reports
}
public void showExportedVersion(String id, String fileName) {
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 a5e4d88..47b7809 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
@@ -8,6 +8,7 @@ import java.util.List;
import org.gcube.portlets.d4sreporting.common.shared.AttributeArea;
import org.gcube.portlets.d4sreporting.common.shared.BasicComponent;
import org.gcube.portlets.d4sreporting.common.shared.ComponentType;
+import org.gcube.portlets.d4sreporting.common.shared.ReportReference;
import org.gcube.portlets.d4sreporting.common.shared.Tuple;
import org.gcube.portlets.d4sreporting.common.shared.Metadata;
import org.gcube.portlets.d4sreporting.common.shared.RepTimeSeries;
@@ -19,7 +20,7 @@ import org.gcube.portlets.user.reportgenerator.client.targets.AttributeSingleSel
import org.gcube.portlets.user.reportgenerator.client.targets.BasicTextArea;
import org.gcube.portlets.user.reportgenerator.client.targets.ClientImage;
import org.gcube.portlets.user.reportgenerator.client.targets.ClientSequence;
-import org.gcube.portlets.user.reportgenerator.client.targets.ClientTuple;
+import org.gcube.portlets.user.reportgenerator.client.targets.ClientReportReference;
import org.gcube.portlets.user.reportgenerator.client.targets.ClientRepeatableSequence;
import org.gcube.portlets.user.reportgenerator.client.targets.D4sRichTextarea;
import org.gcube.portlets.user.reportgenerator.client.targets.DropTSListener;
@@ -369,12 +370,13 @@ public class TemplateComponent {
}
this.content = tti;
break;
- case TUPLE:
+ case REPORT_REFERENCE:
GWT.log("FOUND Master SEQUENCE trying getGroup");
- @SuppressWarnings("unchecked")
- ArrayList tuple = (ArrayList) sc.getPossibleContent();
- ClientTuple cmSeq = new ClientTuple(presenter, tuple);
+ ReportReference ref = (ReportReference) sc.getPossibleContent();
+ ArrayList tuple = ref.getTuples();
+
+ ClientReportReference cmSeq = new ClientReportReference(presenter, ref.getRefType(), tuple);
this.content = cmSeq;
break;
}
@@ -482,10 +484,10 @@ public class TemplateComponent {
RepeatableSequence toSave = new RepeatableSequence(getSerializableSequence(tti), height);
content = toSave;
break;
- case TUPLE:
- ClientTuple cTuples = (ClientTuple) this.content;
- ArrayList tuples = cTuples.getTupleList();
- content = tuples;
+ case REPORT_REFERENCE:
+ ClientReportReference cRef = (ClientReportReference) this.content;
+ ReportReference ref = new ReportReference(cRef.getRefType(), cRef.getTupleList());
+ content = ref;
break;
}
diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/client/targets/ClientTuple.java b/src/main/java/org/gcube/portlets/user/reportgenerator/client/targets/ClientReportReference.java
similarity index 89%
rename from src/main/java/org/gcube/portlets/user/reportgenerator/client/targets/ClientTuple.java
rename to src/main/java/org/gcube/portlets/user/reportgenerator/client/targets/ClientReportReference.java
index 90b4ee3..3067f6b 100644
--- a/src/main/java/org/gcube/portlets/user/reportgenerator/client/targets/ClientTuple.java
+++ b/src/main/java/org/gcube/portlets/user/reportgenerator/client/targets/ClientReportReference.java
@@ -18,11 +18,12 @@ import com.google.gwt.user.client.ui.VerticalPanel;
* @author massi
*
*/
-public class ClientTuple extends Composite implements ClientSequence {
+public class ClientReportReference extends Composite implements ClientSequence {
protected ArrayList groupedComponents = new ArrayList();
private VerticalPanel myPanel = new VerticalPanel();
+ private String refType;
private ArrayList tupleList;
private SequenceWidget first;
private Presenter p;
@@ -32,8 +33,9 @@ public class ClientTuple extends Composite implements ClientSequence {
* @param p
* @param ms
*/
- public ClientTuple(Presenter p, ArrayList tupleList) {
+ public ClientReportReference(Presenter p, String refType, ArrayList tupleList) {
this.p = p;
+ this.refType = refType;
this.tupleList = tupleList;
for (Tuple seq : tupleList) {
if (myPanel.getWidgetCount()==0) { // if is the first one
@@ -86,7 +88,7 @@ public class ClientTuple extends Composite implements ClientSequence {
myPanel.add(seqW);
first.hideClearAssociationButton();
}
- //needed for the model //TODO: preserve the id!!
+ //needed for the model
Tuple toAdd = new Tuple(id, sequence.getGroupedComponents());
tupleList.add(toAdd);
return true;
@@ -110,10 +112,9 @@ public class ClientTuple extends Composite implements ClientSequence {
@Override
public void AddButtonClicked(RepeatableSequence sequence) {
- Tuple tuple = (Tuple) sequence;
VMETypeIdentifier type2Pass = null;
try {
- type2Pass = p.getTypeIdFromString(tuple.getKey());
+ type2Pass = p.getTypeIdFromString(refType);
} catch (Exception e) {
e.printStackTrace();
}
@@ -121,6 +122,7 @@ public class ClientTuple extends Composite implements ClientSequence {
p.setClientSequenceSelected(this); //important!
}
-
-
+ public String getRefType() {
+ return refType;
+ }
}
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 dc04bce..66e0977 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,8 +6,8 @@
-
-
+
+
@@ -15,7 +15,7 @@
-
+