This is an automated email from the git hooks/post-receive script. pini pushed a commit to tag upstream/1.1.0_beta1 in repository sikuli.
commit 323e950bb5673d54bb693e37230f525d52c46c83 Author: Raimund Hocke <[email protected]> Date: Tue Feb 11 20:25:10 2014 +0100 minor --- API/src/main/java/org/sikuli/script/Region.java | 4 ++-- Basics/src/main/resources/Lib/sikuli/Region.py | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/API/src/main/java/org/sikuli/script/Region.java b/API/src/main/java/org/sikuli/script/Region.java index b9fe8b1..1b88609 100755 --- a/API/src/main/java/org/sikuli/script/Region.java +++ b/API/src/main/java/org/sikuli/script/Region.java @@ -2498,9 +2498,9 @@ public class Region { return name; } - public String onChange(SikuliEventObserver observer) { + public String onChange(Object observer) { String name = Observer.add(this, (ObserverCallBack) observer, SikuliEvent.Type.CHANGE); - getEventManager().addChangeObserver(Settings.ObserveMinChangedPixels, observer, name); + getEventManager().addChangeObserver(Settings.ObserveMinChangedPixels, (SikuliEventObserver) observer, name); return name; } diff --git a/Basics/src/main/resources/Lib/sikuli/Region.py b/Basics/src/main/resources/Lib/sikuli/Region.py index 2479762..95c76fa 100755 --- a/Basics/src/main/resources/Lib/sikuli/Region.py +++ b/Basics/src/main/resources/Lib/sikuli/Region.py @@ -4,7 +4,7 @@ from org.sikuli.basics import Debug from org.sikuli.script import Region as JRegion -from org.sikuli.script import SikuliEventAdapter +from org.sikuli.script import ObserverCallBack from org.sikuli.script.Constants import * import sys import inspect @@ -63,19 +63,18 @@ class Region(JRegion): # observe(): Special setup for Jython def onAppear(self, target, handler): - class AnonyObserver(SikuliEventAdapter): + class AnonyObserver(ObserverCallBack): def targetAppeared(self, event): handler(event) return JRegion.onAppear(self, target, AnonyObserver()) def onVanish(self, target, handler): - class AnonyObserver(SikuliEventAdapter): + class AnonyObserver(ObserverCallBack): def targetVanished(self, event): handler(event) return JRegion.onVanish(self, target, AnonyObserver()) def onChange(self, arg1, arg2=None): - if isinstance(arg1, int): min_size = arg1 handler = arg2 @@ -85,12 +84,13 @@ class Region(JRegion): min_size = None handler = arg1 - class AnonyObserver(SikuliEventAdapter): + class AnonyObserver(ObserverCallBack): def targetChanged(self, event): handler(event) if min_size != None: return JRegion.onChange(self, min_size, AnonyObserver()) + print "**** going to JRegion onChange()" return JRegion.onChange(self, AnonyObserver()) def observe(self, time=FOREVER, background=False): -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/sikuli.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
