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/09/26 21:12:55 UTC
svn commit: r1762382 - in
/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src:
main/java/org/apache/uima/analysis_engine/asb/impl/
main/java/org/apache/uima/analysis_engine/impl/
main/java/org/apache/uima/resource/impl/ main/java/org/apache/uima/uti...
Author: schor
Date: Mon Sep 26 21:12:55 2016
New Revision: 1762382
URL: http://svn.apache.org/viewvc?rev=1762382&view=rev
Log:
[UIMA-4674] change CAS Api for getJCas() to no longer throw exception
Modified:
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/impl/FlowContainer.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/impl/FlowControllerContainer.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisEngineImplBase.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/JCasIteratorWrapper.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/resource/impl/CasManager_impl.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/util/JCasPool.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/GrowingTheCasTest.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/util/CasWrapperForTstng.java
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/impl/FlowContainer.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/impl/FlowContainer.java?rev=1762382&r1=1762381&r2=1762382&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/impl/FlowContainer.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/impl/FlowContainer.java Mon Sep 26 21:12:55 2016
@@ -78,8 +78,8 @@ public class FlowContainer {
((JCasFlow_ImplBase)flow).setJCas(view.getJCas());
}
return new FlowContainer(flow, mFlowControllerContainer, newCAS);
- } catch (CASException e) {
- throw new AnalysisEngineProcessException(e);
+// } catch (CASException e) {
+// throw new AnalysisEngineProcessException(e);
} finally {
if (null != view) {
((CASImpl)view).restoreClassLoaderUnlockCas();
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/impl/FlowControllerContainer.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/impl/FlowControllerContainer.java?rev=1762382&r1=1762381&r2=1762382&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/impl/FlowControllerContainer.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/impl/FlowControllerContainer.java Mon Sep 26 21:12:55 2016
@@ -231,8 +231,8 @@ public class FlowControllerContainer ext
((JCasFlow_ImplBase)flow).setJCas(view.getJCas());
}
return new FlowContainer(flow, this, aCAS);
- } catch (CASException e) {
- throw new AnalysisEngineProcessException(e);
+// } catch (CASException e) {
+// throw new AnalysisEngineProcessException(e);
} finally {
if (view != null) {
((CASImpl)view).restoreClassLoaderUnlockCas();
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisEngineImplBase.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisEngineImplBase.java?rev=1762382&r1=1762381&r2=1762382&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisEngineImplBase.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisEngineImplBase.java Mon Sep 26 21:12:55 2016
@@ -239,11 +239,11 @@ public abstract class AnalysisEngineImpl
* @see org.apache.uima.analysis_engine.AnalysisEngine#newJCas()
*/
public JCas newJCas() throws ResourceInitializationException {
- try {
+// try {
return newCAS().getJCas();
- } catch (CASException e) {
- throw new ResourceInitializationException(e);
- }
+// } catch (CASException e) {
+// throw new ResourceInitializationException(e);
+// }
}
/**
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/JCasIteratorWrapper.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/JCasIteratorWrapper.java?rev=1762382&r1=1762381&r2=1762382&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/JCasIteratorWrapper.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/JCasIteratorWrapper.java Mon Sep 26 21:12:55 2016
@@ -50,11 +50,11 @@ public class JCasIteratorWrapper impleme
* @see org.apache.uima.analysis_engine.CasIterator#next()
*/
public JCas next() throws AnalysisEngineProcessException {
- try {
+// try {
return mCasIterator.next().getJCas();
- } catch (CASException e) {
- throw new AnalysisEngineProcessException(e);
- }
+// } catch (CASException e) {
+// throw new AnalysisEngineProcessException(e);
+// }
}
/*
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/resource/impl/CasManager_impl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/resource/impl/CasManager_impl.java?rev=1762382&r1=1762381&r2=1762382&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/resource/impl/CasManager_impl.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/resource/impl/CasManager_impl.java Mon Sep 26 21:12:55 2016
@@ -280,11 +280,11 @@ public class CasManager_impl implements
if (requiredInterface == CAS.class) {
return cas;
} else if (requiredInterface == JCas.class) {
- try {
+// try {
return cas.getJCas();
- } catch (CASException e) {
- throw new UIMARuntimeException(e);
- }
+// } catch (CASException e) {
+// throw new UIMARuntimeException(e);
+// }
} else if (requiredInterface.isInstance(cas)) // covers AbstractCas
{
return cas;
@@ -310,11 +310,11 @@ public class CasManager_impl implements
if (requiredInterface == CAS.class) {
return (T) cas;
} else if (requiredInterface == JCas.class) {
- try {
+// try {
return (T) cas.getJCas();
- } catch (CASException e) {
- throw new UIMARuntimeException(e);
- }
+// } catch (CASException e) {
+// throw new UIMARuntimeException(e);
+// }
} else if (requiredInterface.isInstance(cas)) // covers AbstractCas
{
return (T) cas;
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/util/JCasPool.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/util/JCasPool.java?rev=1762382&r1=1762381&r2=1762382&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/util/JCasPool.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/util/JCasPool.java Mon Sep 26 21:12:55 2016
@@ -215,11 +215,11 @@ public class JCasPool {
mdList.add(aMetaData);
for (int i = 0; i < mNumInstances; i++) {
JCas c;
- try {
+// try {
c = CasCreationUtils.createCas(mdList).getJCas();
- } catch (CASException e) {
- throw new ResourceInitializationException(e);
- }
+// } catch (CASException e) {
+// throw new ResourceInitializationException(e);
+// }
mAllInstances.add(c);
mFreeInstances.add(c);
}
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/GrowingTheCasTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/GrowingTheCasTest.java?rev=1762382&r1=1762381&r2=1762382&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/GrowingTheCasTest.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/GrowingTheCasTest.java Mon Sep 26 21:12:55 2016
@@ -83,9 +83,9 @@ public class GrowingTheCasTest extends T
} catch (ResourceInitializationException e) {
e.printStackTrace();
assertTrue(false);
- } catch (CASException e) {
- e.printStackTrace();
- assertTrue(false);
+// } catch (CASException e) {
+// e.printStackTrace();
+// assertTrue(false);
}
}
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/util/CasWrapperForTstng.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/util/CasWrapperForTstng.java?rev=1762382&r1=1762381&r2=1762382&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/util/CasWrapperForTstng.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/util/CasWrapperForTstng.java Mon Sep 26 21:12:55 2016
@@ -184,7 +184,9 @@ public class CasWrapperForTstng implemen
return originalCAS.getIndexRepository();
}
- public JCas getJCas() throws CASException {
+ public JCas getJCas()
+// throws CASException
+ {
return originalCAS.getJCas();
}