You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by jo...@apache.org on 2009/07/17 17:53:29 UTC
svn commit: r795123 - in
/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl:
FeatureStructureImpl.java OutOfTypeSystemData.java TypeSystemImpl.java
XmiSerializationSharedData.java
Author: joern
Date: Fri Jul 17 15:53:29 2009
New Revision: 795123
URL: http://svn.apache.org/viewvc?rev=795123&view=rev
Log:
UIMA-1444 cas.impl package should use generics
Modified:
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureStructureImpl.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/OutOfTypeSystemData.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeSystemImpl.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiSerializationSharedData.java
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureStructureImpl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureStructureImpl.java?rev=795123&r1=795122&r2=795123&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureStructureImpl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureStructureImpl.java Fri Jul 17 15:53:29 2009
@@ -375,7 +375,7 @@
private static final String refNamePrefix = "#";
- private RedBlackTree tree;
+ private RedBlackTree<String> tree;
private IntSet seen;
@@ -384,7 +384,7 @@
private PrintReferences() {
super();
this.count = 0;
- this.tree = new RedBlackTree();
+ this.tree = new RedBlackTree<String>();
this.seen = new IntSet();
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/OutOfTypeSystemData.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/OutOfTypeSystemData.java?rev=795123&r1=795122&r2=795123&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/OutOfTypeSystemData.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/OutOfTypeSystemData.java Fri Jul 17 15:53:29 2009
@@ -102,9 +102,9 @@
public String toString() {
StringBuffer buf = new StringBuffer();
buf.append(type).append('[');
- Iterator it = featVals.entrySet().iterator();
+ Iterator<Map.Entry<String, String>> it = featVals.entrySet().iterator();
while (it.hasNext()) {
- Map.Entry entry = (Map.Entry) it.next();
+ Map.Entry<String, String> entry = it.next();
buf.append(entry.getKey()).append('=').append(entry.getValue()).append(',');
}
buf.append("](ID=").append(id).append(')');
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeSystemImpl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeSystemImpl.java?rev=795123&r1=795122&r2=795123&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeSystemImpl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeSystemImpl.java Fri Jul 17 15:53:29 2009
@@ -169,7 +169,7 @@
private final IntRedBlackTree arrayToComponentTypeMap;
// A mapping from array type codes to array type objects.
- private final RedBlackTree arrayCodeToTypeMap;
+ private final RedBlackTree<TypeImpl> arrayCodeToTypeMap;
// Is the type system locked?
private boolean locked = false;
@@ -335,7 +335,7 @@
this.stringSetMap = new IntRedBlackTree();
this.componentToArrayTypeMap = new IntRedBlackTree();
this.arrayToComponentTypeMap = new IntRedBlackTree();
- this.arrayCodeToTypeMap = new RedBlackTree();
+ this.arrayCodeToTypeMap = new RedBlackTree<TypeImpl>();
this.parents = new IntVector();
this.parents.add(0);
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiSerializationSharedData.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiSerializationSharedData.java?rev=795123&r1=795122&r2=795123&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiSerializationSharedData.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiSerializationSharedData.java Fri Jul 17 15:53:29 2009
@@ -61,7 +61,7 @@
* getXmiId() method, which is done to ensure a consistent ID for each FS
* address across multiple serializations.
*/
- private RedBlackTree fsAddrToXmiIdMap = new RedBlackTree();
+ private RedBlackTree<String> fsAddrToXmiIdMap = new RedBlackTree<String>();
/**
* A map from xmi:id to FeatureStructure address. This is populated whenever
@@ -69,7 +69,7 @@
* getFsAddrForXmiId() method, necessary to support merging multiple XMI
* CASes into the same CAS object.
**/
- private RedBlackTree xmiIdToFsAddrMap = new RedBlackTree();
+ private RedBlackTree<Integer> xmiIdToFsAddrMap = new RedBlackTree<Integer>();
/**
* List of OotsElementData objects, each of which captures information about
@@ -110,11 +110,11 @@
* @param fsAddr
* @param xmiId
*/
- RedBlackTree nonsharedfeatureIdToFSId = new RedBlackTree();
+ RedBlackTree<Integer> nonsharedfeatureIdToFSId = new RedBlackTree<Integer>();
void addIdMapping(int fsAddr, int xmiId) {
fsAddrToXmiIdMap.put(fsAddr, Integer.toString(xmiId));
- xmiIdToFsAddrMap.put(xmiId, Integer.valueOf(fsAddr));
+ xmiIdToFsAddrMap.put(xmiId, fsAddr);
if (xmiId > maxXmiId)
maxXmiId = xmiId;
}
@@ -337,7 +337,7 @@
*/
void checkForDups() {
Set<String> ids = new HashSet<String>();
- Iterator iter = fsAddrToXmiIdMap.iterator();
+ Iterator<String> iter = fsAddrToXmiIdMap.iterator();
while (iter.hasNext()) {
String xmiId = (String) iter.next();
if (!ids.add(xmiId)) {