You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2014/08/27 11:41:05 UTC
[1/4] git commit: Add a hashCode() impl next to the #equals()
Repository: wicket
Updated Branches:
refs/heads/master 87d2b3e92 -> 6f46632ae
Add a hashCode() impl next to the #equals()
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/c5db2986
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/c5db2986
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/c5db2986
Branch: refs/heads/master
Commit: c5db298616d287837f2a26cb1cabe2d6af84fb7f
Parents: 87d2b3e
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed Aug 27 12:19:10 2014 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Aug 27 12:19:10 2014 +0300
----------------------------------------------------------------------
.../java/org/apache/wicket/markup/head/MetaDataHeaderItem.java | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/c5db2986/wicket-core/src/main/java/org/apache/wicket/markup/head/MetaDataHeaderItem.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/head/MetaDataHeaderItem.java b/wicket-core/src/main/java/org/apache/wicket/markup/head/MetaDataHeaderItem.java
index dee9e9d..e45666a 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/head/MetaDataHeaderItem.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/head/MetaDataHeaderItem.java
@@ -197,4 +197,10 @@ public class MetaDataHeaderItem extends HeaderItem
{
return obj instanceof MetaDataHeaderItem && ((MetaDataHeaderItem) obj).generateString().equals(generateString());
}
+
+ @Override
+ public int hashCode()
+ {
+ return generateString().hashCode();
+ }
}
[2/4] git commit: Do not catch Throwable but Exception
Posted by mg...@apache.org.
Do not catch Throwable but Exception
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/69eed82d
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/69eed82d
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/69eed82d
Branch: refs/heads/master
Commit: 69eed82db533f7de8b70c4a2ed808716941c3303
Parents: c5db298
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed Aug 27 12:22:28 2014 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Aug 27 12:22:28 2014 +0300
----------------------------------------------------------------------
wicket-core/src/main/java/org/apache/wicket/Component.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/69eed82d/wicket-core/src/main/java/org/apache/wicket/Component.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/Component.java b/wicket-core/src/main/java/org/apache/wicket/Component.java
index 0d0f406..a47d728 100644
--- a/wicket-core/src/main/java/org/apache/wicket/Component.java
+++ b/wicket-core/src/main/java/org/apache/wicket/Component.java
@@ -2398,7 +2398,7 @@ public abstract class Component
{
behavior.onException(this, ex);
}
- catch (Throwable ex2)
+ catch (Exception ex2)
{
log.error("Error while cleaning up after exception", ex2);
}
[3/4] git commit: Do not catch Throwable but Exception
Posted by mg...@apache.org.
Do not catch Throwable but Exception
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/90fdeb89
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/90fdeb89
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/90fdeb89
Branch: refs/heads/master
Commit: 90fdeb89497a1e102d71041efa6d2451dd54cb8f
Parents: 69eed82
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed Aug 27 12:24:30 2014 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Aug 27 12:24:30 2014 +0300
----------------------------------------------------------------------
wicket-util/src/main/java/org/apache/wicket/util/diff/Delta.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/90fdeb89/wicket-util/src/main/java/org/apache/wicket/util/diff/Delta.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/diff/Delta.java b/wicket-util/src/main/java/org/apache/wicket/util/diff/Delta.java
index f33f0b0..13526b0 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/diff/Delta.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/diff/Delta.java
@@ -94,7 +94,7 @@ public abstract class Delta extends ToString
DeltaClass[1][0] = DeleteDelta.class;
DeltaClass[1][1] = ChangeDelta.class;
}
- catch (Throwable ignored)
+ catch (Exception ignored)
{
}
}
@@ -117,7 +117,7 @@ public abstract class Delta extends ToString
{
result = (Delta)c.newInstance();
}
- catch (Throwable e)
+ catch (Exception e)
{
return null;
}
[4/4] git commit: Add hashCode() next to equals
Posted by mg...@apache.org.
Add hashCode() next to equals
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/6f46632a
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/6f46632a
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/6f46632a
Branch: refs/heads/master
Commit: 6f46632ae339a1c9c926720c4b5ddb7d98b07544
Parents: 90fdeb8
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed Aug 27 12:26:11 2014 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Aug 27 12:26:11 2014 +0300
----------------------------------------------------------------------
.../java/org/apache/wicket/examples/repeater/Contact.java | 10 ++++++++++
.../org/apache/wicket/examples/spring/common/Contact.java | 10 ++++++++++
2 files changed, 20 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/6f46632a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/Contact.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/Contact.java b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/Contact.java
index 0a53924..ded5f80 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/Contact.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/Contact.java
@@ -88,6 +88,16 @@ public class Contact implements IClusterable
}
}
+ @Override
+ public int hashCode()
+ {
+ int result = firstName.hashCode();
+ result = 31 * result + lastName.hashCode();
+ result = 31 * result + homePhone.hashCode();
+ result = 31 * result + cellPhone.hashCode();
+ return result;
+ }
+
/**
* @param id
*/
http://git-wip-us.apache.org/repos/asf/wicket/blob/6f46632a/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/Contact.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/Contact.java b/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/Contact.java
index e75af9a..6bedd3e 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/Contact.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/Contact.java
@@ -80,6 +80,16 @@ public class Contact implements IClusterable
}
}
+ @Override
+ public int hashCode()
+ {
+ int result = firstName.hashCode();
+ result = 31 * result + lastName.hashCode();
+ result = 31 * result + homePhone.hashCode();
+ result = 31 * result + cellPhone.hashCode();
+ return result;
+ }
+
/**
* @param id
*/