From 6b0dac39893ce0eab91cd9382a54594936689cae Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Tue, 18 Feb 2014 14:17:24 +0000 Subject: [PATCH] Minor Updated git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-expression-widget@91846 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../td/expressionwidget/client/ColumnExpressionPanel.java | 4 ++-- .../{FilterColumnDialog.java => ColumnFilterDialog.java} | 6 +++--- .../client/progress/ColumnFilterProgressDialog.java | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) rename src/main/java/org/gcube/portlets/user/td/expressionwidget/client/{FilterColumnDialog.java => ColumnFilterDialog.java} (97%) diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ColumnExpressionPanel.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ColumnExpressionPanel.java index b1ef143..f852057 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ColumnExpressionPanel.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ColumnExpressionPanel.java @@ -43,7 +43,7 @@ public class ColumnExpressionPanel extends FramedPanel { protected EventBus eventBus; protected ColumnExpressionDialog parentRuleDialog; - protected FilterColumnDialog parentFilterDialog; + protected ColumnFilterDialog parentFilterDialog; protected ColumnData column; protected ConditionWidget conditionWidget; @@ -53,7 +53,7 @@ public class ColumnExpressionPanel extends FramedPanel { private TextButton btnSave; private TextButton btnClose; - public ColumnExpressionPanel(FilterColumnDialog parentFilterDialog, ColumnData column) { + public ColumnExpressionPanel(ColumnFilterDialog parentFilterDialog, ColumnData column) { type = ColumnExpressionPanelType.ColumnFilter; this.parentFilterDialog=parentFilterDialog; } diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/FilterColumnDialog.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ColumnFilterDialog.java similarity index 97% rename from src/main/java/org/gcube/portlets/user/td/expressionwidget/client/FilterColumnDialog.java rename to src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ColumnFilterDialog.java index 0744a7d..aa72b96 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/FilterColumnDialog.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ColumnFilterDialog.java @@ -20,7 +20,7 @@ import com.sencha.gxt.widget.core.client.box.AlertMessageBox; import com.sencha.gxt.widget.core.client.event.HideEvent; import com.sencha.gxt.widget.core.client.event.HideEvent.HideHandler; -public class FilterColumnDialog extends Window { +public class ColumnFilterDialog extends Window { protected String WIDTH = "650px"; protected String HEIGHT = "426px"; protected ColumnExpressionPanel columnExpressionPanel; @@ -32,7 +32,7 @@ public class FilterColumnDialog extends Window { private ColumnFilterSession columnFilterSession; private ColumnFilterProgressDialog dialog; - public FilterColumnDialog(String columnId, + public ColumnFilterDialog(String columnId, ColumnTypeCode columnTypeCode, ColumnDataType dataTypeName, EventBus eventBus) { initWindow(); @@ -45,7 +45,7 @@ public class FilterColumnDialog extends Window { } - public FilterColumnDialog(TRId trId, String columnName, + public ColumnFilterDialog(TRId trId, String columnName, EventBus eventBus) { initWindow(); this.eventBus = eventBus; diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/progress/ColumnFilterProgressDialog.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/progress/ColumnFilterProgressDialog.java index 80b92c9..52cb8eb 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/progress/ColumnFilterProgressDialog.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/progress/ColumnFilterProgressDialog.java @@ -1,6 +1,6 @@ package org.gcube.portlets.user.td.expressionwidget.client.progress; -import org.gcube.portlets.user.td.expressionwidget.client.FilterColumnDialog; +import org.gcube.portlets.user.td.expressionwidget.client.ColumnFilterDialog; import org.gcube.portlets.user.td.widgetcommonevent.client.event.ChangeTableRequestEvent; import org.gcube.portlets.user.td.widgetcommonevent.client.type.ChangeTableRequestType; import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId; @@ -37,9 +37,9 @@ public class ColumnFilterProgressDialog extends Window implements ColumnFilterPr protected ColumnFilterProgressUpdater progressUpdater; protected TextButton ok; protected TRId trId; - protected FilterColumnDialog dialog; + protected ColumnFilterDialog dialog; - public ColumnFilterProgressDialog(FilterColumnDialog dialog,EventBus eventBus) { + public ColumnFilterProgressDialog(ColumnFilterDialog dialog,EventBus eventBus) { this.dialog=dialog; this.eventBus=eventBus; setWidth(WIDTH);