1 files changed, 9 insertions, 25 deletions
diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/ModuleGraphWriter.java b/jetty-start/src/main/java/org/eclipse/jetty/start/ModuleGraphWriter.java
index 48f18a2d3b..f262daf786 100644
--- a/jetty-start/src/main/java/org/eclipse/jetty/start/ModuleGraphWriter.java
+++ b/jetty-start/src/main/java/org/eclipse/jetty/start/ModuleGraphWriter.java
@@ -25,13 +25,8 @@ import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardOpenOption;
-import java.util.Collection;
 import java.util.List;
 
-import org.eclipse.jetty.start.graph.Graph;
-import org.eclipse.jetty.start.graph.Node;
-import org.eclipse.jetty.start.graph.Selection;
-
 /**
  * Generate a graphviz dot graph of the modules found
  */
@@ -186,7 +181,7 @@ public class ModuleGraphWriter
         if (module.isSelected())
         {
             writeModuleDetailHeader(out,"ENABLED");
-            for (Selection selection : module.getSelections())
+            for (String selection : module.getSelections())
             {
                 writeModuleDetailLine(out,"via: " + selection);
             }
@@ -233,32 +228,21 @@ public class ModuleGraphWriter
 
         out.println("  node [ labeljust = l ];");
 
-        for (int depth = 0; depth <= allmodules.getMaxDepth(); depth++)
+        for (Module module: allmodules)
         {
-            out.println();
-            Collection<Module> depthModules = allmodules.getModulesAtDepth(depth);
-            if (depthModules.size() > 0)
-            {
-                out.printf("  /* Level %d */%n",depth);
-                out.println("  { rank = same;");
-                for (Module module : depthModules)
-                {
-                    boolean resolved = enabled.contains(module);
-                    writeModuleNode(out,module,resolved);
-                }
-                out.println("  }");
-            }
+            boolean resolved = enabled.contains(module);
+            writeModuleNode(out,module,resolved);
         }
     }
 
-    private void writeRelationships(PrintWriter out, Graph<Module> modules, List<Module> enabled)
+    private void writeRelationships(PrintWriter out, Iterable<Module> modules, List<Module> enabled)
     {
         for (Module module : modules)
         {
-            for (Node<?> parent : module.getParentEdges())
-            {
-                out.printf("    \"%s\" -> \"%s\";%n",module.getName(),parent.getName());
-            }
+            for (String depends : module.getDepends())
+                out.printf("    \"%s\" -> \"%s\";%n",module.getName(),depends);
+            for (String optional : module.getOptional())
+                out.printf("    \"%s\" => \"%s\";%n",module.getName(),optional);
         }
     }
 }