xlawrence 2005/07/08 11:03:07 CEST
Modified files:
core/src/java/org/jahia/hibernate/model JahiaAppDef.java
JahiaAppdefProp.java
core/src/java/org/jahia/services/lock LockKey.java
core/src/java/org/jahia/services/pages JahiaPageInfo.java
Log:
Cleanup and improvement (perf) of the 'equals' method implementation. Got rid
of all the unecessary calls to 'instanceof'...
Revision Changes Path
1.3 +8 -4
jahia/core/src/java/org/jahia/hibernate/model/JahiaAppDef.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/hibernate/model/JahiaAppDef.java.diff?r1=1.2&r2=1.3&f=h
1.3 +8 -4
jahia/core/src/java/org/jahia/hibernate/model/JahiaAppdefProp.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/hibernate/model/JahiaAppdefProp.java.diff?r1=1.2&r2=1.3&f=h
1.2 +8 -9 jahia/core/src/java/org/jahia/services/lock/LockKey.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/lock/LockKey.java.diff?r1=1.1&r2=1.2&f=h
1.4 +8 -6
jahia/core/src/java/org/jahia/services/pages/JahiaPageInfo.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/pages/JahiaPageInfo.java.diff?r1=1.3&r2=1.4&f=h
Index: JahiaAppDef.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/hibernate/model/JahiaAppDef.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JahiaAppDef.java 22 Jun 2005 12:37:34 -0000 1.2
+++ JahiaAppDef.java 8 Jul 2005 09:03:06 -0000 1.3
@@ -244,12 +244,16 @@
.toString();
}
- public boolean equals(Object other) {
- if (!(other instanceof JahiaAppDef)) return false;
- JahiaAppDef castOther = (JahiaAppDef) other;
- return new EqualsBuilder()
+ public boolean equals(Object obj) {
+ if (this == obj) return true;
+
+ if (obj != null && this.getClass() == obj.getClass()) {
+ final JahiaAppDef castOther = (JahiaAppDef) obj;
+ return new EqualsBuilder()
.append(this.getId(), castOther.getId())
.isEquals();
+ }
+ return false;
}
public int hashCode() {
Index: JahiaAppdefProp.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/hibernate/model/JahiaAppdefProp.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JahiaAppdefProp.java 22 Jun 2005 12:37:34 -0000 1.2
+++ JahiaAppdefProp.java 8 Jul 2005 09:03:06 -0000 1.3
@@ -72,12 +72,16 @@
.toString();
}
- public boolean equals(Object other) {
- if (!(other instanceof JahiaAppdefProp)) return false;
- JahiaAppdefProp castOther = (JahiaAppdefProp) other;
- return new EqualsBuilder()
+ public boolean equals(Object obj) {
+ if (this == obj) return true;
+
+ if (obj != null && this.getClass() == obj.getClass()) {
+ final JahiaAppdefProp castOther = (JahiaAppdefProp) obj;
+ return new EqualsBuilder()
.append(this.getComp_id(), castOther.getComp_id())
.isEquals();
+ }
+ return false;
}
public int hashCode() {
Index: LockKey.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/lock/LockKey.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LockKey.java 30 Mar 2004 14:13:15 -0000 1.1
+++ LockKey.java 8 Jul 2005 09:03:07 -0000 1.2
@@ -139,16 +139,15 @@
}
public boolean equals(Object obj) {
- if (this == obj) {
- return true;
+ if (this == obj) return true;
+
+ if (obj != null && this.getClass() == obj.getClass()) {
+ final LockKey lockKey = (LockKey)obj;
+ return lockKey.getAction().equals(this.action) &&
+ lockKey.getName().equals(this.name) &&
+ lockKey.getId() == this.id;
}
- if (!(obj instanceof LockKey)) {
- return false;
- }
- LockKey lockKey = (LockKey)obj;
- return lockKey.getAction().equals(this.action) &&
- lockKey.getName().equals(this.name) &&
- lockKey.getId() == this.id;
+ return false;
}
public int hashCode() {
Index: JahiaPageInfo.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/pages/JahiaPageInfo.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JahiaPageInfo.java 22 Jun 2005 12:33:17 -0000 1.3
+++ JahiaPageInfo.java 8 Jul 2005 09:03:07 -0000 1.4
@@ -1,4 +1,4 @@
-// $Id: JahiaPageInfo.java,v 1.3 2005/06/22 12:33:17 cmailleux Exp $
+// $Id: JahiaPageInfo.java,v 1.4 2005/07/08 09:03:07 xlawrence Exp $
//
//
// ____.
@@ -126,14 +126,16 @@
public boolean equals (Object obj) {
- if (!(obj instanceof JahiaPageInfo)) {
- return false;
- }
- JahiaPageInfo rightPageInfo = (JahiaPageInfo) obj;
- return ((getID () == rightPageInfo.getID ()) &&
+ if (this == obj) return true;
+
+ if (obj != null && this.getClass() == obj.getClass()) {
+ final JahiaPageInfo rightPageInfo = (JahiaPageInfo) obj;
+ return ((getID () == rightPageInfo.getID ()) &&
(getWorkflowState () == rightPageInfo.getWorkflowState ()) &&
(getVersionID () == rightPageInfo.getVersionID ()) &&
(getLanguageCode ().equals (rightPageInfo.getLanguageCode
())));
+ }
+ return false;
}
public int hashCode () {
