Projects >> errai >>4bc69dbcb6d60bc599d8fa44ad2d79557bf7de85

Chunk
Conflicting content
    }
    while (!processingTasksStack.isEmpty());

<<<<<<< HEAD
    final List toSort = injectionContext.getGraphBuilder().build();
    final List list = sortGraph(toSort);

    final File dotFile = new File(RebindUtils.getErraiCacheDir().getAbsolutePath() + "/beangraph.gv");

    RebindUtils.writeStringToFile(dotFile,
            "//\n" +
                    "// Generated IOC bean dependency graph in GraphViz DOT format.\n" +
                    "//\n\n" +
                    GraphBuilder.toDOTRepresentation(list));

    for (final SortUnit unit : list) {
      if (unit.isCyclicGraph()) {
        final Set knownCycles = new HashSet();
        knownCycles.add(unit.getType().getFullyQualifiedName());

        for (final SortUnit dep : unit.getDependencies()) {
          if (dep.isCyclicGraph()) {
            knownCycles.add(dep.getType().getFullyQualifiedName());
          }
        }

        injectionContext.addKnownTypesWithCycles(knownCycles);
      }
    }
=======
    List toSort = graphBuilder.build();
 //   List list = sortGraph(toSort);
>>>>>>> e64d3fdea7cceb23860bd012484bf53cc1225b5f

    final Set> partitions = sortAndPartitionGraph(toSort);
    for (final List partitionList : partitions) {
Solution content
    }
    while (!processingTasksStack.isEmpty());

    final List toSort = injectionContext.getGraphBuilder().build();
    final List list = GraphSort.sortGraph(toSort);

    final File dotFile = new File(RebindUtils.getErraiCacheDir().getAbsolutePath() + "/beangraph.gv");

    RebindUtils.writeStringToFile(dotFile,
            "//\n" +
                    "// Generated IOC bean dependency graph in GraphViz DOT format.\n" +
                    "//\n\n" +
                    GraphBuilder.toDOTRepresentation(list));

    for (final SortUnit unit : list) {
      if (unit.isCyclicGraph()) {
        final Set knownCycles = new HashSet();
        knownCycles.add(unit.getType().getFullyQualifiedName());

        for (final SortUnit dep : unit.getDependencies()) {
          if (dep.isCyclicGraph()) {
            knownCycles.add(dep.getType().getFullyQualifiedName());
          }
        }

        injectionContext.addKnownTypesWithCycles(knownCycles);
      }
    }

    final Set> partitions = sortAndPartitionGraph(toSort);
    for (final List partitionList : partitions) {
File
IOCProcessorFactory.java
Developer's decision
Manual
Kind of conflict
Comment
For statement
Method invocation
Variable