You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by re...@apache.org on 2013/01/10 20:27:55 UTC
svn commit: r1431571 - in /uima/sandbox/uimafit/branches/UIMA-2562: ./
uimafit-examples/src/main/java/org/apache/uima/fit/examples/type/
uimafit-maven-plugin/src/main/java/org/apache/uima/fit/maven/
uimafit/src/main/java/org/apache/uima/fit/component/ ...
Author: rec
Date: Thu Jan 10 19:27:54 2013
New Revision: 1431571
URL: http://svn.apache.org/viewvc?rev=1431571&view=rev
Log:
[UIMA-2562] Downgrade uimaFIT to Java 5
https://issues.apache.org/jira/browse/UIMA-2562
- Set java.target to 1.5
- Removed @Override annotations on interface methods (only Java 1.6)
Modified:
uima/sandbox/uimafit/branches/UIMA-2562/pom.xml
uima/sandbox/uimafit/branches/UIMA-2562/uimafit-examples/src/main/java/org/apache/uima/fit/examples/type/Sentence_Type.java
uima/sandbox/uimafit/branches/UIMA-2562/uimafit-maven-plugin/src/main/java/org/apache/uima/fit/maven/GenerateDescriptorsMojo.java
uima/sandbox/uimafit/branches/UIMA-2562/uimafit/src/main/java/org/apache/uima/fit/component/Resource_ImplBase.java
uima/sandbox/uimafit/branches/UIMA-2562/uimafit/src/main/java/org/apache/uima/fit/pipeline/JCasIterable.java
uima/sandbox/uimafit/branches/UIMA-2562/uimafit/src/test/java/org/apache/uima/fit/factory/AggregateWithReaderTest.java
uima/sandbox/uimafit/branches/UIMA-2562/uimafit/src/test/java/org/apache/uima/fit/factory/CollectionReaderFactoryTest.java
Modified: uima/sandbox/uimafit/branches/UIMA-2562/pom.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/branches/UIMA-2562/pom.xml?rev=1431571&r1=1431570&r2=1431571&view=diff
==============================================================================
--- uima/sandbox/uimafit/branches/UIMA-2562/pom.xml (original)
+++ uima/sandbox/uimafit/branches/UIMA-2562/pom.xml Thu Jan 10 19:27:54 2013
@@ -40,7 +40,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <java.target>1.6</java.target>
+ <java.target>1.5</java.target>
<spring.version>3.1.2.RELEASE</spring.version>
<uima.version>2.4.0</uima.version>
</properties>
Modified: uima/sandbox/uimafit/branches/UIMA-2562/uimafit-examples/src/main/java/org/apache/uima/fit/examples/type/Sentence_Type.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/branches/UIMA-2562/uimafit-examples/src/main/java/org/apache/uima/fit/examples/type/Sentence_Type.java?rev=1431571&r1=1431570&r2=1431571&view=diff
==============================================================================
--- uima/sandbox/uimafit/branches/UIMA-2562/uimafit-examples/src/main/java/org/apache/uima/fit/examples/type/Sentence_Type.java (original)
+++ uima/sandbox/uimafit/branches/UIMA-2562/uimafit-examples/src/main/java/org/apache/uima/fit/examples/type/Sentence_Type.java Thu Jan 10 19:27:54 2013
@@ -24,7 +24,6 @@ public class Sentence_Type extends Annot
/** @generated */
private final FSGenerator fsGenerator = new FSGenerator() {
- @Override
public FeatureStructure createFS(int addr, CASImpl cas) {
if (Sentence_Type.this.useExistingInstance) {
// Return eq fs instance if already created
Modified: uima/sandbox/uimafit/branches/UIMA-2562/uimafit-maven-plugin/src/main/java/org/apache/uima/fit/maven/GenerateDescriptorsMojo.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/branches/UIMA-2562/uimafit-maven-plugin/src/main/java/org/apache/uima/fit/maven/GenerateDescriptorsMojo.java?rev=1431571&r1=1431570&r2=1431571&view=diff
==============================================================================
--- uima/sandbox/uimafit/branches/UIMA-2562/uimafit-maven-plugin/src/main/java/org/apache/uima/fit/maven/GenerateDescriptorsMojo.java (original)
+++ uima/sandbox/uimafit/branches/UIMA-2562/uimafit-maven-plugin/src/main/java/org/apache/uima/fit/maven/GenerateDescriptorsMojo.java Thu Jan 10 19:27:54 2013
@@ -60,7 +60,6 @@ public class GenerateDescriptorsMojo
private ClassLoader componentLoader;
- @Override
public void execute()
throws MojoExecutionException
{
Modified: uima/sandbox/uimafit/branches/UIMA-2562/uimafit/src/main/java/org/apache/uima/fit/component/Resource_ImplBase.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/branches/UIMA-2562/uimafit/src/main/java/org/apache/uima/fit/component/Resource_ImplBase.java?rev=1431571&r1=1431570&r2=1431571&view=diff
==============================================================================
--- uima/sandbox/uimafit/branches/UIMA-2562/uimafit/src/main/java/org/apache/uima/fit/component/Resource_ImplBase.java (original)
+++ uima/sandbox/uimafit/branches/UIMA-2562/uimafit/src/main/java/org/apache/uima/fit/component/Resource_ImplBase.java Thu Jan 10 19:27:54 2013
@@ -63,12 +63,10 @@ public abstract class Resource_ImplBase
return true;
}
- @Override
public String getResourceName() {
return resourceName;
}
- @Override
public void afterResourcesInitialized() {
// Per default nothing is done here.
}
Modified: uima/sandbox/uimafit/branches/UIMA-2562/uimafit/src/main/java/org/apache/uima/fit/pipeline/JCasIterable.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/branches/UIMA-2562/uimafit/src/main/java/org/apache/uima/fit/pipeline/JCasIterable.java?rev=1431571&r1=1431570&r2=1431571&view=diff
==============================================================================
--- uima/sandbox/uimafit/branches/UIMA-2562/uimafit/src/main/java/org/apache/uima/fit/pipeline/JCasIterable.java (original)
+++ uima/sandbox/uimafit/branches/UIMA-2562/uimafit/src/main/java/org/apache/uima/fit/pipeline/JCasIterable.java Thu Jan 10 19:27:54 2013
@@ -85,12 +85,10 @@ public class JCasIterable implements Ite
this.jCas = CasCreationUtils.createCas(metaData).getJCas();
}
- @Override
public Iterator<JCas> iterator() {
return this;
}
- @Override
public boolean hasNext() {
try {
return this.collectionReader.hasNext();
@@ -103,7 +101,6 @@ public class JCasIterable implements Ite
}
}
- @Override
public JCas next() {
this.jCas.reset();
try {
@@ -124,7 +121,6 @@ public class JCasIterable implements Ite
return this.jCas;
}
- @Override
public void remove() {
throw new UnsupportedOperationException();
}
Modified: uima/sandbox/uimafit/branches/UIMA-2562/uimafit/src/test/java/org/apache/uima/fit/factory/AggregateWithReaderTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/branches/UIMA-2562/uimafit/src/test/java/org/apache/uima/fit/factory/AggregateWithReaderTest.java?rev=1431571&r1=1431570&r2=1431571&view=diff
==============================================================================
--- uima/sandbox/uimafit/branches/UIMA-2562/uimafit/src/test/java/org/apache/uima/fit/factory/AggregateWithReaderTest.java (original)
+++ uima/sandbox/uimafit/branches/UIMA-2562/uimafit/src/test/java/org/apache/uima/fit/factory/AggregateWithReaderTest.java Thu Jan 10 19:27:54 2013
@@ -168,23 +168,19 @@ public class AggregateWithReaderTest {
public static class SimpleReader extends CollectionReader_ImplBase {
private boolean done = false;
- @Override
public void getNext(CAS aCAS) throws IOException, CollectionException {
aCAS.setDocumentText("Anyone up for a game of Foosball?");
done = true;
}
- @Override
public boolean hasNext() throws IOException, CollectionException {
return !done;
}
- @Override
public Progress[] getProgress() {
return new Progress[0];
}
- @Override
public void close() throws IOException {
// Nothing to do
}
Modified: uima/sandbox/uimafit/branches/UIMA-2562/uimafit/src/test/java/org/apache/uima/fit/factory/CollectionReaderFactoryTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/branches/UIMA-2562/uimafit/src/test/java/org/apache/uima/fit/factory/CollectionReaderFactoryTest.java?rev=1431571&r1=1431570&r2=1431571&view=diff
==============================================================================
--- uima/sandbox/uimafit/branches/UIMA-2562/uimafit/src/test/java/org/apache/uima/fit/factory/CollectionReaderFactoryTest.java (original)
+++ uima/sandbox/uimafit/branches/UIMA-2562/uimafit/src/test/java/org/apache/uima/fit/factory/CollectionReaderFactoryTest.java Thu Jan 10 19:27:54 2013
@@ -99,7 +99,6 @@ public class CollectionReaderFactoryTest
rie = e;
}
assertNotNull(rie);
-
}
private class TestCR extends CollectionReader_ImplBase {
@@ -108,30 +107,22 @@ public class CollectionReaderFactoryTest
// do not instantiate
}
- @Override
public void getNext(CAS acas) throws IOException, CollectionException {
// TODO Auto-generated method stub
-
}
- @Override
public void close() throws IOException {
// TODO Auto-generated method stub
-
}
- @Override
public Progress[] getProgress() {
// TODO Auto-generated method stub
return null;
}
- @Override
public boolean hasNext() throws IOException, CollectionException {
// TODO Auto-generated method stub
return false;
}
-
}
-
}