diff --git a/pom.xml b/pom.xml index 57f432e..c83da1c 100644 --- a/pom.xml +++ b/pom.xml @@ -114,6 +114,14 @@ provided + + + org.gcube.portlets.user + tabular-data-expression-widget + [1.0.0-SNAPSHOT,2.0.0-SNAPSHOT) + provided + + org.gcube.portlets.user diff --git a/src/main/java/org/gcube/portlets/user/td/tablewidget/TableWidget.gwt.xml b/src/main/java/org/gcube/portlets/user/td/tablewidget/TableWidget.gwt.xml index 0e1633b..642af46 100644 --- a/src/main/java/org/gcube/portlets/user/td/tablewidget/TableWidget.gwt.xml +++ b/src/main/java/org/gcube/portlets/user/td/tablewidget/TableWidget.gwt.xml @@ -18,6 +18,8 @@ + diff --git a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/geometry/GeometryCreatePointPanel.java b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/geometry/GeometryCreatePointPanel.java index 85e1fbe..32694f5 100644 --- a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/geometry/GeometryCreatePointPanel.java +++ b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/geometry/GeometryCreatePointPanel.java @@ -2,6 +2,7 @@ package org.gcube.portlets.user.td.tablewidget.client.geometry; import java.util.ArrayList; +import org.gcube.portlets.user.td.expressionwidget.client.properties.ColumnDataPropertiesCombo; import org.gcube.portlets.user.td.gwtservice.client.rpc.TDGWTServiceAsync; import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTIsFinalException; import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTIsLockedException; @@ -9,7 +10,6 @@ import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTSessionExpire import org.gcube.portlets.user.td.gwtservice.shared.geometry.GeometryCreatePointSession; import org.gcube.portlets.user.td.monitorwidget.client.MonitorDialog; import org.gcube.portlets.user.td.monitorwidget.client.MonitorDialogListener; -import org.gcube.portlets.user.td.columnwidget.client.properties.ColumnDataPropertiesCombo; import org.gcube.portlets.user.td.tablewidget.client.resources.ResourceBundle; import org.gcube.portlets.user.td.tablewidget.client.util.UtilsGXT3; import org.gcube.portlets.user.td.widgetcommonevent.client.event.ChangeTableRequestEvent; diff --git a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/geospatial/DownscaleCSquarePanel.java b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/geospatial/DownscaleCSquarePanel.java index da2ec64..872794d 100644 --- a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/geospatial/DownscaleCSquarePanel.java +++ b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/geospatial/DownscaleCSquarePanel.java @@ -2,6 +2,7 @@ package org.gcube.portlets.user.td.tablewidget.client.geospatial; import java.util.ArrayList; +import org.gcube.portlets.user.td.expressionwidget.client.properties.ColumnDataPropertiesCombo; import org.gcube.portlets.user.td.gwtservice.client.rpc.TDGWTServiceAsync; import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTIsFinalException; import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTIsLockedException; @@ -9,7 +10,6 @@ import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTSessionExpire import org.gcube.portlets.user.td.gwtservice.shared.geospatial.GeospatialDownscaleCSquareSession; import org.gcube.portlets.user.td.monitorwidget.client.MonitorDialog; import org.gcube.portlets.user.td.monitorwidget.client.MonitorDialogListener; -import org.gcube.portlets.user.td.columnwidget.client.properties.ColumnDataPropertiesCombo; import org.gcube.portlets.user.td.tablewidget.client.resources.ResourceBundle; import org.gcube.portlets.user.td.tablewidget.client.util.UtilsGXT3; import org.gcube.portlets.user.td.widgetcommonevent.client.event.ChangeTableRequestEvent; diff --git a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/geospatial/GeospatialCreateCoordinatesPanel.java b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/geospatial/GeospatialCreateCoordinatesPanel.java index 0b5e90b..ca76159 100644 --- a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/geospatial/GeospatialCreateCoordinatesPanel.java +++ b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/geospatial/GeospatialCreateCoordinatesPanel.java @@ -2,6 +2,7 @@ package org.gcube.portlets.user.td.tablewidget.client.geospatial; import java.util.ArrayList; +import org.gcube.portlets.user.td.expressionwidget.client.properties.ColumnDataPropertiesCombo; import org.gcube.portlets.user.td.gwtservice.client.rpc.TDGWTServiceAsync; import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTIsFinalException; import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTIsLockedException; @@ -10,7 +11,6 @@ import org.gcube.portlets.user.td.gwtservice.shared.geospatial.GeospatialCreateC import org.gcube.portlets.user.td.monitorwidget.client.MonitorDialog; import org.gcube.portlets.user.td.monitorwidget.client.MonitorDialogListener; import org.gcube.portlets.user.td.columnwidget.client.geospatial.GeospatialCoordinatesTypePropertiesCombo; -import org.gcube.portlets.user.td.columnwidget.client.properties.ColumnDataPropertiesCombo; import org.gcube.portlets.user.td.tablewidget.client.resources.ResourceBundle; import org.gcube.portlets.user.td.tablewidget.client.util.UtilsGXT3; import org.gcube.portlets.user.td.widgetcommonevent.client.event.ChangeTableRequestEvent; diff --git a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/normalize/DenormalizePanel.java b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/normalize/DenormalizePanel.java index 3c134c3..cdbe38a 100644 --- a/src/main/java/org/gcube/portlets/user/td/tablewidget/client/normalize/DenormalizePanel.java +++ b/src/main/java/org/gcube/portlets/user/td/tablewidget/client/normalize/DenormalizePanel.java @@ -2,6 +2,7 @@ package org.gcube.portlets.user.td.tablewidget.client.normalize; import java.util.ArrayList; +import org.gcube.portlets.user.td.expressionwidget.client.properties.ColumnDataPropertiesCombo; import org.gcube.portlets.user.td.gwtservice.client.rpc.TDGWTServiceAsync; import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTIsFinalException; import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTIsLockedException; @@ -9,7 +10,6 @@ import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTSessionExpire import org.gcube.portlets.user.td.gwtservice.shared.tr.normalization.DenormalizationSession; import org.gcube.portlets.user.td.monitorwidget.client.MonitorDialog; import org.gcube.portlets.user.td.monitorwidget.client.MonitorDialogListener; -import org.gcube.portlets.user.td.columnwidget.client.properties.ColumnDataPropertiesCombo; import org.gcube.portlets.user.td.tablewidget.client.resources.ResourceBundle; import org.gcube.portlets.user.td.tablewidget.client.util.UtilsGXT3; import org.gcube.portlets.user.td.widgetcommonevent.client.event.ChangeTableRequestEvent; diff --git a/src/main/resources/org/gcube/portlets/user/td/tablewidget/TableWidget.gwt.xml b/src/main/resources/org/gcube/portlets/user/td/tablewidget/TableWidget.gwt.xml index 210f36b..2e7ced5 100644 --- a/src/main/resources/org/gcube/portlets/user/td/tablewidget/TableWidget.gwt.xml +++ b/src/main/resources/org/gcube/portlets/user/td/tablewidget/TableWidget.gwt.xml @@ -18,9 +18,11 @@ - - + + +