From b547f9938a871e5d148fa5a12350f9dbd12dd664 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Wed, 27 May 2015 14:30:29 +0000 Subject: [PATCH] 81: Allow the creation and use of expressions on multi column in TDM portlet Task-Url: https://support.d4science.org/issues/81 Updated Dependency git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-column-widget@115056 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../client/ChangeColumnTypePanel.java | 2 +- .../client/DeleteColumnPanel.java | 2 +- .../client/PositionColumnPanel.java | 2 +- .../client/batch/ReplaceBatchPanel.java | 2 +- .../client/create/AddColumnPanel.java | 2 +- .../dimension/ConnectCodelistDialog.java | 2 +- .../properties/ColumnDataProperties.java | 25 ------------------- .../properties/ColumnDataPropertiesCombo.java | 25 ------------------- 8 files changed, 6 insertions(+), 56 deletions(-) delete mode 100644 src/main/java/org/gcube/portlets/user/td/columnwidget/client/properties/ColumnDataProperties.java delete mode 100644 src/main/java/org/gcube/portlets/user/td/columnwidget/client/properties/ColumnDataPropertiesCombo.java diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/ChangeColumnTypePanel.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/ChangeColumnTypePanel.java index d0e1d2c..ba0f7ed 100644 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/ChangeColumnTypePanel.java +++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/ChangeColumnTypePanel.java @@ -8,11 +8,11 @@ import org.gcube.portlets.user.td.columnwidget.client.dimension.CodelistSelectio import org.gcube.portlets.user.td.columnwidget.client.mapping.ColumnMappingDialog; import org.gcube.portlets.user.td.columnwidget.client.mapping.ColumnMappingListProperties; import org.gcube.portlets.user.td.columnwidget.client.mapping.ColumnMappingListener; -import org.gcube.portlets.user.td.columnwidget.client.properties.ColumnDataPropertiesCombo; import org.gcube.portlets.user.td.columnwidget.client.properties.PeriodDataTypeProperties; import org.gcube.portlets.user.td.columnwidget.client.properties.ValueDataFormatProperties; import org.gcube.portlets.user.td.columnwidget.client.resources.ResourceBundle; import org.gcube.portlets.user.td.columnwidget.client.utils.UtilsGXT3; +import org.gcube.portlets.user.td.expressionwidget.client.properties.ColumnDataPropertiesCombo; import org.gcube.portlets.user.td.expressionwidget.client.properties.ColumnDataTypeProperties; import org.gcube.portlets.user.td.expressionwidget.client.properties.ColumnTypeCodeProperties; import org.gcube.portlets.user.td.expressionwidget.client.properties.LocaleTypeProperties; diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/DeleteColumnPanel.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/DeleteColumnPanel.java index 49eb07f..0a9fa73 100644 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/DeleteColumnPanel.java +++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/DeleteColumnPanel.java @@ -3,9 +3,9 @@ package org.gcube.portlets.user.td.columnwidget.client; import java.util.ArrayList; import java.util.List; -import org.gcube.portlets.user.td.columnwidget.client.properties.ColumnDataProperties; import org.gcube.portlets.user.td.columnwidget.client.resources.ResourceBundle; import org.gcube.portlets.user.td.columnwidget.client.utils.UtilsGXT3; +import org.gcube.portlets.user.td.expressionwidget.client.properties.ColumnDataProperties; 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; diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/PositionColumnPanel.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/PositionColumnPanel.java index 73015eb..41e52df 100644 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/PositionColumnPanel.java +++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/PositionColumnPanel.java @@ -3,9 +3,9 @@ package org.gcube.portlets.user.td.columnwidget.client; import java.util.ArrayList; import java.util.List; -import org.gcube.portlets.user.td.columnwidget.client.properties.ColumnDataProperties; import org.gcube.portlets.user.td.columnwidget.client.resources.ResourceBundle; import org.gcube.portlets.user.td.columnwidget.client.utils.UtilsGXT3; +import org.gcube.portlets.user.td.expressionwidget.client.properties.ColumnDataProperties; 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; diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/batch/ReplaceBatchPanel.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/batch/ReplaceBatchPanel.java index 8579a2e..dd79a1d 100644 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/batch/ReplaceBatchPanel.java +++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/batch/ReplaceBatchPanel.java @@ -8,12 +8,12 @@ import org.gcube.portlets.user.td.columnwidget.client.dimension.ConnectCodelistD import org.gcube.portlets.user.td.columnwidget.client.dimension.ConnectCodelistListener; import org.gcube.portlets.user.td.columnwidget.client.dimension.DimensionRowSelectionDialog; import org.gcube.portlets.user.td.columnwidget.client.dimension.DimensionRowSelectionListener; -import org.gcube.portlets.user.td.columnwidget.client.properties.ColumnDataPropertiesCombo; import org.gcube.portlets.user.td.columnwidget.client.properties.ShowOccurrencesTypeProperties; import org.gcube.portlets.user.td.columnwidget.client.resources.ResourceBundle; import org.gcube.portlets.user.td.columnwidget.client.store.ShowOccurrencesTypeElement; import org.gcube.portlets.user.td.columnwidget.client.store.ShowOccurrencesTypeStore; import org.gcube.portlets.user.td.columnwidget.client.utils.UtilsGXT3; +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; diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/create/AddColumnPanel.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/create/AddColumnPanel.java index 325a9ce..5d8953f 100644 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/create/AddColumnPanel.java +++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/create/AddColumnPanel.java @@ -4,13 +4,13 @@ import java.util.ArrayList; import org.gcube.portlets.user.td.columnwidget.client.dimension.CodelistSelectionDialog; import org.gcube.portlets.user.td.columnwidget.client.dimension.CodelistSelectionListener; -import org.gcube.portlets.user.td.columnwidget.client.properties.ColumnDataPropertiesCombo; import org.gcube.portlets.user.td.columnwidget.client.properties.PeriodDataTypeProperties; import org.gcube.portlets.user.td.columnwidget.client.resources.ResourceBundle; import org.gcube.portlets.user.td.columnwidget.client.utils.UtilsGXT3; import org.gcube.portlets.user.td.expressionwidget.client.ReplaceExpressionDialog; import org.gcube.portlets.user.td.expressionwidget.client.notification.ExpressionWrapperNotification; import org.gcube.portlets.user.td.expressionwidget.client.notification.ExpressionWrapperNotification.ExpressionWrapperNotificationListener; +import org.gcube.portlets.user.td.expressionwidget.client.properties.ColumnDataPropertiesCombo; import org.gcube.portlets.user.td.expressionwidget.client.properties.ColumnDataTypeProperties; import org.gcube.portlets.user.td.expressionwidget.client.properties.ColumnTypeCodeProperties; import org.gcube.portlets.user.td.expressionwidget.client.properties.LocaleTypeProperties; diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/dimension/ConnectCodelistDialog.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/dimension/ConnectCodelistDialog.java index 65b7469..469eb6f 100644 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/dimension/ConnectCodelistDialog.java +++ b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/dimension/ConnectCodelistDialog.java @@ -2,9 +2,9 @@ package org.gcube.portlets.user.td.columnwidget.client.dimension; import java.util.ArrayList; -import org.gcube.portlets.user.td.columnwidget.client.properties.ColumnDataPropertiesCombo; import org.gcube.portlets.user.td.columnwidget.client.resources.ResourceBundle; import org.gcube.portlets.user.td.columnwidget.client.utils.UtilsGXT3; +import org.gcube.portlets.user.td.expressionwidget.client.properties.ColumnDataPropertiesCombo; import org.gcube.portlets.user.td.expressionwidget.client.properties.TabResourceProperties; import org.gcube.portlets.user.td.gwtservice.client.rpc.TDGWTServiceAsync; import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTIsFinalException; diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/properties/ColumnDataProperties.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/properties/ColumnDataProperties.java deleted file mode 100644 index 6f78216..0000000 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/properties/ColumnDataProperties.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.gcube.portlets.user.td.columnwidget.client.properties; - -import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnData; - -import com.google.gwt.editor.client.Editor.Path; -import com.sencha.gxt.core.client.ValueProvider; -import com.sencha.gxt.data.shared.ModelKeyProvider; -import com.sencha.gxt.data.shared.PropertyAccess; - -/** - * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it - * - */ -public interface ColumnDataProperties extends - PropertyAccess { - - @Path("id") - ModelKeyProvider id(); - - ValueProvider label(); - - -} diff --git a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/properties/ColumnDataPropertiesCombo.java b/src/main/java/org/gcube/portlets/user/td/columnwidget/client/properties/ColumnDataPropertiesCombo.java deleted file mode 100644 index ced8e1d..0000000 --- a/src/main/java/org/gcube/portlets/user/td/columnwidget/client/properties/ColumnDataPropertiesCombo.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.gcube.portlets.user.td.columnwidget.client.properties; - -import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnData; - -import com.google.gwt.editor.client.Editor.Path; -import com.sencha.gxt.data.shared.LabelProvider; -import com.sencha.gxt.data.shared.ModelKeyProvider; -import com.sencha.gxt.data.shared.PropertyAccess; - -/** - * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it - * - */ -public interface ColumnDataPropertiesCombo extends - PropertyAccess { - - @Path("id") - ModelKeyProvider id(); - - LabelProvider label(); - - -}