diff options
5 files changed, 52 insertions, 5 deletions
diff --git a/client/src/main/java/com/vaadin/client/WidgetUtil.java b/client/src/main/java/com/vaadin/client/WidgetUtil.java index c9e49f13c0..3390881b72 100644 --- a/client/src/main/java/com/vaadin/client/WidgetUtil.java +++ b/client/src/main/java/com/vaadin/client/WidgetUtil.java @@ -1565,6 +1565,15 @@ public class WidgetUtil { return false; } + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + (int) value; + result = prime * result + ((unit == null) ? 0 : unit.hashCode()); + return result; + } + /** * Check whether the two sizes are equals. * diff --git a/client/src/main/java/com/vaadin/client/ui/VComboBox.java b/client/src/main/java/com/vaadin/client/ui/VComboBox.java index 93ac755ee1..ebb993702c 100644 --- a/client/src/main/java/com/vaadin/client/ui/VComboBox.java +++ b/client/src/main/java/com/vaadin/client/ui/VComboBox.java @@ -229,6 +229,18 @@ public class VComboBox extends Composite implements Field, KeyDownHandler, } return true; } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + VComboBox.this.hashCode(); + result = prime * result + ((key == null) ? 0 : key.hashCode()); + result = prime * result + ((caption == null) ? 0 : caption.hashCode()); + result = prime * result + ((untranslatedIconUri == null) ? 0 : untranslatedIconUri.hashCode()); + result = prime * result + ((style == null) ? 0 : style.hashCode()); + return result; + } } /** An inner class that handles all logic related to mouse wheel. */ diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VFilterSelect.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VFilterSelect.java index 0daaff47f9..64cc713e20 100644 --- a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VFilterSelect.java +++ b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VFilterSelect.java @@ -227,6 +227,18 @@ public class VFilterSelect extends Composite } return true; } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + VFilterSelect.this.hashCode(); + result = prime * result + ((key == null) ? 0 : key.hashCode()); + result = prime * result + ((caption == null) ? 0 : caption.hashCode()); + result = prime * result + ((untranslatedIconUri == null) ? 0 : untranslatedIconUri.hashCode()); + result = prime * result + ((style == null) ? 0 : style.hashCode()); + return result; + } } /** An inner class that handles all logic related to mouse wheel. */ diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VScrollTable.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VScrollTable.java index 38bb1943cf..2e20abe4a0 100644 --- a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VScrollTable.java +++ b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VScrollTable.java @@ -7499,10 +7499,15 @@ public class VScrollTable extends FlowPanel return false; } - // - // public int hashCode() { - // return overkey; - // } + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((dropLocation == null) ? 0 : dropLocation.hashCode()); + result = prime * result + overkey; + result = prime * result + ((colkey == null) ? 0 : colkey.hashCode()); + return result; + } } public class VScrollTableDropHandler extends VAbstractDropHandler { diff --git a/shared/src/main/java/com/vaadin/shared/communication/MethodInvocation.java b/shared/src/main/java/com/vaadin/shared/communication/MethodInvocation.java index c60e711106..9542a04e84 100644 --- a/shared/src/main/java/com/vaadin/shared/communication/MethodInvocation.java +++ b/shared/src/main/java/com/vaadin/shared/communication/MethodInvocation.java @@ -108,8 +108,17 @@ public class MethodInvocation implements Serializable { if (!SharedUtil.equals(getParameters(), other.getParameters())) { return false; } - return true; + } + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((connectorId == null) ? 0 : connectorId.hashCode()); + result = prime * result + ((interfaceName == null) ? 0 : interfaceName.hashCode()); + result = prime * result + ((methodName == null) ? 0 : methodName.hashCode()); + result = prime * result + Arrays.hashCode(parameters); + return result; } } |