summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorxma2007-07-04 03:11:09 (EDT)
committer xgu2007-07-04 03:11:09 (EDT)
commit00efb4676d1510de397131b83478c5bfe1754d76 (patch)
tree84931bfd1e4cba85268c86cd88df8406c084b0a0
parentaf2019034e11a94166027967776701d073c194ad (diff)
downloadorg.eclipse.datatools.enablement.oda-00efb4676d1510de397131b83478c5bfe1754d76.zip
org.eclipse.datatools.enablement.oda-00efb4676d1510de397131b83478c5bfe1754d76.tar.gz
org.eclipse.datatools.enablement.oda-00efb4676d1510de397131b83478c5bfe1754d76.tar.bz2
Fix Bugzilla Bug 195123
NPE throws out when modify a flatfile dataset has no select flatfile[0700]
-rw-r--r--plugins/org.eclipse.datatools.connectivity.oda.flatfile.ui/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.datatools.connectivity.oda.flatfile.ui/src/org/eclipse/datatools/connectivity/oda/flatfile/ui/wizards/FileSelectionWizardPage.java3
2 files changed, 3 insertions, 2 deletions
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.flatfile.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.datatools.connectivity.oda.flatfile.ui/META-INF/MANIFEST.MF
index d3f92ac..49b5737 100644
--- a/plugins/org.eclipse.datatools.connectivity.oda.flatfile.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.datatools.connectivity.oda.flatfile.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %plugin.name
Bundle-SymbolicName: org.eclipse.datatools.connectivity.oda.flatfile.ui; singleton:=true
-Bundle-Version: 3.0.4.200706191
+Bundle-Version: 3.0.4.200707041
Bundle-Activator: org.eclipse.datatools.connectivity.oda.flatfile.ui.FlatFileUIPlugin
Bundle-Vendor: Eclipse.org
Bundle-Localization: plugin
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 cd7b0c3..2a3c87c 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
@@ -1143,7 +1143,8 @@ public class FileSelectionWizardPage extends DataSetWizardPage
File file, IConnection conn ) throws OdaException
{
java.util.Properties prop = new java.util.Properties( );
- prop.put( CommonConstants.CONN_HOME_DIR_PROP, file.getParent( ) );
+ if ( file != null )
+ prop.put( CommonConstants.CONN_HOME_DIR_PROP, file.getParent( ) );
prop.put( CommonConstants.CONN_DELIMITER_TYPE, flatfileDelimiterType );
prop.put( CommonConstants.CONN_CHARSET_PROP, charSet );
prop.put( CommonConstants.CONN_INCLCOLUMNNAME_PROP, inclColumnNameLine );