Merge pull request #41 from gkossakowski/master

Work-around for CPS and vpm problem
scalagwt · Feb 27, 2012 · 18fbc34 · 18fbc34
2 parents b649416 + 309f133
commit 18fbc34
Showing 1 changed file with 14 additions and 13 deletions.
diff --git a/src/com/google/gwt/sample/gwtdlx/client/GwtDlx.scala b/src/com/google/gwt/sample/gwtdlx/client/GwtDlx.scala
@@ -116,19 +116,20 @@ class GwtDlx extends EntryPoint {
       sched {
          val result = (Sudoku(board)).solve
          ajax.setVisible(false)
-         //TODO(grek): Changed pattern patch on Option to if due to collision
-         //between Yvirtpatmat and CPS plugin. Changed back once it's fixed upstream.
-         if (result.isDefined) {
-           val soln = result.get
-           noSolution.setVisible(false)
-           for (r <- 0 until soln.length) {
-              for (c <- 0 until soln(r).length) {
-                 getBox(r, c).setValue(soln(r)(c) + "")
-              }
-           }
-           ajax.setVisible(false)
-         } else
-            noSolution.setVisible(true)
+         result match {
+            case None => noSolution.setVisible(true)
+            case Some(soln) => {
+               noSolution.setVisible(false)
+               for (r <- 0 until soln.length) {
+                  for (c <- 0 until soln(r).length) {
+                     getBox(r, c).setValue(soln(r)(c) + "")
+                  }
+               }
+               ajax.setVisible(false)
+            }
+         }
+         //TODO(grek): Work-around for CPS-vpm interaction problem.
+         ()
       }
    }
 }