You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@opennlp.apache.org by jo...@apache.org on 2011/08/25 10:57:38 UTC

svn commit: r1161450 - in /incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools: dictionary/Dictionary.java util/StringList.java

Author: joern
Date: Thu Aug 25 08:57:38 2011
New Revision: 1161450

URL: http://svn.apache.org/viewvc?rev=1161450&view=rev
Log:
OPENNLP-273 Removed unnecessary null check from equals method

Modified:
    incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/dictionary/Dictionary.java
    incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/StringList.java

Modified: incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/dictionary/Dictionary.java
URL: http://svn.apache.org/viewvc/incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/dictionary/Dictionary.java?rev=1161450&r1=1161449&r2=1161450&view=diff
==============================================================================
--- incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/dictionary/Dictionary.java (original)
+++ incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/dictionary/Dictionary.java Thu Aug 25 08:57:38 2011
@@ -226,7 +226,7 @@ public class Dictionary implements Itera
     if (obj == this) {
       result = true;
     }
-    else if (obj != null && obj instanceof Dictionary) {
+    else if (obj instanceof Dictionary) {
       Dictionary dictionary  = (Dictionary) obj;
 
       result = entrySet.equals(dictionary.entrySet);

Modified: incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/StringList.java
URL: http://svn.apache.org/viewvc/incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/StringList.java?rev=1161450&r1=1161449&r2=1161450&view=diff
==============================================================================
--- incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/StringList.java (original)
+++ incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/StringList.java Thu Aug 25 08:57:38 2011
@@ -152,7 +152,7 @@ public class StringList implements Itera
     if (this == obj) {
       result = true;
     }
-    else if (obj != null && obj instanceof StringList) {
+    else if (obj instanceof StringList) {
       StringList tokenList = (StringList) obj;
 
       result = Arrays.equals(tokens, tokenList.tokens);