xlawrence 2005/07/07 14:40:59 CEST
Modified files:
core/src/java/org/jahia/content ObjectKey.java
ObjectKeyComparator.java
core/src/java/org/jahia/content/comparators
ContainerByContainerListComparator.java
ContainerListByPageComparator.java
ContainerRankingComparator.java
ObjectTypeDispatcherComparator.java
OrderedCompositeComparator.java
core/src/java/org/jahia/data/containers
JahiaContainerStructure.java
core/src/java/org/jahia/engines/validation
ValidationErrorSorter.java
core/src/java/org/jahia/engines/workflow WorkflowEngine.java
core/src/java/org/jahia/faces/model OrderedSelectItem.java
core/src/java/org/jahia/hibernate/model JahiaAccount.java
JahiaAcl.java
JahiaAclEntry.java
JahiaAclEntryPK.java
Log:
Cleanup and improvement (perf) of the 'equals' method implementation. Got rid
of all the unecessary calls to 'instanceof'...
Revision Changes Path
1.2 +13 -15 jahia/core/src/java/org/jahia/content/ObjectKey.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/content/ObjectKey.java.diff?r1=1.1&r2=1.2&f=h
1.3 +5 -4
jahia/core/src/java/org/jahia/content/ObjectKeyComparator.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/content/ObjectKeyComparator.java.diff?r1=1.2&r2=1.3&f=h
1.2 +5 -5
jahia/core/src/java/org/jahia/content/comparators/ContainerByContainerListComparator.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/content/comparators/ContainerByContainerListComparator.java.diff?r1=1.1&r2=1.2&f=h
1.2 +4 -4
jahia/core/src/java/org/jahia/content/comparators/ContainerListByPageComparator.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/content/comparators/ContainerListByPageComparator.java.diff?r1=1.1&r2=1.2&f=h
1.4 +5 -5
jahia/core/src/java/org/jahia/content/comparators/ContainerRankingComparator.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/content/comparators/ContainerRankingComparator.java.diff?r1=1.3&r2=1.4&f=h
1.2 +6 -5
jahia/core/src/java/org/jahia/content/comparators/ObjectTypeDispatcherComparator.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/content/comparators/ObjectTypeDispatcherComparator.java.diff?r1=1.1&r2=1.2&f=h
1.2 +5 -4
jahia/core/src/java/org/jahia/content/comparators/OrderedCompositeComparator.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/content/comparators/OrderedCompositeComparator.java.diff?r1=1.1&r2=1.2&f=h
1.4 +12 -8
jahia/core/src/java/org/jahia/data/containers/JahiaContainerStructure.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/data/containers/JahiaContainerStructure.java.diff?r1=1.3&r2=1.4&f=h
1.2 +6 -1
jahia/core/src/java/org/jahia/engines/validation/ValidationErrorSorter.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/engines/validation/ValidationErrorSorter.java.diff?r1=1.1&r2=1.2&f=h
1.14 +8 -5
jahia/core/src/java/org/jahia/engines/workflow/WorkflowEngine.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/engines/workflow/WorkflowEngine.java.diff?r1=1.13&r2=1.14&f=h
1.2 +9 -4
jahia/core/src/java/org/jahia/faces/model/OrderedSelectItem.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/faces/model/OrderedSelectItem.java.diff?r1=1.1&r2=1.2&f=h
1.3 +8 -4
jahia/core/src/java/org/jahia/hibernate/model/JahiaAccount.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/hibernate/model/JahiaAccount.java.diff?r1=1.2&r2=1.3&f=h
1.4 +8 -4
jahia/core/src/java/org/jahia/hibernate/model/JahiaAcl.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/hibernate/model/JahiaAcl.java.diff?r1=1.3&r2=1.4&f=h
1.3 +8 -4
jahia/core/src/java/org/jahia/hibernate/model/JahiaAclEntry.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/hibernate/model/JahiaAclEntry.java.diff?r1=1.2&r2=1.3&f=h
1.3 +8 -4
jahia/core/src/java/org/jahia/hibernate/model/JahiaAclEntryPK.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/hibernate/model/JahiaAclEntryPK.java.diff?r1=1.2&r2=1.3&f=h
Index: ObjectKey.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/content/ObjectKey.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ObjectKey.java 30 Mar 2004 14:10:23 -0000 1.1
+++ ObjectKey.java 7 Jul 2005 12:40:57 -0000 1.2
@@ -65,20 +65,22 @@
ObjectKeyInterface,
Serializable, Comparable {
- private static org.apache.log4j.Logger logger =
+ private static final org.apache.log4j.Logger logger =
org.apache.log4j.Logger.getLogger(ObjectKey.class);
private static Map keyTypeClassNames = new HashMap();
-
- protected String key;
+
public static final String OBJECT_TYPE = "object";
+
+ protected final String key;
private String type = OBJECT_TYPE;
private String IDInType;
/**
- * Making default constructor private
+ * Making default constructor private, should not be used
*/
private ObjectKey() {
+ this.key = null;
}
/**
@@ -207,18 +209,14 @@
* @return true if the object is an instance of the ObjectKey class and
* the value of the key is the same, false otherwise.
*/
- public boolean equals(Object obj) {
- // JahiaConsole.println("ObjectKey.equals", "Starting...");
- if (obj instanceof ObjectKey) {
- ObjectKey destObj = (ObjectKey) obj;
- if (this.key.equals(destObj.getKey())) {
- return true;
- } else {
- return false;
- }
- } else {
- return false;
+ public boolean equals(Object obj) {
+ if (this == obj) return true;
+
+ if (obj != null && this.getClass() == obj.getClass()) {
+ final ObjectKey destObj = (ObjectKey) obj;
+ return this.getKey().equals(destObj.getKey());
}
+ return false;
}
/**
Index: ObjectKeyComparator.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/content/ObjectKeyComparator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ObjectKeyComparator.java 12 Nov 2004 16:08:17 -0000 1.2
+++ ObjectKeyComparator.java 7 Jul 2005 12:40:57 -0000 1.3
@@ -37,11 +37,12 @@
* same order as this one, so we simply test if it is an instance of this
* comparator class...
*/
- public boolean equals(Object obj) {
- if (obj instanceof ObjectKeyComparator) {
+ public boolean equals(Object obj) {
+ if (this == obj) return true;
+
+ if (obj != null && this.getClass() == obj.getClass()) {
return true;
- } else {
- return false;
}
+ return false;
}
}
Index: ContainerByContainerListComparator.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/content/comparators/ContainerByContainerListComparator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ContainerByContainerListComparator.java 30 Mar 2004 14:10:23 -0000
1.1
+++ ContainerByContainerListComparator.java 7 Jul 2005 12:40:57 -0000
1.2
@@ -24,12 +24,12 @@
return new
Integer(leftContainer.getParentContainerListID()).compareTo(new
Integer(rightContainer.getParentContainerListID()));
}
- public boolean equals(Object obj) {
- if (obj instanceof ContainerByContainerListComparator) {
+ public boolean equals(Object obj) {
+ if (this == obj) return true;
+
+ if (obj != null && this.getClass() == obj.getClass()) {
return true;
- } else {
- return false;
}
+ return false;
}
-
}
\ No newline at end of file
Index: ContainerListByPageComparator.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/content/comparators/ContainerListByPageComparator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ContainerListByPageComparator.java 30 Mar 2004 14:10:23 -0000
1.1
+++ ContainerListByPageComparator.java 7 Jul 2005 12:40:57 -0000
1.2
@@ -24,11 +24,11 @@
}
public boolean equals(Object obj) {
- if (obj instanceof ContainerListByPageComparator) {
+ if (this == obj) return true;
+
+ if (obj != null && this.getClass() == obj.getClass()) {
return true;
- } else {
- return false;
}
+ return false;
}
-
}
\ No newline at end of file
Index: ContainerRankingComparator.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/content/comparators/ContainerRankingComparator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ContainerRankingComparator.java 5 Jul 2005 15:45:58 -0000 1.3
+++ ContainerRankingComparator.java 7 Jul 2005 12:40:57 -0000 1.4
@@ -52,11 +52,11 @@
}
public boolean equals(Object obj) {
- if (obj instanceof ContainerRankingComparator) {
+ if (this == obj) return true;
+
+ if (obj != null && this.getClass() == obj.getClass()) {
return true;
- } else {
- return false;
- }
+ }
+ return false;
}
-
}
\ No newline at end of file
Index: ObjectTypeDispatcherComparator.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/content/comparators/ObjectTypeDispatcherComparator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ObjectTypeDispatcherComparator.java 30 Mar 2004 14:10:23 -0000
1.1
+++ ObjectTypeDispatcherComparator.java 7 Jul 2005 12:40:57 -0000
1.2
@@ -60,14 +60,15 @@
}
}
- public boolean equals(Object obj) {
- if (obj instanceof ObjectTypeDispatcherComparator) {
- ObjectTypeDispatcherComparator otherComparator = (
+ public boolean equals(Object obj) {
+ if (this == obj) return true;
+
+ if (obj != null && this.getClass() == obj.getClass()) {
+ final ObjectTypeDispatcherComparator otherComparator = (
ObjectTypeDispatcherComparator) obj;
return otherComparator.typeComparators.equals(typeComparators);
- } else {
- return false;
}
+ return false;
}
}
\ No newline at end of file
Index: OrderedCompositeComparator.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/content/comparators/OrderedCompositeComparator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- OrderedCompositeComparator.java 30 Mar 2004 14:10:23 -0000 1.1
+++ OrderedCompositeComparator.java 7 Jul 2005 12:40:57 -0000 1.2
@@ -54,12 +54,13 @@
}
public boolean equals(Object obj) {
- if (obj instanceof OrderedCompositeComparator) {
- OrderedCompositeComparator otherComparator =
(OrderedCompositeComparator) obj;
+ if (this == obj) return true;
+
+ if (obj != null && this.getClass() == obj.getClass()) {
+ final OrderedCompositeComparator otherComparator =
(OrderedCompositeComparator) obj;
return
orderedComparators.equals(otherComparator.orderedComparators);
- } else {
- return false;
}
+ return false;
}
}
\ No newline at end of file
Index: JahiaContainerStructure.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/data/containers/JahiaContainerStructure.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JahiaContainerStructure.java 28 Jul 2004 17:36:15 -0000 1.3
+++ JahiaContainerStructure.java 7 Jul 2005 12:40:58 -0000 1.4
@@ -167,15 +167,19 @@
* equals
*
*/
- public boolean equals (JahiaContainerStructure theStruct) {
- if ( (theStruct.getSubctndefid() == this.getSubctndefid()) &&
- (theStruct.getObjectType() == this.getObjectType()) &&
- (theStruct.getObjectDefID() == this.getObjectDefID()) &&
- (theStruct.getRank() == this.getRank())) {
- return true;
- } else {
- return false;
+ public boolean equals(Object obj) {
+ if (this == obj) return true;
+
+ if (obj != null && this.getClass() == obj.getClass()) {
+ final JahiaContainerStructure theStruct =
(JahiaContainerStructure)obj;
+ if ((theStruct.getSubctndefid() == this.getSubctndefid()) &&
+ (theStruct.getObjectType() == this.getObjectType()) &&
+ (theStruct.getObjectDefID() == this.getObjectDefID()) &&
+ (theStruct.getRank() == this.getRank())) {
+ return true;
+ }
}
+ return false;
} // end equals
} // end JahiaContainerStructure
Index: ValidationErrorSorter.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/engines/validation/ValidationErrorSorter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ValidationErrorSorter.java 18 May 2005 12:18:56 -0000 1.1
+++ ValidationErrorSorter.java 7 Jul 2005 12:40:58 -0000 1.2
@@ -111,6 +111,11 @@
}
public boolean equals(Object obj) {
- return obj instanceof ValidationErrorSorter ? true : false;
+ if (this == obj) return true;
+
+ if (obj != null && this.getClass() == obj.getClass()) {
+ return true;
+ }
+ return false;
}
}
Index: WorkflowEngine.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/engines/workflow/WorkflowEngine.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- WorkflowEngine.java 5 Jul 2005 15:46:17 -0000 1.13
+++ WorkflowEngine.java 7 Jul 2005 12:40:58 -0000 1.14
@@ -1041,12 +1041,15 @@
return result.toString();
}
- public boolean equals (Object o) {
- if (!(o instanceof PageNotifData)) {
- return false;
+ public boolean equals (Object obj) {
+ if (this == obj) return true;
+
+ if (obj != null && this.getClass() == obj.getClass()) {
+ final PageNotifData right = (PageNotifData) obj;
+ return ((pageURL.equals (right.pageURL)) &&
+ (pageComment.equals (right.pageComment)));
}
- PageNotifData right = (PageNotifData) o;
- return ((pageURL.equals (right.pageURL)) && (pageComment.equals
(right.pageComment)));
+ return false;
}
public int hashCode () {
Index: OrderedSelectItem.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/faces/model/OrderedSelectItem.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- OrderedSelectItem.java 28 Jul 2004 11:53:24 -0000 1.1
+++ OrderedSelectItem.java 7 Jul 2005 12:40:58 -0000 1.2
@@ -90,10 +90,15 @@
}
public boolean equals(Object obj){
- OrderedSelectItem s = (OrderedSelectItem)obj;
- if ( s == null ){
- return false;
+ if (this == obj) return true;
+
+ if (obj != null && this.getClass() == obj.getClass()) {
+ final OrderedSelectItem s = (OrderedSelectItem)obj;
+ if ( s == null ){
+ return false;
+ }
+ return this.getValue().equals(s.getValue());
}
- return ( this.getValue().equals(s.getValue()));
+ return false;
}
}
Index: JahiaAccount.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/hibernate/model/JahiaAccount.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JahiaAccount.java 22 Jun 2005 12:37:33 -0000 1.2
+++ JahiaAccount.java 7 Jul 2005 12:40:59 -0000 1.3
@@ -184,12 +184,16 @@
.toString();
}
- public boolean equals(Object other) {
- if (!(other instanceof JahiaAccount)) return false;
- JahiaAccount castOther = (JahiaAccount) other;
- return new EqualsBuilder()
+ public boolean equals(Object obj) {
+ if (this == obj) return true;
+
+ if (obj != null && this.getClass() == obj.getClass()) {
+ final JahiaAccount castOther = (JahiaAccount) obj;
+ return new EqualsBuilder()
.append(this.getIdJahiaAccounts(),
castOther.getIdJahiaAccounts())
.isEquals();
+ }
+ return false;
}
public int hashCode() {
Index: JahiaAcl.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/hibernate/model/JahiaAcl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JahiaAcl.java 4 Jul 2005 15:17:57 -0000 1.3
+++ JahiaAcl.java 7 Jul 2005 12:40:59 -0000 1.4
@@ -261,12 +261,16 @@
return acl;
}
- public boolean equals(Object other) {
- if (!(other instanceof JahiaAcl)) return false;
- JahiaAcl castOther = (JahiaAcl) other;
- return new EqualsBuilder()
+ public boolean equals(Object obj) {
+ if (this == obj) return true;
+
+ if (obj != null && this.getClass() == obj.getClass()) {
+ final JahiaAcl castOther = (JahiaAcl) obj;
+ return new EqualsBuilder()
.append(this.getId(), castOther.getId())
.isEquals();
+ }
+ return false;
}
public int hashCode() {
Index: JahiaAclEntry.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/hibernate/model/JahiaAclEntry.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JahiaAclEntry.java 22 Jun 2005 12:37:33 -0000 1.2
+++ JahiaAclEntry.java 7 Jul 2005 12:40:59 -0000 1.3
@@ -153,12 +153,16 @@
.toString();
}
- public boolean equals(Object other) {
- if (!(other instanceof JahiaAclEntry)) return false;
- JahiaAclEntry castOther = (JahiaAclEntry) other;
- return new EqualsBuilder()
+ public boolean equals(Object obj) {
+ if (this == obj) return true;
+
+ if (obj != null && this.getClass() == obj.getClass()) {
+ final JahiaAclEntry castOther = (JahiaAclEntry) obj;
+ return new EqualsBuilder()
.append(this.getComp_id(), castOther.getComp_id())
.isEquals();
+ }
+ return false;
}
public int hashCode() {
Index: JahiaAclEntryPK.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/hibernate/model/JahiaAclEntryPK.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JahiaAclEntryPK.java 22 Jun 2005 12:37:33 -0000 1.2
+++ JahiaAclEntryPK.java 7 Jul 2005 12:40:59 -0000 1.3
@@ -87,14 +87,18 @@
.toString();
}
- public boolean equals(Object other) {
- if (!(other instanceof JahiaAclEntryPK)) return false;
- JahiaAclEntryPK castOther = (JahiaAclEntryPK) other;
- return new EqualsBuilder()
+ public boolean equals(Object obj) {
+ if (this == obj) return true;
+
+ if (obj != null && this.getClass() == obj.getClass()) {
+ final JahiaAclEntryPK castOther = (JahiaAclEntryPK) obj;
+ return new EqualsBuilder()
.append(this.getId(), castOther.getId())
.append(this.getType(), castOther.getType())
.append(this.getTarget(), castOther.getTarget())
.isEquals();
+ }
+ return false;
}
public int hashCode() {
