diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index 3c740da..6a91eb1 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -37,15 +37,15 @@ uses - - uses - uses uses + + uses + diff --git a/pom.xml b/pom.xml index f590f29..476c230 100644 --- a/pom.xml +++ b/pom.xml @@ -255,6 +255,20 @@ tabular-data-table-widget [0.0.1-SNAPSHOT,2.0.0-SNAPSHOT) + + + + org.gcube.portlets.user + tabular-data-information-widget + [2.0.0-SNAPSHOT,3.0.0-SNAPSHOT) + + + + + org.gcube.portlets.user + tabular-data-column-widget + [1.0.0-SNAPSHOT,2.0.0-SNAPSHOT) + diff --git a/src/main/java/org/gcube/portlets/user/td/client/TabularDataController.java b/src/main/java/org/gcube/portlets/user/td/client/TabularDataController.java index bdeb0c7..8b9ef40 100644 --- a/src/main/java/org/gcube/portlets/user/td/client/TabularDataController.java +++ b/src/main/java/org/gcube/portlets/user/td/client/TabularDataController.java @@ -403,7 +403,7 @@ public class TabularDataController { case COLUMNFILTER: openMultiColumnFilter(); break; - case COLUMNEDIT: + case COLUMNBATCHREPLACE: break; case ANALYSETABLEFILTER: break; diff --git a/src/main/java/org/gcube/portlets/user/td/client/ribbon/ModifyToolBar.java b/src/main/java/org/gcube/portlets/user/td/client/ribbon/ModifyToolBar.java index b3ff355..cd5361d 100644 --- a/src/main/java/org/gcube/portlets/user/td/client/ribbon/ModifyToolBar.java +++ b/src/main/java/org/gcube/portlets/user/td/client/ribbon/ModifyToolBar.java @@ -256,15 +256,14 @@ public class ModifyToolBar { editColumnValueOnConditionButton.setScale(ButtonScale.LARGE); editColumnValueOnConditionButton.setIconAlign(IconAlign.TOP); editColumnValueOnConditionButton - .setToolTip("Edit column values according to an condition"); + .setToolTip("Replace column values"); editColumnValueOnConditionButton .setArrowAlign(ButtonArrowAlign.BOTTOM); editColumnValueOnConditionButton .addSelectHandler(new SelectHandler() { public void onSelect(SelectEvent event) { - // eventBus.fireEvent(new - // ImportTableEvent(ImportTableType.JSON)); + eventBus.fireEvent(new RibbonEvent(RibbonType.COLUMNBATCHREPLACE)); } }); @@ -340,7 +339,7 @@ public class ModifyToolBar { annotationButton.disable(); // Column filterColumnButton.enable(); - editColumnValueOnConditionButton.disable(); + editColumnValueOnConditionButton.enable(); break; case WIZARD_OPEN: // Table diff --git a/src/main/java/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml b/src/main/java/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml index a4a34e8..8c2e4f7 100644 --- a/src/main/java/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml +++ b/src/main/java/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml @@ -4,51 +4,58 @@ - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + diff --git a/src/main/resources/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml b/src/main/resources/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml index ec53639..4e11f09 100644 --- a/src/main/resources/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml +++ b/src/main/resources/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml @@ -4,53 +4,59 @@ - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - +