Bugfix/win team map (#7)

Author: stefan-ka

src/main/java/guru/nidi/graphviz/engine/Graphviz.java

@@ -209,6 +209,10 @@ Format format() {
         return options.format;
     }
 
+    public Options getOptions() {
+        return options;
+    }
+
     double dpi() {
         final Matcher matcher = DPI_PATTERN.matcher(src);
         return matcher.find() ? Double.parseDouble(matcher.group(1)) : 72;

src/main/java/guru/nidi/graphviz/engine/GraphvizCmdLineEngine.java

@@ -68,8 +68,11 @@ public EngineResult execute(String src, Options options, Rasterizer rasterizer)
                     new OutputStreamWriter(new FileOutputStream(dotFile), StandardCharsets.UTF_8))) {
                 bw.write(preprocessCode(src, options));
             }
+            System.out.println("try to call: path=" + path.toString() + "; dotFile=" + dotFile.getAbsolutePath() + "; options=" + options.toString());
             return doExecute(path, dotFile, options, rasterizer);
         } catch (IOException | InterruptedException e) {
+            System.out.println("following exception was thrown:");
+            e.printStackTrace();
             throw new GraphvizException(e.getMessage(), e);
         }
     }

src/main/java/guru/nidi/graphviz/engine/SvgRasterizer.java

@@ -17,6 +17,7 @@
 
 import java.awt.*;
 import java.awt.image.BufferedImage;
