From 4612e0e2bae8c57ef38576567397f74636058231 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Fri, 6 Feb 2015 09:27:19 +0000 Subject: [PATCH] Minor Update git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-expression-widget@111758 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../client/ReplaceArithmeticWidget.java | 20 +++++++++---------- .../ReplaceColumnByExpressionPanel.java | 5 ++--- .../shared/condition/ConditionTypeMap.java | 9 +++++---- .../replace/ReplaceArithmeticTypeMap.java | 7 ++++--- .../shared/replace/ReplaceTypeMap.java | 9 +++++---- 5 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ReplaceArithmeticWidget.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ReplaceArithmeticWidget.java index d97c03d..87446b8 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ReplaceArithmeticWidget.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/client/ReplaceArithmeticWidget.java @@ -21,7 +21,6 @@ import org.gcube.portlets.user.td.widgetcommonevent.client.type.SessionExpiredTy import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId; import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expression; import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnDataType; -import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnTypeMap; import com.allen_sauer.gwt.log.client.Log; import com.google.gwt.core.client.GWT; @@ -113,8 +112,8 @@ public class ReplaceArithmeticWidget extends SimpleContainer { public ReplaceArithmeticWidget(ColumnData column, EventBus eventBus) { super(); replaceColumnByExpressionType = ReplaceColumnByExpressionType.Replace; - ColumnDataType targetColumnDataType = ColumnTypeMap - .getColumnDataType(column.getDataTypeName()); + ColumnDataType targetColumnDataType = ColumnDataType + .getColumnDataTypeFromId(column.getDataTypeName()); create(column.getTrId(), WIDTH, HEIGHT, eventBus, targetColumnDataType); retrieveColumns(); } @@ -123,8 +122,8 @@ public class ReplaceArithmeticWidget extends SimpleContainer { String height, EventBus eventBus) { super(); replaceColumnByExpressionType = ReplaceColumnByExpressionType.Replace; - ColumnDataType targetColumnDataType = ColumnTypeMap - .getColumnDataType(column.getDataTypeName()); + ColumnDataType targetColumnDataType = ColumnDataType + .getColumnDataTypeFromId(column.getDataTypeName()); create(column.getTrId(), width, height, eventBus, targetColumnDataType); retrieveColumns(); @@ -135,8 +134,8 @@ public class ReplaceArithmeticWidget extends SimpleContainer { super(); replaceColumnByExpressionType = ReplaceColumnByExpressionType.Template; this.columns = columns; - ColumnDataType targetColumnDataType = ColumnTypeMap - .getColumnDataType(column.getDataTypeName()); + ColumnDataType targetColumnDataType = ColumnDataType + .getColumnDataTypeFromId(column.getDataTypeName()); create(column.getTrId(), WIDTH, HEIGHT, eventBus, targetColumnDataType); setup(); } @@ -147,8 +146,8 @@ public class ReplaceArithmeticWidget extends SimpleContainer { super(); replaceColumnByExpressionType = ReplaceColumnByExpressionType.Template; this.columns = columns; - ColumnDataType targetColumnDataType = ColumnTypeMap - .getColumnDataType(column.getDataTypeName()); + ColumnDataType targetColumnDataType = ColumnDataType + .getColumnDataTypeFromId(column.getDataTypeName()); create(column.getTrId(), width, height, eventBus, targetColumnDataType); setup(); } @@ -480,8 +479,7 @@ public class ReplaceArithmeticWidget extends SimpleContainer { }); comboReplaceArithmeticElementsOperators.setEmptyText("Select..."); - comboReplaceArithmeticElementsOperators - .setItemId(itemIdComboOperation); + comboReplaceArithmeticElementsOperators.setItemId(itemIdComboOperation); comboReplaceArithmeticElementsOperators.setWidth(COMBO_WIDTH); comboReplaceArithmeticElementsOperators.setEditable(false); comboReplaceArithmeticElementsOperators 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 7e19c92..b65149f 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 @@ -14,7 +14,6 @@ import org.gcube.portlets.user.td.widgetcommonevent.client.type.ExpressionType; import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expression; import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_ExpressionContainer; import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnDataType; -import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnTypeMap; import com.allen_sauer.gwt.log.client.Log; import com.google.gwt.event.logical.shared.ValueChangeEvent; @@ -505,8 +504,8 @@ public class ReplaceColumnByExpressionPanel extends FramedPanel { private boolean checkValue(String value) { try { boolean ok = false; - ColumnDataType columnDataType = ColumnTypeMap - .getColumnDataType(column.getDataTypeName()); + ColumnDataType columnDataType =ColumnDataType + .getColumnDataTypeFromId(column.getDataTypeName()); switch (columnDataType) { case Boolean: Boolean.valueOf(value); diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/condition/ConditionTypeMap.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/condition/ConditionTypeMap.java index 59697b2..9c8863a 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/condition/ConditionTypeMap.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/condition/ConditionTypeMap.java @@ -17,10 +17,10 @@ import org.gcube.portlets.user.td.expressionwidget.shared.model.composite.text.C import org.gcube.portlets.user.td.expressionwidget.shared.model.composite.text.C_TextContains; import org.gcube.portlets.user.td.expressionwidget.shared.model.composite.text.C_TextEndsWith; import org.gcube.portlets.user.td.expressionwidget.shared.model.composite.text.C_TextMatchSQLRegexp; +import org.gcube.portlets.user.td.expressionwidget.shared.model.leaf.C_ColumnReference; import org.gcube.portlets.user.td.expressionwidget.shared.model.leaf.C_ColumnReferencePlaceholder; import org.gcube.portlets.user.td.expressionwidget.shared.model.leaf.C_ConstantList; import org.gcube.portlets.user.td.expressionwidget.shared.model.leaf.C_Range; -import org.gcube.portlets.user.td.expressionwidget.shared.model.leaf.C_ColumnReference; import org.gcube.portlets.user.td.expressionwidget.shared.model.leaf.TD_Value; import org.gcube.portlets.user.td.expressionwidget.shared.model.logical.C_And; import org.gcube.portlets.user.td.expressionwidget.shared.model.logical.C_Between; @@ -32,7 +32,6 @@ import org.gcube.portlets.user.td.expressionwidget.shared.model.logical.C_ValueI import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData; import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expression; import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnDataType; -import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnTypeMap; import com.allen_sauer.gwt.log.client.Log; @@ -70,7 +69,8 @@ public class ConditionTypeMap { Log.debug("ConditionTypeMap Map Place Holder"); C_Expression exp = null; Log.debug("Column Data Type Name:" + column.getDataTypeName()); - ColumnDataType dataType = ColumnTypeMap.getColumnDataType(column + ColumnDataType dataType = ColumnDataType + .getColumnDataTypeFromId(column .getDataTypeName()); Log.debug("Data Type:" + dataType); C_ColumnReferencePlaceholder placeHolder = new C_ColumnReferencePlaceholder( @@ -342,7 +342,8 @@ public class ConditionTypeMap { C_Expression exp = null; Log.debug("Column Data Type Name:" + column.getDataTypeName()); - ColumnDataType dataType = ColumnTypeMap.getColumnDataType(column + ColumnDataType dataType = ColumnDataType + .getColumnDataTypeFromId(column .getDataTypeName()); Log.debug("Data Type:" + dataType); C_ColumnReference columnReference = new C_ColumnReference( diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/replace/ReplaceArithmeticTypeMap.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/replace/ReplaceArithmeticTypeMap.java index a3d4d6a..07b062d 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/replace/ReplaceArithmeticTypeMap.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/replace/ReplaceArithmeticTypeMap.java @@ -18,7 +18,6 @@ import org.gcube.portlets.user.td.expressionwidget.shared.model.leaf.TD_Value; import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData; import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expression; import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnDataType; -import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnTypeMap; import com.allen_sauer.gwt.log.client.Log; @@ -113,7 +112,8 @@ public class ReplaceArithmeticTypeMap { } Log.debug("Column Data Type Name:" + column.getDataTypeName()); - ColumnDataType dataType = ColumnTypeMap.getColumnDataType(column + ColumnDataType dataType = ColumnDataType + .getColumnDataTypeFromId(column .getDataTypeName()); Log.debug("Data Type:" + dataType); C_ColumnReferencePlaceholder placeH = new C_ColumnReferencePlaceholder( @@ -285,7 +285,8 @@ public class ReplaceArithmeticTypeMap { } Log.debug("Column Data Type Name:" + column.getDataTypeName()); - ColumnDataType dataType = ColumnTypeMap.getColumnDataType(column + ColumnDataType dataType = ColumnDataType + .getColumnDataTypeFromId(column .getDataTypeName()); Log.debug("Data Type:" + dataType); diff --git a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/replace/ReplaceTypeMap.java b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/replace/ReplaceTypeMap.java index 8601024..3ff86a3 100644 --- a/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/replace/ReplaceTypeMap.java +++ b/src/main/java/org/gcube/portlets/user/td/expressionwidget/shared/replace/ReplaceTypeMap.java @@ -7,13 +7,12 @@ import org.gcube.portlets.user.td.expressionwidget.shared.model.composite.text.C import org.gcube.portlets.user.td.expressionwidget.shared.model.composite.text.C_SubstringByRegex; import org.gcube.portlets.user.td.expressionwidget.shared.model.composite.text.C_SubstringPosition; import org.gcube.portlets.user.td.expressionwidget.shared.model.composite.text.C_TextReplaceMatchingRegex; -import org.gcube.portlets.user.td.expressionwidget.shared.model.leaf.C_ColumnReferencePlaceholder; import org.gcube.portlets.user.td.expressionwidget.shared.model.leaf.C_ColumnReference; +import org.gcube.portlets.user.td.expressionwidget.shared.model.leaf.C_ColumnReferencePlaceholder; import org.gcube.portlets.user.td.expressionwidget.shared.model.leaf.TD_Value; import org.gcube.portlets.user.td.gwtservice.shared.tr.ColumnData; import org.gcube.portlets.user.td.widgetcommonevent.shared.expression.C_Expression; import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnDataType; -import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnTypeMap; import com.allen_sauer.gwt.log.client.Log; @@ -82,7 +81,8 @@ public class ReplaceTypeMap { Log.debug("Column Data Type Name:" + column.getDataTypeName()); - ColumnDataType dataType = ColumnTypeMap.getColumnDataType(column + ColumnDataType dataType = ColumnDataType + .getColumnDataTypeFromId(column .getDataTypeName()); Log.debug("Data Type:" + dataType); C_ColumnReferencePlaceholder placeH = new C_ColumnReferencePlaceholder( @@ -193,7 +193,8 @@ public class ReplaceTypeMap { Log.debug("Column Data Type Name:" + column.getDataTypeName()); - ColumnDataType dataType = ColumnTypeMap.getColumnDataType(column + ColumnDataType dataType = ColumnDataType + .getColumnDataTypeFromId(column .getDataTypeName()); Log.debug("Data Type:" + dataType);