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 2009/07/23 18:04:46 UTC
svn commit: r797125 - in
/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util:
AnalysisEnginePool.java ResourcePool.java
Author: schor
Date: Thu Jul 23 16:04:46 2009
New Revision: 797125
URL: http://svn.apache.org/viewvc?rev=797125&view=rev
Log:
[UIMA-
Modified:
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/AnalysisEnginePool.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/ResourcePool.java
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/AnalysisEnginePool.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/AnalysisEnginePool.java?rev=797125&r1=797124&r2=797125&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/AnalysisEnginePool.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/AnalysisEnginePool.java Thu Jul 23 16:04:46 2009
@@ -153,7 +153,7 @@
// set Result Spec on each AnalysisEngine in the pool
- Vector allInstances = mPool.getAllInstances();
+ Vector<Resource> allInstances = mPool.getAllInstances();
for (int i = 0; i < mPool.getSize(); i++) {
AnalysisEngine ae = (AnalysisEngine)allInstances.get(i);
@@ -183,7 +183,7 @@
*/
public synchronized void reconfigure() throws ResourceConfigurationException {
// reconfigure each AnalysisEngine in the pool
- List toRelease = new ArrayList();
+ List<AnalysisEngine> toRelease = new ArrayList<AnalysisEngine>();
try {
for (int i = 0; i < mPool.getSize(); i++) {
// get an Analysis Engine from the pool
@@ -197,9 +197,9 @@
}
} finally {
// release all AnalysisEngines back to pool
- Iterator it = toRelease.iterator();
+ Iterator<AnalysisEngine> it = toRelease.iterator();
while (it.hasNext()) {
- mPool.releaseResource((AnalysisEngine) it.next());
+ mPool.releaseResource(it.next());
}
}
}
@@ -208,7 +208,7 @@
* Calls batchProcessComplete on all AEs in pool.
*/
public synchronized void batchProcessComplete() throws AnalysisEngineProcessException {
- List toRelease = new ArrayList();
+ List<AnalysisEngine> toRelease = new ArrayList<AnalysisEngine>();
try {
for (int i = 0; i < mPool.getSize(); i++) {
// get an Analysis Engine from the pool
@@ -221,9 +221,9 @@
}
} finally {
// release all AnalysisEngines back to pool
- Iterator it = toRelease.iterator();
+ Iterator<AnalysisEngine> it = toRelease.iterator();
while (it.hasNext()) {
- mPool.releaseResource((AnalysisEngine) it.next());
+ mPool.releaseResource(it.next());
}
}
}
@@ -232,7 +232,7 @@
* Calls collectionProcessComplete on all AEs in pool.
*/
public synchronized void collectionProcessComplete() throws AnalysisEngineProcessException {
- List toRelease = new ArrayList();
+ List<AnalysisEngine> toRelease = new ArrayList<AnalysisEngine>();
try {
for (int i = 0; i < mPool.getSize(); i++) {
// get an Analysis Engine from the pool
@@ -245,9 +245,9 @@
}
} finally {
// release all AnalysisEngines back to pool
- Iterator it = toRelease.iterator();
+ Iterator<AnalysisEngine> it = toRelease.iterator();
while (it.hasNext()) {
- mPool.releaseResource((AnalysisEngine) it.next());
+ mPool.releaseResource(it.next());
}
}
}
@@ -266,7 +266,7 @@
* Sets logger for all AnalysisEngines in pool.
*/
public synchronized void setLogger(Logger aLogger) {
- List toRelease = new ArrayList();
+ List<AnalysisEngine> toRelease = new ArrayList<AnalysisEngine>();
try {
for (int i = 0; i < mPool.getSize(); i++) {
// get an Analysis Engine from the pool
@@ -280,9 +280,9 @@
}
} finally {
// release all AnalysisEngines back to pool
- Iterator it = toRelease.iterator();
+ Iterator<AnalysisEngine> it = toRelease.iterator();
while (it.hasNext()) {
- mPool.releaseResource((AnalysisEngine) it.next());
+ mPool.releaseResource(it.next());
}
}
}
@@ -293,7 +293,7 @@
*
* @return class of Resource contained in this pool
*/
- protected Class getResourceClass() {
+ protected Class<AnalysisEngine> getResourceClass() {
return AnalysisEngine.class;
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/ResourcePool.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/ResourcePool.java?rev=797125&r1=797124&r2=797125&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/ResourcePool.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/ResourcePool.java Thu Jul 23 16:04:46 2009
@@ -56,7 +56,7 @@
/**
* current class
*/
- private static final Class CLASS_NAME = ResourcePool.class;
+ private static final Class<ResourcePool> CLASS_NAME = ResourcePool.class;
/**
* Creates new ResourcePool_impl
@@ -193,7 +193,7 @@
* Destroys all Resources in this pool.
*/
public synchronized void destroy() {
- Iterator i = mAllInstances.iterator();
+ Iterator<Resource> i = mAllInstances.iterator();
while (i.hasNext()) {
Resource current = (Resource) i.next();
current.destroy();
@@ -253,17 +253,17 @@
}
}
- protected Vector getAllInstances() {
+ protected Vector<Resource> getAllInstances() {
return mAllInstances;
}
- protected Vector getFreeInstances() {
+ protected Vector<Resource> getFreeInstances() {
return mFreeInstances;
}
- private Vector mAllInstances = new Vector();
+ private Vector<Resource> mAllInstances = new Vector<Resource>();
- private Vector mFreeInstances = new Vector();
+ private Vector<Resource> mFreeInstances = new Vector<Resource>();
private int mNumInstances;