[jboss-svn-commits] JBL Code SVN: r15076 - labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/java/org/drools/examples/sudoku/rules.

[jboss-svn-commits at lists.jboss.org]

Author: mfrandsen
Date: 2007-09-13 04:02:40 -0400 (Thu, 13 Sep 2007)
New Revision: 15076

Modified:
   labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/java/org/drools/examples/sudoku/rules/DroolsSudokuGridModel.java
Log:
Backport to JDK 1.4

Modified: labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/java/org/drools/examples/sudoku/rules/DroolsSudokuGridModel.java
===================================================================
--- labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/java/org/drools/examples/sudoku/rules/DroolsSudokuGridModel.java	2007-09-13 06:07:14 UTC (rev 15075)
+++ labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/java/org/drools/examples/sudoku/rules/DroolsSudokuGridModel.java	2007-09-13 08:02:40 UTC (rev 15076)
@@ -8,6 +8,7 @@
 
 import java.util.ArrayList;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 import org.drools.RuleBase;
@@ -47,7 +48,7 @@
    public final static String SUDOKU_VALIDATOR_DRL = "../sudokuValidator.drl";
    
    /** A set of AbtractCellValues capturing the current state of the grid */
-   private Set<AbstractCellValue> allCellValues = new HashSet<AbstractCellValue>();
+   private Set allCellValues = new HashSet();
 
    /** The solver rule base */
    private RuleBase solverRuleBase;
@@ -71,13 +72,13 @@
     * 
     * @param cellValues a two dimensional grid of Integer values for cells, a null means the value is not yet resolved
     */
-   public DroolsSudokuGridModel(Integer[][] cellValues)
+   public DroolsSudokuGridModel(int[][] cellValues)
    {  
       this();
       setCellValues(cellValues);
    }
    
-   public void setCellValues(Integer[][] cellValues)
+   public void setCellValues(int[][] cellValues)
    {
       if (solverRuleBase == null)
       {
@@ -104,7 +105,7 @@
       {
          for (int col=0; col<cellValues[row].length; col++)
          {
-            if(cellValues[row][col] == null)
+            if(cellValues[row][col] == 0)
             {
                for(int value=1; value<10; value++)
                {
@@ -168,8 +169,10 @@
             else
             {
                solved = false;
-               for (Object issue : issues)
+               Iterator iter = issues.iterator();
+               while(iter.hasNext())
                {
+            	  Object issue = iter.next();
                   System.out.println(issue);
                }
             }
@@ -184,15 +187,17 @@
       return solved;
    }
    
-   public List<Integer> getPossibleCellValues(int row, int col)
+   public List getPossibleCellValues(int row, int col)
    {
-      List<Integer> possibleCellValues = new ArrayList<Integer>();
+      List possibleCellValues = new ArrayList();
 
-      for (AbstractCellValue cellValue : allCellValues)
+      Iterator iter = allCellValues.iterator();
+      while(iter.hasNext())
       {
+    	 AbstractCellValue cellValue = (AbstractCellValue) iter.next();
          if (cellValue.getRow() == row && cellValue.getCol() == col)
          {
-            possibleCellValues.add(cellValue.getValue());
+            possibleCellValues.add(new Integer(cellValue.getValue()));
          }
       }
       
@@ -208,8 +213,10 @@
    
    private void insertAllCellValues(StatefulSession statefulSession)
    {
-      for (AbstractCellValue cellValue : allCellValues)
-      {
+	  Iterator iter = allCellValues.iterator();
+	  while(iter.hasNext())
+	  {
+	     AbstractCellValue cellValue = (AbstractCellValue) iter.next();
          statefulSession.insert(cellValue);
       }
    }