You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2017/07/20 18:44:36 UTC
svn commit: r1802525 - in /uima/uv3/uimaj-v3/trunk/uimaj-core/src:
main/java/org/apache/uima/cas/impl/ main/java/org/apache/uima/internal/util/
test/java/org/apache/uima/cas/impl/
Author: schor
Date: Thu Jul 20 18:44:35 2017
New Revision: 1802525
URL: http://svn.apache.org/viewvc?rev=1802525&view=rev
Log:
no Jira, fix more javadocs. Also, augment XmiCompare to allow variation in the directories it's comparing
Modified:
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CopyOnWriteIndexPart.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureImpl.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_multiple_indexes.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/LowLevelIterator.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/CopyOnWriteOrderedFsSet_array.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/Misc.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/OrderedFsSet_array.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/XmiCompare.java
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CopyOnWriteIndexPart.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CopyOnWriteIndexPart.java?rev=1802525&r1=1802524&r2=1802525&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CopyOnWriteIndexPart.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CopyOnWriteIndexPart.java Thu Jul 20 18:44:35 2017
@@ -27,7 +27,6 @@ public interface CopyOnWriteIndexPart {
void makeReadOnlyCopy();
/**
- * @param original an instance of ObjectHashSet or OrderedFsSet_sorted
* @return true if this cow version is the same as the original.
* true means the index has not been updated
*/
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureImpl.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureImpl.java?rev=1802525&r1=1802524&r2=1802525&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureImpl.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureImpl.java Thu Jul 20 18:44:35 2017
@@ -259,6 +259,7 @@ public class FeatureImpl implements Feat
/**
* Hashcode and equals are used, possibly for features in different type systems,
* where the features should be "equal". Example: fitering during serialization.
+ * @return long version of hashcode
*/
public long computeHashCodeLong() {
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_multiple_indexes.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_multiple_indexes.java?rev=1802525&r1=1802524&r2=1802525&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_multiple_indexes.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_multiple_indexes.java Thu Jul 20 18:44:35 2017
@@ -51,7 +51,11 @@ public abstract class FsIterator_multipl
}
- /** copy constructor */
+ /**
+ /**
+ * copy constructor
+ * @param v the original to copy
+ */
public FsIterator_multiple_indexes(FsIterator_multiple_indexes<T> v) {
allIterators = v.allIterators.clone();
int i = 0;
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/LowLevelIterator.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/LowLevelIterator.java?rev=1802525&r1=1802524&r2=1802525&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/LowLevelIterator.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/LowLevelIterator.java Thu Jul 20 18:44:35 2017
@@ -126,13 +126,14 @@ public interface LowLevelIterator<T exte
/**
* Internal use
- * same as moveToFirst, but won't reset to use current contents of index if index has changed
+ * same as moveToLast, but won't reset to use current contents of index if index has changed
*/
void moveToLastNoReinit();
/**
* Internal use
- * same as moveToFirst, but won't reset to use current contents of index if index has changed
+ * same as moveTo(fs), but won't reset to use current contents of index if index has changed
+ * @param fs the fs to use as the template identifying the place to move to
*/
void moveToNoReinit(FeatureStructure fs);
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/CopyOnWriteOrderedFsSet_array.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/CopyOnWriteOrderedFsSet_array.java?rev=1802525&r1=1802524&r2=1802525&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/CopyOnWriteOrderedFsSet_array.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/CopyOnWriteOrderedFsSet_array.java Thu Jul 20 18:44:35 2017
@@ -86,6 +86,7 @@ public class CopyOnWriteOrderedFsSet_arr
/**
* @see OrderedFsSet_array#size()
+ * @return the size of this version of the index (maybe not the current index size)
*/
public int size() {
return set.size();
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/Misc.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/Misc.java?rev=1802525&r1=1802524&r2=1802525&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/Misc.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/Misc.java Thu Jul 20 18:44:35 2017
@@ -341,7 +341,7 @@ public class Misc {
* @param c the collection to process
* @param limit the maximum number of items, if negative, no limit
* @param appender the appender
- * @return
+ * @return argument sb, appeneded
*/
public static <T> StringBuilder addElementsToStringBuilder(StringBuilder sb, Collection<T> c, int limit, BiConsumer<StringBuilder, T> appender) {
return addElementsToStringBuilder(INT0, sb, c, limit, appender);
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/OrderedFsSet_array.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/OrderedFsSet_array.java?rev=1802525&r1=1802524&r2=1802525&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/OrderedFsSet_array.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/OrderedFsSet_array.java Thu Jul 20 18:44:35 2017
@@ -127,7 +127,7 @@ public class OrderedFsSet_array<T extend
/**
*
- * @param fs item to add
+ * @param fs1 item to add
* @param comparator either the comparator with ID for sorted indexes, or the comparator without ID for set indexes
* @return true if fs was added (not already present)
*/
@@ -364,7 +364,7 @@ public class OrderedFsSet_array<T extend
/**
* Removes the exactly matching (including ID) FS if present
- * @param fs the fs to remove
+ * @param o the object (should be a Feature Structure) to remove
* @return true if it was removed, false if it wasn't in the index
*/
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/XmiCompare.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/XmiCompare.java?rev=1802525&r1=1802524&r2=1802525&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/XmiCompare.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/XmiCompare.java Thu Jul 20 18:44:35 2017
@@ -128,6 +128,10 @@ public class XmiCompare {
}
Path p2 = Paths.get(d2String, p1.getFileName().toString());
+
+ if (!p2.toFile().exists()) {
+ return;
+ }
try {
CasIOUtils.load(new FileInputStream(p1.toFile()), c1);