summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorxwu2013-04-09 04:32:36 (EDT)
committerlzhu2013-04-09 04:32:36 (EDT)
commit5ae0d5241cd2c16097c5cf0f72378e312255f6ee (patch)
treef4701f096e9144c760302c5b2ef85c56c64a9c04
parentd694bb89e0a4e66550e86eac43028080afde4e71 (diff)
downloadorg.eclipse.datatools.enablement.oda-5ae0d5241cd2c16097c5cf0f72378e312255f6ee.zip
org.eclipse.datatools.enablement.oda-5ae0d5241cd2c16097c5cf0f72378e312255f6ee.tar.gz
org.eclipse.datatools.enablement.oda-5ae0d5241cd2c16097c5cf0f72378e312255f6ee.tar.bz2
Fix an issue - 'Finish' button should be disabled of created flatfilev201304091632
dataset when select columns and column name is a number.[58769].
-rw-r--r--plugins/org.eclipse.datatools.connectivity.oda.flatfile.ui/src/org/eclipse/datatools/connectivity/oda/flatfile/ui/wizards/FileSelectionWizardPage.java15
1 files changed, 8 insertions, 7 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 5bd4de0..f1fc4f9 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
@@ -1000,6 +1000,13 @@ public class FileSelectionWizardPage extends DataSetWizardPage
for ( int i = 0; i < savedSelectedColumnsInfoList.size( ); i++ )
{
String columnName = ( (String[]) savedSelectedColumnsInfoList.get( i ) )[0];
+ if ( columnName == null || isNumeric( columnName ) )
+ {
+ setMessage( Messages.getString( "FileSelectionWizardPage.error.selectColumn.numberName" ), //$NON-NLS-1$
+ ERROR );
+ pageComplete = false;
+ break;
+ }
String originalName = ( (String[]) savedSelectedColumnsInfoList.get( i ) )[1];
boolean columnExists = false;
for ( int k = 0; k < columnNames.length; k++ )
@@ -1018,12 +1025,6 @@ public class FileSelectionWizardPage extends DataSetWizardPage
pageComplete = false;
break;
}
- if ( isNumeric( columnName ) )
- {
- setMessage( Messages.getString( "FileSelectionWizardPage.error.selectColumn.numberName" ), //$NON-NLS-1$
- ERROR );
- pageComplete = false;
- }
}
if ( savedSelectedColumnsInfoList.size( ) <= 0 )
{
@@ -1035,8 +1036,8 @@ public class FileSelectionWizardPage extends DataSetWizardPage
if ( pageComplete )
{
setMessage( DEFAULT_MESSAGE );
- setPageComplete( true );
}
+ setPageComplete( pageComplete );
}
/**