From de3cd1b88377a6e0d22bd210d40b98e0f28d9d98 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Fri, 28 Feb 2014 13:17:25 +0000 Subject: [PATCH] Added Stop support git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-column-widget@92481 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../ChangeColumnTypeProgressBarUpdater.java | 7 ++++++ .../ChangeColumnTypeProgressDialog.java | 14 +++++++++++ .../ChangeColumnTypeProgressListener.java | 8 +++++++ .../ChangeColumnTypeProgressUpdater.java | 22 ++++++++++++++++- .../DeleteColumnProgressBarUpdater.java | 7 ++++++ .../progress/DeleteColumnProgressDialog.java | 14 +++++++++++ .../DeleteColumnProgressListener.java | 9 +++++++ .../progress/DeleteColumnProgressUpdater.java | 23 +++++++++++++++++- .../LabelColumnProgressBarUpdater.java | 7 ++++++ .../progress/LabelColumnProgressDialog.java | 13 ++++++++++ .../progress/LabelColumnProgressListener.java | 9 +++++++ .../progress/LabelColumnProgressUpdater.java | 24 ++++++++++++++++++- 12 files changed, 154 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/ChangeColumnTypeProgressBarUpdater.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/ChangeColumnTypeProgressBarUpdater.java index c045595..76f0519 100644 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/ChangeColumnTypeProgressBarUpdater.java +++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/ChangeColumnTypeProgressBarUpdater.java @@ -63,5 +63,12 @@ public class ChangeColumnTypeProgressBarUpdater implements ChangeColumnTypeProgr if (elaborated == 1) progressBar.updateProgress(1, "Completing..."); } + + @Override + public void operationStopped(String reason, String details) { + Log.info("Stopped"); + progressBar.updateText("Stopped"); + + } } diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/ChangeColumnTypeProgressDialog.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/ChangeColumnTypeProgressDialog.java index 4b809b7..c015275 100644 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/ChangeColumnTypeProgressDialog.java +++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/ChangeColumnTypeProgressDialog.java @@ -122,4 +122,18 @@ public class ChangeColumnTypeProgressDialog extends Window implements ChangeColu } hide(); } + + + @Override + public void operationStopped(String reason, String details) { + ok.setVisible(true); + this.trId=null; + AlertMessageBox d = new AlertMessageBox("Stopped Changing Column Type", reason); + d.addHideHandler(new HideHandler() { + public void onHide(HideEvent event) { + } + }); + d.show(); + + } } diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/ChangeColumnTypeProgressListener.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/ChangeColumnTypeProgressListener.java index 019115f..f37fa12 100644 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/ChangeColumnTypeProgressListener.java +++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/ChangeColumnTypeProgressListener.java @@ -38,4 +38,12 @@ public interface ChangeColumnTypeProgressListener { * @param reason the failure reason. */ public void operationFailed(Throwable caught, String reason, String failureDetails); + + + /** + * Called when the operation is failed. + * @param caught the failure exception. + * @param reason the failure reason. + */ + public void operationStopped(String reason, String details); } diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/ChangeColumnTypeProgressUpdater.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/ChangeColumnTypeProgressUpdater.java index 962baf1..8ca2d70 100644 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/ChangeColumnTypeProgressUpdater.java +++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/ChangeColumnTypeProgressUpdater.java @@ -62,7 +62,7 @@ public class ChangeColumnTypeProgressUpdater extends Timer { break; case STOPPED: cancel(); - errorMessage(result); + stopMessage(result); break; case FAILED: cancel(); @@ -103,6 +103,21 @@ public class ChangeColumnTypeProgressUpdater extends Timer { fireOperationFailed(th, failure, details); } + protected void stopMessage(ChangeColumnTypeMonitor result) { + Log.info("Change Column Type Stopped"); + String failure = null; + String details = null; + if (result.getError() != null) { + failure = "Stopped changing the column type"; + details = result.getError().getLocalizedMessage(); + } else { + failure = "Stopped changing the column type"; + details = "Change the column type stopped"; + } + + fireOperationStopped(failure, details); + } + protected String getStack(Throwable e) { String message = e.getLocalizedMessage() + " ->
"; Throwable c = e.getCause(); @@ -131,6 +146,11 @@ public class ChangeColumnTypeProgressUpdater extends Timer { for (ChangeColumnTypeProgressListener listener : listeners) listener.operationFailed(caught, failure, failureDetails); } + + protected void fireOperationStopped(String reason, String details) { + for (ChangeColumnTypeProgressListener listener : listeners) + listener.operationStopped(reason, details); + } /** * Add a new {@link ChangeColumnTypeProgressListener} to this diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/DeleteColumnProgressBarUpdater.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/DeleteColumnProgressBarUpdater.java index be4d617..0238d6d 100644 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/DeleteColumnProgressBarUpdater.java +++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/DeleteColumnProgressBarUpdater.java @@ -63,5 +63,12 @@ public class DeleteColumnProgressBarUpdater implements DeleteColumnProgressListe if (elaborated == 1) progressBar.updateProgress(1, "Completing..."); } + + @Override + public void operationStopped(String reason, String details) { + Log.info("Stopped"); + progressBar.updateText("Stopped"); + + } } diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/DeleteColumnProgressDialog.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/DeleteColumnProgressDialog.java index 4486a15..2ec2ea6 100644 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/DeleteColumnProgressDialog.java +++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/DeleteColumnProgressDialog.java @@ -122,4 +122,18 @@ public class DeleteColumnProgressDialog extends Window implements DeleteColumnPr } hide(); } + + @Override + public void operationStopped(String reason, String details) { + ok.setVisible(true); + this.trId=null; + AlertMessageBox d = new AlertMessageBox("Stopped Delete Column", reason); + d.addHideHandler(new HideHandler() { + public void onHide(HideEvent event) { + } + }); + d.show(); + + } + } diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/DeleteColumnProgressListener.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/DeleteColumnProgressListener.java index 96be39d..45a556a 100644 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/DeleteColumnProgressListener.java +++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/DeleteColumnProgressListener.java @@ -39,4 +39,13 @@ public interface DeleteColumnProgressListener { * @param reason the failure reason. */ public void operationFailed(Throwable caught, String reason, String failureDetails); + + + /** + * Called when the operation is failed. + * @param caught the failure exception. + * @param reason the failure reason. + */ + public void operationStopped(String reason, String details); + } diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/DeleteColumnProgressUpdater.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/DeleteColumnProgressUpdater.java index b78aae3..434e730 100644 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/DeleteColumnProgressUpdater.java +++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/DeleteColumnProgressUpdater.java @@ -63,7 +63,7 @@ public class DeleteColumnProgressUpdater extends Timer { break; case STOPPED: cancel(); - errorMessage(result); + stopMessage(result); break; case FAILED: cancel(); @@ -106,6 +106,22 @@ public class DeleteColumnProgressUpdater extends Timer { fireOperationFailed(th, failure, details); } + + protected void stopMessage(DeleteColumnMonitor result) { + Log.info("Delete Column Stopped"); + String failure = null; + String details = null; + if (result.getError() != null) { + failure = "Stopped delete column"; + details = result.getError().getLocalizedMessage(); + } else { + failure = "Stopped delete column"; + details = "Delete the column stopped"; + } + + fireOperationStopped(failure, details); + } + protected String getStack(Throwable e) { String message = e.getLocalizedMessage() + " ->
"; @@ -135,6 +151,11 @@ public class DeleteColumnProgressUpdater extends Timer { for (DeleteColumnProgressListener listener : listeners) listener.operationFailed(caught, failure, failureDetails); } + + protected void fireOperationStopped(String reason, String details) { + for (DeleteColumnProgressListener listener : listeners) + listener.operationStopped(reason, details); + } /** * Add a new {@link DeleteColumnProgressListener} to this diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/LabelColumnProgressBarUpdater.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/LabelColumnProgressBarUpdater.java index f368298..23636b2 100644 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/LabelColumnProgressBarUpdater.java +++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/LabelColumnProgressBarUpdater.java @@ -63,5 +63,12 @@ public class LabelColumnProgressBarUpdater implements LabelColumnProgressListene if (elaborated == 1) progressBar.updateProgress(1, "Completing..."); } + + @Override + public void operationStopped(String reason, String details) { + Log.info("Stopped"); + progressBar.updateText("Stopped"); + + } } diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/LabelColumnProgressDialog.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/LabelColumnProgressDialog.java index 0b16db8..38ec745 100644 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/LabelColumnProgressDialog.java +++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/LabelColumnProgressDialog.java @@ -123,4 +123,17 @@ public class LabelColumnProgressDialog extends Window implements LabelColumnProg } hide(); } + + @Override + public void operationStopped(String reason, String details) { + ok.setVisible(true); + this.trId=null; + AlertMessageBox d = new AlertMessageBox(reason, details); + d.addHideHandler(new HideHandler() { + public void onHide(HideEvent event) { + } + }); + d.show(); + + } } diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/LabelColumnProgressListener.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/LabelColumnProgressListener.java index 4a7e9eb..947a7e7 100644 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/LabelColumnProgressListener.java +++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/LabelColumnProgressListener.java @@ -39,4 +39,13 @@ public interface LabelColumnProgressListener { * @param reason the failure reason. */ public void operationFailed(Throwable caught, String reason, String failureDetails); + + + + /** + * Called when the operation is failed. + * @param caught the failure exception. + * @param reason the failure reason. + */ + public void operationStopped(String reason, String details); } diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/LabelColumnProgressUpdater.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/LabelColumnProgressUpdater.java index eb08fdc..9e92d03 100644 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/LabelColumnProgressUpdater.java +++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/progress/LabelColumnProgressUpdater.java @@ -63,7 +63,7 @@ public class LabelColumnProgressUpdater extends Timer { break; case STOPPED: cancel(); - errorMessage(result); + stopMessage(result); break; case FAILED: cancel(); @@ -106,6 +106,22 @@ public class LabelColumnProgressUpdater extends Timer { fireOperationFailed(th, failure, details); } + + protected void stopMessage(LabelColumnMonitor result) { + Log.info("Change Label Stopped"); + String failure = null; + String details = null; + if (result.getError() != null) { + failure = "Stopped"; + details = result.getError().getLocalizedMessage(); + } else { + failure = "Stopped"; + details = "Stopped changing the column label "; + } + + fireOperationStopped(failure, details); + } + protected String getStack(Throwable e) { String message = e.getLocalizedMessage() + " ->
"; @@ -135,6 +151,12 @@ public class LabelColumnProgressUpdater extends Timer { for (LabelColumnProgressListener listener : listeners) listener.operationFailed(caught, failure, failureDetails); } + + protected void fireOperationStopped(String reason, String details) { + for (LabelColumnProgressListener listener : listeners) + listener.operationStopped(reason, details); + } + /** * Add a new {@link LabelColumnProgressListener} to this