Update of /var/cvs/applications/resources/src/org/mmbase/util/images
In directory james.mmbase.org:/tmp/cvs-serv13043/util/images
Modified Files:
Factory.java ImageMagickImageConverter.java
Log Message:
See also:
http://cvs.mmbase.org/viewcvs/applications/resources/src/org/mmbase/util/images
Index: Factory.java
===================================================================
RCS file:
/var/cvs/applications/resources/src/org/mmbase/util/images/Factory.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- Factory.java 23 Sep 2008 07:42:48 -0000 1.5
+++ Factory.java 24 Sep 2008 05:54:30 -0000 1.6
@@ -23,14 +23,14 @@
*
* @author Michiel Meeuwissen
* @since MMBase-1.8
- * @version $Id: Factory.java,v 1.5 2008/09/23 07:42:48 michiel Exp $
+ * @version $Id: Factory.java,v 1.6 2008/09/24 05:54:30 michiel Exp $
*/
public class Factory {
private static final Logger log = Logging.getLoggerInstance(Factory.class);
private static ImageInformer imageInformer;
- protected static Map<String, String> params = new HashMap<String,
String>();
+ protected static final Map<String, String> params = new HashMap<String,
String>();
/**
* The ImageConvertInterface implementation to be used (defaults to
ConvertImageMagic)
@@ -52,6 +52,7 @@
protected static String defaultImageFormat = "jpeg";
public static void init(Map<String, String> properties) {
+ params.clear();
params.putAll(properties);
String tmp = properties.get("MaxConcurrentRequests");
Index: ImageMagickImageConverter.java
===================================================================
RCS file:
/var/cvs/applications/resources/src/org/mmbase/util/images/ImageMagickImageConverter.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- ImageMagickImageConverter.java 3 Sep 2008 17:21:00 -0000 1.10
+++ ImageMagickImageConverter.java 24 Sep 2008 05:54:30 -0000 1.11
@@ -27,7 +27,7 @@
* @author Michiel Meeuwissen
* @author Nico Klasens
* @author Jaco de Groot
- * @version $Id: ImageMagickImageConverter.java,v 1.10 2008/09/03 17:21:00
michiel Exp $
+ * @version $Id: ImageMagickImageConverter.java,v 1.11 2008/09/24 05:54:30
michiel Exp $
*/
public class ImageMagickImageConverter extends AbstractImageConverter
implements ImageConverter {
private static final Logger log =
Logging.getLoggerInstance(ImageMagickImageConverter.class);
@@ -115,7 +115,7 @@
}
}
- String configFile = params.get("configfile").toString();
+ String configFile = params.get("configfile");
if (configFile == null) configFile = "images builder xml";
converterPath = converterCommand; // default.
@@ -158,8 +158,8 @@
launcher.execute(converterPath, cmd.toArray(EMPTY));
launcher.waitAndRead(outputStream, errorStream);
} catch (ProcessException e) {
- log.error("Convert test failed. " + converterPath + " (" +
e.toString() + ") conv.root='" + converterRoot
- + "' conv.command='" + converterCommand + "'", e);
+ log.error("Convert test failed. " + converterPath + " (" +
e.getMessage() + ") conv.root='" + converterRoot
+ + "' conv.command='" + converterCommand + "'");
}
break;
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
