| author | xma | 2007-07-12 22:50:50 (EDT) |
|---|---|---|
| committer | xgu | 2007-07-12 22:50:50 (EDT) |
| commit | a01ce01235a73497ec60f098cb7c7b69689ef7e1 (patch) (side-by-side diff) | |
| tree | c1cc1561988452e3268eb53af122af45196fe0e5 | |
| parent | 0a12ba01833026ce5794af9a4551412aaedfa096 (diff) | |
| download | org.eclipse.datatools.enablement.oda-a01ce01235a73497ec60f098cb7c7b69689ef7e1.zip org.eclipse.datatools.enablement.oda-a01ce01235a73497ec60f098cb7c7b69689ef7e1.tar.gz org.eclipse.datatools.enablement.oda-a01ce01235a73497ec60f098cb7c7b69689ef7e1.tar.bz2 | |
Fix Bugzilla Bug 196051
XML data types that are numeric and contain empty values will cause an "ANY" type error
2 files changed, 5 insertions, 3 deletions
diff --git a/plugins/org.eclipse.datatools.enablement.oda.xml.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.datatools.enablement.oda.xml.ui/META-INF/MANIFEST.MF index 940b3ba..1642ffc 100644 --- a/plugins/org.eclipse.datatools.enablement.oda.xml.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.datatools.enablement.oda.xml.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.enablement.oda.xml.ui;singleton:=true -Bundle-Version: 1.0.2.200707061 +Bundle-Version: 1.0.2.200707131 Bundle-ClassPath: . Bundle-Activator: org.eclipse.datatools.enablement.oda.xml.ui.UiPlugin Bundle-Vendor: Eclipse.org diff --git a/plugins/org.eclipse.datatools.enablement.oda.xml.ui/src/org/eclipse/datatools/enablement/oda/xml/ui/wizards/ResultSetTableViewer.java b/plugins/org.eclipse.datatools.enablement.oda.xml.ui/src/org/eclipse/datatools/enablement/oda/xml/ui/wizards/ResultSetTableViewer.java index 343f1bf..4ff5d8a 100644 --- a/plugins/org.eclipse.datatools.enablement.oda.xml.ui/src/org/eclipse/datatools/enablement/oda/xml/ui/wizards/ResultSetTableViewer.java +++ b/plugins/org.eclipse.datatools.enablement.oda.xml.ui/src/org/eclipse/datatools/enablement/oda/xml/ui/wizards/ResultSetTableViewer.java @@ -47,7 +47,7 @@ import org.eclipse.ui.PlatformUI; * Table viewer of result set, it contains refresh action to get the results of * xml file. * - * @version $Revision: 1.4 $ $Date: 2007/04/17 06:22:33 $ + * @version $Revision: 1.5 $ $Date: 2007/05/31 02:21:09 $ */ public final class ResultSetTableViewer { @@ -192,7 +192,9 @@ public final class ResultSetTableViewer IQuery query = conn.newQuery( null ); - int maxRow = Integer.parseInt( XMLInformationHolder.getPropertyValue( Constants.CONST_PROP_MAX_ROW ) ); + int maxRow = Integer.parseInt( XMLInformationHolder.getPropertyValue( Constants.CONST_PROP_MAX_ROW ) != null + ? XMLInformationHolder.getPropertyValue( Constants.CONST_PROP_MAX_ROW ) + : "-1" ); //$NON-NLS-1$ query.setMaxRows( maxRow ); query.prepare( XMLInformationHolder.getPropertyValue( Constants.CONST_PROP_RELATIONINFORMATION ) ); rs = query.executeQuery( ); |