summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorxwu2012-01-10 01:37:58 (EST)
committerlzhu2012-01-10 01:37:58 (EST)
commit0d799b5479e1ec37b8326008db1635ca59ceb7e9 (patch)
tree408498aacaef037bee4c000440fbb54d5047820d
parented1bbbdd0c39acf041455780540135c0302f8687 (diff)
downloadorg.eclipse.datatools.connectivity-0d799b5479e1ec37b8326008db1635ca59ceb7e9.zip
org.eclipse.datatools.connectivity-0d799b5479e1ec37b8326008db1635ca59ceb7e9.tar.gz
org.eclipse.datatools.connectivity-0d799b5479e1ec37b8326008db1635ca59ceb7e9.tar.bz2
CheckIN: Fix an issue-Selected column doesn't exist error when deletev201201101437
dup column from flat file[46004].
-rw-r--r--plugins/org.eclipse.datatools.connectivity.oda.flatfile.ui/src/org/eclipse/datatools/connectivity/oda/flatfile/ui/wizards/FileSelectionWizardPage.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.flatfile.ui/src/org/eclipse/datatools/connectivity/oda/flatfile/ui/wizards/FileSelectionWizardPage.java b/plugins/org.eclipse.datatools.connectivity.oda.flatfile.ui/src/org/eclipse/datatools/connectivity/oda/flatfile/ui/wizards/FileSelectionWizardPage.java
index f448749..bfab24f 100644
--- a/plugins/org.eclipse.datatools.connectivity.oda.flatfile.ui/src/org/eclipse/datatools/connectivity/oda/flatfile/ui/wizards/FileSelectionWizardPage.java
+++ b/plugins/org.eclipse.datatools.connectivity.oda.flatfile.ui/src/org/eclipse/datatools/connectivity/oda/flatfile/ui/wizards/FileSelectionWizardPage.java
@@ -1013,10 +1013,12 @@ public class FileSelectionWizardPage extends DataSetWizardPage
for ( int i = 0; i < savedSelectedColumnsInfoList.size( ); i++ )
{
String columnName = ( (String[]) savedSelectedColumnsInfoList.get( i ) )[0];
+ String originalName = ( (String[]) savedSelectedColumnsInfoList.get( i ) )[1];
boolean columnExists = false;
for ( int k = 0; k < columnNames.length; k++ )
{
- if ( columnName != null && columnName.equals( columnNames[k] ) )
+ if ( ( columnName != null && columnName.equals( columnNames[k] ) )
+ || ( originalName != null && originalName.equals( columnNames[k] ) ) )
{
columnExists = true;
break;