#6605 Make Button.fireClick(MouseEventDetails) protected and add related null checks...

svn changeset:19153/svn branch:6.6

diff --git a/WebContent/release-notes.html b/WebContent/release-notes.html
index e7ddc6e8de341ac118a1ffd5ddf2f3c5fea62692..43b353f39150c1ba3c9626099348442da00d5244 100644 (file)
--- a/WebContent/release-notes.html
+++ b/WebContent/release-notes.html
@@ -72,6 +72,7 @@ contains a number of significant enhancements.</p>
   <li>Renamed <tt>horizontal/verticalDropLocation()</tt> to <tt>getHorizontal/VerticalDropLocation()</tt> in <b>WrapperTargetDetails</b> (<a href="http://dev.vaadin.com/ticket/6823">#6823</a>)</li>
   <!--  li>Support lazy loading properly in <b>ComboBox</b> (<a href="http://dev.vaadin.com/ticket/4233">#4233</a>)</li>  -->
   <li><tt>CheckBox</tt> now supports null values, displayed as false (<a href="http://dev.vaadin.com/ticket/6918">#6918</a>)</li>
+  <li>The method <tt>Button.fireClick(MouseEventDetails)</tt> is used by Button instead of <tt>Button.fireClick()</tt>. Subclasses should override the former and not the latter.</li>
 </ul>
 
 <p>In the client-side API:</p>

diff --git a/src/com/vaadin/ui/Button.java b/src/com/vaadin/ui/Button.java
index c64cd386ce687480efdb050402c0cab70e7ffb6a..a6df6df56bf2c3ad049d089796abada250ecd7f4 100644 (file)
--- a/src/com/vaadin/ui/Button.java
+++ b/src/com/vaadin/ui/Button.java
@@ -298,7 +298,7 @@ public class Button extends AbstractField implements FieldEvents.BlurNotifier,
      */
     public class ClickEvent extends Component.Event {
 
-        private MouseEventDetails details;
+        private final MouseEventDetails details;
 
         /**
          * New instance of text change event.
@@ -308,6 +308,7 @@ public class Button extends AbstractField implements FieldEvents.BlurNotifier,
          */
         public ClickEvent(Component source) {
             super(source);
+            details = null;
         }
 
         /**
@@ -336,20 +337,28 @@ public class Button extends AbstractField implements FieldEvents.BlurNotifier,
          * Returns the mouse position (x coordinate) when the click took place.
          * The position is relative to the browser client area.
          * 
-         * @return The mouse cursor x position
+         * @return The mouse cursor x position or -1 if unknown
          */
         public int getClientX() {
-            return details.getClientX();
+            if (null != details) {
+                return details.getClientX();
+            } else {
+                return -1;
+            }
         }
 
         /**
          * Returns the mouse position (y coordinate) when the click took place.
          * The position is relative to the browser client area.
          * 
-         * @return The mouse cursor y position
+         * @return The mouse cursor y position or -1 if unknown
          */
         public int getClientY() {
-            return details.getClientY();
+            if (null != details) {
+                return details.getClientY();
+            } else {
+                return -1;
+            }
         }
 
         /**
@@ -360,7 +369,11 @@ public class Button extends AbstractField implements FieldEvents.BlurNotifier,
          *         component or -1 if no x coordinate available
          */
         public int getRelativeX() {
-            return details.getRelativeX();
+            if (null != details) {
+                return details.getRelativeX();
+            } else {
+                return -1;
+            }
         }
 
         /**
@@ -371,46 +384,67 @@ public class Button extends AbstractField implements FieldEvents.BlurNotifier,
          *         component or -1 if no y coordinate available
          */
         public int getRelativeY() {
-            return details.getRelativeY();
+            if (null != details) {
+                return details.getRelativeY();
+            } else {
+                return -1;
+            }
         }
 
         /**
          * Checks if the Alt key was down when the mouse event took place.
          * 
          * @return true if Alt was down when the event occured, false otherwise
+         *         or if unknown
          */
         public boolean isAltKey() {
-            return details.isAltKey();
+            if (null != details) {
+                return details.isAltKey();
+            } else {
+                return false;
+            }
         }
 
         /**
          * Checks if the Ctrl key was down when the mouse event took place.
          * 
          * @return true if Ctrl was pressed when the event occured, false
-         *         otherwise
+         *         otherwise or if unknown
          */
         public boolean isCtrlKey() {
-            return details.isCtrlKey();
+            if (null != details) {
+                return details.isCtrlKey();
+            } else {
+                return false;
+            }
         }
 
         /**
          * Checks if the Meta key was down when the mouse event took place.
          * 
          * @return true if Meta was pressed when the event occured, false
-         *         otherwise
+         *         otherwise or if unknown
          */
         public boolean isMetaKey() {
-            return details.isMetaKey();
+            if (null != details) {
+                return details.isMetaKey();
+            } else {
+                return false;
+            }
         }
 
         /**
          * Checks if the Shift key was down when the mouse event took place.
          * 
          * @return true if Shift was pressed when the event occured, false
-         *         otherwise
+         *         otherwise or if unknown
          */
         public boolean isShiftKey() {
-            return details.isShiftKey();
+            if (null != details) {
+                return details.isShiftKey();
+            } else {
+                return false;
+            }
         }
     }
 
@@ -457,13 +491,25 @@ public class Button extends AbstractField implements FieldEvents.BlurNotifier,
     }
 
     /**
-     * Emits the options change event.
+     * Fires a click event to all listeners without any event details.
+     * 
+     * In subclasses, override {@link #fireClick(MouseEventDetails)} instead of
+     * this method.
      */
     protected void fireClick() {
         fireEvent(new Button.ClickEvent(this));
     }
 
-    private void fireClick(MouseEventDetails details) {
+    /**
+     * Fires a click event to all listeners.
+     * 
+     * @param details
+     *            MouseEventDetails from which keyboard modifiers and other
+     *            information about the mouse click can be obtained. If the
+     *            button was clicked by a keyboard event, some of the fields may
+     *            be empty/undefined.
+     */
+    protected void fireClick(MouseEventDetails details) {
         fireEvent(new Button.ClickEvent(this, details));
     }