From 318389a03312a08d22cecf65411b4942faef468a Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Fri, 25 May 2018 16:07:34 +0000 Subject: [PATCH] ref 11819: SW Test org.gcube.portlet-user.data-miner-manager https://support.d4science.org/issues/11819 Fixed to support System parameters on service git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/data-miner-manager@167783 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../client/DataMinerManagerController.java | 3 ++ .../events/RemoveSelectedOperatorEvent.java | 48 +++++++++++++++++++ .../client/experiments/ComputationPanel.java | 22 ++++++++- 3 files changed, 72 insertions(+), 1 deletion(-) create mode 100644 src/main/java/org/gcube/portlets/user/dataminermanager/client/events/RemoveSelectedOperatorEvent.java diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/DataMinerManagerController.java b/src/main/java/org/gcube/portlets/user/dataminermanager/client/DataMinerManagerController.java index 1ad739a..8da248e 100644 --- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/DataMinerManagerController.java +++ b/src/main/java/org/gcube/portlets/user/dataminermanager/client/DataMinerManagerController.java @@ -24,6 +24,7 @@ import org.gcube.portlets.user.dataminermanager.client.events.OperatorsClassific import org.gcube.portlets.user.dataminermanager.client.events.OutputDataEvent; import org.gcube.portlets.user.dataminermanager.client.events.OutputDataRequestEvent; import org.gcube.portlets.user.dataminermanager.client.events.RefreshDataMinerWorkAreaEvent; +import org.gcube.portlets.user.dataminermanager.client.events.RemoveSelectedOperatorEvent; import org.gcube.portlets.user.dataminermanager.client.events.ResubmitComputationExecutionEvent; import org.gcube.portlets.user.dataminermanager.client.events.ResubmitComputationExecutionRequestEvent; import org.gcube.portlets.user.dataminermanager.client.events.SessionExpiredEvent; @@ -407,6 +408,8 @@ public class DataMinerManagerController { getOperatorsClassifications(event); } else { if (event.isRefresh()) { + RemoveSelectedOperatorEvent rEvent=new RemoveSelectedOperatorEvent(); + EventBusProvider.INSTANCE.fireEvent(rEvent); getOperatorsClassifications(event); } else { organizesOperatorsClassification(event); diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/events/RemoveSelectedOperatorEvent.java b/src/main/java/org/gcube/portlets/user/dataminermanager/client/events/RemoveSelectedOperatorEvent.java new file mode 100644 index 0000000..be4c402 --- /dev/null +++ b/src/main/java/org/gcube/portlets/user/dataminermanager/client/events/RemoveSelectedOperatorEvent.java @@ -0,0 +1,48 @@ +package org.gcube.portlets.user.dataminermanager.client.events; + +import com.google.gwt.event.shared.EventHandler; +import com.google.gwt.event.shared.GwtEvent; +import com.google.gwt.event.shared.HandlerRegistration; +import com.google.gwt.event.shared.HasHandlers; + +public class RemoveSelectedOperatorEvent + extends GwtEvent { + + public static Type TYPE = new Type(); + + public interface RemoveSelectedOperatorEventHandler extends EventHandler { + void onSelect(RemoveSelectedOperatorEvent event); + } + + public interface HasRemoveSelectedOperatorEventHandler extends HasHandlers { + public HandlerRegistration removeSelectedOperatorEventHandler(RemoveSelectedOperatorEventHandler handler); + } + + public RemoveSelectedOperatorEvent() { + + } + + @Override + protected void dispatch(RemoveSelectedOperatorEventHandler handler) { + handler.onSelect(this); + } + + @Override + public Type getAssociatedType() { + return TYPE; + } + + public static Type getType() { + return TYPE; + } + + public static void fire(HasHandlers source, MenuEvent event) { + source.fireEvent(event); + } + + @Override + public String toString() { + return "RemoveSelectedOperatorEvent []"; + } + +} diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/ComputationPanel.java b/src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/ComputationPanel.java index 9d595ae..38eb83b 100644 --- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/ComputationPanel.java +++ b/src/main/java/org/gcube/portlets/user/dataminermanager/client/experiments/ComputationPanel.java @@ -1,12 +1,15 @@ package org.gcube.portlets.user.dataminermanager.client.experiments; +import org.gcube.data.analysis.dataminermanagercl.shared.process.Operator; import org.gcube.portlets.user.dataminermanager.client.DataMinerManager; +import org.gcube.portlets.user.dataminermanager.client.common.EventBusProvider; import org.gcube.portlets.user.dataminermanager.client.events.ComputationReadyEvent; import org.gcube.portlets.user.dataminermanager.client.events.ComputationReadyEvent.ComputationReadyEventHandler; import org.gcube.portlets.user.dataminermanager.client.events.ComputationReadyEvent.HasComputationReadyEventHandler; +import org.gcube.portlets.user.dataminermanager.client.events.RemoveSelectedOperatorEvent; import org.gcube.portlets.user.dataminermanager.client.experiments.ComputationParametersPanel.ComputationParametersPanelHandler; -import org.gcube.data.analysis.dataminermanagercl.shared.process.Operator; +import com.allen_sauer.gwt.log.client.Log; import com.google.gwt.event.shared.HandlerRegistration; import com.google.gwt.user.client.ui.HTML; import com.google.gwt.user.client.ui.Image; @@ -45,6 +48,7 @@ public class ComputationPanel extends FramedPanel implements HasComputationReady super(); init(); create(); + bind(); } @@ -68,6 +72,22 @@ public class ComputationPanel extends FramedPanel implements HasComputationReady emptyPanel(); } + private void bind() { + + EventBusProvider.INSTANCE.addHandler(RemoveSelectedOperatorEvent.TYPE, + new RemoveSelectedOperatorEvent.RemoveSelectedOperatorEventHandler() { + + @Override + public void onSelect(RemoveSelectedOperatorEvent event) { + Log.debug("Catch RemoveSelectedOperatorEvent"); + emptyPanel(); + computationParametersPanel = null; + + } + }); + } + + private void setToolBar() { toolBar = new ToolBar(); toolBar.add(new LabelToolItem("Tools:"));