diff --git a/src/net/sourceforge/plantuml/AnnotatedWorker.java b/src/net/sourceforge/plantuml/AnnotatedWorker.java index 9fcddc0df..d9fda2dd3 100644 --- a/src/net/sourceforge/plantuml/AnnotatedWorker.java +++ b/src/net/sourceforge/plantuml/AnnotatedWorker.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Rectangle2D; import net.sourceforge.plantuml.activitydiagram3.ftile.EntityImageLegend; @@ -49,7 +49,7 @@ import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.SymbolContext; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.TextBlockUtils; -import net.sourceforge.plantuml.graphic.USymbol; +import net.sourceforge.plantuml.graphic.USymbols; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; @@ -125,7 +125,7 @@ public class AnnotatedWorker { final double width = x1 + Math.max(originalMinMax.getWidth(), dimTitle.getWidth()) + x2; final double height = dimTitle.getHeight() + y1 + originalMinMax.getHeight() + y2; - final TextBlock frame = USymbol.FRAME.asBig(title, HorizontalAlignment.LEFT, TextBlockUtils.empty(0, 0), width, + final TextBlock frame = USymbols.FRAME.asBig(title, HorizontalAlignment.LEFT, TextBlockUtils.empty(0, 0), width, height, symbolContext, skinParam.getStereotypeAlignment()); return new TextBlockBackcolored() { diff --git a/src/net/sourceforge/plantuml/ComponentStyle.java b/src/net/sourceforge/plantuml/ComponentStyle.java index c8f67ed6a..cf072c7df 100644 --- a/src/net/sourceforge/plantuml/ComponentStyle.java +++ b/src/net/sourceforge/plantuml/ComponentStyle.java @@ -36,6 +36,7 @@ package net.sourceforge.plantuml; import net.sourceforge.plantuml.graphic.USymbol; +import net.sourceforge.plantuml.graphic.USymbols; public enum ComponentStyle { @@ -44,11 +45,11 @@ public enum ComponentStyle { public USymbol toUSymbol() { switch (this) { case UML1: - return USymbol.COMPONENT1; + return USymbols.COMPONENT1; case UML2: - return USymbol.COMPONENT2; + return USymbols.COMPONENT2; case RECTANGLE: - return USymbol.RECTANGLE; + return USymbols.RECTANGLE; } throw new AssertionError(); } diff --git a/src/net/sourceforge/plantuml/Dimension2DDouble.java b/src/net/sourceforge/plantuml/Dimension2DDouble.java index 08ec8aa3f..26b028c0e 100644 --- a/src/net/sourceforge/plantuml/Dimension2DDouble.java +++ b/src/net/sourceforge/plantuml/Dimension2DDouble.java @@ -35,7 +35,8 @@ */ package net.sourceforge.plantuml; -import java.awt.geom.Dimension2D; +import java.awt.Dimension; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Point2D; import net.sourceforge.plantuml.utils.MathUtils; @@ -135,4 +136,8 @@ public class Dimension2DDouble extends Dimension2D { return new Dimension2DDouble(w, h); } + public static Dimension2D fromDimension(Dimension dimension) { + return new Dimension2D(dimension.getWidth(), dimension.getHeight()); + } + } diff --git a/src/net/sourceforge/plantuml/EmbeddedDiagram.java b/src/net/sourceforge/plantuml/EmbeddedDiagram.java index 804341a9f..6e2c8b894 100644 --- a/src/net/sourceforge/plantuml/EmbeddedDiagram.java +++ b/src/net/sourceforge/plantuml/EmbeddedDiagram.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.image.BufferedImage; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/src/net/sourceforge/plantuml/FileFormat.java b/src/net/sourceforge/plantuml/FileFormat.java index f6199e906..5b3794099 100644 --- a/src/net/sourceforge/plantuml/FileFormat.java +++ b/src/net/sourceforge/plantuml/FileFormat.java @@ -39,7 +39,7 @@ import java.awt.Font; import java.awt.FontMetrics; import java.awt.Graphics2D; import java.awt.RenderingHints; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Rectangle2D; import java.awt.image.BufferedImage; import java.io.IOException; diff --git a/src/net/sourceforge/plantuml/StringUtils.java b/src/net/sourceforge/plantuml/StringUtils.java index 7fbd7c457..b6b436068 100644 --- a/src/net/sourceforge/plantuml/StringUtils.java +++ b/src/net/sourceforge/plantuml/StringUtils.java @@ -81,41 +81,40 @@ public class StringUtils { final StringBuilder sb = new StringBuilder(); for (int i = 0; i < s.length(); i++) { final char c = s.charAt(i); - if (c >= '0' && c <= '9') { + if (c >= '0' && c <= '9') sb.append(Character.toChars('\uE100' + c - '0')); - } else { + else sb.append(c); - } } return sb.toString(); } public static void appendInternalToRealBoldNumber(StringBuilder sb, char c) { - if (c >= '\uE100' && c <= ('\uE100' + 9)) { + if (c >= '\uE100' && c <= ('\uE100' + 9)) sb.append(Character.toChars(0x1d7ce + c - '\uE100')); - } else { + else sb.append(c); - } + } public static void appendInternalToPlainNumber(StringBuilder sb, char c) { - if (c >= '\uE100' && c <= ('\uE100' + 9)) { + if (c >= '\uE100' && c <= ('\uE100' + 9)) sb.append(Character.toChars('0' + c - '\uE100')); - } else { + else sb.append(c); - } + } final static public List getSplit(Pattern2 pattern, String line) { final Matcher2 m = pattern.matcher(line); - if (m.find() == false) { + if (m.find() == false) return null; - } + final List result = new ArrayList<>(); - for (int i = 1; i <= m.groupCount(); i++) { + for (int i = 1; i <= m.groupCount(); i++) result.add(m.group(i)); - } + return result; } @@ -128,11 +127,14 @@ public class StringUtils { } public static boolean isEmpty(CharSequence s) { - if (s == null) return true; + if (s == null) + return true; final int length = s.length(); - if (length == 0) return true; + if (length == 0) + return true; for (int i = 0; i < length; i++) { - if (!isSpaceOrTabOrNull(s.charAt(i))) return false; + if (!isSpaceOrTabOrNull(s.charAt(i))) + return false; } return true; } @@ -145,27 +147,27 @@ public class StringUtils { public static String unicode(String s) { final StringBuilder result = new StringBuilder(); - for (char c : s.toCharArray()) { + for (char c : s.toCharArray()) if (c > 127 || c == '&' || c == '|') { final int i = c; result.append("&#" + i + ";"); } else { result.append(c); } - } + return result.toString(); } public static String unicodeForHtml(String s) { final StringBuilder result = new StringBuilder(); - for (char c : s.toCharArray()) { + for (char c : s.toCharArray()) if (c > 127 || c == '&' || c == '|' || c == '<' || c == '>') { final int i = c; result.append("&#" + i + ";"); } else { result.append(c); } - } + return result.toString(); } @@ -173,9 +175,9 @@ public class StringUtils { final StringBuilder result = new StringBuilder(); for (int i = 0; i < display.size(); i++) { result.append(unicodeForHtml(display.get(i).toString())); - if (i < display.size() - 1) { + if (i < display.size() - 1) result.append("
"); - } + } return result.toString(); } @@ -209,12 +211,12 @@ public class StringUtils { final Direction dir = getArrowDirection(s); s = s.replace('=', '-'); s = s.replaceAll("\\w*", ""); - if (dir == Direction.LEFT || dir == Direction.RIGHT) { + if (dir == Direction.LEFT || dir == Direction.RIGHT) s = s.replaceAll("-+", "-"); - } - if (s.length() == 2 && (dir == Direction.UP || dir == Direction.DOWN)) { + + if (s.length() == 2 && (dir == Direction.UP || dir == Direction.DOWN)) s = s.replaceFirst("-", "--"); - } + return s; } @@ -222,60 +224,60 @@ public class StringUtils { final Direction dir = getQueueDirection(s); s = s.replace('=', '-'); s = s.replaceAll("\\w*", ""); - if (dir == Direction.LEFT || dir == Direction.RIGHT) { + if (dir == Direction.LEFT || dir == Direction.RIGHT) s = s.replaceAll("-+", "-"); - } - if (s.length() == 1 && (dir == Direction.UP || dir == Direction.DOWN)) { + + if (s.length() == 1 && (dir == Direction.UP || dir == Direction.DOWN)) s = s.replaceFirst("-", "--"); - } + return s; } public static Direction getArrowDirection(String s) { - if (s.endsWith(">")) { + if (s.endsWith(">")) return getQueueDirection(s.substring(0, s.length() - 1)); - } + if (s.startsWith("<")) { - if (s.length() == 2) { + if (s.length() == 2) return Direction.LEFT; - } + return Direction.UP; } throw new IllegalArgumentException(s); } public static Direction getQueueDirection(String s) { - if (s.indexOf('<') != -1 || s.indexOf('>') != -1) { + if (s.indexOf('<') != -1 || s.indexOf('>') != -1) throw new IllegalArgumentException(s); - } + s = s.toLowerCase(); - if (s.contains("left")) { + if (s.contains("left")) return Direction.LEFT; - } - if (s.contains("right")) { + + if (s.contains("right")) return Direction.RIGHT; - } - if (s.contains("up")) { + + if (s.contains("up")) return Direction.UP; - } + if (s.contains("down")) { return Direction.DOWN; } - if (s.contains("l")) { + if (s.contains("l")) return Direction.LEFT; - } - if (s.contains("r")) { + + if (s.contains("r")) return Direction.RIGHT; - } - if (s.contains("u")) { + + if (s.contains("u")) return Direction.UP; - } - if (s.contains("d")) { + + if (s.contains("d")) return Direction.DOWN; - } - if (s.length() == 1) { + + if (s.length() == 1) return Direction.RIGHT; - } + return Direction.DOWN; } @@ -284,29 +286,29 @@ public class StringUtils { // } public static String eventuallyRemoveStartingAndEndingDoubleQuote(String s, String format) { - if (s == null) { + if (s == null) return null; - } + if (format.contains("\"") && s.length() > 1 && isDoubleQuote(s.charAt(0)) - && isDoubleQuote(s.charAt(s.length() - 1))) { + && isDoubleQuote(s.charAt(s.length() - 1))) return s.substring(1, s.length() - 1); - } - if (format.contains("(") && s.startsWith("(") && s.endsWith(")")) { + + if (format.contains("(") && s.startsWith("(") && s.endsWith(")")) return s.substring(1, s.length() - 1); - } - if (format.contains("[") && s.startsWith("[") && s.endsWith("]")) { + + if (format.contains("[") && s.startsWith("[") && s.endsWith("]")) return s.substring(1, s.length() - 1); - } - if (format.contains(":") && s.startsWith(":") && s.endsWith(":")) { + + if (format.contains(":") && s.startsWith(":") && s.endsWith(":")) return s.substring(1, s.length() - 1); - } + return s; } public static String eventuallyRemoveStartingAndEndingDoubleQuote(String s) { - if (s == null) { + if (s == null) return s; - } + return eventuallyRemoveStartingAndEndingDoubleQuote(s, "\"([:"); } @@ -342,24 +344,23 @@ public class StringUtils { private static int getWidth(Display stringsToDisplay) { int result = 1; - for (CharSequence s : stringsToDisplay) { - if (s != null && result < s.length()) { + for (CharSequence s : stringsToDisplay) + if (s != null && result < s.length()) result = s.length(); - } - } + return result; } public static int getWcWidth(Display stringsToDisplay) { int result = 1; for (CharSequence s : stringsToDisplay) { - if (s == null) { + if (s == null) continue; - } + final int length = Wcwidth.length(s); - if (result < length) { + if (result < length) result = length; - } + } return result; } @@ -373,9 +374,9 @@ public class StringUtils { } public static boolean isDiagramCacheable(String uml) { - if (uml.length() < 35) { + if (uml.length() < 35) return false; - } + // uml = uml.toLowerCase(); // if (uml.startsWith("@startuml\nversion\n")) { // return false; @@ -410,17 +411,17 @@ public class StringUtils { public static int getPragmaRevision(String uml) { uml = uml.toLowerCase(); final String header = "@startuml\n!pragma revision "; - if (uml.startsWith(header) == false) { + if (uml.startsWith(header) == false) return -1; - } + int x1 = header.length(); int x2 = x1; - while (x2 < uml.length() && Character.isDigit(uml.charAt(x2))) { + while (x2 < uml.length() && Character.isDigit(uml.charAt(x2))) x2++; - } - if (x1 == x2) { + + if (x1 == x2) return -1; - } + return Integer.parseInt(uml.substring(x1, x2)); } @@ -429,9 +430,9 @@ public class StringUtils { final List result = new ArrayList<>(); final Pattern2 p = MyPattern.cmpile("([%pLN_.]+|[%g][^%g]+[%g])"); final Matcher2 m = p.matcher(s); - while (m.find()) { + while (m.find()) result.add(eventuallyRemoveStartingAndEndingDoubleQuote(m.group(0))); - } + return Collections.unmodifiableList(result); } @@ -453,13 +454,13 @@ public class StringUtils { final StringBuilder sb = new StringBuilder(); for (int i = 0; i < s.length(); i++) { char c = s.charAt(i); - if ((c >= 'a' && c <= 'm') || (c >= 'A' && c <= 'M')) { + if ((c >= 'a' && c <= 'm') || (c >= 'A' && c <= 'M')) c += 13; - } else if ((c >= 'n' && c <= 'z') || (c >= 'N' && c <= 'Z')) { + else if ((c >= 'n' && c <= 'z') || (c >= 'N' && c <= 'Z')) c -= 13; - } else if (c > 126) { + else if (c > 126) throw new IllegalArgumentException(s); - } + sb.append(c); } return sb.toString(); @@ -502,35 +503,35 @@ public class StringUtils { } public static String trin(String arg) { - if (arg.length() == 0) { + if (arg.length() == 0) return arg; - } + return trinEndingInternal(arg, getPositionStartNonSpace(arg)); } private static int getPositionStartNonSpace(String arg) { int i = 0; - while (i < arg.length() && isSpaceOrTabOrNull(arg.charAt(i))) { + while (i < arg.length() && isSpaceOrTabOrNull(arg.charAt(i))) i++; - } + return i; } private static String trinEnding(String arg) { - if (arg.length() == 0) { + if (arg.length() == 0) return arg; - } + return trinEndingInternal(arg, 0); } private static String trinEndingInternal(String arg, int from) { int j = arg.length() - 1; - while (j >= from && isSpaceOrTabOrNull(arg.charAt(j))) { + while (j >= from && isSpaceOrTabOrNull(arg.charAt(j))) j--; - } - if (from == 0 && j == arg.length() - 1) { + + if (from == 0 && j == arg.length() - 1) return arg; - } + return arg.substring(from, j + 1); } @@ -546,11 +547,18 @@ public class StringUtils { long h = 1125899906842597L; // prime final int len = string.length(); - for (int i = 0; i < len; i++) { + for (int i = 0; i < len; i++) h = 31 * h + string.charAt(i); - } + return h; } + public static String sharp000000(int color) { + final int v = 0xFFFFFF & color; + String s = "000000" + Integer.toHexString(v).toUpperCase(); + s = s.substring(s.length() - 6); + return "#" + s; + } + // http://docs.oracle.com/javase/tutorial/i18n/format/dateFormat.html } diff --git a/src/net/sourceforge/plantuml/UmlDiagram.java b/src/net/sourceforge/plantuml/UmlDiagram.java index cb66842cf..de188cc2f 100644 --- a/src/net/sourceforge/plantuml/UmlDiagram.java +++ b/src/net/sourceforge/plantuml/UmlDiagram.java @@ -39,7 +39,7 @@ import static net.sourceforge.plantuml.ugraphic.ImageBuilder.plainImageBuilder; import java.awt.Color; import java.awt.geom.AffineTransform; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.image.BufferedImage; import java.io.BufferedOutputStream; import java.io.ByteArrayOutputStream; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandGroup3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandGroup3.java index f0eab11c2..42dd47b67 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandGroup3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandGroup3.java @@ -44,7 +44,7 @@ import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.USymbol; +import net.sourceforge.plantuml.graphic.USymbols; public class CommandGroup3 extends SingleLineCommand2 { @@ -63,7 +63,7 @@ public class CommandGroup3 extends SingleLineCommand2 { @Override protected CommandExecutionResult executeArg(ActivityDiagram3 diagram, LineLocation location, RegexResult arg) { - diagram.startGroup(Display.getWithNewlines(arg.get("NAME", 0)), null, null, null, USymbol.FRAME, 0); + diagram.startGroup(Display.getWithNewlines(arg.get("NAME", 0)), null, null, null, USymbols.FRAME, 0); return CommandExecutionResult.ok(); } diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandPartition3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandPartition3.java index 17195ca2e..a075ca7e1 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandPartition3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandPartition3.java @@ -50,6 +50,7 @@ import net.sourceforge.plantuml.command.regex.RegexResult; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.cucadiagram.Stereotype; import net.sourceforge.plantuml.graphic.USymbol; +import net.sourceforge.plantuml.graphic.USymbols; import net.sourceforge.plantuml.graphic.color.ColorParser; import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.graphic.color.Colors; @@ -89,26 +90,26 @@ public class CommandPartition3 extends SingleLineCommand2 { private USymbol getUSymbol(String type) { if ("card".equalsIgnoreCase(type)) { - return USymbol.CARD; + return USymbols.CARD; } if ("package".equalsIgnoreCase(type)) { - return USymbol.PACKAGE; + return USymbols.PACKAGE; } if ("rectangle".equalsIgnoreCase(type)) { - return USymbol.RECTANGLE; + return USymbols.RECTANGLE; } - return USymbol.FRAME; + return USymbols.FRAME; } private ColorParam getColorParamBorder(final USymbol symbol) { - if (symbol == USymbol.FRAME) { + if (symbol == USymbols.FRAME) { return ColorParam.partitionBorder; } return symbol.getColorParamBorder(); } private ColorParam getColorParamBack(final USymbol symbol) { - if (symbol == USymbol.FRAME) { + if (symbol == USymbols.FRAME) { return ColorParam.partitionBackground; } return symbol.getColorParamBack(); @@ -119,7 +120,7 @@ public class CommandPartition3 extends SingleLineCommand2 { } private StyleSignature getDefaultStyleDefinitionPartition(USymbol symbol) { - if (symbol == USymbol.RECTANGLE) + if (symbol == USymbols.RECTANGLE) return StyleSignature.of(SName.root, SName.element, SName.activityDiagram, SName.rectangle); return StyleSignature.of(SName.root, SName.element, SName.activityDiagram, SName.partition); } diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/CollisionDetector.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/CollisionDetector.java index f048dd417..a71477437 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/CollisionDetector.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/CollisionDetector.java @@ -72,37 +72,29 @@ public class CollisionDetector extends UGraphicNo { private CollisionDetector(CollisionDetector other, UChange change) { super(other, change); - if (!instanceOfAny(change, - UBackground.class, - HColor.class, - UStroke.class, - UTranslate.class - )) { + if (!instanceOfAny(change, UBackground.class, HColor.class, UStroke.class, UTranslate.class)) { throw new UnsupportedOperationException(change.getClass().toString()); } this.context = other.context; } - + static class Context { private final List rectangles = new ArrayList<>(); private final List snakes = new ArrayList<>(); private boolean manageSnakes; public void drawDebug(UGraphic ug) { - for (MinMax minmax : rectangles) { - if (collision(minmax)) { + for (MinMax minmax : rectangles) + if (collision(minmax)) minmax.drawGray(ug); - } - } + final HColor color = HColorUtils.BLACK; ug = ug.apply(color).apply(new UStroke(5)); - for (Snake snake : snakes) { - for (Line2D line : snake.getHorizontalLines()) { - if (collision(line)) { + for (Snake snake : snakes) + for (Line2D line : snake.getHorizontalLines()) + if (collision(line)) drawLine(ug, line); - } - } - } + } private void drawLine(UGraphic ug, Line2D line) { @@ -111,11 +103,10 @@ public class CollisionDetector extends UGraphicNo { } private boolean collision(Line2D hline) { - for (MinMax r : rectangles) { - if (collisionCheck(r, hline)) { + for (MinMax r : rectangles) + if (collisionCheck(r, hline)) return true; - } - } + return false; } @@ -133,42 +124,41 @@ public class CollisionDetector extends UGraphicNo { } private static boolean collisionCheck(MinMax rect, Line2D hline) { - if (hline.getY1() != hline.getY2()) { + if (hline.getY1() != hline.getY2()) throw new IllegalArgumentException(); - } - if (hline.getY1() < rect.getMinY()) { + + if (hline.getY1() < rect.getMinY()) return false; - } - if (hline.getY1() > rect.getMaxY()) { + + if (hline.getY1() > rect.getMaxY()) return false; - } + final double x1 = Math.min(hline.getX1(), hline.getX2()); final double x2 = Math.max(hline.getX1(), hline.getX2()); - if (x2 < rect.getMinX()) { + if (x2 < rect.getMinX()) return false; - } - if (x1 > rect.getMaxX()) { + + if (x1 > rect.getMaxX()) return false; - } + return true; } public void draw(UShape shape) { - if (shape instanceof UPolygon) { + if (shape instanceof UPolygon) drawPolygone((UPolygon) shape); - } else if (shape instanceof URectangle) { + else if (shape instanceof URectangle) drawRectangle((URectangle) shape); - } else if (shape instanceof Snake) { + else if (shape instanceof Snake) drawSnake((Snake) shape); - } /* + /* * else { System.err.println("shape=" + shape.getClass() + " " + shape); } */ } private void drawSnake(Snake shape) { - if (context.manageSnakes) { + if (context.manageSnakes) context.snakes.add(shape.translate(getTranslate())); - } } diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileAssemblySimple.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileAssemblySimple.java index c1d082ff4..ad256276c 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileAssemblySimple.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileAssemblySimple.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.activitydiagram3.ftile; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileGeometry.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileGeometry.java index f3351f9c5..c4883c230 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileGeometry.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileGeometry.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.activitydiagram3.ftile; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Point2D; import net.sourceforge.plantuml.ugraphic.UTranslate; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileHeightFixedCentered.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileHeightFixedCentered.java index 3a2afd382..24beece00 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileHeightFixedCentered.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileHeightFixedCentered.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.activitydiagram3.ftile; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.Collection; import java.util.Collections; import java.util.Set; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileMinWidthCentered.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileMinWidthCentered.java index ce33f9afb..b062e0da4 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileMinWidthCentered.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileMinWidthCentered.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.activitydiagram3.ftile; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.Dimension2DDouble; import net.sourceforge.plantuml.activitydiagram3.ftile.vertical.FtileDecorate; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/GotoInterceptor.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/GotoInterceptor.java index 40ba6ecb4..244f61497 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/GotoInterceptor.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/GotoInterceptor.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.activitydiagram3.ftile; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.activitydiagram3.ftile.vcompact.UGraphicInterceptorGoto; import net.sourceforge.plantuml.graphic.AbstractTextBlock; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/Hexagon.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/Hexagon.java index 6fcd60d10..0cdcc15cd 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/Hexagon.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/Hexagon.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.activitydiagram3.ftile; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.creole.Stencil; import net.sourceforge.plantuml.graphic.StringBounder; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/LaneDivider.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/LaneDivider.java index a784567ed..13695dabe 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/LaneDivider.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/LaneDivider.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.activitydiagram3.ftile; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.ColorParam; import net.sourceforge.plantuml.Dimension2DDouble; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/Snake.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/Snake.java index bc4c97e32..90f4eca0f 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/Snake.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/Snake.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.activitydiagram3.ftile; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Line2D; import java.awt.geom.Point2D; import java.util.ArrayList; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/Swimlanes.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/Swimlanes.java index edf289d19..b0c093b55 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/Swimlanes.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/Swimlanes.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.activitydiagram3.ftile; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/TextBlockInterceptorUDrawable.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/TextBlockInterceptorUDrawable.java index 142d314c3..7fcda4572 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/TextBlockInterceptorUDrawable.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/TextBlockInterceptorUDrawable.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.activitydiagram3.ftile; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.HashMap; import net.sourceforge.plantuml.graphic.AbstractTextBlock; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/WormTexted.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/WormTexted.java index 942fd2d04..a2013aac6 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/WormTexted.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/WormTexted.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.activitydiagram3.ftile; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Point2D; import java.util.Iterator; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FloatingNote.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FloatingNote.java index 4e7232423..c4664c62b 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FloatingNote.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FloatingNote.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.activitydiagram3.ftile.vcompact; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.ColorParam; import net.sourceforge.plantuml.FontParam; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorRepeat.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorRepeat.java index 27d327158..98b83a710 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorRepeat.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorRepeat.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.activitydiagram3.ftile.vcompact; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.List; import net.sourceforge.plantuml.ColorParam; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorSwitch.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorSwitch.java index a1cdd8c5d..96cb47efe 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorSwitch.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorSwitch.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.activitydiagram3.ftile.vcompact; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.ArrayList; import java.util.List; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileForkInner.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileForkInner.java index ad4ed72e7..afc1506cc 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileForkInner.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileForkInner.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.activitydiagram3.ftile.vcompact; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileForkInnerOverlapped.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileForkInnerOverlapped.java index 157fe510a..a6bd2230d 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileForkInnerOverlapped.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileForkInnerOverlapped.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.activitydiagram3.ftile.vcompact; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.ArrayList; import java.util.Collections; import java.util.HashSet; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileGroup.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileGroup.java index 2b21876fb..8cec0b6bc 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileGroup.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileGroup.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.activitydiagram3.ftile.vcompact; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.Collection; import java.util.Set; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileIfAndStop.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileIfAndStop.java index 74e5ade0e..621f3c850 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileIfAndStop.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileIfAndStop.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.activitydiagram3.ftile.vcompact; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Point2D; import java.util.ArrayList; import java.util.Collections; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileIfDown.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileIfDown.java index 5a683d700..14a51bf03 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileIfDown.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileIfDown.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.activitydiagram3.ftile.vcompact; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Point2D; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileIfLongHorizontal.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileIfLongHorizontal.java index f3c9cca14..fe9c7f1a7 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileIfLongHorizontal.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileIfLongHorizontal.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.activitydiagram3.ftile.vcompact; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Point2D; import java.util.ArrayList; import java.util.Collection; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileIfLongVertical.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileIfLongVertical.java index 4a48bd62e..706e343e3 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileIfLongVertical.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileIfLongVertical.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.activitydiagram3.ftile.vcompact; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Point2D; import java.util.ArrayList; import java.util.Collection; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileNoteAlone.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileNoteAlone.java index f1eb8163e..7d2e81d9a 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileNoteAlone.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileNoteAlone.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.activitydiagram3.ftile.vcompact; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.Collection; import java.util.Collections; import java.util.Set; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileRepeat.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileRepeat.java index 88b22c9a9..d5233a296 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileRepeat.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileRepeat.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.activitydiagram3.ftile.vcompact; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Point2D; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileSplit1.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileSplit1.java index 3d86b64c6..cf0e0833f 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileSplit1.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileSplit1.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.activitydiagram3.ftile.vcompact; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.ArrayList; import java.util.Collections; import java.util.HashSet; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileSwitch.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileSwitch.java index 97c3e8f16..31d3d5dcd 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileSwitch.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileSwitch.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.activitydiagram3.ftile.vcompact; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileWhile.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileWhile.java index 323718c39..b00b6908c 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileWhile.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileWhile.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.activitydiagram3.ftile.vcompact; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Point2D; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileWithNoteOpale.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileWithNoteOpale.java index 9d3a765f9..436c6bd9d 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileWithNoteOpale.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileWithNoteOpale.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.activitydiagram3.ftile.vcompact; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Point2D; import java.util.Collection; import java.util.Collections; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileWithNotes.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileWithNotes.java index 95e1d7c2d..0e7567ade 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileWithNotes.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileWithNotes.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.activitydiagram3.ftile.vcompact; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.Collection; import java.util.Set; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/ParallelBuilderFork.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/ParallelBuilderFork.java index 6ff61c3f8..45c6f50a6 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/ParallelBuilderFork.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/ParallelBuilderFork.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.activitydiagram3.ftile.vcompact; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Point2D; import java.util.ArrayList; import java.util.List; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/ParallelBuilderMerge.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/ParallelBuilderMerge.java index 366894cf9..d26674b9d 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/ParallelBuilderMerge.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/ParallelBuilderMerge.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.activitydiagram3.ftile.vcompact; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Point2D; import java.util.ArrayList; import java.util.List; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/cond/ConditionalBuilder.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/cond/ConditionalBuilder.java index 68936b259..59707fbbc 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/cond/ConditionalBuilder.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/cond/ConditionalBuilder.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.activitydiagram3.ftile.vcompact.cond; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.LineBreakStrategy; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/cond/FtileIfNude.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/cond/FtileIfNude.java index 1e2261cbe..808706817 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/cond/FtileIfNude.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/cond/FtileIfNude.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.activitydiagram3.ftile.vcompact.cond; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.Arrays; import java.util.Collection; import java.util.Collections; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/cond/FtileIfWithDiamonds.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/cond/FtileIfWithDiamonds.java index 73da00734..82bfc29fa 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/cond/FtileIfWithDiamonds.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/cond/FtileIfWithDiamonds.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.activitydiagram3.ftile.vcompact.cond; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.Arrays; import java.util.Collection; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/cond/FtileIfWithLinks.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/cond/FtileIfWithLinks.java index 1d5c3dfcf..d18c238ab 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/cond/FtileIfWithLinks.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/cond/FtileIfWithLinks.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.activitydiagram3.ftile.vcompact.cond; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Point2D; import java.util.ArrayList; import java.util.List; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/cond/FtileSwitchNude.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/cond/FtileSwitchNude.java index 202164d53..b6c33c7a2 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/cond/FtileSwitchNude.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/cond/FtileSwitchNude.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.activitydiagram3.ftile.vcompact.cond; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.Collection; import java.util.Collections; import java.util.HashSet; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileBlackBlock.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileBlackBlock.java index d50cbf46f..58231201a 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileBlackBlock.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileBlackBlock.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.activitydiagram3.ftile.vertical; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.Collection; import java.util.Collections; import java.util.Objects; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileBox.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileBox.java index 59017338a..68d51178f 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileBox.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileBox.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.activitydiagram3.ftile.vertical; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.Collection; import java.util.Collections; import java.util.Set; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileBox2.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileBox2.java index 5e6698652..1b108de58 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileBox2.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileBox2.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.activitydiagram3.ftile.vertical; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.Collection; import java.util.Collections; import java.util.Set; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileBoxOld.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileBoxOld.java index 85e8c65bf..c6d90c516 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileBoxOld.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileBoxOld.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.activitydiagram3.ftile.vertical; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.Collection; import java.util.Collections; import java.util.Set; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDecorateInLabel.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDecorateInLabel.java index 4fb285dcd..c9c0b16ad 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDecorateInLabel.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDecorateInLabel.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.activitydiagram3.ftile.vertical; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.activitydiagram3.ftile.Ftile; import net.sourceforge.plantuml.activitydiagram3.ftile.FtileGeometry; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDecorateOutLabel.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDecorateOutLabel.java index d3edfcaec..d730073e5 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDecorateOutLabel.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDecorateOutLabel.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.activitydiagram3.ftile.vertical; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.activitydiagram3.ftile.Ftile; import net.sourceforge.plantuml.activitydiagram3.ftile.FtileGeometry; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamond.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamond.java index e4579cf16..c876251ba 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamond.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamond.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.activitydiagram3.ftile.vertical; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.Dimension2DDouble; import net.sourceforge.plantuml.ISkinParam; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamondInside.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamondInside.java index 90a795bed..29b40d697 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamondInside.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamondInside.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.activitydiagram3.ftile.vertical; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.Dimension2DDouble; import net.sourceforge.plantuml.ISkinParam; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamondInside2.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamondInside2.java index f93018036..7d8cfdaf1 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamondInside2.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamondInside2.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.activitydiagram3.ftile.vertical; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.Dimension2DDouble; import net.sourceforge.plantuml.ISkinParam; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamondSquare.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamondSquare.java index 0b781325e..b22e32d1a 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamondSquare.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamondSquare.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.activitydiagram3.ftile.vertical; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.Dimension2DDouble; import net.sourceforge.plantuml.ISkinParam; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/gtile/AbstractGtile.java b/src/net/sourceforge/plantuml/activitydiagram3/gtile/AbstractGtile.java index c43b8e01d..d9081981e 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/gtile/AbstractGtile.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/gtile/AbstractGtile.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.activitydiagram3.gtile; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.Collection; import java.util.Collections; import java.util.Set; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GConnectionHorizontalThenVerticalDown.java b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GConnectionHorizontalThenVerticalDown.java index 472755b9f..8ca06751a 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GConnectionHorizontalThenVerticalDown.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GConnectionHorizontalThenVerticalDown.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.activitydiagram3.gtile; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Point2D; import net.sourceforge.plantuml.Dimension2DDouble; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileAssembly.java b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileAssembly.java index c5fecb482..2b8c290a4 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileAssembly.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileAssembly.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.activitydiagram3.gtile; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.Collection; import java.util.Collections; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileBox.java b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileBox.java index f30d357b7..3ca5bc6bb 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileBox.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileBox.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.activitydiagram3.gtile; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.ColorParam; import net.sourceforge.plantuml.Dimension2DDouble; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileCircleSpot.java b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileCircleSpot.java index e0585f77b..8cd113373 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileCircleSpot.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileCircleSpot.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.activitydiagram3.gtile; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.ColorParam; import net.sourceforge.plantuml.Dimension2DDouble; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileCircleStart.java b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileCircleStart.java index d7b532f2a..dbf603fab 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileCircleStart.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileCircleStart.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.activitydiagram3.gtile; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.Dimension2DDouble; import net.sourceforge.plantuml.ISkinParam; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileColumns.java b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileColumns.java index 266a5432c..8572bbe5e 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileColumns.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileColumns.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.activitydiagram3.gtile; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.Collections; import java.util.HashSet; import java.util.List; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileEmpty.java b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileEmpty.java index aec1e9b0e..d37253e7a 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileEmpty.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileEmpty.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.activitydiagram3.gtile; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.Dimension2DDouble; import net.sourceforge.plantuml.ISkinParam; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileGroup.java b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileGroup.java index 00289a975..11d9b7e1c 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileGroup.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileGroup.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.activitydiagram3.gtile; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.Collection; import java.util.Collections; import java.util.Set; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileHexagonInside.java b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileHexagonInside.java index 8868db03d..2a9fa6dc9 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileHexagonInside.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileHexagonInside.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.activitydiagram3.gtile; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.Dimension2DDouble; import net.sourceforge.plantuml.ISkinParam; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileHexagonInsideLabelled.java b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileHexagonInsideLabelled.java index 5263e7c58..eb2e0d5c7 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileHexagonInsideLabelled.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileHexagonInsideLabelled.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.activitydiagram3.gtile; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileIfAlone.java b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileIfAlone.java index 4d1564b34..712feddd5 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileIfAlone.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileIfAlone.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.activitydiagram3.gtile; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.Arrays; import java.util.Collection; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileIfHexagon.java b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileIfHexagon.java index fc65bdc75..8b67b1481 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileIfHexagon.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileIfHexagon.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.activitydiagram3.gtile; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.Arrays; import java.util.Collection; import java.util.List; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileRepeat.java b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileRepeat.java index e3514d5c0..56ff98859 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileRepeat.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileRepeat.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.activitydiagram3.gtile; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileSplit.java b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileSplit.java index dc1b36771..66ae3b13f 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileSplit.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileSplit.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.activitydiagram3.gtile; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.List; import net.sourceforge.plantuml.Dimension2DDouble; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileTopDown.java b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileTopDown.java index c9e4629f2..51fc6c7c2 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileTopDown.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileTopDown.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.activitydiagram3.gtile; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.Collections; import java.util.HashSet; import java.util.Set; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileTopDown3.java b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileTopDown3.java index 09c1c203e..92defed68 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileTopDown3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileTopDown3.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.activitydiagram3.gtile; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.Collections; import java.util.HashSet; import java.util.Set; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileWithMargin.java b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileWithMargin.java index d4556057f..ebbda2313 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileWithMargin.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileWithMargin.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.activitydiagram3.gtile; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.Collection; import java.util.Collections; import java.util.Set; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileWithNoteOpale.java b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileWithNoteOpale.java index e025609bd..2d44699f3 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileWithNoteOpale.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileWithNoteOpale.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.activitydiagram3.gtile; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.Set; import net.sourceforge.plantuml.AlignmentParam; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileWithNotes.java b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileWithNotes.java index f0ff92de7..3031366ac 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileWithNotes.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/gtile/GtileWithNotes.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.activitydiagram3.gtile; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.Collection; import java.util.Set; diff --git a/src/net/sourceforge/plantuml/anim/AffineTransformation.java b/src/net/sourceforge/plantuml/anim/AffineTransformation.java index bff75e377..e2931faf1 100644 --- a/src/net/sourceforge/plantuml/anim/AffineTransformation.java +++ b/src/net/sourceforge/plantuml/anim/AffineTransformation.java @@ -36,7 +36,7 @@ package net.sourceforge.plantuml.anim; import java.awt.geom.AffineTransform; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Point2D; import java.util.Objects; import java.util.StringTokenizer; diff --git a/src/net/sourceforge/plantuml/anim/Animation.java b/src/net/sourceforge/plantuml/anim/Animation.java index 38211f182..ba94482db 100644 --- a/src/net/sourceforge/plantuml/anim/Animation.java +++ b/src/net/sourceforge/plantuml/anim/Animation.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.anim; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; diff --git a/src/net/sourceforge/plantuml/api/ImageDataAbstract.java b/src/net/sourceforge/plantuml/api/ImageDataAbstract.java index 371b57232..289f2e2b0 100644 --- a/src/net/sourceforge/plantuml/api/ImageDataAbstract.java +++ b/src/net/sourceforge/plantuml/api/ImageDataAbstract.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.api; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.core.ImageData; diff --git a/src/net/sourceforge/plantuml/api/ImageDataComplex.java b/src/net/sourceforge/plantuml/api/ImageDataComplex.java index dda92c697..6ffb95cee 100644 --- a/src/net/sourceforge/plantuml/api/ImageDataComplex.java +++ b/src/net/sourceforge/plantuml/api/ImageDataComplex.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.api; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.CMapData; diff --git a/src/net/sourceforge/plantuml/api/ImageDataSimple.java b/src/net/sourceforge/plantuml/api/ImageDataSimple.java index 6d53b6cf3..94394ec36 100644 --- a/src/net/sourceforge/plantuml/api/ImageDataSimple.java +++ b/src/net/sourceforge/plantuml/api/ImageDataSimple.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.api; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.core.ImageData; diff --git a/src/net/sourceforge/plantuml/asciiart/AbstractComponentText.java b/src/net/sourceforge/plantuml/asciiart/AbstractComponentText.java index 45bc2a758..1ae8b7e5c 100644 --- a/src/net/sourceforge/plantuml/asciiart/AbstractComponentText.java +++ b/src/net/sourceforge/plantuml/asciiart/AbstractComponentText.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.asciiart; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.Dimension2DDouble; import net.sourceforge.plantuml.graphic.StringBounder; diff --git a/src/net/sourceforge/plantuml/asciiart/ComponentTextActiveLine.java b/src/net/sourceforge/plantuml/asciiart/ComponentTextActiveLine.java index 792b2e450..4fb387c04 100644 --- a/src/net/sourceforge/plantuml/asciiart/ComponentTextActiveLine.java +++ b/src/net/sourceforge/plantuml/asciiart/ComponentTextActiveLine.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.asciiart; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.FileFormat; import net.sourceforge.plantuml.graphic.StringBounder; diff --git a/src/net/sourceforge/plantuml/asciiart/ComponentTextActor.java b/src/net/sourceforge/plantuml/asciiart/ComponentTextActor.java index 8529c4e82..913ecd8ca 100644 --- a/src/net/sourceforge/plantuml/asciiart/ComponentTextActor.java +++ b/src/net/sourceforge/plantuml/asciiart/ComponentTextActor.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.asciiart; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.FileFormat; import net.sourceforge.plantuml.StringUtils; diff --git a/src/net/sourceforge/plantuml/asciiart/ComponentTextArrow.java b/src/net/sourceforge/plantuml/asciiart/ComponentTextArrow.java index 8b1a36c05..fc5fdb57f 100644 --- a/src/net/sourceforge/plantuml/asciiart/ComponentTextArrow.java +++ b/src/net/sourceforge/plantuml/asciiart/ComponentTextArrow.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.asciiart; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Point2D; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/src/net/sourceforge/plantuml/asciiart/ComponentTextDelay.java b/src/net/sourceforge/plantuml/asciiart/ComponentTextDelay.java index 44e219c21..eaea6f03b 100644 --- a/src/net/sourceforge/plantuml/asciiart/ComponentTextDelay.java +++ b/src/net/sourceforge/plantuml/asciiart/ComponentTextDelay.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.asciiart; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.FileFormat; import net.sourceforge.plantuml.StringUtils; diff --git a/src/net/sourceforge/plantuml/asciiart/ComponentTextDivider.java b/src/net/sourceforge/plantuml/asciiart/ComponentTextDivider.java index ac112b6a2..081c6612d 100644 --- a/src/net/sourceforge/plantuml/asciiart/ComponentTextDivider.java +++ b/src/net/sourceforge/plantuml/asciiart/ComponentTextDivider.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.asciiart; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.FileFormat; import net.sourceforge.plantuml.StringUtils; diff --git a/src/net/sourceforge/plantuml/asciiart/ComponentTextGroupingBody.java b/src/net/sourceforge/plantuml/asciiart/ComponentTextGroupingBody.java index 506be54f9..407669bca 100644 --- a/src/net/sourceforge/plantuml/asciiart/ComponentTextGroupingBody.java +++ b/src/net/sourceforge/plantuml/asciiart/ComponentTextGroupingBody.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.asciiart; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.List; import net.sourceforge.plantuml.FileFormat; diff --git a/src/net/sourceforge/plantuml/asciiart/ComponentTextGroupingElse.java b/src/net/sourceforge/plantuml/asciiart/ComponentTextGroupingElse.java index af61eb7d0..dbcb1eae2 100644 --- a/src/net/sourceforge/plantuml/asciiart/ComponentTextGroupingElse.java +++ b/src/net/sourceforge/plantuml/asciiart/ComponentTextGroupingElse.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.asciiart; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.FileFormat; import net.sourceforge.plantuml.cucadiagram.Display; diff --git a/src/net/sourceforge/plantuml/asciiart/ComponentTextGroupingHeader.java b/src/net/sourceforge/plantuml/asciiart/ComponentTextGroupingHeader.java index 4537f0fcd..86f538667 100644 --- a/src/net/sourceforge/plantuml/asciiart/ComponentTextGroupingHeader.java +++ b/src/net/sourceforge/plantuml/asciiart/ComponentTextGroupingHeader.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.asciiart; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.FileFormat; import net.sourceforge.plantuml.StringUtils; diff --git a/src/net/sourceforge/plantuml/asciiart/ComponentTextGroupingTail.java b/src/net/sourceforge/plantuml/asciiart/ComponentTextGroupingTail.java index b6831ce55..2eba85d3c 100644 --- a/src/net/sourceforge/plantuml/asciiart/ComponentTextGroupingTail.java +++ b/src/net/sourceforge/plantuml/asciiart/ComponentTextGroupingTail.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.asciiart; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.List; import net.sourceforge.plantuml.FileFormat; diff --git a/src/net/sourceforge/plantuml/asciiart/ComponentTextLine.java b/src/net/sourceforge/plantuml/asciiart/ComponentTextLine.java index 43704f148..8222e7b9c 100644 --- a/src/net/sourceforge/plantuml/asciiart/ComponentTextLine.java +++ b/src/net/sourceforge/plantuml/asciiart/ComponentTextLine.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.asciiart; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.FileFormat; import net.sourceforge.plantuml.graphic.StringBounder; diff --git a/src/net/sourceforge/plantuml/asciiart/ComponentTextNewpage.java b/src/net/sourceforge/plantuml/asciiart/ComponentTextNewpage.java index 3a39ca826..bda9f3de6 100644 --- a/src/net/sourceforge/plantuml/asciiart/ComponentTextNewpage.java +++ b/src/net/sourceforge/plantuml/asciiart/ComponentTextNewpage.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.asciiart; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.FileFormat; import net.sourceforge.plantuml.graphic.StringBounder; diff --git a/src/net/sourceforge/plantuml/asciiart/ComponentTextNote.java b/src/net/sourceforge/plantuml/asciiart/ComponentTextNote.java index 39c18d741..dbc7c742a 100644 --- a/src/net/sourceforge/plantuml/asciiart/ComponentTextNote.java +++ b/src/net/sourceforge/plantuml/asciiart/ComponentTextNote.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.asciiart; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.FileFormat; import net.sourceforge.plantuml.StringUtils; diff --git a/src/net/sourceforge/plantuml/asciiart/ComponentTextParticipant.java b/src/net/sourceforge/plantuml/asciiart/ComponentTextParticipant.java index 0c1404b27..3928a5b86 100644 --- a/src/net/sourceforge/plantuml/asciiart/ComponentTextParticipant.java +++ b/src/net/sourceforge/plantuml/asciiart/ComponentTextParticipant.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.asciiart; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.FileFormat; import net.sourceforge.plantuml.StringUtils; diff --git a/src/net/sourceforge/plantuml/asciiart/ComponentTextSelfArrow.java b/src/net/sourceforge/plantuml/asciiart/ComponentTextSelfArrow.java index c2fb3ca42..d11ac5622 100644 --- a/src/net/sourceforge/plantuml/asciiart/ComponentTextSelfArrow.java +++ b/src/net/sourceforge/plantuml/asciiart/ComponentTextSelfArrow.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.asciiart; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Point2D; import net.sourceforge.plantuml.FileFormat; diff --git a/src/net/sourceforge/plantuml/asciiart/ComponentTextShape.java b/src/net/sourceforge/plantuml/asciiart/ComponentTextShape.java index 812cdad6f..29c6fb2db 100644 --- a/src/net/sourceforge/plantuml/asciiart/ComponentTextShape.java +++ b/src/net/sourceforge/plantuml/asciiart/ComponentTextShape.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.asciiart; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.cucadiagram.Display; diff --git a/src/net/sourceforge/plantuml/asciiart/TextStringBounder.java b/src/net/sourceforge/plantuml/asciiart/TextStringBounder.java index 465917a1e..adc656934 100644 --- a/src/net/sourceforge/plantuml/asciiart/TextStringBounder.java +++ b/src/net/sourceforge/plantuml/asciiart/TextStringBounder.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.asciiart; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.Dimension2DDouble; import net.sourceforge.plantuml.graphic.StringBounderRaw; diff --git a/src/net/sourceforge/plantuml/awt/Color.java b/src/net/sourceforge/plantuml/awt/Color.java new file mode 100644 index 000000000..eb0e8b285 --- /dev/null +++ b/src/net/sourceforge/plantuml/awt/Color.java @@ -0,0 +1,5 @@ +package net.sourceforge.plantuml.awt; + +public class Color { + +} diff --git a/src/net/sourceforge/plantuml/awt/Font.java b/src/net/sourceforge/plantuml/awt/Font.java new file mode 100644 index 000000000..005631839 --- /dev/null +++ b/src/net/sourceforge/plantuml/awt/Font.java @@ -0,0 +1,5 @@ +package net.sourceforge.plantuml.awt; + +public class Font { + +} diff --git a/src/net/sourceforge/plantuml/awt/FontMetrics.java b/src/net/sourceforge/plantuml/awt/FontMetrics.java new file mode 100644 index 000000000..14eb9262e --- /dev/null +++ b/src/net/sourceforge/plantuml/awt/FontMetrics.java @@ -0,0 +1,14 @@ +package net.sourceforge.plantuml.awt; + +import java.awt.Graphics2D; + +import net.sourceforge.plantuml.awt.geom.Rectangle2D; + +public class FontMetrics { + + public Rectangle2D getStringBounds(String s, Graphics2D g2d) { + // TODO Auto-generated method stub + return null; + } + +} diff --git a/src/net/sourceforge/plantuml/awt/Shape.java b/src/net/sourceforge/plantuml/awt/Shape.java new file mode 100644 index 000000000..69eab4616 --- /dev/null +++ b/src/net/sourceforge/plantuml/awt/Shape.java @@ -0,0 +1,5 @@ +package net.sourceforge.plantuml.awt; + +public interface Shape { + +} diff --git a/src/net/sourceforge/plantuml/awt/geom/AffineTransform.java b/src/net/sourceforge/plantuml/awt/geom/AffineTransform.java new file mode 100644 index 000000000..648e4db04 --- /dev/null +++ b/src/net/sourceforge/plantuml/awt/geom/AffineTransform.java @@ -0,0 +1,88 @@ +package net.sourceforge.plantuml.awt.geom; + +import net.sourceforge.plantuml.awt.geom.Point2D.Double; + +public class AffineTransform { + + public AffineTransform(AffineTransform at) { + // TODO Auto-generated constructor stub + } + + public AffineTransform(double[] ds) { + // TODO Auto-generated constructor stub + } + + public AffineTransform(int i, int j, int k, int l, int m, int n) { + // TODO Auto-generated constructor stub + } + + public AffineTransform() { + // TODO Auto-generated constructor stub + } + + public double getScaleX() { + // TODO Auto-generated method stub + return 0; + } + + public double getScaleY() { + // TODO Auto-generated method stub + return 0; + } + + public double getTranslateX() { + // TODO Auto-generated method stub + return 0; + } + + public double getTranslateY() { + // TODO Auto-generated method stub + return 0; + } + + public void translate(double x, double y) { + // TODO Auto-generated method stub + + } + + public void concatenate(AffineTransform affineTransform) { + // TODO Auto-generated method stub + + } + + public static AffineTransform getScaleInstance(double scale, double scale2) { + // TODO Auto-generated method stub + return null; + } + + public void setToShear(double coef, double coef2) { + // TODO Auto-generated method stub + + } + + public static AffineTransform getTranslateInstance(double tx, double ty) { + // TODO Auto-generated method stub + return null; + } + + public static AffineTransform getShearInstance(double shx, double shy) { + // TODO Auto-generated method stub + return null; + } + + public static AffineTransform getRotateInstance(double d) { + // TODO Auto-generated method stub + return null; + } + + public Point2D transform(Point2D src, Point2D dest) { + // TODO Auto-generated method stub + return null; + } + + public void scale(double changex, double changey) { + // TODO Auto-generated method stub + + } + +} diff --git a/src/net/sourceforge/plantuml/awt/geom/Arc2D.java b/src/net/sourceforge/plantuml/awt/geom/Arc2D.java new file mode 100644 index 000000000..e8439b669 --- /dev/null +++ b/src/net/sourceforge/plantuml/awt/geom/Arc2D.java @@ -0,0 +1,11 @@ +package net.sourceforge.plantuml.awt.geom; + +import net.sourceforge.plantuml.awt.Shape; + +public class Arc2D implements Shape { + + public static class Double extends Arc2D { + + } + +} diff --git a/src/net/sourceforge/plantuml/awt/geom/CubicCurve2D.java b/src/net/sourceforge/plantuml/awt/geom/CubicCurve2D.java new file mode 100644 index 000000000..4bd6ffe9e --- /dev/null +++ b/src/net/sourceforge/plantuml/awt/geom/CubicCurve2D.java @@ -0,0 +1,143 @@ +package net.sourceforge.plantuml.awt.geom; + +import net.sourceforge.plantuml.awt.Shape; + +public class CubicCurve2D implements Shape { + + public double x1; + public double y1; + public double ctrlx1; + public double ctrly1; + public double ctrlx2; + public double ctrly2; + public double x2; + public double y2; + + public CubicCurve2D(double x1, double y1, double ctrlx1, double ctrly1, double ctrlx2, double ctrly2, double x2, + double y2) { + this.x1 = x1; + this.y1 = y1; + this.ctrlx1 = ctrlx1; + this.ctrly1 = ctrly1; + this.ctrlx2 = ctrlx2; + this.ctrly2 = ctrly2; + this.x2 = x2; + this.y2 = y2; + + } + + public Point2D getP1() { + return new Point2D.Double(x1, y1); + } + + public Point2D getP2() { + return new Point2D.Double(x2, y2); + } + + public void setCurve(double x1, double y1, double ctrlx1, double ctrly1, double ctrlx2, double ctrly2, double x2, + double y2) { + this.x1 = x1; + this.y1 = y1; + this.ctrlx1 = ctrlx1; + this.ctrly1 = ctrly1; + this.ctrlx2 = ctrlx2; + this.ctrly2 = ctrly2; + this.x2 = x2; + this.y2 = y2; + + } + + public void setCurve(CubicCurve2D other) { + setCurve(other.x1, other.y1, other.ctrlx1, other.ctrly1, other.ctrlx2, other.ctrly2, other.ctrlx2, + other.ctrly2); + + } + + public void subdivide(CubicCurve2D left, CubicCurve2D right) { + double x1 = this.getX1(); + double y1 = this.getY1(); + double ctrlx1 = this.getCtrlX1(); + double ctrly1 = this.getCtrlY1(); + double ctrlx2 = this.getCtrlX2(); + double ctrly2 = this.getCtrlY2(); + double x2 = this.getX2(); + double y2 = this.getY2(); + double centerx = (ctrlx1 + ctrlx2) / 2.0; + double centery = (ctrly1 + ctrly2) / 2.0; + ctrlx1 = (x1 + ctrlx1) / 2.0; + ctrly1 = (y1 + ctrly1) / 2.0; + ctrlx2 = (x2 + ctrlx2) / 2.0; + ctrly2 = (y2 + ctrly2) / 2.0; + double ctrlx12 = (ctrlx1 + centerx) / 2.0; + double ctrly12 = (ctrly1 + centery) / 2.0; + double ctrlx21 = (ctrlx2 + centerx) / 2.0; + double ctrly21 = (ctrly2 + centery) / 2.0; + centerx = (ctrlx12 + ctrlx21) / 2.0; + centery = (ctrly12 + ctrly21) / 2.0; + if (left != null) + left.setCurve(x1, y1, ctrlx1, ctrly1, ctrlx12, ctrly12, centerx, centery); + + if (right != null) + right.setCurve(centerx, centery, ctrlx21, ctrly21, ctrlx2, ctrly2, x2, y2); + + } + + public static class Double extends CubicCurve2D { + public Double() { + this(0, 0, 0, 0, 0, 0, 0, 0); + } + + public Double(double x1, double y1, double ctrlx1, double ctrly1, double ctrlx2, double ctrly2, double x2, + double y2) { + super(x1, y1, ctrlx1, ctrly1, ctrlx2, ctrly2, x2, y2); + + } + + } + + public final double getX1() { + return x1; + } + + public final double getY1() { + return y1; + } + + public final double getCtrlX1() { + return ctrlx1; + } + + public final double getCtrlY1() { + return ctrly1; + } + + public final double getCtrlX2() { + return ctrlx2; + } + + public final double getCtrlY2() { + return ctrly2; + } + + public final double getX2() { + return x2; + } + + public final double getY2() { + return y2; + } + + public Point2D getCtrlP1() { + return new Point2D.Double(ctrlx1, ctrly1); + } + + public Point2D getCtrlP2() { + return new Point2D.Double(ctrlx2, ctrly2); + } + + public double getFlatnessSq() { + // TODO Auto-generated method stub + return 0; + } + +} diff --git a/src/net/sourceforge/plantuml/awt/geom/Dimension2D.java b/src/net/sourceforge/plantuml/awt/geom/Dimension2D.java new file mode 100644 index 000000000..28e4ebe0c --- /dev/null +++ b/src/net/sourceforge/plantuml/awt/geom/Dimension2D.java @@ -0,0 +1,30 @@ +package net.sourceforge.plantuml.awt.geom; + +public class Dimension2D { + + private final double width; + private final double height; + + public Dimension2D() { + this(0, 0); + } + + public Dimension2D(double width, double height) { + this.width = width; + this.height = height; + } + + public double getWidth() { + return width; + } + + public double getHeight() { + return height; + } + + public void setSize(double width, double height) { + throw new UnsupportedOperationException(); + } + + +} diff --git a/src/net/sourceforge/plantuml/awt/geom/GeneralPath.java b/src/net/sourceforge/plantuml/awt/geom/GeneralPath.java new file mode 100644 index 000000000..cc788319b --- /dev/null +++ b/src/net/sourceforge/plantuml/awt/geom/GeneralPath.java @@ -0,0 +1,10 @@ +package net.sourceforge.plantuml.awt.geom; + +public class GeneralPath extends Path2D { + + public void append(CubicCurve2D bez, boolean b) { + // TODO Auto-generated method stub + + } + +} diff --git a/src/net/sourceforge/plantuml/awt/geom/Line2D.java b/src/net/sourceforge/plantuml/awt/geom/Line2D.java new file mode 100644 index 000000000..0a2ae12b7 --- /dev/null +++ b/src/net/sourceforge/plantuml/awt/geom/Line2D.java @@ -0,0 +1,64 @@ +package net.sourceforge.plantuml.awt.geom; + +import net.sourceforge.plantuml.awt.Shape; + +public class Line2D implements Shape { + + public double x1; + public double y1; + public double x2; + public double y2; + + public Line2D() { + this(0, 0, 0, 0); + } + + public Line2D(double x1, double y1, double x2, double y2) { + this.x1 = x1; + this.y1 = y1; + this.x2 = x2; + this.y2 = y2; + + } + + public Line2D(Point2D p1, Point2D p2) { + this(p1.getX(), p1.getY(), p2.getX(), p2.getY()); + } + + public static class Double extends Line2D { + + public Double(double x1, double y1, double x2, double y2) { + super(x1, y1, x2, y2); + } + + public Double(Point2D p1, Point2D p2) { + super(p1, p2); + } + + } + + public final double getX1() { + return x1; + } + + public final double getY1() { + return y1; + } + + public final double getX2() { + return x2; + } + + public final double getY2() { + return y2; + } + + public Point2D getP1() { + return new Point2D(x1, y1); + } + + public Point2D getP2() { + return new Point2D(x2, y2); + } + +} diff --git a/src/net/sourceforge/plantuml/awt/geom/Path2D.java b/src/net/sourceforge/plantuml/awt/geom/Path2D.java new file mode 100644 index 000000000..6ddfb1b53 --- /dev/null +++ b/src/net/sourceforge/plantuml/awt/geom/Path2D.java @@ -0,0 +1,7 @@ +package net.sourceforge.plantuml.awt.geom; + +import net.sourceforge.plantuml.awt.Shape; + +public abstract class Path2D implements Shape { + +} diff --git a/src/net/sourceforge/plantuml/awt/geom/PathIterator.java b/src/net/sourceforge/plantuml/awt/geom/PathIterator.java new file mode 100644 index 000000000..d801720f7 --- /dev/null +++ b/src/net/sourceforge/plantuml/awt/geom/PathIterator.java @@ -0,0 +1,33 @@ +package net.sourceforge.plantuml.awt.geom; + +public class PathIterator { + + public static final int WIND_EVEN_ODD = java.awt.geom.PathIterator.WIND_EVEN_ODD; + public static final int WIND_NON_ZERO = java.awt.geom.PathIterator.WIND_NON_ZERO; + public static final int SEG_MOVETO = java.awt.geom.PathIterator.SEG_MOVETO; + public static final int SEG_LINETO = java.awt.geom.PathIterator.SEG_LINETO; + public static final int SEG_CUBICTO = java.awt.geom.PathIterator.SEG_CUBICTO; + public static final int SEG_QUADTO = java.awt.geom.PathIterator.SEG_QUADTO; + public static final int SEG_CLOSE = java.awt.geom.PathIterator.SEG_CLOSE; + + public boolean isDone() { + // TODO Auto-generated method stub + return false; + } + + public void next() { + // TODO Auto-generated method stub + + } + + public int getWindingRule() { + // TODO Auto-generated method stub + return 0; + } + + public int currentSegment(double[] coord) { + // TODO Auto-generated method stub + return 0; + } + +} diff --git a/src/net/sourceforge/plantuml/awt/geom/Point2D.java b/src/net/sourceforge/plantuml/awt/geom/Point2D.java new file mode 100644 index 000000000..087fd14f0 --- /dev/null +++ b/src/net/sourceforge/plantuml/awt/geom/Point2D.java @@ -0,0 +1,62 @@ +package net.sourceforge.plantuml.awt.geom; + +public class Point2D { + + public double x; + public double y; + + public Point2D(double x, double y) { + this.x = x; + this.y = y; + } + + public final double getX() { + return x; + } + + public final double getY() { + return y; + } + + public static class Double extends Point2D { + + public Double(double x, double y) { + super(x, y); + } + + public Double() { + this(0, 0); + } + + } + + public double distance(Point2D other) { + final double px = other.getX() - this.getX(); + final double py = other.getY() - this.getY(); + return Math.sqrt(px * px + py * py); + } + + public double distanceSq(Point2D other) { + final double px = other.getX() - this.getX(); + final double py = other.getY() - this.getY(); + return px * px + py * py; + } + + public static double distance(double x1, double y1, double x2, double y2) { + x1 -= x2; + y1 -= y2; + return Math.sqrt(x1 * x1 + y1 * y1); + } + + public double distance(double px, double py) { + px -= getX(); + py -= getY(); + return Math.sqrt(px * px + py * py); + } + + public void setLocation(double px, double py) { + this.x = px; + this.y = py; + } + +} diff --git a/src/net/sourceforge/plantuml/awt/geom/Rectangle2D.java b/src/net/sourceforge/plantuml/awt/geom/Rectangle2D.java new file mode 100644 index 000000000..7f0badbce --- /dev/null +++ b/src/net/sourceforge/plantuml/awt/geom/Rectangle2D.java @@ -0,0 +1,79 @@ +package net.sourceforge.plantuml.awt.geom; + +import net.sourceforge.plantuml.awt.Shape; + +public class Rectangle2D implements Shape { + + public final double x; + public final double y; + public final double width; + public final double height; + + public Rectangle2D(double x, double y, double width, double height) { + this.x = x; + this.y = y; + this.width = width; + this.height = height; + + } + + public static class Double extends Rectangle2D { + + public Double(double x, double y, double width, double height) { + super(x, y, width, height); + + } + + } + + public double getWidth() { + return width; + } + + public double getHeight() { + return height; + } + + public double getX() { + return x; + } + + public double getY() { + return y; + } + + public double getCenterX() { + return x; + } + + public double getCenterY() { + return y; + } + + public double getMinX() { + return x; + } + + public double getMaxX() { + return x + width; + } + + public double getMinY() { + return y; + } + + public double getMaxY() { + return y + height; + } + + public boolean intersects(Rectangle2D rectangle) { + // TODO Auto-generated method stub + return false; + } + + public boolean contains(Point2D point) { + // TODO Auto-generated method stub + return false; + } + +} diff --git a/src/net/sourceforge/plantuml/board/BoardDiagram.java b/src/net/sourceforge/plantuml/board/BoardDiagram.java index 43b9a3fd0..60ab83f6c 100644 --- a/src/net/sourceforge/plantuml/board/BoardDiagram.java +++ b/src/net/sourceforge/plantuml/board/BoardDiagram.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.board; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Rectangle2D; import java.io.IOException; import java.io.OutputStream; diff --git a/src/net/sourceforge/plantuml/board/CardBox.java b/src/net/sourceforge/plantuml/board/CardBox.java index accbc6b0a..0a2fdbc1c 100644 --- a/src/net/sourceforge/plantuml/board/CardBox.java +++ b/src/net/sourceforge/plantuml/board/CardBox.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.board; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.Dimension2DDouble; import net.sourceforge.plantuml.ISkinParam; diff --git a/src/net/sourceforge/plantuml/bpm/BpmElement.java b/src/net/sourceforge/plantuml/bpm/BpmElement.java index d54979478..21228114f 100644 --- a/src/net/sourceforge/plantuml/bpm/BpmElement.java +++ b/src/net/sourceforge/plantuml/bpm/BpmElement.java @@ -34,7 +34,7 @@ */ package net.sourceforge.plantuml.bpm; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Rectangle2D; import net.sourceforge.plantuml.ColorParam; diff --git a/src/net/sourceforge/plantuml/bpm/ConnectorPuzzleEmpty.java b/src/net/sourceforge/plantuml/bpm/ConnectorPuzzleEmpty.java index a79c902a6..3fb615ca1 100644 --- a/src/net/sourceforge/plantuml/bpm/ConnectorPuzzleEmpty.java +++ b/src/net/sourceforge/plantuml/bpm/ConnectorPuzzleEmpty.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.bpm; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Rectangle2D; import net.sourceforge.plantuml.Dimension2DDouble; diff --git a/src/net/sourceforge/plantuml/bpm/GridArray.java b/src/net/sourceforge/plantuml/bpm/GridArray.java index 192ec6ccb..75ec0cae6 100644 --- a/src/net/sourceforge/plantuml/bpm/GridArray.java +++ b/src/net/sourceforge/plantuml/bpm/GridArray.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.bpm; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Point2D; import net.sourceforge.plantuml.ISkinParam; diff --git a/src/net/sourceforge/plantuml/bpm/Placeable.java b/src/net/sourceforge/plantuml/bpm/Placeable.java index c8735e98c..a5e7280cf 100644 --- a/src/net/sourceforge/plantuml/bpm/Placeable.java +++ b/src/net/sourceforge/plantuml/bpm/Placeable.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.bpm; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.graphic.StringBounder; diff --git a/src/net/sourceforge/plantuml/classdiagram/command/CommandCreateElementFull2.java b/src/net/sourceforge/plantuml/classdiagram/command/CommandCreateElementFull2.java index ef2db56e7..66d7ea1d7 100644 --- a/src/net/sourceforge/plantuml/classdiagram/command/CommandCreateElementFull2.java +++ b/src/net/sourceforge/plantuml/classdiagram/command/CommandCreateElementFull2.java @@ -59,6 +59,7 @@ import net.sourceforge.plantuml.cucadiagram.Stereotag; import net.sourceforge.plantuml.cucadiagram.Stereotype; import net.sourceforge.plantuml.descdiagram.command.CommandCreateElementFull; import net.sourceforge.plantuml.graphic.USymbol; +import net.sourceforge.plantuml.graphic.USymbols; import net.sourceforge.plantuml.graphic.color.ColorParser; import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; @@ -192,7 +193,7 @@ public class CommandCreateElementFull2 extends SingleLineCommand2 usymbol = null; } else { type = LeafType.DESCRIPTION; - usymbol = USymbol.fromString(symbol, diagram.getSkinParam()); + usymbol = USymbols.fromString(symbol, diagram.getSkinParam()); if (usymbol == null) { throw new IllegalStateException(); } diff --git a/src/net/sourceforge/plantuml/command/CommandPackage.java b/src/net/sourceforge/plantuml/command/CommandPackage.java index e051d0d9d..f850b7456 100644 --- a/src/net/sourceforge/plantuml/command/CommandPackage.java +++ b/src/net/sourceforge/plantuml/command/CommandPackage.java @@ -57,6 +57,7 @@ import net.sourceforge.plantuml.cucadiagram.NamespaceStrategy; import net.sourceforge.plantuml.cucadiagram.Stereotag; import net.sourceforge.plantuml.cucadiagram.Stereotype; import net.sourceforge.plantuml.graphic.USymbol; +import net.sourceforge.plantuml.graphic.USymbols; import net.sourceforge.plantuml.graphic.color.ColorParser; import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.graphic.color.Colors; @@ -138,7 +139,7 @@ public class CommandPackage extends SingleLineCommand2 { // p.setThisIsTogether(); // } else if (stereotype != null) { - final USymbol usymbol = USymbol.fromString(stereotype, diagram.getSkinParam().actorStyle(), + final USymbol usymbol = USymbols.fromString(stereotype, diagram.getSkinParam().actorStyle(), diagram.getSkinParam().componentStyle(), diagram.getSkinParam().packageStyle()); if (usymbol == null) { p.setStereotype(Stereotype.build(stereotype)); diff --git a/src/net/sourceforge/plantuml/creole/CreoleHorizontalLine.java b/src/net/sourceforge/plantuml/creole/CreoleHorizontalLine.java index 8babf6326..2634b9262 100644 --- a/src/net/sourceforge/plantuml/creole/CreoleHorizontalLine.java +++ b/src/net/sourceforge/plantuml/creole/CreoleHorizontalLine.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.creole; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.Dimension2DDouble; import net.sourceforge.plantuml.ISkinSimple; diff --git a/src/net/sourceforge/plantuml/creole/Fission.java b/src/net/sourceforge/plantuml/creole/Fission.java index b81d45a10..b9ad5911b 100644 --- a/src/net/sourceforge/plantuml/creole/Fission.java +++ b/src/net/sourceforge/plantuml/creole/Fission.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.creole; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; diff --git a/src/net/sourceforge/plantuml/creole/Position.java b/src/net/sourceforge/plantuml/creole/Position.java index c2c6e7b8c..9312fc1c2 100644 --- a/src/net/sourceforge/plantuml/creole/Position.java +++ b/src/net/sourceforge/plantuml/creole/Position.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.creole; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.ugraphic.MinMax; import net.sourceforge.plantuml.ugraphic.UGraphic; diff --git a/src/net/sourceforge/plantuml/creole/Sea.java b/src/net/sourceforge/plantuml/creole/Sea.java index 5577dde07..e32849369 100644 --- a/src/net/sourceforge/plantuml/creole/Sea.java +++ b/src/net/sourceforge/plantuml/creole/Sea.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.creole; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.HashMap; import java.util.Map; import java.util.Objects; diff --git a/src/net/sourceforge/plantuml/creole/SheetBlock1.java b/src/net/sourceforge/plantuml/creole/SheetBlock1.java index 1195cf6ba..eb53edb11 100644 --- a/src/net/sourceforge/plantuml/creole/SheetBlock1.java +++ b/src/net/sourceforge/plantuml/creole/SheetBlock1.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.creole; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Rectangle2D; import java.util.ArrayList; import java.util.LinkedHashMap; diff --git a/src/net/sourceforge/plantuml/creole/SheetBlock2.java b/src/net/sourceforge/plantuml/creole/SheetBlock2.java index 830ac22bf..bdaa7a476 100644 --- a/src/net/sourceforge/plantuml/creole/SheetBlock2.java +++ b/src/net/sourceforge/plantuml/creole/SheetBlock2.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.creole; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Rectangle2D; import java.util.List; import java.util.Objects; diff --git a/src/net/sourceforge/plantuml/creole/atom/Atom.java b/src/net/sourceforge/plantuml/creole/atom/Atom.java index 39457944d..6f9a1e556 100644 --- a/src/net/sourceforge/plantuml/creole/atom/Atom.java +++ b/src/net/sourceforge/plantuml/creole/atom/Atom.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.creole.atom; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.List; import net.sourceforge.plantuml.graphic.StringBounder; diff --git a/src/net/sourceforge/plantuml/creole/atom/AtomEmoji.java b/src/net/sourceforge/plantuml/creole/atom/AtomEmoji.java index 5748b042d..062d7cd39 100644 --- a/src/net/sourceforge/plantuml/creole/atom/AtomEmoji.java +++ b/src/net/sourceforge/plantuml/creole/atom/AtomEmoji.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.creole.atom; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.Dimension2DDouble; import net.sourceforge.plantuml.emoji.Emoji; diff --git a/src/net/sourceforge/plantuml/creole/atom/AtomHorizontalTexts.java b/src/net/sourceforge/plantuml/creole/atom/AtomHorizontalTexts.java index 3e80d5a3f..59377fd45 100644 --- a/src/net/sourceforge/plantuml/creole/atom/AtomHorizontalTexts.java +++ b/src/net/sourceforge/plantuml/creole/atom/AtomHorizontalTexts.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.creole.atom; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.List; import net.sourceforge.plantuml.Dimension2DDouble; diff --git a/src/net/sourceforge/plantuml/creole/atom/AtomImg.java b/src/net/sourceforge/plantuml/creole/atom/AtomImg.java index 7aacb664d..65e4aa1ff 100644 --- a/src/net/sourceforge/plantuml/creole/atom/AtomImg.java +++ b/src/net/sourceforge/plantuml/creole/atom/AtomImg.java @@ -38,7 +38,7 @@ package net.sourceforge.plantuml.creole.atom; import static java.nio.charset.StandardCharsets.UTF_8; import java.awt.Color; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.image.BufferedImage; import java.io.IOException; diff --git a/src/net/sourceforge/plantuml/creole/atom/AtomImgSvg.java b/src/net/sourceforge/plantuml/creole/atom/AtomImgSvg.java index 31650f466..a8258cfd6 100644 --- a/src/net/sourceforge/plantuml/creole/atom/AtomImgSvg.java +++ b/src/net/sourceforge/plantuml/creole/atom/AtomImgSvg.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.creole.atom; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TileImageSvg; diff --git a/src/net/sourceforge/plantuml/creole/atom/AtomMath.java b/src/net/sourceforge/plantuml/creole/atom/AtomMath.java index 0a6433c2f..3b1585853 100644 --- a/src/net/sourceforge/plantuml/creole/atom/AtomMath.java +++ b/src/net/sourceforge/plantuml/creole/atom/AtomMath.java @@ -36,7 +36,7 @@ package net.sourceforge.plantuml.creole.atom; import java.awt.Color; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.image.BufferedImage; import net.sourceforge.plantuml.Dimension2DDouble; diff --git a/src/net/sourceforge/plantuml/creole/atom/AtomOpenIcon.java b/src/net/sourceforge/plantuml/creole/atom/AtomOpenIcon.java index 0d3e3f5fc..798788c64 100644 --- a/src/net/sourceforge/plantuml/creole/atom/AtomOpenIcon.java +++ b/src/net/sourceforge/plantuml/creole/atom/AtomOpenIcon.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.creole.atom; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.graphic.FontConfiguration; diff --git a/src/net/sourceforge/plantuml/creole/atom/AtomSpace.java b/src/net/sourceforge/plantuml/creole/atom/AtomSpace.java index 83378de3b..e45245273 100644 --- a/src/net/sourceforge/plantuml/creole/atom/AtomSpace.java +++ b/src/net/sourceforge/plantuml/creole/atom/AtomSpace.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.creole.atom; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.Dimension2DDouble; import net.sourceforge.plantuml.graphic.StringBounder; diff --git a/src/net/sourceforge/plantuml/creole/atom/AtomSprite.java b/src/net/sourceforge/plantuml/creole/atom/AtomSprite.java index 9b79a78c4..259df10c9 100644 --- a/src/net/sourceforge/plantuml/creole/atom/AtomSprite.java +++ b/src/net/sourceforge/plantuml/creole/atom/AtomSprite.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.creole.atom; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.graphic.FontConfiguration; diff --git a/src/net/sourceforge/plantuml/creole/atom/AtomTable.java b/src/net/sourceforge/plantuml/creole/atom/AtomTable.java index 5be0a9895..5cb3d8c7b 100644 --- a/src/net/sourceforge/plantuml/creole/atom/AtomTable.java +++ b/src/net/sourceforge/plantuml/creole/atom/AtomTable.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.creole.atom; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.ArrayList; import java.util.HashMap; import java.util.List; diff --git a/src/net/sourceforge/plantuml/creole/atom/AtomTree.java b/src/net/sourceforge/plantuml/creole/atom/AtomTree.java index ffa59c787..239455607 100644 --- a/src/net/sourceforge/plantuml/creole/atom/AtomTree.java +++ b/src/net/sourceforge/plantuml/creole/atom/AtomTree.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.creole.atom; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.ArrayList; import java.util.HashMap; import java.util.List; diff --git a/src/net/sourceforge/plantuml/creole/atom/AtomVerticalTexts.java b/src/net/sourceforge/plantuml/creole/atom/AtomVerticalTexts.java index ddc6942d3..d40fd8ae4 100644 --- a/src/net/sourceforge/plantuml/creole/atom/AtomVerticalTexts.java +++ b/src/net/sourceforge/plantuml/creole/atom/AtomVerticalTexts.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.creole.atom; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.List; import net.sourceforge.plantuml.Dimension2DDouble; diff --git a/src/net/sourceforge/plantuml/creole/atom/AtomWithMargin.java b/src/net/sourceforge/plantuml/creole/atom/AtomWithMargin.java index 7480816d7..815b21824 100644 --- a/src/net/sourceforge/plantuml/creole/atom/AtomWithMargin.java +++ b/src/net/sourceforge/plantuml/creole/atom/AtomWithMargin.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.creole.atom; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/src/net/sourceforge/plantuml/creole/atom/Bullet.java b/src/net/sourceforge/plantuml/creole/atom/Bullet.java index e8ac49e34..b6ad8d172 100644 --- a/src/net/sourceforge/plantuml/creole/atom/Bullet.java +++ b/src/net/sourceforge/plantuml/creole/atom/Bullet.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.creole.atom; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.Dimension2DDouble; import net.sourceforge.plantuml.graphic.FontConfiguration; diff --git a/src/net/sourceforge/plantuml/creole/legacy/AtomText.java b/src/net/sourceforge/plantuml/creole/legacy/AtomText.java index 45839b682..da4023e9b 100644 --- a/src/net/sourceforge/plantuml/creole/legacy/AtomText.java +++ b/src/net/sourceforge/plantuml/creole/legacy/AtomText.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.creole.legacy; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; diff --git a/src/net/sourceforge/plantuml/creole/legacy/AtomTextUtils.java b/src/net/sourceforge/plantuml/creole/legacy/AtomTextUtils.java index b7ef85be2..cf2ac0892 100644 --- a/src/net/sourceforge/plantuml/creole/legacy/AtomTextUtils.java +++ b/src/net/sourceforge/plantuml/creole/legacy/AtomTextUtils.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.creole.legacy; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.ArrayList; import java.util.List; import java.util.regex.Matcher; diff --git a/src/net/sourceforge/plantuml/creole/legacy/StripeCode.java b/src/net/sourceforge/plantuml/creole/legacy/StripeCode.java index fe26c3039..62bfd7d75 100644 --- a/src/net/sourceforge/plantuml/creole/legacy/StripeCode.java +++ b/src/net/sourceforge/plantuml/creole/legacy/StripeCode.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.creole.legacy; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; diff --git a/src/net/sourceforge/plantuml/cucadiagram/Body3.java b/src/net/sourceforge/plantuml/cucadiagram/Body3.java index ecab0505f..80c647a0e 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/Body3.java +++ b/src/net/sourceforge/plantuml/cucadiagram/Body3.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.cucadiagram; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.ArrayList; import java.util.List; diff --git a/src/net/sourceforge/plantuml/cucadiagram/BodyEnhancedAbstract.java b/src/net/sourceforge/plantuml/cucadiagram/BodyEnhancedAbstract.java index 4a36925ca..77cd98503 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/BodyEnhancedAbstract.java +++ b/src/net/sourceforge/plantuml/cucadiagram/BodyEnhancedAbstract.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.cucadiagram; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.ISkinSimple; import net.sourceforge.plantuml.StringUtils; diff --git a/src/net/sourceforge/plantuml/cucadiagram/Display.java b/src/net/sourceforge/plantuml/cucadiagram/Display.java index a433e2754..ea16f4f61 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/Display.java +++ b/src/net/sourceforge/plantuml/cucadiagram/Display.java @@ -65,7 +65,6 @@ import net.sourceforge.plantuml.creole.Parser; import net.sourceforge.plantuml.creole.Sheet; import net.sourceforge.plantuml.creole.SheetBlock1; import net.sourceforge.plantuml.creole.SheetBlock2; -import net.sourceforge.plantuml.creole.atom.AtomWithMargin; import net.sourceforge.plantuml.creole.legacy.CreoleParser; import net.sourceforge.plantuml.graphic.CircledCharacter; import net.sourceforge.plantuml.graphic.FontConfiguration; diff --git a/src/net/sourceforge/plantuml/cucadiagram/EntityPosition.java b/src/net/sourceforge/plantuml/cucadiagram/EntityPosition.java index e2efb8665..016775656 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/EntityPosition.java +++ b/src/net/sourceforge/plantuml/cucadiagram/EntityPosition.java @@ -36,7 +36,7 @@ */ package net.sourceforge.plantuml.cucadiagram; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Point2D; import java.util.EnumSet; diff --git a/src/net/sourceforge/plantuml/cucadiagram/Link.java b/src/net/sourceforge/plantuml/cucadiagram/Link.java index 83904afda..c9ae59a9f 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/Link.java +++ b/src/net/sourceforge/plantuml/cucadiagram/Link.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.cucadiagram; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.Objects; import net.sourceforge.plantuml.Hideable; diff --git a/src/net/sourceforge/plantuml/cucadiagram/LinkConstraint.java b/src/net/sourceforge/plantuml/cucadiagram/LinkConstraint.java index e79f85d8b..faecb67b8 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/LinkConstraint.java +++ b/src/net/sourceforge/plantuml/cucadiagram/LinkConstraint.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.cucadiagram; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Point2D; import net.sourceforge.plantuml.FontParam; diff --git a/src/net/sourceforge/plantuml/cucadiagram/MethodsOrFieldsArea.java b/src/net/sourceforge/plantuml/cucadiagram/MethodsOrFieldsArea.java index e8c94f441..b12193234 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/MethodsOrFieldsArea.java +++ b/src/net/sourceforge/plantuml/cucadiagram/MethodsOrFieldsArea.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.cucadiagram; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Rectangle2D; import java.util.Collection; import java.util.HashSet; diff --git a/src/net/sourceforge/plantuml/cucadiagram/NoteLinkStrategy.java b/src/net/sourceforge/plantuml/cucadiagram/NoteLinkStrategy.java index 6420312e5..00eb48822 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/NoteLinkStrategy.java +++ b/src/net/sourceforge/plantuml/cucadiagram/NoteLinkStrategy.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.cucadiagram; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.Dimension2DDouble; diff --git a/src/net/sourceforge/plantuml/cucadiagram/TextBlockMap.java b/src/net/sourceforge/plantuml/cucadiagram/TextBlockMap.java index 167c697ec..6a842ed85 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/TextBlockMap.java +++ b/src/net/sourceforge/plantuml/cucadiagram/TextBlockMap.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.cucadiagram; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.ArrayList; import java.util.Collection; import java.util.LinkedHashMap; diff --git a/src/net/sourceforge/plantuml/cucadiagram/dot/Neighborhood.java b/src/net/sourceforge/plantuml/cucadiagram/dot/Neighborhood.java index 8c3b2b506..6d45b2558 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/dot/Neighborhood.java +++ b/src/net/sourceforge/plantuml/cucadiagram/dot/Neighborhood.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.cucadiagram.dot; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Point2D; import java.awt.geom.Rectangle2D; import java.util.ArrayList; diff --git a/src/net/sourceforge/plantuml/cucadiagram/entity/EntityImpl.java b/src/net/sourceforge/plantuml/cucadiagram/entity/EntityImpl.java index 1c96aaca9..2b08f9227 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/entity/EntityImpl.java +++ b/src/net/sourceforge/plantuml/cucadiagram/entity/EntityImpl.java @@ -72,6 +72,7 @@ import net.sourceforge.plantuml.cucadiagram.Stereotype; import net.sourceforge.plantuml.cucadiagram.dot.Neighborhood; import net.sourceforge.plantuml.graphic.FontConfiguration; import net.sourceforge.plantuml.graphic.USymbol; +import net.sourceforge.plantuml.graphic.USymbols; import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.graphic.color.Colors; import net.sourceforge.plantuml.skin.VisibilityModifier; @@ -576,7 +577,7 @@ final public class EntityImpl implements ILeaf, IGroup { public USymbol getUSymbol() { if (getLeafType() == LeafType.CIRCLE) { - return USymbol.INTERFACE; + return USymbols.INTERFACE; } // if (symbol != null && stereotype != null && stereotype.getSprite() != null) { // return symbol.withStereoAlignment(HorizontalAlignment.RIGHT); diff --git a/src/net/sourceforge/plantuml/descdiagram/BoxedCharacter.java b/src/net/sourceforge/plantuml/descdiagram/BoxedCharacter.java index 6ea9a7448..eb960ac52 100644 --- a/src/net/sourceforge/plantuml/descdiagram/BoxedCharacter.java +++ b/src/net/sourceforge/plantuml/descdiagram/BoxedCharacter.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.descdiagram; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.Dimension2DDouble; import net.sourceforge.plantuml.graphic.AbstractTextBlock; diff --git a/src/net/sourceforge/plantuml/descdiagram/CommandCreateDomain.java b/src/net/sourceforge/plantuml/descdiagram/CommandCreateDomain.java index 83512749e..ad2371679 100644 --- a/src/net/sourceforge/plantuml/descdiagram/CommandCreateDomain.java +++ b/src/net/sourceforge/plantuml/descdiagram/CommandCreateDomain.java @@ -57,6 +57,7 @@ import net.sourceforge.plantuml.cucadiagram.LeafType; import net.sourceforge.plantuml.cucadiagram.NamespaceStrategy; import net.sourceforge.plantuml.cucadiagram.Stereotype; import net.sourceforge.plantuml.graphic.USymbol; +import net.sourceforge.plantuml.graphic.USymbols; import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException; @@ -150,7 +151,7 @@ public class CommandCreateDomain extends SingleLineCommand2 type = "biddable"; } } - USymbol usymbol = USymbol.fromString(type, diagram.getSkinParam()); + USymbol usymbol = USymbols.fromString(type, diagram.getSkinParam()); entity.setUSymbol(usymbol); return CommandExecutionResult.ok(); } diff --git a/src/net/sourceforge/plantuml/descdiagram/DescriptionDiagram.java b/src/net/sourceforge/plantuml/descdiagram/DescriptionDiagram.java index dc8cb294d..d7d17d622 100644 --- a/src/net/sourceforge/plantuml/descdiagram/DescriptionDiagram.java +++ b/src/net/sourceforge/plantuml/descdiagram/DescriptionDiagram.java @@ -48,6 +48,7 @@ import net.sourceforge.plantuml.cucadiagram.ILeaf; import net.sourceforge.plantuml.cucadiagram.Ident; import net.sourceforge.plantuml.cucadiagram.LeafType; import net.sourceforge.plantuml.graphic.USymbol; +import net.sourceforge.plantuml.graphic.USymbols; public class DescriptionDiagram extends AbstractEntityDiagram { @@ -92,7 +93,7 @@ public class DescriptionDiagram extends AbstractEntityDiagram { codeString = StringUtils.eventuallyRemoveStartingAndEndingDoubleQuote(codeString); final Ident idNewLong = buildLeafIdent(codeString); final Code code99 = this.V1972() ? idNewLong : buildCode(codeString); - return getOrCreateLeafDefault(idNewLong, code99, LeafType.DESCRIPTION, USymbol.INTERFACE); + return getOrCreateLeafDefault(idNewLong, code99, LeafType.DESCRIPTION, USymbols.INTERFACE); } final String tmp4 = StringUtils.eventuallyRemoveStartingAndEndingDoubleQuote(code.getName(), "\"([:"); final Ident idNewLong = ident.eventuallyRemoveStartingAndEndingDoubleQuote("\"([:"); @@ -117,7 +118,7 @@ public class DescriptionDiagram extends AbstractEntityDiagram { public void makeDiagramReady() { super.makeDiagramReady(); final LeafType defaultType = isUsecase() ? LeafType.DESCRIPTION : LeafType.DESCRIPTION; - final USymbol defaultSymbol = isUsecase() ? getSkinParam().actorStyle().toUSymbol() : USymbol.INTERFACE; + final USymbol defaultSymbol = isUsecase() ? getSkinParam().actorStyle().toUSymbol() : USymbols.INTERFACE; for (ILeaf leaf : getLeafsvalues()) { if (leaf.getLeafType() == LeafType.STILL_UNKNOWN) { leaf.muteToType(defaultType, defaultSymbol); diff --git a/src/net/sourceforge/plantuml/descdiagram/EntityImageDesignedDomain.java b/src/net/sourceforge/plantuml/descdiagram/EntityImageDesignedDomain.java index 7a55b9bd8..73f4c8ffc 100644 --- a/src/net/sourceforge/plantuml/descdiagram/EntityImageDesignedDomain.java +++ b/src/net/sourceforge/plantuml/descdiagram/EntityImageDesignedDomain.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.descdiagram; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.ColorParam; import net.sourceforge.plantuml.Dimension2DDouble; diff --git a/src/net/sourceforge/plantuml/descdiagram/EntityImageDomain.java b/src/net/sourceforge/plantuml/descdiagram/EntityImageDomain.java index acf2a97e2..95b6cf12e 100644 --- a/src/net/sourceforge/plantuml/descdiagram/EntityImageDomain.java +++ b/src/net/sourceforge/plantuml/descdiagram/EntityImageDomain.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.descdiagram; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.ColorParam; import net.sourceforge.plantuml.Dimension2DDouble; diff --git a/src/net/sourceforge/plantuml/descdiagram/EntityImageMachine.java b/src/net/sourceforge/plantuml/descdiagram/EntityImageMachine.java index ea838d63b..82ee285db 100644 --- a/src/net/sourceforge/plantuml/descdiagram/EntityImageMachine.java +++ b/src/net/sourceforge/plantuml/descdiagram/EntityImageMachine.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.descdiagram; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.ColorParam; import net.sourceforge.plantuml.Dimension2DDouble; diff --git a/src/net/sourceforge/plantuml/descdiagram/EntityImageRequirement.java b/src/net/sourceforge/plantuml/descdiagram/EntityImageRequirement.java index 0763332dd..cfd4a7c4b 100644 --- a/src/net/sourceforge/plantuml/descdiagram/EntityImageRequirement.java +++ b/src/net/sourceforge/plantuml/descdiagram/EntityImageRequirement.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.descdiagram; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.ColorParam; import net.sourceforge.plantuml.FontParam; diff --git a/src/net/sourceforge/plantuml/descdiagram/command/CommandArchimate.java b/src/net/sourceforge/plantuml/descdiagram/command/CommandArchimate.java index 63bab9f4c..fbc2d18ee 100644 --- a/src/net/sourceforge/plantuml/descdiagram/command/CommandArchimate.java +++ b/src/net/sourceforge/plantuml/descdiagram/command/CommandArchimate.java @@ -53,7 +53,7 @@ import net.sourceforge.plantuml.cucadiagram.Ident; import net.sourceforge.plantuml.cucadiagram.LeafType; import net.sourceforge.plantuml.cucadiagram.Stereotype; import net.sourceforge.plantuml.descdiagram.DescriptionDiagram; -import net.sourceforge.plantuml.graphic.USymbol; +import net.sourceforge.plantuml.graphic.USymbols; import net.sourceforge.plantuml.graphic.color.ColorParser; import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.graphic.color.Colors; @@ -129,7 +129,7 @@ public class CommandArchimate extends SingleLineCommand2 { final Code code = diagram.V1972() ? ident : diagram.buildCode(idShort); final String icon = arg.getLazzy("STEREOTYPE", 0); - final IEntity entity = diagram.getOrCreateLeaf(ident, code, LeafType.DESCRIPTION, USymbol.ARCHIMATE); + final IEntity entity = diagram.getOrCreateLeaf(ident, code, LeafType.DESCRIPTION, USymbols.ARCHIMATE); final String displayRaw = arg.getLazzy("DISPLAY", 0); @@ -140,7 +140,7 @@ public class CommandArchimate extends SingleLineCommand2 { display = StringUtils.eventuallyRemoveStartingAndEndingDoubleQuote(display); entity.setDisplay(Display.getWithNewlines(display)); - entity.setUSymbol(USymbol.ARCHIMATE); + entity.setUSymbol(USymbols.ARCHIMATE); if (icon != null) { entity.setStereotype( Stereotype.build("<<$archimate/" + icon + ">>", diagram.getSkinParam().getCircledCharacterRadius(), diff --git a/src/net/sourceforge/plantuml/descdiagram/command/CommandArchimateMultilines.java b/src/net/sourceforge/plantuml/descdiagram/command/CommandArchimateMultilines.java index db10d657f..795dbfded 100644 --- a/src/net/sourceforge/plantuml/descdiagram/command/CommandArchimateMultilines.java +++ b/src/net/sourceforge/plantuml/descdiagram/command/CommandArchimateMultilines.java @@ -54,7 +54,7 @@ import net.sourceforge.plantuml.cucadiagram.IEntity; import net.sourceforge.plantuml.cucadiagram.Ident; import net.sourceforge.plantuml.cucadiagram.LeafType; import net.sourceforge.plantuml.cucadiagram.Stereotype; -import net.sourceforge.plantuml.graphic.USymbol; +import net.sourceforge.plantuml.graphic.USymbols; import net.sourceforge.plantuml.graphic.color.ColorParser; import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.graphic.color.Colors; @@ -110,13 +110,13 @@ public class CommandArchimateMultilines extends CommandMultilines2>", diagram.getSkinParam().getCircledCharacterRadius(), diff --git a/src/net/sourceforge/plantuml/descdiagram/command/CommandCreateElementFull.java b/src/net/sourceforge/plantuml/descdiagram/command/CommandCreateElementFull.java index 5ec8a754e..876ad334b 100644 --- a/src/net/sourceforge/plantuml/descdiagram/command/CommandCreateElementFull.java +++ b/src/net/sourceforge/plantuml/descdiagram/command/CommandCreateElementFull.java @@ -62,6 +62,7 @@ import net.sourceforge.plantuml.cucadiagram.Stereotag; import net.sourceforge.plantuml.cucadiagram.Stereotype; import net.sourceforge.plantuml.descdiagram.DescriptionDiagram; import net.sourceforge.plantuml.graphic.USymbol; +import net.sourceforge.plantuml.graphic.USymbols; import net.sourceforge.plantuml.graphic.color.ColorParser; import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.graphic.color.Colors; @@ -221,7 +222,7 @@ public class CommandCreateElementFull extends SingleLineCommand2 { final String codeString = code.getName(); if (ident.getLast().startsWith("()")) { ident = ident.removeStartingParenthesis(); - return getOrCreateLeaf1972(diagram, ident, ident.toCode(diagram), LeafType.DESCRIPTION, USymbol.INTERFACE, + return getOrCreateLeaf1972(diagram, ident, ident.toCode(diagram), LeafType.DESCRIPTION, USymbols.INTERFACE, pure); } final char codeChar = codeString.length() > 2 ? codeString.charAt(0) : 0; @@ -302,7 +303,7 @@ public class CommandLinkElement extends SingleLineCommand2 { final Ident ident3 = diagram.buildFullyQualified(tmp3); final Code code3 = diagram.V1972() ? ident3 : diagram.buildCode(tmp3); if (codeChar == '(') { - return getOrCreateLeaf1972(diagram, ident3, code3, LeafType.USECASE, USymbol.USECASE, pure); + return getOrCreateLeaf1972(diagram, ident3, code3, LeafType.USECASE, USymbols.USECASE, pure); } else if (codeChar == ':') { return getOrCreateLeaf1972(diagram, ident3, code3, LeafType.DESCRIPTION, diagram.getSkinParam().actorStyle().toUSymbol(), pure); diff --git a/src/net/sourceforge/plantuml/descdiagram/command/CommandPackageWithUSymbol.java b/src/net/sourceforge/plantuml/descdiagram/command/CommandPackageWithUSymbol.java index cfbb594f6..64cff0ff3 100644 --- a/src/net/sourceforge/plantuml/descdiagram/command/CommandPackageWithUSymbol.java +++ b/src/net/sourceforge/plantuml/descdiagram/command/CommandPackageWithUSymbol.java @@ -59,7 +59,7 @@ import net.sourceforge.plantuml.cucadiagram.Ident; import net.sourceforge.plantuml.cucadiagram.NamespaceStrategy; import net.sourceforge.plantuml.cucadiagram.Stereotag; import net.sourceforge.plantuml.cucadiagram.Stereotype; -import net.sourceforge.plantuml.graphic.USymbol; +import net.sourceforge.plantuml.graphic.USymbols; import net.sourceforge.plantuml.graphic.color.ColorParser; import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.graphic.color.Colors; @@ -162,7 +162,7 @@ public class CommandPackageWithUSymbol extends SingleLineCommand2 all = new HashMap(); - - public final static USymbol STORAGE = record("STORAGE", SkinParameter.STORAGE, new USymbolStorage()); - public final static USymbol DATABASE = record("DATABASE", SkinParameter.DATABASE, new USymbolDatabase()); - public final static USymbol CLOUD = record("CLOUD", SkinParameter.CLOUD, new USymbolCloud()); - public final static USymbol CARD = record("CARD", SkinParameter.CARD, new USymbolCard(SkinParameter.CARD)); - public final static USymbol FRAME = record("FRAME", SkinParameter.FRAME, new USymbolFrame()); - public final static USymbol NODE = record("NODE", SkinParameter.NODE, new USymbolNode()); - public final static USymbol ARTIFACT = record("ARTIFACT", SkinParameter.ARTIFACT, new USymbolArtifact()); - public final static USymbol PACKAGE = record("PACKAGE", SkinParameter.PACKAGE, - new USymbolFolder(SName.package_, SkinParameter.PACKAGE, true)); - public final static USymbol FOLDER = record("FOLDER", SkinParameter.FOLDER, - new USymbolFolder(SName.folder, SkinParameter.FOLDER, false)); - public final static USymbol FILE = record("FILE", SkinParameter.FILE, new USymbolFile()); - public final static USymbol RECTANGLE = record("RECTANGLE", SkinParameter.RECTANGLE, - new USymbolRectangle(SkinParameter.RECTANGLE)); - public final static USymbol HEXAGON = record("HEXAGON", SkinParameter.HEXAGON, new USymbolHexagon()); - public final static USymbol PERSON = record("PERSON", SkinParameter.PERSON, new USymbolPerson()); - public final static USymbol LABEL = record("LABEL", SkinParameter.LABEL, new USymbolLabel(SkinParameter.LABEL)); - public final static USymbol ARCHIMATE = record("ARCHIMATE", SkinParameter.ARCHIMATE, - new USymbolRectangle(SkinParameter.ARCHIMATE)); - public final static USymbol COLLECTIONS = record("COLLECTIONS", SkinParameter.COLLECTIONS, - new USymbolCollections(SkinParameter.COLLECTIONS)); - public final static USymbol AGENT = record("AGENT", SkinParameter.AGENT, new USymbolRectangle(SkinParameter.AGENT)); - public final static USymbol ACTOR_STICKMAN = record("ACTOR_STICKMAN", SkinParameter.ACTOR, - new USymbolActor(ActorStyle.STICKMAN)); - public final static USymbol ACTOR_STICKMAN_BUSINESS = record("ACTOR_STICKMAN_BUSINESS", SkinParameter.ACTOR, - new USymbolActor(ActorStyle.STICKMAN_BUSINESS)); - public final static USymbol ACTOR_AWESOME = record("ACTOR_AWESOME", SkinParameter.ACTOR, - new USymbolActor(ActorStyle.AWESOME)); - public final static USymbol ACTOR_HOLLOW = record("ACTOR_HOLLOW", SkinParameter.ACTOR, - new USymbolActor(ActorStyle.HOLLOW)); - public final static USymbol USECASE = null; - public final static USymbol COMPONENT1 = record("COMPONENT1", SkinParameter.COMPONENT1, new USymbolComponent1()); - public final static USymbol COMPONENT2 = record("COMPONENT2", SkinParameter.COMPONENT2, new USymbolComponent2()); - public final static USymbol BOUNDARY = record("BOUNDARY", SkinParameter.BOUNDARY, new USymbolBoundary()); - public final static USymbol ENTITY_DOMAIN = record("ENTITY_DOMAIN", SkinParameter.ENTITY, - new USymbolEntityDomain()); - public final static USymbol CONTROL = record("CONTROL", SkinParameter.CONTROL, new USymbolControl()); - public final static USymbol INTERFACE = record("INTERFACE", SkinParameter.INTERFACE, new USymbolInterface()); - public final static USymbol QUEUE = record("QUEUE", SkinParameter.QUEUE, new USymbolQueue()); - public final static USymbol STACK = record("STACK", SkinParameter.STACK, new USymbolStack()); - public final static USymbol TOGETHER = record("TOGETHER", SkinParameter.QUEUE, new USymbolTogether()); - abstract public SkinParameter getSkinParameter(); abstract public SName getSName(); - // public USymbol withStereoAlignment(HorizontalAlignment alignment) { - // return this; - // } - public FontParam getFontParam() { return getSkinParameter().getFontParam(); } @@ -120,11 +65,6 @@ public abstract class USymbol { return getSkinParameter().getColorParamBorder(); } - private static USymbol record(String code, SkinParameter skinParameter, USymbol symbol) { - all.put(StringUtils.goUpperCase(code), symbol); - return symbol; - } - public abstract TextBlock asSmall(TextBlock name, TextBlock label, TextBlock stereotype, SymbolContext symbolContext, HorizontalAlignment stereoAlignment); @@ -173,97 +113,4 @@ public abstract class USymbol { return 0; } -// final Stencil getRectangleStencil(final Dimension2D dim) { -// return new Stencil() { -// public double getStartingX(StringBounder stringBounder, double y) { -// return 0; -// } -// -// public double getEndingX(StringBounder stringBounder, double y) { -// return dim.getWidth(); -// } -// }; -// } - - public static USymbol fromString(String s, ActorStyle actorStyle, ComponentStyle componentStyle, - PackageStyle packageStyle) { - if (s == null) { - return null; - } - if (s.equalsIgnoreCase("package")) { - return packageStyle.toUSymbol(); - } - if (s.equalsIgnoreCase("actor")) { - return actorStyle.toUSymbol(); - } - if (s.equalsIgnoreCase("component")) { - return componentStyle.toUSymbol(); - } - if (s.equalsIgnoreCase("entity")) { - return ENTITY_DOMAIN; - } - if (s.equalsIgnoreCase("circle")) { - return INTERFACE; - } - final USymbol result = all.get(StringUtils.goUpperCase(s.replaceAll("\\W", ""))); - return result; - } - - public static USymbol fromString(String symbol, ISkinParam skinParam) { - USymbol usymbol = null; - if (symbol.equalsIgnoreCase("artifact")) { - usymbol = USymbol.ARTIFACT; - } else if (symbol.equalsIgnoreCase("folder")) { - usymbol = USymbol.FOLDER; - } else if (symbol.equalsIgnoreCase("file")) { - usymbol = USymbol.FILE; - } else if (symbol.equalsIgnoreCase("package")) { - usymbol = USymbol.PACKAGE; - } else if (symbol.equalsIgnoreCase("rectangle")) { - usymbol = USymbol.RECTANGLE; - } else if (symbol.equalsIgnoreCase("person")) { - usymbol = USymbol.PERSON; - } else if (symbol.equalsIgnoreCase("hexagon")) { - usymbol = USymbol.HEXAGON; - } else if (symbol.equalsIgnoreCase("label")) { - usymbol = USymbol.LABEL; - } else if (symbol.equalsIgnoreCase("collections")) { - usymbol = USymbol.COLLECTIONS; - } else if (symbol.equalsIgnoreCase("node")) { - usymbol = USymbol.NODE; - } else if (symbol.equalsIgnoreCase("frame")) { - usymbol = USymbol.FRAME; - } else if (symbol.equalsIgnoreCase("cloud")) { - usymbol = USymbol.CLOUD; - } else if (symbol.equalsIgnoreCase("database")) { - usymbol = USymbol.DATABASE; - } else if (symbol.equalsIgnoreCase("queue")) { - usymbol = USymbol.QUEUE; - } else if (symbol.equalsIgnoreCase("stack")) { - usymbol = USymbol.STACK; - } else if (symbol.equalsIgnoreCase("storage")) { - usymbol = USymbol.STORAGE; - } else if (symbol.equalsIgnoreCase("agent")) { - usymbol = USymbol.AGENT; - } else if (symbol.equalsIgnoreCase("actor/")) { - usymbol = USymbol.ACTOR_STICKMAN_BUSINESS; - } else if (symbol.equalsIgnoreCase("actor")) { - usymbol = skinParam.actorStyle().toUSymbol(); - } else if (symbol.equalsIgnoreCase("component")) { - usymbol = skinParam.componentStyle().toUSymbol(); - } else if (symbol.equalsIgnoreCase("boundary")) { - usymbol = USymbol.BOUNDARY; - } else if (symbol.equalsIgnoreCase("control")) { - usymbol = USymbol.CONTROL; - } else if (symbol.equalsIgnoreCase("entity")) { - usymbol = USymbol.ENTITY_DOMAIN; - } else if (symbol.equalsIgnoreCase("card")) { - usymbol = USymbol.CARD; - } else if (symbol.equalsIgnoreCase("interface")) { - usymbol = USymbol.INTERFACE; - } else if (symbol.equalsIgnoreCase("()")) { - usymbol = USymbol.INTERFACE; - } - return usymbol; - } } \ No newline at end of file diff --git a/src/net/sourceforge/plantuml/graphic/USymbolArtifact.java b/src/net/sourceforge/plantuml/graphic/USymbolArtifact.java index d5e3aabf0..d13b6798f 100644 --- a/src/net/sourceforge/plantuml/graphic/USymbolArtifact.java +++ b/src/net/sourceforge/plantuml/graphic/USymbolArtifact.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.graphic; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.Dimension2DDouble; import net.sourceforge.plantuml.style.SName; diff --git a/src/net/sourceforge/plantuml/graphic/USymbolCard.java b/src/net/sourceforge/plantuml/graphic/USymbolCard.java index 811154456..c653f4ac3 100644 --- a/src/net/sourceforge/plantuml/graphic/USymbolCard.java +++ b/src/net/sourceforge/plantuml/graphic/USymbolCard.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.graphic; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.Dimension2DDouble; import net.sourceforge.plantuml.style.SName; diff --git a/src/net/sourceforge/plantuml/graphic/USymbolCloud.java b/src/net/sourceforge/plantuml/graphic/USymbolCloud.java index 68bf90467..066830098 100644 --- a/src/net/sourceforge/plantuml/graphic/USymbolCloud.java +++ b/src/net/sourceforge/plantuml/graphic/USymbolCloud.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.graphic; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Point2D; import java.util.ArrayList; import java.util.List; diff --git a/src/net/sourceforge/plantuml/graphic/USymbolCollections.java b/src/net/sourceforge/plantuml/graphic/USymbolCollections.java index a038788c2..4ecbb73cf 100644 --- a/src/net/sourceforge/plantuml/graphic/USymbolCollections.java +++ b/src/net/sourceforge/plantuml/graphic/USymbolCollections.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.graphic; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.Dimension2DDouble; import net.sourceforge.plantuml.style.SName; diff --git a/src/net/sourceforge/plantuml/graphic/USymbolComponent1.java b/src/net/sourceforge/plantuml/graphic/USymbolComponent1.java index 3f020870a..32f81719a 100644 --- a/src/net/sourceforge/plantuml/graphic/USymbolComponent1.java +++ b/src/net/sourceforge/plantuml/graphic/USymbolComponent1.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.graphic; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.Dimension2DDouble; import net.sourceforge.plantuml.style.SName; @@ -104,7 +104,7 @@ class USymbolComponent1 extends USymbol { @Override public TextBlock asBig(TextBlock title, HorizontalAlignment labelAlignment, TextBlock stereotype, double width, double height, SymbolContext symbolContext, HorizontalAlignment stereoAlignment) { - return USymbol.COMPONENT2.asBig(title, labelAlignment, stereotype, width, height, symbolContext, + return USymbols.COMPONENT2.asBig(title, labelAlignment, stereotype, width, height, symbolContext, stereoAlignment); } diff --git a/src/net/sourceforge/plantuml/graphic/USymbolComponent2.java b/src/net/sourceforge/plantuml/graphic/USymbolComponent2.java index 83e7d9ca3..5dc44dde2 100644 --- a/src/net/sourceforge/plantuml/graphic/USymbolComponent2.java +++ b/src/net/sourceforge/plantuml/graphic/USymbolComponent2.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.graphic; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.Dimension2DDouble; import net.sourceforge.plantuml.style.SName; diff --git a/src/net/sourceforge/plantuml/graphic/USymbolDatabase.java b/src/net/sourceforge/plantuml/graphic/USymbolDatabase.java index 103016c11..812be213d 100644 --- a/src/net/sourceforge/plantuml/graphic/USymbolDatabase.java +++ b/src/net/sourceforge/plantuml/graphic/USymbolDatabase.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.graphic; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.Dimension2DDouble; import net.sourceforge.plantuml.UseStyle; diff --git a/src/net/sourceforge/plantuml/graphic/USymbolFile.java b/src/net/sourceforge/plantuml/graphic/USymbolFile.java index 29f19e964..7553c9421 100644 --- a/src/net/sourceforge/plantuml/graphic/USymbolFile.java +++ b/src/net/sourceforge/plantuml/graphic/USymbolFile.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.graphic; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Point2D; import net.sourceforge.plantuml.Dimension2DDouble; diff --git a/src/net/sourceforge/plantuml/graphic/USymbolFolder.java b/src/net/sourceforge/plantuml/graphic/USymbolFolder.java index 4f98f1723..deafc0b64 100644 --- a/src/net/sourceforge/plantuml/graphic/USymbolFolder.java +++ b/src/net/sourceforge/plantuml/graphic/USymbolFolder.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.graphic; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Point2D; import java.util.Objects; diff --git a/src/net/sourceforge/plantuml/graphic/USymbolFrame.java b/src/net/sourceforge/plantuml/graphic/USymbolFrame.java index dbee931c9..eead5b5c3 100644 --- a/src/net/sourceforge/plantuml/graphic/USymbolFrame.java +++ b/src/net/sourceforge/plantuml/graphic/USymbolFrame.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.graphic; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.Dimension2DDouble; import net.sourceforge.plantuml.style.SName; diff --git a/src/net/sourceforge/plantuml/graphic/USymbolHexagon.java b/src/net/sourceforge/plantuml/graphic/USymbolHexagon.java index 65e363f24..dcf825650 100644 --- a/src/net/sourceforge/plantuml/graphic/USymbolHexagon.java +++ b/src/net/sourceforge/plantuml/graphic/USymbolHexagon.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.graphic; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.Dimension2DDouble; import net.sourceforge.plantuml.style.SName; diff --git a/src/net/sourceforge/plantuml/graphic/USymbolLabel.java b/src/net/sourceforge/plantuml/graphic/USymbolLabel.java index f9c46d955..ff1c9c84d 100644 --- a/src/net/sourceforge/plantuml/graphic/USymbolLabel.java +++ b/src/net/sourceforge/plantuml/graphic/USymbolLabel.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.graphic; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.Dimension2DDouble; import net.sourceforge.plantuml.style.SName; diff --git a/src/net/sourceforge/plantuml/graphic/USymbolNode.java b/src/net/sourceforge/plantuml/graphic/USymbolNode.java index c7139947c..74a55b9f0 100644 --- a/src/net/sourceforge/plantuml/graphic/USymbolNode.java +++ b/src/net/sourceforge/plantuml/graphic/USymbolNode.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.graphic; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.Dimension2DDouble; import net.sourceforge.plantuml.UseStyle; diff --git a/src/net/sourceforge/plantuml/graphic/USymbolPerson.java b/src/net/sourceforge/plantuml/graphic/USymbolPerson.java index 649763a95..debb803bb 100644 --- a/src/net/sourceforge/plantuml/graphic/USymbolPerson.java +++ b/src/net/sourceforge/plantuml/graphic/USymbolPerson.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.graphic; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.Dimension2DDouble; import net.sourceforge.plantuml.style.SName; diff --git a/src/net/sourceforge/plantuml/graphic/USymbolQueue.java b/src/net/sourceforge/plantuml/graphic/USymbolQueue.java index b33178f41..78fbfa44a 100644 --- a/src/net/sourceforge/plantuml/graphic/USymbolQueue.java +++ b/src/net/sourceforge/plantuml/graphic/USymbolQueue.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.graphic; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.Dimension2DDouble; import net.sourceforge.plantuml.creole.Stencil; diff --git a/src/net/sourceforge/plantuml/graphic/USymbolRectangle.java b/src/net/sourceforge/plantuml/graphic/USymbolRectangle.java index 92f1146e3..3d322254d 100644 --- a/src/net/sourceforge/plantuml/graphic/USymbolRectangle.java +++ b/src/net/sourceforge/plantuml/graphic/USymbolRectangle.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.graphic; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.Dimension2DDouble; import net.sourceforge.plantuml.style.SName; diff --git a/src/net/sourceforge/plantuml/graphic/USymbolSimpleAbstract.java b/src/net/sourceforge/plantuml/graphic/USymbolSimpleAbstract.java index 46d4b2191..5faa6e2df 100644 --- a/src/net/sourceforge/plantuml/graphic/USymbolSimpleAbstract.java +++ b/src/net/sourceforge/plantuml/graphic/USymbolSimpleAbstract.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.graphic; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.Objects; import net.sourceforge.plantuml.Dimension2DDouble; diff --git a/src/net/sourceforge/plantuml/graphic/USymbolStack.java b/src/net/sourceforge/plantuml/graphic/USymbolStack.java index 9c65cb461..dc7d54616 100644 --- a/src/net/sourceforge/plantuml/graphic/USymbolStack.java +++ b/src/net/sourceforge/plantuml/graphic/USymbolStack.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.graphic; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Point2D; import net.sourceforge.plantuml.Dimension2DDouble; diff --git a/src/net/sourceforge/plantuml/graphic/USymbolStorage.java b/src/net/sourceforge/plantuml/graphic/USymbolStorage.java index a63f7eebd..714343a77 100644 --- a/src/net/sourceforge/plantuml/graphic/USymbolStorage.java +++ b/src/net/sourceforge/plantuml/graphic/USymbolStorage.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.graphic; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.Dimension2DDouble; import net.sourceforge.plantuml.style.SName; diff --git a/src/net/sourceforge/plantuml/graphic/USymbolTogether.java b/src/net/sourceforge/plantuml/graphic/USymbolTogether.java index c54df0756..f9a1b8ff1 100644 --- a/src/net/sourceforge/plantuml/graphic/USymbolTogether.java +++ b/src/net/sourceforge/plantuml/graphic/USymbolTogether.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.graphic; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.Dimension2DDouble; import net.sourceforge.plantuml.style.SName; diff --git a/src/net/sourceforge/plantuml/graphic/USymbols.java b/src/net/sourceforge/plantuml/graphic/USymbols.java new file mode 100644 index 000000000..be141d4e8 --- /dev/null +++ b/src/net/sourceforge/plantuml/graphic/USymbols.java @@ -0,0 +1,184 @@ +/* ======================================================================== + * PlantUML : a free UML diagram generator + * ======================================================================== + * + * (C) Copyright 2009-2020, Arnaud Roques + * + * Project Info: http://plantuml.com + * + * If you like this project or if you find it useful, you can support us at: + * + * http://plantuml.com/patreon (only 1$ per month!) + * http://plantuml.com/paypal + * + * This file is part of PlantUML. + * + * PlantUML is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * PlantUML distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public + * License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. + * + * + * Original Author: Arnaud Roques + * + * + */ +package net.sourceforge.plantuml.graphic; + +import java.util.HashMap; +import java.util.Map; + +import net.sourceforge.plantuml.ComponentStyle; +import net.sourceforge.plantuml.ISkinParam; +import net.sourceforge.plantuml.StringUtils; +import net.sourceforge.plantuml.skin.ActorStyle; +import net.sourceforge.plantuml.style.SName; +import net.sourceforge.plantuml.svek.PackageStyle; + +public abstract class USymbols { + + private USymbols() { + } + + private static final Map all = new HashMap(); + + private static USymbol record(String code, SkinParameter skinParameter, USymbol symbol) { + all.put(StringUtils.goUpperCase(code), symbol); + return symbol; + } + + public final static USymbol STORAGE = record("STORAGE", SkinParameter.STORAGE, new USymbolStorage()); + public final static USymbol DATABASE = record("DATABASE", SkinParameter.DATABASE, new USymbolDatabase()); + public final static USymbol CLOUD = record("CLOUD", SkinParameter.CLOUD, new USymbolCloud()); + public final static USymbol CARD = record("CARD", SkinParameter.CARD, new USymbolCard(SkinParameter.CARD)); + public final static USymbol FRAME = record("FRAME", SkinParameter.FRAME, new USymbolFrame()); + public final static USymbol NODE = record("NODE", SkinParameter.NODE, new USymbolNode()); + public final static USymbol ARTIFACT = record("ARTIFACT", SkinParameter.ARTIFACT, new USymbolArtifact()); + public final static USymbol PACKAGE = record("PACKAGE", SkinParameter.PACKAGE, + new USymbolFolder(SName.package_, SkinParameter.PACKAGE, true)); + public final static USymbol FOLDER = record("FOLDER", SkinParameter.FOLDER, + new USymbolFolder(SName.folder, SkinParameter.FOLDER, false)); + public final static USymbol FILE = record("FILE", SkinParameter.FILE, new USymbolFile()); + public final static USymbol RECTANGLE = record("RECTANGLE", SkinParameter.RECTANGLE, + new USymbolRectangle(SkinParameter.RECTANGLE)); + public final static USymbol HEXAGON = record("HEXAGON", SkinParameter.HEXAGON, new USymbolHexagon()); + public final static USymbol PERSON = record("PERSON", SkinParameter.PERSON, new USymbolPerson()); + public final static USymbol LABEL = record("LABEL", SkinParameter.LABEL, new USymbolLabel(SkinParameter.LABEL)); + public final static USymbol ARCHIMATE = record("ARCHIMATE", SkinParameter.ARCHIMATE, + new USymbolRectangle(SkinParameter.ARCHIMATE)); + public final static USymbol COLLECTIONS = record("COLLECTIONS", SkinParameter.COLLECTIONS, + new USymbolCollections(SkinParameter.COLLECTIONS)); + public final static USymbol AGENT = record("AGENT", SkinParameter.AGENT, new USymbolRectangle(SkinParameter.AGENT)); + public final static USymbol ACTOR_STICKMAN = record("ACTOR_STICKMAN", SkinParameter.ACTOR, + new USymbolActor(ActorStyle.STICKMAN)); + public final static USymbol ACTOR_STICKMAN_BUSINESS = record("ACTOR_STICKMAN_BUSINESS", SkinParameter.ACTOR, + new USymbolActor(ActorStyle.STICKMAN_BUSINESS)); + public final static USymbol ACTOR_AWESOME = record("ACTOR_AWESOME", SkinParameter.ACTOR, + new USymbolActor(ActorStyle.AWESOME)); + public final static USymbol ACTOR_HOLLOW = record("ACTOR_HOLLOW", SkinParameter.ACTOR, + new USymbolActor(ActorStyle.HOLLOW)); + public final static USymbol USECASE = null; + public final static USymbol COMPONENT1 = record("COMPONENT1", SkinParameter.COMPONENT1, new USymbolComponent1()); + public final static USymbol COMPONENT2 = record("COMPONENT2", SkinParameter.COMPONENT2, new USymbolComponent2()); + public final static USymbol BOUNDARY = record("BOUNDARY", SkinParameter.BOUNDARY, new USymbolBoundary()); + public final static USymbol ENTITY_DOMAIN = record("ENTITY_DOMAIN", SkinParameter.ENTITY, + new USymbolEntityDomain()); + public final static USymbol CONTROL = record("CONTROL", SkinParameter.CONTROL, new USymbolControl()); + public final static USymbol INTERFACE = record("INTERFACE", SkinParameter.INTERFACE, new USymbolInterface()); + public final static USymbol QUEUE = record("QUEUE", SkinParameter.QUEUE, new USymbolQueue()); + public final static USymbol STACK = record("STACK", SkinParameter.STACK, new USymbolStack()); + public final static USymbol TOGETHER = record("TOGETHER", SkinParameter.QUEUE, new USymbolTogether()); + + public static USymbol fromString(String s, ActorStyle actorStyle, ComponentStyle componentStyle, + PackageStyle packageStyle) { + if (s == null) + return null; + + if (s.equalsIgnoreCase("package")) + return packageStyle.toUSymbol(); + + if (s.equalsIgnoreCase("actor")) + return actorStyle.toUSymbol(); + + if (s.equalsIgnoreCase("component")) + return componentStyle.toUSymbol(); + + if (s.equalsIgnoreCase("entity")) + return ENTITY_DOMAIN; + + if (s.equalsIgnoreCase("circle")) + return INTERFACE; + + final USymbol result = all.get(StringUtils.goUpperCase(s.replaceAll("\\W", ""))); + return result; + } + + public static USymbol fromString(String symbol, ISkinParam skinParam) { + USymbol usymbol = null; + if (symbol.equalsIgnoreCase("artifact")) + usymbol = USymbols.ARTIFACT; + else if (symbol.equalsIgnoreCase("folder")) + usymbol = USymbols.FOLDER; + else if (symbol.equalsIgnoreCase("file")) + usymbol = USymbols.FILE; + else if (symbol.equalsIgnoreCase("package")) + usymbol = USymbols.PACKAGE; + else if (symbol.equalsIgnoreCase("rectangle")) + usymbol = USymbols.RECTANGLE; + else if (symbol.equalsIgnoreCase("person")) + usymbol = USymbols.PERSON; + else if (symbol.equalsIgnoreCase("hexagon")) + usymbol = USymbols.HEXAGON; + else if (symbol.equalsIgnoreCase("label")) + usymbol = USymbols.LABEL; + else if (symbol.equalsIgnoreCase("collections")) + usymbol = USymbols.COLLECTIONS; + else if (symbol.equalsIgnoreCase("node")) + usymbol = USymbols.NODE; + else if (symbol.equalsIgnoreCase("frame")) + usymbol = USymbols.FRAME; + else if (symbol.equalsIgnoreCase("cloud")) + usymbol = USymbols.CLOUD; + else if (symbol.equalsIgnoreCase("database")) + usymbol = USymbols.DATABASE; + else if (symbol.equalsIgnoreCase("queue")) + usymbol = USymbols.QUEUE; + else if (symbol.equalsIgnoreCase("stack")) + usymbol = USymbols.STACK; + else if (symbol.equalsIgnoreCase("storage")) + usymbol = USymbols.STORAGE; + else if (symbol.equalsIgnoreCase("agent")) + usymbol = USymbols.AGENT; + else if (symbol.equalsIgnoreCase("actor/")) + usymbol = USymbols.ACTOR_STICKMAN_BUSINESS; + else if (symbol.equalsIgnoreCase("actor")) + usymbol = skinParam.actorStyle().toUSymbol(); + else if (symbol.equalsIgnoreCase("component")) + usymbol = skinParam.componentStyle().toUSymbol(); + else if (symbol.equalsIgnoreCase("boundary")) + usymbol = USymbols.BOUNDARY; + else if (symbol.equalsIgnoreCase("control")) + usymbol = USymbols.CONTROL; + else if (symbol.equalsIgnoreCase("entity")) + usymbol = USymbols.ENTITY_DOMAIN; + else if (symbol.equalsIgnoreCase("card")) + usymbol = USymbols.CARD; + else if (symbol.equalsIgnoreCase("interface")) + usymbol = USymbols.INTERFACE; + else if (symbol.equalsIgnoreCase("()")) + usymbol = USymbols.INTERFACE; + + return usymbol; + } + +} \ No newline at end of file diff --git a/src/net/sourceforge/plantuml/jsondiagram/JsonDiagram.java b/src/net/sourceforge/plantuml/jsondiagram/JsonDiagram.java index a4d2c7225..c7baca2fc 100644 --- a/src/net/sourceforge/plantuml/jsondiagram/JsonDiagram.java +++ b/src/net/sourceforge/plantuml/jsondiagram/JsonDiagram.java @@ -34,7 +34,7 @@ */ package net.sourceforge.plantuml.jsondiagram; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Rectangle2D; import java.io.IOException; import java.io.OutputStream; diff --git a/src/net/sourceforge/plantuml/jsondiagram/SmetanaForJson.java b/src/net/sourceforge/plantuml/jsondiagram/SmetanaForJson.java index fd301637d..61ddde588 100644 --- a/src/net/sourceforge/plantuml/jsondiagram/SmetanaForJson.java +++ b/src/net/sourceforge/plantuml/jsondiagram/SmetanaForJson.java @@ -41,7 +41,7 @@ import static gen.lib.cgraph.node__c.agnode; import static gen.lib.gvc.gvc__c.gvContext; import static gen.lib.gvc.gvlayout__c.gvLayoutJobs; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/src/net/sourceforge/plantuml/jsondiagram/TextBlockJson.java b/src/net/sourceforge/plantuml/jsondiagram/TextBlockJson.java index e7107e261..8b5c02628 100644 --- a/src/net/sourceforge/plantuml/jsondiagram/TextBlockJson.java +++ b/src/net/sourceforge/plantuml/jsondiagram/TextBlockJson.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.jsondiagram; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/src/net/sourceforge/plantuml/logo/TurtleGraphicsPane.java b/src/net/sourceforge/plantuml/logo/TurtleGraphicsPane.java index 87d672514..cac1a0993 100644 --- a/src/net/sourceforge/plantuml/logo/TurtleGraphicsPane.java +++ b/src/net/sourceforge/plantuml/logo/TurtleGraphicsPane.java @@ -36,7 +36,7 @@ package net.sourceforge.plantuml.logo; import java.awt.Font; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Rectangle2D; import java.util.ArrayList; import java.util.List; diff --git a/src/net/sourceforge/plantuml/math/AsciiMath.java b/src/net/sourceforge/plantuml/math/AsciiMath.java index 1614ae21d..a307ef18c 100644 --- a/src/net/sourceforge/plantuml/math/AsciiMath.java +++ b/src/net/sourceforge/plantuml/math/AsciiMath.java @@ -36,7 +36,7 @@ package net.sourceforge.plantuml.math; import java.awt.Color; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.io.IOException; import java.lang.reflect.InvocationTargetException; diff --git a/src/net/sourceforge/plantuml/math/ConverterSvg.java b/src/net/sourceforge/plantuml/math/ConverterSvg.java index b6309d006..9ab2d2405 100644 --- a/src/net/sourceforge/plantuml/math/ConverterSvg.java +++ b/src/net/sourceforge/plantuml/math/ConverterSvg.java @@ -38,7 +38,7 @@ package net.sourceforge.plantuml.math; import java.awt.Color; import java.awt.Dimension; import java.awt.Graphics; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.io.CharArrayWriter; import java.io.IOException; import java.io.Writer; @@ -50,6 +50,8 @@ import javax.swing.Icon; import org.w3c.dom.DOMImplementation; import org.w3c.dom.Document; +import net.sourceforge.plantuml.Dimension2DDouble; + public class ConverterSvg { private final Icon icon; @@ -65,10 +67,10 @@ public class ConverterSvg { final Class clDefaultTeXFont = Class.forName("org.scilab.forge.jlatexmath.DefaultTeXFont"); final Class clAlphabetRegistration = Class.forName("org.scilab.forge.jlatexmath.AlphabetRegistration"); final Method registerAlphabet = clDefaultTeXFont.getMethod("registerAlphabet", clAlphabetRegistration); - registerAlphabet.invoke(null, Class.forName("org.scilab.forge.jlatexmath.cyrillic.CyrillicRegistration") - .newInstance()); - registerAlphabet.invoke(null, Class.forName("org.scilab.forge.jlatexmath.greek.GreekRegistration") - .newInstance()); + registerAlphabet.invoke(null, + Class.forName("org.scilab.forge.jlatexmath.cyrillic.CyrillicRegistration").newInstance()); + registerAlphabet.invoke(null, + Class.forName("org.scilab.forge.jlatexmath.greek.GreekRegistration").newInstance()); } catch (Exception e) { e.printStackTrace(); @@ -78,13 +80,13 @@ public class ConverterSvg { private Dimension dimension; - public String getSvg(double scale, boolean fontAsShapes, Color backgroundColor) throws ClassNotFoundException, - IllegalAccessException, IllegalArgumentException, InvocationTargetException, NoSuchMethodException, - SecurityException, InstantiationException, IOException { + public String getSvg(double scale, boolean fontAsShapes, Color backgroundColor) + throws ClassNotFoundException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, + NoSuchMethodException, SecurityException, InstantiationException, IOException { // DOMImplementation domImpl = GenericDOMImplementation.getDOMImplementation(); final Class clGenericDOMImplementation = Class.forName("org.apache.batik.dom.GenericDOMImplementation"); - final DOMImplementation domImpl = (DOMImplementation) clGenericDOMImplementation.getMethod( - "getDOMImplementation").invoke(null); + final DOMImplementation domImpl = (DOMImplementation) clGenericDOMImplementation + .getMethod("getDOMImplementation").invoke(null); final String svgNS = "http://www.w3.org/2000/svg"; final Document document = domImpl.createDocument(svgNS, "svg", null); @@ -120,7 +122,7 @@ public class ConverterSvg { } public Dimension2D getDimension() { - return dimension; + return Dimension2DDouble.fromDimension(dimension); } } diff --git a/src/net/sourceforge/plantuml/math/LatexBuilder.java b/src/net/sourceforge/plantuml/math/LatexBuilder.java index 935a0c00d..c6002fe79 100644 --- a/src/net/sourceforge/plantuml/math/LatexBuilder.java +++ b/src/net/sourceforge/plantuml/math/LatexBuilder.java @@ -37,7 +37,7 @@ package net.sourceforge.plantuml.math; import java.awt.Color; import java.awt.Graphics2D; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.image.BufferedImage; import java.io.IOException; import java.lang.reflect.InvocationTargetException; diff --git a/src/net/sourceforge/plantuml/math/ScientificEquation.java b/src/net/sourceforge/plantuml/math/ScientificEquation.java index b24928f79..dd98e4597 100644 --- a/src/net/sourceforge/plantuml/math/ScientificEquation.java +++ b/src/net/sourceforge/plantuml/math/ScientificEquation.java @@ -36,7 +36,7 @@ package net.sourceforge.plantuml.math; import java.awt.Color; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.io.IOException; import java.lang.reflect.InvocationTargetException; diff --git a/src/net/sourceforge/plantuml/mindmap/FingerImpl.java b/src/net/sourceforge/plantuml/mindmap/FingerImpl.java index 0598efd54..272295760 100644 --- a/src/net/sourceforge/plantuml/mindmap/FingerImpl.java +++ b/src/net/sourceforge/plantuml/mindmap/FingerImpl.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.mindmap; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Point2D; import java.util.ArrayList; import java.util.List; diff --git a/src/net/sourceforge/plantuml/mindmap/MindMap.java b/src/net/sourceforge/plantuml/mindmap/MindMap.java index bb80308b8..a15302ad5 100644 --- a/src/net/sourceforge/plantuml/mindmap/MindMap.java +++ b/src/net/sourceforge/plantuml/mindmap/MindMap.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.mindmap; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.Dimension2DDouble; import net.sourceforge.plantuml.Direction; diff --git a/src/net/sourceforge/plantuml/mindmap/MindMapDiagram.java b/src/net/sourceforge/plantuml/mindmap/MindMapDiagram.java index c5f439d87..ad117afb1 100644 --- a/src/net/sourceforge/plantuml/mindmap/MindMapDiagram.java +++ b/src/net/sourceforge/plantuml/mindmap/MindMapDiagram.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.mindmap; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Rectangle2D; import java.io.IOException; import java.io.OutputStream; diff --git a/src/net/sourceforge/plantuml/nwdiag/NwDiagram.java b/src/net/sourceforge/plantuml/nwdiag/NwDiagram.java index b51e15c7f..2c5fdf928 100644 --- a/src/net/sourceforge/plantuml/nwdiag/NwDiagram.java +++ b/src/net/sourceforge/plantuml/nwdiag/NwDiagram.java @@ -34,7 +34,7 @@ */ package net.sourceforge.plantuml.nwdiag; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Rectangle2D; import java.io.IOException; import java.io.OutputStream; diff --git a/src/net/sourceforge/plantuml/nwdiag/core/NServer.java b/src/net/sourceforge/plantuml/nwdiag/core/NServer.java index 800587efa..0e1e92ba9 100644 --- a/src/net/sourceforge/plantuml/nwdiag/core/NServer.java +++ b/src/net/sourceforge/plantuml/nwdiag/core/NServer.java @@ -48,6 +48,7 @@ import net.sourceforge.plantuml.graphic.SymbolContext; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.TextBlockUtils; import net.sourceforge.plantuml.graphic.USymbol; +import net.sourceforge.plantuml.graphic.USymbols; import net.sourceforge.plantuml.nwdiag.next.LinkedElement; import net.sourceforge.plantuml.nwdiag.next.NBar; import net.sourceforge.plantuml.skin.ActorStyle; @@ -61,7 +62,7 @@ public class NServer { private final Map connections = new LinkedHashMap(); - private USymbol shape = USymbol.RECTANGLE; + private USymbol shape = USymbols.RECTANGLE; private final String name; private String description; private final NBar bar; @@ -179,7 +180,7 @@ public class NServer { } public final void setShape(String shapeName) { - final USymbol shapeFromString = USymbol.fromString(shapeName, ActorStyle.STICKMAN, ComponentStyle.RECTANGLE, + final USymbol shapeFromString = USymbols.fromString(shapeName, ActorStyle.STICKMAN, ComponentStyle.RECTANGLE, PackageStyle.RECTANGLE); if (shapeFromString != null) { this.shape = shapeFromString; diff --git a/src/net/sourceforge/plantuml/nwdiag/core/NwGroup.java b/src/net/sourceforge/plantuml/nwdiag/core/NwGroup.java index bd42d566e..8fb6c0fb3 100644 --- a/src/net/sourceforge/plantuml/nwdiag/core/NwGroup.java +++ b/src/net/sourceforge/plantuml/nwdiag/core/NwGroup.java @@ -34,7 +34,7 @@ */ package net.sourceforge.plantuml.nwdiag.core; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.Collections; import java.util.HashSet; import java.util.Map; diff --git a/src/net/sourceforge/plantuml/nwdiag/next/GridTextBlockSimple.java b/src/net/sourceforge/plantuml/nwdiag/next/GridTextBlockSimple.java index e4c70d4cd..5cf60eb12 100644 --- a/src/net/sourceforge/plantuml/nwdiag/next/GridTextBlockSimple.java +++ b/src/net/sourceforge/plantuml/nwdiag/next/GridTextBlockSimple.java @@ -34,7 +34,7 @@ */ package net.sourceforge.plantuml.nwdiag.next; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Rectangle2D; import net.sourceforge.plantuml.Dimension2DDouble; diff --git a/src/net/sourceforge/plantuml/nwdiag/next/LinkedElement.java b/src/net/sourceforge/plantuml/nwdiag/next/LinkedElement.java index a95b9c352..06f5e3fcf 100644 --- a/src/net/sourceforge/plantuml/nwdiag/next/LinkedElement.java +++ b/src/net/sourceforge/plantuml/nwdiag/next/LinkedElement.java @@ -34,7 +34,7 @@ */ package net.sourceforge.plantuml.nwdiag.next; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.Collections; import java.util.List; import java.util.Map; diff --git a/src/net/sourceforge/plantuml/openiconic/OpenIcon.java b/src/net/sourceforge/plantuml/openiconic/OpenIcon.java index 754d0dbcc..59795e787 100644 --- a/src/net/sourceforge/plantuml/openiconic/OpenIcon.java +++ b/src/net/sourceforge/plantuml/openiconic/OpenIcon.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.openiconic; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; diff --git a/src/net/sourceforge/plantuml/png/PngTitler.java b/src/net/sourceforge/plantuml/png/PngTitler.java index cdef5c348..b565907d3 100644 --- a/src/net/sourceforge/plantuml/png/PngTitler.java +++ b/src/net/sourceforge/plantuml/png/PngTitler.java @@ -36,7 +36,7 @@ package net.sourceforge.plantuml.png; import java.awt.Font; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.ISkinSimple; import net.sourceforge.plantuml.SpriteContainerEmpty; diff --git a/src/net/sourceforge/plantuml/posimo/AbstractEntityImage2.java b/src/net/sourceforge/plantuml/posimo/AbstractEntityImage2.java index ca4f4d860..74186989d 100644 --- a/src/net/sourceforge/plantuml/posimo/AbstractEntityImage2.java +++ b/src/net/sourceforge/plantuml/posimo/AbstractEntityImage2.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.posimo; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.Objects; import net.sourceforge.plantuml.ColorParam; diff --git a/src/net/sourceforge/plantuml/posimo/BezierUtils.java b/src/net/sourceforge/plantuml/posimo/BezierUtils.java index f8d8fe1ce..e9e91f3bf 100644 --- a/src/net/sourceforge/plantuml/posimo/BezierUtils.java +++ b/src/net/sourceforge/plantuml/posimo/BezierUtils.java @@ -37,7 +37,7 @@ package net.sourceforge.plantuml.posimo; import java.awt.Shape; import java.awt.geom.CubicCurve2D; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Line2D; import java.awt.geom.Point2D; import java.awt.geom.Rectangle2D; diff --git a/src/net/sourceforge/plantuml/posimo/Block.java b/src/net/sourceforge/plantuml/posimo/Block.java index b0d57850a..7fbfd975d 100644 --- a/src/net/sourceforge/plantuml/posimo/Block.java +++ b/src/net/sourceforge/plantuml/posimo/Block.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.posimo; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Point2D; import java.util.Locale; diff --git a/src/net/sourceforge/plantuml/posimo/Cluster.java b/src/net/sourceforge/plantuml/posimo/Cluster.java index 7d72d8b51..795e6fae2 100644 --- a/src/net/sourceforge/plantuml/posimo/Cluster.java +++ b/src/net/sourceforge/plantuml/posimo/Cluster.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.posimo; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Point2D; import java.util.ArrayList; import java.util.Collection; diff --git a/src/net/sourceforge/plantuml/posimo/DotxMaker.java b/src/net/sourceforge/plantuml/posimo/DotxMaker.java index bf9fe83d4..cc07e54ef 100644 --- a/src/net/sourceforge/plantuml/posimo/DotxMaker.java +++ b/src/net/sourceforge/plantuml/posimo/DotxMaker.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.posimo; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.Collection; import java.util.Objects; diff --git a/src/net/sourceforge/plantuml/posimo/EntityImageNote2.java b/src/net/sourceforge/plantuml/posimo/EntityImageNote2.java index ef06ece4d..2aa532c2c 100644 --- a/src/net/sourceforge/plantuml/posimo/EntityImageNote2.java +++ b/src/net/sourceforge/plantuml/posimo/EntityImageNote2.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.posimo; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.Collection; import net.sourceforge.plantuml.Dimension2DDouble; diff --git a/src/net/sourceforge/plantuml/posimo/Frame.java b/src/net/sourceforge/plantuml/posimo/Frame.java index 282a4a504..bc85155d7 100644 --- a/src/net/sourceforge/plantuml/posimo/Frame.java +++ b/src/net/sourceforge/plantuml/posimo/Frame.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.posimo; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.List; import net.sourceforge.plantuml.ColorParam; diff --git a/src/net/sourceforge/plantuml/posimo/GraphvizSolverB.java b/src/net/sourceforge/plantuml/posimo/GraphvizSolverB.java index f24ce5d76..0256cd364 100644 --- a/src/net/sourceforge/plantuml/posimo/GraphvizSolverB.java +++ b/src/net/sourceforge/plantuml/posimo/GraphvizSolverB.java @@ -37,7 +37,7 @@ package net.sourceforge.plantuml.posimo; import static java.nio.charset.StandardCharsets.UTF_8; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Point2D; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/src/net/sourceforge/plantuml/posimo/IEntityImageBlock.java b/src/net/sourceforge/plantuml/posimo/IEntityImageBlock.java index a98fa6d60..e1ee06c03 100644 --- a/src/net/sourceforge/plantuml/posimo/IEntityImageBlock.java +++ b/src/net/sourceforge/plantuml/posimo/IEntityImageBlock.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.posimo; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.ugraphic.UGraphic; diff --git a/src/net/sourceforge/plantuml/posimo/Label.java b/src/net/sourceforge/plantuml/posimo/Label.java index 0e64be01b..e196e7622 100644 --- a/src/net/sourceforge/plantuml/posimo/Label.java +++ b/src/net/sourceforge/plantuml/posimo/Label.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.posimo; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Point2D; import net.sourceforge.plantuml.Dimension2DDouble; diff --git a/src/net/sourceforge/plantuml/posimo/LabelImage.java b/src/net/sourceforge/plantuml/posimo/LabelImage.java index 9be0c3bd6..255b225d7 100644 --- a/src/net/sourceforge/plantuml/posimo/LabelImage.java +++ b/src/net/sourceforge/plantuml/posimo/LabelImage.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.posimo; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.Objects; import net.sourceforge.plantuml.ISkinParam; diff --git a/src/net/sourceforge/plantuml/posimo/MargedBlock.java b/src/net/sourceforge/plantuml/posimo/MargedBlock.java index d211655c6..a6380f3cb 100644 --- a/src/net/sourceforge/plantuml/posimo/MargedBlock.java +++ b/src/net/sourceforge/plantuml/posimo/MargedBlock.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.posimo; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Point2D; import net.sourceforge.plantuml.graphic.StringBounder; diff --git a/src/net/sourceforge/plantuml/posimo/Positionable.java b/src/net/sourceforge/plantuml/posimo/Positionable.java index cfd087c3d..e013837d8 100644 --- a/src/net/sourceforge/plantuml/posimo/Positionable.java +++ b/src/net/sourceforge/plantuml/posimo/Positionable.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.posimo; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Point2D; public interface Positionable extends Moveable { diff --git a/src/net/sourceforge/plantuml/posimo/PositionableImpl.java b/src/net/sourceforge/plantuml/posimo/PositionableImpl.java index 0fd00963e..afb99a28e 100644 --- a/src/net/sourceforge/plantuml/posimo/PositionableImpl.java +++ b/src/net/sourceforge/plantuml/posimo/PositionableImpl.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.posimo; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Point2D; public class PositionableImpl implements Positionable { diff --git a/src/net/sourceforge/plantuml/posimo/PositionableUtils.java b/src/net/sourceforge/plantuml/posimo/PositionableUtils.java index fef521dae..608ee30b8 100644 --- a/src/net/sourceforge/plantuml/posimo/PositionableUtils.java +++ b/src/net/sourceforge/plantuml/posimo/PositionableUtils.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.posimo; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Point2D; import java.awt.geom.Rectangle2D; diff --git a/src/net/sourceforge/plantuml/posimo/SimpleDrawer.java b/src/net/sourceforge/plantuml/posimo/SimpleDrawer.java index 98108f8d5..d02d2397d 100644 --- a/src/net/sourceforge/plantuml/posimo/SimpleDrawer.java +++ b/src/net/sourceforge/plantuml/posimo/SimpleDrawer.java @@ -37,7 +37,7 @@ package net.sourceforge.plantuml.posimo; import java.awt.Color; import java.awt.Graphics2D; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Point2D; import java.awt.geom.Rectangle2D; import java.util.ArrayList; diff --git a/src/net/sourceforge/plantuml/project/GanttDiagram.java b/src/net/sourceforge/plantuml/project/GanttDiagram.java index 826125a3d..4032953f1 100644 --- a/src/net/sourceforge/plantuml/project/GanttDiagram.java +++ b/src/net/sourceforge/plantuml/project/GanttDiagram.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.project; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Rectangle2D; import java.io.IOException; import java.io.OutputStream; diff --git a/src/net/sourceforge/plantuml/project/draw/TaskDrawDiamond.java b/src/net/sourceforge/plantuml/project/draw/TaskDrawDiamond.java index c83c64501..b8ec619e1 100644 --- a/src/net/sourceforge/plantuml/project/draw/TaskDrawDiamond.java +++ b/src/net/sourceforge/plantuml/project/draw/TaskDrawDiamond.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.project.draw; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.SpriteContainerEmpty; diff --git a/src/net/sourceforge/plantuml/project/draw/TaskDrawRegular.java b/src/net/sourceforge/plantuml/project/draw/TaskDrawRegular.java index cb7f6e19f..ba826ca5c 100644 --- a/src/net/sourceforge/plantuml/project/draw/TaskDrawRegular.java +++ b/src/net/sourceforge/plantuml/project/draw/TaskDrawRegular.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.project.draw; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.ArrayList; import java.util.Collection; import java.util.TreeSet; diff --git a/src/net/sourceforge/plantuml/salt/PSystemSalt.java b/src/net/sourceforge/plantuml/salt/PSystemSalt.java index 79dcdb4c1..927d96228 100644 --- a/src/net/sourceforge/plantuml/salt/PSystemSalt.java +++ b/src/net/sourceforge/plantuml/salt/PSystemSalt.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.salt; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Rectangle2D; import java.io.IOException; import java.io.OutputStream; diff --git a/src/net/sourceforge/plantuml/salt/element/AbstractElementText.java b/src/net/sourceforge/plantuml/salt/element/AbstractElementText.java index 192132403..67bbe9f47 100644 --- a/src/net/sourceforge/plantuml/salt/element/AbstractElementText.java +++ b/src/net/sourceforge/plantuml/salt/element/AbstractElementText.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.salt.element; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.Dimension2DDouble; import net.sourceforge.plantuml.ISkinSimple; diff --git a/src/net/sourceforge/plantuml/salt/element/Element.java b/src/net/sourceforge/plantuml/salt/element/Element.java index a38dce7ee..ab2f1a0dd 100644 --- a/src/net/sourceforge/plantuml/salt/element/Element.java +++ b/src/net/sourceforge/plantuml/salt/element/Element.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.salt.element; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.ugraphic.UGraphic; diff --git a/src/net/sourceforge/plantuml/salt/element/ElementBorder.java b/src/net/sourceforge/plantuml/salt/element/ElementBorder.java index ac63e278e..baa03e1f5 100644 --- a/src/net/sourceforge/plantuml/salt/element/ElementBorder.java +++ b/src/net/sourceforge/plantuml/salt/element/ElementBorder.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.salt.element; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Point2D; import net.sourceforge.plantuml.Dimension2DDouble; diff --git a/src/net/sourceforge/plantuml/salt/element/ElementButton.java b/src/net/sourceforge/plantuml/salt/element/ElementButton.java index 11b4003a0..a0e5ad350 100644 --- a/src/net/sourceforge/plantuml/salt/element/ElementButton.java +++ b/src/net/sourceforge/plantuml/salt/element/ElementButton.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.salt.element; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.Dimension2DDouble; import net.sourceforge.plantuml.ISkinSimple; diff --git a/src/net/sourceforge/plantuml/salt/element/ElementDroplist.java b/src/net/sourceforge/plantuml/salt/element/ElementDroplist.java index 7254f4c61..443479bf5 100644 --- a/src/net/sourceforge/plantuml/salt/element/ElementDroplist.java +++ b/src/net/sourceforge/plantuml/salt/element/ElementDroplist.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.salt.element; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.ArrayList; import java.util.List; import java.util.StringTokenizer; diff --git a/src/net/sourceforge/plantuml/salt/element/ElementEmpty.java b/src/net/sourceforge/plantuml/salt/element/ElementEmpty.java index 5708ca911..1ed04df04 100644 --- a/src/net/sourceforge/plantuml/salt/element/ElementEmpty.java +++ b/src/net/sourceforge/plantuml/salt/element/ElementEmpty.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.salt.element; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.Dimension2DDouble; import net.sourceforge.plantuml.graphic.StringBounder; diff --git a/src/net/sourceforge/plantuml/salt/element/ElementImage.java b/src/net/sourceforge/plantuml/salt/element/ElementImage.java index 07496dbbf..0ef75c7de 100644 --- a/src/net/sourceforge/plantuml/salt/element/ElementImage.java +++ b/src/net/sourceforge/plantuml/salt/element/ElementImage.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.salt.element; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.List; import net.sourceforge.plantuml.Dimension2DDouble; diff --git a/src/net/sourceforge/plantuml/salt/element/ElementLine.java b/src/net/sourceforge/plantuml/salt/element/ElementLine.java index 8b027b4d6..1163e301c 100644 --- a/src/net/sourceforge/plantuml/salt/element/ElementLine.java +++ b/src/net/sourceforge/plantuml/salt/element/ElementLine.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.salt.element; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.Dimension2DDouble; import net.sourceforge.plantuml.graphic.StringBounder; diff --git a/src/net/sourceforge/plantuml/salt/element/ElementMenuBar.java b/src/net/sourceforge/plantuml/salt/element/ElementMenuBar.java index 41d1172d3..d08bdbcfe 100644 --- a/src/net/sourceforge/plantuml/salt/element/ElementMenuBar.java +++ b/src/net/sourceforge/plantuml/salt/element/ElementMenuBar.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.salt.element; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; diff --git a/src/net/sourceforge/plantuml/salt/element/ElementMenuEntry.java b/src/net/sourceforge/plantuml/salt/element/ElementMenuEntry.java index df983f087..3f2a9c800 100644 --- a/src/net/sourceforge/plantuml/salt/element/ElementMenuEntry.java +++ b/src/net/sourceforge/plantuml/salt/element/ElementMenuEntry.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.salt.element; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.Dimension2DDouble; import net.sourceforge.plantuml.ISkinSimple; diff --git a/src/net/sourceforge/plantuml/salt/element/ElementMenuPopup.java b/src/net/sourceforge/plantuml/salt/element/ElementMenuPopup.java index f720cb994..18a260a03 100644 --- a/src/net/sourceforge/plantuml/salt/element/ElementMenuPopup.java +++ b/src/net/sourceforge/plantuml/salt/element/ElementMenuPopup.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.salt.element; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.ArrayList; import java.util.Collection; diff --git a/src/net/sourceforge/plantuml/salt/element/ElementPyramid.java b/src/net/sourceforge/plantuml/salt/element/ElementPyramid.java index c42faea17..15515b9d3 100644 --- a/src/net/sourceforge/plantuml/salt/element/ElementPyramid.java +++ b/src/net/sourceforge/plantuml/salt/element/ElementPyramid.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.salt.element; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; diff --git a/src/net/sourceforge/plantuml/salt/element/ElementPyramidScrolled.java b/src/net/sourceforge/plantuml/salt/element/ElementPyramidScrolled.java index 2bb747035..a47685bb6 100644 --- a/src/net/sourceforge/plantuml/salt/element/ElementPyramidScrolled.java +++ b/src/net/sourceforge/plantuml/salt/element/ElementPyramidScrolled.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.salt.element; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.Dimension2DDouble; import net.sourceforge.plantuml.ISkinSimple; diff --git a/src/net/sourceforge/plantuml/salt/element/ElementRadioCheckbox.java b/src/net/sourceforge/plantuml/salt/element/ElementRadioCheckbox.java index 53718b8f9..9fad65869 100644 --- a/src/net/sourceforge/plantuml/salt/element/ElementRadioCheckbox.java +++ b/src/net/sourceforge/plantuml/salt/element/ElementRadioCheckbox.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.salt.element; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.List; import net.sourceforge.plantuml.Dimension2DDouble; diff --git a/src/net/sourceforge/plantuml/salt/element/ElementTabBar.java b/src/net/sourceforge/plantuml/salt/element/ElementTabBar.java index 7c6f0e927..3c1ddee43 100644 --- a/src/net/sourceforge/plantuml/salt/element/ElementTabBar.java +++ b/src/net/sourceforge/plantuml/salt/element/ElementTabBar.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.salt.element; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; diff --git a/src/net/sourceforge/plantuml/salt/element/ElementText.java b/src/net/sourceforge/plantuml/salt/element/ElementText.java index 6c9aa9e09..e4ce07a59 100644 --- a/src/net/sourceforge/plantuml/salt/element/ElementText.java +++ b/src/net/sourceforge/plantuml/salt/element/ElementText.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.salt.element; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.List; import net.sourceforge.plantuml.ISkinSimple; diff --git a/src/net/sourceforge/plantuml/salt/element/ElementTextField.java b/src/net/sourceforge/plantuml/salt/element/ElementTextField.java index f92481aeb..543ae3128 100644 --- a/src/net/sourceforge/plantuml/salt/element/ElementTextField.java +++ b/src/net/sourceforge/plantuml/salt/element/ElementTextField.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.salt.element; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.Dimension2DDouble; import net.sourceforge.plantuml.ISkinSimple; diff --git a/src/net/sourceforge/plantuml/salt/element/ElementTree.java b/src/net/sourceforge/plantuml/salt/element/ElementTree.java index 29207ece9..667eaa219 100644 --- a/src/net/sourceforge/plantuml/salt/element/ElementTree.java +++ b/src/net/sourceforge/plantuml/salt/element/ElementTree.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.salt.element; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.ArrayList; import java.util.Arrays; import java.util.Iterator; diff --git a/src/net/sourceforge/plantuml/salt/element/ElementTreeEntry.java b/src/net/sourceforge/plantuml/salt/element/ElementTreeEntry.java index 1e0ce8320..ef43be35e 100644 --- a/src/net/sourceforge/plantuml/salt/element/ElementTreeEntry.java +++ b/src/net/sourceforge/plantuml/salt/element/ElementTreeEntry.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.salt.element; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.ArrayList; import java.util.Iterator; import java.util.List; diff --git a/src/net/sourceforge/plantuml/salt/element/Grid.java b/src/net/sourceforge/plantuml/salt/element/Grid.java index bf3ba5d33..7b8421f7f 100644 --- a/src/net/sourceforge/plantuml/salt/element/Grid.java +++ b/src/net/sourceforge/plantuml/salt/element/Grid.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.salt.element; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.HashSet; import java.util.Set; diff --git a/src/net/sourceforge/plantuml/salt/element/WrappedElement.java b/src/net/sourceforge/plantuml/salt/element/WrappedElement.java index 684228eb3..df32cf49a 100644 --- a/src/net/sourceforge/plantuml/salt/element/WrappedElement.java +++ b/src/net/sourceforge/plantuml/salt/element/WrappedElement.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.salt.element; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.ugraphic.UGraphic; diff --git a/src/net/sourceforge/plantuml/sdot/CucaDiagramFileMakerSmetana.java b/src/net/sourceforge/plantuml/sdot/CucaDiagramFileMakerSmetana.java index b41515d9a..7ab1df8e4 100644 --- a/src/net/sourceforge/plantuml/sdot/CucaDiagramFileMakerSmetana.java +++ b/src/net/sourceforge/plantuml/sdot/CucaDiagramFileMakerSmetana.java @@ -43,7 +43,7 @@ import static gen.lib.cgraph.subg__c.agsubg; import static gen.lib.gvc.gvc__c.gvContext; import static gen.lib.gvc.gvlayout__c.gvLayoutJobs; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Point2D; import java.io.IOException; import java.io.OutputStream; diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandDeactivateShort.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandDeactivateShort.java index 057544117..d4f4a9039 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandDeactivateShort.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandDeactivateShort.java @@ -42,8 +42,8 @@ import net.sourceforge.plantuml.command.regex.IRegex; import net.sourceforge.plantuml.command.regex.RegexConcat; import net.sourceforge.plantuml.command.regex.RegexLeaf; import net.sourceforge.plantuml.command.regex.RegexResult; +import net.sourceforge.plantuml.sequencediagram.AbstractMessage; import net.sourceforge.plantuml.sequencediagram.LifeEventType; -import net.sourceforge.plantuml.sequencediagram.Message; import net.sourceforge.plantuml.sequencediagram.SequenceDiagram; public class CommandDeactivateShort extends SingleLineCommand2 { @@ -60,15 +60,16 @@ public class CommandDeactivateShort extends SingleLineCommand2 } @Override - protected CommandExecutionResult executeArg(SequenceDiagram sequenceDiagram, LineLocation location, RegexResult arg2) { - Message message = (Message) sequenceDiagram.getActivatingMessage(); - if (message == null) { + protected CommandExecutionResult executeArg(SequenceDiagram sequenceDiagram, LineLocation location, + RegexResult arg2) { + final AbstractMessage message = sequenceDiagram.getActivatingMessage(); + if (message == null) return CommandExecutionResult.error("Nothing to deactivate."); - } + final String error = sequenceDiagram.activate(message.getParticipant2(), LifeEventType.DEACTIVATE, null); - if (error != null) { + if (error != null) return CommandExecutionResult.error(error); - } + return CommandExecutionResult.ok(); } diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/DrawableSet.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/DrawableSet.java index 0d6b7a003..2a2450c44 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/DrawableSet.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/DrawableSet.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.sequencediagram.graphic; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Rectangle2D; import java.util.ArrayList; import java.util.Collection; diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/GraphicalDelayText.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/GraphicalDelayText.java index e57e65c2d..92de18075 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/GraphicalDelayText.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/GraphicalDelayText.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.sequencediagram.graphic; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.Dimension2DDouble; import net.sourceforge.plantuml.graphic.StringBounder; diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/GraphicalDivider.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/GraphicalDivider.java index 9e7a3bc3a..936b24a5f 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/GraphicalDivider.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/GraphicalDivider.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.sequencediagram.graphic; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.Dimension2DDouble; import net.sourceforge.plantuml.graphic.StringBounder; diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/GraphicalNewpage.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/GraphicalNewpage.java index edd052356..0824cb10d 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/GraphicalNewpage.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/GraphicalNewpage.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.sequencediagram.graphic; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.Dimension2DDouble; import net.sourceforge.plantuml.graphic.StringBounder; diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/GraphicalReference.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/GraphicalReference.java index fc3dfed0a..c8dd74eb5 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/GraphicalReference.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/GraphicalReference.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.sequencediagram.graphic; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.Objects; import net.sourceforge.plantuml.Dimension2DDouble; diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/GroupingGraphicalElementElse.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/GroupingGraphicalElementElse.java index ef02ff755..06e78341b 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/GroupingGraphicalElementElse.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/GroupingGraphicalElementElse.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.sequencediagram.graphic; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.Dimension2DDouble; import net.sourceforge.plantuml.graphic.StringBounder; diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/GroupingGraphicalElementHeader.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/GroupingGraphicalElementHeader.java index 133fcccb8..184d6b484 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/GroupingGraphicalElementHeader.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/GroupingGraphicalElementHeader.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.sequencediagram.graphic; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.ArrayList; import java.util.Collection; import java.util.List; diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/MessageArrow.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/MessageArrow.java index 04a730bce..31a5e84ea 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/MessageArrow.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/MessageArrow.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.sequencediagram.graphic; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.Objects; import net.sourceforge.plantuml.Dimension2DDouble; diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/MessageExoArrow.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/MessageExoArrow.java index 1cbcaa535..4224ecc56 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/MessageExoArrow.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/MessageExoArrow.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.sequencediagram.graphic; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.Dimension2DDouble; import net.sourceforge.plantuml.Url; diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/MessageSelfArrow.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/MessageSelfArrow.java index ef10502ab..136b13890 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/MessageSelfArrow.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/MessageSelfArrow.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.sequencediagram.graphic; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.Dimension2DDouble; import net.sourceforge.plantuml.Url; diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/NoteBox.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/NoteBox.java index bd0a50b85..0967cf5f7 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/NoteBox.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/NoteBox.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.sequencediagram.graphic; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.Objects; import net.sourceforge.plantuml.Dimension2DDouble; diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/SegmentColored.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/SegmentColored.java index d35a22ed7..e4ad99d30 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/SegmentColored.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/SegmentColored.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.sequencediagram.graphic; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.AbstractCollection; import java.util.Collection; import java.util.Iterator; diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/SequenceDiagramArea.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/SequenceDiagramArea.java index de9ed0a68..cbb6626c3 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/SequenceDiagramArea.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/SequenceDiagramArea.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.sequencediagram.graphic; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.UseStyle; import net.sourceforge.plantuml.graphic.HorizontalAlignment; diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/SequenceDiagramFileMakerPuma2.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/SequenceDiagramFileMakerPuma2.java index a5a63a5f3..d6c97aa29 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/SequenceDiagramFileMakerPuma2.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/SequenceDiagramFileMakerPuma2.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.sequencediagram.graphic; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.io.IOException; import java.io.OutputStream; import java.util.ArrayList; diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/SequenceDiagramTxtMaker.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/SequenceDiagramTxtMaker.java index d451c4e6f..d2a1785d3 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/SequenceDiagramTxtMaker.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/SequenceDiagramTxtMaker.java @@ -37,7 +37,7 @@ package net.sourceforge.plantuml.sequencediagram.graphic; import static java.nio.charset.StandardCharsets.UTF_8; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.io.IOException; import java.io.OutputStream; import java.io.PrintStream; diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationExoTile.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationExoTile.java index 05b25acc7..39d3f2534 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationExoTile.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationExoTile.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.sequencediagram.teoz; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.graphic.StringBounder; diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTile.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTile.java index 18c9cf20e..45166d934 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTile.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTile.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.sequencediagram.teoz; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.LineParam; diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileNoteBottom.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileNoteBottom.java index 6984faa01..905733d78 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileNoteBottom.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileNoteBottom.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.sequencediagram.teoz; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.graphic.StringBounder; diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileNoteBottomTopAbstract.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileNoteBottomTopAbstract.java index 6a8ee8752..e02766172 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileNoteBottomTopAbstract.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileNoteBottomTopAbstract.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.sequencediagram.teoz; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.ColorParam; import net.sourceforge.plantuml.ISkinParam; diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileNoteLeft.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileNoteLeft.java index 53750a8a9..32c81793e 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileNoteLeft.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileNoteLeft.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.sequencediagram.teoz; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.graphic.StringBounder; diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileNoteRight.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileNoteRight.java index ccb1e6bfa..9415700bc 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileNoteRight.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileNoteRight.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.sequencediagram.teoz; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.graphic.StringBounder; diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileNoteTop.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileNoteTop.java index ee031982e..f6c26484f 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileNoteTop.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileNoteTop.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.sequencediagram.teoz; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.graphic.StringBounder; diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileSelf.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileSelf.java index 189e491de..ba9292f5c 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileSelf.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileSelf.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.sequencediagram.teoz; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Point2D; import java.util.Iterator; diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileSelfNoteRight.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileSelfNoteRight.java index b4a18ce8a..aaa0b75c5 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileSelfNoteRight.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileSelfNoteRight.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.sequencediagram.teoz; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.graphic.StringBounder; diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/ComponentAdapter.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/ComponentAdapter.java index 1a63e3f65..4b60aa6d1 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/ComponentAdapter.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/ComponentAdapter.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.sequencediagram.teoz; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.Dimension2DDouble; import net.sourceforge.plantuml.graphic.AbstractTextBlock; diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/DelayTile.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/DelayTile.java index 7e431d440..414e4b1ed 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/DelayTile.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/DelayTile.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.sequencediagram.teoz; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.real.Real; diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/DividerTile.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/DividerTile.java index db5411c7a..73fd611df 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/DividerTile.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/DividerTile.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.sequencediagram.teoz; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.graphic.StringBounder; diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/ElseTile.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/ElseTile.java index 8005a077a..689450743 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/ElseTile.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/ElseTile.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.sequencediagram.teoz; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.SkinParamBackcolored; diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/GroupingTile.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/GroupingTile.java index b9caa7542..e256de2ff 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/GroupingTile.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/GroupingTile.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.sequencediagram.teoz; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/LifeEventTile.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/LifeEventTile.java index ca872c2b4..b6ef40aa9 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/LifeEventTile.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/LifeEventTile.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.sequencediagram.teoz; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.real.Real; diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/LiveBoxesDrawer.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/LiveBoxesDrawer.java index 54fb869e6..ab06f349b 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/LiveBoxesDrawer.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/LiveBoxesDrawer.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.sequencediagram.teoz; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.Collection; import java.util.HashSet; import java.util.Iterator; diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/LivingSpace.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/LivingSpace.java index 137c0776a..84af49f74 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/LivingSpace.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/LivingSpace.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.sequencediagram.teoz; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.List; import net.sourceforge.plantuml.ISkinParam; diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/LivingSpaces.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/LivingSpaces.java index b200f2c78..3ec142188 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/LivingSpaces.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/LivingSpaces.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.sequencediagram.teoz; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.Collection; import java.util.Iterator; import java.util.LinkedHashMap; diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/MutingLine.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/MutingLine.java index e8aaab804..92f0e1fc6 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/MutingLine.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/MutingLine.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.sequencediagram.teoz; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.List; import java.util.Map; import java.util.TreeMap; diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/NoteTile.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/NoteTile.java index 8691d07ab..00b2ba6e7 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/NoteTile.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/NoteTile.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.sequencediagram.teoz; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.graphic.StringBounder; diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/NotesTile.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/NotesTile.java index fddfbb7a6..aff7fe965 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/NotesTile.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/NotesTile.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.sequencediagram.teoz; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.ArrayList; import java.util.List; diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/PlayingSpaceWithParticipants.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/PlayingSpaceWithParticipants.java index 329423480..1872100b9 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/PlayingSpaceWithParticipants.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/PlayingSpaceWithParticipants.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.sequencediagram.teoz; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.List; import java.util.Objects; diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/ReferenceTile.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/ReferenceTile.java index 4c40c81e4..1dcab0796 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/ReferenceTile.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/ReferenceTile.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.sequencediagram.teoz; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.graphic.StringBounder; diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/SequenceDiagramFileMakerTeoz.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/SequenceDiagramFileMakerTeoz.java index d550a5f7d..4ebf99a0e 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/SequenceDiagramFileMakerTeoz.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/SequenceDiagramFileMakerTeoz.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.sequencediagram.teoz; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.io.IOException; import java.io.OutputStream; diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/TeozLayer.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/TeozLayer.java index f79e1bf75..34ca2e8c4 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/TeozLayer.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/TeozLayer.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.sequencediagram.teoz; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.Dimension2DDouble; import net.sourceforge.plantuml.FontParam; diff --git a/src/net/sourceforge/plantuml/skin/AbstractComponent.java b/src/net/sourceforge/plantuml/skin/AbstractComponent.java index a77b59b37..d13765910 100644 --- a/src/net/sourceforge/plantuml/skin/AbstractComponent.java +++ b/src/net/sourceforge/plantuml/skin/AbstractComponent.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.skin; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.Dimension2DDouble; import net.sourceforge.plantuml.graphic.StringBounder; diff --git a/src/net/sourceforge/plantuml/skin/AbstractTextualComponent.java b/src/net/sourceforge/plantuml/skin/AbstractTextualComponent.java index 33f2f8ea6..8c6e8d06a 100644 --- a/src/net/sourceforge/plantuml/skin/AbstractTextualComponent.java +++ b/src/net/sourceforge/plantuml/skin/AbstractTextualComponent.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.skin; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.FontParam; import net.sourceforge.plantuml.ISkinParam; diff --git a/src/net/sourceforge/plantuml/skin/ActorAwesome.java b/src/net/sourceforge/plantuml/skin/ActorAwesome.java index 8a61af546..af0da19c9 100644 --- a/src/net/sourceforge/plantuml/skin/ActorAwesome.java +++ b/src/net/sourceforge/plantuml/skin/ActorAwesome.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.skin; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.Dimension2DDouble; import net.sourceforge.plantuml.graphic.AbstractTextBlock; diff --git a/src/net/sourceforge/plantuml/skin/ActorHollow.java b/src/net/sourceforge/plantuml/skin/ActorHollow.java index 6688d83e0..7b90730b6 100644 --- a/src/net/sourceforge/plantuml/skin/ActorHollow.java +++ b/src/net/sourceforge/plantuml/skin/ActorHollow.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.skin; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.Dimension2DDouble; import net.sourceforge.plantuml.graphic.AbstractTextBlock; diff --git a/src/net/sourceforge/plantuml/skin/ActorStickMan.java b/src/net/sourceforge/plantuml/skin/ActorStickMan.java index 9f81108af..cf69d9c4f 100644 --- a/src/net/sourceforge/plantuml/skin/ActorStickMan.java +++ b/src/net/sourceforge/plantuml/skin/ActorStickMan.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.skin; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Point2D; import net.sourceforge.plantuml.Dimension2DDouble; diff --git a/src/net/sourceforge/plantuml/skin/ActorStyle.java b/src/net/sourceforge/plantuml/skin/ActorStyle.java index ef8aef2fc..37d532771 100644 --- a/src/net/sourceforge/plantuml/skin/ActorStyle.java +++ b/src/net/sourceforge/plantuml/skin/ActorStyle.java @@ -38,6 +38,7 @@ package net.sourceforge.plantuml.skin; import net.sourceforge.plantuml.graphic.SymbolContext; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.USymbol; +import net.sourceforge.plantuml.graphic.USymbols; public enum ActorStyle { @@ -45,11 +46,11 @@ public enum ActorStyle { public USymbol toUSymbol() { if (this == STICKMAN) { - return USymbol.ACTOR_STICKMAN; + return USymbols.ACTOR_STICKMAN; } else if (this == AWESOME) { - return USymbol.ACTOR_AWESOME; + return USymbols.ACTOR_AWESOME; } else if (this == HOLLOW) { - return USymbol.ACTOR_HOLLOW; + return USymbols.ACTOR_HOLLOW; } throw new IllegalStateException(); } diff --git a/src/net/sourceforge/plantuml/skin/Area.java b/src/net/sourceforge/plantuml/skin/Area.java index 0f200a620..dcd898c21 100644 --- a/src/net/sourceforge/plantuml/skin/Area.java +++ b/src/net/sourceforge/plantuml/skin/Area.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.skin; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.Dimension2DDouble; diff --git a/src/net/sourceforge/plantuml/skin/ArrowComponent.java b/src/net/sourceforge/plantuml/skin/ArrowComponent.java index 7002bdcb6..1976b7a2a 100644 --- a/src/net/sourceforge/plantuml/skin/ArrowComponent.java +++ b/src/net/sourceforge/plantuml/skin/ArrowComponent.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.skin; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Point2D; import net.sourceforge.plantuml.graphic.StringBounder; diff --git a/src/net/sourceforge/plantuml/skin/Component.java b/src/net/sourceforge/plantuml/skin/Component.java index 0af068076..e616a2782 100644 --- a/src/net/sourceforge/plantuml/skin/Component.java +++ b/src/net/sourceforge/plantuml/skin/Component.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.skin; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.style.WithStyle; diff --git a/src/net/sourceforge/plantuml/skin/Padder.java b/src/net/sourceforge/plantuml/skin/Padder.java index 0c472c1ef..a342a288c 100644 --- a/src/net/sourceforge/plantuml/skin/Padder.java +++ b/src/net/sourceforge/plantuml/skin/Padder.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.skin; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.Dimension2DDouble; import net.sourceforge.plantuml.graphic.AbstractTextBlock; diff --git a/src/net/sourceforge/plantuml/skin/VisibilityModifier.java b/src/net/sourceforge/plantuml/skin/VisibilityModifier.java index 264cc82e2..ac9c99628 100644 --- a/src/net/sourceforge/plantuml/skin/VisibilityModifier.java +++ b/src/net/sourceforge/plantuml/skin/VisibilityModifier.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.skin; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Rectangle2D; import net.sourceforge.plantuml.ColorParam; diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseActiveLine.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseActiveLine.java index 2624ee80b..245a52425 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseActiveLine.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseActiveLine.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.skin.rose; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.UseStyle; import net.sourceforge.plantuml.api.ThemeStyle; diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseActor.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseActor.java index f436eec30..4b9d808cd 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseActor.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseActor.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.skin.rose; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.ISkinSimple; import net.sourceforge.plantuml.LineBreakStrategy; diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseArrow.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseArrow.java index 9dbdc030f..7bab5d9da 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseArrow.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseArrow.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.skin.rose; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Point2D; import net.sourceforge.plantuml.ISkinSimple; diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseBoundary.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseBoundary.java index 1e35472b9..b35294454 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseBoundary.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseBoundary.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.skin.rose; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.ISkinSimple; import net.sourceforge.plantuml.LineBreakStrategy; diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseControl.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseControl.java index 62aead5e0..a9f6a611d 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseControl.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseControl.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.skin.rose; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.ISkinSimple; import net.sourceforge.plantuml.LineBreakStrategy; diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseDatabase.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseDatabase.java index 5f9c3d46f..b0c9c8581 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseDatabase.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseDatabase.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.skin.rose; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.ISkinSimple; import net.sourceforge.plantuml.LineBreakStrategy; @@ -47,7 +47,7 @@ import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.SymbolContext; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.TextBlockUtils; -import net.sourceforge.plantuml.graphic.USymbol; +import net.sourceforge.plantuml.graphic.USymbols; import net.sourceforge.plantuml.skin.AbstractTextualComponent; import net.sourceforge.plantuml.skin.Area; import net.sourceforge.plantuml.style.Style; @@ -74,7 +74,7 @@ public class ComponentRoseDatabase extends AbstractTextualComponent { final SymbolContext symbolContext = new SymbolContext(biColor.getBackColor(), biColor.getForeColor()) .withStroke(new UStroke(1.5)).withShadow(biColor.getDeltaShadow()); - this.stickman = USymbol.DATABASE.asSmall(null, TextBlockUtils.empty(16, 17), TextBlockUtils.empty(0, 0), + this.stickman = USymbols.DATABASE.asSmall(null, TextBlockUtils.empty(16, 17), TextBlockUtils.empty(0, 0), symbolContext, HorizontalAlignment.CENTER); } diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseDelayLine.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseDelayLine.java index 68dc81fe4..8fdf9fcbe 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseDelayLine.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseDelayLine.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.skin.rose; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.skin.AbstractComponent; diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseDelayText.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseDelayText.java index c83f9e438..b5f0250a9 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseDelayText.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseDelayText.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.skin.rose; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.ISkinSimple; import net.sourceforge.plantuml.LineBreakStrategy; diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseDivider.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseDivider.java index a60715f53..8a56efe17 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseDivider.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseDivider.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.skin.rose; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.ISkinSimple; import net.sourceforge.plantuml.LineBreakStrategy; diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseEnglober.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseEnglober.java index b2502f869..a3a52478c 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseEnglober.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseEnglober.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.skin.rose; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.ISkinSimple; import net.sourceforge.plantuml.LineBreakStrategy; diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseEntity.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseEntity.java index c1e051798..a39623f58 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseEntity.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseEntity.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.skin.rose; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.ISkinSimple; import net.sourceforge.plantuml.LineBreakStrategy; diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseGroupingElse.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseGroupingElse.java index 391832dae..232c7ed49 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseGroupingElse.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseGroupingElse.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.skin.rose; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.ISkinSimple; import net.sourceforge.plantuml.LineBreakStrategy; diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseGroupingHeader.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseGroupingHeader.java index 683eafa0d..2d25585d3 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseGroupingHeader.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseGroupingHeader.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.skin.rose; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.Objects; import net.sourceforge.plantuml.ISkinSimple; diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseGroupingSpace.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseGroupingSpace.java index 4c429de1f..f487221d6 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseGroupingSpace.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseGroupingSpace.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.skin.rose; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.Dimension2DDouble; import net.sourceforge.plantuml.graphic.StringBounder; diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseLine.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseLine.java index 323448ff9..34b489fa7 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseLine.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseLine.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.skin.rose; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.UseStyle; import net.sourceforge.plantuml.api.ThemeStyle; diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseNewpage.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseNewpage.java index 6bd47b39c..9bc28f05b 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseNewpage.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseNewpage.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.skin.rose; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.skin.AbstractComponent; diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseQueue.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseQueue.java index 9072c6ab6..3e46eb578 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseQueue.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseQueue.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.skin.rose; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.ISkinSimple; import net.sourceforge.plantuml.LineBreakStrategy; @@ -47,7 +47,7 @@ import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.SymbolContext; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.TextBlockUtils; -import net.sourceforge.plantuml.graphic.USymbol; +import net.sourceforge.plantuml.graphic.USymbols; import net.sourceforge.plantuml.skin.AbstractTextualComponent; import net.sourceforge.plantuml.skin.Area; import net.sourceforge.plantuml.style.Style; @@ -70,7 +70,7 @@ public class ComponentRoseQueue extends AbstractTextualComponent { biColor = style.getSymbolContext(spriteContainer.getThemeStyle(), getIHtmlColorSet()); } this.head = head; - this.stickman = USymbol.QUEUE.asSmall(TextBlockUtils.empty(0, 0), getTextBlock(), TextBlockUtils.empty(0, 0), + this.stickman = USymbols.QUEUE.asSmall(TextBlockUtils.empty(0, 0), getTextBlock(), TextBlockUtils.empty(0, 0), biColor, HorizontalAlignment.CENTER); } diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseReference.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseReference.java index b1168ce59..c6c34f490 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseReference.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseReference.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.skin.rose; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.ISkinSimple; import net.sourceforge.plantuml.LineBreakStrategy; diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseSelfArrow.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseSelfArrow.java index 190d36ae8..d5381a52e 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseSelfArrow.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseSelfArrow.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.skin.rose; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Point2D; import net.sourceforge.plantuml.ISkinSimple; diff --git a/src/net/sourceforge/plantuml/sprite/ListSpriteDiagram.java b/src/net/sourceforge/plantuml/sprite/ListSpriteDiagram.java index 4880bd451..b9c077ae6 100644 --- a/src/net/sourceforge/plantuml/sprite/ListSpriteDiagram.java +++ b/src/net/sourceforge/plantuml/sprite/ListSpriteDiagram.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.sprite; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.io.IOException; import java.io.OutputStream; diff --git a/src/net/sourceforge/plantuml/sprite/SpriteColor.java b/src/net/sourceforge/plantuml/sprite/SpriteColor.java index 1d71b60e0..a2a69956a 100644 --- a/src/net/sourceforge/plantuml/sprite/SpriteColor.java +++ b/src/net/sourceforge/plantuml/sprite/SpriteColor.java @@ -36,7 +36,7 @@ package net.sourceforge.plantuml.sprite; import java.awt.Color; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.image.BufferedImage; import net.sourceforge.plantuml.Dimension2DDouble; diff --git a/src/net/sourceforge/plantuml/sprite/SpriteImage.java b/src/net/sourceforge/plantuml/sprite/SpriteImage.java index cc2c939c4..65da8ab29 100644 --- a/src/net/sourceforge/plantuml/sprite/SpriteImage.java +++ b/src/net/sourceforge/plantuml/sprite/SpriteImage.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.sprite; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.image.BufferedImage; import java.io.IOException; import java.io.InputStream; diff --git a/src/net/sourceforge/plantuml/sprite/SpriteMonochrome.java b/src/net/sourceforge/plantuml/sprite/SpriteMonochrome.java index b30f8fae9..4fde75cb3 100644 --- a/src/net/sourceforge/plantuml/sprite/SpriteMonochrome.java +++ b/src/net/sourceforge/plantuml/sprite/SpriteMonochrome.java @@ -36,7 +36,7 @@ package net.sourceforge.plantuml.sprite; import java.awt.Color; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.image.BufferedImage; import java.io.IOException; import java.io.OutputStream; diff --git a/src/net/sourceforge/plantuml/sprite/SpriteSvg.java b/src/net/sourceforge/plantuml/sprite/SpriteSvg.java index 171a1c656..e3579b780 100644 --- a/src/net/sourceforge/plantuml/sprite/SpriteSvg.java +++ b/src/net/sourceforge/plantuml/sprite/SpriteSvg.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.sprite; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.Dimension2DDouble; import net.sourceforge.plantuml.graphic.AbstractTextBlock; diff --git a/src/net/sourceforge/plantuml/sprite/StdlibDiagram.java b/src/net/sourceforge/plantuml/sprite/StdlibDiagram.java index ee200117d..d01a51e11 100644 --- a/src/net/sourceforge/plantuml/sprite/StdlibDiagram.java +++ b/src/net/sourceforge/plantuml/sprite/StdlibDiagram.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.sprite; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.io.IOException; import java.io.OutputStream; import java.util.List; diff --git a/src/net/sourceforge/plantuml/statediagram/command/CommandCreatePackage2.java b/src/net/sourceforge/plantuml/statediagram/command/CommandCreatePackage2.java index 7e1441e0f..7978a60d1 100644 --- a/src/net/sourceforge/plantuml/statediagram/command/CommandCreatePackage2.java +++ b/src/net/sourceforge/plantuml/statediagram/command/CommandCreatePackage2.java @@ -55,7 +55,7 @@ import net.sourceforge.plantuml.cucadiagram.IGroup; import net.sourceforge.plantuml.cucadiagram.Ident; import net.sourceforge.plantuml.cucadiagram.NamespaceStrategy; import net.sourceforge.plantuml.cucadiagram.Stereotype; -import net.sourceforge.plantuml.graphic.USymbol; +import net.sourceforge.plantuml.graphic.USymbols; import net.sourceforge.plantuml.graphic.color.ColorParser; import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.graphic.color.Colors; @@ -125,7 +125,7 @@ public class CommandCreatePackage2 extends SingleLineCommand2 { final String stereotype = arg.get("STEREOTYPE", 0); if (stereotype != null) p.setStereotype(Stereotype.build(stereotype)); - p.setUSymbol(USymbol.FRAME); + p.setUSymbol(USymbols.FRAME); final String urlString = arg.get("URL", 0); if (urlString != null) { diff --git a/src/net/sourceforge/plantuml/svek/Boundary.java b/src/net/sourceforge/plantuml/svek/Boundary.java index 31536e78d..0a62b286a 100644 --- a/src/net/sourceforge/plantuml/svek/Boundary.java +++ b/src/net/sourceforge/plantuml/svek/Boundary.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.svek; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.Dimension2DDouble; import net.sourceforge.plantuml.graphic.AbstractTextBlock; diff --git a/src/net/sourceforge/plantuml/svek/CircleInterface2.java b/src/net/sourceforge/plantuml/svek/CircleInterface2.java index c60b5ebca..fe0e1600b 100644 --- a/src/net/sourceforge/plantuml/svek/CircleInterface2.java +++ b/src/net/sourceforge/plantuml/svek/CircleInterface2.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.svek; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.Dimension2DDouble; import net.sourceforge.plantuml.graphic.AbstractTextBlock; diff --git a/src/net/sourceforge/plantuml/svek/Cluster.java b/src/net/sourceforge/plantuml/svek/Cluster.java index d2580d9c1..987774968 100644 --- a/src/net/sourceforge/plantuml/svek/Cluster.java +++ b/src/net/sourceforge/plantuml/svek/Cluster.java @@ -36,7 +36,7 @@ */ package net.sourceforge.plantuml.svek; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Point2D; import java.util.ArrayList; import java.util.Collection; @@ -56,6 +56,7 @@ import net.sourceforge.plantuml.Dimension2DDouble; import net.sourceforge.plantuml.FontParam; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.SkinParamUtils; +import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.UmlDiagramType; import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.UseStyle; @@ -69,6 +70,7 @@ import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.USymbol; +import net.sourceforge.plantuml.graphic.USymbols; import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.graphic.color.Colors; import net.sourceforge.plantuml.posimo.Moveable; @@ -318,7 +320,7 @@ public class Cluster implements Moveable { final double rounded; final double shadowing; if (UseStyle.useBetaStyle()) { - final USymbol uSymbol = group.getUSymbol() == null ? USymbol.PACKAGE : group.getUSymbol(); + final USymbol uSymbol = group.getUSymbol() == null ? USymbols.PACKAGE : group.getUSymbol(); final StyleSignature tmp = getDefaultStyleDefinition(umlDiagramType.getStyleName(), uSymbol); style = tmp.with(group.getStereotype()).getMergedStyle(skinParam.getCurrentStyleBuilder()); shadowing = style.value(PName.Shadowing).asDouble(); @@ -334,7 +336,7 @@ public class Cluster implements Moveable { } else { if (group.getUSymbol() == null) - shadowing = skinParam2.shadowing2(group.getStereotype(), USymbol.PACKAGE.getSkinParameter()) ? 3 : 0; + shadowing = skinParam2.shadowing2(group.getStereotype(), USymbols.PACKAGE.getSkinParameter()) ? 3 : 0; else shadowing = skinParam2.shadowing2(group.getStereotype(), group.getUSymbol().getSkinParameter()) ? 3 : 0; @@ -427,7 +429,7 @@ public class Cluster implements Moveable { if (style != null) return style.getStroke(); - if (group.getUSymbol() != null && group.getUSymbol() != USymbol.PACKAGE) + if (group.getUSymbol() != null && group.getUSymbol() != USymbols.PACKAGE) return group.getUSymbol().getSkinParameter().getStroke(skinParam, group.getStereotype()); return GeneralImageBuilder.getForcedStroke(group.getStereotype(), skinParam); @@ -714,7 +716,7 @@ public class Cluster implements Moveable { } private boolean protection1(UmlDiagramType type) { - if (group.getUSymbol() == USymbol.NODE) + if (group.getUSymbol() == USymbols.NODE) return true; if (skinParam.useSwimlanes(type)) @@ -785,7 +787,7 @@ public class Cluster implements Moveable { sb.append("subgraph " + getClusterId() + " {"); sb.append("style=solid;"); - sb.append("color=\"" + DotStringFactory.sharp000000(color) + "\";"); + sb.append("color=\"" + StringUtils.sharp000000(color) + "\";"); final String label; if (isLabel()) { @@ -916,7 +918,7 @@ public class Cluster implements Moveable { if (UseStyle.useBetaStyle()) return style.value(PName.BackGroundColor).asColor(skinParam.getThemeStyle(), skinParam.getIHtmlColorSet()); - final USymbol sym = group.getUSymbol() == null ? USymbol.PACKAGE : group.getUSymbol(); + final USymbol sym = group.getUSymbol() == null ? USymbols.PACKAGE : group.getUSymbol(); final ColorParam backparam = umlDiagramType == UmlDiagramType.ACTIVITY ? ColorParam.partitionBackground : sym.getColorParamBack(); final HColor c1 = skinParam.getHtmlColor(backparam, stereo, false); diff --git a/src/net/sourceforge/plantuml/svek/ClusterPosition.java b/src/net/sourceforge/plantuml/svek/ClusterPosition.java index 6d3cb67d1..e2c23d6d3 100644 --- a/src/net/sourceforge/plantuml/svek/ClusterPosition.java +++ b/src/net/sourceforge/plantuml/svek/ClusterPosition.java @@ -36,7 +36,7 @@ package net.sourceforge.plantuml.svek; import java.awt.geom.CubicCurve2D; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Point2D; import net.sourceforge.plantuml.Dimension2DDouble; diff --git a/src/net/sourceforge/plantuml/svek/ConcurrentStateImage.java b/src/net/sourceforge/plantuml/svek/ConcurrentStateImage.java index 129786d12..a25be59c2 100644 --- a/src/net/sourceforge/plantuml/svek/ConcurrentStateImage.java +++ b/src/net/sourceforge/plantuml/svek/ConcurrentStateImage.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.svek; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.ArrayList; import java.util.Collection; import java.util.List; diff --git a/src/net/sourceforge/plantuml/svek/Control.java b/src/net/sourceforge/plantuml/svek/Control.java index 8bf4b9deb..05b7bc07b 100644 --- a/src/net/sourceforge/plantuml/svek/Control.java +++ b/src/net/sourceforge/plantuml/svek/Control.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.svek; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.Dimension2DDouble; import net.sourceforge.plantuml.graphic.AbstractTextBlock; diff --git a/src/net/sourceforge/plantuml/svek/CucaDiagramFileMakerSvek2InternalImage.java b/src/net/sourceforge/plantuml/svek/CucaDiagramFileMakerSvek2InternalImage.java index 27ad0913b..b0502fb21 100644 --- a/src/net/sourceforge/plantuml/svek/CucaDiagramFileMakerSvek2InternalImage.java +++ b/src/net/sourceforge/plantuml/svek/CucaDiagramFileMakerSvek2InternalImage.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.svek; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.List; import net.sourceforge.plantuml.ColorParam; diff --git a/src/net/sourceforge/plantuml/svek/DecorateEntityImage.java b/src/net/sourceforge/plantuml/svek/DecorateEntityImage.java index 062c14472..546a4dfcc 100644 --- a/src/net/sourceforge/plantuml/svek/DecorateEntityImage.java +++ b/src/net/sourceforge/plantuml/svek/DecorateEntityImage.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.svek; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.Objects; import net.sourceforge.plantuml.Dimension2DDouble; diff --git a/src/net/sourceforge/plantuml/svek/DecorateEntityImage3.java b/src/net/sourceforge/plantuml/svek/DecorateEntityImage3.java index 76c52b09f..c9a4d7e83 100644 --- a/src/net/sourceforge/plantuml/svek/DecorateEntityImage3.java +++ b/src/net/sourceforge/plantuml/svek/DecorateEntityImage3.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.svek; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.graphic.AbstractTextBlock; import net.sourceforge.plantuml.graphic.StringBounder; diff --git a/src/net/sourceforge/plantuml/svek/DirectionalTextBlock.java b/src/net/sourceforge/plantuml/svek/DirectionalTextBlock.java index c6093d7f4..6587d2fa6 100644 --- a/src/net/sourceforge/plantuml/svek/DirectionalTextBlock.java +++ b/src/net/sourceforge/plantuml/svek/DirectionalTextBlock.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.svek; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.Direction; import net.sourceforge.plantuml.graphic.AbstractTextBlock; diff --git a/src/net/sourceforge/plantuml/svek/DotStringFactory.java b/src/net/sourceforge/plantuml/svek/DotStringFactory.java index ee686172d..c18d9d831 100644 --- a/src/net/sourceforge/plantuml/svek/DotStringFactory.java +++ b/src/net/sourceforge/plantuml/svek/DotStringFactory.java @@ -114,9 +114,9 @@ public class DotStringFactory implements Moveable { } private void printMinRanking(StringBuilder sb) { - if (rankMin.size() == 0) { + if (rankMin.size() == 0) return; - } + sb.append("{ rank = min;"); for (String id : rankMin) { sb.append(id); @@ -130,9 +130,9 @@ public class DotStringFactory implements Moveable { double max = 0; for (SvekLine l : bibliotekon.allLines()) { final double c = l.getHorizontalDzeta(stringBounder); - if (c > max) { + if (c > max) max = c; - } + } return max / 10; } @@ -141,9 +141,9 @@ public class DotStringFactory implements Moveable { double max = 0; for (SvekLine l : bibliotekon.allLines()) { final double c = l.getVerticalDzeta(stringBounder); - if (c > max) { + if (c > max) max = c; - } + } return max / 10; } @@ -152,21 +152,21 @@ public class DotStringFactory implements Moveable { final StringBuilder sb = new StringBuilder(); double nodesep = getHorizontalDzeta(); - if (nodesep < getMinNodeSep()) { + if (nodesep < getMinNodeSep()) nodesep = getMinNodeSep(); - } - if (skinParam.getNodesep() != 0) { + + if (skinParam.getNodesep() != 0) nodesep = skinParam.getNodesep(); - } + final String nodesepInches = SvekUtils.pixelToInches(nodesep); // Log.println("nodesep=" + nodesepInches); double ranksep = getVerticalDzeta(); - if (ranksep < getMinRankSep()) { + if (ranksep < getMinRankSep()) ranksep = getMinRankSep(); - } - if (skinParam.getRanksep() != 0) { + + if (skinParam.getRanksep() != 0) ranksep = skinParam.getRanksep(); - } + final String ranksepInches = SvekUtils.pixelToInches(ranksep); // Log.println("ranksep=" + ranksepInches); sb.append("digraph unix {"); @@ -211,16 +211,16 @@ public class DotStringFactory implements Moveable { manageMinMaxCluster(sb); root.printCluster1(sb, bibliotekon.allLines(), stringBounder); - for (SvekLine line : bibliotekon.lines0()) { + for (SvekLine line : bibliotekon.lines0()) line.appendLine(getGraphvizVersion(), sb, dotMode, dotSplines); - } + root.fillRankMin(rankMin); root.printCluster2(sb, bibliotekon.allLines(), stringBounder, dotMode, getGraphvizVersion(), umlDiagramType); printMinRanking(sb); - for (SvekLine line : bibliotekon.lines1()) { + for (SvekLine line : bibliotekon.lines1()) line.appendLine(getGraphvizVersion(), sb, dotMode, dotSplines); - } + SvekUtils.println(sb); sb.append("}"); @@ -232,13 +232,13 @@ public class DotStringFactory implements Moveable { final List maxPointCluster = new ArrayList<>(); for (Cluster cluster : bibliotekon.allCluster()) { final String minPoint = cluster.getMinPoint(umlDiagramType); - if (minPoint != null) { + if (minPoint != null) minPointCluster.add(minPoint); - } + final String maxPoint = cluster.getMaxPoint(umlDiagramType); - if (maxPoint != null) { + if (maxPoint != null) maxPointCluster.add(maxPoint); - } + } if (minPointCluster.size() > 0) { sb.append("{rank=min;"); @@ -281,17 +281,17 @@ public class DotStringFactory implements Moveable { private GraphvizVersion graphvizVersion; public GraphvizVersion getGraphvizVersion() { - if (graphvizVersion == null) { + if (graphvizVersion == null) graphvizVersion = getGraphvizVersionInternal(); - } + return graphvizVersion; } private GraphvizVersion getGraphvizVersionInternal() { final Graphviz graphviz = GraphvizUtils.create(skinParam, "foo;", "svg"); - if (graphviz instanceof GraphvizJs) { + if (graphviz instanceof GraphvizJs) return GraphvizJs.getGraphvizVersion(false); - } + final File f = graphviz.getDotExe(); return GraphvizVersions.getInstance().getVersion(f); } @@ -320,9 +320,9 @@ public class DotStringFactory implements Moveable { baos = new ByteArrayOutputStream(); final ProcessState state = graphviz.createFile3(baos); baos.close(); - if (state.differs(ProcessState.TERMINATED_OK())) { + if (state.differs(ProcessState.TERMINATED_OK())) throw new IllegalStateException("Timeout4 " + state, state.getCause()); - } + } final byte[] result = baos.toByteArray(); final String s = new String(result, UTF_8); @@ -337,9 +337,9 @@ public class DotStringFactory implements Moveable { public boolean illegalDotExe() { final Graphviz graphviz = GraphvizUtils.create(skinParam, "svg"); - if (graphviz instanceof GraphvizJs) { + if (graphviz instanceof GraphvizJs) return false; - } + final File dotExe = graphviz.getDotExe(); return dotExe == null || dotExe.isFile() == false || dotExe.canRead() == false; } @@ -351,19 +351,15 @@ public class DotStringFactory implements Moveable { public void solve(boolean mergeIntricated, EntityFactory entityFactory, final String svg) throws IOException, InterruptedException { - if (svg.length() == 0) { + if (svg.length() == 0) throw new EmptySvgException(); - } final Pattern pGraph = Pattern.compile("(?m)\\ pointsTitle = svgResult.substring(starting1) @@ -446,37 +442,29 @@ public class DotStringFactory implements Moveable { cluster.setTitlePosition(minXtitle, minYtitle); } - for (SvekLine line : bibliotekon.allLines()) { + for (SvekLine line : bibliotekon.allLines()) line.solveLine(svgResult); - } - for (SvekLine line : bibliotekon.allLines()) { + for (SvekLine line : bibliotekon.allLines()) line.manageCollision(bibliotekon.allNodes()); - } + // corner1.manage(0, 0); // return new ClusterPosition(corner1.getMinX(), corner1.getMinY(), fullWidth, fullHeight); // // return new ClusterPosition(0, 0, fullWidth, fullHeight); } private int getClusterIndex(final String svg, int colorInt) { - final String colorString = StringUtils.goLowerCase(DotStringFactory.sharp000000(colorInt)); + final String colorString = StringUtils.goLowerCase(StringUtils.sharp000000(colorInt)); final String keyTitle1 = "=\"" + colorString + "\""; int idx = svg.indexOf(keyTitle1); if (idx == -1) { final String keyTitle2 = "stroke:" + colorString + ";"; idx = svg.indexOf(keyTitle2); } - if (idx == -1) { + if (idx == -1) throw new IllegalStateException("Cannot find color " + colorString); - } - return idx; - } - public static String sharp000000(int color) { - final int v = 0xFFFFFF & color; - String s = "000000" + Integer.toHexString(v).toUpperCase(); - s = s.substring(s.length() - 6); - return "#" + s; + return idx; } public void openCluster(int titleAndAttributeWidth, int titleAndAttributeHeight, TextBlock title, TextBlock stereo, @@ -487,22 +475,21 @@ public class DotStringFactory implements Moveable { } public void closeCluster() { - if (current.getParentCluster() == null) { + if (current.getParentCluster() == null) throw new IllegalStateException(); - } + this.current = current.getParentCluster(); } public void moveSvek(double deltaX, double deltaY) { - for (SvekNode sh : bibliotekon.allNodes()) { + for (SvekNode sh : bibliotekon.allNodes()) sh.moveSvek(deltaX, deltaY); - } - for (SvekLine line : bibliotekon.allLines()) { + + for (SvekLine line : bibliotekon.allLines()) line.moveSvek(deltaX, deltaY); - } - for (Cluster cl : bibliotekon.allCluster()) { + + for (Cluster cl : bibliotekon.allCluster()) cl.moveSvek(deltaX, deltaY); - } } diff --git a/src/net/sourceforge/plantuml/svek/EntityDomain.java b/src/net/sourceforge/plantuml/svek/EntityDomain.java index 75ea5bfea..1f5d803ab 100644 --- a/src/net/sourceforge/plantuml/svek/EntityDomain.java +++ b/src/net/sourceforge/plantuml/svek/EntityDomain.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.svek; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.Dimension2DDouble; import net.sourceforge.plantuml.graphic.AbstractTextBlock; diff --git a/src/net/sourceforge/plantuml/svek/EntityImageDegenerated.java b/src/net/sourceforge/plantuml/svek/EntityImageDegenerated.java index 3c8b3796b..30a2fff36 100644 --- a/src/net/sourceforge/plantuml/svek/EntityImageDegenerated.java +++ b/src/net/sourceforge/plantuml/svek/EntityImageDegenerated.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.svek; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Rectangle2D; import net.sourceforge.plantuml.Dimension2DDouble; diff --git a/src/net/sourceforge/plantuml/svek/EntityImageProtected.java b/src/net/sourceforge/plantuml/svek/EntityImageProtected.java index 6226e9826..d2a2af471 100644 --- a/src/net/sourceforge/plantuml/svek/EntityImageProtected.java +++ b/src/net/sourceforge/plantuml/svek/EntityImageProtected.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.svek; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Rectangle2D; import net.sourceforge.plantuml.Dimension2DDouble; diff --git a/src/net/sourceforge/plantuml/svek/GeneralImageBuilder.java b/src/net/sourceforge/plantuml/svek/GeneralImageBuilder.java index 798769939..e1caaf1cf 100644 --- a/src/net/sourceforge/plantuml/svek/GeneralImageBuilder.java +++ b/src/net/sourceforge/plantuml/svek/GeneralImageBuilder.java @@ -37,7 +37,7 @@ */ package net.sourceforge.plantuml.svek; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Rectangle2D; import java.io.File; import java.io.IOException; diff --git a/src/net/sourceforge/plantuml/svek/GraphvizCrash.java b/src/net/sourceforge/plantuml/svek/GraphvizCrash.java index 5415e2710..c52fd0a2c 100644 --- a/src/net/sourceforge/plantuml/svek/GraphvizCrash.java +++ b/src/net/sourceforge/plantuml/svek/GraphvizCrash.java @@ -36,7 +36,7 @@ package net.sourceforge.plantuml.svek; import java.awt.Color; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.image.BufferedImage; import java.util.ArrayList; import java.util.List; diff --git a/src/net/sourceforge/plantuml/svek/HeaderLayout.java b/src/net/sourceforge/plantuml/svek/HeaderLayout.java index d9eaf94c6..666dc263f 100644 --- a/src/net/sourceforge/plantuml/svek/HeaderLayout.java +++ b/src/net/sourceforge/plantuml/svek/HeaderLayout.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.svek; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.Dimension2DDouble; import net.sourceforge.plantuml.graphic.StringBounder; diff --git a/src/net/sourceforge/plantuml/svek/InnerActivity.java b/src/net/sourceforge/plantuml/svek/InnerActivity.java index 124603785..3cd301573 100644 --- a/src/net/sourceforge/plantuml/svek/InnerActivity.java +++ b/src/net/sourceforge/plantuml/svek/InnerActivity.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.svek; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.graphic.AbstractTextBlock; import net.sourceforge.plantuml.graphic.StringBounder; diff --git a/src/net/sourceforge/plantuml/svek/InnerStateAutonom.java b/src/net/sourceforge/plantuml/svek/InnerStateAutonom.java index df8fefbfe..8f6b52745 100644 --- a/src/net/sourceforge/plantuml/svek/InnerStateAutonom.java +++ b/src/net/sourceforge/plantuml/svek/InnerStateAutonom.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.svek; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.Dimension2DDouble; import net.sourceforge.plantuml.Url; diff --git a/src/net/sourceforge/plantuml/svek/PackageStyle.java b/src/net/sourceforge/plantuml/svek/PackageStyle.java index 927ca90eb..7b0c8cbb0 100644 --- a/src/net/sourceforge/plantuml/svek/PackageStyle.java +++ b/src/net/sourceforge/plantuml/svek/PackageStyle.java @@ -36,11 +36,12 @@ */ package net.sourceforge.plantuml.svek; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.EnumSet; import net.sourceforge.plantuml.Dimension2DDouble; import net.sourceforge.plantuml.graphic.USymbol; +import net.sourceforge.plantuml.graphic.USymbols; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.ULine; import net.sourceforge.plantuml.ugraphic.UPath; @@ -66,27 +67,27 @@ public enum PackageStyle { } public USymbol toUSymbol() { - if (this == NODE) { - return USymbol.NODE; - } - if (this == CARD) { - return USymbol.CARD; - } - if (this == DATABASE) { - return USymbol.DATABASE; - } - if (this == CLOUD) { - return USymbol.CLOUD; - } - if (this == FRAME) { - return USymbol.FRAME; - } - if (this == RECTANGLE) { - return USymbol.RECTANGLE; - } - if (this == FOLDER) { - return USymbol.PACKAGE; - } + if (this == NODE) + return USymbols.NODE; + + if (this == CARD) + return USymbols.CARD; + + if (this == DATABASE) + return USymbols.DATABASE; + + if (this == CLOUD) + return USymbols.CLOUD; + + if (this == FRAME) + return USymbols.FRAME; + + if (this == RECTANGLE) + return USymbols.RECTANGLE; + + if (this == FOLDER) + return USymbols.PACKAGE; + return null; } @@ -117,7 +118,8 @@ public enum PackageStyle { } else if (this == ARTIFACT) { drawArtifact(ug, width, height, shadowing); } else { - // drawNode(ug, xTheoricalPosition, yTheoricalPosition, width, height, shadowing); + // drawNode(ug, xTheoricalPosition, yTheoricalPosition, width, height, + // shadowing); throw new UnsupportedOperationException(); } } diff --git a/src/net/sourceforge/plantuml/svek/RoundedContainer.java b/src/net/sourceforge/plantuml/svek/RoundedContainer.java index dc9644a7a..40774ac30 100644 --- a/src/net/sourceforge/plantuml/svek/RoundedContainer.java +++ b/src/net/sourceforge/plantuml/svek/RoundedContainer.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.svek; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.ULine; diff --git a/src/net/sourceforge/plantuml/svek/SvekLine.java b/src/net/sourceforge/plantuml/svek/SvekLine.java index b1a833759..2602aeec3 100644 --- a/src/net/sourceforge/plantuml/svek/SvekLine.java +++ b/src/net/sourceforge/plantuml/svek/SvekLine.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.svek; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Point2D; import java.util.ArrayList; import java.util.Collection; @@ -54,6 +54,7 @@ import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.LineParam; import net.sourceforge.plantuml.Log; import net.sourceforge.plantuml.Pragma; +import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.UmlDiagramType; import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.command.Position; @@ -368,7 +369,7 @@ public class SvekLine implements Moveable, Hideable, GuideLine { sb.append("minlen=" + (length - 1)); sb.append(","); } - sb.append("color=\"" + DotStringFactory.sharp000000(lineColor) + "\""); + sb.append("color=\"" + StringUtils.sharp000000(lineColor) + "\""); if (hasNoteLabelText() || link.getLinkConstraint() != null) { sb.append(","); if (graphvizVersion.useXLabelInsteadOfLabel() || dotMode == DotMode.NO_LEFT_RIGHT_AND_XLABEL @@ -438,7 +439,7 @@ public class SvekLine implements Moveable, Hideable, GuideLine { public static void appendTable(StringBuilder sb, int w, int h, int col) { sb.append(""); sb.append(""); diff --git a/src/net/sourceforge/plantuml/svek/SvekNode.java b/src/net/sourceforge/plantuml/svek/SvekNode.java index 0a7333f6c..ee0cc1f83 100644 --- a/src/net/sourceforge/plantuml/svek/SvekNode.java +++ b/src/net/sourceforge/plantuml/svek/SvekNode.java @@ -35,13 +35,13 @@ */ package net.sourceforge.plantuml.svek; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Point2D; import java.util.List; -import java.util.Map; import net.sourceforge.plantuml.Dimension2DDouble; import net.sourceforge.plantuml.Hideable; +import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.cucadiagram.EntityPosition; import net.sourceforge.plantuml.cucadiagram.IGroup; import net.sourceforge.plantuml.cucadiagram.ILeaf; @@ -154,7 +154,7 @@ public class SvekNode implements Positionable, IShapePseudo, Hideable { sb.append(","); sb.append("height=" + SvekUtils.pixelToInches(getHeight())); sb.append(","); - sb.append("color=\"" + DotStringFactory.sharp000000(color) + "\""); + sb.append("color=\"" + StringUtils.sharp000000(color) + "\""); sb.append("];"); SvekUtils.println(sb); } @@ -181,7 +181,7 @@ public class SvekNode implements Positionable, IShapePseudo, Hideable { sb.append(""); sb.append(""); appendTd(sb, shield.getX1(), 1); - sb.append(""); @@ -203,7 +203,7 @@ public class SvekNode implements Positionable, IShapePseudo, Hideable { sb.append("shape=plaintext,"); // sb.append("color=\"" + StringUtils.getAsHtml(color) + "\","); sb.append("label=<"); - sb.append("
"); sb.append("
"); double position = 0; for (PortGeometry geom : ports.getAllPortGeometry()) { diff --git a/src/net/sourceforge/plantuml/svek/SvekResult.java b/src/net/sourceforge/plantuml/svek/SvekResult.java index 461e004ca..c70cf4ea5 100644 --- a/src/net/sourceforge/plantuml/svek/SvekResult.java +++ b/src/net/sourceforge/plantuml/svek/SvekResult.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.svek; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.HashSet; import java.util.Set; diff --git a/src/net/sourceforge/plantuml/svek/SvgResult.java b/src/net/sourceforge/plantuml/svek/SvgResult.java index e4cac8bf1..d0a265179 100644 --- a/src/net/sourceforge/plantuml/svek/SvgResult.java +++ b/src/net/sourceforge/plantuml/svek/SvgResult.java @@ -62,33 +62,34 @@ public class SvgResult { public List extractList(final String searched) { final int p2 = this.indexOf(searched, 0); - if (p2 == -1) { + if (p2 == -1) return Collections.emptyList(); - } + final int p3 = this.indexOf("\"", p2 + searched.length()); - if (p3 == -1) { + if (p3 == -1) return Collections.emptyList(); - } + return this.substring(p2 + searched.length(), p3).getPoints(" MC"); } public int getIndexFromColor(int color) { - String s = "stroke=\"" + StringUtils.goLowerCase(DotStringFactory.sharp000000(color)) + "\""; + String s = "stroke=\"" + StringUtils.goLowerCase(StringUtils.sharp000000(color)) + "\""; int idx = svg.indexOf(s); - if (idx != -1) { + if (idx != -1) return idx; - } - s = ";stroke:" + StringUtils.goLowerCase(DotStringFactory.sharp000000(color)) + ";"; + + s = ";stroke:" + StringUtils.goLowerCase(StringUtils.sharp000000(color)) + ";"; idx = svg.indexOf(s); - if (idx != -1) { + if (idx != -1) return idx; - } - s = "fill=\"" + StringUtils.goLowerCase(DotStringFactory.sharp000000(color)) + "\""; + + s = "fill=\"" + StringUtils.goLowerCase(StringUtils.sharp000000(color)) + "\""; idx = svg.indexOf(s); - if (idx != -1) { + if (idx != -1) return idx; - } - // Log.info("Cannot find color=" + color + " " + StringUtils.goLowerCase(StringUtils.getAsHtml(color))); + + // Log.info("Cannot find color=" + color + " " + + // StringUtils.goLowerCase(StringUtils.getAsHtml(color))); return -1; } @@ -97,9 +98,9 @@ public class SvgResult { try { final StringTokenizer st = new StringTokenizer(svg, separator); final List result = new ArrayList(); - while (st.hasMoreTokens()) { + while (st.hasMoreTokens()) result.add(getFirstPoint(st.nextToken())); - } + return result; } catch (NumberFormatException e) { return Collections.emptyList(); diff --git a/src/net/sourceforge/plantuml/svek/image/AbstractEntityImageBorder.java b/src/net/sourceforge/plantuml/svek/image/AbstractEntityImageBorder.java index 64957d345..6eb0b9d5e 100644 --- a/src/net/sourceforge/plantuml/svek/image/AbstractEntityImageBorder.java +++ b/src/net/sourceforge/plantuml/svek/image/AbstractEntityImageBorder.java @@ -36,7 +36,7 @@ package net.sourceforge.plantuml.svek.image; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.FontParam; import net.sourceforge.plantuml.ISkinParam; diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageActivity.java b/src/net/sourceforge/plantuml/svek/image/EntityImageActivity.java index 8a37503b2..5ca77ff34 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageActivity.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageActivity.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.svek.image; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.ColorParam; import net.sourceforge.plantuml.Dimension2DDouble; diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageArcCircle.java b/src/net/sourceforge/plantuml/svek/image/EntityImageArcCircle.java index 88e523284..b8a45c559 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageArcCircle.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageArcCircle.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.svek.image; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.Dimension2DDouble; import net.sourceforge.plantuml.FontParam; diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageAssociation.java b/src/net/sourceforge/plantuml/svek/image/EntityImageAssociation.java index 354452976..d943af567 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageAssociation.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageAssociation.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.svek.image; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.ColorParam; import net.sourceforge.plantuml.Dimension2DDouble; diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageAssociationPoint.java b/src/net/sourceforge/plantuml/svek/image/EntityImageAssociationPoint.java index 835cf48c9..5de09780f 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageAssociationPoint.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageAssociationPoint.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.svek.image; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.Dimension2DDouble; import net.sourceforge.plantuml.ISkinParam; diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageBranch.java b/src/net/sourceforge/plantuml/svek/image/EntityImageBranch.java index 3f8a5c5b7..68360804b 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageBranch.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageBranch.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.svek.image; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.EnumMap; import java.util.Map; diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageCircleEnd.java b/src/net/sourceforge/plantuml/svek/image/EntityImageCircleEnd.java index fbdbfc15e..1cbf134a7 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageCircleEnd.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageCircleEnd.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.svek.image; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.ColorParam; import net.sourceforge.plantuml.Dimension2DDouble; diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageCircleStart.java b/src/net/sourceforge/plantuml/svek/image/EntityImageCircleStart.java index 63362083c..7b37d64c1 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageCircleStart.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageCircleStart.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.svek.image; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.ColorParam; import net.sourceforge.plantuml.Dimension2DDouble; diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageClass.java b/src/net/sourceforge/plantuml/svek/image/EntityImageClass.java index 7620cb55d..f5037e5db 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageClass.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageClass.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.svek.image; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Rectangle2D; import java.util.EnumMap; import java.util.Map; diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageClassHeader.java b/src/net/sourceforge/plantuml/svek/image/EntityImageClassHeader.java index f7f01f93e..0a56d8b3f 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageClassHeader.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageClassHeader.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.svek.image; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.ColorParam; import net.sourceforge.plantuml.FontParam; diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageDescription.java b/src/net/sourceforge/plantuml/svek/image/EntityImageDescription.java index da1e5f1d7..7eab52b83 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageDescription.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageDescription.java @@ -36,7 +36,7 @@ */ package net.sourceforge.plantuml.svek.image; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.Collection; import java.util.EnumMap; import java.util.HashSet; @@ -66,6 +66,7 @@ import net.sourceforge.plantuml.graphic.SymbolContext; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.TextBlockUtils; import net.sourceforge.plantuml.graphic.USymbol; +import net.sourceforge.plantuml.graphic.USymbols; import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.graphic.color.Colors; import net.sourceforge.plantuml.style.PName; @@ -117,17 +118,17 @@ public class EntityImageDescription extends AbstractEntityImage { this.links = links; final Stereotype stereotype = entity.getStereotype(); USymbol symbol = getUSymbol(entity); - if (symbol == USymbol.FOLDER) + if (symbol == USymbols.FOLDER) this.shapeType = ShapeType.FOLDER; - else if (symbol == USymbol.HEXAGON) + else if (symbol == USymbols.HEXAGON) this.shapeType = ShapeType.HEXAGON; - else if (symbol == USymbol.INTERFACE) + else if (symbol == USymbols.INTERFACE) this.shapeType = getSkinParam().fixCircleLabelOverlapping() ? ShapeType.RECTANGLE_WITH_CIRCLE_INSIDE : ShapeType.RECTANGLE; else this.shapeType = ShapeType.RECTANGLE; - this.hideText = symbol == USymbol.INTERFACE; + this.hideText = symbol == USymbols.INTERFACE; this.url = entity.getUrl99(); diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageEmptyPackage.java b/src/net/sourceforge/plantuml/svek/image/EntityImageEmptyPackage.java index 41372ab83..088d6f8e2 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageEmptyPackage.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageEmptyPackage.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.svek.image; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.AlignmentParam; import net.sourceforge.plantuml.ColorParam; @@ -59,7 +59,7 @@ import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.TextBlockUtils; -import net.sourceforge.plantuml.graphic.USymbol; +import net.sourceforge.plantuml.graphic.USymbols; import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.graphic.color.Colors; import net.sourceforge.plantuml.style.PName; @@ -131,7 +131,7 @@ public class EntityImageEmptyPackage extends AbstractEntityImage { this.shadowing = getSkinParam().shadowing(getEntity().getStereotype()) ? 3 : 0; this.stroke = GeneralImageBuilder.getForcedStroke(getEntity().getStereotype(), getSkinParam()); this.roundCorner = 0; - this.back = Cluster.getBackColor(specificBackColor, skinParam, stereotype, sname, USymbol.PACKAGE); + this.back = Cluster.getBackColor(specificBackColor, skinParam, stereotype, sname, USymbols.PACKAGE); titleFontConfiguration = new FontConfiguration(getSkinParam(), FontParam.PACKAGE, stereotype); titleHorizontalAlignment = HorizontalAlignment.CENTER; } diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageGroup.java b/src/net/sourceforge/plantuml/svek/image/EntityImageGroup.java index ca3a83b4e..90c3c8656 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageGroup.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageGroup.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.svek.image; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.Dimension2DDouble; import net.sourceforge.plantuml.ISkinParam; diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageLollipopInterface.java b/src/net/sourceforge/plantuml/svek/image/EntityImageLollipopInterface.java index 948b97814..6e72d2146 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageLollipopInterface.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageLollipopInterface.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.svek.image; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.EnumMap; import java.util.Map; diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageLollipopInterfaceEye1.java b/src/net/sourceforge/plantuml/svek/image/EntityImageLollipopInterfaceEye1.java index aa050a478..cd011289d 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageLollipopInterfaceEye1.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageLollipopInterfaceEye1.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.svek.image; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Point2D; import java.util.List; diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageLollipopInterfaceEye2.java b/src/net/sourceforge/plantuml/svek/image/EntityImageLollipopInterfaceEye2.java index 70ef0ce8a..9dc0c71d5 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageLollipopInterfaceEye2.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageLollipopInterfaceEye2.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.svek.image; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.Objects; import net.sourceforge.plantuml.Dimension2DDouble; diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageMap.java b/src/net/sourceforge/plantuml/svek/image/EntityImageMap.java index 75794c885..874801ff4 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageMap.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageMap.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.svek.image; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.EnumMap; import java.util.Map; diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageNote.java b/src/net/sourceforge/plantuml/svek/image/EntityImageNote.java index 6dfd38cbb..cac5a128e 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageNote.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageNote.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.svek.image; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Line2D; import java.awt.geom.Point2D; import java.util.EnumMap; diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageNoteLink.java b/src/net/sourceforge/plantuml/svek/image/EntityImageNoteLink.java index 7f2a8a483..1a536c8e7 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageNoteLink.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageNoteLink.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.svek.image; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.Dimension2DDouble; import net.sourceforge.plantuml.ISkinParam; diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageObject.java b/src/net/sourceforge/plantuml/svek/image/EntityImageObject.java index a9ab9f899..b52ae6751 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageObject.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageObject.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.svek.image; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.EnumMap; import java.util.Map; diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImagePort.java b/src/net/sourceforge/plantuml/svek/image/EntityImagePort.java index 27cf22275..73fe6eda8 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImagePort.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImagePort.java @@ -36,7 +36,7 @@ package net.sourceforge.plantuml.svek.image; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Point2D; import net.sourceforge.plantuml.ColorParam; diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImagePseudoState.java b/src/net/sourceforge/plantuml/svek/image/EntityImagePseudoState.java index 6383ea92a..e4abb232d 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImagePseudoState.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImagePseudoState.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.svek.image; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.ColorParam; import net.sourceforge.plantuml.Dimension2DDouble; diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageState.java b/src/net/sourceforge/plantuml/svek/image/EntityImageState.java index 8c6e4cd41..e970024ba 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageState.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageState.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.svek.image; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.Collections; import net.sourceforge.plantuml.Dimension2DDouble; diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageState2.java b/src/net/sourceforge/plantuml/svek/image/EntityImageState2.java index e5c82d028..39f4a8bab 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageState2.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageState2.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.svek.image; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.SkinParamUtils; @@ -50,6 +50,7 @@ import net.sourceforge.plantuml.graphic.SymbolContext; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.TextBlockUtils; import net.sourceforge.plantuml.graphic.USymbol; +import net.sourceforge.plantuml.graphic.USymbols; import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; @@ -72,7 +73,7 @@ public class EntityImageState2 extends AbstractEntityImage { this.sname = sname; final Stereotype stereotype = entity.getStereotype(); - final USymbol symbol = USymbol.FRAME; + final USymbol symbol = USymbols.FRAME; final SymbolContext ctx; if (UseStyle.useBetaStyle()) { diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageStateBorder.java b/src/net/sourceforge/plantuml/svek/image/EntityImageStateBorder.java index 0d3e24ea2..c65146058 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageStateBorder.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageStateBorder.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.svek.image; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Point2D; import net.sourceforge.plantuml.ColorParam; diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageStateCommon.java b/src/net/sourceforge/plantuml/svek/image/EntityImageStateCommon.java index 598deed69..7c404fe7c 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageStateCommon.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageStateCommon.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.svek.image; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.ColorParam; import net.sourceforge.plantuml.FontParam; diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageStateEmptyDescription.java b/src/net/sourceforge/plantuml/svek/image/EntityImageStateEmptyDescription.java index 6d1959658..b1b1bf36c 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageStateEmptyDescription.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageStateEmptyDescription.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.svek.image; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.Dimension2DDouble; import net.sourceforge.plantuml.ISkinParam; diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageSynchroBar.java b/src/net/sourceforge/plantuml/svek/image/EntityImageSynchroBar.java index c7eea50e1..774ab0900 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageSynchroBar.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageSynchroBar.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.svek.image; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.ColorParam; import net.sourceforge.plantuml.Dimension2DDouble; diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageTips.java b/src/net/sourceforge/plantuml/svek/image/EntityImageTips.java index 8522d861d..ad24e2245 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageTips.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageTips.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.svek.image; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Point2D; import java.awt.geom.Rectangle2D; import java.util.Map; diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageUseCase.java b/src/net/sourceforge/plantuml/svek/image/EntityImageUseCase.java index 0000c0825..84423d014 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageUseCase.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageUseCase.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.svek.image; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Point2D; import java.util.EnumMap; import java.util.Map; diff --git a/src/net/sourceforge/plantuml/svek/image/Footprint.java b/src/net/sourceforge/plantuml/svek/image/Footprint.java index 697909d94..34e4795df 100644 --- a/src/net/sourceforge/plantuml/svek/image/Footprint.java +++ b/src/net/sourceforge/plantuml/svek/image/Footprint.java @@ -37,7 +37,7 @@ package net.sourceforge.plantuml.svek.image; import static net.sourceforge.plantuml.utils.ObjectUtils.instanceOfAny; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Point2D; import java.util.ArrayList; import java.util.List; diff --git a/src/net/sourceforge/plantuml/svek/image/Opale.java b/src/net/sourceforge/plantuml/svek/image/Opale.java index 17a9b04a5..45566b641 100644 --- a/src/net/sourceforge/plantuml/svek/image/Opale.java +++ b/src/net/sourceforge/plantuml/svek/image/Opale.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.svek.image; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Point2D; import net.sourceforge.plantuml.Dimension2DDouble; diff --git a/src/net/sourceforge/plantuml/svg/SvgGraphics.java b/src/net/sourceforge/plantuml/svg/SvgGraphics.java index ea997a85d..72c137f33 100644 --- a/src/net/sourceforge/plantuml/svg/SvgGraphics.java +++ b/src/net/sourceforge/plantuml/svg/SvgGraphics.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.svg; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.PathIterator; import java.awt.image.BufferedImage; import java.io.ByteArrayOutputStream; @@ -109,10 +109,12 @@ public class SvgGraphics { final private Element gRoot; private String fill = "black"; - private String fillDark = "black"; - private Collection classesForDarkness = new LinkedHashSet<>(); private String stroke = "black"; - private String strokeDark = "black"; + +// private Collection classesForDarkness = new LinkedHashSet<>(); +// private String strokeDark = "black"; +// private String fillDark = "black"; + private String strokeWidth; private String strokeDasharray = null; private final String backcolor; @@ -129,7 +131,7 @@ public class SvgGraphics { private final boolean svgDimensionStyle; private final LengthAdjust lengthAdjust; - private final boolean INTERACTIVE; + private final boolean interactive; final protected void ensureVisible(double x, double y) { if (x > maxX) { @@ -141,7 +143,8 @@ public class SvgGraphics { } public SvgGraphics(String backcolor, boolean svgDimensionStyle, Dimension2D minDim, double scale, String hover, - long seed, String preserveAspectRatio, LengthAdjust lengthAdjust, DarkStrategy darkStrategy, boolean interactive) { + long seed, String preserveAspectRatio, LengthAdjust lengthAdjust, DarkStrategy darkStrategy, + boolean interactive) { try { this.lengthAdjust = lengthAdjust; this.svgDimensionStyle = svgDimensionStyle; @@ -149,7 +152,7 @@ public class SvgGraphics { this.document = getDocument(); this.backcolor = backcolor; this.preserveAspectRatio = preserveAspectRatio; - this.INTERACTIVE = interactive; + this.interactive = interactive; ensureVisible(minDim.getWidth(), minDim.getHeight()); this.root = getRootNode(); @@ -165,7 +168,7 @@ public class SvgGraphics { if (hover != null) defs.appendChild(getPathHover(hover)); - if (INTERACTIVE) { + if (interactive) { final Element styles = getStylesForInteractiveMode(); if (styles != null) defs.appendChild(styles); @@ -192,33 +195,33 @@ public class SvgGraphics { return style; } - private Element getStylesForDarkness() { - final Element style = simpleElement("style"); - final StringBuilder text1 = new StringBuilder(); - final StringBuilder text2 = new StringBuilder("@media (prefers-color-scheme:dark) {"); - final Pattern p = Pattern.compile("^(\\w)_(\\w+)_(\\w+)$"); - for (String s : this.classesForDarkness) { - final Matcher m = p.matcher(s); - if (m.matches() == false) - throw new IllegalStateException(); - final String color1 = m.group(2); - final String color2 = m.group(3); - final String type = m.group(1); - if ("f".equals(type)) { - text1.append("*." + s + " {fill:#" + color1 + ";}"); - text2.append("*." + s + " {fill:#" + color2 + ";}"); - } else if ("s".equals(type)) { - text1.append("*." + s + " {stroke:#" + color1 + ";}"); - text2.append("*." + s + " {stroke:#" + color2 + ";}"); - } else - throw new IllegalStateException(); - } - text2.append("}"); - final CDATASection cdata = document.createCDATASection(text1.toString() + text2.toString()); - style.setAttribute("type", "text/css"); - style.appendChild(cdata); - return style; - } +// private Element getStylesForDarkness() { +// final Element style = simpleElement("style"); +// final StringBuilder text1 = new StringBuilder(); +// final StringBuilder text2 = new StringBuilder("@media (prefers-color-scheme:dark) {"); +// final Pattern p = Pattern.compile("^(\\w)_(\\w+)_(\\w+)$"); +// for (String s : this.classesForDarkness) { +// final Matcher m = p.matcher(s); +// if (m.matches() == false) +// throw new IllegalStateException(); +// final String color1 = m.group(2); +// final String color2 = m.group(3); +// final String type = m.group(1); +// if ("f".equals(type)) { +// text1.append("*." + s + " {fill:#" + color1 + ";}"); +// text2.append("*." + s + " {fill:#" + color2 + ";}"); +// } else if ("s".equals(type)) { +// text1.append("*." + s + " {stroke:#" + color1 + ";}"); +// text2.append("*." + s + " {stroke:#" + color2 + ";}"); +// } else +// throw new IllegalStateException(); +// } +// text2.append("}"); +// final CDATASection cdata = document.createCDATASection(text1.toString() + text2.toString()); +// style.setAttribute("type", "text/css"); +// style.appendChild(cdata); +// return style; +// } private Element getScriptForInteractiveMode() { final Element script = document.createElement("script"); @@ -376,22 +379,22 @@ public class SvgGraphics { public final void setFillColor(String fill) { this.fill = fill == null ? "none" : fill; - this.fillDark = this.fill; + // this.fillDark = this.fill; } public final void setFillColor(String fill, String fillDark) { this.fill = fill == null ? "none" : fill; - this.fillDark = fillDark == null ? "none" : fillDark; + // this.fillDark = fillDark == null ? "none" : fillDark; } public final void setStrokeColor(String stroke) { this.stroke = stroke == null ? "none" : stroke; - this.strokeDark = stroke; + // this.strokeDark = stroke; } public final void setStrokeColor(String stroke, String strokeDark) { this.stroke = stroke == null ? "none" : stroke; - this.strokeDark = strokeDark == null ? "none" : strokeDark; + // this.strokeDark = strokeDark == null ? "none" : strokeDark; } public final void setStrokeWidth(double strokeWidth, String strokeDasharray) { @@ -447,13 +450,13 @@ public class SvgGraphics { } private void manageDarkStroke(final Element elt) { - if (strokeDark != null && stroke.equals(strokeDark) == false) { - final String attribute = elt.getAttribute("class"); - if (attribute == null || attribute.length() == 0) - elt.setAttribute("class", getStrokeClassForDark()); - else - elt.setAttribute("class", attribute + " " + getStrokeClassForDark()); - } +// if (strokeDark != null && stroke.equals(strokeDark) == false) { +// final String attribute = elt.getAttribute("class"); +// if (attribute == null || attribute.length() == 0) +// elt.setAttribute("class", getStrokeClassForDark()); +// else +// elt.setAttribute("class", attribute + " " + getStrokeClassForDark()); +// } } public void svgLine(double x1, double y1, double x2, double y2, double deltaShadow) { @@ -475,8 +478,8 @@ public class SvgGraphics { private String getStyle() { final StringBuilder style = new StringBuilder(); - if (stroke.equals(strokeDark)) - style.append("stroke:" + stroke + ";"); + // if (stroke.equals(strokeDark)) + style.append("stroke:" + stroke + ";"); style.append("stroke-width:" + strokeWidth + ";"); if (fill.equals("#00000000")) style.append("fill:none;"); @@ -490,8 +493,8 @@ public class SvgGraphics { // https://forum.plantuml.net/12469/package-background-transparent-package-default-background?show=12479#c12479 private String getStyleSpecial() { final StringBuilder style = new StringBuilder(); - if (stroke.equals(strokeDark)) - style.append("stroke:" + stroke + ";"); + // if (stroke.equals(strokeDark)) + style.append("stroke:" + stroke + ";"); style.append("stroke-width:" + strokeWidth + ";"); if (fill.equals("#00000000")) style.append("fill:none;"); @@ -660,8 +663,8 @@ public class SvgGraphics { } private void createXmlInternal(OutputStream os) throws TransformerException { - if (this.classesForDarkness.size() > 0) - defs.appendChild(getStylesForDarkness()); +// if (this.classesForDarkness.size() > 0) +// defs.appendChild(getStylesForDarkness()); // Get a DOMSource object that represents the // Document object @@ -670,7 +673,7 @@ public class SvgGraphics { final int maxXscaled = (int) (maxX * scale); final int maxYscaled = (int) (maxY * scale); String style = "width:" + maxXscaled + "px;height:" + maxYscaled + "px;"; - if (this.classesForDarkness.size() == 0 && backcolor != null) + if (/*this.classesForDarkness.size() == 0 &&*/ backcolor != null) style += "background:" + backcolor + ";"; if (svgDimensionStyle) { @@ -752,31 +755,31 @@ public class SvgGraphics { } } - private String getFillClassForDark() { - final String result = "f_" + fill.toLowerCase().replaceAll("\\#", "") + "_" - + fillDark.toLowerCase().replaceAll("\\#", ""); - this.classesForDarkness.add(result); - return result; - } - - private String getStrokeClassForDark() { - final String result = "s_" + stroke.toLowerCase().replaceAll("\\#", "") + "_" - + strokeDark.toLowerCase().replaceAll("\\#", ""); - this.classesForDarkness.add(result); - return result; - } +// private String getFillClassForDark() { +// final String result = "f_" + fill.toLowerCase().replaceAll("\\#", "") + "_" +// + fillDark.toLowerCase().replaceAll("\\#", ""); +// this.classesForDarkness.add(result); +// return result; +// } +// +// private String getStrokeClassForDark() { +// final String result = "s_" + stroke.toLowerCase().replaceAll("\\#", "") + "_" +// + strokeDark.toLowerCase().replaceAll("\\#", ""); +// this.classesForDarkness.add(result); +// return result; +// } private void fillMe(Element elt) { if (fill.equals("#00000000")) return; - if (fill.equals(fillDark) == false) { - if (elt.getAttribute("class") != null && elt.getAttribute("class").length() != 0) - throw new IllegalStateException(); - - elt.setAttribute("class", getFillClassForDark()); - return; - } +// if (fill.equals(fillDark) == false) { +// if (elt.getAttribute("class") != null && elt.getAttribute("class").length() != 0) +// throw new IllegalStateException(); +// +// elt.setAttribute("class", getFillClassForDark()); +// return; +// } if (fill.matches("#[0-9A-Fa-f]{8}")) { elt.setAttribute("fill", fill.substring(0, 7)); @@ -980,7 +983,6 @@ public class SvgGraphics { return SignatureUtils.getMD5Hex(comment); } - public void addComment(String comment) { final String signature = getMD5Hex(comment); comment = "MD5=[" + signature + "]\n" + comment; @@ -1069,13 +1071,13 @@ public class SvgGraphics { public void startGroup(Map typeIdents) { if (typeIdents.isEmpty()) throw new IllegalArgumentException(); - + pendingAction.add(0, (Element) document.createElement("g")); for (Map.Entry typeIdent : typeIdents.entrySet()) { if (typeIdent.getKey() == UGroupType.ID) pendingAction.get(0).setAttribute("id", typeIdent.getValue()); - if (INTERACTIVE && typeIdent.getKey() == UGroupType.CLASS) + if (interactive && typeIdent.getKey() == UGroupType.CLASS) pendingAction.get(0).setAttribute("class", typeIdent.getValue()); } } diff --git a/src/net/sourceforge/plantuml/timingdiagram/PlayerAnalog.java b/src/net/sourceforge/plantuml/timingdiagram/PlayerAnalog.java index 20af2c5d3..19f1b85bf 100644 --- a/src/net/sourceforge/plantuml/timingdiagram/PlayerAnalog.java +++ b/src/net/sourceforge/plantuml/timingdiagram/PlayerAnalog.java @@ -34,7 +34,7 @@ */ package net.sourceforge.plantuml.timingdiagram; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Point2D; import java.util.Map; import java.util.Map.Entry; diff --git a/src/net/sourceforge/plantuml/timingdiagram/PlayerBinary.java b/src/net/sourceforge/plantuml/timingdiagram/PlayerBinary.java index e26d877fb..4cd568b2d 100644 --- a/src/net/sourceforge/plantuml/timingdiagram/PlayerBinary.java +++ b/src/net/sourceforge/plantuml/timingdiagram/PlayerBinary.java @@ -34,7 +34,7 @@ */ package net.sourceforge.plantuml.timingdiagram; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Point2D; import java.util.ArrayList; import java.util.List; diff --git a/src/net/sourceforge/plantuml/timingdiagram/PlayerClock.java b/src/net/sourceforge/plantuml/timingdiagram/PlayerClock.java index 4ee94c829..16717f21a 100644 --- a/src/net/sourceforge/plantuml/timingdiagram/PlayerClock.java +++ b/src/net/sourceforge/plantuml/timingdiagram/PlayerClock.java @@ -34,7 +34,7 @@ */ package net.sourceforge.plantuml.timingdiagram; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.math.BigDecimal; import net.sourceforge.plantuml.FontParam; diff --git a/src/net/sourceforge/plantuml/timingdiagram/PlayerRobustConcise.java b/src/net/sourceforge/plantuml/timingdiagram/PlayerRobustConcise.java index cfbf3e612..6c715a8c2 100644 --- a/src/net/sourceforge/plantuml/timingdiagram/PlayerRobustConcise.java +++ b/src/net/sourceforge/plantuml/timingdiagram/PlayerRobustConcise.java @@ -34,7 +34,7 @@ */ package net.sourceforge.plantuml.timingdiagram; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; diff --git a/src/net/sourceforge/plantuml/timingdiagram/TimeConstraint.java b/src/net/sourceforge/plantuml/timingdiagram/TimeConstraint.java index c6d9bc9ae..7d90e38bb 100644 --- a/src/net/sourceforge/plantuml/timingdiagram/TimeConstraint.java +++ b/src/net/sourceforge/plantuml/timingdiagram/TimeConstraint.java @@ -34,7 +34,7 @@ */ package net.sourceforge.plantuml.timingdiagram; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Point2D; import java.util.List; import java.util.Objects; diff --git a/src/net/sourceforge/plantuml/timingdiagram/TimingDiagram.java b/src/net/sourceforge/plantuml/timingdiagram/TimingDiagram.java index da6caeef7..d34e6b880 100644 --- a/src/net/sourceforge/plantuml/timingdiagram/TimingDiagram.java +++ b/src/net/sourceforge/plantuml/timingdiagram/TimingDiagram.java @@ -34,7 +34,7 @@ */ package net.sourceforge.plantuml.timingdiagram; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Rectangle2D; import java.io.IOException; import java.io.OutputStream; diff --git a/src/net/sourceforge/plantuml/timingdiagram/TimingRuler.java b/src/net/sourceforge/plantuml/timingdiagram/TimingRuler.java index ff9fc368f..dca0536a5 100644 --- a/src/net/sourceforge/plantuml/timingdiagram/TimingRuler.java +++ b/src/net/sourceforge/plantuml/timingdiagram/TimingRuler.java @@ -34,7 +34,7 @@ */ package net.sourceforge.plantuml.timingdiagram; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.math.BigDecimal; import java.util.Collection; import java.util.Comparator; diff --git a/src/net/sourceforge/plantuml/timingdiagram/graphic/Histogram.java b/src/net/sourceforge/plantuml/timingdiagram/graphic/Histogram.java index af38ba445..122375438 100644 --- a/src/net/sourceforge/plantuml/timingdiagram/graphic/Histogram.java +++ b/src/net/sourceforge/plantuml/timingdiagram/graphic/Histogram.java @@ -34,7 +34,7 @@ */ package net.sourceforge.plantuml.timingdiagram.graphic; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Point2D; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/net/sourceforge/plantuml/timingdiagram/graphic/PlayerFrame.java b/src/net/sourceforge/plantuml/timingdiagram/graphic/PlayerFrame.java index be6676f68..8996720e4 100644 --- a/src/net/sourceforge/plantuml/timingdiagram/graphic/PlayerFrame.java +++ b/src/net/sourceforge/plantuml/timingdiagram/graphic/PlayerFrame.java @@ -34,7 +34,7 @@ */ package net.sourceforge.plantuml.timingdiagram.graphic; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.UseStyle; diff --git a/src/net/sourceforge/plantuml/timingdiagram/graphic/Ribbon.java b/src/net/sourceforge/plantuml/timingdiagram/graphic/Ribbon.java index 3b02e63ba..bc0becc84 100644 --- a/src/net/sourceforge/plantuml/timingdiagram/graphic/Ribbon.java +++ b/src/net/sourceforge/plantuml/timingdiagram/graphic/Ribbon.java @@ -34,7 +34,7 @@ */ package net.sourceforge.plantuml.timingdiagram.graphic; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Point2D; import java.util.ArrayList; import java.util.List; diff --git a/src/net/sourceforge/plantuml/timingdiagram/graphic/TimeArrow.java b/src/net/sourceforge/plantuml/timingdiagram/graphic/TimeArrow.java index e0f5ab2cb..8833355fe 100644 --- a/src/net/sourceforge/plantuml/timingdiagram/graphic/TimeArrow.java +++ b/src/net/sourceforge/plantuml/timingdiagram/graphic/TimeArrow.java @@ -34,7 +34,7 @@ */ package net.sourceforge.plantuml.timingdiagram.graphic; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Point2D; import net.sourceforge.plantuml.ISkinSimple; diff --git a/src/net/sourceforge/plantuml/ugraphic/AbstractPlacementStrategy.java b/src/net/sourceforge/plantuml/ugraphic/AbstractPlacementStrategy.java index b41804be0..3eafcdf15 100644 --- a/src/net/sourceforge/plantuml/ugraphic/AbstractPlacementStrategy.java +++ b/src/net/sourceforge/plantuml/ugraphic/AbstractPlacementStrategy.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.ugraphic; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.Iterator; import java.util.LinkedHashMap; import java.util.Map; diff --git a/src/net/sourceforge/plantuml/ugraphic/ImageBuilder.java b/src/net/sourceforge/plantuml/ugraphic/ImageBuilder.java index de4b0768a..9823b2a69 100644 --- a/src/net/sourceforge/plantuml/ugraphic/ImageBuilder.java +++ b/src/net/sourceforge/plantuml/ugraphic/ImageBuilder.java @@ -41,7 +41,7 @@ import java.awt.Color; import java.awt.Graphics2D; import java.awt.Image; import java.awt.geom.AffineTransform; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.image.BufferedImage; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -273,7 +273,8 @@ public class ImageBuilder { / 96.0; if (scaleFactor <= 0) throw new IllegalStateException("Bad scaleFactor"); - UGraphic ug = createUGraphic(fileFormatOption, dim, animationArg, dx, dy, scaleFactor, titledDiagram !=null ? titledDiagram.getPragma() : new Pragma()); + UGraphic ug = createUGraphic(fileFormatOption, dim, animationArg, dx, dy, scaleFactor, + titledDiagram == null ? new Pragma() : titledDiagram.getPragma()); maybeDrawBorder(ug, dim); if (randomPixel) { drawRandomPoint(ug); @@ -402,17 +403,12 @@ public class ImageBuilder { } private UGraphic createUGraphic(FileFormatOption option, final Dimension2D dim, Animation animationArg, double dx, - double dy, double scaleFactor, Pragma pragma) { + double dy, double scaleFactor, Pragma pragma) { switch (option.getFileFormat()) { case PNG: return createUGraphicPNG(scaleFactor, dim, animationArg, dx, dy, option.getWatermark()); case SVG: - final boolean interactive; - if (!pragma.isDefine("svginteractive")) - interactive = false; - else { - interactive = Boolean.valueOf(pragma.getValue("svginteractive")); - } + final boolean interactive = "true".equalsIgnoreCase(pragma.getValue("svginteractive")); return createUGraphicSVG(scaleFactor, dim, interactive); case EPS: return new UGraphicEps(backcolor, colorMapper, stringBounder, EpsStrategy.getDefault2()); diff --git a/src/net/sourceforge/plantuml/ugraphic/LimitFinder.java b/src/net/sourceforge/plantuml/ugraphic/LimitFinder.java index fc29b3098..28af00e93 100644 --- a/src/net/sourceforge/plantuml/ugraphic/LimitFinder.java +++ b/src/net/sourceforge/plantuml/ugraphic/LimitFinder.java @@ -37,7 +37,7 @@ package net.sourceforge.plantuml.ugraphic; import static net.sourceforge.plantuml.utils.ObjectUtils.instanceOfAny; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.activitydiagram3.ftile.CenteredText; import net.sourceforge.plantuml.graphic.SpecialText; diff --git a/src/net/sourceforge/plantuml/ugraphic/MinMax.java b/src/net/sourceforge/plantuml/ugraphic/MinMax.java index 8907a20d3..efa941985 100644 --- a/src/net/sourceforge/plantuml/ugraphic/MinMax.java +++ b/src/net/sourceforge/plantuml/ugraphic/MinMax.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.ugraphic; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Point2D; import net.sourceforge.plantuml.Dimension2DDouble; diff --git a/src/net/sourceforge/plantuml/ugraphic/MinMaxMutable.java b/src/net/sourceforge/plantuml/ugraphic/MinMaxMutable.java index 6c74191bd..ec6bee539 100644 --- a/src/net/sourceforge/plantuml/ugraphic/MinMaxMutable.java +++ b/src/net/sourceforge/plantuml/ugraphic/MinMaxMutable.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.ugraphic; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.Dimension2DDouble; diff --git a/src/net/sourceforge/plantuml/ugraphic/PlacementStrategyVisibility.java b/src/net/sourceforge/plantuml/ugraphic/PlacementStrategyVisibility.java index d57cc22fd..6d70b1f2a 100644 --- a/src/net/sourceforge/plantuml/ugraphic/PlacementStrategyVisibility.java +++ b/src/net/sourceforge/plantuml/ugraphic/PlacementStrategyVisibility.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.ugraphic; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Point2D; import java.util.Iterator; import java.util.LinkedHashMap; diff --git a/src/net/sourceforge/plantuml/ugraphic/PlacementStrategyX1X2.java b/src/net/sourceforge/plantuml/ugraphic/PlacementStrategyX1X2.java index 84a44b9f1..a757ffba7 100644 --- a/src/net/sourceforge/plantuml/ugraphic/PlacementStrategyX1X2.java +++ b/src/net/sourceforge/plantuml/ugraphic/PlacementStrategyX1X2.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.ugraphic; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Point2D; import java.util.LinkedHashMap; import java.util.Map; diff --git a/src/net/sourceforge/plantuml/ugraphic/PlacementStrategyX1Y2Y3.java b/src/net/sourceforge/plantuml/ugraphic/PlacementStrategyX1Y2Y3.java index 493df1dce..f6da5075c 100644 --- a/src/net/sourceforge/plantuml/ugraphic/PlacementStrategyX1Y2Y3.java +++ b/src/net/sourceforge/plantuml/ugraphic/PlacementStrategyX1Y2Y3.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.ugraphic; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Point2D; import java.util.Iterator; import java.util.LinkedHashMap; diff --git a/src/net/sourceforge/plantuml/ugraphic/PlacementStrategyY1Y2.java b/src/net/sourceforge/plantuml/ugraphic/PlacementStrategyY1Y2.java index c3bb40b83..424f18834 100644 --- a/src/net/sourceforge/plantuml/ugraphic/PlacementStrategyY1Y2.java +++ b/src/net/sourceforge/plantuml/ugraphic/PlacementStrategyY1Y2.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.ugraphic; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Point2D; import java.util.LinkedHashMap; import java.util.Map; diff --git a/src/net/sourceforge/plantuml/ugraphic/PlacementStrategyY1Y2Center.java b/src/net/sourceforge/plantuml/ugraphic/PlacementStrategyY1Y2Center.java index b5f98dfb1..dd2579514 100644 --- a/src/net/sourceforge/plantuml/ugraphic/PlacementStrategyY1Y2Center.java +++ b/src/net/sourceforge/plantuml/ugraphic/PlacementStrategyY1Y2Center.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.ugraphic; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Point2D; import java.util.LinkedHashMap; import java.util.Map; diff --git a/src/net/sourceforge/plantuml/ugraphic/PlacementStrategyY1Y2Left.java b/src/net/sourceforge/plantuml/ugraphic/PlacementStrategyY1Y2Left.java index 88d3f8353..186b45a47 100644 --- a/src/net/sourceforge/plantuml/ugraphic/PlacementStrategyY1Y2Left.java +++ b/src/net/sourceforge/plantuml/ugraphic/PlacementStrategyY1Y2Left.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.ugraphic; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Point2D; import java.util.LinkedHashMap; import java.util.Map; diff --git a/src/net/sourceforge/plantuml/ugraphic/PlacementStrategyY1Y2Right.java b/src/net/sourceforge/plantuml/ugraphic/PlacementStrategyY1Y2Right.java index b2eae23a9..f8c1a7f22 100644 --- a/src/net/sourceforge/plantuml/ugraphic/PlacementStrategyY1Y2Right.java +++ b/src/net/sourceforge/plantuml/ugraphic/PlacementStrategyY1Y2Right.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.ugraphic; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Point2D; import java.util.LinkedHashMap; import java.util.Map; diff --git a/src/net/sourceforge/plantuml/ugraphic/TextBlockInEllipse.java b/src/net/sourceforge/plantuml/ugraphic/TextBlockInEllipse.java index d9d9c29a1..1741daef2 100644 --- a/src/net/sourceforge/plantuml/ugraphic/TextBlockInEllipse.java +++ b/src/net/sourceforge/plantuml/ugraphic/TextBlockInEllipse.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.ugraphic; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Point2D; import net.sourceforge.plantuml.graphic.AbstractTextBlock; diff --git a/src/net/sourceforge/plantuml/ugraphic/TextLimitFinder.java b/src/net/sourceforge/plantuml/ugraphic/TextLimitFinder.java index 2bc68a60a..394bb58c6 100644 --- a/src/net/sourceforge/plantuml/ugraphic/TextLimitFinder.java +++ b/src/net/sourceforge/plantuml/ugraphic/TextLimitFinder.java @@ -37,7 +37,7 @@ package net.sourceforge.plantuml.ugraphic; import static net.sourceforge.plantuml.utils.ObjectUtils.instanceOfAny; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.ugraphic.color.HColor; diff --git a/src/net/sourceforge/plantuml/ugraphic/UEllipse.java b/src/net/sourceforge/plantuml/ugraphic/UEllipse.java index f18bb3bea..49babdb09 100644 --- a/src/net/sourceforge/plantuml/ugraphic/UEllipse.java +++ b/src/net/sourceforge/plantuml/ugraphic/UEllipse.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.ugraphic; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Point2D; import net.sourceforge.plantuml.Dimension2DDouble; diff --git a/src/net/sourceforge/plantuml/ugraphic/UEmpty.java b/src/net/sourceforge/plantuml/ugraphic/UEmpty.java index 4eb90f444..a80a2b6c2 100644 --- a/src/net/sourceforge/plantuml/ugraphic/UEmpty.java +++ b/src/net/sourceforge/plantuml/ugraphic/UEmpty.java @@ -34,7 +34,7 @@ */ package net.sourceforge.plantuml.ugraphic; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; public class UEmpty implements UShape { diff --git a/src/net/sourceforge/plantuml/ugraphic/UGraphicStencil.java b/src/net/sourceforge/plantuml/ugraphic/UGraphicStencil.java index 576e3816a..1f947393e 100644 --- a/src/net/sourceforge/plantuml/ugraphic/UGraphicStencil.java +++ b/src/net/sourceforge/plantuml/ugraphic/UGraphicStencil.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.ugraphic; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.creole.Stencil; import net.sourceforge.plantuml.graphic.StringBounder; diff --git a/src/net/sourceforge/plantuml/ugraphic/UHorizontalLine.java b/src/net/sourceforge/plantuml/ugraphic/UHorizontalLine.java index ebcc1a5c8..5a0974a8e 100644 --- a/src/net/sourceforge/plantuml/ugraphic/UHorizontalLine.java +++ b/src/net/sourceforge/plantuml/ugraphic/UHorizontalLine.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.ugraphic; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.creole.Stencil; import net.sourceforge.plantuml.graphic.StringBounder; diff --git a/src/net/sourceforge/plantuml/ugraphic/URectangle.java b/src/net/sourceforge/plantuml/ugraphic/URectangle.java index 24faa6079..d6bf636bc 100644 --- a/src/net/sourceforge/plantuml/ugraphic/URectangle.java +++ b/src/net/sourceforge/plantuml/ugraphic/URectangle.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.ugraphic; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.ugraphic.comp.CompressionMode; diff --git a/src/net/sourceforge/plantuml/ugraphic/USegmentType.java b/src/net/sourceforge/plantuml/ugraphic/USegmentType.java index 81c62467d..2a8e47593 100644 --- a/src/net/sourceforge/plantuml/ugraphic/USegmentType.java +++ b/src/net/sourceforge/plantuml/ugraphic/USegmentType.java @@ -38,16 +38,17 @@ package net.sourceforge.plantuml.ugraphic; import java.awt.geom.PathIterator; import java.util.EnumSet; -import net.sourceforge.plantuml.ugraphic.arc.ExtendedPathIterator; - public enum USegmentType { + SEG_MOVETO(PathIterator.SEG_MOVETO), // SEG_LINETO(PathIterator.SEG_LINETO), // SEG_QUADTO(PathIterator.SEG_QUADTO), // SEG_CUBICTO(PathIterator.SEG_CUBICTO), // SEG_CLOSE(PathIterator.SEG_CLOSE), // - SEG_ARCTO(ExtendedPathIterator.SEG_ARCTO);// + SEG_ARCTO(4321);// + + final public static int SEG_ARCTO_VALUE = 4321; private final int code; diff --git a/src/net/sourceforge/plantuml/ugraphic/UTranslate.java b/src/net/sourceforge/plantuml/ugraphic/UTranslate.java index 2735160bf..ca8d4825d 100644 --- a/src/net/sourceforge/plantuml/ugraphic/UTranslate.java +++ b/src/net/sourceforge/plantuml/ugraphic/UTranslate.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.ugraphic; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Point2D; import java.awt.geom.Rectangle2D; diff --git a/src/net/sourceforge/plantuml/ugraphic/color/AbstractColorMapper.java b/src/net/sourceforge/plantuml/ugraphic/color/AbstractColorMapper.java index b78cc3cf3..78ae2e529 100644 --- a/src/net/sourceforge/plantuml/ugraphic/color/AbstractColorMapper.java +++ b/src/net/sourceforge/plantuml/ugraphic/color/AbstractColorMapper.java @@ -37,36 +37,36 @@ package net.sourceforge.plantuml.ugraphic.color; import java.awt.Color; -import net.sourceforge.plantuml.svek.DotStringFactory; +import net.sourceforge.plantuml.StringUtils; public abstract class AbstractColorMapper implements ColorMapper { final public String toRGB(HColor hcolor) { - if (hcolor == null) { + if (hcolor == null) return null; - } + final Color color = toColor(hcolor); - return DotStringFactory.sharp000000(color.getRGB()); + return StringUtils.sharp000000(color.getRGB()); } final public String toSvg(HColor hcolor) { - if (hcolor == null) { + if (hcolor == null) return "none"; - } + if (hcolor instanceof HColorBackground) { hcolor = ((HColorBackground) hcolor).getBack(); // Thread.dumpStack(); // System.exit(0); // return toHtml(result); } - if (HColorUtils.isTransparent(hcolor)) { + if (HColorUtils.isTransparent(hcolor)) return "#00000000"; - } + final Color color = toColor(hcolor); final int alpha = color.getAlpha(); - if (alpha == 255) { + if (alpha == 255) return toRGB(hcolor); - } + String s = "0" + Integer.toHexString(alpha).toUpperCase(); s = s.substring(s.length() - 2); return toRGB(hcolor) + s; diff --git a/src/net/sourceforge/plantuml/ugraphic/color/HColorSimple.java b/src/net/sourceforge/plantuml/ugraphic/color/HColorSimple.java index ee2fb486d..d97fad724 100644 --- a/src/net/sourceforge/plantuml/ugraphic/color/HColorSimple.java +++ b/src/net/sourceforge/plantuml/ugraphic/color/HColorSimple.java @@ -37,7 +37,7 @@ package net.sourceforge.plantuml.ugraphic.color; import java.awt.Color; -import net.sourceforge.plantuml.svek.DotStringFactory; +import net.sourceforge.plantuml.StringUtils; public class HColorSimple extends HColorAbstract implements HColor { @@ -74,7 +74,7 @@ public class HColorSimple extends HColorAbstract implements HColor { return "transparent"; if (color.getAlpha() == 255) - return DotStringFactory.sharp000000(color.getRGB()); + return StringUtils.sharp000000(color.getRGB()); return "#" + Integer.toHexString(color.getRGB()); } diff --git a/src/net/sourceforge/plantuml/ugraphic/comp/PiecewiseAffineOnXorYBuilder.java b/src/net/sourceforge/plantuml/ugraphic/comp/PiecewiseAffineOnXorYBuilder.java index 0e7f1c6b6..af0f3f10f 100644 --- a/src/net/sourceforge/plantuml/ugraphic/comp/PiecewiseAffineOnXorYBuilder.java +++ b/src/net/sourceforge/plantuml/ugraphic/comp/PiecewiseAffineOnXorYBuilder.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.ugraphic.comp; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.Dimension2DDouble; import net.sourceforge.plantuml.graphic.AbstractTextBlock; diff --git a/src/net/sourceforge/plantuml/ugraphic/debug/StringBounderDebug.java b/src/net/sourceforge/plantuml/ugraphic/debug/StringBounderDebug.java index a7ba81ce6..99bcc732f 100644 --- a/src/net/sourceforge/plantuml/ugraphic/debug/StringBounderDebug.java +++ b/src/net/sourceforge/plantuml/ugraphic/debug/StringBounderDebug.java @@ -34,7 +34,7 @@ */ package net.sourceforge.plantuml.ugraphic.debug; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.Random; import net.sourceforge.plantuml.Dimension2DDouble; diff --git a/src/net/sourceforge/plantuml/ugraphic/debug/UGraphicDebug.java b/src/net/sourceforge/plantuml/ugraphic/debug/UGraphicDebug.java index e00ff3291..6669500e6 100644 --- a/src/net/sourceforge/plantuml/ugraphic/debug/UGraphicDebug.java +++ b/src/net/sourceforge/plantuml/ugraphic/debug/UGraphicDebug.java @@ -37,7 +37,7 @@ package net.sourceforge.plantuml.ugraphic.debug; import static java.nio.charset.StandardCharsets.UTF_8; import java.awt.Color; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Point2D; import java.io.IOException; import java.io.OutputStream; diff --git a/src/net/sourceforge/plantuml/ugraphic/g2d/DriverPathG2d.java b/src/net/sourceforge/plantuml/ugraphic/g2d/DriverPathG2d.java index f7e7a7d0e..96a688735 100644 --- a/src/net/sourceforge/plantuml/ugraphic/g2d/DriverPathG2d.java +++ b/src/net/sourceforge/plantuml/ugraphic/g2d/DriverPathG2d.java @@ -44,7 +44,6 @@ import net.sourceforge.plantuml.ugraphic.UParam; import net.sourceforge.plantuml.ugraphic.UPath; import net.sourceforge.plantuml.ugraphic.USegment; import net.sourceforge.plantuml.ugraphic.USegmentType; -import net.sourceforge.plantuml.ugraphic.arc.ExtendedGeneralPath; import net.sourceforge.plantuml.ugraphic.color.ColorMapper; import net.sourceforge.plantuml.ugraphic.color.HColor; import net.sourceforge.plantuml.ugraphic.color.HColorGradient; diff --git a/src/net/sourceforge/plantuml/ugraphic/g2d/DriverTextAsPathG2d.java b/src/net/sourceforge/plantuml/ugraphic/g2d/DriverTextAsPathG2d.java index f22c39cfc..bf343aee3 100644 --- a/src/net/sourceforge/plantuml/ugraphic/g2d/DriverTextAsPathG2d.java +++ b/src/net/sourceforge/plantuml/ugraphic/g2d/DriverTextAsPathG2d.java @@ -44,7 +44,7 @@ import java.awt.FontMetrics; import java.awt.Graphics2D; import java.awt.GraphicsEnvironment; import java.awt.font.TextLayout; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Rectangle2D; import net.sourceforge.plantuml.EnsureVisible; diff --git a/src/net/sourceforge/plantuml/ugraphic/g2d/DriverTextG2d.java b/src/net/sourceforge/plantuml/ugraphic/g2d/DriverTextG2d.java index 06c4eb6ca..316629af1 100644 --- a/src/net/sourceforge/plantuml/ugraphic/g2d/DriverTextG2d.java +++ b/src/net/sourceforge/plantuml/ugraphic/g2d/DriverTextG2d.java @@ -44,7 +44,7 @@ import java.awt.GradientPaint; import java.awt.Graphics2D; import java.awt.RenderingHints; import java.awt.geom.AffineTransform; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Rectangle2D; import java.util.List; diff --git a/src/net/sourceforge/plantuml/ugraphic/arc/ExtendedGeneralPath.java b/src/net/sourceforge/plantuml/ugraphic/g2d/ExtendedGeneralPath.java similarity index 99% rename from src/net/sourceforge/plantuml/ugraphic/arc/ExtendedGeneralPath.java rename to src/net/sourceforge/plantuml/ugraphic/g2d/ExtendedGeneralPath.java index 9608eb462..7942322e8 100644 --- a/src/net/sourceforge/plantuml/ugraphic/arc/ExtendedGeneralPath.java +++ b/src/net/sourceforge/plantuml/ugraphic/g2d/ExtendedGeneralPath.java @@ -33,7 +33,7 @@ * * */ -package net.sourceforge.plantuml.ugraphic.arc; +package net.sourceforge.plantuml.ugraphic.g2d; /* diff --git a/src/net/sourceforge/plantuml/ugraphic/arc/ExtendedPathIterator.java b/src/net/sourceforge/plantuml/ugraphic/g2d/ExtendedPathIterator.java similarity index 92% rename from src/net/sourceforge/plantuml/ugraphic/arc/ExtendedPathIterator.java rename to src/net/sourceforge/plantuml/ugraphic/g2d/ExtendedPathIterator.java index 765e26d40..306917e72 100644 --- a/src/net/sourceforge/plantuml/ugraphic/arc/ExtendedPathIterator.java +++ b/src/net/sourceforge/plantuml/ugraphic/g2d/ExtendedPathIterator.java @@ -33,10 +33,12 @@ * * */ -package net.sourceforge.plantuml.ugraphic.arc; +package net.sourceforge.plantuml.ugraphic.g2d; import java.awt.geom.PathIterator; +import net.sourceforge.plantuml.ugraphic.USegmentType; + /* * @@ -105,7 +107,7 @@ public interface ExtendedPathIterator { * largeArcFlag is zero if the smaller of the two arcs are to be used. sweepFlag is zero if the 'left' branch is * taken one otherwise. x and y are the destination for the ellipse. */ - int SEG_ARCTO = 4321; + int SEG_ARCTO = USegmentType.SEG_ARCTO_VALUE; /** * The winding rule constant for specifying an even-odd rule for determining the interior of a path. The even-odd @@ -115,10 +117,11 @@ public interface ExtendedPathIterator { int WIND_EVEN_ODD = PathIterator.WIND_EVEN_ODD; /** - * The winding rule constant for specifying a non-zero rule for determining the interior of a path. The non-zero - * rule specifies that a point lies inside the path if a ray drawn in any direction from that point to infinity is - * crossed by path segments a different number of times in the counter-clockwise direction than the clockwise - * direction. + * The winding rule constant for specifying a non-zero rule for determining the + * interior of a path. The non-zero rule specifies that a point lies inside the + * path if a ray drawn in any direction from that point to infinity is crossed + * by path segments a different number of times in the counter-clockwise + * direction than the clockwise direction. */ int WIND_NON_ZERO = PathIterator.WIND_NON_ZERO; diff --git a/src/net/sourceforge/plantuml/ugraphic/svg/DriverTextSvg.java b/src/net/sourceforge/plantuml/ugraphic/svg/DriverTextSvg.java index 7317af987..3c17eb150 100644 --- a/src/net/sourceforge/plantuml/ugraphic/svg/DriverTextSvg.java +++ b/src/net/sourceforge/plantuml/ugraphic/svg/DriverTextSvg.java @@ -34,7 +34,7 @@ */ package net.sourceforge.plantuml.ugraphic.svg; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.graphic.FontConfiguration; diff --git a/src/net/sourceforge/plantuml/ugraphic/svg/UGraphicSvg.java b/src/net/sourceforge/plantuml/ugraphic/svg/UGraphicSvg.java index c30609995..70919111f 100644 --- a/src/net/sourceforge/plantuml/ugraphic/svg/UGraphicSvg.java +++ b/src/net/sourceforge/plantuml/ugraphic/svg/UGraphicSvg.java @@ -34,7 +34,7 @@ */ package net.sourceforge.plantuml.ugraphic.svg; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.io.IOException; import java.io.OutputStream; import java.util.Map; diff --git a/src/net/sourceforge/plantuml/ugraphic/txt/UGraphicTxt.java b/src/net/sourceforge/plantuml/ugraphic/txt/UGraphicTxt.java index a8746ea01..5faa1473f 100644 --- a/src/net/sourceforge/plantuml/ugraphic/txt/UGraphicTxt.java +++ b/src/net/sourceforge/plantuml/ugraphic/txt/UGraphicTxt.java @@ -36,7 +36,7 @@ package net.sourceforge.plantuml.ugraphic.txt; import static java.nio.charset.StandardCharsets.UTF_8; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.io.IOException; import java.io.OutputStream; import java.io.PrintStream; diff --git a/src/net/sourceforge/plantuml/ugraphic/visio/DriverTextVdx.java b/src/net/sourceforge/plantuml/ugraphic/visio/DriverTextVdx.java index 15c3de828..e30824e24 100644 --- a/src/net/sourceforge/plantuml/ugraphic/visio/DriverTextVdx.java +++ b/src/net/sourceforge/plantuml/ugraphic/visio/DriverTextVdx.java @@ -34,7 +34,7 @@ */ package net.sourceforge.plantuml.ugraphic.visio; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.graphic.FontConfiguration; diff --git a/src/net/sourceforge/plantuml/utils/MathUtils.java b/src/net/sourceforge/plantuml/utils/MathUtils.java index 76079d2a2..3ab653d28 100644 --- a/src/net/sourceforge/plantuml/utils/MathUtils.java +++ b/src/net/sourceforge/plantuml/utils/MathUtils.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.utils; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Point2D; import net.sourceforge.plantuml.Dimension2DDouble; diff --git a/src/net/sourceforge/plantuml/version/Version.java b/src/net/sourceforge/plantuml/version/Version.java index dfa1a8b24..3a1ed81fa 100644 --- a/src/net/sourceforge/plantuml/version/Version.java +++ b/src/net/sourceforge/plantuml/version/Version.java @@ -80,7 +80,7 @@ public class Version { } public static int beta() { - final int beta = 5; + final int beta = 6; return beta; } diff --git a/src/net/sourceforge/plantuml/wbs/Fork.java b/src/net/sourceforge/plantuml/wbs/Fork.java index 196a4c4e7..31c509802 100644 --- a/src/net/sourceforge/plantuml/wbs/Fork.java +++ b/src/net/sourceforge/plantuml/wbs/Fork.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.wbs; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.ArrayList; import java.util.List; diff --git a/src/net/sourceforge/plantuml/wbs/ITFComposed.java b/src/net/sourceforge/plantuml/wbs/ITFComposed.java index 1d4242539..8a2cd6fa4 100644 --- a/src/net/sourceforge/plantuml/wbs/ITFComposed.java +++ b/src/net/sourceforge/plantuml/wbs/ITFComposed.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.wbs; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Point2D; import java.util.ArrayList; import java.util.Collection; diff --git a/src/net/sourceforge/plantuml/wbs/ITFLeaf.java b/src/net/sourceforge/plantuml/wbs/ITFLeaf.java index c321f5e32..73f8d97dd 100644 --- a/src/net/sourceforge/plantuml/wbs/ITFLeaf.java +++ b/src/net/sourceforge/plantuml/wbs/ITFLeaf.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.wbs; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Point2D; import net.sourceforge.plantuml.ISkinParam; diff --git a/src/net/sourceforge/plantuml/wbs/WBSDiagram.java b/src/net/sourceforge/plantuml/wbs/WBSDiagram.java index 467013e48..4d5d6a508 100644 --- a/src/net/sourceforge/plantuml/wbs/WBSDiagram.java +++ b/src/net/sourceforge/plantuml/wbs/WBSDiagram.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.wbs; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Rectangle2D; import java.io.IOException; import java.io.OutputStream; diff --git a/src/net/sourceforge/plantuml/wire/Block.java b/src/net/sourceforge/plantuml/wire/Block.java index fbeaa7438..9a7a042c3 100644 --- a/src/net/sourceforge/plantuml/wire/Block.java +++ b/src/net/sourceforge/plantuml/wire/Block.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.wire; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; diff --git a/src/net/sourceforge/plantuml/wire/WBlock.java b/src/net/sourceforge/plantuml/wire/WBlock.java index 9fd03fc07..f338d060a 100644 --- a/src/net/sourceforge/plantuml/wire/WBlock.java +++ b/src/net/sourceforge/plantuml/wire/WBlock.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.wire; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.util.ArrayList; import java.util.List; import java.util.StringTokenizer; diff --git a/src/net/sourceforge/plantuml/wire/WLinkHorizontal.java b/src/net/sourceforge/plantuml/wire/WLinkHorizontal.java index 2c0fb87cc..f2cfd8e00 100644 --- a/src/net/sourceforge/plantuml/wire/WLinkHorizontal.java +++ b/src/net/sourceforge/plantuml/wire/WLinkHorizontal.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.wire; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.cucadiagram.Display; diff --git a/src/net/sourceforge/plantuml/wire/WireDiagram.java b/src/net/sourceforge/plantuml/wire/WireDiagram.java index 3c4b75aa9..05ff66b1d 100644 --- a/src/net/sourceforge/plantuml/wire/WireDiagram.java +++ b/src/net/sourceforge/plantuml/wire/WireDiagram.java @@ -35,7 +35,7 @@ */ package net.sourceforge.plantuml.wire; -import java.awt.geom.Dimension2D; +import net.sourceforge.plantuml.awt.geom.Dimension2D; import java.awt.geom.Rectangle2D; import java.io.IOException; import java.io.OutputStream;