| commit | 76aad6fd899bde805012e0ec788506323a3795cb | [log] [tgz] |
|---|---|---|
| author | Brian Payton <bpayton@us.ibm.com> | Mon Jul 07 22:36:19 2008 +0000 |
| committer | Brian Payton <bpayton@us.ibm.com> | Mon Jul 07 22:36:19 2008 +0000 |
| tree | d9d4a0e7d4c222076ccf1607ebac2cf9e9b69514 | |
| parent | ca895d718bc791b984e49abf722188a498645b69 [diff] |
[239899] Removed Java 1.5-specific code from o.e.d.modelbase.sql.query to fix DTP build break
diff --git a/plugins/org.eclipse.datatools.modelbase.sql.query/.settings/.cvsignore b/plugins/org.eclipse.datatools.modelbase.sql.query/.settings/.cvsignore new file mode 100644 index 0000000..013bce7 --- /dev/null +++ b/plugins/org.eclipse.datatools.modelbase.sql.query/.settings/.cvsignore
@@ -0,0 +1 @@ +org.eclipse.jdt.core.prefs
diff --git a/plugins/org.eclipse.datatools.modelbase.sql.query/src/org/eclipse/datatools/modelbase/sql/query/helper/TableHelper.java b/plugins/org.eclipse.datatools.modelbase.sql.query/src/org/eclipse/datatools/modelbase/sql/query/helper/TableHelper.java index a12115b..c54e1df 100644 --- a/plugins/org.eclipse.datatools.modelbase.sql.query/src/org/eclipse/datatools/modelbase/sql/query/helper/TableHelper.java +++ b/plugins/org.eclipse.datatools.modelbase.sql.query/src/org/eclipse/datatools/modelbase/sql/query/helper/TableHelper.java
@@ -320,9 +320,9 @@ * and use those names for the exposed result columns. */ TableCorrelation tableCorr = tableExpr.getTableCorrelation(); if (tableCorr != null) { - List<?> corrColNameList = tableCorr.getColumnNameList(); + List corrColNameList = tableCorr.getColumnNameList(); if (corrColNameList.size() <= resultColExprList.size()) { - List<ValueExpressionColumn> corrColList = new ArrayList<ValueExpressionColumn>(); + List corrColList = new ArrayList(); for (int i=0; i<corrColNameList.size(); i++) { Object obj1 = corrColNameList.get(i); Object obj2 = resultColExprList.get(i);