summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorxwu2011-10-31 01:56:54 (EDT)
committer lzhu2011-10-31 01:56:54 (EDT)
commit153b60f629ab063f9e410c650025de1978554bc2 (patch)
tree0bf1fc490390645be9c3b3c4be19f0483b604ced
parentcbdef4f2b0b182ffb4f5581493e40a0ae4cf9e3f (diff)
downloadorg.eclipse.datatools.enablement.oda-153b60f629ab063f9e410c650025de1978554bc2.zip
org.eclipse.datatools.enablement.oda-153b60f629ab063f9e410c650025de1978554bc2.tar.gz
org.eclipse.datatools.enablement.oda-153b60f629ab063f9e410c650025de1978554bc2.tar.bz2
CheckIn: Fix an issue Message pops up when trying to edit a flat file
data set.[42934]
-rw-r--r--plugins/org.eclipse.datatools.connectivity.oda.flatfile.ui/src/org/eclipse/datatools/connectivity/oda/flatfile/ui/wizards/FileSelectionWizardPage.java17
1 files changed, 9 insertions, 8 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 ba2d1b7..5089867 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
@@ -950,7 +950,7 @@ public class FileSelectionWizardPage extends DataSetWizardPage
}
// Home folder mode
- if ( file.equals( selectedFile ) )
+ if ( file.equals( selectedFile ) || selectedFile == null )
return;
else
{
@@ -1027,6 +1027,7 @@ public class FileSelectionWizardPage extends DataSetWizardPage
setMessage( Messages.getFormattedString( "warning.columnNotExist", new Object[]{columnName} ), //$NON-NLS-1$
ERROR );
pageComplete = false;
+ break;
}
}
if ( savedSelectedColumnsInfoList.size( ) <= 0)
@@ -1044,11 +1045,11 @@ public class FileSelectionWizardPage extends DataSetWizardPage
*/
private void loadProperties( )
{
- DataSourceDesign dataSourceDesign = getInitializationDesign( ).getDataSourceDesign( );
+ DataSourceDesign dataSourceDesign = getInitializationDesign( ).getDataSourceDesign( );
java.util.Properties dataSourceProps = null;
try
{
- dataSourceProps = DesignSessionUtil.getEffectiveDataSourceProperties( dataSourceDesign );
+ dataSourceProps = DesignSessionUtil.getEffectiveDataSourceProperties( dataSourceDesign );
}
catch ( OdaException e )
{
@@ -1059,8 +1060,8 @@ public class FileSelectionWizardPage extends DataSetWizardPage
String sourcePath = dataSourceProps.getProperty( ConnectionProfileProperty.PROFILE_STORE_FILE_PATH_PROP_KEY );
if ( sourcePath != null )
{
- File cpFile = DesignUtil.convertPathToResourceFile( sourcePath, dataSourceDesign.getHostResourceIdentifiers() );
- if ( cpFile == null )
+ File cpFile = DesignUtil.convertPathToResourceFile( sourcePath, dataSourceDesign.getHostResourceIdentifiers() );
+ if ( cpFile == null )
{
setMessage( Messages.getFormattedString( "error.invalidConnectionFilePath", new Object[]{ sourcePath } ), ERROR ); //$NON-NLS-1$
return;
@@ -1432,8 +1433,8 @@ public class FileSelectionWizardPage extends DataSetWizardPage
savedSelectedColumnsInfoString = (new QueryTextUtil( queryText )).getColumnsInfo( );
- Map<String, Object> appContext =
- DesignSessionUtil.createResourceIdentifiersContext( getHostResourceIdentifiers() );
+ Map<String, Object> appContext =
+ DesignSessionUtil.createResourceIdentifiersContext( getHostResourceIdentifiers() );
conn.setAppContext( appContext );
conn.open( prop );
@@ -1447,7 +1448,7 @@ public class FileSelectionWizardPage extends DataSetWizardPage
private ResourceIdentifiers getResourceIdentifiers( )
{
- return DesignSessionUtil.createRuntimeResourceIdentifiers( getHostResourceIdentifiers() );
+ return DesignSessionUtil.createRuntimeResourceIdentifiers( getHostResourceIdentifiers() );
}
/**