diff --git a/distro/changelog.xml b/distro/changelog.xml index ed012a1..752c01a 100644 --- a/distro/changelog.xml +++ b/distro/changelog.xml @@ -1,4 +1,7 @@ + + Support Java 8 compatibility [ticket #8580] + Updated dependencies diff --git a/pom.xml b/pom.xml index e207c39..5d47654 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ 4.0.0 org.gcube.portlets.user tabular-data-monitor-widget - 1.4.0-SNAPSHOT + 1.5.0-SNAPSHOT tabular-data-monitor-widget tabular-data-monitor-widget allows monitoring of tasks diff --git a/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/MonitorBarUpdater.java b/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/MonitorBarUpdater.java index 2099100..f21d4af 100644 --- a/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/MonitorBarUpdater.java +++ b/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/MonitorBarUpdater.java @@ -10,8 +10,8 @@ import com.sencha.gxt.widget.core.client.ProgressBar; /** * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class MonitorBarUpdater implements MonitorUpdaterListener { diff --git a/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/MonitorDialog.java b/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/MonitorDialog.java index b33f225..f0f2809 100644 --- a/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/MonitorDialog.java +++ b/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/MonitorDialog.java @@ -32,8 +32,8 @@ import com.sencha.gxt.widget.core.client.event.SelectEvent.SelectHandler; /** * AddColumnProgressDialog is a Dialog that show progress of AddColumn * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class MonitorDialog extends Window implements MonitorUpdaterListener { diff --git a/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/MonitorDialogEventUIListener.java b/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/MonitorDialogEventUIListener.java index 3901abb..0a397ce 100644 --- a/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/MonitorDialogEventUIListener.java +++ b/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/MonitorDialogEventUIListener.java @@ -1,5 +1,10 @@ package org.gcube.portlets.user.td.monitorwidget.client; +/** + * + * @author Giancarlo Panichi + * + */ public interface MonitorDialogEventUIListener { /** * Called when the operation is aborted diff --git a/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/MonitorDialogListener.java b/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/MonitorDialogListener.java index 9c5eb83..325cbd8 100644 --- a/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/MonitorDialogListener.java +++ b/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/MonitorDialogListener.java @@ -5,8 +5,8 @@ import org.gcube.portlets.user.td.widgetcommonevent.shared.OperationResult; /** * - * @author "Giancarlo Panichi" - * email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public interface MonitorDialogListener { @@ -14,16 +14,16 @@ public interface MonitorDialogListener { /** * Called when the operation is complete. - * @param operationResult TODO + * @param operationResult Operation result */ public void operationComplete(OperationResult operationResult); /** * Called when the operation is failed. * - * @param caught - * @param reason - * @param details + * @param caught Error + * @param reason Reason + * @param details Details */ public void operationFailed(Throwable caught, String reason, String details); @@ -31,9 +31,10 @@ public interface MonitorDialogListener { /** * Called when the operation is stopped - * @param operationResult TODO - * @param reason - * @param details + * + * @param operationResult Operation result + * @param reason Reason + * @param details Details */ public void operationStopped(OperationResult operationResult, String reason, String details); diff --git a/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/MonitorUpdater.java b/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/MonitorUpdater.java index f60a5b6..2cc3811 100644 --- a/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/MonitorUpdater.java +++ b/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/MonitorUpdater.java @@ -10,117 +10,104 @@ import com.allen_sauer.gwt.log.client.Log; import com.google.gwt.user.client.Timer; import com.google.gwt.user.client.rpc.AsyncCallback; - /** * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class MonitorUpdater extends Timer implements MonitorDialogEventUIListener { - + private ArrayList listeners = new ArrayList(); private OperationMonitorSession operationMonitorSession; - - public MonitorUpdater(OperationMonitorSession operationMonitorSession){ - this.operationMonitorSession=operationMonitorSession; - + + public MonitorUpdater(OperationMonitorSession operationMonitorSession) { + this.operationMonitorSession = operationMonitorSession; + } - - /** - * {@inheritDoc} - */ + @Override public void run() { Log.debug("requesting operation progress"); - TDGWTServiceAsync.INSTANCE - .getOperationMonitor(operationMonitorSession,new AsyncCallback() { + TDGWTServiceAsync.INSTANCE.getOperationMonitor(operationMonitorSession, new AsyncCallback() { - - public void onFailure(Throwable caught) { - cancel(); - - Log.error("Error retrieving the operation state", - caught); - String message = getStack(caught); - fireMonitorFailed(caught, - "Failed getting operation updates", message, null); - } + public void onFailure(Throwable caught) { + cancel(); - public void onSuccess(OperationMonitor result) { - Log.debug("retrieved OperationMonitor: " - + result); - - if(result==null){ - return; - } - if(result.isInBackground()){ - Log.debug("Operation is in background"); - cancel(); - fireMonitorPutInBackground(); - return; - } - - if(result.isAbort()){ - Log.debug("Operation is aborted"); - cancel(); - fireMonitorAborted(); - - } - - if(result.getTask()==null|| result.getTask().getState()==null){ - return; - } - - switch (result.getTask().getState()) { - case INITIALIZING: - Log.info("Initializing..."); - fireMonitorInitializing(result); - break; - case ABORTED: - cancel(); - fireMonitorAborted(); - Log.info("Aborted"); - break; - case IN_PROGRESS: - fireMonitorUpdate(result); - - break; - case VALIDATING_RULES: - fireMonitorValidate(result); - break; - case GENERATING_VIEW: - Log.info("Generating View..."); - fireMonitorGeneratingView(result); - break; - case STOPPED: - cancel(); - stopMessage(result); - break; - case FAILED: - cancel(); - errorMessage(result); - break; - case SUCCEDED: - cancel(); - Log.info("Fisnish :" - + result.getTrId()); - fireMonitorComplete(result); - break; - default: - Log.info("Unknow State"); - break; - } + Log.error("Error retrieving the operation state", caught); + String message = getStack(caught); + fireMonitorFailed(caught, "Failed getting operation updates", message, null); + } - } + public void onSuccess(OperationMonitor result) { + Log.debug("retrieved OperationMonitor: " + result); - + if (result == null) { + return; + } + if (result.isInBackground()) { + Log.debug("Operation is in background"); + cancel(); + fireMonitorPutInBackground(); + return; + } - }); + if (result.isAbort()) { + Log.debug("Operation is aborted"); + cancel(); + fireMonitorAborted(); + + } + + if (result.getTask() == null || result.getTask().getState() == null) { + return; + } + + switch (result.getTask().getState()) { + case INITIALIZING: + Log.info("Initializing..."); + fireMonitorInitializing(result); + break; + case ABORTED: + cancel(); + fireMonitorAborted(); + Log.info("Aborted"); + break; + case IN_PROGRESS: + fireMonitorUpdate(result); + + break; + case VALIDATING_RULES: + fireMonitorValidate(result); + break; + case GENERATING_VIEW: + Log.info("Generating View..."); + fireMonitorGeneratingView(result); + break; + case STOPPED: + cancel(); + stopMessage(result); + break; + case FAILED: + cancel(); + errorMessage(result); + break; + case SUCCEDED: + cancel(); + Log.info("Fisnish :" + result.getTrId()); + fireMonitorComplete(result); + break; + default: + Log.info("Unknow State"); + break; + } + + } + + }); } - protected void errorMessage(OperationMonitor result) { Log.info("Operation Failed"); Throwable th; @@ -135,25 +122,24 @@ public class MonitorUpdater extends Timer implements MonitorDialogEventUIListene reason = "Error on Service"; details = "Operation failed"; } - - fireMonitorFailed(th, reason, details,result); + + fireMonitorFailed(th, reason, details, result); } - + protected void stopMessage(OperationMonitor result) { Log.info("Operation Stopped"); String reason = null; String details = null; - if (result.getTask().getErrorCause() != null) { + if (result.getTask().getErrorCause() != null) { reason = "Validations failed"; details = result.getTask().getErrorCause().getLocalizedMessage(); } else { reason = "Validations failed"; details = "Operation stopped"; } - - fireMonitorStopped(reason, details,result); + + fireMonitorStopped(reason, details, result); } - protected String getStack(Throwable e) { String message = e.getLocalizedMessage() + " ->
"; @@ -167,7 +153,7 @@ public class MonitorUpdater extends Timer implements MonitorDialogEventUIListene for (MonitorUpdaterListener listener : listeners) listener.monitorInitializing(result); } - + protected void fireMonitorGeneratingView(OperationMonitor result) { for (MonitorUpdaterListener listener : listeners) listener.monitorGeneratingView(result); @@ -177,7 +163,7 @@ public class MonitorUpdater extends Timer implements MonitorDialogEventUIListene for (MonitorUpdaterListener listener : listeners) listener.monitorUpdate(result); } - + protected void fireMonitorValidate(OperationMonitor result) { for (MonitorUpdaterListener listener : listeners) listener.monitorValidate(result); @@ -188,8 +174,8 @@ public class MonitorUpdater extends Timer implements MonitorDialogEventUIListene listener.monitorComplete(result); } - protected void fireMonitorFailed(Throwable caught, String failure, - String failureDetails, OperationMonitor operationMonitor) { + protected void fireMonitorFailed(Throwable caught, String failure, String failureDetails, + OperationMonitor operationMonitor) { for (MonitorUpdaterListener listener : listeners) listener.monitorFailed(caught, failure, failureDetails, operationMonitor); } @@ -198,21 +184,19 @@ public class MonitorUpdater extends Timer implements MonitorDialogEventUIListene for (MonitorUpdaterListener listener : listeners) listener.monitorStopped(reason, details, operationMonitor); } - + protected void fireMonitorAborted() { for (MonitorUpdaterListener listener : listeners) listener.monitorAborted(); } - + protected void fireMonitorPutInBackground() { for (MonitorUpdaterListener listener : listeners) listener.monitorPutInBackground(); } - - + /** - * Add a new {@link MonitorUpdaterListener} to this - * {@link AddColumnProgressUpdater}. + * Add a new MonitorUpdaterListener to this * * @param listener * the listener to add. @@ -222,8 +206,8 @@ public class MonitorUpdater extends Timer implements MonitorDialogEventUIListene } /** - * Removes the specified {@link MonitorUpdaterListener} from this - * {@link AddColumnProgressUpdater}. + * Removes the specified MonitorUpdaterListener from this + * * * @param listener * the listener to remove. @@ -232,19 +216,15 @@ public class MonitorUpdater extends Timer implements MonitorDialogEventUIListene listeners.remove(listener); } - - - @Override public void requestAborted() { operationMonitorSession.setAbort(true); - - } + } @Override public void requestPutInBackground() { operationMonitorSession.setInBackground(true); - + } } diff --git a/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/MonitorUpdaterListener.java b/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/MonitorUpdaterListener.java index f43761c..d99f4d4 100644 --- a/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/MonitorUpdaterListener.java +++ b/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/MonitorUpdaterListener.java @@ -1,39 +1,45 @@ package org.gcube.portlets.user.td.monitorwidget.client; - import org.gcube.portlets.user.td.gwtservice.shared.monitor.OperationMonitor; - - /** * Defines a listener for operation progress. * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public interface MonitorUpdaterListener { - + /** * Called when the operation is starting. + * + * @param operationMonitor + * Operation monitor */ public void monitorInitializing(OperationMonitor operationMonitor); - + /** * Called when there is a progress for the operation. - * @param elaborated the elaborated part. + * + * @param operationMonitor + * Operation monitor */ public void monitorUpdate(OperationMonitor operationMonitor); - + /** * Called when there is a validate for the operation. - * @param elaborated the elaborated part. + * + * @param operationMonitor + * Operation monitor */ - public void monitorValidate(OperationMonitor operationMonitor); - + public void monitorValidate(OperationMonitor operationMonitor); + /** * Called when the operation is complete. - * @param operationMonitor + * + * @param operationMonitor + * Operation monitor */ public void monitorComplete(OperationMonitor operationMonitor); @@ -41,40 +47,45 @@ public interface MonitorUpdaterListener { * Called when the operation is failed. * * @param caught + * Error * @param reason + * Reason * @param details - * @param operationMonitor + * Details + * @param operationMonitor + * Operation monitor */ public void monitorFailed(Throwable caught, String reason, String details, OperationMonitor operationMonitor); - + /** * Called when the operation is stopped * + * * @param reason + * Reason * @param details - * @param operationMonitor + * Details + * @param operationMonitor + * Operation monitor */ public void monitorStopped(String reason, String details, OperationMonitor operationMonitor); - - + /** * Called when the operation is aborted + * */ public void monitorAborted(); - - + /** - * Called when the operation is put in background + * Called when the operation is put in background */ public void monitorPutInBackground(); - - + /** - * Called when the operation is generating the view + * Called when the operation is generating the view + * + * @param operationMonitor Operation monitor */ public void monitorGeneratingView(OperationMonitor operationMonitor); - - - - + } diff --git a/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/MonitorWidgetEntry.java b/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/MonitorWidgetEntry.java index f0fd702..6a900f3 100644 --- a/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/MonitorWidgetEntry.java +++ b/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/MonitorWidgetEntry.java @@ -23,8 +23,8 @@ import com.google.web.bindery.event.shared.SimpleEventBus; /** * - * @author "Giancarlo Panichi" email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class MonitorWidgetEntry implements EntryPoint { diff --git a/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/background/MonitorBackgroundDialog.java b/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/background/MonitorBackgroundDialog.java index 70ce59e..5f61f2e 100644 --- a/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/background/MonitorBackgroundDialog.java +++ b/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/background/MonitorBackgroundDialog.java @@ -13,8 +13,8 @@ import com.sencha.gxt.widget.core.client.event.SelectEvent.SelectHandler; /** * Background Operations Monitor * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class MonitorBackgroundDialog extends Window { diff --git a/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/background/MonitorBackgroundEventUIListener.java b/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/background/MonitorBackgroundEventUIListener.java index f025dcf..76c7e53 100644 --- a/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/background/MonitorBackgroundEventUIListener.java +++ b/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/background/MonitorBackgroundEventUIListener.java @@ -1,9 +1,15 @@ package org.gcube.portlets.user.td.monitorwidget.client.background; +/** + * + * @author Giancarlo Panichi + * + */ public interface MonitorBackgroundEventUIListener { /** * Called when the task is aborted * + * @param taskId Task id */ public void requestAborted(String taskId); @@ -11,6 +17,7 @@ public interface MonitorBackgroundEventUIListener { /** * Called when the task is hidden * + * @param taskId Task id */ public void requestHidden(String taskId); @@ -18,6 +25,8 @@ public interface MonitorBackgroundEventUIListener { /** * Called when the task is resumed * + * + * @param taskId Task id */ public void requestResume(String taskId); diff --git a/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/background/MonitorBackgroundInfoDialog.java b/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/background/MonitorBackgroundInfoDialog.java index 3a3792e..ef11511 100644 --- a/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/background/MonitorBackgroundInfoDialog.java +++ b/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/background/MonitorBackgroundInfoDialog.java @@ -12,8 +12,8 @@ import com.sencha.gxt.widget.core.client.event.SelectEvent.SelectHandler; /** * Background Operations Monitor * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class MonitorBackgroundInfoDialog extends Window { diff --git a/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/background/MonitorBackgroundInfoPanel.java b/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/background/MonitorBackgroundInfoPanel.java index ccd19ce..836c3c6 100644 --- a/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/background/MonitorBackgroundInfoPanel.java +++ b/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/background/MonitorBackgroundInfoPanel.java @@ -52,8 +52,8 @@ import com.sencha.gxt.widget.core.client.treegrid.TreeGrid; /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class MonitorBackgroundInfoPanel extends FramedPanel implements diff --git a/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/background/MonitorBackgroundInfoUpdater.java b/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/background/MonitorBackgroundInfoUpdater.java index 18c8b9f..d6d18ce 100644 --- a/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/background/MonitorBackgroundInfoUpdater.java +++ b/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/background/MonitorBackgroundInfoUpdater.java @@ -12,8 +12,8 @@ import com.google.gwt.user.client.rpc.AsyncCallback; /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class MonitorBackgroundInfoUpdater extends Timer { @@ -27,9 +27,7 @@ public class MonitorBackgroundInfoUpdater extends Timer { } - /** - * {@inheritDoc} - */ + @Override public void run() { Log.debug("requesting operation in background "); @@ -68,19 +66,11 @@ public class MonitorBackgroundInfoUpdater extends Timer { listener.retrieveBackgroundOperationMonitorFailed(throwable); } - /** - * - * - * @param listener - */ + public void addListener(MonitorBackgroundInfoUpdaterListener listener) { listeners.add(listener); } - /** - * - * @param listener - */ public void removeListener(MonitorBackgroundInfoUpdaterListener listener) { listeners.remove(listener); } diff --git a/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/background/MonitorBackgroundInfoUpdaterListener.java b/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/background/MonitorBackgroundInfoUpdaterListener.java index bf778f3..f97dd84 100644 --- a/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/background/MonitorBackgroundInfoUpdaterListener.java +++ b/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/background/MonitorBackgroundInfoUpdaterListener.java @@ -4,20 +4,24 @@ import org.gcube.portlets.user.td.gwtservice.shared.monitor.OperationMonitor; /** * - * @author giancarlo - * email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public interface MonitorBackgroundInfoUpdaterListener { /** * Called when the operation is updated + * + * @param operationMonitor Operation monitor */ public void backgroundOperationMonitorUpdated(OperationMonitor operationMonitor); /** * Called when operation is failed + * + * @param caught Error */ public void retrieveBackgroundOperationMonitorFailed(Throwable caught); diff --git a/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/background/MonitorBackgroundPanel.java b/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/background/MonitorBackgroundPanel.java index 45d8701..e1e45a2 100644 --- a/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/background/MonitorBackgroundPanel.java +++ b/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/background/MonitorBackgroundPanel.java @@ -40,8 +40,8 @@ import com.sencha.gxt.widget.core.client.menu.MenuItem; /** * - * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class MonitorBackgroundPanel extends FramedPanel implements diff --git a/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/background/MonitorBackgroundUpdater.java b/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/background/MonitorBackgroundUpdater.java index 7bbe0af..a6c12e9 100644 --- a/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/background/MonitorBackgroundUpdater.java +++ b/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/background/MonitorBackgroundUpdater.java @@ -11,113 +11,82 @@ import com.allen_sauer.gwt.log.client.Log; import com.google.gwt.user.client.Timer; import com.google.gwt.user.client.rpc.AsyncCallback; - /** * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class MonitorBackgroundUpdater extends Timer implements MonitorBackgroundEventUIListener { - + private ArrayList listeners = new ArrayList(); private BackgroundOperationMonitorSession backgroundOperationMonitorSession; - - public MonitorBackgroundUpdater(){ - backgroundOperationMonitorSession=new BackgroundOperationMonitorSession(); + + public MonitorBackgroundUpdater() { + backgroundOperationMonitorSession = new BackgroundOperationMonitorSession(); } - - - /** - * {@inheritDoc} - */ + @Override public void run() { Log.debug("requesting list of operation in background "); - TDGWTServiceAsync.INSTANCE - .getBackgroundOperationMonitor(backgroundOperationMonitorSession, new AsyncCallback>() { + TDGWTServiceAsync.INSTANCE.getBackgroundOperationMonitor(backgroundOperationMonitorSession, + new AsyncCallback>() { - public void onFailure(Throwable caught) { cancel(); - - Log.error("Error retrieving operation monitor list", - caught); - + + Log.error("Error retrieving operation monitor list", caught); + fireRetrieveOperationMonitorListFailed(caught); } public void onSuccess(ArrayList result) { - Log.debug("retrieved Operation Monitor List: " - + result.size()); - - fireOperationMonitorListUpdated(result); - - } + Log.debug("retrieved Operation Monitor List: " + result.size()); - + fireOperationMonitorListUpdated(result); + + } }); } - - protected void fireOperationMonitorListUpdated(ArrayList operationMonitorList){ + protected void fireOperationMonitorListUpdated(ArrayList operationMonitorList) { for (MonitorBackgroundUpdaterListener listener : listeners) listener.operationMonitorListUpdated(operationMonitorList); } - - protected void fireRetrieveOperationMonitorListFailed(Throwable throwable){ + + protected void fireRetrieveOperationMonitorListFailed(Throwable throwable) { for (MonitorBackgroundUpdaterListener listener : listeners) listener.retrieveOperationMonitorListFailed(throwable); } - - - - /** - * - * - * @param listener - */ + public void addListener(MonitorBackgroundUpdaterListener listener) { listeners.add(listener); } - - /** - * - * @param listener - */ public void removeListener(MonitorBackgroundUpdaterListener listener) { listeners.remove(listener); } - @Override public void requestAborted(String taskId) { - OperationMonitorSession operationMonitorSession=new OperationMonitorSession(taskId); + OperationMonitorSession operationMonitorSession = new OperationMonitorSession(taskId); operationMonitorSession.setAbort(true); backgroundOperationMonitorSession.addToOperationMonitorSessionList(operationMonitorSession); } @Override public void requestHidden(String taskId) { - OperationMonitorSession operationMonitorSession=new OperationMonitorSession(taskId); + OperationMonitorSession operationMonitorSession = new OperationMonitorSession(taskId); operationMonitorSession.setHidden(true); backgroundOperationMonitorSession.addToOperationMonitorSessionList(operationMonitorSession); } - - - @Override public void requestResume(String taskId) { // TODO Auto-generated method stub - + } - - - - } diff --git a/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/background/MonitorBackgroundUpdaterListener.java b/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/background/MonitorBackgroundUpdaterListener.java index fd82a3b..4e533d0 100644 --- a/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/background/MonitorBackgroundUpdaterListener.java +++ b/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/background/MonitorBackgroundUpdaterListener.java @@ -6,20 +6,24 @@ import org.gcube.portlets.user.td.gwtservice.shared.monitor.BackgroundOperationM /** * - * @author giancarlo - * email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public interface MonitorBackgroundUpdaterListener { /** * Called when the list of opration is updated + * + * @param operationMonitorList Operation monitor list */ public void operationMonitorListUpdated(ArrayList operationMonitorList); /** * Called when operation is failed + * + * @param caught Error */ public void retrieveOperationMonitorListFailed(Throwable caught); diff --git a/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/custom/ExtendedTreeGridView.java b/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/custom/ExtendedTreeGridView.java index 43be311..aeb19f8 100644 --- a/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/custom/ExtendedTreeGridView.java +++ b/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/custom/ExtendedTreeGridView.java @@ -4,13 +4,13 @@ import com.sencha.gxt.widget.core.client.treegrid.TreeGridView; /** * - * @author giancarlo - * email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * - * @param + * @param Type */ public class ExtendedTreeGridView extends TreeGridView { - // TODO bug in gxt3 3.0.0 fixed in future + @Override diff --git a/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/details/MonitorDetailPanel.java b/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/details/MonitorDetailPanel.java index 21696ba..a138c5a 100644 --- a/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/details/MonitorDetailPanel.java +++ b/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/details/MonitorDetailPanel.java @@ -48,6 +48,11 @@ import com.sencha.gxt.widget.core.client.grid.ColumnModel; import com.sencha.gxt.widget.core.client.toolbar.ToolBar; import com.sencha.gxt.widget.core.client.treegrid.TreeGrid; +/** + * + * @author Giancarlo Panichi + * + */ public class MonitorDetailPanel extends FramedPanel { private static final String WIDTH = "618px"; private static final String HEIGHT = "256px"; @@ -87,7 +92,7 @@ public class MonitorDetailPanel extends FramedPanel { /** * - * @param eventBus + * @param eventBus Event bus */ public MonitorDetailPanel(EventBus eventBus) { super(); diff --git a/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/details/tree/MonitorBaseDto.java b/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/details/tree/MonitorBaseDto.java index 4631ab9..7960252 100644 --- a/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/details/tree/MonitorBaseDto.java +++ b/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/details/tree/MonitorBaseDto.java @@ -4,8 +4,8 @@ import java.io.Serializable; /** * - * @author giancarlo - * email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class MonitorBaseDto implements Serializable { diff --git a/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/details/tree/MonitorFolderDto.java b/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/details/tree/MonitorFolderDto.java index 0fccb75..1336113 100644 --- a/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/details/tree/MonitorFolderDto.java +++ b/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/details/tree/MonitorFolderDto.java @@ -4,8 +4,8 @@ import java.util.ArrayList; /** * - * @author giancarlo - * email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class MonitorFolderDto extends MonitorBaseDto { diff --git a/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/details/tree/MonitorJobSDto.java b/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/details/tree/MonitorJobSDto.java index d8075a0..575dfcf 100644 --- a/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/details/tree/MonitorJobSDto.java +++ b/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/details/tree/MonitorJobSDto.java @@ -6,8 +6,8 @@ import org.gcube.portlets.user.td.gwtservice.shared.task.JobSClassifier; /** * - * @author giancarlo - * email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class MonitorJobSDto extends MonitorFolderDto { diff --git a/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/details/tree/MonitorTaskSDto.java b/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/details/tree/MonitorTaskSDto.java index e45bd1a..e7ff72e 100644 --- a/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/details/tree/MonitorTaskSDto.java +++ b/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/details/tree/MonitorTaskSDto.java @@ -4,8 +4,8 @@ import java.util.ArrayList; /** * - * @author giancarlo email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class MonitorTaskSDto extends MonitorFolderDto { diff --git a/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/details/tree/MonitorTreeDataGenerator.java b/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/details/tree/MonitorTreeDataGenerator.java index b57c832..22ca735 100644 --- a/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/details/tree/MonitorTreeDataGenerator.java +++ b/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/details/tree/MonitorTreeDataGenerator.java @@ -12,8 +12,8 @@ import com.google.gwt.i18n.client.DateTimeFormat; /** * - * @author giancarlo email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class MonitorTreeDataGenerator { diff --git a/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/details/tree/MonitorValidationJobSDto.java b/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/details/tree/MonitorValidationJobSDto.java index 900fcc0..cf56d3f 100644 --- a/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/details/tree/MonitorValidationJobSDto.java +++ b/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/details/tree/MonitorValidationJobSDto.java @@ -5,41 +5,27 @@ import org.gcube.portlets.user.td.gwtservice.shared.task.WorkerState; /** * - * @author giancarlo - * email: g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class MonitorValidationJobSDto extends MonitorBaseDto { private static final long serialVersionUID = -4353641080571614057L; - + private WorkerState workerState; private float progress; private String description; private Throwable errorMessage; private String humanReadableStatus; private InvocationS invocation; - - - - public MonitorValidationJobSDto(){ - + public MonitorValidationJobSDto() { + } - - /** - * - * @param id - * @param workerState - * @param progress - * @param description - * @param errorMessage - * @param humanReadableStatus - * @param invocation - */ - public MonitorValidationJobSDto(String id, WorkerState workerState, float progress, - String description, Throwable errorMessage, - String humanReadableStatus, InvocationS invocation) { + + public MonitorValidationJobSDto(String id, WorkerState workerState, float progress, String description, + Throwable errorMessage, String humanReadableStatus, InvocationS invocation) { super(id); this.workerState = workerState; this.progress = progress; @@ -48,7 +34,6 @@ public class MonitorValidationJobSDto extends MonitorBaseDto { this.humanReadableStatus = humanReadableStatus; this.invocation = invocation; } - public WorkerState getWorkerState() { return workerState; @@ -66,8 +51,6 @@ public class MonitorValidationJobSDto extends MonitorBaseDto { this.progress = progress; } - - public String getDescription() { return description; } @@ -105,7 +88,4 @@ public class MonitorValidationJobSDto extends MonitorBaseDto { return description; } - - - } diff --git a/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/resources/MonitorCSS.java b/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/resources/MonitorCSS.java index 3117a68..fabe43a 100644 --- a/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/resources/MonitorCSS.java +++ b/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/resources/MonitorCSS.java @@ -7,8 +7,8 @@ import com.google.gwt.resources.client.CssResource; /** * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public interface MonitorCSS extends CssResource { diff --git a/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/utils/InfoMessageBox.java b/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/utils/InfoMessageBox.java index 36cf485..e0a28d1 100644 --- a/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/utils/InfoMessageBox.java +++ b/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/utils/InfoMessageBox.java @@ -4,8 +4,8 @@ import com.sencha.gxt.widget.core.client.box.MessageBox; /** * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class InfoMessageBox extends MessageBox { diff --git a/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/utils/UtilsGXT3.java b/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/utils/UtilsGXT3.java index 0d3dd43..4fd1f87 100644 --- a/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/utils/UtilsGXT3.java +++ b/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/utils/UtilsGXT3.java @@ -11,8 +11,8 @@ import com.sencha.gxt.widget.core.client.event.HideEvent.HideHandler; /** * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it + * @author Giancarlo Panichi + * * */ public class UtilsGXT3 {