From dd41b18b21129ad5c41c6b7f2a19b4822ed1a2ef Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Fri, 6 Feb 2015 09:28:35 +0000 Subject: [PATCH] Minor Update git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-extractcodelist-widget@111760 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../ExtractCodelistOperationInProgressCard.java | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/gcube/portlets/user/td/extractcodelistwidget/client/ExtractCodelistOperationInProgressCard.java b/src/main/java/org/gcube/portlets/user/td/extractcodelistwidget/client/ExtractCodelistOperationInProgressCard.java index efefd39..2062e1f 100644 --- a/src/main/java/org/gcube/portlets/user/td/extractcodelistwidget/client/ExtractCodelistOperationInProgressCard.java +++ b/src/main/java/org/gcube/portlets/user/td/extractcodelistwidget/client/ExtractCodelistOperationInProgressCard.java @@ -19,7 +19,6 @@ import org.gcube.portlets.user.td.widgetcommonevent.shared.OperationResult; import org.gcube.portlets.user.td.widgetcommonevent.shared.TRId; import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnDataType; import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnTypeCode; -import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnTypeMap; import org.gcube.portlets.user.td.wizardwidget.client.WizardCard; import com.allen_sauer.gwt.log.client.Log; @@ -166,10 +165,10 @@ public class ExtractCodelistOperationInProgressCard extends WizardCard private void createChangeColumnSession(ArrayList refColumns) { ColumnData orig = extractCodelistSession.getAttachColumn(); - ColumnTypeCode origColumnTypeCode = ColumnTypeMap - .getColumnTypeCode(orig.getTypeCode()); - ColumnDataType origColumnDataType = ColumnTypeMap - .getColumnDataType(orig.getDataTypeName()); + ColumnTypeCode origColumnTypeCode = ColumnTypeCode + .getColumnTypeCodeFromId(orig.getTypeCode()); + ColumnDataType origColumnDataType = ColumnDataType + .getColumnDataTypeFromId(orig.getDataTypeName()); String labelOfAttachColumn = null; ColumnTypeCode typeCodeOfColumnAttach = null; @@ -184,8 +183,8 @@ public class ExtractCodelistOperationInProgressCard extends WizardCard } else { labelOfAttachColumn = targetCol.getTargetColumn() .getLabel(); - typeCodeOfColumnAttach = ColumnTypeMap - .getColumnTypeCode(targetCol.getTargetColumn() + typeCodeOfColumnAttach = ColumnTypeCode + .getColumnTypeCodeFromId(targetCol.getTargetColumn() .getTypeCode()); } break; @@ -203,8 +202,8 @@ public class ExtractCodelistOperationInProgressCard extends WizardCard } else { for (ColumnData refColumn : refColumns) { if (refColumn.getLabel().compareTo(labelOfAttachColumn) == 0) { - if (ColumnTypeMap - .getColumnTypeCode(refColumn.getTypeCode()) + if (ColumnTypeCode + .getColumnTypeCodeFromId(refColumn.getTypeCode()) .compareTo(typeCodeOfColumnAttach) == 0) { codelistColumnReference = refColumn; break;