Author: michiel
Date: 2009-06-29 13:49:30 +0200 (Mon, 29 Jun 2009)
New Revision: 36462
Modified:
mmbase/trunk/applications/resources/src/main/java/org/mmbase/util/images/AbstractImageConverter.java
mmbase/trunk/applications/resources/src/main/java/org/mmbase/util/images/ImageConversionRequestProcessor.java
mmbase/trunk/applications/resources/src/main/java/org/mmbase/util/images/ImageMagickImageConverter.java
mmbase/trunk/applications/resources/src/main/java/org/mmbase/util/images/JAIImageConverter.java
Log:
added some @Overrides, javadoc and so on
Modified:
mmbase/trunk/applications/resources/src/main/java/org/mmbase/util/images/AbstractImageConverter.java
===================================================================
---
mmbase/trunk/applications/resources/src/main/java/org/mmbase/util/images/AbstractImageConverter.java
2009-06-29 11:38:01 UTC (rev 36461)
+++
mmbase/trunk/applications/resources/src/main/java/org/mmbase/util/images/AbstractImageConverter.java
2009-06-29 11:49:30 UTC (rev 36462)
@@ -10,18 +10,24 @@
package org.mmbase.util.images;
import java.io.*;
+import java.util.List;
+import java.util.Map;
+import org.mmbase.util.logging.Logger;
+import org.mmbase.util.logging.Logging;
+
+
/**
- * Abstract implementation of a ImageConverter
+ * Abstract implementation of a ImageConverter. Override either {...@link
convertImage(byte[], String,
+ * List)} or {...@link convertImage(InputStream, String, OutputStream, List)}.
*
* @author Michiel Meeuwissen
* @since MMBase-1.9
*/
-import java.util.List;
-import java.util.Map;
public abstract class AbstractImageConverter implements ImageConverter {
+ private static final Logger log =
Logging.getLoggerInstance(AbstractImageConverter.class);
/**
* @see org.mmbase.util.images.ImageConverter#init(java.util.Map)
@@ -32,7 +38,17 @@
/**
* @see org.mmbase.util.images.ImageConverter#convertImage(byte[],
java.lang.String, java.util.List)
*/
- public abstract byte[] convertImage(byte[] input, String sourceFormat,
List<String> commands);
+ public byte[] convertImage(byte[] input, String sourceFormat, List<String>
commands) {
+ try {
+ ByteArrayInputStream in = new ByteArrayInputStream(input);
+ ByteArrayOutputStream out = new ByteArrayOutputStream();
+ convertImage(in, sourceFormat, out, commands);
+ return out.toByteArray();
+ } catch (IOException ioe) {
+ log.error(ioe);
+ return null;
+ }
+ }
/**
* @see
org.mmbase.util.images.ImageConverter#convertImage(java.io.InputStream,
java.lang.String, java.io.OutputStream, java.util.List)
@@ -41,15 +57,10 @@
byte[] bytes;
if (input instanceof BytesInputStream) {
bytes = ((BytesInputStream) input).getBuffer();
+
} else {
ByteArrayOutputStream in = new ByteArrayOutputStream();
- BufferedOutputStream bufStream = new BufferedOutputStream(in);
- byte[] buf = new byte[1024];
- int b = 0;
- while ((b = input.read(buf)) != -1) {
- bufStream.write(buf, 0, b);
- }
- bufStream.flush();
+ org.mmbase.util.IOUtil.copy(input, in);
bytes = in.toByteArray();
}
byte[] result = convertImage(bytes, sourceFormat, commands);
@@ -57,14 +68,7 @@
return result.length;
}
- public class MyStream extends ByteArrayInputStream {
- MyStream(byte[] b) {
- super(b);
- }
- byte[] getBuffer() {
- return buf;
- }
- }
+
}
Modified:
mmbase/trunk/applications/resources/src/main/java/org/mmbase/util/images/ImageConversionRequestProcessor.java
===================================================================
---
mmbase/trunk/applications/resources/src/main/java/org/mmbase/util/images/ImageConversionRequestProcessor.java
2009-06-29 11:38:01 UTC (rev 36461)
+++
mmbase/trunk/applications/resources/src/main/java/org/mmbase/util/images/ImageConversionRequestProcessor.java
2009-06-29 11:49:30 UTC (rev 36462)
@@ -115,7 +115,7 @@
}
rec.ready();
} else {
- log.warn("processRequest(): Convert problem params : "
+ params);
+ log.warn("Convert problem. params : " + params);
}
} catch (java.io.IOException ioe) {
log.error(ioe);
Modified:
mmbase/trunk/applications/resources/src/main/java/org/mmbase/util/images/ImageMagickImageConverter.java
===================================================================
---
mmbase/trunk/applications/resources/src/main/java/org/mmbase/util/images/ImageMagickImageConverter.java
2009-06-29 11:38:01 UTC (rev 36461)
+++
mmbase/trunk/applications/resources/src/main/java/org/mmbase/util/images/ImageMagickImageConverter.java
2009-06-29 11:49:30 UTC (rev 36462)
@@ -129,6 +129,7 @@
* ImageConvert.ConverterRoot and
ImageConvert.ConverterCommand specifying the converter root, and it can also
contain
* ImageConvert.DefaultImageFormat which can also be 'asis'.
*/
+ @Override
public void init(Map<String, String> params) {
String converterRoot = "";
String converterCommand = "convert";
@@ -281,6 +282,7 @@
* ImageConvert.converterRoot and
ImageConvert.converterCommand specifying the converter root....
* @return an array of <code>byte</code>s containing the new converted
image.
*/
+ @Override
public byte[] convertImage(byte[] input, String sourceFormat, List<String>
commands) {
if (input == null) {
log.error("Converting an empty image does not make sense.");
@@ -617,7 +619,7 @@
cmd.add(format+ ":-");
String command = cmd.toString(); // only for debugging.
- log.info("" + this + " executing " + command);
+ log.service("" + this + " executing " + command);
@@ -655,13 +657,11 @@
byte[] error = errorStream.toByteArray();
if (error.length > 0) {
- log.error("Imagemagick conversion did not succeed. Returning
null.");
String errorMessage = errorStream.toString();
-
if (errorMessage.length() > 0) {
- log.error( "From stderr with command '" + command + "' in
'" + new File("").getAbsolutePath() + "' --> '" + errorMessage + "'");
+ log.error( "From stderr with command '" + command + "' in
'" + new File("").getAbsolutePath() + "' --> '" + errorMessage + "'.");
} else {
- log.warn("No information on stderr found for '" + command
+ "' in " + cwd);
+ log.warn("No information on stderr found for '" + command
+ "' in " + cwd + ".");
}
} else {
// print some info and return....
Modified:
mmbase/trunk/applications/resources/src/main/java/org/mmbase/util/images/JAIImageConverter.java
===================================================================
---
mmbase/trunk/applications/resources/src/main/java/org/mmbase/util/images/JAIImageConverter.java
2009-06-29 11:38:01 UTC (rev 36461)
+++
mmbase/trunk/applications/resources/src/main/java/org/mmbase/util/images/JAIImageConverter.java
2009-06-29 11:49:30 UTC (rev 36462)
@@ -35,6 +35,7 @@
/**
* @javadoc
*/
+ @Override
public void init(Map<String,String> params) {
log.info("Starting JAI convertor");
}
@@ -43,6 +44,7 @@
/**
* @javadoc
*/
+ @Override
public byte[] convertImage(byte[] input, String sourceFormat, List<String>
commands) {
String format;
byte[] pict=null;
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
