Author: maxcom
Date: Thu Feb 24 11:25:37 2011
New Revision: 1074113
URL: http://svn.apache.org/viewvc?rev=1074113&view=rev
Log:
tika-server: fix compilation under Java 1.5 - remove @Override on interface
implementations
Modified:
tika/trunk/tika-server/src/main/java/org/apache/tika/server/MetadataResource.java
tika/trunk/tika-server/src/main/java/org/apache/tika/server/TikaExceptionMapper.java
tika/trunk/tika-server/src/main/java/org/apache/tika/server/TikaResource.java
tika/trunk/tika-server/src/main/java/org/apache/tika/server/UnpackerResource.java
tika/trunk/tika-server/src/main/java/org/apache/tika/server/ZipOutput.java
Modified:
tika/trunk/tika-server/src/main/java/org/apache/tika/server/MetadataResource.java
URL:
http://svn.apache.org/viewvc/tika/trunk/tika-server/src/main/java/org/apache/tika/server/MetadataResource.java?rev=1074113&r1=1074112&r2=1074113&view=diff
==============================================================================
---
tika/trunk/tika-server/src/main/java/org/apache/tika/server/MetadataResource.java
(original)
+++
tika/trunk/tika-server/src/main/java/org/apache/tika/server/MetadataResource.java
Thu Feb 24 11:25:37 2011
@@ -60,7 +60,6 @@ public class MetadataResource {
fillMetadata ( httpHeaders, metadata );
return new StreamingOutput() {
- @Override
public void write(OutputStream outputStream) throws IOException,
WebApplicationException {
CSVWriter writer = new CSVWriter(new OutputStreamWriter(outputStream));
for (String name : metadata.names()) {
@@ -90,7 +89,6 @@ public class MetadataResource {
if (mediaType == null ||
mediaType.equals(javax.ws.rs.core.MediaType.APPLICATION_OCTET_STREAM_TYPE ))
return (new TikaConfig()).getMimeRepository();
else return new Detector() {
- @Override
public MediaType detect(InputStream inputStream, Metadata metadata)
throws IOException {
return MediaType.parse( mediaType.toString() );
}
Modified:
tika/trunk/tika-server/src/main/java/org/apache/tika/server/TikaExceptionMapper.java
URL:
http://svn.apache.org/viewvc/tika/trunk/tika-server/src/main/java/org/apache/tika/server/TikaExceptionMapper.java?rev=1074113&r1=1074112&r2=1074113&view=diff
==============================================================================
---
tika/trunk/tika-server/src/main/java/org/apache/tika/server/TikaExceptionMapper.java
(original)
+++
tika/trunk/tika-server/src/main/java/org/apache/tika/server/TikaExceptionMapper.java
Thu Feb 24 11:25:37 2011
@@ -25,7 +25,6 @@ import javax.ws.rs.ext.Provider;
@Provider
public class TikaExceptionMapper implements ExceptionMapper<TikaException> {
- @Override
public Response toResponse(TikaException e) {
if (e.getCause() !=null && e.getCause() instanceof
WebApplicationException) {
return ((WebApplicationException) e.getCause()).getResponse();
Modified:
tika/trunk/tika-server/src/main/java/org/apache/tika/server/TikaResource.java
URL:
http://svn.apache.org/viewvc/tika/trunk/tika-server/src/main/java/org/apache/tika/server/TikaResource.java?rev=1074113&r1=1074112&r2=1074113&view=diff
==============================================================================
---
tika/trunk/tika-server/src/main/java/org/apache/tika/server/TikaResource.java
(original)
+++
tika/trunk/tika-server/src/main/java/org/apache/tika/server/TikaResource.java
Thu Feb 24 11:25:37 2011
@@ -62,12 +62,10 @@ public class TikaResource {
return parser.getSupportedTypes(parseContext);
}
- @Override
public void parse(InputStream inputStream, ContentHandler
contentHandler, Metadata metadata, ParseContext parseContext) {
throw new
WebApplicationException(Response.Status.UNSUPPORTED_MEDIA_TYPE);
}
- @Override
public void parse(InputStream inputStream, ContentHandler
contentHandler, Metadata metadata) {
throw new
WebApplicationException(Response.Status.UNSUPPORTED_MEDIA_TYPE);
}
@@ -85,7 +83,6 @@ public class TikaResource {
final Detector detector = parser.getDetector();
parser.setDetector(new Detector() {
- @Override
public MediaType detect(InputStream inputStream, Metadata metadata)
throws IOException {
String ct =
metadata.get(org.apache.tika.metadata.HttpHeaders.CONTENT_TYPE);
@@ -109,7 +106,6 @@ public class TikaResource {
fillMetadata(parser, metadata, httpHeaders);
return new StreamingOutput() {
- @Override
public void write(OutputStream outputStream) throws IOException,
WebApplicationException {
BodyContentHandler body = new BodyContentHandler(outputStream);
Modified:
tika/trunk/tika-server/src/main/java/org/apache/tika/server/UnpackerResource.java
URL:
http://svn.apache.org/viewvc/tika/trunk/tika-server/src/main/java/org/apache/tika/server/UnpackerResource.java?rev=1074113&r1=1074112&r2=1074113&view=diff
==============================================================================
---
tika/trunk/tika-server/src/main/java/org/apache/tika/server/UnpackerResource.java
(original)
+++
tika/trunk/tika-server/src/main/java/org/apache/tika/server/UnpackerResource.java
Thu Feb 24 11:25:37 2011
@@ -109,12 +109,10 @@ public class UnpackerResource {
this.zout = zout;
}
- @Override
public boolean shouldParseEmbedded(Metadata metadata) {
return true;
}
- @Override
public void parseEmbedded(InputStream inputStream, ContentHandler
contentHandler, Metadata metadata, boolean b) throws SAXException, IOException {
ByteArrayOutputStream bos = new ByteArrayOutputStream();
IOUtils.copy(inputStream, bos);
@@ -168,7 +166,6 @@ public class UnpackerResource {
final String finalName = name;
zout.put(new PartExtractor<byte[]>() {
- @Override
public void extract(byte[] part, ZipOutputStream output) throws
IOException {
ZipUtils.zipStoreBuffer(output, finalName, part);
}
Modified:
tika/trunk/tika-server/src/main/java/org/apache/tika/server/ZipOutput.java
URL:
http://svn.apache.org/viewvc/tika/trunk/tika-server/src/main/java/org/apache/tika/server/ZipOutput.java?rev=1074113&r1=1074112&r2=1074113&view=diff
==============================================================================
--- tika/trunk/tika-server/src/main/java/org/apache/tika/server/ZipOutput.java
(original)
+++ tika/trunk/tika-server/src/main/java/org/apache/tika/server/ZipOutput.java
Thu Feb 24 11:25:37 2011
@@ -36,7 +36,6 @@ public class ZipOutput implements Stream
this.parts.put(extractor, parts);
}
- @Override
public void write(OutputStream outputStream) throws IOException,
WebApplicationException {
ZipOutputStream zip = new ZipOutputStream(outputStream);
