diff --git a/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/CodelistMappingOperationInProgressCard.java b/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/CodelistMappingOperationInProgressCard.java
index c473132..d96fae0 100644
--- a/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/CodelistMappingOperationInProgressCard.java
+++ b/src/main/java/org/gcube/portlets/user/td/codelistmappingimportwidget/client/CodelistMappingOperationInProgressCard.java
@@ -6,25 +6,23 @@ package org.gcube.portlets.user.td.codelistmappingimportwidget.client;
import org.gcube.portlets.user.td.gwtservice.client.rpc.TDGWTServiceAsync;
import org.gcube.portlets.user.td.gwtservice.shared.codelisthelper.CodelistMappingSession;
import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTSessionExpiredException;
-import org.gcube.portlets.user.td.gwtservice.shared.monitor.OperationMonitor;
-import org.gcube.portlets.user.td.gwtservice.shared.monitor.OperationMonitorSession;
-import org.gcube.portlets.user.td.monitorwidget.client.MonitorBarUpdater;
-import org.gcube.portlets.user.td.monitorwidget.client.MonitorUpdaterListener;
-import org.gcube.portlets.user.td.monitorwidget.client.MonitorUpdater;
+import org.gcube.portlets.user.td.monitorwidget.client.MonitorDialog;
+import org.gcube.portlets.user.td.monitorwidget.client.MonitorDialogListener;
import org.gcube.portlets.user.td.widgetcommonevent.client.event.SessionExpiredEvent;
import org.gcube.portlets.user.td.widgetcommonevent.client.type.SessionExpiredType;
import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId;
import org.gcube.portlets.user.td.wizardwidget.client.WizardCard;
import com.allen_sauer.gwt.log.client.Log;
+import com.google.gwt.safehtml.shared.SafeHtmlBuilder;
import com.google.gwt.user.client.Command;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.google.gwt.user.client.ui.FlexTable;
import com.sencha.gxt.core.client.util.Margins;
import com.sencha.gxt.widget.core.client.FramedPanel;
-import com.sencha.gxt.widget.core.client.ProgressBar;
import com.sencha.gxt.widget.core.client.box.AlertMessageBox;
import com.sencha.gxt.widget.core.client.container.BoxLayoutContainer.BoxLayoutData;
+import com.sencha.gxt.widget.core.client.container.HtmlLayoutContainer;
import com.sencha.gxt.widget.core.client.container.VBoxLayoutContainer;
import com.sencha.gxt.widget.core.client.container.VBoxLayoutContainer.VBoxLayoutAlign;
import com.sencha.gxt.widget.core.client.event.HideEvent;
@@ -39,13 +37,13 @@ import com.sencha.gxt.widget.core.client.event.HideEvent.HideHandler;
*
*/
public class CodelistMappingOperationInProgressCard extends WizardCard implements
- MonitorUpdaterListener {
+MonitorDialogListener {
- public static final int STATUS_POLLING_DELAY = 1000;
+
protected CodelistMappingOperationInProgressCard thisCard;
protected CodelistMappingSession codelistMappingSession;
- protected MonitorUpdater progressUpdater;
- protected ProgressBar progressBar;
+ protected TRId newTrId;
+ protected HtmlLayoutContainer resultField;
public CodelistMappingOperationInProgressCard(final CodelistMappingSession codelistMappingSession) {
super("Operation In Progress", "");
@@ -79,14 +77,13 @@ public class CodelistMappingOperationInProgressCard extends WizardCard implement
operationInProgressPanel.add(summary, new BoxLayoutData(new Margins(20,
5, 10, 5)));
- progressBar = new ProgressBar();
- operationInProgressPanel.add(progressBar, new BoxLayoutData(
+ resultField = new HtmlLayoutContainer("
");
+
+ operationInProgressPanel.add(resultField, new BoxLayoutData(
new Margins(10, 5, 10, 5)));
-
-
-
setContent(operationInProgressPanel);
+ resultField.setVisible(false);
}
@@ -95,14 +92,8 @@ public class CodelistMappingOperationInProgressCard extends WizardCard implement
TDGWTServiceAsync.INSTANCE.startCodelistMappingImport(codelistMappingSession,
new AsyncCallback() {
- public void onSuccess(String result) {
- OperationMonitorSession operationMonitorSession=new OperationMonitorSession(result);
- progressUpdater = new MonitorUpdater(operationMonitorSession);
- progressUpdater
- .addListener(new MonitorBarUpdater(progressBar));
-
- progressUpdater.addListener(thisCard);
- progressUpdater.scheduleRepeating(STATUS_POLLING_DELAY);
+ public void onSuccess(String taskId) {
+ openMonitorDialog(taskId);
}
public void onFailure(Throwable caught) {
@@ -132,26 +123,35 @@ public class CodelistMappingOperationInProgressCard extends WizardCard implement
importCodelistMapping();
}
- @Override
- public void monitorInitializing(OperationMonitor opearationMonitor) {
+
+
+
+
- }
- @Override
- public void monitorUpdate(OperationMonitor operationMonitor) {
+ //
+ protected void openMonitorDialog(String taskId) {
+ MonitorDialog monitorDialog = new MonitorDialog(taskId, getEventBus());
+ monitorDialog.addProgressDialogListener(this);
+ monitorDialog.show();
+ }
- }
-
@Override
- public void monitorComplete(final TRId trId, OperationMonitor operationMonitor) {
-
+ public void operationComplete(TRId trId) {
+ newTrId = trId;
+ SafeHtmlBuilder safeHtmlBuilder = new SafeHtmlBuilder();
+ safeHtmlBuilder
+ .appendHtmlConstant("Operation Completed
");
+ resultField.setHTML(safeHtmlBuilder.toSafeHtml());
+ resultField.setVisible(true);
+
Command sayComplete = new Command() {
public void execute() {
try {
getWizardWindow().close(false);
- Log.info("fire Complete: "+ trId);
-
- getWizardWindow().fireCompleted(trId);
+ Log.info("fire Complete: " + newTrId);
+
+ getWizardWindow().fireCompleted(newTrId);
} catch (Exception e) {
Log.error("fire Complete :" + e.getLocalizedMessage());
@@ -163,11 +163,18 @@ public class CodelistMappingOperationInProgressCard extends WizardCard implement
setNextButtonVisible(true);
getWizardWindow().setEnableNextButton(true);
+
+ forceLayout();
+
}
-
+
@Override
- public void monitorFailed(Throwable caught, String reason,
- String failureDetails, OperationMonitor operationMonitor) {
+ public void operationFailed(Throwable caught, String reason, String details) {
+ SafeHtmlBuilder safeHtmlBuilder = new SafeHtmlBuilder();
+ safeHtmlBuilder
+ .appendHtmlConstant("Operation Failed
");
+ resultField.setHTML(safeHtmlBuilder.toSafeHtml());
+ resultField.setVisible(true);
if (caught instanceof TDGWTSessionExpiredException) {
getEventBus()
.fireEvent(
@@ -182,19 +189,28 @@ public class CodelistMappingOperationInProgressCard extends WizardCard implement
});
d.show();
}
+
+ forceLayout();
}
@Override
- public void monitorStopped(final TRId trId, String reason, String details, OperationMonitor operationMonitor) {
-
+ public void operationStopped(TRId trId, String reason, String details) {
+ newTrId = trId;
+ SafeHtmlBuilder safeHtmlBuilder = new SafeHtmlBuilder();
+ safeHtmlBuilder
+ .appendHtmlConstant("Problems in the Operation
");
+ resultField.setHTML(safeHtmlBuilder.toSafeHtml());
+ resultField.setVisible(true);
+
Command sayComplete = new Command() {
public void execute() {
try {
getWizardWindow().close(false);
- Log.info("fire Complete: tabular resource " + trId.getId());
- Log.info("fire Complete: tableId " + trId.getTableId());
+ Log.info("fire Complete: tabular resource "
+ + newTrId.getId());
+ Log.info("fire Complete: tableId " + newTrId.getTableId());
- getWizardWindow().fireCompleted(trId);
+ getWizardWindow().fireCompleted(newTrId);
} catch (Exception e) {
Log.error("fire Complete :" + e.getLocalizedMessage());
@@ -207,33 +223,68 @@ public class CodelistMappingOperationInProgressCard extends WizardCard implement
setNextButtonVisible(true);
getWizardWindow().setEnableNextButton(true);
+ forceLayout();
}
@Override
- public void monitorGeneratingView(OperationMonitor operationMonitor) {
- // TODO Auto-generated method stub
+ public void operationAborted() {
+ SafeHtmlBuilder safeHtmlBuilder = new SafeHtmlBuilder();
+ safeHtmlBuilder
+ .appendHtmlConstant("Operation Aborted
");
+ resultField.setHTML(safeHtmlBuilder.toSafeHtml());
+ resultField.setVisible(true);
+
+ Command sayComplete = new Command() {
+ public void execute() {
+ try {
+ getWizardWindow().close(false);
+ Log.info("fire Aborted");
+
+ getWizardWindow().fireAborted();
+
+ } catch (Exception e) {
+ Log.error("fire Aborted :" + e.getLocalizedMessage());
+ }
+ }
+ };
+
+ getWizardWindow().setNextButtonCommand(sayComplete);
+
+ setNextButtonVisible(true);
+ getWizardWindow().setEnableNextButton(true);
+ forceLayout();
}
@Override
- public void monitorValidate(OperationMonitor operationMonitor) {
- // TODO Auto-generated method stub
+ public void operationPutInBackground() {
+ SafeHtmlBuilder safeHtmlBuilder = new SafeHtmlBuilder();
+ safeHtmlBuilder
+ .appendHtmlConstant("Operation in Background
");
+ resultField.setHTML(safeHtmlBuilder.toSafeHtml());
+ resultField.setVisible(true);
- }
+ Command sayComplete = new Command() {
+ public void execute() {
+ try {
+ getWizardWindow().close(false);
+ Log.info("fire Operation In Background");
+ getWizardWindow().fireAborted();
+ } catch (Exception e) {
+ Log.error("fire Operation In Background :"
+ + e.getLocalizedMessage());
+ }
+ }
+ };
- @Override
- public void monitorAborted() {
- // TODO Auto-generated method stub
-
- }
+ getWizardWindow().setNextButtonCommand(sayComplete);
+ setNextButtonVisible(true);
+ getWizardWindow().setEnableNextButton(true);
+ forceLayout();
- @Override
- public void monitorPutInBackground() {
- // TODO Auto-generated method stub
-
}
}