diff --git a/.classpath b/.classpath index 5990e91..a8cb542 100644 --- a/.classpath +++ b/.classpath @@ -1,6 +1,6 @@ - + @@ -26,5 +26,5 @@ - + diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index 5391f78..a4af7db 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -4,10 +4,10 @@ - + uses - + diff --git a/pom.xml b/pom.xml index 22f69fe..c4d449c 100644 --- a/pom.xml +++ b/pom.xml @@ -393,7 +393,6 @@ DataMinerManagerWidget.html ${webappDirectory} org.gcube.portlets.widgets.dataminermanagerwidget.dataminermanagerwidget - diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/DataMinerManager.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/DataMinerManager.java index ab150bc..86be023 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/DataMinerManager.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/DataMinerManager.java @@ -1,46 +1,14 @@ 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.EntryPoint; -import com.google.gwt.core.client.GWT; import com.google.gwt.core.client.Scheduler; 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 onModuleLoad(). */ 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} @@ -54,186 +22,19 @@ public class DataMinerManager implements EntryPoint { Log.setUncaughtExceptionHandler(); // use deferred command to catch initialization exceptions in - // onModuleLoad2 + // onModuleLoad Scheduler.get().scheduleDeferred(new ScheduledCommand() { public void execute() { - //loadScope(); + // loadScope(); loadMainPanel(); } }); } - /*private void loadScope() { - ClientScopeHelper.getService().setScope(Location.getHref(), - new AsyncCallback() { - @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() { - 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); - - // - - 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(); + DataMinerManagerDialog dataMinerManagerDialog = new DataMinerManagerDialog(); + dataMinerManagerDialog.show(); } - - 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; - } - } diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/DataMinerManagerController.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/DataMinerManagerController.java index 1bce0a1..b791032 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/DataMinerManagerController.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/DataMinerManagerController.java @@ -74,7 +74,7 @@ public class DataMinerManagerController { } private void init() { - currentVisualization = MenuType.HOME; + currentVisualization = MenuType.EXPERIMENT; restoreUISession(); bind(); callHello(); diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/DataMinerManagerDialog.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/DataMinerManagerDialog.java new file mode 100644 index 0000000..d000705 --- /dev/null +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/DataMinerManagerDialog.java @@ -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: g.panichi@isti.cnr.it + * + */ +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); + + } +} \ No newline at end of file diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/DataMinerManagerPanel.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/DataMinerManagerPanel.java new file mode 100644 index 0000000..45b373f --- /dev/null +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/DataMinerManagerPanel.java @@ -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: g.panichi@isti.cnr.it + * + */ +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; + } + +} diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/Header.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/Header.java index b9407d7..8168159 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/Header.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/Header.java @@ -27,7 +27,7 @@ import com.google.gwt.user.client.ui.Image; */ public class Header extends HorizontalPanel { - private Image menuGoBack, menuExperiment, menuDataSpace, menuComputations, menuHelp; + private Image menuExperiment, menuDataSpace, menuComputations, menuHelp; private Enum currentSelection; public Header() { @@ -51,12 +51,12 @@ public class Header extends HorizontalPanel { private void create() { // 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.setTitle("Data Miner Manager"); logo.addStyleName("menuImgLogo"); - menuGoBack = new Image(DataMinerManager.resources.goBack()); + /*menuGoBack = new Image(DataMinerManagerPanel.resources.goBack()); menuGoBack.addStyleName("menuItemImage"); menuGoBack.addClickHandler(new ClickHandler() { @Override @@ -65,10 +65,10 @@ public class Header extends HorizontalPanel { EventBusProvider.INSTANCE.fireEvent(menuEvent); } - }); + });*/ menuDataSpace = new Image( - DataMinerManager.resources.menuItemInputspace()); + DataMinerManagerPanel.resources.menuItemInputspace()); menuDataSpace.addStyleName("menuItemImage"); menuDataSpace.addClickHandler(new ClickHandler() { @Override @@ -80,7 +80,7 @@ public class Header extends HorizontalPanel { }); menuExperiment = new Image( - DataMinerManager.resources.menuItemExperiment()); + DataMinerManagerPanel.resources.menuItemExperiment()); menuExperiment.addStyleName("menuItemImage"); menuExperiment.addClickHandler(new ClickHandler() { @Override @@ -92,7 +92,7 @@ public class Header extends HorizontalPanel { }); menuComputations = new Image( - DataMinerManager.resources.menuItemComputations()); + DataMinerManagerPanel.resources.menuItemComputations()); menuComputations.addStyleName("menuItemImage"); menuComputations.addClickHandler(new ClickHandler() { @@ -106,7 +106,7 @@ public class Header extends HorizontalPanel { menuHelp = new Image( - DataMinerManager.resources.menuItemHelp()); + DataMinerManagerPanel.resources.menuItemHelp()); menuHelp.addStyleName("menuItemImage"); menuHelp.addClickHandler(new ClickHandler() { @@ -119,20 +119,20 @@ public class Header extends HorizontalPanel { add(logo); - add(menuGoBack); + //add(menuGoBack); add(menuDataSpace); add(menuExperiment); add(menuComputations); add(menuHelp); - + this.setCellWidth(logo, "100px"); - this.setCellWidth(menuGoBack, "100px"); + //this.setCellWidth(menuGoBack, "100px"); this.setCellWidth(menuDataSpace, "80px"); this.setCellWidth(menuExperiment, "80px"); // this.setCellWidth(menuComputations, "80px"); this.setCellWidth(menuHelp, "80px"); - menuGoBack.setVisible(false); + //menuGoBack.setVisible(false); menuDataSpace.setVisible(false); menuExperiment.setVisible(false); menuComputations.setVisible(false); @@ -143,7 +143,7 @@ public class Header extends HorizontalPanel { Log.debug("SetMenu: " + menuType); if (menuType.compareTo(MenuType.HOME) == 0) { - menuGoBack.setVisible(false); + //menuGoBack.setVisible(false); menuDataSpace.setVisible(false); menuExperiment.setVisible(false); menuComputations.setVisible(false); @@ -162,7 +162,7 @@ public class Header extends HorizontalPanel { if (currentSelection == null || (currentSelection != null && currentSelection .compareTo(MenuType.HOME) == 0)) { - menuGoBack.setVisible(true); + //menuGoBack.setVisible(true); menuDataSpace.setVisible(true); menuExperiment.setVisible(true); menuComputations.setVisible(true); @@ -197,7 +197,7 @@ public class Header extends HorizontalPanel { Log.debug("MenuSwitch: " + event); if (event.getMenuType().compareTo(MenuType.HOME) == 0) { - menuGoBack.setVisible(false); + //menuGoBack.setVisible(false); menuDataSpace.setVisible(false); menuExperiment.setVisible(false); menuComputations.setVisible(false); @@ -216,7 +216,7 @@ public class Header extends HorizontalPanel { if (currentSelection == null || (currentSelection != null && currentSelection .compareTo(MenuType.HOME) == 0)) { - menuGoBack.setVisible(true); + //menuGoBack.setVisible(true); menuDataSpace.setVisible(true); menuExperiment.setVisible(true); menuComputations.setVisible(true); @@ -247,7 +247,7 @@ public class Header extends HorizontalPanel { private void showHelp() { try { - DataMinerManager.resources.wikiLink().getText( + DataMinerManagerPanel.resources.wikiLink().getText( new ResourceCallback() { public void onError(ResourceException e) { Log.error("Error retrieving wiki link!: " diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/HomePanel.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/HomePanel.java index 60bb0b9..0b1cbeb 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/HomePanel.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/HomePanel.java @@ -62,7 +62,7 @@ public class HomePanel extends SimpleContainer { SimpleContainer itemDataSpace = createMenuItem( "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.", - DataMinerManager.resources.inputSpaceIcon(), new MouseDownHandler() { + DataMinerManagerPanel.resources.inputSpaceIcon(), new MouseDownHandler() { @Override public void onMouseDown(MouseDownEvent event) { @@ -77,7 +77,7 @@ public class HomePanel extends SimpleContainer { SimpleContainer itemExperiment = createMenuItem( "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.", - DataMinerManager.resources.executionIcon(), new MouseDownHandler() { + DataMinerManagerPanel.resources.executionIcon(), new MouseDownHandler() { @Override public void onMouseDown(MouseDownEvent event) { @@ -94,7 +94,7 @@ public class HomePanel extends SimpleContainer { SimpleContainer itemComputations = createMenuItem( "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.", - DataMinerManager.resources.computationsIcon(), new MouseDownHandler() { + DataMinerManagerPanel.resources.computationsIcon(), new MouseDownHandler() { @Override public void onMouseDown(MouseDownEvent event) { diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/computations/ComputationValueFilePanel.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/computations/ComputationValueFilePanel.java index 2484ea1..614312e 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/computations/ComputationValueFilePanel.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/computations/ComputationValueFilePanel.java @@ -1,7 +1,7 @@ package org.gcube.portlets.widgets.dataminermanagerwidget.client.computations; 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.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))); TextButton downloadBtn = new TextButton("Download File"); - downloadBtn.setIcon(DataMinerManager.resources.download()); + downloadBtn.setIcon(DataMinerManagerPanel.resources.download()); downloadBtn.addSelectHandler(new SelectEvent.SelectHandler() { @Override public void onSelect(SelectEvent event) { diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/computations/ComputationValueImagePanel.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/computations/ComputationValueImagePanel.java index 427f521..76c09f6 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/computations/ComputationValueImagePanel.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/computations/ComputationValueImagePanel.java @@ -1,7 +1,7 @@ package org.gcube.portlets.widgets.dataminermanagerwidget.client.computations; 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.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))); TextButton saveImageBtn = new TextButton("Download Image"); - saveImageBtn.setIcon(DataMinerManager.resources.download()); + saveImageBtn.setIcon(DataMinerManagerPanel.resources.download()); saveImageBtn.addSelectHandler(new SelectEvent.SelectHandler() { @Override diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/computations/ComputationsExecutedPanel.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/computations/ComputationsExecutedPanel.java index 8d28a27..6bff7c6 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/computations/ComputationsExecutedPanel.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/computations/ComputationsExecutedPanel.java @@ -6,7 +6,7 @@ import java.util.List; import java.util.Map; 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.events.CancelExecutionFromComputationsRequestEvent; import org.gcube.portlets.widgets.dataminermanagerwidget.client.events.ComputationDataRequestEvent; @@ -318,7 +318,7 @@ public class ComputationsExecutedPanel extends FramedPanel { // ToolBar btnShow = new TextButton("Show"); - btnShow.setIcon(DataMinerManager.resources.show()); + btnShow.setIcon(DataMinerManagerPanel.resources.show()); btnShow.setScale(ButtonScale.SMALL); btnShow.setIconAlign(IconAlign.LEFT); btnShow.setToolTip("Show"); @@ -332,7 +332,7 @@ public class ComputationsExecutedPanel extends FramedPanel { }); btnDownload = new TextButton("Download"); - btnDownload.setIcon(DataMinerManager.resources.download()); + btnDownload.setIcon(DataMinerManagerPanel.resources.download()); btnDownload.setScale(ButtonScale.SMALL); btnDownload.setIconAlign(IconAlign.LEFT); btnDownload.setToolTip("Download"); @@ -346,7 +346,7 @@ public class ComputationsExecutedPanel extends FramedPanel { }); btnDelete = new TextButton("Delete"); - btnDelete.setIcon(DataMinerManager.resources.deleteCircle()); + btnDelete.setIcon(DataMinerManagerPanel.resources.deleteCircle()); btnDelete.setScale(ButtonScale.SMALL); btnDelete.setIconAlign(IconAlign.LEFT); btnDelete.setToolTip("Delete"); @@ -360,7 +360,7 @@ public class ComputationsExecutedPanel extends FramedPanel { }); btnRefresh = new TextButton("Refresh"); - btnRefresh.setIcon(DataMinerManager.resources.refresh()); + btnRefresh.setIcon(DataMinerManagerPanel.resources.refresh()); btnRefresh.setScale(ButtonScale.SMALL); btnRefresh.setIconAlign(IconAlign.LEFT); btnRefresh.setToolTip("Refresh"); @@ -374,7 +374,7 @@ public class ComputationsExecutedPanel extends FramedPanel { }); btnResubmit = new TextButton("Resubmit"); - btnResubmit.setIcon(DataMinerManager.resources.resubmit()); + btnResubmit.setIcon(DataMinerManagerPanel.resources.resubmit()); btnResubmit.setScale(ButtonScale.SMALL); btnResubmit.setIconAlign(IconAlign.LEFT); btnResubmit.setToolTip("Resubmit"); @@ -388,7 +388,7 @@ public class ComputationsExecutedPanel extends FramedPanel { }); btnCancel = new TextButton("Cancel"); - btnCancel.setIcon(DataMinerManager.resources.cancelCircle()); + btnCancel.setIcon(DataMinerManagerPanel.resources.cancelCircle()); btnCancel.setScale(ButtonScale.SMALL); btnCancel.setIconAlign(IconAlign.LEFT); btnCancel.setToolTip("Cancel"); diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/computations/ComputationsPanel.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/computations/ComputationsPanel.java index 7ebeaf6..2ab338a 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/computations/ComputationsPanel.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/computations/ComputationsPanel.java @@ -5,7 +5,7 @@ package org.gcube.portlets.widgets.dataminermanagerwidget.client.computations; 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.events.ComputationDataEvent; import org.gcube.portlets.widgets.dataminermanagerwidget.client.events.DataMinerWorkAreaEvent; @@ -136,7 +136,7 @@ public class ComputationsPanel extends SimpleContainer { TabItemConfig computationsExecutedItemConf = new TabItemConfig( "List of Computations", false); - computationsExecutedItemConf.setIcon(DataMinerManager.resources + computationsExecutedItemConf.setIcon(DataMinerManagerPanel.resources .folderExplore()); computationsTabPanel.add(computationsExecutedPanel, @@ -181,7 +181,7 @@ public class ComputationsPanel extends SimpleContainer { computationsViewers.add(computationsViewerPanel); TabItemConfig computationsViewerItemConf = new TabItemConfig(event .getComputationData().getComputationId().getId(), true); - computationsViewerItemConf.setIcon(DataMinerManager.resources + computationsViewerItemConf.setIcon(DataMinerManagerPanel.resources .folderExplore()); computationsTabPanel.add(computationsViewerPanel, computationsViewerItemConf); diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/dataspace/DataSpacePanel.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/dataspace/DataSpacePanel.java index 01522e3..33d294f 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/dataspace/DataSpacePanel.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/dataspace/DataSpacePanel.java @@ -3,7 +3,7 @@ */ 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.TabPanel; @@ -40,14 +40,14 @@ public class DataSpacePanel extends SimpleContainer { TabItemConfig outputDataItemConf = new TabItemConfig("Output Data Sets", false); - outputDataItemConf.setIcon(DataMinerManager.resources + outputDataItemConf.setIcon(DataMinerManagerPanel.resources .folderExplore()); dataSpaceTabPanel.add(outputDataSetsPanel, outputDataItemConf); TabItemConfig inputDataSetsItemConf = new TabItemConfig( "Input Data Sets", false); - inputDataSetsItemConf.setIcon(DataMinerManager.resources + inputDataSetsItemConf.setIcon(DataMinerManagerPanel.resources .folderExplore()); dataSpaceTabPanel.add(inputDataSetsPanel, inputDataSetsItemConf); diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/dataspace/InputDataSetsPanel.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/dataspace/InputDataSetsPanel.java index 883f23e..9c98b33 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/dataspace/InputDataSetsPanel.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/dataspace/InputDataSetsPanel.java @@ -6,7 +6,7 @@ import java.util.List; import java.util.Map; 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.events.DataMinerWorkAreaEvent; import org.gcube.portlets.widgets.dataminermanagerwidget.client.events.DeleteItemRequestEvent; @@ -303,7 +303,7 @@ public class InputDataSetsPanel extends FramedPanel { // ToolBar btnDownload = new TextButton("Download"); - btnDownload.setIcon(DataMinerManager.resources.download()); + btnDownload.setIcon(DataMinerManagerPanel.resources.download()); btnDownload.setScale(ButtonScale.SMALL); btnDownload.setIconAlign(IconAlign.LEFT); btnDownload.setToolTip("Download"); @@ -317,7 +317,7 @@ public class InputDataSetsPanel extends FramedPanel { }); btnDelete = new TextButton("Delete"); - btnDelete.setIcon(DataMinerManager.resources.deleteCircle()); + btnDelete.setIcon(DataMinerManagerPanel.resources.deleteCircle()); btnDelete.setScale(ButtonScale.SMALL); btnDelete.setIconAlign(IconAlign.LEFT); btnDelete.setToolTip("Delete"); @@ -331,7 +331,7 @@ public class InputDataSetsPanel extends FramedPanel { }); btnRefresh = new TextButton("Refresh"); - btnRefresh.setIcon(DataMinerManager.resources.refresh()); + btnRefresh.setIcon(DataMinerManagerPanel.resources.refresh()); btnRefresh.setScale(ButtonScale.SMALL); btnRefresh.setIconAlign(IconAlign.LEFT); btnRefresh.setToolTip("Refresh"); diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/dataspace/OutputDataSetsPanel.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/dataspace/OutputDataSetsPanel.java index a581010..7ed3b38 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/dataspace/OutputDataSetsPanel.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/dataspace/OutputDataSetsPanel.java @@ -6,7 +6,7 @@ import java.util.List; import java.util.Map; 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.events.DataMinerWorkAreaEvent; import org.gcube.portlets.widgets.dataminermanagerwidget.client.events.DeleteItemRequestEvent; @@ -302,7 +302,7 @@ public class OutputDataSetsPanel extends FramedPanel { // ToolBar btnDownload = new TextButton("Download"); - btnDownload.setIcon(DataMinerManager.resources.download()); + btnDownload.setIcon(DataMinerManagerPanel.resources.download()); btnDownload.setScale(ButtonScale.SMALL); btnDownload.setIconAlign(IconAlign.LEFT); btnDownload.setToolTip("Download"); @@ -316,7 +316,7 @@ public class OutputDataSetsPanel extends FramedPanel { }); btnDelete = new TextButton("Delete"); - btnDelete.setIcon(DataMinerManager.resources.deleteCircle()); + btnDelete.setIcon(DataMinerManagerPanel.resources.deleteCircle()); btnDelete.setScale(ButtonScale.SMALL); btnDelete.setIconAlign(IconAlign.LEFT); btnDelete.setToolTip("Delete"); @@ -330,7 +330,7 @@ public class OutputDataSetsPanel extends FramedPanel { }); btnRefresh = new TextButton("Refresh"); - btnRefresh.setIcon(DataMinerManager.resources.refresh()); + btnRefresh.setIcon(DataMinerManagerPanel.resources.refresh()); btnRefresh.setScale(ButtonScale.SMALL); btnRefresh.setIconAlign(IconAlign.LEFT); btnRefresh.setToolTip("Refresh"); diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/experiments/ComputationExecutionPanel.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/experiments/ComputationExecutionPanel.java index a6605be..604516b 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/experiments/ComputationExecutionPanel.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/experiments/ComputationExecutionPanel.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.List; 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.events.ResubmitComputationExecutionEvent; 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.setScale(ButtonScale.MEDIUM); diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/experiments/ComputationPanel.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/experiments/ComputationPanel.java index 69a3c46..9db0e2f 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/experiments/ComputationPanel.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/experiments/ComputationPanel.java @@ -1,7 +1,7 @@ package org.gcube.portlets.widgets.dataminermanagerwidget.client.experiments; 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.ComputationReadyEventHandler; 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.setToolTip(DELETE_ALL_BUTTON_TOOLTIP); - removeAllButton.setIcon(DataMinerManager.resources.removeAll()); + removeAllButton.setIcon(DataMinerManagerPanel.resources.removeAll()); removeAllButton.setEnabled(false); removeAllButton.addSelectHandler(new SelectHandler() { @@ -105,7 +105,7 @@ public class ComputationPanel extends FramedPanel implements HasComputationReady v.clear(); HBoxLayoutContainer hBox = new HBoxLayoutContainer(); hBox.setPack(BoxLayoutPack.CENTER); - hBox.add(new Image(DataMinerManager.resources.workflowConnector1()), + hBox.add(new Image(DataMinerManagerPanel.resources.workflowConnector1()), new BoxLayoutData(new Margins(0))); v.add(hBox, new VerticalLayoutData(1, -1, new Margins(10,0,0,0))); v.add(computationParametersPanel, new VerticalLayoutData(1, -1, diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/experiments/ComputationParametersPanel.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/experiments/ComputationParametersPanel.java index 8967ea2..e9d474b 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/experiments/ComputationParametersPanel.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/experiments/ComputationParametersPanel.java @@ -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.ParameterType; 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.events.SessionExpiredEvent; 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 ImageResource PRELOAD_IMAGE = DataMinerManager.resources + private static final ImageResource PRELOAD_IMAGE = DataMinerManagerPanel.resources .loaderBig(); private VerticalLayoutContainer v; @@ -164,7 +164,7 @@ public class ComputationParametersPanel extends SimpleContainer { submit = new TextButton("Start Computation"); 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().setMarginBottom(20, Unit.PX); diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/experiments/OperatorsPanel.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/experiments/OperatorsPanel.java index 6f3df48..ac31188 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/experiments/OperatorsPanel.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/experiments/OperatorsPanel.java @@ -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.OperatorCategory; 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.events.OperatorsClassificationEvent; import org.gcube.portlets.widgets.dataminermanagerwidget.client.events.OperatorsClassificationRequestEvent; @@ -227,7 +227,7 @@ public class OperatorsPanel extends FramedPanel { filterField.setWidth(100); TextButton showAllOperatorsButton = new TextButton(); - showAllOperatorsButton.setIcon(DataMinerManager.resources + showAllOperatorsButton.setIcon(DataMinerManagerPanel.resources .sortAscending()); showAllOperatorsButton .addSelectHandler(new SelectEvent.SelectHandler() { @@ -242,7 +242,7 @@ public class OperatorsPanel extends FramedPanel { showAllOperatorsButton.setToolTip(SHOW_ALL_OPERATORS_TOOLTIP); TextButton showCategoriesButton = new TextButton(); - showCategoriesButton.setIcon(DataMinerManager.resources.tree()); + showCategoriesButton.setIcon(DataMinerManagerPanel.resources.tree()); showCategoriesButton.addSelectHandler(new SelectEvent.SelectHandler() { @Override @@ -258,14 +258,14 @@ public class OperatorsPanel extends FramedPanel { final TextButton btnMenuPerspective = new TextButton( currentClassificationName); btnMenuPerspective - .setIcon(DataMinerManager.resources.userPerspective()); + .setIcon(DataMinerManagerPanel.resources.userPerspective()); Menu menuPerspective = new Menu(); for (final String perspectiveName : Constants.ClassificationNames) { final ImageResource img = perspectiveName - .equals(Constants.UserClassificationName) ? DataMinerManager.resources - .userPerspective() : DataMinerManager.resources + .equals(Constants.UserClassificationName) ? DataMinerManagerPanel.resources + .userPerspective() : DataMinerManagerPanel.resources .computationPerspective(); MenuItem perspectiveItem = new MenuItem(perspectiveName); perspectiveItem.addSelectionHandler(new SelectionHandler() { diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/experiments/WorkflowPanel.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/experiments/WorkflowPanel.java index 5069530..a21cecb 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/experiments/WorkflowPanel.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/experiments/WorkflowPanel.java @@ -4,7 +4,7 @@ package org.gcube.portlets.widgets.dataminermanagerwidget.client.experiments; 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.events.ComputationReadyEvent; import org.gcube.portlets.widgets.dataminermanagerwidget.client.events.ResubmitComputationExecutionEvent; @@ -45,7 +45,7 @@ public class WorkflowPanel extends TabPanel { TabItemConfig tabWorkFlowLcItemConf = new TabItemConfig("Operator", false); - tabWorkFlowLcItemConf.setIcon(DataMinerManager.resources + tabWorkFlowLcItemConf.setIcon(DataMinerManagerPanel.resources .folderExplore()); computationPanel = new ComputationPanel(); computationPanel @@ -62,7 +62,7 @@ public class WorkflowPanel extends TabPanel { TabItemConfig tabComputationPanelItemConf = new TabItemConfig( "Computations Execution", false); - tabComputationPanelItemConf.setIcon(DataMinerManager.resources + tabComputationPanelItemConf.setIcon(DataMinerManagerPanel.resources .folderExplore()); computationExecutionPanel = new ComputationExecutionPanel(); add(computationExecutionPanel, tabComputationPanelItemConf); diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/FileFld.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/FileFld.java index ae110cc..23ba1f0 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/FileFld.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/FileFld.java @@ -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.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.events.SessionExpiredEvent; import org.gcube.portlets.widgets.dataminermanagerwidget.client.rpc.DataMinerPortletServiceAsync; @@ -145,7 +145,7 @@ public class FileFld extends AbstractFld { wselectDialog.setZIndex(XDOM.getTopZIndex()); selectButton = new TextButton("Select File"); - selectButton.setIcon(DataMinerManager.resources.folderExplore()); + selectButton.setIcon(DataMinerManagerPanel.resources.folderExplore()); selectButton.addSelectHandler(new SelectEvent.SelectHandler() { @Override @@ -157,7 +157,7 @@ public class FileFld extends AbstractFld { selectButton.setToolTip("Select File"); selectButton2 = new TextButton(""); - selectButton2.setIcon(DataMinerManager.resources.folderExplore()); + selectButton2.setIcon(DataMinerManagerPanel.resources.folderExplore()); selectButton2.addSelectHandler(new SelectEvent.SelectHandler() { @Override @@ -168,7 +168,7 @@ public class FileFld extends AbstractFld { selectButton2.setToolTip("Select Another File"); cancelButton = new TextButton(""); - cancelButton.setIcon(DataMinerManager.resources.cancel()); + cancelButton.setIcon(DataMinerManagerPanel.resources.cancel()); cancelButton.addSelectHandler(new SelectEvent.SelectHandler() { @Override @@ -179,7 +179,7 @@ public class FileFld extends AbstractFld { }); downloadButton = new TextButton(""); - downloadButton.setIcon(DataMinerManager.resources.download()); + downloadButton.setIcon(DataMinerManagerPanel.resources.download()); downloadButton.addSelectHandler(new SelectEvent.SelectHandler() { @Override diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/ListIntFld.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/ListIntFld.java index 3824ed9..f905ea1 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/ListIntFld.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/ListIntFld.java @@ -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.ObjectParameter; 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.sencha.gxt.core.client.util.Margins; @@ -178,7 +178,7 @@ public class ListIntFld extends AbstractFld { addBtn = new TextButton(""); - addBtn.setIcon(DataMinerManager.resources.add()); + addBtn.setIcon(DataMinerManagerPanel.resources.add()); addBtn.addSelectHandler(new SelectEvent.SelectHandler() { @@ -193,7 +193,7 @@ public class ListIntFld extends AbstractFld { removeBtn = new TextButton(""); - removeBtn.setIcon(DataMinerManager.resources.cancel()); + removeBtn.setIcon(DataMinerManagerPanel.resources.cancel()); removeBtn.addSelectHandler(new SelectEvent.SelectHandler() { diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/StringItem.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/StringItem.java index 2d12c99..afb4108 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/StringItem.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/StringItem.java @@ -1,7 +1,7 @@ package org.gcube.portlets.widgets.dataminermanagerwidget.client.parametersfield; 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.widget.core.client.button.TextButton; @@ -36,7 +36,7 @@ public class StringItem extends HBoxLayoutContainer { addBtn = new TextButton(""); - addBtn.setIcon(DataMinerManager.resources.add()); + addBtn.setIcon(DataMinerManagerPanel.resources.add()); addBtn.addSelectHandler(new SelectEvent.SelectHandler() { @@ -50,7 +50,7 @@ public class StringItem extends HBoxLayoutContainer { removeBtn = new TextButton(""); - removeBtn.setIcon(DataMinerManager.resources.cancel()); + removeBtn.setIcon(DataMinerManagerPanel.resources.cancel()); removeBtn.addSelectHandler(new SelectEvent.SelectHandler() { diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/TabItem.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/TabItem.java index 57df57d..7f46f19 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/TabItem.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/TabItem.java @@ -6,7 +6,7 @@ import java.util.List; import org.gcube.data.analysis.dataminermanagercl.shared.data.TableItemSimple; 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.events.SessionExpiredEvent; 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"); selectButton2 = new TextButton(""); - selectButton2.setIcon(DataMinerManager.resources.folderExplore()); + selectButton2.setIcon(DataMinerManagerPanel.resources.folderExplore()); selectButton2.setToolTip("Select Another Data Set"); selectButton2.addSelectHandler(new SelectEvent.SelectHandler() { @@ -93,7 +93,7 @@ public class TabItem extends HBoxLayoutContainer { downloadButton = new TextButton(""); - downloadButton.setIcon(DataMinerManager.resources.download()); + downloadButton.setIcon(DataMinerManagerPanel.resources.download()); downloadButton.addSelectHandler(new SelectEvent.SelectHandler() { @Override @@ -105,7 +105,7 @@ public class TabItem extends HBoxLayoutContainer { addBtn = new TextButton(""); - addBtn.setIcon(DataMinerManager.resources.add()); + addBtn.setIcon(DataMinerManagerPanel.resources.add()); addBtn.addSelectHandler(new SelectEvent.SelectHandler() { @Override @@ -116,7 +116,7 @@ public class TabItem extends HBoxLayoutContainer { }); removeBtn = new TextButton(""); - removeBtn.setIcon(DataMinerManager.resources.cancel()); + removeBtn.setIcon(DataMinerManagerPanel.resources.cancel()); removeBtn.addSelectHandler(new SelectEvent.SelectHandler() { @Override diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/TabularFld.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/TabularFld.java index e173da2..5f629b4 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/TabularFld.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/TabularFld.java @@ -10,7 +10,7 @@ import java.util.List; 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.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.events.SessionExpiredEvent; 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"); 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"); cancelButton = new TextButton(""); - cancelButton.setIcon(DataMinerManager.resources.cancel()); + cancelButton.setIcon(DataMinerManagerPanel.resources.cancel()); cancelButton.addSelectHandler(new SelectEvent.SelectHandler() { @Override @@ -251,7 +251,7 @@ public class TabularFld extends AbstractFld implements }); downloadButton = new TextButton(""); - downloadButton.setIcon(DataMinerManager.resources.download()); + downloadButton.setIcon(DataMinerManagerPanel.resources.download()); downloadButton.addSelectHandler(new SelectEvent.SelectHandler() { @Override diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/WKTFld.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/WKTFld.java index 27794e4..7a9ee41 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/WKTFld.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/parametersfield/WKTFld.java @@ -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.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.openlayerbasicwidgets.client.event.SelectAreaDialogEvent; import org.gcube.portlets.widgets.openlayerbasicwidgets.client.event.SelectAreaDialogEvent.SelectAreaDialogEventHandler; @@ -157,7 +157,7 @@ public class WKTFld extends AbstractFld { private void init() { selectButton = new TextButton("Draw a " + wktParameter.getWktGeometryType().getLabel()); - selectButton.setIcon(DataMinerManager.resources.drawGeometry()); + selectButton.setIcon(DataMinerManagerPanel.resources.drawGeometry()); selectButton.addSelectHandler(new SelectEvent.SelectHandler() { @Override @@ -170,7 +170,7 @@ public class WKTFld extends AbstractFld { // + wktParameter.getWktGeometryType().getLabel()); selectButton2 = new TextButton(""); - selectButton2.setIcon(DataMinerManager.resources.folderExplore()); + selectButton2.setIcon(DataMinerManagerPanel.resources.folderExplore()); selectButton2.addSelectHandler(new SelectEvent.SelectHandler() { @Override @@ -182,7 +182,7 @@ public class WKTFld extends AbstractFld { // + wktParameter.getWktGeometryType().getLabel()); cancelButton = new TextButton(""); - cancelButton.setIcon(DataMinerManager.resources.cancel()); + cancelButton.setIcon(DataMinerManagerPanel.resources.cancel()); cancelButton.addSelectHandler(new SelectEvent.SelectHandler() { @Override diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/resources/logoLittle.png b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/resources/logoLittle.png index df9bd99..727b28d 100644 Binary files a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/resources/logoLittle.png and b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/resources/logoLittle.png differ diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/rpc/DataMinerPortletService.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/rpc/DataMinerPortletService.java index ef5e447..abdd497 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/rpc/DataMinerPortletService.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/rpc/DataMinerPortletService.java @@ -22,7 +22,7 @@ import com.google.gwt.user.client.rpc.RemoteServiceRelativePath; /** * The client side stub for the RPC service. */ -@RemoteServiceRelativePath("dataminerman") +@RemoteServiceRelativePath("dataminermanagerwidget") public interface DataMinerPortletService extends RemoteService { public UserInfo hello() throws ServiceException; diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/widgets/FileViewer.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/widgets/FileViewer.java index e8d89e2..2bdf572 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/widgets/FileViewer.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/widgets/FileViewer.java @@ -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.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.sencha.gxt.core.client.util.Margins; @@ -50,7 +50,7 @@ public class FileViewer extends SimpleContainer { .toSafeHtml().asString() + "

"); lc.add(fileNameHtml, new VerticalLayoutData(-1, -1, new Margins(0))); TextButton downloadBtn = new TextButton("Download File"); - downloadBtn.setIcon(DataMinerManager.resources.download()); + downloadBtn.setIcon(DataMinerManagerPanel.resources.download()); downloadBtn.addSelectHandler(new SelectEvent.SelectHandler() { @Override public void onSelect(SelectEvent event) { diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/widgets/ImageViewer.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/widgets/ImageViewer.java index f3bf623..6e397df 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/widgets/ImageViewer.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/client/widgets/ImageViewer.java @@ -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.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.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))); TextButton saveImageBtn = new TextButton( "Download Image"); - saveImageBtn.setIcon(DataMinerManager.resources.download()); + saveImageBtn.setIcon(DataMinerManagerPanel.resources.download()); saveImageBtn.addSelectHandler(new SelectEvent.SelectHandler() { @Override diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/dataminermanagerwidget.gwt.xml b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/dataminermanagerwidget.gwt.xml index 14a2531..4a88af9 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/dataminermanagerwidget.gwt.xml +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/dataminermanagerwidget.gwt.xml @@ -20,7 +20,12 @@ - + + + + + @@ -30,18 +35,18 @@ - - + /> + diff --git a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/shared/Constants.java b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/shared/Constants.java index a80fd37..e11ef0a 100644 --- a/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/shared/Constants.java +++ b/src/main/java/org/gcube/portlets/widgets/dataminermanagerwidget/shared/Constants.java @@ -7,7 +7,7 @@ package org.gcube.portlets.widgets.dataminermanagerwidget.shared; * */ 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 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 DEFAULT_USER = "giancarlo.panichi"; - public final static String DEFAULT_SCOPE = "/gcube/devNext"; - public final static String DEFAULT_TOKEN = "16e65d4f-11e0-4e4a-84b9-351688fccc12-98187548"; - + public final static String DEFAULT_SCOPE = "/gcube/devNext/NextNext"; + public final static String DEFAULT_TOKEN = "ae1208f0-210d-47c9-9b24-d3f2dfcce05f-98187548"; + public static final String DEFAULT_ROLE = "OrganizationMember"; // public final static String DEFAULT_SCOPE = "/gcube/devNext"; //public final static String DEFAULT_SCOPE = "/gcube/devNext/NextNext"; diff --git a/src/main/resources/org/gcube/portlets/widgets/dataminermanagerwidget/dataminermanager.gwt.xml b/src/main/resources/org/gcube/portlets/widgets/dataminermanagerwidget/dataminermanager.gwt.xml index 31c7f0d..d25f4a2 100644 --- a/src/main/resources/org/gcube/portlets/widgets/dataminermanagerwidget/dataminermanager.gwt.xml +++ b/src/main/resources/org/gcube/portlets/widgets/dataminermanagerwidget/dataminermanager.gwt.xml @@ -14,13 +14,18 @@ - + + + + + @@ -30,7 +35,7 @@ + class='org.gcube.portlets.widgets.dataminermanagerwidget.client.DataMinerManager' /> + src="dataminermanagerwidget/js/bootstrap.min.js"> + src="dataminermanagerwidget/dataminermanagerwidget.nocache.js"> diff --git a/src/main/webapp/WEB-INF/jsp/DataMinerManagerWidget_view.jsp b/src/main/webapp/WEB-INF/jsp/DataMinerManagerWidget_view.jsp index 99fb536..a6bbc6f 100644 --- a/src/main/webapp/WEB-INF/jsp/DataMinerManagerWidget_view.jsp +++ b/src/main/webapp/WEB-INF/jsp/DataMinerManagerWidget_view.jsp @@ -21,7 +21,7 @@ src='<%=request.getContextPath()%>/dataminermanagerwidget/js/jquery-1.11.0.min.js'> + src='<%=request.getContextPath()%>/dataminermanagerwidget/js/bootstrap.min.js'> diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index d8e98d1..62cf720 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -32,7 +32,7 @@ DataMinerManagerServlet - /dataminermanagerwidget/dataminermanwidget + /dataminermanagerwidget/dataminermanagerwidget jUnitHostImpl