xlawrence 2005/05/03 17:22:52 CEST
Modified files:
calClient/src/java/org/jahia/suite/calendar/calServer
SyncEventID.java
src/java/org/jahia/suite/calendar/framework/message
GetCalendarRequest.java
GetCalendarRequestResponse.java
GetGUIDRequest.java
GetGUIDRequestResponse.java
UpdateCalendarRequest.java
UpdateCalendarRequestResponse.java
src/java/org/jahia/suite/calendar/framework/model
Calendar.java
GUID.java
SyncEvent.java
SyncOperation.java
Log:
Updated all 'equals' & 'toString' methods' implementation for maximum
performance
Revision Changes Path
1.4 +11 -9
uwcal_JSR168/calClient/src/java/org/jahia/suite/calendar/calServer/SyncEventID.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/calClient/src/java/org/jahia/suite/calendar/calServer/SyncEventID.java.diff?r1=1.3&r2=1.4&f=h
1.5 +13 -11
uwcal_JSR168/src/java/org/jahia/suite/calendar/framework/message/GetCalendarRequest.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/src/java/org/jahia/suite/calendar/framework/message/GetCalendarRequest.java.diff?r1=1.4&r2=1.5&f=h
1.6 +14 -11
uwcal_JSR168/src/java/org/jahia/suite/calendar/framework/message/GetCalendarRequestResponse.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/src/java/org/jahia/suite/calendar/framework/message/GetCalendarRequestResponse.java.diff?r1=1.5&r2=1.6&f=h
1.6 +12 -10
uwcal_JSR168/src/java/org/jahia/suite/calendar/framework/message/GetGUIDRequest.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/src/java/org/jahia/suite/calendar/framework/message/GetGUIDRequest.java.diff?r1=1.5&r2=1.6&f=h
1.6 +14 -11
uwcal_JSR168/src/java/org/jahia/suite/calendar/framework/message/GetGUIDRequestResponse.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/src/java/org/jahia/suite/calendar/framework/message/GetGUIDRequestResponse.java.diff?r1=1.5&r2=1.6&f=h
1.5 +15 -11
uwcal_JSR168/src/java/org/jahia/suite/calendar/framework/message/UpdateCalendarRequest.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/src/java/org/jahia/suite/calendar/framework/message/UpdateCalendarRequest.java.diff?r1=1.4&r2=1.5&f=h
1.6 +17 -14
uwcal_JSR168/src/java/org/jahia/suite/calendar/framework/message/UpdateCalendarRequestResponse.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/src/java/org/jahia/suite/calendar/framework/message/UpdateCalendarRequestResponse.java.diff?r1=1.5&r2=1.6&f=h
1.8 +5 -5
uwcal_JSR168/src/java/org/jahia/suite/calendar/framework/model/Calendar.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/src/java/org/jahia/suite/calendar/framework/model/Calendar.java.diff?r1=1.7&r2=1.8&f=h
1.5 +9 -8
uwcal_JSR168/src/java/org/jahia/suite/calendar/framework/model/GUID.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/src/java/org/jahia/suite/calendar/framework/model/GUID.java.diff?r1=1.4&r2=1.5&f=h
1.7 +18 -8
uwcal_JSR168/src/java/org/jahia/suite/calendar/framework/model/SyncEvent.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/src/java/org/jahia/suite/calendar/framework/model/SyncEvent.java.diff?r1=1.6&r2=1.7&f=h
1.4 +5 -5
uwcal_JSR168/src/java/org/jahia/suite/calendar/framework/model/SyncOperation.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/src/java/org/jahia/suite/calendar/framework/model/SyncOperation.java.diff?r1=1.3&r2=1.4&f=h
Index: SyncEventID.java
===================================================================
RCS file:
/home/cvs/repository/uwcal_JSR168/calClient/src/java/org/jahia/suite/calendar/calServer/SyncEventID.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SyncEventID.java 3 Feb 2005 10:52:34 -0000 1.3
+++ SyncEventID.java 3 May 2005 15:22:51 -0000 1.4
@@ -70,21 +70,23 @@
}
public boolean equals(Object o) {
- try {
- SyncEventID tmp = (SyncEventID)o;
+ if (this == o) return true;
+
+ if (o != null && this.getClass() == o.getClass()) {
+ SyncEventID tmp = (SyncEventID)o;
if (tmp.getCalendarID().equals(this.calendarID) &&
tmp.getEventID().equals(this.eventID))
return true;
- else {
- return false;
- }
-
- } catch (Throwable t) {
- return false;
}
+ return false;
}
public String toString() {
- return "SyncEventID: "+eventID+"-"+calendarID;
+ StringBuffer buffer = new StringBuffer();
+ buffer.append("SyncEventID: ");
+ buffer.append(eventID);
+ buffer.append("-");
+ buffer.append(calendarID);
+ return buffer.toString();
}
}
Index: GetCalendarRequest.java
===================================================================
RCS file:
/home/cvs/repository/uwcal_JSR168/src/java/org/jahia/suite/calendar/framework/message/GetCalendarRequest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- GetCalendarRequest.java 23 Nov 2004 10:30:17 -0000 1.4
+++ GetCalendarRequest.java 3 May 2005 15:22:51 -0000 1.5
@@ -151,21 +151,23 @@
public String toString() {
StringBuffer buff = new StringBuffer();
- buff.append(TYPE+": "+super.ID);
- buff.append(", "+super.content);
- buff.append(", "+super.props);
+ buff.append(TYPE);
+ buff.append(": ");
+ buff.append(super.ID);
+ buff.append(", ");
+ buff.append(super.content);
+ buff.append(", ");
+ buff.append(super.props);
return buff.toString();
}
public boolean equals(Object o) {
- try {
+ if (this == o) return true;
+
+ if (o != null && this.getClass() == o.getClass()) {
GetCalendarRequest temp = (GetCalendarRequest)o;
- if (super.ID.equals(temp.getID())) {
- return true;
- }
- return false;
- } catch (Throwable t) {
- return false;
+ return super.ID.equals(temp.getID());
}
- }
+ return false;
+ }
}
Index: GetCalendarRequestResponse.java
===================================================================
RCS file:
/home/cvs/repository/uwcal_JSR168/src/java/org/jahia/suite/calendar/framework/message/GetCalendarRequestResponse.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- GetCalendarRequestResponse.java 20 Dec 2004 16:31:16 -0000 1.5
+++ GetCalendarRequestResponse.java 3 May 2005 15:22:51 -0000 1.6
@@ -101,22 +101,25 @@
public String toString() {
StringBuffer buff = new StringBuffer();
- buff.append(TYPE+": "+ super.ID);
- buff.append(", Request: "+ super.reqID);
- buff.append(", "+ super.content);
- buff.append(", "+ super.props);
+ buff.append(TYPE);
+ buff.append(": ");
+ buff.append(super.ID);
+ buff.append(", Request: ");
+ buff.append( super.reqID);
+ buff.append(", ");
+ buff.append(super.content);
+ buff.append(", ");
+ buff.append(super.props);
return buff.toString();
}
public boolean equals(Object o) {
- try {
+ if (this == o) return true;
+
+ if (o != null && this.getClass() == o.getClass()) {
GetCalendarRequestResponse temp = (GetCalendarRequestResponse)o;
- if (super.ID.equals(temp.getID())) {
- return true;
- }
- return false;
- } catch (Throwable t) {
- return false;
+ return super.ID.equals(temp.getID());
}
+ return false;
}
}
Index: GetGUIDRequest.java
===================================================================
RCS file:
/home/cvs/repository/uwcal_JSR168/src/java/org/jahia/suite/calendar/framework/message/GetGUIDRequest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- GetGUIDRequest.java 12 Jan 2005 16:32:19 -0000 1.5
+++ GetGUIDRequest.java 3 May 2005 15:22:51 -0000 1.6
@@ -116,22 +116,24 @@
public String toString() {
StringBuffer buff = new StringBuffer();
- buff.append(TYPE+": "+super.ID);
- buff.append(", "+super.content);
- buff.append(", "+super.props);
+ buff.append(TYPE);
+ buff.append(": ");
+ buff.append(super.ID);
+ buff.append(", ");
+ buff.append(super.content);
+ buff.append(", ");
+ buff.append(super.props);
return buff.toString();
}
public boolean equals(Object o) {
- try {
+ if (this == o) return true;
+
+ if (o != null && this.getClass() == o.getClass()) {
GetGUIDRequest temp = (GetGUIDRequest)o;
- if (super.ID.equals(temp.getID())) {
- return true;
- }
- return false;
- } catch (Throwable t) {
- return false;
+ return super.ID.equals(temp.getID());
}
+ return false;
}
public String getCalendarID() {
Index: GetGUIDRequestResponse.java
===================================================================
RCS file:
/home/cvs/repository/uwcal_JSR168/src/java/org/jahia/suite/calendar/framework/message/GetGUIDRequestResponse.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- GetGUIDRequestResponse.java 20 Dec 2004 16:31:16 -0000 1.5
+++ GetGUIDRequestResponse.java 3 May 2005 15:22:51 -0000 1.6
@@ -109,22 +109,25 @@
public String toString() {
StringBuffer buff = new StringBuffer();
- buff.append(TYPE+": "+ super.ID);
- buff.append(", Request: "+ super.reqID);
- buff.append(", "+ super.content);
- buff.append(", "+ super.props);
+ buff.append(TYPE);
+ buff.append(": ");
+ buff.append(super.ID);
+ buff.append(", Request: ");
+ buff.append(super.reqID);
+ buff.append(", ");
+ buff.append(super.content);
+ buff.append(", ");
+ buff.append(super.props);
return buff.toString();
}
public boolean equals(Object o) {
- try {
+ if (this == o) return true;
+
+ if (o != null && this.getClass() == o.getClass()) {
GetGUIDRequestResponse temp = (GetGUIDRequestResponse)o;
- if (super.ID.equals(temp.getID())) {
- return true;
- }
- return false;
- } catch (Throwable t) {
- return false;
+ return super.ID.equals(temp.getID());
}
+ return false;
}
}
Index: UpdateCalendarRequest.java
===================================================================
RCS file:
/home/cvs/repository/uwcal_JSR168/src/java/org/jahia/suite/calendar/framework/message/UpdateCalendarRequest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- UpdateCalendarRequest.java 23 Nov 2004 10:30:17 -0000 1.4
+++ UpdateCalendarRequest.java 3 May 2005 15:22:51 -0000 1.5
@@ -147,25 +147,29 @@
public String toString() {
StringBuffer buff = new StringBuffer();
- buff.append(TYPE+": "+super.ID);
- buff.append(", "+super.content);
- buff.append(", "+super.props+"\n");
+ buff.append(TYPE);
+ buff.append(": ");
+ buff.append(super.ID);
+ buff.append(", ");
+ buff.append(super.content);
+ buff.append(", ");
+ buff.append(super.props);
+ buff.append("\n");
SyncOperation[] ops = getOperations();
for (int i=0; i<ops.length; i++) {
- buff.append(ops[i]+"\n");
+ buff.append(ops[i]);
+ buff.append("\n");
}
return buff.toString();
}
public boolean equals(Object o) {
- try {
+ if (this == o) return true;
+
+ if (o != null && this.getClass() == o.getClass()) {
UpdateCalendarRequest temp = (UpdateCalendarRequest)o;
- if (super.ID.equals(temp.getID())) {
- return true;
- }
- return false;
- } catch (Throwable t) {
- return false;
+ return super.ID.equals(temp.getID());
}
+ return false;
}
}
Index: UpdateCalendarRequestResponse.java
===================================================================
RCS file:
/home/cvs/repository/uwcal_JSR168/src/java/org/jahia/suite/calendar/framework/message/UpdateCalendarRequestResponse.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- UpdateCalendarRequestResponse.java 20 Dec 2004 16:31:16 -0000
1.5
+++ UpdateCalendarRequestResponse.java 3 May 2005 15:22:51 -0000
1.6
@@ -121,10 +121,15 @@
public String toString() {
StringBuffer buff = new StringBuffer();
- buff.append(TYPE+": "+ super.ID);
- buff.append(", Request: "+ super.reqID);
- buff.append(", "+ super.content);
- buff.append(", "+ super.props);
+ buff.append(TYPE);
+ buff.append(": ");
+ buff.append(super.ID);
+ buff.append(", Request: ");
+ buff.append(super.reqID);
+ buff.append(", ");
+ buff.append(super.content);
+ buff.append(", ");
+ buff.append(super.props);
if (status == OK)
buff.append(", Status: OK");
else
@@ -133,14 +138,12 @@
}
public boolean equals(Object o) {
- try {
- UpdateCalendarRequestResponse temp =
(UpdateCalendarRequestResponse)o;
- if (super.ID.equals(temp.getID())) {
- return true;
- }
- return false;
- } catch (Throwable t) {
- return false;
- }
- }
+ if (this == o) return true;
+
+ if (o != null && this.getClass() == o.getClass()) {
+ UpdateCalendarRequestResponse temp =
(UpdateCalendarRequestResponse)o;
+ return super.ID.equals(temp.getID());
+ }
+ return false;
+ }
}
Index: Calendar.java
===================================================================
RCS file:
/home/cvs/repository/uwcal_JSR168/src/java/org/jahia/suite/calendar/framework/model/Calendar.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Calendar.java 3 Feb 2005 10:52:35 -0000 1.7
+++ Calendar.java 3 May 2005 15:22:51 -0000 1.8
@@ -144,7 +144,10 @@
}
public boolean equals(Object o) {
- try {
+
+ if (this == o) return true;
+
+ if (o != null && this.getClass() == o.getClass()) {
Calendar tmp = (Calendar)o;
SyncEvent[] tmpEvents = tmp.getEvents();
@@ -157,10 +160,7 @@
}
return true;
}
- return false;
-
- } catch (Throwable t) {
- return false;
}
+ return false;
}
}
Index: GUID.java
===================================================================
RCS file:
/home/cvs/repository/uwcal_JSR168/src/java/org/jahia/suite/calendar/framework/model/GUID.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- GUID.java 10 Feb 2005 09:06:22 -0000 1.4
+++ GUID.java 3 May 2005 15:22:51 -0000 1.5
@@ -70,18 +70,19 @@
}
public String toString() {
- return key;
+ StringBuffer buffer = new StringBuffer();
+ buffer.append("GUID: ");
+ buffer.append(key);
+ return buffer.toString();
}
public boolean equals(Object o) {
- try {
+ if (this == o) return true;
+
+ if (o != null && this.getClass() == o.getClass()) {
GUID tmp = (GUID)o;
- if (tmp.getKey().equals(this.key)) {
- return true;
- }
- return false;
- } catch (Throwable t) {
- return false;
+ return tmp.getKey().equals(this.key);
}
+ return false;
}
}
Index: SyncEvent.java
===================================================================
RCS file:
/home/cvs/repository/uwcal_JSR168/src/java/org/jahia/suite/calendar/framework/model/SyncEvent.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SyncEvent.java 3 Feb 2005 10:52:35 -0000 1.6
+++ SyncEvent.java 3 May 2005 15:22:52 -0000 1.7
@@ -113,20 +113,30 @@
}
public String toString() {
- return key+", "+new String(content)+", "+stateToString(state);
+ StringBuffer buffer = new StringBuffer();
+ buffer.append(key);
+ buffer.append(", ");
+ buffer.append(content);
+ buffer.append(", ");
+ buffer.append(stateToString(state));
+ return buffer.toString();
}
public boolean equals(Object o) {
- try {
+ if (this == o) return true;
+
+ if (o != null && this.getClass() == o.getClass()) {
SyncEvent ev = (SyncEvent)o;
- if (ev.getKey().equals(getKey()) &&
- new String(ev.getContent()).equals(new
String(getContent()))) {
- return true;
+ if (ev.getKey().equals(getKey()) &&
+ ev.getContent().length == this.getContent().length) {
+
+ String content1 = new String(ev.getContent());
+ String content2 = new String(this.getContent());
+
+ return content1.equals(content2);
}
- return false;
- } catch (Throwable t) {
- return false;
}
+ return false;
}
/**
Index: SyncOperation.java
===================================================================
RCS file:
/home/cvs/repository/uwcal_JSR168/src/java/org/jahia/suite/calendar/framework/model/SyncOperation.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SyncOperation.java 22 Nov 2004 17:10:32 -0000 1.3
+++ SyncOperation.java 3 May 2005 15:22:52 -0000 1.4
@@ -90,15 +90,15 @@
}
public boolean equals(Object o) {
- try {
+ if (this == o) return true;
+
+ if (o != null && this.getClass() == o.getClass()) {
SyncOperation temp = (SyncOperation)o;
if (temp.getEvent().equals(this.getEvent()) && temp.getType().
- equals(this.getType())) {
+ equals(this.getType())) {
return true;
}
- return false;
- } catch (Throwable t) {
- return false;
}
+ return false;
}
}
