From e3d900c9dd3fe95c9df93db1e7ebe3f751cb9438 Mon Sep 17 00:00:00 2001 From: Massimiliano Assante Date: Fri, 24 Jan 2014 15:25:54 +0000 Subject: [PATCH] added set id for report references git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/reports@90500 82a268e6-3cf1-43bd-a215-b396298e98cf --- .classpath | 6 +++--- .settings/com.google.gdt.eclipse.core.prefs | 2 +- pom.xml | 8 +------- .../client/model/TemplateComponent.java | 2 ++ .../client/targets/ClientReportReference.java | 12 +++++++++++- .../server/servlet/ReportServiceImpl.java | 5 +++-- 6 files changed, 21 insertions(+), 14 deletions(-) diff --git a/.classpath b/.classpath index dd1e368..e6f84d8 100644 --- a/.classpath +++ b/.classpath @@ -1,6 +1,6 @@ - + @@ -28,8 +28,8 @@ - + - + diff --git a/.settings/com.google.gdt.eclipse.core.prefs b/.settings/com.google.gdt.eclipse.core.prefs index 001af32..550f60c 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.7.2-SNAPSHOT +lastWarOutDir=/Users/massi/Documents/workspace/reports/target/reports-4.7.3-SNAPSHOT warSrcDir=src/main/webapp warSrcDirIsOutput=false diff --git a/pom.xml b/pom.xml index 983874c..47c270b 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ org.gcube.portlets.user reports war - 4.7.2-SNAPSHOT + 4.7.3-SNAPSHOT gCube Reports Manager gCube Reports Portlet. @@ -229,12 +229,6 @@ org.slf4j slf4j-api - - junit - junit - 4.7 - test - 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 bc17f4d..8119cb9 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 @@ -390,6 +390,7 @@ public class TemplateComponent { if (refs != null) { ArrayList tuple = refs.getTuples(); ClientReportReference cmSeq = new ClientReportReference(presenter, refs.getRefType(), tuple, refs.isSingleRelation()); + cmSeq.setId(sc.getId()); cmSeq.setMetadata(sc.getMetadata()); this.content = cmSeq; } else @@ -531,6 +532,7 @@ public class TemplateComponent { break; case REPORT_REFERENCE: ClientReportReference cRef = (ClientReportReference) this.content; + id = cRef.getId(); metas = cRef.getMetadata(); ReportReferences ref = new ReportReferences(cRef.getRefType(), cRef.getTupleList(), cRef.isSingleRelation()); content = ref; 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 76851f1..a9655cd 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 @@ -23,8 +23,11 @@ import com.google.gwt.user.client.ui.VerticalPanel; * */ public class ClientReportReference extends Composite implements ClientSequence, Cloneable { - + private final int indentationValue = 20; + private String id; + + private List metas; protected ArrayList groupedComponents = new ArrayList(); private VerticalPanel myPanel = new VerticalPanel(); @@ -206,4 +209,11 @@ public class ClientReportReference extends Composite implements ClientSequence, public void setMetadata(List metas) { this.metas = metas; } + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } } 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 ff92677..11797b2 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 @@ -44,6 +44,7 @@ import org.gcube.application.rsg.service.dto.ReportType; import org.gcube.application.rsg.support.builder.exceptions.ReportBuilderException; import org.gcube.application.rsg.support.builder.impl.ReportManagerReportBuilder; import org.gcube.application.rsg.support.model.components.impl.CompiledReport; +import org.gcube.application.rsg.support.model.utils.CompiledReportUtils; import org.gcube.applicationsupportlayer.social.ApplicationNotificationsManager; import org.gcube.applicationsupportlayer.social.NotificationsManager; import org.gcube.common.homelibrary.home.HomeLibrary; @@ -1618,8 +1619,8 @@ public class ReportServiceImpl extends RemoteServiceServlet implements ReportSe CompiledReport template = rsgClient.getTemplate(new ReportType(VMETypeIdentifier.Vme.getId())); CompiledReport toSend = null; try { - toSend = new ReportManagerReportBuilder().extract(template, model); - } catch (ReportBuilderException e) { + toSend = new ReportManagerReportBuilder().extract(template, model); + } catch (Exception e) { e.printStackTrace(); } //Actual RSG client interface exposes different methods (publish / publishDelta etc.) that need to be updated