diff --git a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXAgenciesSelectionCard.java b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXAgenciesSelectionCard.java index 303a95e..eab08bc 100644 --- a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXAgenciesSelectionCard.java +++ b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXAgenciesSelectionCard.java @@ -4,6 +4,7 @@ package org.gcube.portlets.user.td.sdmxexportwidget.client; import org.gcube.portlets.user.td.gwtservice.shared.Agencies; +import org.gcube.portlets.user.td.gwtservice.shared.sdmx.SDMXExportSession; import org.gcube.portlets.user.td.wizardwidget.client.WizardCard; import com.google.gwt.event.logical.shared.SelectionEvent; diff --git a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXAgencyTypeCard.java b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXAgencyTypeCard.java index 05fb8e4..9d77865 100644 --- a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXAgencyTypeCard.java +++ b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXAgencyTypeCard.java @@ -3,8 +3,8 @@ */ package org.gcube.portlets.user.td.sdmxexportwidget.client; -import org.gcube.portlets.user.td.sdmxexportwidget.shared.Agencies; -import org.gcube.portlets.user.td.sdmxexportwidget.shared.SDMXExportSession; +import org.gcube.portlets.user.td.gwtservice.shared.Agencies; +import org.gcube.portlets.user.td.gwtservice.shared.sdmx.SDMXExportSession; import org.gcube.portlets.user.td.wizardwidget.client.WizardCard; import com.allen_sauer.gwt.log.client.Log; diff --git a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXCodelistSelectionCard.java b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXCodelistSelectionCard.java index 4861008..ab71a7d 100644 --- a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXCodelistSelectionCard.java +++ b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXCodelistSelectionCard.java @@ -3,8 +3,8 @@ */ package org.gcube.portlets.user.td.sdmxexportwidget.client; -import org.gcube.portlets.user.td.sdmxexportwidget.shared.Codelist; -import org.gcube.portlets.user.td.sdmxexportwidget.shared.SDMXExportSession; +import org.gcube.portlets.user.td.gwtservice.shared.Codelist; +import org.gcube.portlets.user.td.gwtservice.shared.sdmx.SDMXExportSession; import org.gcube.portlets.user.td.wizardwidget.client.WizardCard; import com.allen_sauer.gwt.log.client.Log; diff --git a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXDatasetSelectionCard.java b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXDatasetSelectionCard.java index f08a787..a1e7817 100644 --- a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXDatasetSelectionCard.java +++ b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXDatasetSelectionCard.java @@ -3,7 +3,7 @@ */ package org.gcube.portlets.user.td.sdmxexportwidget.client; -import org.gcube.portlets.user.td.sdmxexportwidget.shared.SDMXExportSession; +import org.gcube.portlets.user.td.gwtservice.shared.sdmx.SDMXExportSession; import org.gcube.portlets.user.td.wizardwidget.client.WizardCard; import com.allen_sauer.gwt.log.client.Log; @@ -21,10 +21,10 @@ public class SDMXDatasetSelectionCard extends WizardCard { protected SDMXExportSession importSession; protected DatasetSelectionPanel datasetSelectionPanel; - public SDMXDatasetSelectionCard(final SDMXExportSession importSession) { + public SDMXDatasetSelectionCard(final SDMXExportSession exportSession) { super("SDMX Dataset selection", ""); - this.importSession = importSession; + this.exportSession = exportSession; thisCard=this; diff --git a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXExportWizardTD.java b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXExportWizardTD.java index 84022c9..ef6a477 100644 --- a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXExportWizardTD.java +++ b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXExportWizardTD.java @@ -1,7 +1,6 @@ package org.gcube.portlets.user.td.sdmxexportwidget.client; -import org.gcube.portlets.user.td.sdmxexportwidget.client.rpc.SDMXExportWizardServiceAsync; -import org.gcube.portlets.user.td.sdmxexportwidget.shared.SDMXExportSession; +import org.gcube.portlets.user.td.gwtservice.shared.sdmx.SDMXExportSession; import org.gcube.portlets.user.td.wizardwidget.client.WizardWindow; import com.google.gwt.user.client.rpc.AsyncCallback; diff --git a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXOperationInProgressCard.java b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXOperationInProgressCard.java index b566214..2deec64 100644 --- a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXOperationInProgressCard.java +++ b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXOperationInProgressCard.java @@ -6,8 +6,8 @@ package org.gcube.portlets.user.td.sdmxexportwidget.client; import org.gcube.portlets.user.td.sdmxexportwidget.client.progress.ImportProgressBarUpdater; import org.gcube.portlets.user.td.sdmxexportwidget.client.progress.OperationProgressListener; import org.gcube.portlets.user.td.sdmxexportwidget.client.progress.OperationProgressUpdater; -import org.gcube.portlets.user.td.sdmxexportwidget.client.rpc.SDMXExportWizardServiceAsync; -import org.gcube.portlets.user.td.sdmxexportwidget.shared.SDMXExportSession; +import org.gcube.portlets.user.td.gwtservice.client.rpc.TDGWTServiceAsync; +import org.gcube.portlets.user.td.gwtservice.shared.sdmx.SDMXExportSession; import org.gcube.portlets.user.td.wizardwidget.client.WizardCard; import org.gcube.portlets.user.td.gwtservice.shared.TRId; @@ -36,15 +36,15 @@ public class SDMXOperationInProgressCard extends WizardCard public static final int STATUS_POLLING_DELAY = 1000; protected SDMXOperationInProgressCard thisCard; - protected SDMXExportSession importSession; + protected SDMXExportSession exportSession; protected OperationProgressUpdater progressUpdater; - public SDMXOperationInProgressCard(final SDMXExportSession importSession) { + public SDMXOperationInProgressCard(final SDMXExportSession exportSession) { super("Operation In Progress", ""); - this.importSession = importSession; + this.exportSession = exportSession; thisCard=this; VBoxLayoutContainer operationInProgressPanel = new VBoxLayoutContainer(); @@ -80,7 +80,7 @@ public class SDMXOperationInProgressCard extends WizardCard public void exportSDMX() { - SDMXExportWizardServiceAsync.INSTANCE.exportSDMXClientLibraryRequest(importSession, new AsyncCallback() { + TDGWTServiceAsync.INSTANCE.exportSDMXClientLibraryRequest(exportSession, new AsyncCallback() { @Override public void onSuccess(Void result) { diff --git a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXTableDetailCard.java b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXTableDetailCard.java index e2f39b4..2862b6f 100644 --- a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXTableDetailCard.java +++ b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXTableDetailCard.java @@ -3,12 +3,14 @@ */ package org.gcube.portlets.user.td.sdmxexportwidget.client; +import java.util.ArrayList; import java.util.List; -import org.gcube.portlets.user.td.sdmxexportwidget.client.rpc.SDMXExportWizardServiceAsync; -import org.gcube.portlets.user.td.sdmxexportwidget.shared.Agencies; -import org.gcube.portlets.user.td.sdmxexportwidget.shared.SDMXExportSession; -import org.gcube.portlets.user.td.sdmxexportwidget.shared.TableDetail; +import org.gcube.portlets.user.td.gwtservice.client.rpc.TDGWTServiceAsync; +import org.gcube.portlets.user.td.gwtservice.shared.Agencies; +import org.gcube.portlets.user.td.gwtservice.shared.TabResource; +import org.gcube.portlets.user.td.gwtservice.shared.sdmx.SDMXExportSession; + import org.gcube.portlets.user.td.wizardwidget.client.WizardCard; import com.allen_sauer.gwt.log.client.Log; @@ -51,7 +53,7 @@ import com.sencha.gxt.widget.core.client.info.Info; */ public class SDMXTableDetailCard extends WizardCard { - protected SDMXExportSession importSession; + protected SDMXExportSession exportSession; protected SDMXTableDetailCard thisCard; protected static final AgenciesProperties agenciesProperties = GWT.create(AgenciesProperties.class); @@ -66,14 +68,14 @@ public class SDMXTableDetailCard extends WizardCard { protected TextField right; protected ComboBox combo=null; - TableDetail detail=new TableDetail(); - public SDMXTableDetailCard(final SDMXExportSession importSession) { + + public SDMXTableDetailCard(final SDMXExportSession exportSession) { super("SDMX Table Detail", ""); - this.importSession = importSession; + this.exportSession = exportSession; thisCard=this; @@ -99,14 +101,14 @@ public class SDMXTableDetailCard extends WizardCard { name = new TextField(); name.setAllowBlank(false); name.setEmptyText("Enter a name..."); - name.setValue(importSession.getSelectedCodelist().getName()); + name.setValue(exportSession.getSelectedCodelist().getName()); p.add(new FieldLabel(name, "Name"), new VerticalLayoutData(1, -1)); description = new TextArea(); description.setAllowBlank(false); description.setEmptyText("Enter a description..."); - description.setValue(importSession.getSelectedCodelist().getDescription()); + description.setValue(exportSession.getSelectedCodelist().getDescription()); p.add(new FieldLabel(description, "Description"), new VerticalLayoutData(1, -1)); right = new TextField(); @@ -168,7 +170,7 @@ public class SDMXTableDetailCard extends WizardCard { protected void loadData(PagingLoadConfig loadConfig, final AsyncCallback> callback) { - SDMXExportWizardServiceAsync.INSTANCE.getAgencies(new AsyncCallback>() { + TDGWTServiceAsync.INSTANCE.getAgencies(new AsyncCallback>() { @Override public void onFailure(Throwable caught) { @@ -176,7 +178,7 @@ public class SDMXTableDetailCard extends WizardCard { } @Override - public void onSuccess(List result) { + public void onSuccess(ArrayList result) { Log.trace("loaded "+result.size()+" agencies"); for(int i=0; i() { + TDGWTServiceAsync.INSTANCE.getSDMXExportMonitor(new AsyncCallback() { @Override public void onFailure(Throwable caught) { @@ -44,7 +44,7 @@ public class OperationProgressUpdater extends Timer { } @Override - public void onSuccess(ExportMonitor result) { + public void onSuccess(SDMXExportMonitor result) { Log.info("retrieved ImportMonitor: "+result.getStatus()); switch (result.getStatus()) { case WAITING: @@ -61,8 +61,8 @@ public class OperationProgressUpdater extends Timer { break; case SUCCEDED: cancel(); - Log.info("Import fisnish TableId :"+result.getTrId()); - fireOperationComplete(result.getTrId()); + Log.info("Import fisnish TableId :"+result.getUrl()); + fireOperationComplete(result.getUrl()); break; case ABORTED: cancel(); @@ -101,9 +101,9 @@ public class OperationProgressUpdater extends Timer { for (OperationProgressListener listener:listeners) listener.operationUpdate(elaborated); } - protected void fireOperationComplete(TRId trId) + protected void fireOperationComplete(String url) { - for (OperationProgressListener listener:listeners) listener.operationComplete(trId); + for (OperationProgressListener listener:listeners) listener.operationComplete(url); } protected void fireOperationFailed(Throwable caught, String failure, String failureDetails)