Layered: Fix hierarchy handling problem. #735

Signed-off-by: le-cds <zephanya@web.de>
(cherry picked from commit df30228)

Author: le-cds

plugins/org.eclipse.elk.alg.layered/src/org/eclipse/elk/alg/layered/graph/transform/ElkGraphImporter.java

@@ -407,8 +407,10 @@ private void importHierarchicalGraph(final ElkNode elkgraph, final LGraph lgraph
                 for (ElkNode elkChildGraphNode : elkGraphNode.getChildren()) {
                     boolean usesElkLayered = !elkChildGraphNode.hasProperty(CoreOptions.ALGORITHM)
                             || elkChildGraphNode.getProperty(CoreOptions.ALGORITHM).equals(LayeredOptions.ALGORITHM_ID);
+                    boolean partOfSameLayoutRun = elkChildGraphNode.getProperty(LayeredOptions.HIERARCHY_HANDLING)
+                            == HierarchyHandling.INCLUDE_CHILDREN;
 
-                    if (usesElkLayered) {
+                    if (usesElkLayered && partOfSameLayoutRun) {
                         elkGraphQueue.add(elkChildGraphNode);
                     }
                 }

plugins/org.eclipse.elk.core/src/org/eclipse/elk/core/options/HierarchyHandling.java

@@ -36,8 +36,8 @@ public enum HierarchyHandling {
     INHERIT,
 
     /**
-     * Allows the node's children should be included in the current layout run. Which children are included in the
-     * layout run is determined by their hierarchy handling setting. For a child to actually be included, its hierarchy
+     * Allows the node's children to be included in the current layout run. Which children are included in the layout
+     * run is determined by their hierarchy handling setting. For a child to actually be included, its hierarchy
      * handling must be set to either {@link #INHERIT} or {@link #INCLUDE_CHILDREN}.
      */
     INCLUDE_CHILDREN,

test/org.eclipse.elk.alg.layered.test/src/org/eclipse/elk/alg/layered/issues/Issue700Test.java

@@ -44,7 +44,8 @@ public List<AbstractResourcePath> testGraphs() {
         // The bug was introduced while fixing #665, so ensure that the fix for #700 does not return the favour...
         return Lists.newArrayList(
                 new ModelResourcePath("tickets/layered/**").withFilter(new FileNameFilter("665.+\\.elkt")),
-                new ModelResourcePath("tickets/layered/**").withFilter(new FileNameFilter("700.+\\.elkt")));
+                new ModelResourcePath("tickets/layered/**").withFilter(new FileNameFilter("700.+\\.elkt")),
+                new ModelResourcePath("examples/hierarchy/**"));
     }
 
     //////////////////////////////////////////////////////////////////////////////////////////////////////////////