[Mulgara-svn] r1646 - trunk/src/jar/tuples/java/org/mulgara/store/tuples

[pag at mulgara.org]

Author: pag
Date: 2009-03-26 13:27:31 -0700 (Thu, 26 Mar 2009)
New Revision: 1646

Modified:
   trunk/src/jar/tuples/java/org/mulgara/store/tuples/UnboundJoin.java
Log:
Updated some comments to avoid possible javadoc issues, and added in generics

Modified: trunk/src/jar/tuples/java/org/mulgara/store/tuples/UnboundJoin.java
===================================================================
--- trunk/src/jar/tuples/java/org/mulgara/store/tuples/UnboundJoin.java	2009-03-26 20:26:37 UTC (rev 1645)
+++ trunk/src/jar/tuples/java/org/mulgara/store/tuples/UnboundJoin.java	2009-03-26 20:27:31 UTC (rev 1646)
@@ -17,8 +17,8 @@
  * Plugged In Software Pty Ltd. All Rights Reserved.
  *
  * Contributor(s):
- *  Various bug fixes copyright Netymon Pty Ltd <info at netymon.com> under
- *  contract to The Topaz Foundation <info at topazproject.org>
+ *  Various bug fixes copyright Netymon Pty Ltd (info at netymon.com) under
+ *  contract to The Topaz Foundation (info at topazproject.org)
  *
  * [NOTE: The text of this Exhibit A may differ slightly from the text
  * of the notices in the Source Code files of the Original Code. You
@@ -200,11 +200,11 @@
 
     // Calculate the variables present and their mappings from operand
     // columns to result columns
-    List variableList = new ArrayList();
-    List mapOperandList = new ArrayList();
-    List mapColumnList = new ArrayList();
-    List fooOperandList = new ArrayList();
-    List fooColumnList = new ArrayList();
+    List<Variable> variableList = new ArrayList<Variable>();
+    List<Integer> mapOperandList = new ArrayList<Integer>();
+    List<Integer> mapColumnList = new ArrayList<Integer>();
+    List<Integer> fooOperandList = new ArrayList<Integer>();
+    List<Integer> fooColumnList = new ArrayList<Integer>();
 
     for (int i = 0; i < operands.length; i++) {
       fooOperandList.clear();
@@ -286,7 +286,7 @@
     return true;
   }
 
-  public List getOperands() {
+  public List<Tuples> getOperands() {
     return Arrays.asList(operands);
   }