* Added interfaces for Sikuli actions: WaitForSikuliImage & ClickSiku…

…liImage

* removed SikuliImageExists
* published new selenate verison to 0.2.17

code/Client/src/main/java/net/selenate/client/user/ActorBrowser.java

@@ -9,7 +9,6 @@
 import net.selenate.common.comms.req.*;
 import net.selenate.common.comms.res.*;
 import net.selenate.common.user.*;
-
 import akka.actor.ActorRef;
 
 public class ActorBrowser extends ActorBase implements IBrowser {
@@ -245,4 +244,14 @@ public BrowserPage waitForAnyPage(List<BrowserPage> pageList) throws IOException
   public void setAutoFrames(final Boolean useFrames) throws IOException {
     typedBlock(new SeReqSetUseFrames(useFrames), SeResSetUseFrames.class);
   }
+
+  public boolean waitForSikuliImage(final byte[] image) throws IOException {
+    final SeResWaitForSikuliImage res = typedBlock(new SeReqWaitForSikuliImage(image, 30000), SeResWaitForSikuliImage.class);
+    return res.isImageFound();
+  }
+
+  public void clickSikuliImage(final byte[] image) throws IOException {
+    typedBlock(new SeReqClickSikuliImage(image, 30000), SeResClickSikuliImage.class);
+  }
+
 }

code/Common/src/main/java/net/selenate/common/comms/res/SeResWaitForSikuliImage.java

@@ -3,11 +3,18 @@
 public class SeResWaitForSikuliImage implements SeCommsRes {
   private static final long serialVersionUID = 1L;
 
-  public SeResWaitForSikuliImage() {
+  private boolean isImageFound;
+
+  public SeResWaitForSikuliImage(final boolean isImageFound) {
+    this.isImageFound = isImageFound;
+  }
+
+  public boolean isImageFound() {
+    return isImageFound;
   }
 
   @Override
   public String toString() {
-    return String.format("SeResWaitForSikuliImage()");
+    return String.format("SeResWaitForSikuliImage(%s)", isImageFound);
   }
 }

code/Server/src/main/scala/net/selenate/server/sessions/SessionActor.scala

@@ -50,7 +50,6 @@ class SessionActor(sessionID: String, profile: DriverProfile, useFrames: Boolean
     case arg: SeReqResetFrame         => new ResetFrameAction(d).act(arg)
     case arg: SeReqSelectOption       => new SelectOptionAction(d).act(arg)
     case arg: SeReqSetUseFrames       => new SetUseFramesAction(d).act(arg)
-    case arg: SeReqSikuliImageExists  => new SikuliImageExistsAction(d).act(arg)
     case arg: SeReqStartKeepalive     => new StartKeepaliveAction(d).act(arg)
     case arg: SeReqStopKeepalive      => new StopKeepaliveAction(d).act(arg)
     case arg: SeReqSwitchFrame        => new SwitchFrameAction(d).act(arg)

code/Server/src/main/scala/net/selenate/server/sessions/actions/WaitForSikuliImageAction.scala

@@ -24,6 +24,8 @@ class WaitForSikuliImageAction(val d: FirefoxDriver) extends IAction[SeReqWaitFo
     val desktop = new DesktopScreenRegion()
     val region  = desktop.wait(target, arg.timeoutMillis)
 
-    new SeResWaitForSikuliImage()
+    val isImageFound = region != null
+
+    new SeResWaitForSikuliImage(isImageFound)
   }
 }

code/project/Settings.scala

@@ -57,7 +57,7 @@ object Default {
       //, "-Yinline"
       //, "-Yinline-warnings"
       , "-Xmax-classfile-name", "72"
-      , "-Yrepl-sync"
+      , "-Yrepl-sync" 
       , "-Xlint"
       , "-Xverify"
       , "-Ywarn-all"
@@ -74,7 +74,7 @@ object Default {
     Seq(
       name         := Name,
       organization := "net.selenate",
-      version      := "0.2.16",
+      version      := "0.2.17",
       scalaVersion := "2.10.2",
       unmanagedSourceDirectories in Test := Nil
   )