[jboss-cvs] JBossAS SVN: r90961 - in projects/mc-tools/grapher/trunk/src: main/java/org/jboss/mctools/grapher/render and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Jul 8 17:58:44 EDT 2009
Author: alesj
Date: 2009-07-08 17:58:44 -0400 (Wed, 08 Jul 2009)
New Revision: 90961
Added:
projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/render/PNGRenderer.java
Modified:
projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/GrapherServlet.java
projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/render/GIFRenderer.java
projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/render/JPGRenderer.java
projects/mc-tools/grapher/trunk/src/test/java/org/jboss/test/mctools/grapher/render/test/AbstractRendererTest.java
projects/mc-tools/grapher/trunk/src/test/java/org/jboss/test/mctools/grapher/render/test/ManualGraphWrite2FileTestCase.java
Log:
Add PNG.
Modified: projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/GrapherServlet.java
===================================================================
--- projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/GrapherServlet.java 2009-07-08 21:31:26 UTC (rev 90960)
+++ projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/GrapherServlet.java 2009-07-08 21:58:44 UTC (rev 90961)
@@ -36,10 +36,11 @@
import org.jboss.logging.Logger;
import org.jboss.mc.servlet.vdf.api.KernelControllerVDFConnector;
import org.jboss.mctools.grapher.graph.GraphCreator;
+import org.jboss.mctools.grapher.map.DefaultGraphCreatorMapper;
import org.jboss.mctools.grapher.map.GraphCreatorMapper;
-import org.jboss.mctools.grapher.map.DefaultGraphCreatorMapper;
import org.jboss.mctools.grapher.render.GIFRenderer;
import org.jboss.mctools.grapher.render.JPGRenderer;
+import org.jboss.mctools.grapher.render.PNGRenderer;
import org.jboss.mctools.grapher.render.Renderer;
import org.jboss.mctools.grapher.render.SVGRenderer;
import org.jgraph.JGraph;
@@ -85,6 +86,7 @@
renderers = new HashMap<String, Renderer>();
renderers.put("svg", new SVGRenderer());
renderers.put("jpg", new JPGRenderer());
+ renderers.put("png", new PNGRenderer());
renderers.put("gif", new GIFRenderer());
// do we have short extension
Modified: projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/render/GIFRenderer.java
===================================================================
--- projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/render/GIFRenderer.java 2009-07-08 21:31:26 UTC (rev 90960)
+++ projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/render/GIFRenderer.java 2009-07-08 21:58:44 UTC (rev 90961)
@@ -40,13 +40,9 @@
{
public void render(JGraph graph, OutputStream writer, int inset) throws IOException
{
- if (graph.getModel().getRootCount() > 0)
- {
- BufferedImage img = GraphUtilities.toImage(graph, null, inset);
- writer.write(convertToGif(img));
- // Write to file
- writer.flush();
- }
+ BufferedImage img = GraphUtilities.toImage(graph, null, inset);
+ writer.write(convertToGif(img));
+ writer.flush();
}
/**
Modified: projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/render/JPGRenderer.java
===================================================================
--- projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/render/JPGRenderer.java 2009-07-08 21:31:26 UTC (rev 90960)
+++ projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/render/JPGRenderer.java 2009-07-08 21:58:44 UTC (rev 90961)
@@ -39,10 +39,8 @@
{
public void render(JGraph graph, OutputStream writer, int inset) throws IOException
{
- if (graph.getModel().getRootCount() > 0)
- {
- BufferedImage img = GraphUtilities.toImage(graph, Color.WHITE, 5);
- ImageIO.write(img, "jpg", writer);
- }
+ BufferedImage img = GraphUtilities.toImage(graph, Color.WHITE, inset);
+ ImageIO.write(img, "jpg", writer);
+ writer.flush();
}
}
\ No newline at end of file
Copied: projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/render/PNGRenderer.java (from rev 90939, projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/render/JPGRenderer.java)
===================================================================
--- projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/render/PNGRenderer.java (rev 0)
+++ projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/render/PNGRenderer.java 2009-07-08 21:58:44 UTC (rev 90961)
@@ -0,0 +1,47 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.mctools.grapher.render;
+
+import java.awt.*;
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+import java.io.OutputStream;
+import javax.imageio.ImageIO;
+
+import org.jgraph.JGraph;
+
+/**
+ * Render png image.
+ *
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public class PNGRenderer implements Renderer
+{
+ public void render(JGraph graph, OutputStream writer, int inset) throws IOException
+ {
+ Color bg = null; // Use this to make the background transparent
+ //bg = graph.getBackground(); // Use this to use the graph background color
+ BufferedImage img = graph.getImage(bg, inset);
+ ImageIO.write(img, "png", writer);
+ writer.flush();
+ }
+}
\ No newline at end of file
Modified: projects/mc-tools/grapher/trunk/src/test/java/org/jboss/test/mctools/grapher/render/test/AbstractRendererTest.java
===================================================================
--- projects/mc-tools/grapher/trunk/src/test/java/org/jboss/test/mctools/grapher/render/test/AbstractRendererTest.java 2009-07-08 21:31:26 UTC (rev 90960)
+++ projects/mc-tools/grapher/trunk/src/test/java/org/jboss/test/mctools/grapher/render/test/AbstractRendererTest.java 2009-07-08 21:58:44 UTC (rev 90961)
@@ -22,11 +22,12 @@
package org.jboss.test.mctools.grapher.render.test;
import java.io.OutputStream;
+import java.util.HashMap;
import java.util.Map;
-import java.util.HashMap;
import org.jboss.mctools.grapher.render.GIFRenderer;
import org.jboss.mctools.grapher.render.JPGRenderer;
+import org.jboss.mctools.grapher.render.PNGRenderer;
import org.jboss.mctools.grapher.render.Renderer;
import org.jboss.mctools.grapher.render.SVGRenderer;
import org.jboss.test.mctools.grapher.GrapherTest;
@@ -53,6 +54,7 @@
suffixes.put(SVGRenderer.class, ".svg");
suffixes.put(GIFRenderer.class, ".gif");
suffixes.put(JPGRenderer.class, ".jpg");
+ suffixes.put(PNGRenderer.class, ".png");
}
protected abstract T createOutputStream(String suffix) throws Throwable;
@@ -73,7 +75,7 @@
T out = createOutputStream(suffix);
try
{
- renderer.render(graph, out, 0);
+ renderer.render(graph, out, 100);
testOutputStream(out, suffix);
}
finally
@@ -103,4 +105,9 @@
{
testRenderer(new JPGRenderer());
}
+
+ public void testPNG() throws Throwable
+ {
+ testRenderer(new PNGRenderer());
+ }
}
\ No newline at end of file
Modified: projects/mc-tools/grapher/trunk/src/test/java/org/jboss/test/mctools/grapher/render/test/ManualGraphWrite2FileTestCase.java
===================================================================
--- projects/mc-tools/grapher/trunk/src/test/java/org/jboss/test/mctools/grapher/render/test/ManualGraphWrite2FileTestCase.java 2009-07-08 21:31:26 UTC (rev 90960)
+++ projects/mc-tools/grapher/trunk/src/test/java/org/jboss/test/mctools/grapher/render/test/ManualGraphWrite2FileTestCase.java 2009-07-08 21:58:44 UTC (rev 90961)
@@ -45,7 +45,7 @@
public ManualGraphWrite2FileTestCase(String name)
{
super(name);
- setDeleteFile(false);
+ //setDeleteFile(false);
}
public static Test suite()
More information about the jboss-cvs-commits
mailing list