[Gzz-commits] libvob org/nongnu/libvob/mouse/MouseMultiplexer...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/libvob
Module name:    libvob
Branch:         
Changes by:     Tuomas J. Lukka <address@hidden>        03/08/06 05:30:10

Modified files:
        org/nongnu/libvob/mouse: MouseMultiplexer.java 
        test/vob/mouse : multiplex.py 

Log message:
        Failing test and fix

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/org/nongnu/libvob/mouse/MouseMultiplexer.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/test/vob/mouse/multiplex.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: libvob/org/nongnu/libvob/mouse/MouseMultiplexer.java
diff -u libvob/org/nongnu/libvob/mouse/MouseMultiplexer.java:1.3 
libvob/org/nongnu/libvob/mouse/MouseMultiplexer.java:1.4
--- libvob/org/nongnu/libvob/mouse/MouseMultiplexer.java:1.3    Wed Aug  6 
04:39:42 2003
+++ libvob/org/nongnu/libvob/mouse/MouseMultiplexer.java        Wed Aug  6 
05:30:09 2003
@@ -137,8 +137,9 @@
        if(e.getType() == e.MOUSE_PRESSED) {
            // Ignore second button while dragging
            if(currentDrag != null) return false;
-           currentDrag = mousePressListeners[(e.getModifiers() & ALLMASK) + 
MAXMASK * e.getButton()]
-                               .pressed(e.getX(), e.getY());
+           MousePressListener mpl = mousePressListeners[(e.getModifiers() & 
ALLMASK) + MAXMASK * e.getButton()];
+           if(mpl == null) return false;
+           currentDrag = mpl.pressed(e.getX(), e.getY());
            if(currentDrag != null) {
                currentDragButton = e.getButton();
                currentDrag.startDrag(e.getX(), e.getY());
Index: libvob/test/vob/mouse/multiplex.py
diff -u libvob/test/vob/mouse/multiplex.py:1.1 
libvob/test/vob/mouse/multiplex.py:1.2
--- libvob/test/vob/mouse/multiplex.py:1.1      Wed Aug  6 04:39:42 2003
+++ libvob/test/vob/mouse/multiplex.py  Wed Aug  6 05:30:10 2003
@@ -11,4 +11,7 @@
     mul.deliverEvent(vob.VobMouseEvent(
            vob.VobMouseEvent.MOUSE_RELEASED,
            0, 0, 0, 0, 0))
+    mul.deliverEvent(vob.VobMouseEvent(
+           vob.VobMouseEvent.MOUSE_PRESSED,
+           0, 0, 0, vob.VobMouseEvent.CONTROL_MASK, 1))