From 2ca7dca0e3177cf3b55a0ae61adebc1309e17543 Mon Sep 17 00:00:00 2001 From: Martin Ross Date: Tue, 15 Feb 2022 14:55:21 -0500 Subject: [PATCH] Remove extra logging and switch startGroup maps from HashMap to EnumMap --- src/net/sourceforge/plantuml/svek/SvekLine.java | 2 +- .../sourceforge/plantuml/svek/image/EntityImageBranch.java | 5 ++--- .../sourceforge/plantuml/svek/image/EntityImageClass.java | 3 ++- .../plantuml/svek/image/EntityImageDescription.java | 2 +- .../plantuml/svek/image/EntityImageLollipopInterface.java | 3 ++- .../sourceforge/plantuml/svek/image/EntityImageMap.java | 3 ++- .../sourceforge/plantuml/svek/image/EntityImageNote.java | 7 ++----- .../sourceforge/plantuml/svek/image/EntityImageObject.java | 3 ++- .../plantuml/svek/image/EntityImageUseCase.java | 3 ++- src/net/sourceforge/plantuml/svg/SvgGraphics.java | 2 -- 10 files changed, 16 insertions(+), 17 deletions(-) diff --git a/src/net/sourceforge/plantuml/svek/SvekLine.java b/src/net/sourceforge/plantuml/svek/SvekLine.java index da6adf38b..d8d6402fd 100644 --- a/src/net/sourceforge/plantuml/svek/SvekLine.java +++ b/src/net/sourceforge/plantuml/svek/SvekLine.java @@ -619,7 +619,7 @@ public class SvekLine implements Moveable, Hideable, GuideLine { return; ug.draw(link.commentForSvg()); - Map typeIDent = new HashMap<>(); + Map typeIDent = new EnumMap<>(UGroupType.class);; typeIDent.put(UGroupType.CLASS, "link " + link.getEntity1().getCode() + " " + link.getEntity2().getCode() + " selected"); typeIDent.put(UGroupType.ID, "link_" + link.getEntity1().getCode() + "_" + link.getEntity2().getCode()); ug.startGroup(typeIDent); diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageBranch.java b/src/net/sourceforge/plantuml/svek/image/EntityImageBranch.java index 8eb03cd6d..1a0720f39 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageBranch.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageBranch.java @@ -36,8 +36,7 @@ package net.sourceforge.plantuml.svek.image; import java.awt.geom.Dimension2D; -import java.util.Collections; -import java.util.HashMap; +import java.util.EnumMap; import java.util.Map; import net.sourceforge.plantuml.ColorParam; @@ -104,7 +103,7 @@ public class EntityImageBranch extends AbstractEntityImage { } diams.setDeltaShadow(shadowing); - Map typeIDent = new HashMap<>(); + Map typeIDent = new EnumMap<>(UGroupType.class); typeIDent.put(UGroupType.CLASS, "elem " + getEntity().getCode() + " selected"); typeIDent.put(UGroupType.ID, "elem_" + getEntity().getCode()); ug.startGroup(typeIDent); diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageClass.java b/src/net/sourceforge/plantuml/svek/image/EntityImageClass.java index d298d98a6..bbb8dc0d7 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageClass.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageClass.java @@ -38,6 +38,7 @@ package net.sourceforge.plantuml.svek.image; import java.awt.geom.Dimension2D; import java.awt.geom.Rectangle2D; import java.util.Collections; +import java.util.EnumMap; import java.util.HashMap; import java.util.Map; @@ -138,7 +139,7 @@ public class EntityImageClass extends AbstractEntityImage implements Stencil, Wi if (url != null) ug.startUrl(url); - Map typeIDent = new HashMap<>(); + Map typeIDent = new EnumMap<>(UGroupType.class);; typeIDent.put(UGroupType.CLASS, "elem " + getEntity().getCode() + " selected"); typeIDent.put(UGroupType.ID, "elem_" + getEntity().getCode()); ug.startGroup(typeIDent); diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageDescription.java b/src/net/sourceforge/plantuml/svek/image/EntityImageDescription.java index 12c97e68c..4ac9d5d1b 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageDescription.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageDescription.java @@ -283,7 +283,7 @@ public class EntityImageDescription extends AbstractEntityImage { final public void drawU(UGraphic ug) { ug.draw(new UComment("entity " + getEntity().getCodeGetName())); - Map typeIDent = new HashMap<>(); + Map typeIDent = new EnumMap<>(UGroupType.class);; typeIDent.put(UGroupType.CLASS, "elem " + getEntity().getCode() + " selected"); typeIDent.put(UGroupType.ID, "elem_" + getEntity().getCode()); ug.startGroup(typeIDent); diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageLollipopInterface.java b/src/net/sourceforge/plantuml/svek/image/EntityImageLollipopInterface.java index be6d597eb..2ceae293e 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageLollipopInterface.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageLollipopInterface.java @@ -37,6 +37,7 @@ package net.sourceforge.plantuml.svek.image; import java.awt.geom.Dimension2D; import java.util.Collections; +import java.util.EnumMap; import java.util.HashMap; import java.util.Map; @@ -134,7 +135,7 @@ public class EntityImageLollipopInterface extends AbstractEntityImage { if (url != null) ug.startUrl(url); - Map typeIDent = new HashMap<>(); + Map typeIDent = new EnumMap<>(UGroupType.class);; typeIDent.put(UGroupType.CLASS, "elem " + getEntity().getCode() + " selected"); typeIDent.put(UGroupType.ID, "elem_" + getEntity().getCode()); ug.startGroup(typeIDent); diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageMap.java b/src/net/sourceforge/plantuml/svek/image/EntityImageMap.java index 34c40ccd1..0ee2c1d8f 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageMap.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageMap.java @@ -37,6 +37,7 @@ package net.sourceforge.plantuml.svek.image; import java.awt.geom.Dimension2D; import java.util.Collections; +import java.util.EnumMap; import java.util.HashMap; import java.util.Map; @@ -196,7 +197,7 @@ public class EntityImageMap extends AbstractEntityImage implements Stencil, With if (url != null) ug.startUrl(url); - Map typeIDent = new HashMap<>(); + Map typeIDent = new EnumMap<>(UGroupType.class);; typeIDent.put(UGroupType.CLASS, "elem " + getEntity().getCode() + " selected"); typeIDent.put(UGroupType.ID, "elem_" + getEntity().getCode()); ug.startGroup(typeIDent); diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageNote.java b/src/net/sourceforge/plantuml/svek/image/EntityImageNote.java index 11fe8f86b..302064ecb 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageNote.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageNote.java @@ -38,10 +38,7 @@ package net.sourceforge.plantuml.svek.image; import java.awt.geom.Dimension2D; import java.awt.geom.Line2D; import java.awt.geom.Point2D; -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; -import java.util.Objects; +import java.util.*; import net.sourceforge.plantuml.AlignmentParam; import net.sourceforge.plantuml.ColorParam; @@ -220,7 +217,7 @@ public class EntityImageNote extends AbstractEntityImage implements Stencil { final public void drawU(UGraphic ug) { final Url url = getEntity().getUrl99(); - Map typeIDent = new HashMap<>(); + Map typeIDent = new EnumMap<>(UGroupType.class);; typeIDent.put(UGroupType.CLASS, "elem " + getEntity().getCode() + " selected"); typeIDent.put(UGroupType.ID, "elem_" + getEntity().getCode()); ug.startGroup(typeIDent); diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageObject.java b/src/net/sourceforge/plantuml/svek/image/EntityImageObject.java index 580099a2e..49823d1dc 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageObject.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageObject.java @@ -37,6 +37,7 @@ package net.sourceforge.plantuml.svek.image; import java.awt.geom.Dimension2D; import java.util.Collections; +import java.util.EnumMap; import java.util.HashMap; import java.util.Map; @@ -199,7 +200,7 @@ public class EntityImageObject extends AbstractEntityImage implements Stencil, W ug.startUrl(url); - Map typeIDent = new HashMap<>(); + Map typeIDent = new EnumMap<>(UGroupType.class);; typeIDent.put(UGroupType.CLASS, "elem " + getEntity().getCode() + " selected"); typeIDent.put(UGroupType.ID, "elem_" + getEntity().getCode()); ug.startGroup(typeIDent); diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageUseCase.java b/src/net/sourceforge/plantuml/svek/image/EntityImageUseCase.java index dcbfaef5c..fb1ab6fcc 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageUseCase.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageUseCase.java @@ -38,6 +38,7 @@ package net.sourceforge.plantuml.svek.image; import java.awt.geom.Dimension2D; import java.awt.geom.Point2D; import java.util.Collections; +import java.util.EnumMap; import java.util.HashMap; import java.util.Map; @@ -162,7 +163,7 @@ public class EntityImageUseCase extends AbstractEntityImage { ug = ug.apply(backcolor.bg()); final UGraphic ug2 = new MyUGraphicEllipse(ug, 0, 0, ellipse.getUEllipse()); - Map typeIDent = new HashMap<>(); + Map typeIDent = new EnumMap<>(UGroupType.class);; typeIDent.put(UGroupType.CLASS, "elem " + getEntity().getCode() + " selected"); typeIDent.put(UGroupType.ID, "elem_" + getEntity().getCode()); ug.startGroup(typeIDent); diff --git a/src/net/sourceforge/plantuml/svg/SvgGraphics.java b/src/net/sourceforge/plantuml/svg/SvgGraphics.java index 19e5594b3..c1b7d6d87 100644 --- a/src/net/sourceforge/plantuml/svg/SvgGraphics.java +++ b/src/net/sourceforge/plantuml/svg/SvgGraphics.java @@ -992,7 +992,6 @@ public class SvgGraphics { // javascript: security issue if (SecurityUtils.ignoreThisLink(url)) return; - Log.info("openLink=" + title); // if (pendingAction.size() > 0) @@ -1042,7 +1041,6 @@ public class SvgGraphics { } public void startGroup(Map typeIdents) { - Log.debug("startGroup=" + typeIdents) ; if (!typeIdents.isEmpty()) pendingAction.add(0, (Element) document.createElement("g")); for (Map.Entry typeIdent : typeIdents.entrySet()) {