gCubeSystem
/
tabular-data-extractcodelist-widget
15
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
This commit is contained in:
Giancarlo Panichi 2015-02-06 09:28:35 +00:00
parent cf3be76185
commit dd41b18b21
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/org/gcube/portlets/user/td/extractcodelistwidget/client/ExtractCodelistOperationInProgressCard.java
View File

@ -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.TRId;
import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnDataType; 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.ColumnTypeCode;
import org.gcube.portlets.user.td.widgetcommonevent.shared.tr.column.ColumnTypeMap;
import org.gcube.portlets.user.td.wizardwidget.client.WizardCard; import org.gcube.portlets.user.td.wizardwidget.client.WizardCard;
import com.allen_sauer.gwt.log.client.Log; import com.allen_sauer.gwt.log.client.Log;
@ -166,10 +165,10 @@ public class ExtractCodelistOperationInProgressCard extends WizardCard
private void createChangeColumnSession(ArrayList<ColumnData> refColumns) { private void createChangeColumnSession(ArrayList<ColumnData> refColumns) {
ColumnData orig = extractCodelistSession.getAttachColumn(); ColumnData orig = extractCodelistSession.getAttachColumn();
ColumnTypeCode origColumnTypeCode = ColumnTypeMap ColumnTypeCode origColumnTypeCode = ColumnTypeCode
.getColumnTypeCode(orig.getTypeCode()); .getColumnTypeCodeFromId(orig.getTypeCode());
ColumnDataType origColumnDataType = ColumnTypeMap ColumnDataType origColumnDataType = ColumnDataType
.getColumnDataType(orig.getDataTypeName()); .getColumnDataTypeFromId(orig.getDataTypeName());
String labelOfAttachColumn = null; String labelOfAttachColumn = null;
ColumnTypeCode typeCodeOfColumnAttach = null; ColumnTypeCode typeCodeOfColumnAttach = null;
@ -184,8 +183,8 @@ public class ExtractCodelistOperationInProgressCard extends WizardCard
} else { } else {
labelOfAttachColumn = targetCol.getTargetColumn() labelOfAttachColumn = targetCol.getTargetColumn()
.getLabel(); .getLabel();
typeCodeOfColumnAttach = ColumnTypeMap typeCodeOfColumnAttach = ColumnTypeCode
.getColumnTypeCode(targetCol.getTargetColumn() .getColumnTypeCodeFromId(targetCol.getTargetColumn()
.getTypeCode()); .getTypeCode());
} }
break; break;
@ -203,8 +202,8 @@ public class ExtractCodelistOperationInProgressCard extends WizardCard
} else { } else {
for (ColumnData refColumn : refColumns) { for (ColumnData refColumn : refColumns) {
if (refColumn.getLabel().compareTo(labelOfAttachColumn) == 0) { if (refColumn.getLabel().compareTo(labelOfAttachColumn) == 0) {
if (ColumnTypeMap if (ColumnTypeCode
.getColumnTypeCode(refColumn.getTypeCode()) .getColumnTypeCodeFromId(refColumn.getTypeCode())
.compareTo(typeCodeOfColumnAttach) == 0) { .compareTo(typeCodeOfColumnAttach) == 0) {
codelistColumnReference = refColumn; codelistColumnReference = refColumn;
break; break;