diff --git a/src/net/sourceforge/plantuml/style/CommandStyleImport.java b/src/net/sourceforge/plantuml/style/CommandStyleImport.java index bdc6d5ab7..f7297d505 100644 --- a/src/net/sourceforge/plantuml/style/CommandStyleImport.java +++ b/src/net/sourceforge/plantuml/style/CommandStyleImport.java @@ -86,9 +86,8 @@ public class CommandStyleImport extends SingleLineCommand2 { if (path.startsWith("http://") || path.startsWith("https://")) { SURL url = SURL.create(path); try (InputStream remoteInputStream = url.openStream()) { - if (remoteInputStream != null) { + if (remoteInputStream != null) lines = BlocLines.load(remoteInputStream, location); - } } } else { final SFile styleFile = FileSystem.getInstance().getFile(path); diff --git a/src/net/sourceforge/plantuml/xmi/XmiClassDiagramScript.java b/src/net/sourceforge/plantuml/xmi/XmiClassDiagramScript.java index ff466a52b..9dd6d2b91 100644 --- a/src/net/sourceforge/plantuml/xmi/XmiClassDiagramScript.java +++ b/src/net/sourceforge/plantuml/xmi/XmiClassDiagramScript.java @@ -54,7 +54,6 @@ import net.sourceforge.plantuml.utils.Log; public class XmiClassDiagramScript extends XmiClassDiagramAbstract implements XmlDiagramTransformer { - private static class MemberData { public final String name; public final String id; @@ -103,7 +102,9 @@ public class XmiClassDiagramScript extends XmiClassDiagramAbstract implements Xm continue; element.appendChild(cla); - members.computeIfAbsent(ent.getUid(), (e) -> new ArrayList<>()); + if (members.containsKey(ent.getUid()) == false) + members.put(ent.getUid(), new ArrayList()); + NodeList attrs = cla.getElementsByTagName("UML:Attribute"); for (int i = 0; i < attrs.getLength(); i++) { Element child = (Element) attrs.item(i); @@ -288,5 +289,4 @@ public class XmiClassDiagramScript extends XmiClassDiagramAbstract implements Xm } - }