+import java.io.File;
 import java.util.function.Consumer;
 
 abstract class SvgRasterizer implements Rasterizer {
@@ -27,14 +28,18 @@ public Format format() {
 
     @Override
     public BufferedImage rasterize(Graphviz graphviz, Consumer<Graphics2D> graphicsConfigurer, String input) {
-        final String svg = input
+        String svg = input
                 .replace("xlink:href=\"", "xlink:href=\"file://")
                 .replace("stroke=\"transparent\"", "stroke=\"#fff\" stroke-opacity=\"0.0\"")
                 .replace("fill=\"transparent\"", "fill=\"#fff\" fill-opacity=\"0.0\"");
+
+        String baseDirStringOrig = graphviz.getOptions().basedir.getAbsolutePath() + File.separator;
+        String baseDirString = baseDirStringOrig.replace("\\", "/");
+        if(System.getProperty("os.name").toLowerCase().indexOf("win") >= 0)
+            svg = svg.replace("xlink:href=\"file://" + baseDirStringOrig, "xlink:href=\"file:///" + baseDirString);
+
         return doRasterize(graphviz, graphicsConfigurer, svg);
     }
 
-    abstract BufferedImage doRasterize(Graphviz graphviz,
-                                       Consumer<Graphics2D> graphicsConfigurer,
-                                       String svg);
+    abstract BufferedImage doRasterize(Graphviz graphviz, Consumer<Graphics2D> graphicsConfigurer, String svg);
 }

src/main/java/org/contextmapper/contextmap/generator/ContextMapGenerator.java

@@ -25,6 +25,9 @@
 import org.contextmapper.contextmap.generator.model.*;
 
 import java.io.*;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.nio.file.StandardCopyOption;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -39,6 +42,7 @@
 public class ContextMapGenerator {
 
     private static final String EDGE_SPACING_UNIT = "        ";
+    private static final String TEAM_ICON_FILE_NAME = "team-icon.png";
 
     private Map<String, MutableNode> bcNodesMap;
     private Set<MutableNode> genericNodes;
@@ -146,7 +150,7 @@ public void generateContextMapGraphic(ContextMap contextMap, Format format, Outp
 
     private Renderer generateContextMapGraphic(ContextMap contextMap, Format format) throws IOException {
         exportImages();
-        MutableGraph graph = createGraph(contextMap);
+        MutableGraph graph = createGraph(contextMap, format == Format.DOT);
 
         // store file
         if (useWidth)
@@ -155,22 +159,22 @@ private Renderer generateContextMapGraphic(ContextMap contextMap, Format format)
             return Graphviz.fromGraph(graph).basedir(baseDir).height(height).render(format);
     }
 
-    private MutableGraph createGraph(ContextMap contextMap) {
+    private MutableGraph createGraph(ContextMap contextMap, boolean withImagePath) {
         this.bcNodesMap = new TreeMap<>();
         this.genericNodes = new HashSet<>();
         this.teamNodes = new HashSet<>();
-        MutableGraph rootGraph = createGraph("ContextMapGraph");
+        MutableGraph rootGraph = createGraph("ContextMapGraph", withImagePath);
 
         createNodes(contextMap.getBoundedContexts());
 
         if (!needsSubGraphs(contextMap)) {
             addNodesToGraph(rootGraph, bcNodesMap.values());
             createRelationshipLinks4ExistingNodes(contextMap.getRelationships());
         } else {
-            MutableGraph genericGraph = createGraph(getSubgraphName("GenericSubgraph"))
+            MutableGraph genericGraph = createGraph(getSubgraphName("GenericSubgraph"), withImagePath)
                     .graphAttrs().add("color", "white");
             addNodesToGraph(genericGraph, genericNodes);
-            MutableGraph teamGraph = createGraph(getSubgraphName("Teams_Subgraph"))
+            MutableGraph teamGraph = createGraph(getSubgraphName("Teams_Subgraph"), withImagePath)
                     .graphAttrs().add("color", "white");
             addNodesToGraph(teamGraph, teamNodes);
             genericGraph.addTo(rootGraph);
@@ -196,10 +200,11 @@ private boolean needsSubGraphs(ContextMap contextMap) {
         return hasGenericContexts && hasTeams;
     }
 
-    private MutableGraph createGraph(String name) {
+    private MutableGraph createGraph(String name, boolean withImagePath) {
         MutableGraph rootGraph = mutGraph(name);
         rootGraph.setDirected(true);
-        rootGraph.graphAttrs().add(attr("imagepath", baseDir.getAbsolutePath()));
+        if (withImagePath)
+            rootGraph.graphAttrs().add(attr("imagepath", baseDir.getAbsolutePath()));
         return rootGraph;
     }
 
@@ -284,7 +289,7 @@ private void createTeamImplementationLinks(MutableGraph graph, List<BoundedConte
                     MutableNode node1 = createNode(team);
                     MutableNode node2 = createNode(system);
                     node1.addLink(to(node2).with(
-                            Label.lines("  «realizes»"),
+                            Label.lines(getRealizesLabel()),
                             attr("color", "#686868"),
                             attr("fontname", "sans-serif"),
                             attr("fontsize", "12"),
@@ -297,9 +302,13 @@ private void createTeamImplementationLinks(MutableGraph graph, List<BoundedConte
         }
     }
 
+    private String getRealizesLabel() {
+        return (System.getProperty("os.name").toLowerCase().indexOf("win") >= 0) ? "  \"realizes\"" : "  «realizes»";
+    }
+
     private Label createNodeLabel(BoundedContext boundedContext) {
         if (boundedContext.getType() == BoundedContextType.TEAM)
-            return Label.html("<table cellspacing=\"0\" cellborder=\"0\" border=\"0\"><tr><td rowspan=\"2\"><img src='team-icon.png' /></td><td width=\"10px\">" +
+            return Label.html("<table cellspacing=\"0\" cellborder=\"0\" border=\"0\"><tr><td rowspan=\"2\"><img src='" + TEAM_ICON_FILE_NAME + "' /></td><td width=\"10px\">" +
                     "</td><td><b>Team</b></td></tr><tr><td width=\"10px\"></td><td>" + boundedContext.getName() + "</td></tr></table>");
         return Label.lines(boundedContext.getName());
     }
@@ -367,15 +376,9 @@ private Label getEdgeHTMLLabel(String upstreamDownstreamLabel, Set<String> patte
     private void exportImages() throws IOException {
         if (!baseDir.exists())
             baseDir.mkdir();
-        if (!new File(baseDir, "team-icon.png").exists()) {
-            InputStream teamIconInputStream = ContextMapGenerator.class.getClassLoader().getResourceAsStream("team-icon.png");
-            byte[] buffer = new byte[teamIconInputStream.available()];
-            teamIconInputStream.read(buffer);
-            File targetFile = new File(baseDir, "team-icon.png");
-            OutputStream outStream = new FileOutputStream(targetFile);
-            outStream.write(buffer);
-            outStream.flush();
-            outStream.close();
+        if (!new File(baseDir, TEAM_ICON_FILE_NAME).exists()) {
+            InputStream teamIconInputStream = ContextMapGenerator.class.getClassLoader().getResourceAsStream(TEAM_ICON_FILE_NAME);
+            Files.copy(teamIconInputStream, Paths.get(baseDir.getAbsolutePath(), TEAM_ICON_FILE_NAME), StandardCopyOption.REPLACE_EXISTING);
         }
     }