gCubeSystem
/
data-miner-manager-widget
15
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ref 6078:TDM - Create a new widget to support operations's invocation on DataMiner 

https://support.d4science.org/issues/6078

Updated Dialog interface

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/widgets/data-miner-manager-widget@144854 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2017-03-10 19:10:42 +00:00
parent 8fbf70c6ea
commit d978d83f28
38 changed files with 351 additions and 323 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.classpath
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="src" path="src/main/java"> <classpathentry kind="src" output="target/data-miner-manager-widget-1.0.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
<attributes> <attributes>
<attribute name="optional" value="true"/> <attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
@ -26,5 +26,5 @@
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="target/data-miner-manager-1.3.0-SNAPSHOT/WEB-INF/classes"/> <classpathentry kind="output" path="target/data-miner-manager-widget-1.0.0-SNAPSHOT/WEB-INF/classes"/>
</classpath> </classpath>

4
.settings/org.eclipse.wst.common.component
View File

@ -4,10 +4,10 @@
<wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/> <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/> <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/> <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
<dependent-module archiveName="data-miner-manager-cl-1.1.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/data-miner-manager-cl/data-miner-manager-cl"> <dependent-module archiveName="data-miner-manager-cl-1.2.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/data-miner-manager-cl/data-miner-manager-cl">
<dependency-type>uses</dependency-type> <dependency-type>uses</dependency-type>
</dependent-module> </dependent-module>
<property name="context-root" value="data-miner-manager"/>
<property name="java-output-path" value="/data-miner-manager/target/data-miner-manager-1.2.0-SNAPSHOT/WEB-INF/classes"/> <property name="java-output-path" value="/data-miner-manager/target/data-miner-manager-1.2.0-SNAPSHOT/WEB-INF/classes"/>
<property name="context-root" value="data-miner-manager-widget"/>
</wb-module> </wb-module>
</project-modules> </project-modules>

1
pom.xml
View File

@ -393,7 +393,6 @@
<runTarget>DataMinerManagerWidget.html</runTarget> <runTarget>DataMinerManagerWidget.html</runTarget>
<hostedWebapp>${webappDirectory}</hostedWebapp> <hostedWebapp>${webappDirectory}</hostedWebapp>
<module>org.gcube.portlets.widgets.dataminermanagerwidget.dataminermanagerwidget</module> <module>org.gcube.portlets.widgets.dataminermanagerwidget.dataminermanagerwidget</module>
</configuration> </configuration>
</plugin> </plugin>

207
src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/DataMinerManager.java
View File

@ -1,46 +1,14 @@
package org.gcube.portlets.widgets.dataminermanagerwidget.client; package org.gcube.portlets.widgets.dataminermanagerwidget.client;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.common.EventBusProvider;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.computations.ComputationsPanel;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.dataspace.DataSpacePanel;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.events.DataMinerWorkAreaRequestEvent;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.events.MenuSwitchEvent;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.experiments.ExperimentPanel;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.resources.Resources;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.type.DataMinerWorkAreaRegionType;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.type.DataMinerWorkAreaRequestEventType;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.type.MenuType;
import com.allen_sauer.gwt.log.client.Log; import com.allen_sauer.gwt.log.client.Log;
import com.google.gwt.core.client.EntryPoint; import com.google.gwt.core.client.EntryPoint;
import com.google.gwt.core.client.GWT;
import com.google.gwt.core.client.Scheduler; import com.google.gwt.core.client.Scheduler;
import com.google.gwt.core.client.Scheduler.ScheduledCommand; import com.google.gwt.core.client.Scheduler.ScheduledCommand;
import com.google.gwt.user.client.ui.RootPanel;
import com.sencha.gxt.core.client.util.Margins;
import com.sencha.gxt.widget.core.client.container.BorderLayoutContainer;
import com.sencha.gxt.widget.core.client.container.BorderLayoutContainer.BorderLayoutData;
import com.sencha.gxt.widget.core.client.container.MarginData;
import com.sencha.gxt.widget.core.client.container.SimpleContainer;
import com.sencha.gxt.widget.core.client.container.Viewport;
/** /**
* Entry point classes define <code>onModuleLoad()</code>. * Entry point classes define <code>onModuleLoad()</code>.
*/ */
public class DataMinerManager implements EntryPoint { public class DataMinerManager implements EntryPoint {
public static final Resources resources = GWT.create(Resources.class);
private static final String SM_DIV = "contentDiv";
private DataMinerManagerController dataMinerManagerController;
private Header header;
private HomePanel homePanel;
private DataSpacePanel dataSpacePanel;
private ExperimentPanel experimentPanel;
private ComputationsPanel computationsPanel;
private SimpleContainer previousPanel;
private SimpleContainer centerPanel;
/** /**
* {@inheritDoc} * {@inheritDoc}
@ -54,186 +22,19 @@ public class DataMinerManager implements EntryPoint {
Log.setUncaughtExceptionHandler(); Log.setUncaughtExceptionHandler();
// use deferred command to catch initialization exceptions in // use deferred command to catch initialization exceptions in
// onModuleLoad2 // onModuleLoad
Scheduler.get().scheduleDeferred(new ScheduledCommand() { Scheduler.get().scheduleDeferred(new ScheduledCommand() {
public void execute() { public void execute() {
//loadScope(); // loadScope();
loadMainPanel(); loadMainPanel();
} }
}); });
} }
/*private void loadScope() {
ClientScopeHelper.getService().setScope(Location.getHref(),
new AsyncCallback<Boolean>() {
@Override
public void onSuccess(Boolean result) {
if (result) {
loadMainPanel();
} else {
UtilsGXT3
.info("Attention",
"ClientScopeHelper has returned a false value!");
}
}
@Override
public void onFailure(Throwable caught) {
UtilsGXT3.alert("Error", "Error setting scope: "
+ caught.getLocalizedMessage());
caught.printStackTrace();
}
});
}*/
private void loadMainPanel() { private void loadMainPanel() {
dataMinerManagerController = new DataMinerManagerController(); DataMinerManagerDialog dataMinerManagerDialog = new DataMinerManagerDialog();
homePanel = new HomePanel(); dataMinerManagerDialog.show();
dataSpacePanel = new DataSpacePanel();
experimentPanel = new ExperimentPanel();
computationsPanel = new ComputationsPanel();
bind();
// Layout
BorderLayoutContainer mainPanelLayout = new BorderLayoutContainer();
mainPanelLayout.setId("mainPanelLayout");
mainPanelLayout.setBorders(false);
mainPanelLayout.setResize(true);
mainPanelLayout.getElement().getStyle().setBackgroundColor("#FFFFFF");
// Center
centerPanel = new SimpleContainer();
MarginData mainData = new MarginData(new Margins(0));
mainPanelLayout.setCenterWidget(centerPanel, mainData);
// Menu
header = new Header();
BorderLayoutData menuData = new BorderLayoutData(40);
menuData.setMargins(new Margins(5));
menuData.setCollapsible(false);
menuData.setSplit(false);
mainPanelLayout.setNorthWidget(header, menuData);
//
if (dataMinerManagerController.getOperatorId() != null
&& !dataMinerManagerController.getOperatorId().isEmpty()){
header.setMenu(MenuType.EXPERIMENT);
centerPanel.add(experimentPanel);
previousPanel = experimentPanel;
} else {
centerPanel.add(homePanel);
previousPanel = homePanel;
}
bindWindow(mainPanelLayout);
mainPanelLayout.forceLayout();
} }
private void bind() {
EventBusProvider.INSTANCE.addHandler(MenuSwitchEvent.TYPE,
new MenuSwitchEvent.MenuSwitchEventHandler() {
@Override
public void onSelect(MenuSwitchEvent event) {
Log.debug("Catch MenuSwitchEvent");
menuSwitch(event);
}
});
}
/**
*
* @param mainWidget
*/
private void bindWindow(BorderLayoutContainer mainWidget) {
try {
RootPanel root = RootPanel.get(SM_DIV);
Log.info("Root Panel: " + root);
if (root == null) {
Log.info("Div with id " + SM_DIV
+ " not found, starting in dev mode");
Viewport viewport = new Viewport();
viewport.setWidget(mainWidget);
viewport.onResize();
RootPanel.get().add(viewport);
} else {
Log.info("Application div with id " + SM_DIV
+ " found, starting in portal mode");
PortalViewport viewport = new PortalViewport();
Log.info("Created Viewport");
viewport.setEnableScroll(false);
viewport.setWidget(mainWidget);
Log.info("Set Widget");
Log.info("getOffsetWidth(): " + viewport.getOffsetWidth());
Log.info("getOffsetHeight(): " + viewport.getOffsetHeight());
viewport.onResize();
root.add(viewport);
Log.info("Added viewport to root");
}
} catch (Exception e) {
e.printStackTrace();
Log.error("Error in attach viewport:" + e.getLocalizedMessage());
}
}
/**
*
* @param event
*/
private void menuSwitch(MenuSwitchEvent event) {
if (event == null || event.getMenuType() == null) {
return;
}
switch (event.getMenuType()) {
case COMPUTATIONS:
switchPanel(computationsPanel);
fireDataMinerWorkAreareRequestUpdate(DataMinerWorkAreaRegionType.Computations);
break;
case DATA_SPACE:
switchPanel(dataSpacePanel);
fireDataMinerWorkAreareRequestUpdate(DataMinerWorkAreaRegionType.DataSets);
break;
case EXPERIMENT:
switchPanel(experimentPanel);
break;
case HOME:
switchPanel(homePanel);
break;
default:
break;
}
}
private void fireDataMinerWorkAreareRequestUpdate(
DataMinerWorkAreaRegionType dataMinerWorkAreaRegionType) {
DataMinerWorkAreaRequestEvent event = new DataMinerWorkAreaRequestEvent(
DataMinerWorkAreaRequestEventType.UPDATE,
dataMinerWorkAreaRegionType);
EventBusProvider.INSTANCE.fireEvent(event);
}
/**
*
* @param panel
*/
private void switchPanel(SimpleContainer panel) {
centerPanel.remove(previousPanel);
centerPanel.add(panel);
centerPanel.forceLayout();
previousPanel = panel;
}
} }

2
src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/DataMinerManagerController.java
View File

