[jboss-cvs] JBossAS SVN: r106817 - in projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher: graph and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Jul 19 10:34:53 EDT 2010
Author: alesj
Date: 2010-07-19 10:34:53 -0400 (Mon, 19 Jul 2010)
New Revision: 106817
Added:
projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/render/AbstractRenderer.java
Modified:
projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/analysis/AbstractHtmlRenderer.java
projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/analysis/SubGraphRenderer.java
projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/graph/DefaultDependencyTypeMapper.java
projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/graph/DependencyType.java
projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/graph/DependsOnMeDependencyType.java
projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/graph/IDependOnDependencyType.java
projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/graph/UnresolvedDependencyType.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/HtmlRenderer.java
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
projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/render/Renderer.java
projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/render/SVGRenderer.java
Log:
Apply dependency type to roots check.
Modified: projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/analysis/AbstractHtmlRenderer.java
===================================================================
--- projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/analysis/AbstractHtmlRenderer.java 2010-07-19 13:51:24 UTC (rev 106816)
+++ projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/analysis/AbstractHtmlRenderer.java 2010-07-19 14:34:53 UTC (rev 106817)
@@ -25,21 +25,28 @@
import java.io.IOException;
import java.io.OutputStream;
-import org.jboss.mctools.grapher.render.Renderer;
+import org.jboss.mctools.grapher.graph.DependencyType;
+import org.jboss.mctools.grapher.render.AbstractRenderer;
import org.jgraph.JGraph;
/**
* @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
*/
-public abstract class AbstractHtmlRenderer implements Renderer
+public abstract class AbstractHtmlRenderer extends AbstractRenderer
{
public void render(JGraph graph, OutputStream writer, int inset) throws IOException
{
+ render(graph, null, writer, inset);
+ }
+
+ @Override
+ public void render(JGraph graph, DependencyType dtype, OutputStream writer, int inset) throws IOException
+ {
writer.write("<html>".getBytes());
writer.write("<head>".getBytes());
writer.write("<body>".getBytes());
- doAnalyse(graph, writer);
+ doAnalyse(graph, dtype, writer);
writer.write("</body>".getBytes());
writer.write("</html>".getBytes());
}
@@ -48,8 +55,9 @@
* Do analyse graph.
*
* @param graph the graph
+ * @param dtype the dependency type
* @param writer the writer
* @throws IOException for any IO error
*/
- protected abstract void doAnalyse(JGraph graph, OutputStream writer) throws IOException;
+ protected abstract void doAnalyse(JGraph graph, DependencyType dtype, OutputStream writer) throws IOException;
}
Modified: projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/analysis/SubGraphRenderer.java
===================================================================
--- projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/analysis/SubGraphRenderer.java 2010-07-19 13:51:24 UTC (rev 106816)
+++ projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/analysis/SubGraphRenderer.java 2010-07-19 14:34:53 UTC (rev 106817)
@@ -29,6 +29,7 @@
import java.util.List;
import java.util.Set;
+import org.jboss.mctools.grapher.graph.DependencyType;
import org.jboss.mctools.grapher.graph.GVertex;
import org.jboss.util.graph.Edge;
import org.jboss.util.graph.Vertex;
@@ -44,7 +45,7 @@
public class SubGraphRenderer extends AbstractHtmlRenderer
{
@Override
- protected void doAnalyse(JGraph graph, OutputStream writer) throws IOException
+ protected void doAnalyse(JGraph graph, DependencyType dtype, OutputStream writer) throws IOException
{
List<Set<Vertex>> groups = new ArrayList<Set<Vertex>>();
Set<Vertex> visited = new HashSet<Vertex>();
@@ -75,13 +76,13 @@
List<Vertex> roots = new ArrayList<Vertex>();
for (Vertex v : sv)
{
- if (v.getOutgoingEdgeCount() == 0)
+ if (dtype != null && dtype.isRoot(v))
roots.add(v);
writer.write(("<li>" + v + "</li>").getBytes());
}
writer.write("</ul>".getBytes());
- if (sv.size() > 1)
+ if (sv.size() > 1 && roots.isEmpty() == false)
{
writer.write(("<ul>Roots: ").getBytes());
for (Vertex rv : roots)
Modified: projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/graph/DefaultDependencyTypeMapper.java
===================================================================
--- projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/graph/DefaultDependencyTypeMapper.java 2010-07-19 13:51:24 UTC (rev 106816)
+++ projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/graph/DefaultDependencyTypeMapper.java 2010-07-19 14:34:53 UTC (rev 106817)
@@ -53,4 +53,4 @@
else
return DependencyTypes.IDependOn;
}
-}
\ No newline at end of file
+}
Modified: projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/graph/DependencyType.java
===================================================================
--- projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/graph/DependencyType.java 2010-07-19 13:51:24 UTC (rev 106816)
+++ projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/graph/DependencyType.java 2010-07-19 14:34:53 UTC (rev 106817)
@@ -25,6 +25,7 @@
import org.jboss.dependency.spi.DependencyInfo;
import org.jboss.dependency.spi.DependencyItem;
+import org.jboss.util.graph.Vertex;
/**
* Dependency type.
@@ -60,4 +61,12 @@
* @return edge order array
*/
Object[] getEdgeOrder(Object owner, Object dependency);
+
+ /**
+ * Is the vertext root.
+ *
+ * @param vertex the vertex
+ * @return true if root, false otherwise
+ */
+ boolean isRoot(Vertex vertex);
}
Modified: projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/graph/DependsOnMeDependencyType.java
===================================================================
--- projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/graph/DependsOnMeDependencyType.java 2010-07-19 13:51:24 UTC (rev 106816)
+++ projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/graph/DependsOnMeDependencyType.java 2010-07-19 14:34:53 UTC (rev 106817)
@@ -25,6 +25,7 @@
import org.jboss.dependency.spi.DependencyInfo;
import org.jboss.dependency.spi.DependencyItem;
+import org.jboss.util.graph.Vertex;
/**
* DependsOnMe dependency type.
@@ -56,4 +57,9 @@
{
return new Object[]{dependency, owner};
}
+
+ public boolean isRoot(Vertex vertex)
+ {
+ return vertex.getIncomingEdgeCount() == 0;
+ }
}
\ No newline at end of file
Modified: projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/graph/IDependOnDependencyType.java
===================================================================
--- projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/graph/IDependOnDependencyType.java 2010-07-19 13:51:24 UTC (rev 106816)
+++ projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/graph/IDependOnDependencyType.java 2010-07-19 14:34:53 UTC (rev 106817)
@@ -25,6 +25,7 @@
import org.jboss.dependency.spi.DependencyInfo;
import org.jboss.dependency.spi.DependencyItem;
+import org.jboss.util.graph.Vertex;
/**
* IDependOn dependency type.
@@ -56,4 +57,9 @@
{
return new Object[]{owner, dependency};
}
+
+ public boolean isRoot(Vertex vertex)
+ {
+ return vertex.getOutgoingEdgeCount() == 0;
+ }
}
\ No newline at end of file
Modified: projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/graph/UnresolvedDependencyType.java
===================================================================
--- projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/graph/UnresolvedDependencyType.java 2010-07-19 13:51:24 UTC (rev 106816)
+++ projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/graph/UnresolvedDependencyType.java 2010-07-19 14:34:53 UTC (rev 106817)
@@ -26,6 +26,7 @@
import org.jboss.dependency.spi.ControllerState;
import org.jboss.dependency.spi.DependencyInfo;
import org.jboss.dependency.spi.DependencyItem;
+import org.jboss.util.graph.Vertex;
/**
* Unresolved dependency type.
@@ -59,4 +60,9 @@
{
return new Object[]{owner, dependency};
}
+
+ public boolean isRoot(Vertex vertex)
+ {
+ return false;
+ }
}
\ No newline at end of file
Copied: projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/render/AbstractRenderer.java (from rev 104079, projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/render/Renderer.java)
===================================================================
--- projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/render/AbstractRenderer.java (rev 0)
+++ projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/render/AbstractRenderer.java 2010-07-19 14:34:53 UTC (rev 106817)
@@ -0,0 +1,42 @@
+/*
+ * 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.io.IOException;
+import java.io.OutputStream;
+
+import org.jboss.mctools.grapher.graph.DependencyType;
+
+import org.jgraph.JGraph;
+
+/**
+ * Abstract Renderer.
+ *
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public abstract class AbstractRenderer implements Renderer
+{
+ public void render(JGraph graph, DependencyType dtype, OutputStream writer, int inset) throws IOException
+ {
+ render(graph, writer, inset);
+ }
+}
\ No newline at end of file
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 2010-07-19 13:51:24 UTC (rev 106816)
+++ projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/render/GIFRenderer.java 2010-07-19 14:34:53 UTC (rev 106817)
@@ -36,7 +36,7 @@
*
* @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
*/
-public class GIFRenderer implements Renderer
+public class GIFRenderer extends AbstractRenderer
{
public void render(JGraph graph, OutputStream writer, int inset) throws IOException
{
Modified: projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/render/HtmlRenderer.java
===================================================================
--- projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/render/HtmlRenderer.java 2010-07-19 13:51:24 UTC (rev 106816)
+++ projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/render/HtmlRenderer.java 2010-07-19 14:34:53 UTC (rev 106817)
@@ -37,7 +37,7 @@
*
* @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
*/
-public class HtmlRenderer implements Renderer
+public class HtmlRenderer extends AbstractRenderer
{
private static final Comparator<Object> COMPARATOR = new CellComparator();
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 2010-07-19 13:51:24 UTC (rev 106816)
+++ projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/render/JPGRenderer.java 2010-07-19 14:34:53 UTC (rev 106817)
@@ -35,7 +35,7 @@
*
* @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
*/
-public class JPGRenderer implements Renderer
+public class JPGRenderer extends AbstractRenderer
{
public void render(JGraph graph, OutputStream writer, int inset) throws IOException
{
Modified: projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/render/PNGRenderer.java
===================================================================
--- projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/render/PNGRenderer.java 2010-07-19 13:51:24 UTC (rev 106816)
+++ projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/render/PNGRenderer.java 2010-07-19 14:34:53 UTC (rev 106817)
@@ -34,7 +34,7 @@
*
* @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
*/
-public class PNGRenderer implements Renderer
+public class PNGRenderer extends AbstractRenderer
{
public void render(JGraph graph, OutputStream writer, int inset) throws IOException
{
Modified: projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/render/Renderer.java
===================================================================
--- projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/render/Renderer.java 2010-07-19 13:51:24 UTC (rev 106816)
+++ projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/render/Renderer.java 2010-07-19 14:34:53 UTC (rev 106817)
@@ -24,6 +24,8 @@
import java.io.IOException;
import java.io.OutputStream;
+import org.jboss.mctools.grapher.graph.DependencyType;
+
import org.jgraph.JGraph;
/**
@@ -42,4 +44,15 @@
* @throws IOException for any error
*/
void render(JGraph graph, OutputStream writer, int inset) throws IOException;
+
+ /**
+ * Do render.
+ *
+ * @param graph the current graph
+ * @param dtype dependency type
+ * @param writer the writer to render into
+ * @param inset the inset
+ * @throws IOException for any error
+ */
+ void render(JGraph graph, DependencyType dtype, OutputStream writer, int inset) throws IOException;
}
Modified: projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/render/SVGRenderer.java
===================================================================
--- projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/render/SVGRenderer.java 2010-07-19 13:51:24 UTC (rev 106816)
+++ projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/render/SVGRenderer.java 2010-07-19 14:34:53 UTC (rev 106817)
@@ -39,7 +39,7 @@
*
* @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
*/
-public class SVGRenderer implements Renderer
+public class SVGRenderer extends AbstractRenderer
{
public void render(JGraph graph, OutputStream out, int inset) throws IOException
{
More information about the jboss-cvs-commits
mailing list