From 1315884dfd45f2ff2fe9ceb2a8b65e7ed4a29e3f Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Tue, 31 Mar 2015 17:18:50 +0000 Subject: [PATCH] Minor Update git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-expression-widget@113844 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../client/ReplaceColumnByExpressionDialog.java | 8 ++++++-- .../client/ReplaceColumnByExpressionPanel.java | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ReplaceColumnByExpressionDialog.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ReplaceColumnByExpressionDialog.java index e2c5679..75e07b4 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ReplaceColumnByExpressionDialog.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ReplaceColumnByExpressionDialog.java @@ -99,8 +99,12 @@ public class ReplaceColumnByExpressionDialog extends Window implements EventBus eventBus) { this.eventBus = eventBus; this.trId = trId; - column = new ColumnData(); - column.setColumnId(columnId); + if (columnId == null) { + column=null; + } else { + column = new ColumnData(); + column.setColumnId(columnId); + } replaceExpressionType = ReplaceExpressionType.Replace; initWindow(); load(); diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ReplaceColumnByExpressionPanel.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ReplaceColumnByExpressionPanel.java index 7a9012c..d22be69 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ReplaceColumnByExpressionPanel.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ReplaceColumnByExpressionPanel.java @@ -361,7 +361,7 @@ public class ReplaceColumnByExpressionPanel extends FramedPanel { } protected void setSelectedColumn() { - if (column == null|| column.getTypeCode()==null) { + if (column == null) { } else {