@ -74,7 +74,7 @@ public class DataMinerManagerController {
} }
private void init() { private void init() {
currentVisualization = MenuType.HOME; currentVisualization = MenuType.EXPERIMENT;
restoreUISession(); restoreUISession();
bind(); bind();
callHello(); callHello();

43
src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/DataMinerManagerDialog.java Normal file
View File

@ -0,0 +1,43 @@
package org.gcube.portlets.widgets.dataminermanagerwidget.client;
import com.allen_sauer.gwt.log.client.Log;
import com.sencha.gxt.widget.core.client.Window;
/**
*
* @author Giancarlo Panichi email: <a
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
*
*/
public class DataMinerManagerDialog extends Window {
//private DateTimeFormat dateTimeFormat= DateTimeFormat.getFormat("yyyy/MM/dd HH:mm:ss SSS");
private static final String WIDTH = "1024px";
private static final String HEIGHT = "600px";
//private static final String PANELWIDTH = "620px";
//private static final String PANELHEIGHT = "308px";
public DataMinerManagerDialog() {
Log.debug("DataMinerManagerDialog");
initWindow();
create();
}
private void initWindow() {
setWidth(WIDTH);
setHeight(HEIGHT);
setBodyBorder(false);
setResizable(false);
setModal(true);
setClosable(true);
setHeadingText("DataMiner Manager");
setOnEsc(true);
}
private void create() {
DataMinerManagerPanel dataMinerManagerPanel=new DataMinerManagerPanel();
setWidget(dataMinerManagerPanel);
}
}

174
src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/DataMinerManagerPanel.java Normal file
View File

@ -0,0 +1,174 @@
package org.gcube.portlets.widgets.dataminermanagerwidget.client;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.common.EventBusProvider;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.computations.ComputationsPanel;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.dataspace.DataSpacePanel;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.events.DataMinerWorkAreaRequestEvent;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.events.MenuSwitchEvent;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.experiments.ExperimentPanel;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.resources.Resources;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.type.DataMinerWorkAreaRegionType;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.type.DataMinerWorkAreaRequestEventType;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.type.MenuType;
import com.allen_sauer.gwt.log.client.Log;
import com.google.gwt.core.client.GWT;
import com.sencha.gxt.core.client.util.Margins;
import com.sencha.gxt.widget.core.client.ContentPanel;
import com.sencha.gxt.widget.core.client.container.BorderLayoutContainer;
import com.sencha.gxt.widget.core.client.container.BorderLayoutContainer.BorderLayoutData;
import com.sencha.gxt.widget.core.client.container.MarginData;
import com.sencha.gxt.widget.core.client.container.SimpleContainer;
/**
*
* @author Giancarlo Panichi email: <a
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
*
*/
public class DataMinerManagerPanel extends ContentPanel {
public static final Resources resources = GWT.create(Resources.class);
private DataMinerManagerController dataMinerManagerController;
private Header header;
private HomePanel homePanel;
private DataSpacePanel dataSpacePanel;
private ExperimentPanel experimentPanel;
private ComputationsPanel computationsPanel;
private SimpleContainer previousPanel;
private SimpleContainer centerPanel;
public DataMinerManagerPanel() {
Log.debug("DataMiner Manager Panel");
initPanel();
create();
}
private void initPanel() {
setHeaderVisible(false);
setBodyBorder(false);
}
private void create() {
dataMinerManagerController = new DataMinerManagerController();
homePanel = new HomePanel();
dataSpacePanel = new DataSpacePanel();
experimentPanel = new ExperimentPanel();
computationsPanel = new ComputationsPanel();
bind();
// Layout
BorderLayoutContainer mainPanelLayout = new BorderLayoutContainer();
mainPanelLayout.setId("mainPanelLayout");
mainPanelLayout.setBorders(false);
mainPanelLayout.setResize(true);
mainPanelLayout.getElement().getStyle().setBackgroundColor("#FFFFFF");
// Center
centerPanel = new SimpleContainer();
MarginData mainData = new MarginData(new Margins(0));
mainPanelLayout.setCenterWidget(centerPanel, mainData);
// Menu
header = new Header();
BorderLayoutData menuData = new BorderLayoutData(40);
menuData.setMargins(new Margins(5));
menuData.setCollapsible(false);
menuData.setSplit(false);
mainPanelLayout.setNorthWidget(header, menuData);
//
header.setMenu(MenuType.EXPERIMENT);
centerPanel.add(experimentPanel);
previousPanel = experimentPanel;
/*
if (dataMinerManagerController.getOperatorId() != null
&& !dataMinerManagerController.getOperatorId().isEmpty()) {
header.setMenu(MenuType.EXPERIMENT);
centerPanel.add(experimentPanel);
previousPanel = experimentPanel;
} else {
centerPanel.add(homePanel);
previousPanel = homePanel;
}*/
setWidget(mainPanelLayout);
mainPanelLayout.forceLayout();
}
private void bind() {
EventBusProvider.INSTANCE.addHandler(MenuSwitchEvent.TYPE,
new MenuSwitchEvent.MenuSwitchEventHandler() {
@Override
public void onSelect(MenuSwitchEvent event) {
Log.debug("Catch MenuSwitchEvent");
menuSwitch(event);
}
});
}
/**
*
* @param event
*/
private void menuSwitch(MenuSwitchEvent event) {
if (event == null || event.getMenuType() == null) {
return;
}
switch (event.getMenuType()) {
case COMPUTATIONS:
switchPanel(computationsPanel);
fireDataMinerWorkAreareRequestUpdate(DataMinerWorkAreaRegionType.Computations);
break;
case DATA_SPACE:
switchPanel(dataSpacePanel);
fireDataMinerWorkAreareRequestUpdate(DataMinerWorkAreaRegionType.DataSets);
break;
case EXPERIMENT:
switchPanel(experimentPanel);
break;
case HOME:
switchPanel(homePanel);
break;
default:
break;
}
}
private void fireDataMinerWorkAreareRequestUpdate(
DataMinerWorkAreaRegionType dataMinerWorkAreaRegionType) {
DataMinerWorkAreaRequestEvent event = new DataMinerWorkAreaRequestEvent(
DataMinerWorkAreaRequestEventType.UPDATE,
dataMinerWorkAreaRegionType);
EventBusProvider.INSTANCE.fireEvent(event);
}
/**
*
* @param panel
*/
private void switchPanel(SimpleContainer panel) {
centerPanel.remove(previousPanel);
centerPanel.add(panel);
centerPanel.forceLayout();
previousPanel = panel;
}
}

34
src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/Header.java
View File

@ -27,7 +27,7 @@ import com.google.gwt.user.client.ui.Image;
*/ */
public class Header extends HorizontalPanel { public class Header extends HorizontalPanel {
private Image menuGoBack, menuExperiment, menuDataSpace, menuComputations, menuHelp; private Image menuExperiment, menuDataSpace, menuComputations, menuHelp;
private Enum<MenuType> currentSelection; private Enum<MenuType> currentSelection;
public Header() { public Header() {
@ -51,12 +51,12 @@ public class Header extends HorizontalPanel {
private void create() { private void create() {
// this.setStyleAttribute("background-color", "#FFFFFF"); // this.setStyleAttribute("background-color", "#FFFFFF");
Image logo = new Image(DataMinerManager.resources.logoLittle()); Image logo = new Image(DataMinerManagerPanel.resources.logoLittle());
logo.setAltText("Data Miner Manager"); logo.setAltText("Data Miner Manager");
logo.setTitle("Data Miner Manager"); logo.setTitle("Data Miner Manager");
logo.addStyleName("menuImgLogo"); logo.addStyleName("menuImgLogo");
menuGoBack = new Image(DataMinerManager.resources.goBack()); /*menuGoBack = new Image(DataMinerManagerPanel.resources.goBack());
menuGoBack.addStyleName("menuItemImage"); menuGoBack.addStyleName("menuItemImage");
menuGoBack.addClickHandler(new ClickHandler() { menuGoBack.addClickHandler(new ClickHandler() {
@Override @Override
@ -65,10 +65,10 @@ public class Header extends HorizontalPanel {
EventBusProvider.INSTANCE.fireEvent(menuEvent); EventBusProvider.INSTANCE.fireEvent(menuEvent);
} }
}); });*/
menuDataSpace = new Image( menuDataSpace = new Image(
DataMinerManager.resources.menuItemInputspace()); DataMinerManagerPanel.resources.menuItemInputspace());
menuDataSpace.addStyleName("menuItemImage"); menuDataSpace.addStyleName("menuItemImage");
menuDataSpace.addClickHandler(new ClickHandler() { menuDataSpace.addClickHandler(new ClickHandler() {
@Override @Override
@ -80,7 +80,7 @@ public class Header extends HorizontalPanel {
}); });
menuExperiment = new Image( menuExperiment = new Image(
DataMinerManager.resources.menuItemExperiment()); DataMinerManagerPanel.resources.menuItemExperiment());
menuExperiment.addStyleName("menuItemImage"); menuExperiment.addStyleName("menuItemImage");
menuExperiment.addClickHandler(new ClickHandler() { menuExperiment.addClickHandler(new ClickHandler() {
@Override @Override
@ -92,7 +92,7 @@ public class Header extends HorizontalPanel {
}); });
menuComputations = new Image( menuComputations = new Image(
DataMinerManager.resources.menuItemComputations()); DataMinerManagerPanel.resources.menuItemComputations());
menuComputations.addStyleName("menuItemImage"); menuComputations.addStyleName("menuItemImage");
menuComputations.addClickHandler(new ClickHandler() { menuComputations.addClickHandler(new ClickHandler() {
@ -106,7 +106,7 @@ public class Header extends HorizontalPanel {
menuHelp = new Image( menuHelp = new Image(
DataMinerManager.resources.menuItemHelp()); DataMinerManagerPanel.resources.menuItemHelp());
menuHelp.addStyleName("menuItemImage"); menuHelp.addStyleName("menuItemImage");
menuHelp.addClickHandler(new ClickHandler() { menuHelp.addClickHandler(new ClickHandler() {
@ -119,20 +119,20 @@ public class Header extends HorizontalPanel {
add(logo); add(logo);
add(menuGoBack); //add(menuGoBack);
add(menuDataSpace); add(menuDataSpace);
add(menuExperiment); add(menuExperiment);
add(menuComputations); add(menuComputations);
add(menuHelp); add(menuHelp);
this.setCellWidth(logo, "100px"); this.setCellWidth(logo, "100px");
this.setCellWidth(menuGoBack, "100px"); //this.setCellWidth(menuGoBack, "100px");
this.setCellWidth(menuDataSpace, "80px"); this.setCellWidth(menuDataSpace, "80px");
this.setCellWidth(menuExperiment, "80px"); // this.setCellWidth(menuExperiment, "80px"); //
this.setCellWidth(menuComputations, "80px"); this.setCellWidth(menuComputations, "80px");
this.setCellWidth(menuHelp, "80px"); this.setCellWidth(menuHelp, "80px");
menuGoBack.setVisible(false); //menuGoBack.setVisible(false);
menuDataSpace.setVisible(false); menuDataSpace.setVisible(false);
menuExperiment.setVisible(false); menuExperiment.setVisible(false);
menuComputations.setVisible(false); menuComputations.setVisible(false);
@ -143,7 +143,7 @@ public class Header extends HorizontalPanel {
Log.debug("SetMenu: " + menuType); Log.debug("SetMenu: " + menuType);
if (menuType.compareTo(MenuType.HOME) == 0) { if (menuType.compareTo(MenuType.HOME) == 0) {
menuGoBack.setVisible(false); //menuGoBack.setVisible(false);
menuDataSpace.setVisible(false); menuDataSpace.setVisible(false);
menuExperiment.setVisible(false); menuExperiment.setVisible(false);
menuComputations.setVisible(false); menuComputations.setVisible(false);
@ -162,7 +162,7 @@ public class Header extends HorizontalPanel {
if (currentSelection == null if (currentSelection == null
|| (currentSelection != null && currentSelection || (currentSelection != null && currentSelection
.compareTo(MenuType.HOME) == 0)) { .compareTo(MenuType.HOME) == 0)) {
menuGoBack.setVisible(true); //menuGoBack.setVisible(true);
menuDataSpace.setVisible(true); menuDataSpace.setVisible(true);
menuExperiment.setVisible(true); menuExperiment.setVisible(true);
menuComputations.setVisible(true); menuComputations.setVisible(true);
@ -197,7 +197,7 @@ public class Header extends HorizontalPanel {
Log.debug("MenuSwitch: " + event); Log.debug("MenuSwitch: " + event);
if (event.getMenuType().compareTo(MenuType.HOME) == 0) { if (event.getMenuType().compareTo(MenuType.HOME) == 0) {
menuGoBack.setVisible(false); //menuGoBack.setVisible(false);
menuDataSpace.setVisible(false); menuDataSpace.setVisible(false);
menuExperiment.setVisible(false); menuExperiment.setVisible(false);
menuComputations.setVisible(false); menuComputations.setVisible(false);
@ -216,7 +216,7 @@ public class Header extends HorizontalPanel {
if (currentSelection == null if (currentSelection == null
|| (currentSelection != null && currentSelection || (currentSelection != null && currentSelection
.compareTo(MenuType.HOME) == 0)) { .compareTo(MenuType.HOME) == 0)) {
menuGoBack.setVisible(true); //menuGoBack.setVisible(true);
menuDataSpace.setVisible(true); menuDataSpace.setVisible(true);
menuExperiment.setVisible(true); menuExperiment.setVisible(true);
menuComputations.setVisible(true); menuComputations.setVisible(true);
@ -247,7 +247,7 @@ public class Header extends HorizontalPanel {
private void showHelp() { private void showHelp() {
try { try {
DataMinerManager.resources.wikiLink().getText( DataMinerManagerPanel.resources.wikiLink().getText(
new ResourceCallback<TextResource>() { new ResourceCallback<TextResource>() {
public void onError(ResourceException e) { public void onError(ResourceException e) {
Log.error("Error retrieving wiki link!: " Log.error("Error retrieving wiki link!: "

6
src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/HomePanel.java
View File

@ -62,7 +62,7 @@ public class HomePanel extends SimpleContainer {
SimpleContainer itemDataSpace = createMenuItem( SimpleContainer itemDataSpace = createMenuItem(
"Access to the Data Space", "Access to the Data Space",
"The data space contains the set of input and output data sets of the users. It is possible to upload and share tables. Data sources can be chosen from those hosted by the infrastructure. Outputs of the computations can be even saved in this space.", "The data space contains the set of input and output data sets of the users. It is possible to upload and share tables. Data sources can be chosen from those hosted by the infrastructure. Outputs of the computations can be even saved in this space.",
DataMinerManager.resources.inputSpaceIcon(), new MouseDownHandler() { DataMinerManagerPanel.resources.inputSpaceIcon(), new MouseDownHandler() {
@Override @Override
public void onMouseDown(MouseDownEvent event) { public void onMouseDown(MouseDownEvent event) {
@ -77,7 +77,7 @@ public class HomePanel extends SimpleContainer {
SimpleContainer itemExperiment = createMenuItem( SimpleContainer itemExperiment = createMenuItem(
"Execute an Experiment", "Execute an Experiment",
"This section allows to execute or prepare a Niche Modeling experiment. The section is endowed with a list of algorithms for training and executing statistical models for biological applications. Evaluation of the performances is possible by means of several kinds of measurement systems and processes.", "This section allows to execute or prepare a Niche Modeling experiment. The section is endowed with a list of algorithms for training and executing statistical models for biological applications. Evaluation of the performances is possible by means of several kinds of measurement systems and processes.",
DataMinerManager.resources.executionIcon(), new MouseDownHandler() { DataMinerManagerPanel.resources.executionIcon(), new MouseDownHandler() {
@Override @Override
public void onMouseDown(MouseDownEvent event) { public void onMouseDown(MouseDownEvent event) {
@ -94,7 +94,7 @@ public class HomePanel extends SimpleContainer {
SimpleContainer itemComputations = createMenuItem( SimpleContainer itemComputations = createMenuItem(
"Check the Computations", "Check the Computations",
"This section allows to check the status of the computation. A list of processes launched by the user is shown along with meta-information. By clicking on the completed jobs it is possible to visualize the data set contents.", "This section allows to check the status of the computation. A list of processes launched by the user is shown along with meta-information. By clicking on the completed jobs it is possible to visualize the data set contents.",
DataMinerManager.resources.computationsIcon(), new MouseDownHandler() { DataMinerManagerPanel.resources.computationsIcon(), new MouseDownHandler() {
@Override @Override
public void onMouseDown(MouseDownEvent event) { public void onMouseDown(MouseDownEvent event) {

4
src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/computations/ComputationValueFilePanel.java
View File

@ -1,7 +1,7 @@
package org.gcube.portlets.widgets.dataminermanagerwidget.client.computations; package org.gcube.portlets.widgets.dataminermanagerwidget.client.computations;
import org.gcube.data.analysis.dataminermanagercl.shared.data.computations.ComputationValueFile; import org.gcube.data.analysis.dataminermanagercl.shared.data.computations.ComputationValueFile;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.DataMinerManager; import org.gcube.portlets.widgets.dataminermanagerwidget.client.DataMinerManagerPanel;
import com.google.gwt.safehtml.shared.SafeHtmlBuilder; import com.google.gwt.safehtml.shared.SafeHtmlBuilder;
import com.sencha.gxt.core.client.util.Margins; import com.sencha.gxt.core.client.util.Margins;
@ -50,7 +50,7 @@ public class ComputationValueFilePanel extends SimpleContainer {
lc.add(fileNameHtml, new VerticalLayoutData(-1, -1, new Margins(0))); lc.add(fileNameHtml, new VerticalLayoutData(-1, -1, new Margins(0)));
TextButton downloadBtn = new TextButton("Download File"); TextButton downloadBtn = new TextButton("Download File");
downloadBtn.setIcon(DataMinerManager.resources.download()); downloadBtn.setIcon(DataMinerManagerPanel.resources.download());
downloadBtn.addSelectHandler(new SelectEvent.SelectHandler() { downloadBtn.addSelectHandler(new SelectEvent.SelectHandler() {
@Override @Override
public void onSelect(SelectEvent event) { public void onSelect(SelectEvent event) {

4
src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/computations/ComputationValueImagePanel.java
View File

@ -1,7 +1,7 @@
package org.gcube.portlets.widgets.dataminermanagerwidget.client.computations; package org.gcube.portlets.widgets.dataminermanagerwidget.client.computations;
import org.gcube.data.analysis.dataminermanagercl.shared.data.computations.ComputationValueImage; import org.gcube.data.analysis.dataminermanagercl.shared.data.computations.ComputationValueImage;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.DataMinerManager; import org.gcube.portlets.widgets.dataminermanagerwidget.client.DataMinerManagerPanel;
import com.google.gwt.user.client.ui.Image; import com.google.gwt.user.client.ui.Image;
import com.sencha.gxt.core.client.util.Margins; import com.sencha.gxt.core.client.util.Margins;
@ -52,7 +52,7 @@ public class ComputationValueImagePanel extends SimpleContainer {
v.add(imageName, new VerticalLayoutData(-1, -1, new Margins(0))); v.add(imageName, new VerticalLayoutData(-1, -1, new Margins(0)));
TextButton saveImageBtn = new TextButton("Download Image"); TextButton saveImageBtn = new TextButton("Download Image");
saveImageBtn.setIcon(DataMinerManager.resources.download()); saveImageBtn.setIcon(DataMinerManagerPanel.resources.download());
saveImageBtn.addSelectHandler(new SelectEvent.SelectHandler() { saveImageBtn.addSelectHandler(new SelectEvent.SelectHandler() {
@Override @Override

14
src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/computations/ComputationsExecutedPanel.java
View File

@ -6,7 +6,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import org.gcube.portal.clientcontext.client.GCubeClientContext; import org.gcube.portal.clientcontext.client.GCubeClientContext;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.DataMinerManager; import org.gcube.portlets.widgets.dataminermanagerwidget.client.DataMinerManagerPanel;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.common.EventBusProvider; import org.gcube.portlets.widgets.dataminermanagerwidget.client.common.EventBusProvider;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.events.CancelExecutionFromComputationsRequestEvent; import org.gcube.portlets.widgets.dataminermanagerwidget.client.events.CancelExecutionFromComputationsRequestEvent;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.events.ComputationDataRequestEvent; import org.gcube.portlets.widgets.dataminermanagerwidget.client.events.ComputationDataRequestEvent;
@ -318,7 +318,7 @@ public class ComputationsExecutedPanel extends FramedPanel {
// ToolBar // ToolBar
btnShow = new TextButton("Show"); btnShow = new TextButton("Show");
btnShow.setIcon(DataMinerManager.resources.show()); btnShow.setIcon(DataMinerManagerPanel.resources.show());
btnShow.setScale(ButtonScale.SMALL); btnShow.setScale(ButtonScale.SMALL);
btnShow.setIconAlign(IconAlign.LEFT); btnShow.setIconAlign(IconAlign.LEFT);
btnShow.setToolTip("Show"); btnShow.setToolTip("Show");
@ -332,7 +332,7 @@ public class ComputationsExecutedPanel extends FramedPanel {
}); });
btnDownload = new TextButton("Download"); btnDownload = new TextButton("Download");
btnDownload.setIcon(DataMinerManager.resources.download()); btnDownload.setIcon(DataMinerManagerPanel.resources.download());
btnDownload.setScale(ButtonScale.SMALL); btnDownload.setScale(ButtonScale.SMALL);
btnDownload.setIconAlign(IconAlign.LEFT); btnDownload.setIconAlign(IconAlign.LEFT);
btnDownload.setToolTip("Download"); btnDownload.setToolTip("Download");
@ -346,7 +346,7 @@ public class ComputationsExecutedPanel extends FramedPanel {
}); });
btnDelete = new TextButton("Delete"); btnDelete = new TextButton("Delete");
btnDelete.setIcon(DataMinerManager.resources.deleteCircle()); btnDelete.setIcon(DataMinerManagerPanel.resources.deleteCircle());
btnDelete.setScale(ButtonScale.SMALL); btnDelete.setScale(ButtonScale.SMALL);
btnDelete.setIconAlign(IconAlign.LEFT); btnDelete.setIconAlign(IconAlign.LEFT);
btnDelete.setToolTip("Delete"); btnDelete.setToolTip("Delete");
@ -360,7 +360,7 @@ public class ComputationsExecutedPanel extends FramedPanel {
}); });
btnRefresh = new TextButton("Refresh"); btnRefresh = new TextButton("Refresh");
btnRefresh.setIcon(DataMinerManager.resources.refresh()); btnRefresh.setIcon(DataMinerManagerPanel.resources.refresh());
btnRefresh.setScale(ButtonScale.SMALL); btnRefresh.setScale(ButtonScale.SMALL);
btnRefresh.setIconAlign(IconAlign.LEFT); btnRefresh.setIconAlign(IconAlign.LEFT);
btnRefresh.setToolTip("Refresh"); btnRefresh.setToolTip("Refresh");
@ -374,7 +374,7 @@ public class ComputationsExecutedPanel extends FramedPanel {
}); });
btnResubmit = new TextButton("Resubmit"); btnResubmit = new TextButton("Resubmit");
btnResubmit.setIcon(DataMinerManager.resources.resubmit()); btnResubmit.setIcon(DataMinerManagerPanel.resources.resubmit());
btnResubmit.setScale(ButtonScale.SMALL); btnResubmit.setScale(ButtonScale.SMALL);
btnResubmit.setIconAlign(IconAlign.LEFT); btnResubmit.setIconAlign(IconAlign.LEFT);
btnResubmit.setToolTip("Resubmit"); btnResubmit.setToolTip("Resubmit");
@ -388,7 +388,7 @@ public class ComputationsExecutedPanel extends FramedPanel {
}); });
btnCancel = new TextButton("Cancel"); btnCancel = new TextButton("Cancel");
btnCancel.setIcon(DataMinerManager.resources.cancelCircle()); btnCancel.setIcon(DataMinerManagerPanel.resources.cancelCircle());
btnCancel.setScale(ButtonScale.SMALL); btnCancel.setScale(ButtonScale.SMALL);
btnCancel.setIconAlign(IconAlign.LEFT); btnCancel.setIconAlign(IconAlign.LEFT);
btnCancel.setToolTip("Cancel"); btnCancel.setToolTip("Cancel");

6
src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/computations/ComputationsPanel.java
View File

@ -5,7 +5,7 @@ package org.gcube.portlets.widgets.dataminermanagerwidget.client.computations;
import java.util.ArrayList; import java.util.ArrayList;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.DataMinerManager; import org.gcube.portlets.widgets.dataminermanagerwidget.client.DataMinerManagerPanel;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.common.EventBusProvider; import org.gcube.portlets.widgets.dataminermanagerwidget.client.common.EventBusProvider;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.events.ComputationDataEvent; import org.gcube.portlets.widgets.dataminermanagerwidget.client.events.ComputationDataEvent;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.events.DataMinerWorkAreaEvent; import org.gcube.portlets.widgets.dataminermanagerwidget.client.events.DataMinerWorkAreaEvent;
@ -136,7 +136,7 @@ public class ComputationsPanel extends SimpleContainer {
TabItemConfig computationsExecutedItemConf = new TabItemConfig( TabItemConfig computationsExecutedItemConf = new TabItemConfig(
"List of Computations", false); "List of Computations", false);
computationsExecutedItemConf.setIcon(DataMinerManager.resources computationsExecutedItemConf.setIcon(DataMinerManagerPanel.resources
.folderExplore()); .folderExplore());
computationsTabPanel.add(computationsExecutedPanel, computationsTabPanel.add(computationsExecutedPanel,
@ -181,7 +181,7 @@ public class ComputationsPanel extends SimpleContainer {
computationsViewers.add(computationsViewerPanel); computationsViewers.add(computationsViewerPanel);
TabItemConfig computationsViewerItemConf = new TabItemConfig(event TabItemConfig computationsViewerItemConf = new TabItemConfig(event
.getComputationData().getComputationId().getId(), true); .getComputationData().getComputationId().getId(), true);
computationsViewerItemConf.setIcon(DataMinerManager.resources computationsViewerItemConf.setIcon(DataMinerManagerPanel.resources
.folderExplore()); .folderExplore());
computationsTabPanel.add(computationsViewerPanel, computationsTabPanel.add(computationsViewerPanel,
computationsViewerItemConf); computationsViewerItemConf);

6
src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/dataspace/DataSpacePanel.java
View File

@ -3,7 +3,7 @@
*/ */
package org.gcube.portlets.widgets.dataminermanagerwidget.client.dataspace; package org.gcube.portlets.widgets.dataminermanagerwidget.client.dataspace;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.DataMinerManager; import org.gcube.portlets.widgets.dataminermanagerwidget.client.DataMinerManagerPanel;
import com.sencha.gxt.widget.core.client.TabItemConfig; import com.sencha.gxt.widget.core.client.TabItemConfig;
import com.sencha.gxt.widget.core.client.TabPanel; import com.sencha.gxt.widget.core.client.TabPanel;
@ -40,14 +40,14 @@ public class DataSpacePanel extends SimpleContainer {
TabItemConfig outputDataItemConf = new TabItemConfig("Output Data Sets", TabItemConfig outputDataItemConf = new TabItemConfig("Output Data Sets",
false); false);
outputDataItemConf.setIcon(DataMinerManager.resources outputDataItemConf.setIcon(DataMinerManagerPanel.resources
.folderExplore()); .folderExplore());
dataSpaceTabPanel.add(outputDataSetsPanel, outputDataItemConf); dataSpaceTabPanel.add(outputDataSetsPanel, outputDataItemConf);
TabItemConfig inputDataSetsItemConf = new TabItemConfig( TabItemConfig inputDataSetsItemConf = new TabItemConfig(
"Input Data Sets", false); "Input Data Sets", false);
inputDataSetsItemConf.setIcon(DataMinerManager.resources inputDataSetsItemConf.setIcon(DataMinerManagerPanel.resources
.folderExplore()); .folderExplore());
dataSpaceTabPanel.add(inputDataSetsPanel, inputDataSetsItemConf); dataSpaceTabPanel.add(inputDataSetsPanel, inputDataSetsItemConf);

8
src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/dataspace/InputDataSetsPanel.java
View File

@ -6,7 +6,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import org.gcube.portal.clientcontext.client.GCubeClientContext; import org.gcube.portal.clientcontext.client.GCubeClientContext;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.DataMinerManager; import org.gcube.portlets.widgets.dataminermanagerwidget.client.DataMinerManagerPanel;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.common.EventBusProvider; import org.gcube.portlets.widgets.dataminermanagerwidget.client.common.EventBusProvider;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.events.DataMinerWorkAreaEvent; import org.gcube.portlets.widgets.dataminermanagerwidget.client.events.DataMinerWorkAreaEvent;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.events.DeleteItemRequestEvent; import org.gcube.portlets.widgets.dataminermanagerwidget.client.events.DeleteItemRequestEvent;
@ -303,7 +303,7 @@ public class InputDataSetsPanel extends FramedPanel {
// ToolBar // ToolBar
btnDownload = new TextButton("Download"); btnDownload = new TextButton("Download");
btnDownload.setIcon(DataMinerManager.resources.download()); btnDownload.setIcon(DataMinerManagerPanel.resources.download());
btnDownload.setScale(ButtonScale.SMALL); btnDownload.setScale(ButtonScale.SMALL);
btnDownload.setIconAlign(IconAlign.LEFT); btnDownload.setIconAlign(IconAlign.LEFT);
btnDownload.setToolTip("Download"); btnDownload.setToolTip("Download");
@ -317,7 +317,7 @@ public class InputDataSetsPanel extends FramedPanel {
}); });
btnDelete = new TextButton("Delete"); btnDelete = new TextButton("Delete");
btnDelete.setIcon(DataMinerManager.resources.deleteCircle()); btnDelete.setIcon(DataMinerManagerPanel.resources.deleteCircle());
btnDelete.setScale(ButtonScale.SMALL); btnDelete.setScale(ButtonScale.SMALL);
btnDelete.setIconAlign(IconAlign.LEFT); btnDelete.setIconAlign(IconAlign.LEFT);
btnDelete.setToolTip("Delete"); btnDelete.setToolTip("Delete");
@ -331,7 +331,7 @@ public class InputDataSetsPanel extends FramedPanel {
}); });
btnRefresh = new TextButton("Refresh"); btnRefresh = new TextButton("Refresh");
btnRefresh.setIcon(DataMinerManager.resources.refresh()); btnRefresh.setIcon(DataMinerManagerPanel.resources.refresh());
btnRefresh.setScale(ButtonScale.SMALL); btnRefresh.setScale(ButtonScale.SMALL);
btnRefresh.setIconAlign(IconAlign.LEFT); btnRefresh.setIconAlign(IconAlign.LEFT);
btnRefresh.setToolTip("Refresh"); btnRefresh.setToolTip("Refresh");

8
src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/dataspace/OutputDataSetsPanel.java
View File

@ -6,7 +6,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import org.gcube.portal.clientcontext.client.GCubeClientContext; import org.gcube.portal.clientcontext.client.GCubeClientContext;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.DataMinerManager; import org.gcube.portlets.widgets.dataminermanagerwidget.client.DataMinerManagerPanel;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.common.EventBusProvider; import org.gcube.portlets.widgets.dataminermanagerwidget.client.common.EventBusProvider;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.events.DataMinerWorkAreaEvent; import org.gcube.portlets.widgets.dataminermanagerwidget.client.events.DataMinerWorkAreaEvent;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.events.DeleteItemRequestEvent; import org.gcube.portlets.widgets.dataminermanagerwidget.client.events.DeleteItemRequestEvent;
@ -302,7 +302,7 @@ public class OutputDataSetsPanel extends FramedPanel {
// ToolBar // ToolBar
btnDownload = new TextButton("Download"); btnDownload = new TextButton("Download");
btnDownload.setIcon(DataMinerManager.resources.download()); btnDownload.setIcon(DataMinerManagerPanel.resources.download());
btnDownload.setScale(ButtonScale.SMALL); btnDownload.setScale(ButtonScale.SMALL);
btnDownload.setIconAlign(IconAlign.LEFT); btnDownload.setIconAlign(IconAlign.LEFT);
btnDownload.setToolTip("Download"); btnDownload.setToolTip("Download");
@ -316,7 +316,7 @@ public class OutputDataSetsPanel extends FramedPanel {
}); });
btnDelete = new TextButton("Delete"); btnDelete = new TextButton("Delete");
btnDelete.setIcon(DataMinerManager.resources.deleteCircle()); btnDelete.setIcon(DataMinerManagerPanel.resources.deleteCircle());
btnDelete.setScale(ButtonScale.SMALL); btnDelete.setScale(ButtonScale.SMALL);
btnDelete.setIconAlign(IconAlign.LEFT); btnDelete.setIconAlign(IconAlign.LEFT);
btnDelete.setToolTip("Delete"); btnDelete.setToolTip("Delete");
@ -330,7 +330,7 @@ public class OutputDataSetsPanel extends FramedPanel {
}); });
btnRefresh = new TextButton("Refresh"); btnRefresh = new TextButton("Refresh");
btnRefresh.setIcon(DataMinerManager.resources.refresh()); btnRefresh.setIcon(DataMinerManagerPanel.resources.refresh());
btnRefresh.setScale(ButtonScale.SMALL); btnRefresh.setScale(ButtonScale.SMALL);
btnRefresh.setIconAlign(IconAlign.LEFT); btnRefresh.setIconAlign(IconAlign.LEFT);
btnRefresh.setToolTip("Refresh"); btnRefresh.setToolTip("Refresh");

4
src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/experiments/ComputationExecutionPanel.java
View File

@ -4,7 +4,7 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.gcube.data.analysis.dataminermanagercl.shared.process.Operator; import org.gcube.data.analysis.dataminermanagercl.shared.process.Operator;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.DataMinerManager; import org.gcube.portlets.widgets.dataminermanagerwidget.client.DataMinerManagerPanel;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.common.EventBusProvider; import org.gcube.portlets.widgets.dataminermanagerwidget.client.common.EventBusProvider;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.events.ResubmitComputationExecutionEvent; import org.gcube.portlets.widgets.dataminermanagerwidget.client.events.ResubmitComputationExecutionEvent;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.events.StartComputationExecutionEvent; import org.gcube.portlets.widgets.dataminermanagerwidget.client.events.StartComputationExecutionEvent;
@ -196,7 +196,7 @@ public class ComputationExecutionPanel extends FramedPanel {
} }
}); });
removeAllButton.setIcon(DataMinerManager.resources.removeAll()); removeAllButton.setIcon(DataMinerManagerPanel.resources.removeAll());
removeAllButton.setToolTip(DELETE_ALL_BUTTON_TOOLTIP); removeAllButton.setToolTip(DELETE_ALL_BUTTON_TOOLTIP);
// removeAllButton.setScale(ButtonScale.MEDIUM); // removeAllButton.setScale(ButtonScale.MEDIUM);

6
src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/experiments/ComputationPanel.java
View File

@ -1,7 +1,7 @@
package org.gcube.portlets.widgets.dataminermanagerwidget.client.experiments; package org.gcube.portlets.widgets.dataminermanagerwidget.client.experiments;
import org.gcube.data.analysis.dataminermanagercl.shared.process.Operator; import org.gcube.data.analysis.dataminermanagercl.shared.process.Operator;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.DataMinerManager; import org.gcube.portlets.widgets.dataminermanagerwidget.client.DataMinerManagerPanel;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.events.ComputationReadyEvent; import org.gcube.portlets.widgets.dataminermanagerwidget.client.events.ComputationReadyEvent;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.events.ComputationReadyEvent.ComputationReadyEventHandler; import org.gcube.portlets.widgets.dataminermanagerwidget.client.events.ComputationReadyEvent.ComputationReadyEventHandler;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.events.ComputationReadyEvent.HasComputationReadyEventHandler; import org.gcube.portlets.widgets.dataminermanagerwidget.client.events.ComputationReadyEvent.HasComputationReadyEventHandler;
@ -74,7 +74,7 @@ public class ComputationPanel extends FramedPanel implements HasComputationReady
removeAllButton = new TextButton(DELETE_ALL_BUTTON_TOOLTIP); removeAllButton = new TextButton(DELETE_ALL_BUTTON_TOOLTIP);
removeAllButton.setToolTip(DELETE_ALL_BUTTON_TOOLTIP); removeAllButton.setToolTip(DELETE_ALL_BUTTON_TOOLTIP);
removeAllButton.setIcon(DataMinerManager.resources.removeAll()); removeAllButton.setIcon(DataMinerManagerPanel.resources.removeAll());
removeAllButton.setEnabled(false); removeAllButton.setEnabled(false);
removeAllButton.addSelectHandler(new SelectHandler() { removeAllButton.addSelectHandler(new SelectHandler() {
@ -105,7 +105,7 @@ public class ComputationPanel extends FramedPanel implements HasComputationReady
v.clear(); v.clear();
HBoxLayoutContainer hBox = new HBoxLayoutContainer(); HBoxLayoutContainer hBox = new HBoxLayoutContainer();
hBox.setPack(BoxLayoutPack.CENTER); hBox.setPack(BoxLayoutPack.CENTER);
hBox.add(new Image(DataMinerManager.resources.workflowConnector1()), hBox.add(new Image(DataMinerManagerPanel.resources.workflowConnector1()),
new BoxLayoutData(new Margins(0))); new BoxLayoutData(new Margins(0)));
v.add(hBox, new VerticalLayoutData(1, -1, new Margins(10,0,0,0))); v.add(hBox, new VerticalLayoutData(1, -1, new Margins(10,0,0,0)));
v.add(computationParametersPanel, new VerticalLayoutData(1, -1, v.add(computationParametersPanel, new VerticalLayoutData(1, -1,

6
src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/experiments/ComputationParametersPanel.java
View File

@ -13,7 +13,7 @@ import org.gcube.data.analysis.dataminermanagercl.shared.parameters.ColumnParame
import org.gcube.data.analysis.dataminermanagercl.shared.parameters.Parameter; import org.gcube.data.analysis.dataminermanagercl.shared.parameters.Parameter;
import org.gcube.data.analysis.dataminermanagercl.shared.parameters.ParameterType; import org.gcube.data.analysis.dataminermanagercl.shared.parameters.ParameterType;
import org.gcube.data.analysis.dataminermanagercl.shared.process.Operator; import org.gcube.data.analysis.dataminermanagercl.shared.process.Operator;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.DataMinerManager; import org.gcube.portlets.widgets.dataminermanagerwidget.client.DataMinerManagerPanel;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.common.EventBusProvider; import org.gcube.portlets.widgets.dataminermanagerwidget.client.common.EventBusProvider;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.events.SessionExpiredEvent; import org.gcube.portlets.widgets.dataminermanagerwidget.client.events.SessionExpiredEvent;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.parametersfield.AbstractFld; import org.gcube.portlets.widgets.dataminermanagerwidget.client.parametersfield.AbstractFld;
@ -59,7 +59,7 @@ public class ComputationParametersPanel extends SimpleContainer {
private static final String START_BUTTON_TOOLTIP = "Start Computation"; private static final String START_BUTTON_TOOLTIP = "Start Computation";
private static final ImageResource PRELOAD_IMAGE = DataMinerManager.resources private static final ImageResource PRELOAD_IMAGE = DataMinerManagerPanel.resources
.loaderBig(); .loaderBig();
private VerticalLayoutContainer v; private VerticalLayoutContainer v;
@ -164,7 +164,7 @@ public class ComputationParametersPanel extends SimpleContainer {
submit = new TextButton("Start Computation"); submit = new TextButton("Start Computation");
submit.setToolTip(START_BUTTON_TOOLTIP); submit.setToolTip(START_BUTTON_TOOLTIP);
submit.setIcon(DataMinerManager.resources.startComputation()); submit.setIcon(DataMinerManagerPanel.resources.startComputation());
submit.getElement().getStyle().setMarginLeft(20, Unit.PX); submit.getElement().getStyle().setMarginLeft(20, Unit.PX);
submit.getElement().getStyle().setMarginBottom(20, Unit.PX); submit.getElement().getStyle().setMarginBottom(20, Unit.PX);

12
src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/experiments/OperatorsPanel.java
View File

@ -11,7 +11,7 @@ import java.util.Map;
import org.gcube.data.analysis.dataminermanagercl.shared.process.Operator; import org.gcube.data.analysis.dataminermanagercl.shared.process.Operator;
import org.gcube.data.analysis.dataminermanagercl.shared.process.OperatorCategory; import org.gcube.data.analysis.dataminermanagercl.shared.process.OperatorCategory;
import org.gcube.data.analysis.dataminermanagercl.shared.process.OperatorsClassification; import org.gcube.data.analysis.dataminermanagercl.shared.process.OperatorsClassification;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.DataMinerManager; import org.gcube.portlets.widgets.dataminermanagerwidget.client.DataMinerManagerPanel;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.common.EventBusProvider; import org.gcube.portlets.widgets.dataminermanagerwidget.client.common.EventBusProvider;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.events.OperatorsClassificationEvent; import org.gcube.portlets.widgets.dataminermanagerwidget.client.events.OperatorsClassificationEvent;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.events.OperatorsClassificationRequestEvent; import org.gcube.portlets.widgets.dataminermanagerwidget.client.events.OperatorsClassificationRequestEvent;
@ -227,7 +227,7 @@ public class OperatorsPanel extends FramedPanel {
filterField.setWidth(100); filterField.setWidth(100);
TextButton showAllOperatorsButton = new TextButton(); TextButton showAllOperatorsButton = new TextButton();
showAllOperatorsButton.setIcon(DataMinerManager.resources showAllOperatorsButton.setIcon(DataMinerManagerPanel.resources
.sortAscending()); .sortAscending());
showAllOperatorsButton showAllOperatorsButton
.addSelectHandler(new SelectEvent.SelectHandler() { .addSelectHandler(new SelectEvent.SelectHandler() {
@ -242,7 +242,7 @@ public class OperatorsPanel extends FramedPanel {
showAllOperatorsButton.setToolTip(SHOW_ALL_OPERATORS_TOOLTIP); showAllOperatorsButton.setToolTip(SHOW_ALL_OPERATORS_TOOLTIP);
TextButton showCategoriesButton = new TextButton(); TextButton showCategoriesButton = new TextButton();
showCategoriesButton.setIcon(DataMinerManager.resources.tree()); showCategoriesButton.setIcon(DataMinerManagerPanel.resources.tree());
showCategoriesButton.addSelectHandler(new SelectEvent.SelectHandler() { showCategoriesButton.addSelectHandler(new SelectEvent.SelectHandler() {
@Override @Override
@ -258,14 +258,14 @@ public class OperatorsPanel extends FramedPanel {
final TextButton btnMenuPerspective = new TextButton( final TextButton btnMenuPerspective = new TextButton(
currentClassificationName); currentClassificationName);
btnMenuPerspective btnMenuPerspective
.setIcon(DataMinerManager.resources.userPerspective()); .setIcon(DataMinerManagerPanel.resources.userPerspective());
Menu menuPerspective = new Menu(); Menu menuPerspective = new Menu();
for (final String perspectiveName : Constants.ClassificationNames) { for (final String perspectiveName : Constants.ClassificationNames) {
final ImageResource img = perspectiveName final ImageResource img = perspectiveName
.equals(Constants.UserClassificationName) ? DataMinerManager.resources .equals(Constants.UserClassificationName) ? DataMinerManagerPanel.resources
.userPerspective() : DataMinerManager.resources .userPerspective() : DataMinerManagerPanel.resources
.computationPerspective(); .computationPerspective();
MenuItem perspectiveItem = new MenuItem(perspectiveName); MenuItem perspectiveItem = new MenuItem(perspectiveName);
perspectiveItem.addSelectionHandler(new SelectionHandler<Item>() { perspectiveItem.addSelectionHandler(new SelectionHandler<Item>() {

6
src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/experiments/WorkflowPanel.java
View File

@ -4,7 +4,7 @@
package org.gcube.portlets.widgets.dataminermanagerwidget.client.experiments; package org.gcube.portlets.widgets.dataminermanagerwidget.client.experiments;
import org.gcube.data.analysis.dataminermanagercl.shared.process.Operator; import org.gcube.data.analysis.dataminermanagercl.shared.process.Operator;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.DataMinerManager; import org.gcube.portlets.widgets.dataminermanagerwidget.client.DataMinerManagerPanel;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.common.EventBusProvider; import org.gcube.portlets.widgets.dataminermanagerwidget.client.common.EventBusProvider;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.events.ComputationReadyEvent; import org.gcube.portlets.widgets.dataminermanagerwidget.client.events.ComputationReadyEvent;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.events.ResubmitComputationExecutionEvent; import org.gcube.portlets.widgets.dataminermanagerwidget.client.events.ResubmitComputationExecutionEvent;
@ -45,7 +45,7 @@ public class WorkflowPanel extends TabPanel {
TabItemConfig tabWorkFlowLcItemConf = new TabItemConfig("Operator", TabItemConfig tabWorkFlowLcItemConf = new TabItemConfig("Operator",
false); false);
tabWorkFlowLcItemConf.setIcon(DataMinerManager.resources tabWorkFlowLcItemConf.setIcon(DataMinerManagerPanel.resources
.folderExplore()); .folderExplore());
computationPanel = new ComputationPanel(); computationPanel = new ComputationPanel();
computationPanel computationPanel
@ -62,7 +62,7 @@ public class WorkflowPanel extends TabPanel {
TabItemConfig tabComputationPanelItemConf = new TabItemConfig( TabItemConfig tabComputationPanelItemConf = new TabItemConfig(
"Computations Execution", false); "Computations Execution", false);
tabComputationPanelItemConf.setIcon(DataMinerManager.resources tabComputationPanelItemConf.setIcon(DataMinerManagerPanel.resources
.folderExplore()); .folderExplore());
computationExecutionPanel = new ComputationExecutionPanel(); computationExecutionPanel = new ComputationExecutionPanel();
add(computationExecutionPanel, tabComputationPanelItemConf); add(computationExecutionPanel, tabComputationPanelItemConf);

10
src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/FileFld.java
View File

@ -9,7 +9,7 @@ import java.util.List;
import org.gcube.data.analysis.dataminermanagercl.shared.parameters.FileParameter; import org.gcube.data.analysis.dataminermanagercl.shared.parameters.FileParameter;
import org.gcube.data.analysis.dataminermanagercl.shared.parameters.Parameter; import org.gcube.data.analysis.dataminermanagercl.shared.parameters.Parameter;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.DataMinerManager; import org.gcube.portlets.widgets.dataminermanagerwidget.client.DataMinerManagerPanel;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.common.EventBusProvider; import org.gcube.portlets.widgets.dataminermanagerwidget.client.common.EventBusProvider;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.events.SessionExpiredEvent; import org.gcube.portlets.widgets.dataminermanagerwidget.client.events.SessionExpiredEvent;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.rpc.DataMinerPortletServiceAsync; import org.gcube.portlets.widgets.dataminermanagerwidget.client.rpc.DataMinerPortletServiceAsync;
@ -145,7 +145,7 @@ public class FileFld extends AbstractFld {
wselectDialog.setZIndex(XDOM.getTopZIndex()); wselectDialog.setZIndex(XDOM.getTopZIndex());
selectButton = new TextButton("Select File"); selectButton = new TextButton("Select File");
selectButton.setIcon(DataMinerManager.resources.folderExplore()); selectButton.setIcon(DataMinerManagerPanel.resources.folderExplore());
selectButton.addSelectHandler(new SelectEvent.SelectHandler() { selectButton.addSelectHandler(new SelectEvent.SelectHandler() {
@Override @Override
@ -157,7 +157,7 @@ public class FileFld extends AbstractFld {
selectButton.setToolTip("Select File"); selectButton.setToolTip("Select File");
selectButton2 = new TextButton(""); selectButton2 = new TextButton("");
selectButton2.setIcon(DataMinerManager.resources.folderExplore()); selectButton2.setIcon(DataMinerManagerPanel.resources.folderExplore());
selectButton2.addSelectHandler(new SelectEvent.SelectHandler() { selectButton2.addSelectHandler(new SelectEvent.SelectHandler() {
@Override @Override
@ -168,7 +168,7 @@ public class FileFld extends AbstractFld {
selectButton2.setToolTip("Select Another File"); selectButton2.setToolTip("Select Another File");
cancelButton = new TextButton(""); cancelButton = new TextButton("");
cancelButton.setIcon(DataMinerManager.resources.cancel()); cancelButton.setIcon(DataMinerManagerPanel.resources.cancel());
cancelButton.addSelectHandler(new SelectEvent.SelectHandler() { cancelButton.addSelectHandler(new SelectEvent.SelectHandler() {
@Override @Override
@ -179,7 +179,7 @@ public class FileFld extends AbstractFld {
}); });
downloadButton = new TextButton(""); downloadButton = new TextButton("");
downloadButton.setIcon(DataMinerManager.resources.download()); downloadButton.setIcon(DataMinerManagerPanel.resources.download());
downloadButton.addSelectHandler(new SelectEvent.SelectHandler() { downloadButton.addSelectHandler(new SelectEvent.SelectHandler() {
@Override @Override

6
src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/ListIntFld.java
View File

@ -9,7 +9,7 @@ import java.util.List;
import org.gcube.data.analysis.dataminermanagercl.shared.parameters.ListParameter; import org.gcube.data.analysis.dataminermanagercl.shared.parameters.ListParameter;
import org.gcube.data.analysis.dataminermanagercl.shared.parameters.ObjectParameter; import org.gcube.data.analysis.dataminermanagercl.shared.parameters.ObjectParameter;
import org.gcube.data.analysis.dataminermanagercl.shared.parameters.Parameter; import org.gcube.data.analysis.dataminermanagercl.shared.parameters.Parameter;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.DataMinerManager; import org.gcube.portlets.widgets.dataminermanagerwidget.client.DataMinerManagerPanel;
import com.google.gwt.user.client.ui.Widget; import com.google.gwt.user.client.ui.Widget;
import com.sencha.gxt.core.client.util.Margins; import com.sencha.gxt.core.client.util.Margins;
@ -178,7 +178,7 @@ public class ListIntFld extends AbstractFld {
addBtn = new TextButton(""); addBtn = new TextButton("");
addBtn.setIcon(DataMinerManager.resources.add()); addBtn.setIcon(DataMinerManagerPanel.resources.add());
addBtn.addSelectHandler(new SelectEvent.SelectHandler() { addBtn.addSelectHandler(new SelectEvent.SelectHandler() {
@ -193,7 +193,7 @@ public class ListIntFld extends AbstractFld {
removeBtn = new TextButton(""); removeBtn = new TextButton("");
removeBtn.setIcon(DataMinerManager.resources.cancel()); removeBtn.setIcon(DataMinerManagerPanel.resources.cancel());
removeBtn.addSelectHandler(new SelectEvent.SelectHandler() { removeBtn.addSelectHandler(new SelectEvent.SelectHandler() {

6
src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/StringItem.java
View File

@ -1,7 +1,7 @@
package org.gcube.portlets.widgets.dataminermanagerwidget.client.parametersfield; package org.gcube.portlets.widgets.dataminermanagerwidget.client.parametersfield;
import org.gcube.data.analysis.dataminermanagercl.shared.parameters.ObjectParameter; import org.gcube.data.analysis.dataminermanagercl.shared.parameters.ObjectParameter;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.DataMinerManager; import org.gcube.portlets.widgets.dataminermanagerwidget.client.DataMinerManagerPanel;
import com.sencha.gxt.core.client.util.Margins; import com.sencha.gxt.core.client.util.Margins;
import com.sencha.gxt.widget.core.client.button.TextButton; import com.sencha.gxt.widget.core.client.button.TextButton;
@ -36,7 +36,7 @@ public class StringItem extends HBoxLayoutContainer {
addBtn = new TextButton(""); addBtn = new TextButton("");
addBtn.setIcon(DataMinerManager.resources.add()); addBtn.setIcon(DataMinerManagerPanel.resources.add());
addBtn.addSelectHandler(new SelectEvent.SelectHandler() { addBtn.addSelectHandler(new SelectEvent.SelectHandler() {
@ -50,7 +50,7 @@ public class StringItem extends HBoxLayoutContainer {
removeBtn = new TextButton(""); removeBtn = new TextButton("");
removeBtn.setIcon(DataMinerManager.resources.cancel()); removeBtn.setIcon(DataMinerManagerPanel.resources.cancel());
removeBtn.addSelectHandler(new SelectEvent.SelectHandler() { removeBtn.addSelectHandler(new SelectEvent.SelectHandler() {

12
src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/TabItem.java
View File

@ -6,7 +6,7 @@ import java.util.List;
import org.gcube.data.analysis.dataminermanagercl.shared.data.TableItemSimple; import org.gcube.data.analysis.dataminermanagercl.shared.data.TableItemSimple;
import org.gcube.data.analysis.dataminermanagercl.shared.parameters.TabularParameter; import org.gcube.data.analysis.dataminermanagercl.shared.parameters.TabularParameter;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.DataMinerManager; import org.gcube.portlets.widgets.dataminermanagerwidget.client.DataMinerManagerPanel;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.common.EventBusProvider; import org.gcube.portlets.widgets.dataminermanagerwidget.client.common.EventBusProvider;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.events.SessionExpiredEvent; import org.gcube.portlets.widgets.dataminermanagerwidget.client.events.SessionExpiredEvent;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.rpc.DataMinerPortletServiceAsync; import org.gcube.portlets.widgets.dataminermanagerwidget.client.rpc.DataMinerPortletServiceAsync;
@ -76,11 +76,11 @@ public class TabItem extends HBoxLayoutContainer {
} }
}); });
selectButton.setIcon(DataMinerManager.resources.folderExplore()); selectButton.setIcon(DataMinerManagerPanel.resources.folderExplore());
selectButton.setToolTip("Select Data Set"); selectButton.setToolTip("Select Data Set");
selectButton2 = new TextButton(""); selectButton2 = new TextButton("");
selectButton2.setIcon(DataMinerManager.resources.folderExplore()); selectButton2.setIcon(DataMinerManagerPanel.resources.folderExplore());
selectButton2.setToolTip("Select Another Data Set"); selectButton2.setToolTip("Select Another Data Set");
selectButton2.addSelectHandler(new SelectEvent.SelectHandler() { selectButton2.addSelectHandler(new SelectEvent.SelectHandler() {
@ -93,7 +93,7 @@ public class TabItem extends HBoxLayoutContainer {
downloadButton = new TextButton(""); downloadButton = new TextButton("");
downloadButton.setIcon(DataMinerManager.resources.download()); downloadButton.setIcon(DataMinerManagerPanel.resources.download());
downloadButton.addSelectHandler(new SelectEvent.SelectHandler() { downloadButton.addSelectHandler(new SelectEvent.SelectHandler() {
@Override @Override
@ -105,7 +105,7 @@ public class TabItem extends HBoxLayoutContainer {
addBtn = new TextButton(""); addBtn = new TextButton("");
addBtn.setIcon(DataMinerManager.resources.add()); addBtn.setIcon(DataMinerManagerPanel.resources.add());
addBtn.addSelectHandler(new SelectEvent.SelectHandler() { addBtn.addSelectHandler(new SelectEvent.SelectHandler() {
@Override @Override
@ -116,7 +116,7 @@ public class TabItem extends HBoxLayoutContainer {
}); });
removeBtn = new TextButton(""); removeBtn = new TextButton("");
removeBtn.setIcon(DataMinerManager.resources.cancel()); removeBtn.setIcon(DataMinerManagerPanel.resources.cancel());
removeBtn.addSelectHandler(new SelectEvent.SelectHandler() { removeBtn.addSelectHandler(new SelectEvent.SelectHandler() {
@Override @Override

10
src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/TabularFld.java
View File

@ -10,7 +10,7 @@ import java.util.List;
import org.gcube.data.analysis.dataminermanagercl.shared.data.TableItemSimple; import org.gcube.data.analysis.dataminermanagercl.shared.data.TableItemSimple;
import org.gcube.data.analysis.dataminermanagercl.shared.parameters.Parameter; import org.gcube.data.analysis.dataminermanagercl.shared.parameters.Parameter;
import org.gcube.data.analysis.dataminermanagercl.shared.parameters.TabularParameter; import org.gcube.data.analysis.dataminermanagercl.shared.parameters.TabularParameter;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.DataMinerManager; import org.gcube.portlets.widgets.dataminermanagerwidget.client.DataMinerManagerPanel;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.common.EventBusProvider; import org.gcube.portlets.widgets.dataminermanagerwidget.client.common.EventBusProvider;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.events.SessionExpiredEvent; import org.gcube.portlets.widgets.dataminermanagerwidget.client.events.SessionExpiredEvent;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.events.TabularFldChangeEvent; import org.gcube.portlets.widgets.dataminermanagerwidget.client.events.TabularFldChangeEvent;
@ -223,7 +223,7 @@ public class TabularFld extends AbstractFld implements
} }
}); });
selectButton.setIcon(DataMinerManager.resources.folderExplore()); selectButton.setIcon(DataMinerManagerPanel.resources.folderExplore());
selectButton.setToolTip("Select Data Set"); selectButton.setToolTip("Select Data Set");
selectButton2 = new TextButton(""); selectButton2 = new TextButton("");
@ -235,11 +235,11 @@ public class TabularFld extends AbstractFld implements
} }
}); });
selectButton2.setIcon(DataMinerManager.resources.folderExplore()); selectButton2.setIcon(DataMinerManagerPanel.resources.folderExplore());
selectButton2.setToolTip("Select Another Data Set"); selectButton2.setToolTip("Select Another Data Set");
cancelButton = new TextButton(""); cancelButton = new TextButton("");
cancelButton.setIcon(DataMinerManager.resources.cancel()); cancelButton.setIcon(DataMinerManagerPanel.resources.cancel());
cancelButton.addSelectHandler(new SelectEvent.SelectHandler() { cancelButton.addSelectHandler(new SelectEvent.SelectHandler() {
@Override @Override
@ -251,7 +251,7 @@ public class TabularFld extends AbstractFld implements
}); });
downloadButton = new TextButton(""); downloadButton = new TextButton("");
downloadButton.setIcon(DataMinerManager.resources.download()); downloadButton.setIcon(DataMinerManagerPanel.resources.download());
downloadButton.addSelectHandler(new SelectEvent.SelectHandler() { downloadButton.addSelectHandler(new SelectEvent.SelectHandler() {
@Override @Override

8
src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/WKTFld.java
View File

@ -5,7 +5,7 @@ package org.gcube.portlets.widgets.dataminermanagerwidget.client.parametersfield
import org.gcube.data.analysis.dataminermanagercl.shared.parameters.Parameter; import org.gcube.data.analysis.dataminermanagercl.shared.parameters.Parameter;
import org.gcube.data.analysis.dataminermanagercl.shared.parameters.WKTParameter; import org.gcube.data.analysis.dataminermanagercl.shared.parameters.WKTParameter;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.DataMinerManager; import org.gcube.portlets.widgets.dataminermanagerwidget.client.DataMinerManagerPanel;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.util.UtilsGXT3; import org.gcube.portlets.widgets.dataminermanagerwidget.client.util.UtilsGXT3;
import org.gcube.portlets.widgets.openlayerbasicwidgets.client.event.SelectAreaDialogEvent; import org.gcube.portlets.widgets.openlayerbasicwidgets.client.event.SelectAreaDialogEvent;
import org.gcube.portlets.widgets.openlayerbasicwidgets.client.event.SelectAreaDialogEvent.SelectAreaDialogEventHandler; import org.gcube.portlets.widgets.openlayerbasicwidgets.client.event.SelectAreaDialogEvent.SelectAreaDialogEventHandler;
@ -157,7 +157,7 @@ public class WKTFld extends AbstractFld {
private void init() { private void init() {
selectButton = new TextButton("Draw a " selectButton = new TextButton("Draw a "
+ wktParameter.getWktGeometryType().getLabel()); + wktParameter.getWktGeometryType().getLabel());
selectButton.setIcon(DataMinerManager.resources.drawGeometry()); selectButton.setIcon(DataMinerManagerPanel.resources.drawGeometry());
selectButton.addSelectHandler(new SelectEvent.SelectHandler() { selectButton.addSelectHandler(new SelectEvent.SelectHandler() {
@Override @Override
@ -170,7 +170,7 @@ public class WKTFld extends AbstractFld {
// + wktParameter.getWktGeometryType().getLabel()); // + wktParameter.getWktGeometryType().getLabel());
selectButton2 = new TextButton(""); selectButton2 = new TextButton("");
selectButton2.setIcon(DataMinerManager.resources.folderExplore()); selectButton2.setIcon(DataMinerManagerPanel.resources.folderExplore());
selectButton2.addSelectHandler(new SelectEvent.SelectHandler() { selectButton2.addSelectHandler(new SelectEvent.SelectHandler() {
@Override @Override
@ -182,7 +182,7 @@ public class WKTFld extends AbstractFld {
// + wktParameter.getWktGeometryType().getLabel()); // + wktParameter.getWktGeometryType().getLabel());
cancelButton = new TextButton(""); cancelButton = new TextButton("");
cancelButton.setIcon(DataMinerManager.resources.cancel()); cancelButton.setIcon(DataMinerManagerPanel.resources.cancel());
cancelButton.addSelectHandler(new SelectEvent.SelectHandler() { cancelButton.addSelectHandler(new SelectEvent.SelectHandler() {
@Override @Override

BIN
src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/resources/logoLittle.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.8 KiB

After

Width:  |  Height:  |  Size: 7.8 KiB

2
src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/rpc/DataMinerPortletService.java
View File

@ -22,7 +22,7 @@ import com.google.gwt.user.client.rpc.RemoteServiceRelativePath;
/** /**
* The client side stub for the RPC service. * The client side stub for the RPC service.
*/ */
@RemoteServiceRelativePath("dataminerman") @RemoteServiceRelativePath("dataminermanagerwidget")
public interface DataMinerPortletService extends RemoteService { public interface DataMinerPortletService extends RemoteService {
public UserInfo hello() throws ServiceException; public UserInfo hello() throws ServiceException;

4
src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/widgets/FileViewer.java
View File

@ -2,7 +2,7 @@ package org.gcube.portlets.widgets.dataminermanagerwidget.client.widgets;
import org.gcube.data.analysis.dataminermanagercl.shared.data.computations.ComputationId; import org.gcube.data.analysis.dataminermanagercl.shared.data.computations.ComputationId;
import org.gcube.data.analysis.dataminermanagercl.shared.data.output.FileResource; import org.gcube.data.analysis.dataminermanagercl.shared.data.output.FileResource;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.DataMinerManager; import org.gcube.portlets.widgets.dataminermanagerwidget.client.DataMinerManagerPanel;
import com.google.gwt.safehtml.shared.SafeHtmlBuilder; import com.google.gwt.safehtml.shared.SafeHtmlBuilder;
import com.sencha.gxt.core.client.util.Margins; import com.sencha.gxt.core.client.util.Margins;
@ -50,7 +50,7 @@ public class FileViewer extends SimpleContainer {
.toSafeHtml().asString() + "</p></div>"); .toSafeHtml().asString() + "</p></div>");
lc.add(fileNameHtml, new VerticalLayoutData(-1, -1, new Margins(0))); lc.add(fileNameHtml, new VerticalLayoutData(-1, -1, new Margins(0)));
TextButton downloadBtn = new TextButton("Download File"); TextButton downloadBtn = new TextButton("Download File");
downloadBtn.setIcon(DataMinerManager.resources.download()); downloadBtn.setIcon(DataMinerManagerPanel.resources.download());
downloadBtn.addSelectHandler(new SelectEvent.SelectHandler() { downloadBtn.addSelectHandler(new SelectEvent.SelectHandler() {
@Override @Override
public void onSelect(SelectEvent event) { public void onSelect(SelectEvent event) {

4
src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/widgets/ImageViewer.java
View File

@ -2,7 +2,7 @@ package org.gcube.portlets.widgets.dataminermanagerwidget.client.widgets;
import org.gcube.data.analysis.dataminermanagercl.shared.data.computations.ComputationId; import org.gcube.data.analysis.dataminermanagercl.shared.data.computations.ComputationId;
import org.gcube.data.analysis.dataminermanagercl.shared.data.output.ImageResource; import org.gcube.data.analysis.dataminermanagercl.shared.data.output.ImageResource;
import org.gcube.portlets.widgets.dataminermanagerwidget.client.DataMinerManager; import org.gcube.portlets.widgets.dataminermanagerwidget.client.DataMinerManagerPanel;
import com.google.gwt.user.client.ui.Image; import com.google.gwt.user.client.ui.Image;
import com.sencha.gxt.core.client.util.Margins; import com.sencha.gxt.core.client.util.Margins;
@ -51,7 +51,7 @@ public class ImageViewer extends SimpleContainer {
v.add(new HtmlLayoutContainer(imagesResource.getName()),new VerticalLayoutData(-1, -1, new Margins(0))); v.add(new HtmlLayoutContainer(imagesResource.getName()),new VerticalLayoutData(-1, -1, new Margins(0)));
TextButton saveImageBtn = new TextButton( TextButton saveImageBtn = new TextButton(
"Download Image"); "Download Image");
saveImageBtn.setIcon(DataMinerManager.resources.download()); saveImageBtn.setIcon(DataMinerManagerPanel.resources.download());
saveImageBtn.addSelectHandler(new SelectEvent.SelectHandler() { saveImageBtn.addSelectHandler(new SelectEvent.SelectHandler() {
@Override @Override

17
src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/dataminermanagerwidget.gwt.xml
View File

@ -20,7 +20,12 @@
<!-- OpenLayer Basic Widgets --> <!-- OpenLayer Basic Widgets -->
<inherits <inherits
name='org.gcube.portlets.widgets.openlayerbasicwidgets.olbasicwidgets' /> name='org.gcube.portlets.widgets.openlayerbasicwidgets.olbasicwidgets' />
<!-- DataMiner Manager CL -->
<inherits
name='org.gcube.data.analysis.dataminermanagercl.dataminermanagercl' />
<!-- inherits WorkspaceExplorer widget --> <!-- inherits WorkspaceExplorer widget -->
<inherits name='org.gcube.portlets.widgets.wsexplorer.WorkspaceExplorer' /> <inherits name='org.gcube.portlets.widgets.wsexplorer.WorkspaceExplorer' />
@ -30,18 +35,18 @@
<entry-point <entry-point
class='org.gcube.portlets.user.dataminermanager.client.DataMinerManager' /> class='org.gcube.portlets.widgets.dataminermanagerwidget.client.DataMinerManager' />
<!-- <set-property name="log_ConsoleLogger" value="ENABLED" /> <set-property <set-property name="log_ConsoleLogger" value="ENABLED" /> <set-property
name="log_DivLogger" value="ENABLED" /> <set-property name="log_GWTLogger" name="log_DivLogger" value="ENABLED" /> <set-property name="log_GWTLogger"
value="ENABLED" /> <set-property name="log_SystemLogger" value="ENABLED" value="ENABLED" /> <set-property name="log_SystemLogger" value="ENABLED"
/> --> />
<!--
<set-property name="log_ConsoleLogger" value="DISABLED" /> <set-property name="log_ConsoleLogger" value="DISABLED" />
<set-property name="log_DivLogger" value="DISABLED" /> <set-property name="log_DivLogger" value="DISABLED" />
<set-property name="log_GWTLogger" value="DISABLED" /> <set-property name="log_GWTLogger" value="DISABLED" />
<set-property name="log_SystemLogger" value="DISABLED" /> <set-property name="log_SystemLogger" value="DISABLED" />
-->
<source path='client' /> <source path='client' />

8
src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/shared/Constants.java
View File

@ -7,7 +7,7 @@ package org.gcube.portlets.widgets.dataminermanagerwidget.shared;
* *
*/ */
public class Constants { public class Constants {
public static final boolean DEBUG_MODE = false; public static final boolean DEBUG_MODE = true;
public static final boolean TEST_ENABLE = false; public static final boolean TEST_ENABLE = false;
public static final String APPLICATION_ID = "org.gcube.portlets.user.dataminermanager.portlet.DataMinerManager"; public static final String APPLICATION_ID = "org.gcube.portlets.user.dataminermanager.portlet.DataMinerManager";
@ -17,9 +17,9 @@ public class Constants {
public static final String DATA_MINER_OPERATOR_ID = "OperatorId"; public static final String DATA_MINER_OPERATOR_ID = "OperatorId";
public static final String DEFAULT_USER = "giancarlo.panichi"; public static final String DEFAULT_USER = "giancarlo.panichi";
public final static String DEFAULT_SCOPE = "/gcube/devNext"; public final static String DEFAULT_SCOPE = "/gcube/devNext/NextNext";
public final static String DEFAULT_TOKEN = "16e65d4f-11e0-4e4a-84b9-351688fccc12-98187548"; public final static String DEFAULT_TOKEN = "ae1208f0-210d-47c9-9b24-d3f2dfcce05f-98187548";
public static final String DEFAULT_ROLE = "OrganizationMember"; public static final String DEFAULT_ROLE = "OrganizationMember";
// public final static String DEFAULT_SCOPE = "/gcube/devNext"; // public final static String DEFAULT_SCOPE = "/gcube/devNext";
//public final static String DEFAULT_SCOPE = "/gcube/devNext/NextNext"; //public final static String DEFAULT_SCOPE = "/gcube/devNext/NextNext";

9
src/main/resources/org/gcube/portlets/widgets/dataminermanagerwidget/dataminermanager.gwt.xml
View File

@ -14,13 +14,18 @@
<set-configuration-property name="CssResource.style" <set-configuration-property name="CssResource.style"
value="pretty" /> value="pretty" />
<inherits name='org.gcube.portal.clientcontext.GCubeClientContext' /> <inherits name='org.gcube.portal.clientcontext.GCubeClientContext' />
<!-- OpenLayer Basic Widgets --> <!-- OpenLayer Basic Widgets -->
<inherits <inherits
name='org.gcube.portlets.widgets.openlayerbasicwidgets.olbasicwidgets' /> name='org.gcube.portlets.widgets.openlayerbasicwidgets.olbasicwidgets' />
<!-- DataMiner Manager CL -->
<inherits
name='org.gcube.data.analysis.dataminermanagercl.dataminermanagercl' />
<!-- inherits WorkspaceExplorer widget --> <!-- inherits WorkspaceExplorer widget -->
<inherits name='org.gcube.portlets.widgets.wsexplorer.WorkspaceExplorer' /> <inherits name='org.gcube.portlets.widgets.wsexplorer.WorkspaceExplorer' />
@ -30,7 +35,7 @@
<entry-point <entry-point
class='org.gcube.portlets.user.dataminermanager.client.DataMinerManager' /> class='org.gcube.portlets.widgets.dataminermanagerwidget.client.DataMinerManager' />
<!-- <set-property name="log_ConsoleLogger" value="ENABLED" /> <set-property <!-- <set-property name="log_ConsoleLogger" value="ENABLED" /> <set-property
name="log_DivLogger" value="ENABLED" /> <set-property name="log_GWTLogger" name="log_DivLogger" value="ENABLED" /> <set-property name="log_GWTLogger"
value="ENABLED" /> <set-property name="log_SystemLogger" value="ENABLED" value="ENABLED" /> <set-property name="log_SystemLogger" value="ENABLED"

1
src/main/webapp/DataMinerManagerWidget.css
View File

@ -290,6 +290,7 @@
border: 1px solid black; border: 1px solid black;
/*margin-left: 5px; /*margin-left: 5px;
margin-right: 5px;*/ margin-right: 5px;*/
} }
.workflow-icon { .workflow-icon {

14
src/main/webapp/DataMinerManagerWidget.html
View File

@ -4,22 +4,22 @@
<head> <head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8"> <meta http-equiv="content-type" content="text/html; charset=UTF-8">
<link type="text/css" rel="stylesheet" href="dataminermanager/reset.css"> <link type="text/css" rel="stylesheet" href="dataminermanagerwidget/reset.css">
<link type="text/css" rel="stylesheet" href="DataMinerManager.css"> <link type="text/css" rel="stylesheet" href="DataMinerManagerWidget.css">
<link type="text/css" rel="stylesheet" href="gxt/css/gxt-all.css"> <link type="text/css" rel="stylesheet" href="gxt/css/gxt-all.css">
<link type="text/css" rel="stylesheet" href="dataminermanager/css/ol.css"> <link type="text/css" rel="stylesheet" href="dataminermanagerwidget/css/ol.css">
<title>Data Miner Manager</title> <title>Data Miner Manager</title>
<script type="text/javascript" src="dataminermanager/js/jquery-1.11.0.min.js"></script> <script type="text/javascript" src="dataminermanagerwidget/js/jquery-1.11.0.min.js"></script>
<script type="text/javascript" src="dataminermanager/js/ol.js"></script> <script type="text/javascript" src="dataminermanagerwidget/js/ol.js"></script>
<!-- <!--
<script type="text/javascript" <script type="text/javascript"
src="dataminermanager/js/jquery-1.10.1.min.js"></script> --> src="dataminermanager/js/jquery-1.10.1.min.js"></script> -->
<script type="text/javascript" <script type="text/javascript"
src="dataminermanager/js/bootstrap.min.js"></script> src="dataminermanagerwidget/js/bootstrap.min.js"></script>
<script type="text/javascript" <script type="text/javascript"
src="dataminermanager/dataminermanager.nocache.js"></script> src="dataminermanagerwidget/dataminermanagerwidget.nocache.js"></script>
</head> </head>
<body> <body>

2
src/main/webapp/WEB-INF/jsp/DataMinerManagerWidget_view.jsp
View File

@ -21,7 +21,7 @@
src='<%=request.getContextPath()%>/dataminermanagerwidget/js/jquery-1.11.0.min.js'></script> src='<%=request.getContextPath()%>/dataminermanagerwidget/js/jquery-1.11.0.min.js'></script>
<script src='<%=request.getContextPath()%>/dataminermanagerwidget/js/ol.js'></script> <script src='<%=request.getContextPath()%>/dataminermanagerwidget/js/ol.js'></script>
<script <script
src='<%=request.getContextPath()%>/dataminermanager/js/bootstrap.min.js'></script> src='<%=request.getContextPath()%>/dataminermanagerwidget/js/bootstrap.min.js'></script>
<script <script
src='<%=request.getContextPath()%>/dataminermanagerwidget/dataminermanagerwidget.nocache.js'></script> src='<%=request.getContextPath()%>/dataminermanagerwidget/dataminermanagerwidget.nocache.js'></script>

2
src/main/webapp/WEB-INF/web.xml
View File

@ -32,7 +32,7 @@
<servlet-mapping> <servlet-mapping>
<servlet-name>DataMinerManagerServlet</servlet-name> <servlet-name>DataMinerManagerServlet</servlet-name>
<url-pattern>/dataminermanagerwidget/dataminermanwidget</url-pattern> <url-pattern>/dataminermanagerwidget/dataminermanagerwidget</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping> <servlet-mapping>
<servlet-name>jUnitHostImpl</servlet-name> <servlet-name>jUnitHostImpl</servlet-name>