Update of
/var/cvs/contributions/CMSContainer/cmsc/portal/src/java/com/finalist/pluto/portalImpl/util
In directory
james.mmbase.org:/tmp/cvs-serv19747/cmsc/portal/src/java/com/finalist/pluto/portalImpl/util
Modified Files:
ObjectID.java
Log Message:
CMSC-907 Code Quality with PMD
PMD error fixes
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/portal/src/java/com/finalist/pluto/portalImpl/util
See also: http://www.mmbase.org/jira/browse/CMSC-907
Index: ObjectID.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/portal/src/java/com/finalist/pluto/portalImpl/util/ObjectID.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- ObjectID.java 26 Nov 2007 11:43:47 -0000 1.3
+++ ObjectID.java 9 Jun 2008 21:23:24 -0000 1.4
@@ -15,9 +15,7 @@
*/
package com.finalist.pluto.portalImpl.util;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
+import java.io.*;
/**
* * Wraps around the internal Object IDs. By holding both * the string and the
@@ -25,7 +23,7 @@
* processing.
*/
-public class ObjectID implements org.apache.pluto.om.common.ObjectID,
java.io.Serializable {
+public final class ObjectID implements org.apache.pluto.om.common.ObjectID,
java.io.Serializable {
private String stringOID;
@@ -54,31 +52,37 @@
// addtional methods.
+ @Override
public boolean equals(Object object) {
boolean result = false;
- if (object instanceof ObjectID)
+ if (object instanceof ObjectID) {
result = (intOID == ((ObjectID) object).intOID);
- else if (object instanceof String)
+ }
+ else if (object instanceof String) {
result = stringOID.equals(object);
- else if (object instanceof Integer)
+ }
+ else if (object instanceof Integer) {
result = (intOID == ((Integer) object).intValue());
- return (result);
+ }
+ return result;
}
+ @Override
public int hashCode() {
- return (intOID);
+ return intOID;
}
+ @Override
public String toString() {
- return (stringOID);
+ return stringOID;
}
public int intValue() {
- return (intOID);
+ return intOID;
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs