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 2016/12/07 17:03:45 UTC
svn commit: r1773117 - in
/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas:
FSArrayList.java FSHashSet.java IntegerArrayList.java
Author: schor
Date: Wed Dec 7 17:03:45 2016
New Revision: 1773117
URL: http://svn.apache.org/viewvc?rev=1773117&view=rev
Log:
[UIMA-5164] source cleanup, fix wrong array type cast in FSHashSet
Modified:
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FSArrayList.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FSHashSet.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/IntegerArrayList.java
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FSArrayList.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FSArrayList.java?rev=1773117&r1=1773116&r2=1773117&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FSArrayList.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FSArrayList.java Wed Dec 7 17:03:45 2016
@@ -22,7 +22,6 @@ package org.apache.uima.jcas.cas;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
-import java.util.Collections;
import java.util.Comparator;
import java.util.Iterator;
import java.util.List;
@@ -42,7 +41,6 @@ import org.apache.uima.cas.impl.CASImpl;
import org.apache.uima.cas.impl.FeatureStructureImplC;
import org.apache.uima.cas.impl.TypeImpl;
import org.apache.uima.cas.impl.TypeSystemImpl;
-import org.apache.uima.internal.util.Misc;
import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.JCasRegistry;
import org.apache.uima.util.impl.Constants;
@@ -70,7 +68,7 @@ public final class FSArrayList <T extend
List<T>, RandomAccess, Cloneable {
/** The Constant EMPTY_LIST. */
- private final static List<? extends TOP> EMPTY_LIST = (List<? extends TOP>) Arrays.asList(Constants.EMPTY_TOP_ARRAY);
+ private final static List<? extends TOP> EMPTY_LIST = Arrays.asList(Constants.EMPTY_TOP_ARRAY);
/**
* each cover class when loaded sets an index. used in the JCas typeArray to go from the cover
* class or class instance to the corresponding instance of the _Type class
@@ -86,6 +84,7 @@ public final class FSArrayList <T extend
* @return the type array index
*/
// can't be factored - refs locally defined field
+ @Override
public int getTypeIndexID() {
return typeIndexID;
}
@@ -200,6 +199,7 @@ public final class FSArrayList <T extend
/* (non-Javadoc)
* @see org.apache.uima.UimaSerializable#_init_from_cas_data()
*/
+ @Override
public void _init_from_cas_data() {
fsArrayAsList = (List<T>) Arrays.asList(gta());
}
@@ -207,6 +207,7 @@ public final class FSArrayList <T extend
/* (non-Javadoc)
* @see org.apache.uima.UimaSerializable#_save_to_cas_data()
*/
+ @Override
public void _save_to_cas_data() {
// if fsArraysAsList is not null, then the cas data form is still valid, do nothing
if (null != fsArrayAsList) return;
@@ -237,8 +238,9 @@ public final class FSArrayList <T extend
/* (non-Javadoc)
* @see java.util.List#get(int)
*/
+ @Override
public T get(int i) {
- return (T) gl().get(i);
+ return gl().get(i);
}
/**
@@ -248,6 +250,7 @@ public final class FSArrayList <T extend
* @param v the v
* @return the t
*/
+ @Override
public T set(int i, T v) {
if (v != null && _casView.getBaseCAS() != v._casView.getBaseCAS()) {
@@ -262,6 +265,7 @@ public final class FSArrayList <T extend
*
* @return the int
*/
+ @Override
public int size() {
return gl().size();
}
@@ -318,6 +322,7 @@ public final class FSArrayList <T extend
* @return the feature structure[]
* @see org.apache.uima.cas.ArrayFS#toArray()
*/
+ @Override
public FeatureStructure[] toArray() {
FeatureStructure[] r = new FeatureStructure[size()];
copyToArray(0, r, 0, size());
@@ -327,6 +332,7 @@ public final class FSArrayList <T extend
/* (non-Javadoc)
* @see org.apache.uima.jcas.cas.SelectViaCopyToArray#_toArrayForSelect()
*/
+ @Override
public FeatureStructure[] _toArrayForSelect() { return toArray(); }
/**
@@ -337,6 +343,7 @@ public final class FSArrayList <T extend
* @param destPos the dest pos
* @param length the length
*/
+ @Override
public void copyFromArray(String[] src, int srcPos, int destPos, int length) {
throw new UnsupportedOperationException();
}
@@ -358,6 +365,7 @@ public final class FSArrayList <T extend
* <code>length > size()</code> or
* <code>destPos + length > destArray.length</code>.
*/
+ @Override
public void copyToArray(int srcPos, String[] dest, int destPos, int length) {
_casView.checkArrayBounds(size(), srcPos, length);
int i = 0;
@@ -370,6 +378,7 @@ public final class FSArrayList <T extend
/* (non-Javadoc)
* @see org.apache.uima.jcas.cas.CommonArray#toStringArray()
*/
+ @Override
public String[] toStringArray() {
final int size = size();
String[] strArray = new String[size];
@@ -414,6 +423,7 @@ public final class FSArrayList <T extend
/* (non-Javadoc)
* @see org.apache.uima.UimaSerializable#_superClone()
*/
+ @Override
public FeatureStructureImplC _superClone() {return clone();} // enable common clone
/**
@@ -423,6 +433,7 @@ public final class FSArrayList <T extend
* @return -
* @see java.util.AbstractCollection#containsAll(java.util.Collection)
*/
+ @Override
public boolean containsAll(Collection<?> c) {
return gl().containsAll(c);
}
@@ -433,6 +444,7 @@ public final class FSArrayList <T extend
* @return -
* @see java.util.ArrayList#isEmpty()
*/
+ @Override
public boolean isEmpty() {
return gl().isEmpty();
}
@@ -444,6 +456,7 @@ public final class FSArrayList <T extend
* @return -
* @see java.util.ArrayList#contains(java.lang.Object)
*/
+ @Override
public boolean contains(Object o) {
if (!(o instanceof TOP)) return false;
TOP fs = (TOP) o;
@@ -457,6 +470,7 @@ public final class FSArrayList <T extend
* @return -
* @see java.util.ArrayList#indexOf(java.lang.Object)
*/
+ @Override
public int indexOf(Object o) {
if (!(o instanceof TOP)) return -1;
TOP fs = (TOP) o;
@@ -470,6 +484,7 @@ public final class FSArrayList <T extend
* @return -
* @see java.util.ArrayList#lastIndexOf(java.lang.Object)
*/
+ @Override
public int lastIndexOf(Object o) {
if (!(o instanceof TOP)) return -1;
TOP fs = (TOP) o;
@@ -484,6 +499,7 @@ public final class FSArrayList <T extend
* @return -
* @see java.util.ArrayList#toArray(java.lang.Object[])
*/
+ @Override
public <T> T[] toArray(T[] a) {
return gl().toArray(a);
}
@@ -512,6 +528,7 @@ public final class FSArrayList <T extend
* @return -
* @see java.util.ArrayList#add(java.lang.Object)
*/
+ @Override
public boolean add(T e) {
maybeStartUsingArrayList();
return fsArrayList.add(e);
@@ -524,6 +541,7 @@ public final class FSArrayList <T extend
* @return -
* @see java.util.AbstractList#equals(java.lang.Object)
*/
+ @Override
public boolean equals(Object o) {
if (!(o instanceof FSArrayList)) return false;
FSArrayList<T> other = (FSArrayList<T>) o;
@@ -543,6 +561,7 @@ public final class FSArrayList <T extend
* @param element -
* @see java.util.ArrayList#add(int, java.lang.Object)
*/
+ @Override
public void add(int index, T element) {
maybeStartUsingArrayList();
fsArrayList.add(index, element);
@@ -555,6 +574,7 @@ public final class FSArrayList <T extend
* @return -
* @see java.util.ArrayList#remove(int)
*/
+ @Override
public T remove(int index) {
maybeStartUsingArrayList();
return fsArrayList.remove(index);
@@ -567,6 +587,7 @@ public final class FSArrayList <T extend
* @return -
* @see java.util.ArrayList#remove(java.lang.Object)
*/
+ @Override
public boolean remove(Object o) {
maybeStartUsingArrayList();
return fsArrayList.remove(o);
@@ -578,6 +599,7 @@ public final class FSArrayList <T extend
* @return -
* @see java.util.AbstractList#hashCode()
*/
+ @Override
public int hashCode() {
int hc = 1;
final int prime = 31;
@@ -592,6 +614,7 @@ public final class FSArrayList <T extend
*
* @see java.util.ArrayList#clear()
*/
+ @Override
public void clear() {
maybeStartUsingArrayList();
fsArrayList.clear();
@@ -604,6 +627,7 @@ public final class FSArrayList <T extend
* @return -
* @see java.util.ArrayList#addAll(java.util.Collection)
*/
+ @Override
public boolean addAll(Collection<? extends T> c) {
maybeStartUsingArrayList();
return fsArrayList.addAll(c);
@@ -617,6 +641,7 @@ public final class FSArrayList <T extend
* @return -
* @see java.util.ArrayList#addAll(int, java.util.Collection)
*/
+ @Override
public boolean addAll(int index, Collection<? extends T> c) {
maybeStartUsingArrayList();
return fsArrayList.addAll(index, c);
@@ -629,6 +654,7 @@ public final class FSArrayList <T extend
* @return -
* @see java.util.ArrayList#removeAll(java.util.Collection)
*/
+ @Override
public boolean removeAll(Collection<?> c) {
maybeStartUsingArrayList();
return fsArrayList.removeAll(c);
@@ -641,6 +667,7 @@ public final class FSArrayList <T extend
* @return -
* @see java.util.ArrayList#retainAll(java.util.Collection)
*/
+ @Override
public boolean retainAll(Collection<?> c) {
maybeStartUsingArrayList();
return fsArrayList.retainAll(c);
@@ -652,6 +679,7 @@ public final class FSArrayList <T extend
* @return -
* @see java.util.Collection#stream()
*/
+ @Override
public Stream<T> stream() {
return gl().stream();
}
@@ -662,6 +690,7 @@ public final class FSArrayList <T extend
* @return -
* @see java.util.Collection#parallelStream()
*/
+ @Override
public Stream<T> parallelStream() {
return gl().parallelStream();
}
@@ -673,6 +702,7 @@ public final class FSArrayList <T extend
* @return -
* @see java.util.ArrayList#listIterator(int)
*/
+ @Override
public ListIterator<T> listIterator(int index) {
return gl().listIterator(index);
}
@@ -683,6 +713,7 @@ public final class FSArrayList <T extend
* @return -
* @see java.util.ArrayList#listIterator()
*/
+ @Override
public ListIterator<T> listIterator() {
return gl().listIterator();
}
@@ -693,6 +724,7 @@ public final class FSArrayList <T extend
* @return -
* @see java.util.ArrayList#iterator()
*/
+ @Override
public Iterator<T> iterator() {
return gl().iterator();
}
@@ -705,6 +737,7 @@ public final class FSArrayList <T extend
* @return -
* @see java.util.ArrayList#subList(int, int)
*/
+ @Override
public List<T> subList(int fromIndex, int toIndex) {
return gl().subList(fromIndex, toIndex);
}
@@ -715,6 +748,7 @@ public final class FSArrayList <T extend
* @param action -
* @see java.util.ArrayList#forEach(java.util.function.Consumer)
*/
+ @Override
public void forEach(Consumer<? super T> action) {
gl().forEach(action);
}
@@ -725,6 +759,7 @@ public final class FSArrayList <T extend
* @return -
* @see java.util.ArrayList#spliterator()
*/
+ @Override
public Spliterator<T> spliterator() {
return gl().spliterator();
}
@@ -736,6 +771,7 @@ public final class FSArrayList <T extend
* @return -
* @see java.util.ArrayList#removeIf(java.util.function.Predicate)
*/
+ @Override
public boolean removeIf(Predicate<? super T> filter) {
maybeStartUsingArrayList();
return fsArrayList.removeIf(filter);
@@ -747,6 +783,7 @@ public final class FSArrayList <T extend
* @param operator -
* @see java.util.ArrayList#replaceAll(java.util.function.UnaryOperator)
*/
+ @Override
public void replaceAll(UnaryOperator<T> operator) {
maybeStartUsingArrayList();
fsArrayList.replaceAll(operator);
@@ -758,6 +795,7 @@ public final class FSArrayList <T extend
* @param c -
* @see java.util.ArrayList#sort(java.util.Comparator)
*/
+ @Override
public void sort(Comparator<? super T> c) {
gl().sort(c);
}
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FSHashSet.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FSHashSet.java?rev=1773117&r1=1773116&r2=1773117&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FSHashSet.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FSHashSet.java Wed Dec 7 17:03:45 2016
@@ -69,6 +69,7 @@ public final class FSHashSet <T extends
* @return the type array index
*/
// can't be factored - refs locally defined field
+ @Override
public int getTypeIndexID() {
return typeIndexID;
}
@@ -163,6 +164,7 @@ public final class FSHashSet <T extends
/* (non-Javadoc)
* @see org.apache.uima.UimaSerializable#_init_from_cas_data()
*/
+ @Override
public void _init_from_cas_data() {
isPendingInit = true;
}
@@ -185,6 +187,7 @@ public final class FSHashSet <T extends
/* (non-Javadoc)
* @see org.apache.uima.UimaSerializable#_save_to_cas_data()
*/
+ @Override
public void _save_to_cas_data() {
if (isSaveNeeded) {
isSaveNeeded = false;
@@ -200,7 +203,10 @@ public final class FSHashSet <T extends
/* (non-Javadoc)
* @see org.apache.uima.jcas.cas.SelectViaCopyToArray#_toArrayForSelect()
*/
- public FeatureStructure[] _toArrayForSelect() { return (FeatureStructure[]) toArray(); }
+ @Override
+ public T[] _toArrayForSelect() {
+ return toArray();
+ }
/* (non-Javadoc)
* @see org.apache.uima.UimaSerializable#_superClone()
@@ -223,6 +229,7 @@ public final class FSHashSet <T extends
* @return true, if successful
* @see java.util.AbstractSet#equals(java.lang.Object)
*/
+ @Override
public boolean equals(Object o) {
if (!(o instanceof FSHashSet)) return false;
FSHashSet other = (FSHashSet) o;
@@ -242,6 +249,7 @@ public final class FSHashSet <T extends
* @return the int
* @see java.util.AbstractSet#hashCode()
*/
+ @Override
public int hashCode() {
return isSaveNeeded
? fsHashSet.hashCode()
@@ -254,10 +262,14 @@ public final class FSHashSet <T extends
* @return the feature structure[]
* @see java.util.AbstractCollection#toArray()
*/
- public Object[] toArray() {
- return isSaveNeeded
- ? fsHashSet.toArray()
- : gta().clone();
+ @Override
+ public T[] toArray() {
+ if (isSaveNeeded) {
+ T[] r = (T[]) new TOP[size()];
+ fsHashSet.toArray(r);
+ return r;
+ }
+ return (T[]) gta().clone();
}
/**
@@ -267,6 +279,7 @@ public final class FSHashSet <T extends
* @return true, if set changed
* @see java.util.AbstractSet#removeAll(java.util.Collection)
*/
+ @Override
public boolean removeAll(Collection<?> c) {
maybeLazyInit();
boolean r = fsHashSet.removeAll(c);
@@ -282,6 +295,7 @@ public final class FSHashSet <T extends
* @return the N[]
* @see java.util.AbstractCollection#toArray(Object[])
*/
+ @Override
public <N> N[] toArray(N[] a) {
if (isSaveNeeded) {
return fsHashSet.toArray(a);
@@ -302,6 +316,7 @@ public final class FSHashSet <T extends
* @return the iterator
* @see java.util.HashSet#iterator()
*/
+ @Override
public Iterator<T> iterator() {
return isSaveNeeded
? fsHashSet.iterator()
@@ -314,6 +329,7 @@ public final class FSHashSet <T extends
* @return the int
* @see java.util.HashSet#size()
*/
+ @Override
public int size() {
return isSaveNeeded
? fsHashSet.size()
@@ -326,6 +342,7 @@ public final class FSHashSet <T extends
* @return true, if is empty
* @see java.util.HashSet#isEmpty()
*/
+ @Override
public boolean isEmpty() {
return size() == 0;
}
@@ -337,6 +354,7 @@ public final class FSHashSet <T extends
* @return true, if successful
* @see java.util.HashSet#contains(java.lang.Object)
*/
+ @Override
public boolean contains(Object o) {
maybeLazyInit();
return fsHashSet.contains(o);
@@ -349,6 +367,7 @@ public final class FSHashSet <T extends
* @return true, if the set didn't already contain this element
* @see java.util.HashSet#add(java.lang.Object)
*/
+ @Override
public boolean add(T e) {
maybeLazyInit();
boolean r = fsHashSet.add(e);
@@ -363,6 +382,7 @@ public final class FSHashSet <T extends
* @return true, if the set contained the element
* @see java.util.HashSet#remove(java.lang.Object)
*/
+ @Override
public boolean remove(Object o) {
maybeLazyInit();
boolean r = fsHashSet.remove(o);
@@ -375,6 +395,7 @@ public final class FSHashSet <T extends
*
* @see java.util.HashSet#clear()
*/
+ @Override
public void clear() {
if (size() == 0) return;
maybeLazyInit();
@@ -389,6 +410,7 @@ public final class FSHashSet <T extends
* @return true, if set contains all of the elements in c
* @see java.util.AbstractCollection#containsAll(java.util.Collection)
*/
+ @Override
public boolean containsAll(Collection<?> c) {
maybeLazyInit();
return fsHashSet.containsAll(c);
@@ -401,6 +423,7 @@ public final class FSHashSet <T extends
* @return true, if set changed
* @see java.util.AbstractCollection#addAll(java.util.Collection)
*/
+ @Override
public boolean addAll(Collection<? extends T> c) {
maybeLazyInit();
boolean r = fsHashSet.addAll(c);
@@ -414,6 +437,7 @@ public final class FSHashSet <T extends
* @return the spliterator
* @see java.util.HashSet#spliterator()
*/
+ @Override
public Spliterator<T> spliterator() {
return isSaveNeeded
? fsHashSet.spliterator()
@@ -427,6 +451,7 @@ public final class FSHashSet <T extends
* @return true, if collection changed
* @see java.util.AbstractCollection#retainAll(java.util.Collection)
*/
+ @Override
public boolean retainAll(Collection<?> c) {
maybeLazyInit();
boolean r = fsHashSet.retainAll(c);
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/IntegerArrayList.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/IntegerArrayList.java?rev=1773117&r1=1773116&r2=1773117&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/IntegerArrayList.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/IntegerArrayList.java Wed Dec 7 17:03:45 2016
@@ -19,26 +19,10 @@
package org.apache.uima.jcas.cas;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
import java.util.Iterator;
-import java.util.List;
-import java.util.ListIterator;
import java.util.RandomAccess;
-import java.util.Spliterator;
-import java.util.function.Consumer;
-import java.util.function.Predicate;
-import java.util.function.UnaryOperator;
-import java.util.stream.Stream;
-
import org.apache.uima.List_of_ints;
import org.apache.uima.UimaSerializable;
-import org.apache.uima.UimaSerializableFSs;
-import org.apache.uima.cas.CASRuntimeException;
-import org.apache.uima.cas.CommonArrayFS;
import org.apache.uima.cas.FeatureStructure;
import org.apache.uima.cas.impl.CASImpl;
import org.apache.uima.cas.impl.FeatureStructureImplC;
@@ -46,7 +30,6 @@ import org.apache.uima.cas.impl.TypeImpl
import org.apache.uima.cas.impl.TypeSystemImpl;
import org.apache.uima.internal.util.IntListIterator;
import org.apache.uima.internal.util.IntVector;
-import org.apache.uima.internal.util.Misc;
import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.JCasRegistry;
@@ -84,6 +67,7 @@ public final class IntegerArrayList exte
* @return the type array index
*/
// can't be factored - refs locally defined field
+ @Override
public int getTypeIndexID() {
return typeIndexID;
}
@@ -172,10 +156,12 @@ public final class IntegerArrayList exte
}
}
+ @Override
public void _init_from_cas_data() {
intArrayAsList = List_of_ints.newInstance(getIntegerArray()._getTheArray());
}
+ @Override
public void _save_to_cas_data() {
if (getIntegerArray() == null) {
IntegerArray a = new IntegerArray(_casView.getExistingJCas(), intArrayList.size());
@@ -208,6 +194,7 @@ public final class IntegerArrayList exte
}
/** return the size of the array. */
+ @Override
public int size() {
return (null == intArrayAsList)
? intArrayList.size()
@@ -304,6 +291,7 @@ public final class IntegerArrayList exte
}
}
+ @Override
public String[] toStringArray() {
final int size = size();
String[] strArray = new String[size];
@@ -343,6 +331,7 @@ public final class IntegerArrayList exte
return ial;
}
+ @Override
public FeatureStructureImplC _superClone() {return clone();} // enable common clone
/**
@@ -400,6 +389,7 @@ public final class IntegerArrayList exte
* @return -
* @see java.util.AbstractCollection#toString()
*/
+ @Override
public String toString() {
return String.format("IntegerArrayList[size: %,d]", size());
}
@@ -420,6 +410,7 @@ public final class IntegerArrayList exte
* @return true if all elements are the same, and in same order, and same number
* @see java.util.AbstractList#equals(java.lang.Object)
*/
+ @Override
public boolean equals(Object o) {
if (o instanceof IntegerArrayList) {
IntegerArrayList other = (IntegerArrayList) o;
@@ -474,6 +465,7 @@ public final class IntegerArrayList exte
* @return -
* @see java.util.AbstractList#hashCode()
*/
+ @Override
public int hashCode() {
int hc = 1;
final int prime = 31;
@@ -497,6 +489,7 @@ public final class IntegerArrayList exte
* @return -
* @see java.util.ArrayList#iterator()
*/
+ @Override
public Iterator<Integer> iterator() {
return (null == intArrayAsList)
? intArrayList.iterator()