natas_hw
/
UMLGraph
mirror of https://github.com/dspinellis/UMLGraph
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixup dot formatting

This commit is contained in:
Erich Schubert 2018-10-27 22:57:37 +02:00
parent 1d03695f8e
commit 867dec5d9c
14 changed files with 114 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/test/java/org/umlgraph/test/DotDiff.java
View File

@ -173,9 +173,8 @@ public class DotDiff {
} else { // that's a node
String attributes = line.substring(openBrackedIdx + 1, closedBracketIdx);
Map<String, String> attMap = parseAttributes(attributes);
String name = line.substring(0, openBrackedIdx - 1).trim();
String label = attMap.get("label");
DotNode node = new DotNode(name, label, attMap, line);
String name = trim(line.substring(0, openBrackedIdx - 1));
DotNode node = new DotNode(name, attMap.get("label"), attMap, line);
nodes.put(name, node);
nodeList.add(node);
}
@ -185,19 +184,21 @@ public class DotDiff {
int closedBracketIdx = line.lastIndexOf(']');
String attributes = line.substring(openBrackedIdx + 1, closedBracketIdx);
String[] names = line.substring(0, openBrackedIdx).split("->");
DotNode from = nodes.get(names[0].trim());
DotNode to = nodes.get(names[1].trim());
if (from == null) {
from = new DotNode(names[0], "", new HashMap<String, String>(), "");
}
if (to == null) {
to = new DotNode(names[1], "", new HashMap<String, String>(), "");
}
DotNode from = nodes.get(names[0] = trim(names[0]));
DotNode to = nodes.get(names[1] = trim(names[1]));
from = from != null ? from : new DotNode(names[0], "", new HashMap<String, String>(), "");
to = to != null? to : new DotNode(names[1], "", new HashMap<String, String>(), "");
arcs.add(new DotArc(from, to, parseAttributes(attributes), line));
}
return extraLines;
}
// Trim space AND port.
private String trim(String name) {
name = name.trim();
return name.endsWith(":p") ? name.substring(0, name.length() - 2) : name;
}
private Map<String, String> parseAttributes(String attributes) throws IOException {
Map<String, String> map = new HashMap<String, String>();