svn commit: r809974 - /incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/CasCreationUtils.java

[sc...@apache.org]

Author: schor
Date: Tue Sep  1 11:23:00 2009
New Revision: 809974

URL: http://svn.apache.org/viewvc?rev=809974&view=rev
Log:
no Jira - clarify that arguments are always Strings, and add comment as to purpose

Modified:
    incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/CasCreationUtils.java

Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/CasCreationUtils.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/CasCreationUtils.java?rev=809974&r1=809973&r2=809974&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/CasCreationUtils.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/CasCreationUtils.java Tue Sep  1 11:23:00 2009
@@ -1658,7 +1658,13 @@
     }
   }
 
-  private static boolean elementTypesCompatible(Object o1, Object o2) {
+  /**
+   * Compare element type names for array-like features
+   * @param o1 name of first element type
+   * @param o2 name of second element type
+   * @return true if elements are compatible for merging features
+   */
+  private static boolean elementTypesCompatible(String o1, String o2) {
     return ((null == o1) && (null == o2)) || ((null != o1) && o1.equals(o2)) ||
       // allow missing types to be equal to TOP
       (o1 != null && o1.equals(CAS.TYPE_NAME_TOP) && o2 == null) ||