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/10/17 13:14:39 UTC
svn commit: r1812399 - in
/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima: cas/
cas/impl/ internal/util/ jcas/cas/
Author: schor
Date: Tue Oct 17 13:14:39 2017
New Revision: 1812399
URL: http://svn.apache.org/viewvc?rev=1812399&view=rev
Log:
no jira remove unused imports and methods, comment update, remove unneeded synchronized.
Modified:
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/FeatureStructure.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_bag.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/LowLevelIndex.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeSystemImpl.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/jcas/cas/SelectViaCopyToArray.java
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/FeatureStructure.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/FeatureStructure.java?rev=1812399&r1=1812398&r2=1812399&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/FeatureStructure.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/FeatureStructure.java Tue Oct 17 13:14:39 2017
@@ -19,7 +19,6 @@
package org.apache.uima.cas;
-import org.apache.uima.cas.impl.FeatureStructureImplC;
import org.apache.uima.jcas.JCas;
/**
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_bag.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_bag.java?rev=1812399&r1=1812398&r2=1812399&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_bag.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_bag.java Tue Oct 17 13:14:39 2017
@@ -22,7 +22,6 @@ package org.apache.uima.cas.impl;
import java.util.Collection;
import java.util.List;
-import org.apache.uima.cas.FSIterator;
import org.apache.uima.cas.FeatureStructure;
import org.apache.uima.cas.Type;
import org.apache.uima.cas.admin.FSIndexComparator;
@@ -225,6 +224,11 @@ public class FsIndex_bag<T extends Featu
return Integer.MAX_VALUE;
}
+ @Override
+ public LowLevelIterator<T> iterator() {
+ return iterator(!IS_ORDERED, !IS_TYPE_ORDER);
+ }
+
// ObjHashSet<TOP> getObjHashSet() {
// return index;
// }
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/LowLevelIndex.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/LowLevelIndex.java?rev=1812399&r1=1812398&r2=1812399&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/LowLevelIndex.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/LowLevelIndex.java Tue Oct 17 13:14:39 2017
@@ -37,7 +37,7 @@ import org.apache.uima.jcas.cas.TOP;
public interface LowLevelIndex<T extends FeatureStructure> extends FSIndex<T> {
/**
- * Get a low-level, FS reference iterator.
+ * Get a low-level FS iterator.
*
* @return An iterator for this index.
*/
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeSystemImpl.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeSystemImpl.java?rev=1812399&r1=1812398&r2=1812399&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeSystemImpl.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeSystemImpl.java Tue Oct 17 13:14:39 2017
@@ -2615,7 +2615,7 @@ public class TypeSystemImpl implements T
return (fi == null) ? -1 : fi.getAdjustedOffset();
}
- static synchronized int getAdjustedFeatureOffset(TypeImpl type, String featName) {
+ static int getAdjustedFeatureOffset(TypeImpl type, String featName) {
FeatureImpl fi = type.getFeatureByBaseName(featName);
return (fi == null) ? -1 : fi.getAdjustedOffset();
}
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=1812399&r1=1812398&r2=1812399&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 Tue Oct 17 13:14:39 2017
@@ -949,14 +949,16 @@ public class Misc {
}
}
- public static <T> Iterable<T> iterable(Iterator<T> iterator) {
- return new Iterable<T>() {
- @Override
- public Iterator<T> iterator() {
- return iterator;
- }
- };
- }
+
+ // bad idea - the iterator would be tied to another one, not independent
+// public static <T> Iterable<T> iterable(Iterator<T> iterator) {
+// return new Iterable<T>() {
+// @Override
+// public Iterator<T> iterator() {
+// return iterator;
+// }
+// };
+// }
public static boolean isJava9ea() {
return isJava9ea;
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/SelectViaCopyToArray.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/SelectViaCopyToArray.java?rev=1812399&r1=1812398&r2=1812399&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/SelectViaCopyToArray.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/SelectViaCopyToArray.java Tue Oct 17 13:14:39 2017
@@ -19,7 +19,6 @@
package org.apache.uima.jcas.cas;
-import org.apache.uima.cas.CAS;
import org.apache.uima.cas.FeatureStructure;
import org.apache.uima.cas.SelectFSs;
import org.apache.uima.cas.Type;