Merge pull request #925 from blipper/master

Preserve element group structure in svg output to allow more intelligent post-processing

src/net/sourceforge/plantuml/graphic/UGraphicDelegator.java

@@ -45,6 +45,7 @@ import net.sourceforge.plantuml.ugraphic.color.HColor;
 
 import java.io.IOException;
 import java.io.OutputStream;
+import java.util.Map;
 
 public abstract class UGraphicDelegator implements UGraphic {
 
@@ -89,8 +90,8 @@ public abstract class UGraphicDelegator implements UGraphic {
 		ug.closeUrl();
 	}
 
-	public void startGroup(UGroupType type, String ident) {
+	public void startGroup(Map<UGroupType, String> typeIdents) {
-		ug.startGroup(type, ident);
+		ug.startGroup(typeIdents);
 	}
 
 	public void closeGroup() {

src/net/sourceforge/plantuml/svek/Cluster.java

@@ -80,6 +80,7 @@ import net.sourceforge.plantuml.style.StyleSignature;
 import net.sourceforge.plantuml.svek.image.EntityImageState;
 import net.sourceforge.plantuml.ugraphic.UComment;
 import net.sourceforge.plantuml.ugraphic.UGraphic;
+import net.sourceforge.plantuml.ugraphic.UGroupType;
 import net.sourceforge.plantuml.ugraphic.ULine;
 import net.sourceforge.plantuml.ugraphic.URectangle;
 import net.sourceforge.plantuml.ugraphic.UStroke;
@@ -347,6 +348,9 @@ public class Cluster implements Moveable {
 
 		}
 
+
+		ug.startGroup(Collections.singletonMap(UGroupType.ID, "cluster_" + fullName));
+
 		final Url url = group.getUrl99();
 		if (url != null)
 			ug.startUrl(url);
@@ -411,8 +415,8 @@ public class Cluster implements Moveable {
 		} finally {
 			if (url != null)
 				ug.closeUrl();
+			ug.closeGroup();
 		}
-
 	}
 
 	static public UStroke getStrokeInternal(IGroup group, ISkinParam skinParam, Style style) {

src/net/sourceforge/plantuml/svek/SvekLine.java

@@ -37,11 +37,7 @@ package net.sourceforge.plantuml.svek;
 
 import java.awt.geom.Dimension2D;
 import java.awt.geom.Point2D;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.Collection;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
 
 import net.sourceforge.plantuml.AlignmentParam;
 import net.sourceforge.plantuml.ColorParam;
@@ -623,8 +619,10 @@ public class SvekLine implements Moveable, Hideable, GuideLine {
 			return;
 
 		ug.draw(link.commentForSvg());
-		ug.startGroup(UGroupType.CLASS,
+		Map<UGroupType, String> typeIDent = new HashMap<>();
-				"link " + link.getEntity1().getCode() + " " + link.getEntity2().getCode() + " selected");
+		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);
 		double x = 0;
 		double y = 0;
 		final Url url = link.getUrl();

src/net/sourceforge/plantuml/svek/image/EntityImageBranch.java

@@ -36,6 +36,9 @@
 package net.sourceforge.plantuml.svek.image;
 
 import java.awt.geom.Dimension2D;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
 
 import net.sourceforge.plantuml.ColorParam;
 import net.sourceforge.plantuml.Dimension2DDouble;
@@ -101,8 +104,10 @@ public class EntityImageBranch extends AbstractEntityImage {
 
 		}
 		diams.setDeltaShadow(shadowing);
-
+		Map<UGroupType, String> typeIDent = new HashMap<>();
-		ug.startGroup(UGroupType.CLASS, "elem " + getEntity().getCode() + " selected");
+		typeIDent.put(UGroupType.CLASS, "elem " + getEntity().getCode() + " selected");
+		typeIDent.put(UGroupType.ID, "elem_" + getEntity().getCode());
+		ug.startGroup(typeIDent);
 		ug.apply(border).apply(back.bg()).apply(stroke).draw(diams);
 		ug.closeGroup();
 	}

src/net/sourceforge/plantuml/svek/image/EntityImageClass.java

@@ -37,6 +37,9 @@ package net.sourceforge.plantuml.svek.image;
 
 import java.awt.geom.Dimension2D;
 import java.awt.geom.Rectangle2D;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
 
 import net.sourceforge.plantuml.ColorParam;
 import net.sourceforge.plantuml.CornerParam;
@@ -135,7 +138,10 @@ public class EntityImageClass extends AbstractEntityImage implements Stencil, Wi
 		if (url != null)
 			ug.startUrl(url);
 
-		ug.startGroup(UGroupType.CLASS, "elem " + getEntity().getCode() + " selected");
+		Map<UGroupType, String> typeIDent = new HashMap<>();
+		typeIDent.put(UGroupType.CLASS, "elem " + getEntity().getCode() + " selected");
+		typeIDent.put(UGroupType.ID, "elem_" + getEntity().getCode());
+		ug.startGroup(typeIDent);
 		drawInternal(ug);
 		ug.closeGroup();
 

src/net/sourceforge/plantuml/svek/image/EntityImageDescription.java

@@ -37,10 +37,7 @@
 package net.sourceforge.plantuml.svek.image;
 
 import java.awt.geom.Dimension2D;
-import java.util.Collection;
+import java.util.*;
-import java.util.HashSet;
-import java.util.Objects;
-import java.util.Set;
 
 import net.sourceforge.plantuml.Dimension2DDouble;
 import net.sourceforge.plantuml.Guillemet;
@@ -286,7 +283,10 @@ public class EntityImageDescription extends AbstractEntityImage {
 
 	final public void drawU(UGraphic ug) {
 		ug.draw(new UComment("entity " + getEntity().getCodeGetName()));
-		ug.startGroup(UGroupType.CLASS, "elem " + getEntity().getCode() + " selected");
+		Map<UGroupType, String> typeIDent = new HashMap<>();
+		typeIDent.put(UGroupType.CLASS, "elem " + getEntity().getCode() + " selected");
+		typeIDent.put(UGroupType.ID, "elem_" + getEntity().getCode());
+		ug.startGroup(typeIDent);
 
 		if (url != null)
 			ug.startUrl(url);

src/net/sourceforge/plantuml/svek/image/EntityImageLollipopInterface.java

@@ -36,6 +36,9 @@
 package net.sourceforge.plantuml.svek.image;
 
 import java.awt.geom.Dimension2D;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
 
 import net.sourceforge.plantuml.ColorParam;
 import net.sourceforge.plantuml.Dimension2DDouble;
@@ -131,7 +134,10 @@ public class EntityImageLollipopInterface extends AbstractEntityImage {
 		if (url != null)
 			ug.startUrl(url);
 
-		ug.startGroup(UGroupType.CLASS, "elem " + getEntity().getCode() + " selected");
+		Map<UGroupType, String> typeIDent = new HashMap<>();
+		typeIDent.put(UGroupType.CLASS, "elem " + getEntity().getCode() + " selected");
+		typeIDent.put(UGroupType.ID, "elem_" + getEntity().getCode());
+		ug.startGroup(typeIDent);
 		ug.apply(getUStroke()).draw(circle);
 		ug.closeGroup();
 

src/net/sourceforge/plantuml/svek/image/EntityImageMap.java

@@ -36,6 +36,9 @@
 package net.sourceforge.plantuml.svek.image;
 
 import java.awt.geom.Dimension2D;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
 
 import net.sourceforge.plantuml.ColorParam;
 import net.sourceforge.plantuml.CornerParam;
@@ -193,7 +196,10 @@ public class EntityImageMap extends AbstractEntityImage implements Stencil, With
 		if (url != null)
 			ug.startUrl(url);
 
-		ug.startGroup(UGroupType.CLASS, "elem " + getEntity().getCode() + " selected");
+		Map<UGroupType, String> typeIDent = new HashMap<>();
+		typeIDent.put(UGroupType.CLASS, "elem " + getEntity().getCode() + " selected");
+		typeIDent.put(UGroupType.ID, "elem_" + getEntity().getCode());
+		ug.startGroup(typeIDent);
 		ug.apply(stroke).draw(rect);
 
 		final ULayoutGroup header = new ULayoutGroup(new PlacementStrategyY1Y2(ug.getStringBounder()));

src/net/sourceforge/plantuml/svek/image/EntityImageNote.java

@@ -38,6 +38,9 @@ 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 net.sourceforge.plantuml.AlignmentParam;
@@ -217,7 +220,10 @@ public class EntityImageNote extends AbstractEntityImage implements Stencil {
 	final public void drawU(UGraphic ug) {
 		final Url url = getEntity().getUrl99();
 
-		ug.startGroup(UGroupType.CLASS, "elem " + getEntity().getCode() + " selected");
+		Map<UGroupType, String> typeIDent = new HashMap<>();
+		typeIDent.put(UGroupType.CLASS, "elem " + getEntity().getCode() + " selected");
+		typeIDent.put(UGroupType.ID, "elem_" + getEntity().getCode());
+		ug.startGroup(typeIDent);
 
 		if (url != null)
 			ug.startUrl(url);

src/net/sourceforge/plantuml/svek/image/EntityImageObject.java

@@ -36,6 +36,9 @@
 package net.sourceforge.plantuml.svek.image;
 
 import java.awt.geom.Dimension2D;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
 
 import net.sourceforge.plantuml.ColorParam;
 import net.sourceforge.plantuml.CornerParam;
@@ -195,7 +198,11 @@ public class EntityImageObject extends AbstractEntityImage implements Stencil, W
 		if (url != null)
 			ug.startUrl(url);
 
-		ug.startGroup(UGroupType.CLASS, "elem " + getEntity().getCode() + " selected");
+
+		Map<UGroupType, String> typeIDent = new HashMap<>();
+		typeIDent.put(UGroupType.CLASS, "elem " + getEntity().getCode() + " selected");
+		typeIDent.put(UGroupType.ID, "elem_" + getEntity().getCode());
+		ug.startGroup(typeIDent);
 		ug.apply(stroke).draw(rect);
 
 		final ULayoutGroup header = new ULayoutGroup(new PlacementStrategyY1Y2(ug.getStringBounder()));

src/net/sourceforge/plantuml/svek/image/EntityImageState.java

@@ -36,6 +36,7 @@
 package net.sourceforge.plantuml.svek.image;
 
 import java.awt.geom.Dimension2D;
+import java.util.Collections;
 
 import net.sourceforge.plantuml.Dimension2DDouble;
 import net.sourceforge.plantuml.FontParam;
@@ -102,7 +103,7 @@ public class EntityImageState extends EntityImageStateCommon {
 	}
 
 	final public void drawU(UGraphic ug) {
-		ug.startGroup(UGroupType.ID, getEntity().getIdent().toString("."));
+		ug.startGroup(Collections.singletonMap(UGroupType.ID, getEntity().getIdent().toString(".")));
 		if (url != null)
 			ug.startUrl(url);
 

src/net/sourceforge/plantuml/svek/image/EntityImageUseCase.java

@@ -37,6 +37,9 @@ package net.sourceforge.plantuml.svek.image;
 
 import java.awt.geom.Dimension2D;
 import java.awt.geom.Point2D;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
 
 import net.sourceforge.plantuml.ColorParam;
 import net.sourceforge.plantuml.FontParam;
@@ -159,7 +162,10 @@ public class EntityImageUseCase extends AbstractEntityImage {
 		ug = ug.apply(backcolor.bg());
 		final UGraphic ug2 = new MyUGraphicEllipse(ug, 0, 0, ellipse.getUEllipse());
 
-		ug2.startGroup(UGroupType.CLASS, "elem " + getEntity().getCode() + " selected");
+		Map<UGroupType, String> typeIDent = new HashMap<>();
+		typeIDent.put(UGroupType.CLASS, "elem " + getEntity().getCode() + " selected");
+		typeIDent.put(UGroupType.ID, "elem_" + getEntity().getCode());
+		ug.startGroup(typeIDent);
 		ellipse.drawU(ug2);
 		ug2.closeGroup();
 

src/net/sourceforge/plantuml/svg/SvgGraphics.java

@@ -992,9 +992,11 @@ public class SvgGraphics {
 		// javascript: security issue
 		if (SecurityUtils.ignoreThisLink(url))
 			return;
+		Log.info("openLink=" + title);
 
-		if (pendingAction.size() > 0)
+
-			closeLink();
+//		if (pendingAction.size() > 0)
+//			closeLink();
 
 		pendingAction.add(0, (Element) document.createElement("a"));
 		pendingAction.get(0).setAttribute("target", target);
@@ -1039,13 +1041,18 @@ public class SvgGraphics {
 		}
 	}
 
-	public void startGroup(UGroupType type, String ident) {
+	public void startGroup(Map<UGroupType, String> typeIdents) {
-		if (type == UGroupType.ID) {
+		Log.debug("startGroup=" + typeIdents) ;
+		if (!typeIdents.isEmpty())
 			pendingAction.add(0, (Element) document.createElement("g"));
-			pendingAction.get(0).setAttribute("id", ident);
+		for (Map.Entry<UGroupType, String> typeIdent : typeIdents.entrySet()) {
-		} else if (INTERACTIVE && type == UGroupType.CLASS) {
+			if (typeIdent.getKey() == UGroupType.ID) {
-			pendingAction.add(0, (Element) document.createElement("g"));
+				pendingAction.get(0).setAttribute("id", typeIdent.getValue());
-			pendingAction.get(0).setAttribute("class", ident);
+			}
+
+			if (INTERACTIVE && typeIdent.getKey() == UGroupType.CLASS) {
+				pendingAction.get(0).setAttribute("class", typeIdent.getValue());
+			}
 		}
 	}
 

src/net/sourceforge/plantuml/ugraphic/AbstractCommonUGraphic.java

@@ -35,6 +35,7 @@
  */
 package net.sourceforge.plantuml.ugraphic;
 
+import java.util.Map;
 import java.util.Objects;
 
 import net.sourceforge.plantuml.Url;
@@ -181,7 +182,7 @@ public abstract class AbstractCommonUGraphic implements UGraphic {
 	public void closeUrl() {
 	}
 
-	public void startGroup(UGroupType type, String ident) {
+	public void startGroup(Map<UGroupType, String> typeIdents) {
 	}
 
 	public void closeGroup() {

src/net/sourceforge/plantuml/ugraphic/UGraphic.java

@@ -42,6 +42,7 @@ import net.sourceforge.plantuml.ugraphic.color.HColor;
 
 import java.io.IOException;
 import java.io.OutputStream;
+import java.util.Map;
 
 public interface UGraphic {
 
@@ -59,7 +60,7 @@ public interface UGraphic {
 
 	public void closeUrl();
 
-	public void startGroup(UGroupType type, String ident);
+	public void startGroup(Map<UGroupType, String> typeIdents);
 
 	public void closeGroup();
 

src/net/sourceforge/plantuml/ugraphic/UGraphicNo.java

@@ -43,6 +43,7 @@ import net.sourceforge.plantuml.ugraphic.color.HColorUtils;
 
 import java.io.IOException;
 import java.io.OutputStream;
+import java.util.Map;
 
 public abstract class UGraphicNo implements UGraphic {
 
@@ -68,7 +69,7 @@ public abstract class UGraphicNo implements UGraphic {
 	}
 
 	@Override
-	public void startGroup(UGroupType type, String ident) {
+	public void startGroup(Map<UGroupType, String> typeIdents) {
 	}
 
 	@Override

src/net/sourceforge/plantuml/ugraphic/UGroupType.java

@@ -37,5 +37,4 @@ package net.sourceforge.plantuml.ugraphic;
 
 public enum UGroupType {
 	ID, CLASS
-
 }

src/net/sourceforge/plantuml/ugraphic/svg/UGraphicSvg.java

@@ -37,6 +37,7 @@ package net.sourceforge.plantuml.ugraphic.svg;
 import java.awt.geom.Dimension2D;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.util.Map;
 
 import javax.xml.transform.TransformerException;
 
@@ -157,8 +158,8 @@ public class UGraphicSvg extends AbstractUGraphic<SvgGraphics> implements ClipCo
 	}
 
 	@Override
-	public void startGroup(UGroupType type, String ident) {
+	public void startGroup(Map<UGroupType, String> typeIdents) {
-		getGraphicObject().startGroup(type, ident);
+		getGraphicObject().startGroup(typeIdents);
 	}
 
 	@Override