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

[Matti Katila]

CVSROOT:        /cvsroot/libvob
Module name:    libvob
Branch:         
Changes by:     Matti Katila <address@hidden>   03/08/06 05:51:30

Modified files:
        org/nongnu/libvob/mouse: MouseClickListener.java 
                                 MouseMultiplexer.java 

Log message:
        fix buggy interface and remove copied code

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

Patches:
Index: libvob/org/nongnu/libvob/mouse/MouseClickListener.java
diff -u libvob/org/nongnu/libvob/mouse/MouseClickListener.java:1.1 
libvob/org/nongnu/libvob/mouse/MouseClickListener.java:1.2
--- libvob/org/nongnu/libvob/mouse/MouseClickListener.java:1.1  Tue Aug  5 
14:07:18 2003
+++ libvob/org/nongnu/libvob/mouse/MouseClickListener.java      Wed Aug  6 
05:51:30 2003
@@ -7,6 +7,6 @@
     /** The mouse was clicked.
      * @param x,y The coordinates.
      */
-    MouseDragListener clicked(int x, int y);
+    void clicked(int x, int y);
 }
 
Index: libvob/org/nongnu/libvob/mouse/MouseMultiplexer.java
diff -u libvob/org/nongnu/libvob/mouse/MouseMultiplexer.java:1.4 
libvob/org/nongnu/libvob/mouse/MouseMultiplexer.java:1.5
--- libvob/org/nongnu/libvob/mouse/MouseMultiplexer.java:1.4    Wed Aug  6 
05:30:09 2003
+++ libvob/org/nongnu/libvob/mouse/MouseMultiplexer.java        Wed Aug  6 
05:51:30 2003
@@ -5,7 +5,6 @@
 import org.nongnu.libvob.VobMouseEvent;
 import org.nongnu.libvob.input.RelativeAxisListener;
 
-
 /** A class to send mouse events to the listeners that want them.
  */
 public class MouseMultiplexer {
@@ -20,23 +19,18 @@
      */
     public final static int MAXBUTTON = 4;
 
-    /** The modifier mask for shift.
-     */
-    public final static int SHIFT_MASK = 1;
-    /** The modifier mask for control.
-     */
-    public final static int CONTROL_MASK = 2;
-    /** The modifier mask for alt.
+    /** A constant that is all modifier masks ored together.
      */
-    public final static int ALT_MASK = 4;
+    private final static int ALLMASK;
+    static {
+       VobMouseEvent e = null;
+       ALLMASK = e.SHIFT_MASK + e.CONTROL_MASK + e.ALT_MASK;
+    }
 
     /** The maximum modifier mask plus one.
      */
-    public final static int MAXMASK = 8;
+    public final static int MAXMASK = ALLMASK + 1;
 
-    /** A constant that is all modifier masks ored together.
-     */
-    private final static int ALLMASK = 7;
 
     //-- Internal data structures