diff --git a/pom.xml b/pom.xml index 8edccf078..27ceffa8e 100644 --- a/pom.xml +++ b/pom.xml @@ -30,13 +30,12 @@ Script Author: Julien Eluard --> - + 4.0.0 net.sourceforge.plantuml plantuml - 8046-SNAPSHOT + 8048-SNAPSHOT jar PlantUML diff --git a/src/net/sourceforge/plantuml/AbstractPSystem.java b/src/net/sourceforge/plantuml/AbstractPSystem.java index 9a2dfdcd2..e4a8b52cc 100644 --- a/src/net/sourceforge/plantuml/AbstractPSystem.java +++ b/src/net/sourceforge/plantuml/AbstractPSystem.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19886 $ * */ package net.sourceforge.plantuml; diff --git a/src/net/sourceforge/plantuml/AlignParam.java b/src/net/sourceforge/plantuml/AlignParam.java index 4a76d64a0..522b357ae 100644 --- a/src/net/sourceforge/plantuml/AlignParam.java +++ b/src/net/sourceforge/plantuml/AlignParam.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6549 $ * */ package net.sourceforge.plantuml; diff --git a/src/net/sourceforge/plantuml/AnimatedGifEncoder.java b/src/net/sourceforge/plantuml/AnimatedGifEncoder.java index 6c0fb0dae..c639241b6 100644 --- a/src/net/sourceforge/plantuml/AnimatedGifEncoder.java +++ b/src/net/sourceforge/plantuml/AnimatedGifEncoder.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 13805 $ * */ package net.sourceforge.plantuml; diff --git a/src/net/sourceforge/plantuml/Annotated.java b/src/net/sourceforge/plantuml/Annotated.java index 99700d04b..b2a65731a 100644 --- a/src/net/sourceforge/plantuml/Annotated.java +++ b/src/net/sourceforge/plantuml/Annotated.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 18790 $ * */ package net.sourceforge.plantuml; diff --git a/src/net/sourceforge/plantuml/AnnotatedWorker.java b/src/net/sourceforge/plantuml/AnnotatedWorker.java index 0ec62e60f..434245866 100644 --- a/src/net/sourceforge/plantuml/AnnotatedWorker.java +++ b/src/net/sourceforge/plantuml/AnnotatedWorker.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 18790 $ * */ package net.sourceforge.plantuml; diff --git a/src/net/sourceforge/plantuml/BaseFile.java b/src/net/sourceforge/plantuml/BaseFile.java index 332446e22..0c36e7b56 100644 --- a/src/net/sourceforge/plantuml/BaseFile.java +++ b/src/net/sourceforge/plantuml/BaseFile.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 9997 $ * */ package net.sourceforge.plantuml; diff --git a/src/net/sourceforge/plantuml/BasicEnsureVisible.java b/src/net/sourceforge/plantuml/BasicEnsureVisible.java index 1615571a1..9d5afb845 100644 --- a/src/net/sourceforge/plantuml/BasicEnsureVisible.java +++ b/src/net/sourceforge/plantuml/BasicEnsureVisible.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 7903 $ * */ package net.sourceforge.plantuml; diff --git a/src/net/sourceforge/plantuml/BlockUml.java b/src/net/sourceforge/plantuml/BlockUml.java index d11cddf05..ff77ca1c5 100644 --- a/src/net/sourceforge/plantuml/BlockUml.java +++ b/src/net/sourceforge/plantuml/BlockUml.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4780 $ * */ package net.sourceforge.plantuml; diff --git a/src/net/sourceforge/plantuml/BlockUmlBuilder.java b/src/net/sourceforge/plantuml/BlockUmlBuilder.java index 0f79d23ea..ce7e31cdf 100644 --- a/src/net/sourceforge/plantuml/BlockUmlBuilder.java +++ b/src/net/sourceforge/plantuml/BlockUmlBuilder.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4952 $ * */ package net.sourceforge.plantuml; diff --git a/src/net/sourceforge/plantuml/CMapData.java b/src/net/sourceforge/plantuml/CMapData.java index 3c213021a..6a3f6de12 100644 --- a/src/net/sourceforge/plantuml/CMapData.java +++ b/src/net/sourceforge/plantuml/CMapData.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8368 $ * */ package net.sourceforge.plantuml; diff --git a/src/net/sourceforge/plantuml/CharSequence2.java b/src/net/sourceforge/plantuml/CharSequence2.java index 0aa22ae10..0883a89cd 100644 --- a/src/net/sourceforge/plantuml/CharSequence2.java +++ b/src/net/sourceforge/plantuml/CharSequence2.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3824 $ * */ package net.sourceforge.plantuml; diff --git a/src/net/sourceforge/plantuml/CharSequence2Impl.java b/src/net/sourceforge/plantuml/CharSequence2Impl.java index 8caa69622..6234498ae 100644 --- a/src/net/sourceforge/plantuml/CharSequence2Impl.java +++ b/src/net/sourceforge/plantuml/CharSequence2Impl.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3824 $ * */ package net.sourceforge.plantuml; diff --git a/src/net/sourceforge/plantuml/ColorParam.java b/src/net/sourceforge/plantuml/ColorParam.java index 5cb8401c1..07034c0bc 100644 --- a/src/net/sourceforge/plantuml/ColorParam.java +++ b/src/net/sourceforge/plantuml/ColorParam.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19978 $ * */ package net.sourceforge.plantuml; diff --git a/src/net/sourceforge/plantuml/CounterOutputStream.java b/src/net/sourceforge/plantuml/CounterOutputStream.java index 25a25a922..b325fc4b7 100644 --- a/src/net/sourceforge/plantuml/CounterOutputStream.java +++ b/src/net/sourceforge/plantuml/CounterOutputStream.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4780 $ * */ package net.sourceforge.plantuml; diff --git a/src/net/sourceforge/plantuml/Dimension2DDouble.java b/src/net/sourceforge/plantuml/Dimension2DDouble.java index f28e971db..2d1cee408 100644 --- a/src/net/sourceforge/plantuml/Dimension2DDouble.java +++ b/src/net/sourceforge/plantuml/Dimension2DDouble.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml; diff --git a/src/net/sourceforge/plantuml/DirWatcher.java b/src/net/sourceforge/plantuml/DirWatcher.java index 8bb76c396..f62d2ebee 100644 --- a/src/net/sourceforge/plantuml/DirWatcher.java +++ b/src/net/sourceforge/plantuml/DirWatcher.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml; diff --git a/src/net/sourceforge/plantuml/DirWatcher2.java b/src/net/sourceforge/plantuml/DirWatcher2.java index 0d1edeca5..06d5d748f 100644 --- a/src/net/sourceforge/plantuml/DirWatcher2.java +++ b/src/net/sourceforge/plantuml/DirWatcher2.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6070 $ * */ package net.sourceforge.plantuml; diff --git a/src/net/sourceforge/plantuml/Direction.java b/src/net/sourceforge/plantuml/Direction.java index 5cc402274..e88b88bcb 100644 --- a/src/net/sourceforge/plantuml/Direction.java +++ b/src/net/sourceforge/plantuml/Direction.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3828 $ * */ package net.sourceforge.plantuml; diff --git a/src/net/sourceforge/plantuml/EmbededDiagram.java b/src/net/sourceforge/plantuml/EmbededDiagram.java index 1bdc7dcf1..fef2cf57c 100644 --- a/src/net/sourceforge/plantuml/EmbededDiagram.java +++ b/src/net/sourceforge/plantuml/EmbededDiagram.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5982 $ * */ package net.sourceforge.plantuml; diff --git a/src/net/sourceforge/plantuml/EmptyImageBuilder.java b/src/net/sourceforge/plantuml/EmptyImageBuilder.java index 0932048f5..618099df8 100644 --- a/src/net/sourceforge/plantuml/EmptyImageBuilder.java +++ b/src/net/sourceforge/plantuml/EmptyImageBuilder.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml; @@ -47,20 +44,19 @@ public class EmptyImageBuilder { private final BufferedImage im; private final Graphics2D g2d; - static final private int LIMIT = GraphvizUtils.getenvImageLimit(); - + public EmptyImageBuilder(double width, double height, Color background) { this((int) width, (int) height, background); } public EmptyImageBuilder(int width, int height, Color background) { - if (width > LIMIT) { + if (width > GraphvizUtils.getenvImageLimit()) { Log.info("Width too large " + width); - width = LIMIT; + width = GraphvizUtils.getenvImageLimit(); } - if (height > LIMIT) { + if (height > GraphvizUtils.getenvImageLimit()) { Log.info("Height too large " + height); - height = LIMIT; + height = GraphvizUtils.getenvImageLimit(); } Log.info("Creating image " + width + "x" + height); im = new BufferedImage(width, height, background == null ? BufferedImage.TYPE_INT_ARGB diff --git a/src/net/sourceforge/plantuml/EnsureVisible.java b/src/net/sourceforge/plantuml/EnsureVisible.java index f2f907de7..341c426f5 100644 --- a/src/net/sourceforge/plantuml/EnsureVisible.java +++ b/src/net/sourceforge/plantuml/EnsureVisible.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 7903 $ * */ package net.sourceforge.plantuml; diff --git a/src/net/sourceforge/plantuml/ErrorUml.java b/src/net/sourceforge/plantuml/ErrorUml.java index 4419152bc..6c3d3f662 100644 --- a/src/net/sourceforge/plantuml/ErrorUml.java +++ b/src/net/sourceforge/plantuml/ErrorUml.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3824 $ * */ package net.sourceforge.plantuml; diff --git a/src/net/sourceforge/plantuml/ErrorUmlType.java b/src/net/sourceforge/plantuml/ErrorUmlType.java index 564e81ee1..f11344e00 100644 --- a/src/net/sourceforge/plantuml/ErrorUmlType.java +++ b/src/net/sourceforge/plantuml/ErrorUmlType.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3824 $ * */ package net.sourceforge.plantuml; diff --git a/src/net/sourceforge/plantuml/FileFormat.java b/src/net/sourceforge/plantuml/FileFormat.java index 6b15cbfe6..f0236af77 100644 --- a/src/net/sourceforge/plantuml/FileFormat.java +++ b/src/net/sourceforge/plantuml/FileFormat.java @@ -23,18 +23,25 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 9786 $ * */ package net.sourceforge.plantuml; +import java.awt.FontMetrics; +import java.awt.Graphics2D; +import java.awt.geom.Dimension2D; +import java.awt.geom.Rectangle2D; +import java.awt.image.BufferedImage; import java.io.File; +import net.sourceforge.plantuml.braille.BrailleCharFactory; +import net.sourceforge.plantuml.braille.UGraphicBraille; +import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.ugraphic.UFont; + /** * Format for output files generated by PlantUML. * @@ -42,8 +49,7 @@ import java.io.File; * */ public enum FileFormat { - PNG, SVG, EPS, EPS_TEXT, ATXT, UTXT, XMI_STANDARD, XMI_STAR, XMI_ARGO, SCXML, - PDF, MJPEG, ANIMATED_GIF, HTML, HTML5, VDX, LATEX, LATEX_NO_PREAMBLE, BASE64, BRAILLE_PNG; + PNG, SVG, EPS, EPS_TEXT, ATXT, UTXT, XMI_STANDARD, XMI_STAR, XMI_ARGO, SCXML, PDF, MJPEG, ANIMATED_GIF, HTML, HTML5, VDX, LATEX, LATEX_NO_PREAMBLE, BASE64, BRAILLE_PNG; /** * Returns the file format to be used for that format. @@ -72,6 +78,34 @@ public enum FileFormat { return "." + StringUtils.goLowerCase(name()); } + final static BufferedImage imDummy = new BufferedImage(10, 10, BufferedImage.TYPE_INT_RGB); + final static Graphics2D gg = imDummy.createGraphics(); + + public StringBounder getDefaultStringBounder() { + if (this == BRAILLE_PNG) { + return new StringBounder() { + public Dimension2D calculateDimension(UFont font, String text) { + final int nb = BrailleCharFactory.build(text).size(); + final double quanta = UGraphicBraille.QUANTA; + final double height = 5 * quanta; + final double width = 3 * nb * quanta + 1; + return new Dimension2DDouble(width, height); + } + }; + + } + return new StringBounder() { + public Dimension2D calculateDimension(UFont font, String text) { + // Log.info("FileFormat::calculateDimension text="+text); + final FontMetrics fm = gg.getFontMetrics(font.getFont()); + // Log.info("FileFormat::calculateDimension fm="+fm); + final Rectangle2D rect = fm.getStringBounds(text, gg); + // Log.info("FileFormat::calculateDimension rect="+rect); + return new Dimension2DDouble(rect.getWidth(), rect.getHeight()); + } + }; + } + /** * Check if this file format is Encapsulated PostScript. * diff --git a/src/net/sourceforge/plantuml/FileFormatOption.java b/src/net/sourceforge/plantuml/FileFormatOption.java index daf1135a5..f9e13396b 100644 --- a/src/net/sourceforge/plantuml/FileFormatOption.java +++ b/src/net/sourceforge/plantuml/FileFormatOption.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5333 $ * */ package net.sourceforge.plantuml; @@ -45,6 +42,7 @@ import net.sourceforge.plantuml.graphic.HtmlColor; import net.sourceforge.plantuml.graphic.HtmlColorGradient; import net.sourceforge.plantuml.graphic.HtmlColorSimple; import net.sourceforge.plantuml.graphic.HtmlColorTransparent; +import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.ugraphic.ColorMapper; import net.sourceforge.plantuml.ugraphic.ColorMapperIdentity; import net.sourceforge.plantuml.ugraphic.UChangeBackColor; @@ -76,6 +74,10 @@ public class FileFormatOption implements Serializable { this(fileFormat, null, true, false, "_top", false); } + public StringBounder getDefaultStringBounder() { + return fileFormat.getDefaultStringBounder(); + } + public String getSvgLinkTarget() { return svgLinkTarget; } diff --git a/src/net/sourceforge/plantuml/FileGroup.java b/src/net/sourceforge/plantuml/FileGroup.java index 478a52bb7..cc3b14834 100644 --- a/src/net/sourceforge/plantuml/FileGroup.java +++ b/src/net/sourceforge/plantuml/FileGroup.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19880 $ * */ package net.sourceforge.plantuml; diff --git a/src/net/sourceforge/plantuml/FileSystem.java b/src/net/sourceforge/plantuml/FileSystem.java index 30455fe6e..e323700fc 100644 --- a/src/net/sourceforge/plantuml/FileSystem.java +++ b/src/net/sourceforge/plantuml/FileSystem.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19896 $ * */ package net.sourceforge.plantuml; diff --git a/src/net/sourceforge/plantuml/FileUtils.java b/src/net/sourceforge/plantuml/FileUtils.java index 0a2cb2d8f..d58deb996 100644 --- a/src/net/sourceforge/plantuml/FileUtils.java +++ b/src/net/sourceforge/plantuml/FileUtils.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5749 $ * */ package net.sourceforge.plantuml; diff --git a/src/net/sourceforge/plantuml/FileWatcher.java b/src/net/sourceforge/plantuml/FileWatcher.java index da6438e81..11b921e9c 100644 --- a/src/net/sourceforge/plantuml/FileWatcher.java +++ b/src/net/sourceforge/plantuml/FileWatcher.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5794 $ * */ package net.sourceforge.plantuml; diff --git a/src/net/sourceforge/plantuml/FontParam.java b/src/net/sourceforge/plantuml/FontParam.java index cb1db1fa8..9ceddeafc 100644 --- a/src/net/sourceforge/plantuml/FontParam.java +++ b/src/net/sourceforge/plantuml/FontParam.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml; diff --git a/src/net/sourceforge/plantuml/GeneratedImage.java b/src/net/sourceforge/plantuml/GeneratedImage.java index 0544abb13..80a8810bd 100644 --- a/src/net/sourceforge/plantuml/GeneratedImage.java +++ b/src/net/sourceforge/plantuml/GeneratedImage.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml; diff --git a/src/net/sourceforge/plantuml/GeneratedImageImpl.java b/src/net/sourceforge/plantuml/GeneratedImageImpl.java index eacac30dd..1142ea974 100644 --- a/src/net/sourceforge/plantuml/GeneratedImageImpl.java +++ b/src/net/sourceforge/plantuml/GeneratedImageImpl.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 12869 $ * */ package net.sourceforge.plantuml; diff --git a/src/net/sourceforge/plantuml/Hideable.java b/src/net/sourceforge/plantuml/Hideable.java index e39ffcae4..26c27f803 100644 --- a/src/net/sourceforge/plantuml/Hideable.java +++ b/src/net/sourceforge/plantuml/Hideable.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3835 $ * */ package net.sourceforge.plantuml; diff --git a/src/net/sourceforge/plantuml/ISkinParam.java b/src/net/sourceforge/plantuml/ISkinParam.java index 570b67751..aa9dfcb17 100644 --- a/src/net/sourceforge/plantuml/ISkinParam.java +++ b/src/net/sourceforge/plantuml/ISkinParam.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml; diff --git a/src/net/sourceforge/plantuml/ISkinSimple.java b/src/net/sourceforge/plantuml/ISkinSimple.java index bdb4371cd..d9017ea21 100644 --- a/src/net/sourceforge/plantuml/ISkinSimple.java +++ b/src/net/sourceforge/plantuml/ISkinSimple.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml; diff --git a/src/net/sourceforge/plantuml/ISourceFileReader.java b/src/net/sourceforge/plantuml/ISourceFileReader.java index 48cbb39f2..da05f649e 100644 --- a/src/net/sourceforge/plantuml/ISourceFileReader.java +++ b/src/net/sourceforge/plantuml/ISourceFileReader.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4771 $ * */ package net.sourceforge.plantuml; diff --git a/src/net/sourceforge/plantuml/LineConfigurable.java b/src/net/sourceforge/plantuml/LineConfigurable.java index f42b55526..eddcc5487 100644 --- a/src/net/sourceforge/plantuml/LineConfigurable.java +++ b/src/net/sourceforge/plantuml/LineConfigurable.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3835 $ * */ package net.sourceforge.plantuml; diff --git a/src/net/sourceforge/plantuml/LineLocation.java b/src/net/sourceforge/plantuml/LineLocation.java index a7c07c424..446fc54a2 100644 --- a/src/net/sourceforge/plantuml/LineLocation.java +++ b/src/net/sourceforge/plantuml/LineLocation.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3824 $ * */ package net.sourceforge.plantuml; diff --git a/src/net/sourceforge/plantuml/LineLocationImpl.java b/src/net/sourceforge/plantuml/LineLocationImpl.java index 10471de9e..8f12ac2ca 100644 --- a/src/net/sourceforge/plantuml/LineLocationImpl.java +++ b/src/net/sourceforge/plantuml/LineLocationImpl.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3824 $ * */ package net.sourceforge.plantuml; diff --git a/src/net/sourceforge/plantuml/LineParam.java b/src/net/sourceforge/plantuml/LineParam.java index 1ae2ed262..efc1bbd42 100644 --- a/src/net/sourceforge/plantuml/LineParam.java +++ b/src/net/sourceforge/plantuml/LineParam.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 7715 $ * */ package net.sourceforge.plantuml; diff --git a/src/net/sourceforge/plantuml/Log.java b/src/net/sourceforge/plantuml/Log.java index 0876b4572..6abc08c85 100644 --- a/src/net/sourceforge/plantuml/Log.java +++ b/src/net/sourceforge/plantuml/Log.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml; diff --git a/src/net/sourceforge/plantuml/NamedOutputStream.java b/src/net/sourceforge/plantuml/NamedOutputStream.java index dc56cee45..a52e5cff4 100644 --- a/src/net/sourceforge/plantuml/NamedOutputStream.java +++ b/src/net/sourceforge/plantuml/NamedOutputStream.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 9997 $ * */ package net.sourceforge.plantuml; diff --git a/src/net/sourceforge/plantuml/NewpagedDiagram.java b/src/net/sourceforge/plantuml/NewpagedDiagram.java index 671e3defc..1f6641e06 100644 --- a/src/net/sourceforge/plantuml/NewpagedDiagram.java +++ b/src/net/sourceforge/plantuml/NewpagedDiagram.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 10459 $ * */ package net.sourceforge.plantuml; diff --git a/src/net/sourceforge/plantuml/NullOutputStream.java b/src/net/sourceforge/plantuml/NullOutputStream.java index d013421c3..c31fa04eb 100644 --- a/src/net/sourceforge/plantuml/NullOutputStream.java +++ b/src/net/sourceforge/plantuml/NullOutputStream.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4780 $ * */ package net.sourceforge.plantuml; diff --git a/src/net/sourceforge/plantuml/Option.java b/src/net/sourceforge/plantuml/Option.java index 2268ee8aa..a9ecd68d1 100644 --- a/src/net/sourceforge/plantuml/Option.java +++ b/src/net/sourceforge/plantuml/Option.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19880 $ * */ package net.sourceforge.plantuml; @@ -113,6 +110,8 @@ public class Option { setFileFormat(FileFormat.ATXT); } else if (s.equalsIgnoreCase("-tutxt") || s.equalsIgnoreCase("-utxt")) { setFileFormat(FileFormat.UTXT); + } else if (s.equalsIgnoreCase("-braille") || s.equalsIgnoreCase("-tbraille")) { + setFileFormat(FileFormat.BRAILLE_PNG); } else if (s.equalsIgnoreCase("-png") || s.equalsIgnoreCase("-tpng")) { setFileFormat(FileFormat.PNG); } else if (s.equalsIgnoreCase("-vdx") || s.equalsIgnoreCase("-tvdx")) { diff --git a/src/net/sourceforge/plantuml/OptionFlags.java b/src/net/sourceforge/plantuml/OptionFlags.java index b7eac28fb..7f80ba402 100644 --- a/src/net/sourceforge/plantuml/OptionFlags.java +++ b/src/net/sourceforge/plantuml/OptionFlags.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 20057 $ * */ package net.sourceforge.plantuml; diff --git a/src/net/sourceforge/plantuml/OptionPrint.java b/src/net/sourceforge/plantuml/OptionPrint.java index 66093ad4c..5150f9a0c 100644 --- a/src/net/sourceforge/plantuml/OptionPrint.java +++ b/src/net/sourceforge/plantuml/OptionPrint.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19885 $ * */ package net.sourceforge.plantuml; diff --git a/src/net/sourceforge/plantuml/PSystemBuilder.java b/src/net/sourceforge/plantuml/PSystemBuilder.java index c3c6bf1e7..bf6180be9 100644 --- a/src/net/sourceforge/plantuml/PSystemBuilder.java +++ b/src/net/sourceforge/plantuml/PSystemBuilder.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5207 $ * */ package net.sourceforge.plantuml; diff --git a/src/net/sourceforge/plantuml/PSystemError.java b/src/net/sourceforge/plantuml/PSystemError.java index 743c5b14d..9be6fde8f 100644 --- a/src/net/sourceforge/plantuml/PSystemError.java +++ b/src/net/sourceforge/plantuml/PSystemError.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ */ package net.sourceforge.plantuml; diff --git a/src/net/sourceforge/plantuml/PSystemUtils.java b/src/net/sourceforge/plantuml/PSystemUtils.java index 3a9262483..4b0ddb027 100644 --- a/src/net/sourceforge/plantuml/PSystemUtils.java +++ b/src/net/sourceforge/plantuml/PSystemUtils.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 9997 $ * */ package net.sourceforge.plantuml; diff --git a/src/net/sourceforge/plantuml/Pragma.java b/src/net/sourceforge/plantuml/Pragma.java index 1b5eeadd8..5daeb8e4b 100644 --- a/src/net/sourceforge/plantuml/Pragma.java +++ b/src/net/sourceforge/plantuml/Pragma.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3835 $ * */ package net.sourceforge.plantuml; diff --git a/src/net/sourceforge/plantuml/Removeable.java b/src/net/sourceforge/plantuml/Removeable.java index a713d5e8d..4cce81765 100644 --- a/src/net/sourceforge/plantuml/Removeable.java +++ b/src/net/sourceforge/plantuml/Removeable.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3835 $ * */ package net.sourceforge.plantuml; diff --git a/src/net/sourceforge/plantuml/Run.java b/src/net/sourceforge/plantuml/Run.java index 332d2df56..1eab75e2a 100644 --- a/src/net/sourceforge/plantuml/Run.java +++ b/src/net/sourceforge/plantuml/Run.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19462 $ * */ package net.sourceforge.plantuml; diff --git a/src/net/sourceforge/plantuml/Scale.java b/src/net/sourceforge/plantuml/Scale.java index 3322e1548..818286b17 100644 --- a/src/net/sourceforge/plantuml/Scale.java +++ b/src/net/sourceforge/plantuml/Scale.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5401 $ * */ package net.sourceforge.plantuml; diff --git a/src/net/sourceforge/plantuml/ScaleHeight.java b/src/net/sourceforge/plantuml/ScaleHeight.java index 75313b551..b7cd07521 100644 --- a/src/net/sourceforge/plantuml/ScaleHeight.java +++ b/src/net/sourceforge/plantuml/ScaleHeight.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5401 $ * */ package net.sourceforge.plantuml; diff --git a/src/net/sourceforge/plantuml/ScaleMaxHeight.java b/src/net/sourceforge/plantuml/ScaleMaxHeight.java index e72cb7371..5c0e69ef0 100644 --- a/src/net/sourceforge/plantuml/ScaleMaxHeight.java +++ b/src/net/sourceforge/plantuml/ScaleMaxHeight.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5401 $ * */ package net.sourceforge.plantuml; diff --git a/src/net/sourceforge/plantuml/ScaleMaxWidth.java b/src/net/sourceforge/plantuml/ScaleMaxWidth.java index b1b4e6467..679bda1ce 100644 --- a/src/net/sourceforge/plantuml/ScaleMaxWidth.java +++ b/src/net/sourceforge/plantuml/ScaleMaxWidth.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5401 $ * */ package net.sourceforge.plantuml; diff --git a/src/net/sourceforge/plantuml/ScaleMaxWidthAndHeight.java b/src/net/sourceforge/plantuml/ScaleMaxWidthAndHeight.java index da4d4e70c..dbe1964ea 100644 --- a/src/net/sourceforge/plantuml/ScaleMaxWidthAndHeight.java +++ b/src/net/sourceforge/plantuml/ScaleMaxWidthAndHeight.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5401 $ * */ package net.sourceforge.plantuml; diff --git a/src/net/sourceforge/plantuml/ScaleSimple.java b/src/net/sourceforge/plantuml/ScaleSimple.java index 5c5936fed..617287f25 100644 --- a/src/net/sourceforge/plantuml/ScaleSimple.java +++ b/src/net/sourceforge/plantuml/ScaleSimple.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5401 $ * */ package net.sourceforge.plantuml; diff --git a/src/net/sourceforge/plantuml/ScaleWidth.java b/src/net/sourceforge/plantuml/ScaleWidth.java index 2211f8377..d85e4f081 100644 --- a/src/net/sourceforge/plantuml/ScaleWidth.java +++ b/src/net/sourceforge/plantuml/ScaleWidth.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5401 $ * */ package net.sourceforge.plantuml; diff --git a/src/net/sourceforge/plantuml/ScaleWidthAndHeight.java b/src/net/sourceforge/plantuml/ScaleWidthAndHeight.java index b75fa355d..c7e1d9324 100644 --- a/src/net/sourceforge/plantuml/ScaleWidthAndHeight.java +++ b/src/net/sourceforge/plantuml/ScaleWidthAndHeight.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5401 $ * */ package net.sourceforge.plantuml; diff --git a/src/net/sourceforge/plantuml/SignatureUtils.java b/src/net/sourceforge/plantuml/SignatureUtils.java index add5f377c..00386b63f 100644 --- a/src/net/sourceforge/plantuml/SignatureUtils.java +++ b/src/net/sourceforge/plantuml/SignatureUtils.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19670 $ * */ package net.sourceforge.plantuml; diff --git a/src/net/sourceforge/plantuml/SingleLine.java b/src/net/sourceforge/plantuml/SingleLine.java index 478d6ab5a..676da11a8 100644 --- a/src/net/sourceforge/plantuml/SingleLine.java +++ b/src/net/sourceforge/plantuml/SingleLine.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml; diff --git a/src/net/sourceforge/plantuml/SkinParam.java b/src/net/sourceforge/plantuml/SkinParam.java index e5545b00a..867fbebc0 100644 --- a/src/net/sourceforge/plantuml/SkinParam.java +++ b/src/net/sourceforge/plantuml/SkinParam.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 20003 $ * */ package net.sourceforge.plantuml; diff --git a/src/net/sourceforge/plantuml/SkinParamBackcolored.java b/src/net/sourceforge/plantuml/SkinParamBackcolored.java index d8cccd42c..c31207909 100644 --- a/src/net/sourceforge/plantuml/SkinParamBackcolored.java +++ b/src/net/sourceforge/plantuml/SkinParamBackcolored.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4246 $ * */ package net.sourceforge.plantuml; diff --git a/src/net/sourceforge/plantuml/SkinParamBackcoloredReference.java b/src/net/sourceforge/plantuml/SkinParamBackcoloredReference.java index d15abb30b..5ec03719d 100644 --- a/src/net/sourceforge/plantuml/SkinParamBackcoloredReference.java +++ b/src/net/sourceforge/plantuml/SkinParamBackcoloredReference.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4246 $ * */ package net.sourceforge.plantuml; diff --git a/src/net/sourceforge/plantuml/SkinParamColors.java b/src/net/sourceforge/plantuml/SkinParamColors.java index 0f3485de2..923cd3d05 100644 --- a/src/net/sourceforge/plantuml/SkinParamColors.java +++ b/src/net/sourceforge/plantuml/SkinParamColors.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4246 $ * */ package net.sourceforge.plantuml; diff --git a/src/net/sourceforge/plantuml/SkinParamDelegator.java b/src/net/sourceforge/plantuml/SkinParamDelegator.java index a83604141..d06c50e6b 100644 --- a/src/net/sourceforge/plantuml/SkinParamDelegator.java +++ b/src/net/sourceforge/plantuml/SkinParamDelegator.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4246 $ * */ package net.sourceforge.plantuml; diff --git a/src/net/sourceforge/plantuml/SkinParamForceColor.java b/src/net/sourceforge/plantuml/SkinParamForceColor.java index 8e98bef0d..e508bfa37 100644 --- a/src/net/sourceforge/plantuml/SkinParamForceColor.java +++ b/src/net/sourceforge/plantuml/SkinParamForceColor.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4246 $ * */ package net.sourceforge.plantuml; diff --git a/src/net/sourceforge/plantuml/SkinParamForecolored.java b/src/net/sourceforge/plantuml/SkinParamForecolored.java index 21484110b..7658634ad 100644 --- a/src/net/sourceforge/plantuml/SkinParamForecolored.java +++ b/src/net/sourceforge/plantuml/SkinParamForecolored.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4246 $ * */ package net.sourceforge.plantuml; diff --git a/src/net/sourceforge/plantuml/SkinParamSameClassWidth.java b/src/net/sourceforge/plantuml/SkinParamSameClassWidth.java index 7d25e6b9e..5d72a1ea3 100644 --- a/src/net/sourceforge/plantuml/SkinParamSameClassWidth.java +++ b/src/net/sourceforge/plantuml/SkinParamSameClassWidth.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4246 $ * */ package net.sourceforge.plantuml; diff --git a/src/net/sourceforge/plantuml/SkinParamUtils.java b/src/net/sourceforge/plantuml/SkinParamUtils.java index c4afdb0d5..638619b7b 100644 --- a/src/net/sourceforge/plantuml/SkinParamUtils.java +++ b/src/net/sourceforge/plantuml/SkinParamUtils.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 9423 $ * */ package net.sourceforge.plantuml; diff --git a/src/net/sourceforge/plantuml/SourceFileReader.java b/src/net/sourceforge/plantuml/SourceFileReader.java index be852d1e3..e27b134da 100644 --- a/src/net/sourceforge/plantuml/SourceFileReader.java +++ b/src/net/sourceforge/plantuml/SourceFileReader.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4771 $ * */ package net.sourceforge.plantuml; diff --git a/src/net/sourceforge/plantuml/SourceFileReader2.java b/src/net/sourceforge/plantuml/SourceFileReader2.java index 5918b6076..e51d2daed 100644 --- a/src/net/sourceforge/plantuml/SourceFileReader2.java +++ b/src/net/sourceforge/plantuml/SourceFileReader2.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4771 $ * */ package net.sourceforge.plantuml; diff --git a/src/net/sourceforge/plantuml/SourceStringReader.java b/src/net/sourceforge/plantuml/SourceStringReader.java index d958cc7f4..504d6acd9 100644 --- a/src/net/sourceforge/plantuml/SourceStringReader.java +++ b/src/net/sourceforge/plantuml/SourceStringReader.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4041 $ * */ package net.sourceforge.plantuml; diff --git a/src/net/sourceforge/plantuml/SpecificBackcolorable.java b/src/net/sourceforge/plantuml/SpecificBackcolorable.java index 04030f22c..f8b4150fc 100644 --- a/src/net/sourceforge/plantuml/SpecificBackcolorable.java +++ b/src/net/sourceforge/plantuml/SpecificBackcolorable.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3835 $ * */ package net.sourceforge.plantuml; diff --git a/src/net/sourceforge/plantuml/SpriteContainer.java b/src/net/sourceforge/plantuml/SpriteContainer.java index c511e3e41..128140887 100644 --- a/src/net/sourceforge/plantuml/SpriteContainer.java +++ b/src/net/sourceforge/plantuml/SpriteContainer.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml; diff --git a/src/net/sourceforge/plantuml/SpriteContainerEmpty.java b/src/net/sourceforge/plantuml/SpriteContainerEmpty.java index 18ff7e6ba..45667fe31 100644 --- a/src/net/sourceforge/plantuml/SpriteContainerEmpty.java +++ b/src/net/sourceforge/plantuml/SpriteContainerEmpty.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml; diff --git a/src/net/sourceforge/plantuml/StringUtils.java b/src/net/sourceforge/plantuml/StringUtils.java index aad38b7db..ccaae422b 100644 --- a/src/net/sourceforge/plantuml/StringUtils.java +++ b/src/net/sourceforge/plantuml/StringUtils.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 13958 $ * */ package net.sourceforge.plantuml; diff --git a/src/net/sourceforge/plantuml/UmlDiagram.java b/src/net/sourceforge/plantuml/UmlDiagram.java index 3b168088d..b92123209 100644 --- a/src/net/sourceforge/plantuml/UmlDiagram.java +++ b/src/net/sourceforge/plantuml/UmlDiagram.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19863 $ * */ package net.sourceforge.plantuml; diff --git a/src/net/sourceforge/plantuml/UmlDiagramType.java b/src/net/sourceforge/plantuml/UmlDiagramType.java index ece1e1023..4e205bf97 100644 --- a/src/net/sourceforge/plantuml/UmlDiagramType.java +++ b/src/net/sourceforge/plantuml/UmlDiagramType.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml; diff --git a/src/net/sourceforge/plantuml/Url.java b/src/net/sourceforge/plantuml/Url.java index 8164abcc9..40ce1f994 100644 --- a/src/net/sourceforge/plantuml/Url.java +++ b/src/net/sourceforge/plantuml/Url.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6396 $ * */ package net.sourceforge.plantuml; diff --git a/src/net/sourceforge/plantuml/UrlBuilder.java b/src/net/sourceforge/plantuml/UrlBuilder.java index e132252be..c1a4cc850 100644 --- a/src/net/sourceforge/plantuml/UrlBuilder.java +++ b/src/net/sourceforge/plantuml/UrlBuilder.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6396 $ * */ package net.sourceforge.plantuml; diff --git a/src/net/sourceforge/plantuml/acearth/PSystemXearth.java b/src/net/sourceforge/plantuml/acearth/PSystemXearth.java index 4b23d84dd..d16e1794e 100644 --- a/src/net/sourceforge/plantuml/acearth/PSystemXearth.java +++ b/src/net/sourceforge/plantuml/acearth/PSystemXearth.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4041 $ * */ package net.sourceforge.plantuml.acearth; diff --git a/src/net/sourceforge/plantuml/acearth/PSystemXearthFactory.java b/src/net/sourceforge/plantuml/acearth/PSystemXearthFactory.java index 8be764800..215250737 100644 --- a/src/net/sourceforge/plantuml/acearth/PSystemXearthFactory.java +++ b/src/net/sourceforge/plantuml/acearth/PSystemXearthFactory.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3837 $ * */ package net.sourceforge.plantuml.acearth; diff --git a/src/net/sourceforge/plantuml/activitydiagram/ActivityDiagram.java b/src/net/sourceforge/plantuml/activitydiagram/ActivityDiagram.java index 55f1df696..b4e68da1a 100644 --- a/src/net/sourceforge/plantuml/activitydiagram/ActivityDiagram.java +++ b/src/net/sourceforge/plantuml/activitydiagram/ActivityDiagram.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.activitydiagram; diff --git a/src/net/sourceforge/plantuml/activitydiagram/ActivityDiagramFactory.java b/src/net/sourceforge/plantuml/activitydiagram/ActivityDiagramFactory.java index d3bdfe94a..f64a2ec83 100644 --- a/src/net/sourceforge/plantuml/activitydiagram/ActivityDiagramFactory.java +++ b/src/net/sourceforge/plantuml/activitydiagram/ActivityDiagramFactory.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 10006 $ * */ package net.sourceforge.plantuml.activitydiagram; diff --git a/src/net/sourceforge/plantuml/activitydiagram/ConditionalContext.java b/src/net/sourceforge/plantuml/activitydiagram/ConditionalContext.java index b142af4b2..725ce912d 100644 --- a/src/net/sourceforge/plantuml/activitydiagram/ConditionalContext.java +++ b/src/net/sourceforge/plantuml/activitydiagram/ConditionalContext.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3828 $ * */ package net.sourceforge.plantuml.activitydiagram; diff --git a/src/net/sourceforge/plantuml/activitydiagram/command/CommandElse.java b/src/net/sourceforge/plantuml/activitydiagram/command/CommandElse.java index 73073a221..d1d7f10f6 100644 --- a/src/net/sourceforge/plantuml/activitydiagram/command/CommandElse.java +++ b/src/net/sourceforge/plantuml/activitydiagram/command/CommandElse.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4762 $ * */ package net.sourceforge.plantuml.activitydiagram.command; diff --git a/src/net/sourceforge/plantuml/activitydiagram/command/CommandEndPartition.java b/src/net/sourceforge/plantuml/activitydiagram/command/CommandEndPartition.java index abf374440..9db4c4696 100644 --- a/src/net/sourceforge/plantuml/activitydiagram/command/CommandEndPartition.java +++ b/src/net/sourceforge/plantuml/activitydiagram/command/CommandEndPartition.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.activitydiagram.command; diff --git a/src/net/sourceforge/plantuml/activitydiagram/command/CommandEndif.java b/src/net/sourceforge/plantuml/activitydiagram/command/CommandEndif.java index 82cd355ad..926e87938 100644 --- a/src/net/sourceforge/plantuml/activitydiagram/command/CommandEndif.java +++ b/src/net/sourceforge/plantuml/activitydiagram/command/CommandEndif.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4762 $ * */ package net.sourceforge.plantuml.activitydiagram.command; diff --git a/src/net/sourceforge/plantuml/activitydiagram/command/CommandIf.java b/src/net/sourceforge/plantuml/activitydiagram/command/CommandIf.java index 744594e4b..875f717d5 100644 --- a/src/net/sourceforge/plantuml/activitydiagram/command/CommandIf.java +++ b/src/net/sourceforge/plantuml/activitydiagram/command/CommandIf.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4762 $ * */ package net.sourceforge.plantuml.activitydiagram.command; diff --git a/src/net/sourceforge/plantuml/activitydiagram/command/CommandInnerConcurrent.java b/src/net/sourceforge/plantuml/activitydiagram/command/CommandInnerConcurrent.java index ccd7dc65a..446e4f96e 100644 --- a/src/net/sourceforge/plantuml/activitydiagram/command/CommandInnerConcurrent.java +++ b/src/net/sourceforge/plantuml/activitydiagram/command/CommandInnerConcurrent.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4762 $ * */ package net.sourceforge.plantuml.activitydiagram.command; diff --git a/src/net/sourceforge/plantuml/activitydiagram/command/CommandLinkActivity.java b/src/net/sourceforge/plantuml/activitydiagram/command/CommandLinkActivity.java index c662d77d3..71d9f4769 100644 --- a/src/net/sourceforge/plantuml/activitydiagram/command/CommandLinkActivity.java +++ b/src/net/sourceforge/plantuml/activitydiagram/command/CommandLinkActivity.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5024 $ * */ package net.sourceforge.plantuml.activitydiagram.command; diff --git a/src/net/sourceforge/plantuml/activitydiagram/command/CommandLinkLongActivity.java b/src/net/sourceforge/plantuml/activitydiagram/command/CommandLinkLongActivity.java index 07b741bae..2c421e92b 100644 --- a/src/net/sourceforge/plantuml/activitydiagram/command/CommandLinkLongActivity.java +++ b/src/net/sourceforge/plantuml/activitydiagram/command/CommandLinkLongActivity.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5031 $ * */ package net.sourceforge.plantuml.activitydiagram.command; diff --git a/src/net/sourceforge/plantuml/activitydiagram/command/CommandPartition.java b/src/net/sourceforge/plantuml/activitydiagram/command/CommandPartition.java index ef1fb56b8..d38e04741 100644 --- a/src/net/sourceforge/plantuml/activitydiagram/command/CommandPartition.java +++ b/src/net/sourceforge/plantuml/activitydiagram/command/CommandPartition.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.activitydiagram.command; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ActivityDiagram3.java b/src/net/sourceforge/plantuml/activitydiagram3/ActivityDiagram3.java index 3e3a6ebe0..04b3522b5 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ActivityDiagram3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ActivityDiagram3.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 9786 $ * */ package net.sourceforge.plantuml.activitydiagram3; @@ -163,7 +160,8 @@ public class ActivityDiagram3 extends UmlDiagram { result = new TextBlockRecentred(result); final ISkinParam skinParam = getSkinParam(); result = new AnnotatedWorker(this, skinParam).addAdd(result); - final Dimension2D dim = TextBlockUtils.getMinMax(result).getDimension(); + final Dimension2D dim = TextBlockUtils.getMinMax(result, fileFormatOption.getDefaultStringBounder()) + .getDimension(); final double margin = 10; final double dpiFactor = getDpiFactor(fileFormatOption, Dimension2DDouble.delta(dim, 2 * margin, 0)); diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ActivityDiagramFactory3.java b/src/net/sourceforge/plantuml/activitydiagram3/ActivityDiagramFactory3.java index 4196bce94..db2a921f7 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ActivityDiagramFactory3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ActivityDiagramFactory3.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 9786 $ * */ package net.sourceforge.plantuml.activitydiagram3; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/Branch.java b/src/net/sourceforge/plantuml/activitydiagram3/Branch.java index 32149e020..6cd1c155e 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/Branch.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/Branch.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 9786 $ * */ package net.sourceforge.plantuml.activitydiagram3; @@ -56,10 +53,6 @@ public class Branch { private Ftile ftile; - public boolean isOnlySingleStop() { - return list.isOnlySingleStop(); - } - public Branch(Swimlane swimlane, Display labelPositive, Display labelTest, HtmlColor color) { if (labelPositive == null) { throw new IllegalArgumentException(); @@ -136,4 +129,8 @@ public class Branch { return list.getLast(); } + public boolean isOnlySingleStop() { + return list.isOnlySingleStop(); + } + } diff --git a/src/net/sourceforge/plantuml/activitydiagram3/Instruction.java b/src/net/sourceforge/plantuml/activitydiagram3/Instruction.java index 65e814a30..0bd16f3c3 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/Instruction.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/Instruction.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 9786 $ * */ package net.sourceforge.plantuml.activitydiagram3; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/InstructionCollection.java b/src/net/sourceforge/plantuml/activitydiagram3/InstructionCollection.java index e1277a15d..a8575160c 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/InstructionCollection.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/InstructionCollection.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 9786 $ * */ package net.sourceforge.plantuml.activitydiagram3; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/InstructionEnd.java b/src/net/sourceforge/plantuml/activitydiagram3/InstructionEnd.java index 2e5904ef5..bda99571b 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/InstructionEnd.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/InstructionEnd.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 9786 $ * */ package net.sourceforge.plantuml.activitydiagram3; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/InstructionFork.java b/src/net/sourceforge/plantuml/activitydiagram3/InstructionFork.java index b83a8b2df..e83e1586e 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/InstructionFork.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/InstructionFork.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 9786 $ * */ package net.sourceforge.plantuml.activitydiagram3; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/InstructionGoto.java b/src/net/sourceforge/plantuml/activitydiagram3/InstructionGoto.java index 4c4cf37d9..db543b914 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/InstructionGoto.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/InstructionGoto.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 9786 $ * */ package net.sourceforge.plantuml.activitydiagram3; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/InstructionGroup.java b/src/net/sourceforge/plantuml/activitydiagram3/InstructionGroup.java index 2f7cafb02..9b470d08a 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/InstructionGroup.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/InstructionGroup.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 9786 $ * */ package net.sourceforge.plantuml.activitydiagram3; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/InstructionIf.java b/src/net/sourceforge/plantuml/activitydiagram3/InstructionIf.java index e2fe65c45..5febd7661 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/InstructionIf.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/InstructionIf.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 9786 $ * */ package net.sourceforge.plantuml.activitydiagram3; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/InstructionLabel.java b/src/net/sourceforge/plantuml/activitydiagram3/InstructionLabel.java index 1b761e4a0..01217d530 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/InstructionLabel.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/InstructionLabel.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 9786 $ * */ package net.sourceforge.plantuml.activitydiagram3; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/InstructionList.java b/src/net/sourceforge/plantuml/activitydiagram3/InstructionList.java index c8d011382..243069436 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/InstructionList.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/InstructionList.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 9786 $ * */ package net.sourceforge.plantuml.activitydiagram3; @@ -53,14 +50,6 @@ public class InstructionList extends WithNote implements Instruction, Instructio private final List all = new ArrayList(); private final Swimlane defaultSwimlane; - public boolean isOnlySingleStop() { - if (all.size() == 1) { - final Instruction last = getLast(); - return last instanceof InstructionStop; - } - return false; - } - public InstructionList() { this(null); } @@ -69,6 +58,10 @@ public class InstructionList extends WithNote implements Instruction, Instructio return all.isEmpty(); } + public boolean isOnlySingleStop() { + return all.size() == 1 && getLast() instanceof InstructionStop; + } + public InstructionList(Swimlane defaultSwimlane) { this.defaultSwimlane = defaultSwimlane; } diff --git a/src/net/sourceforge/plantuml/activitydiagram3/InstructionPartition.java b/src/net/sourceforge/plantuml/activitydiagram3/InstructionPartition.java index cdf13c5a4..6de5e25cd 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/InstructionPartition.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/InstructionPartition.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 9786 $ * */ package net.sourceforge.plantuml.activitydiagram3; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/InstructionRepeat.java b/src/net/sourceforge/plantuml/activitydiagram3/InstructionRepeat.java index 901d2f81a..e7753d18e 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/InstructionRepeat.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/InstructionRepeat.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 9786 $ * */ package net.sourceforge.plantuml.activitydiagram3; @@ -133,7 +130,7 @@ public class InstructionRepeat implements Instruction { } public Swimlane getSwimlaneOut() { - return repeatList.getSwimlaneOut(); + return parent.getSwimlaneOut(); } } diff --git a/src/net/sourceforge/plantuml/activitydiagram3/InstructionSimple.java b/src/net/sourceforge/plantuml/activitydiagram3/InstructionSimple.java index a17c5835a..9559179a0 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/InstructionSimple.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/InstructionSimple.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 9786 $ * */ package net.sourceforge.plantuml.activitydiagram3; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/InstructionSplit.java b/src/net/sourceforge/plantuml/activitydiagram3/InstructionSplit.java index 438cc2754..a6aa79020 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/InstructionSplit.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/InstructionSplit.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 9786 $ * */ package net.sourceforge.plantuml.activitydiagram3; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/InstructionStart.java b/src/net/sourceforge/plantuml/activitydiagram3/InstructionStart.java index 43292a05c..441f1c10a 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/InstructionStart.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/InstructionStart.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 9786 $ * */ package net.sourceforge.plantuml.activitydiagram3; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/InstructionStop.java b/src/net/sourceforge/plantuml/activitydiagram3/InstructionStop.java index 1215f70a2..b7fd0c259 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/InstructionStop.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/InstructionStop.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 9786 $ * */ package net.sourceforge.plantuml.activitydiagram3; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/InstructionWhile.java b/src/net/sourceforge/plantuml/activitydiagram3/InstructionWhile.java index 5f65411dd..459b044a7 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/InstructionWhile.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/InstructionWhile.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 9786 $ * */ package net.sourceforge.plantuml.activitydiagram3; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/LinkRendering.java b/src/net/sourceforge/plantuml/activitydiagram3/LinkRendering.java index 60685c4de..373492377 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/LinkRendering.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/LinkRendering.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 9786 $ * */ package net.sourceforge.plantuml.activitydiagram3; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/MonoSwimable.java b/src/net/sourceforge/plantuml/activitydiagram3/MonoSwimable.java index e8067187d..76aa2ad0f 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/MonoSwimable.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/MonoSwimable.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 9786 $ * */ package net.sourceforge.plantuml.activitydiagram3; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/PositionedNote.java b/src/net/sourceforge/plantuml/activitydiagram3/PositionedNote.java index 6ec5ec24f..e1daaeb6a 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/PositionedNote.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/PositionedNote.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 9786 $ * */ package net.sourceforge.plantuml.activitydiagram3; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/WithNote.java b/src/net/sourceforge/plantuml/activitydiagram3/WithNote.java index 72b42d2f4..6bd1cee3d 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/WithNote.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/WithNote.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 9786 $ * */ package net.sourceforge.plantuml.activitydiagram3; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandActivity3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandActivity3.java index d8a4e5ac4..99c745718 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandActivity3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandActivity3.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4762 $ * */ package net.sourceforge.plantuml.activitydiagram3.command; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandActivityLegacy1.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandActivityLegacy1.java index 639a23e59..cc181b5b5 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandActivityLegacy1.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandActivityLegacy1.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4762 $ * */ package net.sourceforge.plantuml.activitydiagram3.command; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandActivityLong3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandActivityLong3.java index a6293f7c7..10c1bdc4b 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandActivityLong3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandActivityLong3.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5031 $ * */ package net.sourceforge.plantuml.activitydiagram3.command; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandArrow3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandArrow3.java index 5632097d2..de2652d5f 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandArrow3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandArrow3.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4762 $ * */ package net.sourceforge.plantuml.activitydiagram3.command; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandArrowLong3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandArrowLong3.java index 41e5cf82b..f47175213 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandArrowLong3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandArrowLong3.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5031 $ * */ package net.sourceforge.plantuml.activitydiagram3.command; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandElse3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandElse3.java index 3a389970c..1f3d147da 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandElse3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandElse3.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4762 $ * */ package net.sourceforge.plantuml.activitydiagram3.command; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandElseIf2.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandElseIf2.java index 4f235a3bb..15de00954 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandElseIf2.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandElseIf2.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4762 $ * */ package net.sourceforge.plantuml.activitydiagram3.command; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandElseLegacy1.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandElseLegacy1.java index 21063b32c..87f9df69e 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandElseLegacy1.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandElseLegacy1.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4762 $ * */ package net.sourceforge.plantuml.activitydiagram3.command; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandEnd3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandEnd3.java index b4ff1437b..944d76592 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandEnd3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandEnd3.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4762 $ * */ package net.sourceforge.plantuml.activitydiagram3.command; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandEndPartition3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandEndPartition3.java index 9616df511..35bce1e48 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandEndPartition3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandEndPartition3.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 12235 $ * */ package net.sourceforge.plantuml.activitydiagram3.command; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandEndif3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandEndif3.java index 0df4c8f61..905832821 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandEndif3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandEndif3.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4762 $ * */ package net.sourceforge.plantuml.activitydiagram3.command; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandFork3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandFork3.java index 6f9b11674..ee1e9115e 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandFork3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandFork3.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4762 $ * */ package net.sourceforge.plantuml.activitydiagram3.command; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandForkAgain3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandForkAgain3.java index 28dbb4662..e4fc166ef 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandForkAgain3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandForkAgain3.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4762 $ * */ package net.sourceforge.plantuml.activitydiagram3.command; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandForkEnd3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandForkEnd3.java index 9ba22df71..856e67809 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandForkEnd3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandForkEnd3.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4762 $ * */ package net.sourceforge.plantuml.activitydiagram3.command; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandGoto.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandGoto.java index a0f848044..32324d545 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandGoto.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandGoto.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4762 $ * */ package net.sourceforge.plantuml.activitydiagram3.command; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandGroup3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandGroup3.java index d08ca8e17..badee498b 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandGroup3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandGroup3.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4762 $ * */ package net.sourceforge.plantuml.activitydiagram3.command; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandGroupEnd3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandGroupEnd3.java index 70f36e4aa..4d070fe87 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandGroupEnd3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandGroupEnd3.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4762 $ * */ package net.sourceforge.plantuml.activitydiagram3.command; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandIf2.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandIf2.java index f20910fb5..138c1ee78 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandIf2.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandIf2.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4762 $ * */ package net.sourceforge.plantuml.activitydiagram3.command; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandIf4.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandIf4.java index 9f6073a54..5a76714df 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandIf4.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandIf4.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4762 $ * */ package net.sourceforge.plantuml.activitydiagram3.command; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandIfLegacy1.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandIfLegacy1.java index 9102163e9..e84009be2 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandIfLegacy1.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandIfLegacy1.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4762 $ * */ package net.sourceforge.plantuml.activitydiagram3.command; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandKill3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandKill3.java index 675d4c18c..943e1bbe6 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandKill3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandKill3.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4762 $ * */ package net.sourceforge.plantuml.activitydiagram3.command; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandLabel.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandLabel.java index 4510a7fd6..da02da812 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandLabel.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandLabel.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4762 $ * */ package net.sourceforge.plantuml.activitydiagram3.command; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandLink3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandLink3.java index f566eece1..c626245d9 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandLink3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandLink3.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4762 $ * */ package net.sourceforge.plantuml.activitydiagram3.command; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandNolink.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandNolink.java index ed279de21..d7c964b26 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandNolink.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandNolink.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4762 $ * */ package net.sourceforge.plantuml.activitydiagram3.command; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandNote3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandNote3.java index 97479ed3f..bfcef0264 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandNote3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandNote3.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4762 $ * */ package net.sourceforge.plantuml.activitydiagram3.command; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandNoteLong3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandNoteLong3.java index 34617338c..d0cb43ebb 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandNoteLong3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandNoteLong3.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4762 $ * */ package net.sourceforge.plantuml.activitydiagram3.command; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandPartition3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandPartition3.java index bf5c14d7f..667bb0a4e 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandPartition3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandPartition3.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 12235 $ * */ package net.sourceforge.plantuml.activitydiagram3.command; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandRepeat3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandRepeat3.java index e4b736f70..72bc239f4 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandRepeat3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandRepeat3.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4762 $ * */ package net.sourceforge.plantuml.activitydiagram3.command; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandRepeatWhile3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandRepeatWhile3.java index ff0a16087..d23c31793 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandRepeatWhile3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandRepeatWhile3.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4762 $ * */ package net.sourceforge.plantuml.activitydiagram3.command; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandRepeatWhile3Multilines.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandRepeatWhile3Multilines.java index a899bdc29..19aef3e9d 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandRepeatWhile3Multilines.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandRepeatWhile3Multilines.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4762 $ * */ package net.sourceforge.plantuml.activitydiagram3.command; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandSplit3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandSplit3.java index ad986af77..e19e67f97 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandSplit3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandSplit3.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4762 $ * */ package net.sourceforge.plantuml.activitydiagram3.command; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandSplitAgain3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandSplitAgain3.java index e445ee53b..f05ac7d7e 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandSplitAgain3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandSplitAgain3.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4762 $ * */ package net.sourceforge.plantuml.activitydiagram3.command; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandSplitEnd3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandSplitEnd3.java index 0167a89c5..28873dc5d 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandSplitEnd3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandSplitEnd3.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4762 $ * */ package net.sourceforge.plantuml.activitydiagram3.command; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandStart3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandStart3.java index 9ced624dc..870f24fbe 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandStart3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandStart3.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4762 $ * */ package net.sourceforge.plantuml.activitydiagram3.command; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandStop3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandStop3.java index 95bbf3b8b..5bef03755 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandStop3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandStop3.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4762 $ * */ package net.sourceforge.plantuml.activitydiagram3.command; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandSwimlane.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandSwimlane.java index 72c0e838c..99f9aa248 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandSwimlane.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandSwimlane.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4762 $ * */ package net.sourceforge.plantuml.activitydiagram3.command; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandSwimlane2.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandSwimlane2.java index ebf937d9a..3d135d792 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandSwimlane2.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandSwimlane2.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4762 $ * */ package net.sourceforge.plantuml.activitydiagram3.command; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandWhile3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandWhile3.java index 8fafc2005..fa7b2417e 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandWhile3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandWhile3.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4762 $ * */ package net.sourceforge.plantuml.activitydiagram3.command; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandWhileEnd3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandWhileEnd3.java index ae8bf10c3..4c844a9b8 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandWhileEnd3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandWhileEnd3.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4762 $ * */ package net.sourceforge.plantuml.activitydiagram3.command; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/AbstractConnection.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/AbstractConnection.java index 1059dd373..fa0ec74e2 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/AbstractConnection.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/AbstractConnection.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8475 $ * */ package net.sourceforge.plantuml.activitydiagram3.ftile; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/AbstractFtile.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/AbstractFtile.java index 53e032c1b..7bd35a8bb 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/AbstractFtile.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/AbstractFtile.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8475 $ * */ package net.sourceforge.plantuml.activitydiagram3.ftile; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/Arrows.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/Arrows.java index 05c7b169d..f2d79b975 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/Arrows.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/Arrows.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8475 $ * */ package net.sourceforge.plantuml.activitydiagram3.ftile; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/BoxStyle.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/BoxStyle.java index 725738ebf..756efeb51 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/BoxStyle.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/BoxStyle.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8475 $ * */ package net.sourceforge.plantuml.activitydiagram3.ftile; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/CollisionDetector.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/CollisionDetector.java index 0549ff138..5d5737aa6 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/CollisionDetector.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/CollisionDetector.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8475 $ * */ package net.sourceforge.plantuml.activitydiagram3.ftile; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/Connection.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/Connection.java index 23d394413..a86818bdd 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/Connection.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/Connection.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8475 $ * */ package net.sourceforge.plantuml.activitydiagram3.ftile; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/ConnectionCross.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/ConnectionCross.java index 8e0dcd3b3..d0a11a11c 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/ConnectionCross.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/ConnectionCross.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8475 $ * */ package net.sourceforge.plantuml.activitydiagram3.ftile; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/ConnectionTranslatable.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/ConnectionTranslatable.java index d2d70a335..7f66afa68 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/ConnectionTranslatable.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/ConnectionTranslatable.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8475 $ * */ package net.sourceforge.plantuml.activitydiagram3.ftile; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/Diamond.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/Diamond.java index f5c538898..2944c44ff 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/Diamond.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/Diamond.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8475 $ * */ package net.sourceforge.plantuml.activitydiagram3.ftile; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/EntityImageLegend.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/EntityImageLegend.java index 3566d9de5..d70d23a5a 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/EntityImageLegend.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/EntityImageLegend.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5183 $ * */ package net.sourceforge.plantuml.activitydiagram3.ftile; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/Ftile.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/Ftile.java index 9d45be4d8..aa590de7d 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/Ftile.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/Ftile.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8475 $ * */ package net.sourceforge.plantuml.activitydiagram3.ftile; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileAssemblySimple.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileAssemblySimple.java index a94d602d2..f26297bd5 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileAssemblySimple.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileAssemblySimple.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8475 $ * */ package net.sourceforge.plantuml.activitydiagram3.ftile; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileEmpty.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileEmpty.java index 2ea4096fb..472107d92 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileEmpty.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileEmpty.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8475 $ * */ package net.sourceforge.plantuml.activitydiagram3.ftile; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileFactory.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileFactory.java index 6997bd3e4..42eb4f335 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileFactory.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileFactory.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8475 $ * */ package net.sourceforge.plantuml.activitydiagram3.ftile; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileFactoryDelegator.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileFactoryDelegator.java index ab3215ba9..3858b882d 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileFactoryDelegator.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileFactoryDelegator.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8475 $ * */ package net.sourceforge.plantuml.activitydiagram3.ftile; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileGeometry.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileGeometry.java index aaa852166..c8fb26ee7 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileGeometry.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileGeometry.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8475 $ * */ package net.sourceforge.plantuml.activitydiagram3.ftile; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileGeometryMerger.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileGeometryMerger.java index adae1019d..9575dcd77 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileGeometryMerger.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileGeometryMerger.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8475 $ * */ package net.sourceforge.plantuml.activitydiagram3.ftile; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileGoto.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileGoto.java index c878fa6b6..7e5f4b0ee 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileGoto.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileGoto.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8475 $ * */ package net.sourceforge.plantuml.activitydiagram3.ftile; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileHeightFixed.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileHeightFixed.java index 1449b2f7a..944602b96 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileHeightFixed.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileHeightFixed.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8475 $ * */ package net.sourceforge.plantuml.activitydiagram3.ftile; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileKilled.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileKilled.java index 6840041be..29ac6a355 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileKilled.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileKilled.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8475 $ * */ package net.sourceforge.plantuml.activitydiagram3.ftile; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileLabel.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileLabel.java index f0f9ba44d..f089a9ba6 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileLabel.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileLabel.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8475 $ * */ package net.sourceforge.plantuml.activitydiagram3.ftile; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileMarged.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileMarged.java index b4cb2276e..36a35b79e 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileMarged.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileMarged.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8475 $ * */ package net.sourceforge.plantuml.activitydiagram3.ftile; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileMargedRight.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileMargedRight.java index da1f92c0c..1878cae60 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileMargedRight.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileMargedRight.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8475 $ * */ package net.sourceforge.plantuml.activitydiagram3.ftile; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileMargedVertically.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileMargedVertically.java index 3502e1c9e..6ca13fb71 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileMargedVertically.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileMargedVertically.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8475 $ * */ package net.sourceforge.plantuml.activitydiagram3.ftile; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileMinWidth.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileMinWidth.java index 2ef198589..4d388849a 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileMinWidth.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileMinWidth.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8475 $ * */ package net.sourceforge.plantuml.activitydiagram3.ftile; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileOverpassing.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileOverpassing.java index 6125a957b..7453a8e49 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileOverpassing.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileOverpassing.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8475 $ * */ package net.sourceforge.plantuml.activitydiagram3.ftile; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileUtils.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileUtils.java index a6a898618..91f31f703 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileUtils.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileUtils.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8475 $ * */ package net.sourceforge.plantuml.activitydiagram3.ftile; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileWithConnection.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileWithConnection.java index 08e0572d4..b68e8e8b6 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileWithConnection.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileWithConnection.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8475 $ * */ package net.sourceforge.plantuml.activitydiagram3.ftile; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileWithSwimlanes.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileWithSwimlanes.java index 59a496abe..118faec6f 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileWithSwimlanes.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileWithSwimlanes.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8475 $ * */ package net.sourceforge.plantuml.activitydiagram3.ftile; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileWithUrl.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileWithUrl.java index 09d839383..c06a1b934 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileWithUrl.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileWithUrl.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8475 $ * */ package net.sourceforge.plantuml.activitydiagram3.ftile; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/GotoInterceptor.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/GotoInterceptor.java index bca3e4efe..9a713d85f 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/GotoInterceptor.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/GotoInterceptor.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8475 $ * */ package net.sourceforge.plantuml.activitydiagram3.ftile; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/MergeStrategy.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/MergeStrategy.java new file mode 100644 index 000000000..a9a5ec8af --- /dev/null +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/MergeStrategy.java @@ -0,0 +1,42 @@ +/* ======================================================================== + * PlantUML : a free UML diagram generator + * ======================================================================== + * + * (C) Copyright 2009-2017, Arnaud Roques + * + * Project Info: http://plantuml.com + * + * 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.activitydiagram3.ftile; + +public enum MergeStrategy { + + FULL, LIMITED, NONE; + + public MergeStrategy max(MergeStrategy other) { + final int max = Math.max(this.ordinal(), other.ordinal()); + return MergeStrategy.values()[max]; + } + +} diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/Snake.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/Snake.java index dfaca2017..1ba779aee 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/Snake.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/Snake.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8475 $ * */ package net.sourceforge.plantuml.activitydiagram3.ftile; @@ -57,7 +54,7 @@ public class Snake implements UShape { private final UPolygon endDecoration; private final Rainbow color; private TextBlock textBlock; - private boolean mergeable = true; + private MergeStrategy mergeable = MergeStrategy.FULL; private Direction emphasizeDirection; public Snake transformX(CompressionTransform compressionTransform) { @@ -206,11 +203,12 @@ public class Snake implements UShape { return pt1.distance(pt2) < 0.001; } - public Snake merge(Snake other) { - if (mergeable == false || other.mergeable == false) { + public Snake merge(Snake other, StringBounder stringBounder) { + final MergeStrategy strategy = this.mergeable.max(other.mergeable); + if (strategy == MergeStrategy.NONE) { return null; } - if (TextBlockUtils.isEmpty(other.textBlock) == false) { + if (TextBlockUtils.isEmpty(other.textBlock, stringBounder) == false) { return null; // System.err.println("merge other.textBlock="+other.textBlock+" "+other.textBlock.calculateDimension(TextBlockUtils.getDummyStringBounder())); } @@ -221,17 +219,18 @@ public class Snake implements UShape { final UPolygon oneOf = other.endDecoration == null ? endDecoration : other.endDecoration; final Snake result = new Snake(color, oneOf); result.emphasizeDirection = emphasizeDirection == null ? other.emphasizeDirection : emphasizeDirection; - result.worm.addAll(this.worm.merge(other.worm)); + result.worm.addAll(this.worm.merge(other.worm, strategy)); + result.mergeable = strategy; return result; } if (same(this.getFirst(), other.getLast())) { - return other.merge(this); + return other.merge(this, stringBounder); } return null; } - public void goUnmergeable() { - this.mergeable = false; + public void goUnmergeable(MergeStrategy strategy) { + this.mergeable = strategy; } public void emphasizeDirection(Direction direction) { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/SnakeDirection.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/SnakeDirection.java index 79af5b2be..0b0339544 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/SnakeDirection.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/SnakeDirection.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8475 $ * */ package net.sourceforge.plantuml.activitydiagram3.ftile; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/Swimable.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/Swimable.java index 7c8e24dd3..d9d9c9cf8 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/Swimable.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/Swimable.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8475 $ * */ package net.sourceforge.plantuml.activitydiagram3.ftile; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/Swimlane.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/Swimlane.java index bdf4f7589..293bd63d0 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/Swimlane.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/Swimlane.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8475 $ * */ package net.sourceforge.plantuml.activitydiagram3.ftile; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/Swimlanes.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/Swimlanes.java index f1b21446b..a0e833410 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/Swimlanes.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/Swimlanes.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8475 $ * */ package net.sourceforge.plantuml.activitydiagram3.ftile; @@ -107,8 +104,8 @@ public class Swimlanes extends AbstractTextBlock implements TextBlock { return new FontConfiguration(skinParam, FontParam.SWIMLANE_TITLE, null); } - private FtileFactory getFtileFactory() { - FtileFactory factory = new VCompactFactory(skinParam, TextBlockUtils.getDummyStringBounder()); + private FtileFactory getFtileFactory(StringBounder stringBounder) { + FtileFactory factory = new VCompactFactory(skinParam, stringBounder); factory = new FtileFactoryDelegatorAddUrl(factory); factory = new FtileFactoryDelegatorAssembly(factory); factory = new FtileFactoryDelegatorIf(factory, pragma); @@ -177,7 +174,7 @@ public class Swimlanes extends AbstractTextBlock implements TextBlock { static private final double separationMargin = 10; public void drawU(UGraphic ug) { - final FtileFactory factory = getFtileFactory(); + final FtileFactory factory = getFtileFactory(ug.getStringBounder()); TextBlock full = root.createFtile(factory); ug = new UGraphicForSnake(ug); @@ -314,7 +311,7 @@ public class Swimlanes extends AbstractTextBlock implements TextBlock { } private CollisionDetector getCollisionDetector(UGraphic ug, final UTranslate titleHeightTranslate) { - final FtileFactory factory = getFtileFactory(); + final FtileFactory factory = getFtileFactory(ug.getStringBounder()); final TextBlock full = root.createFtile(factory); ug = new UGraphicForSnake(ug); diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/TextBlockInterceptorUDrawable.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/TextBlockInterceptorUDrawable.java index a80f65623..71888b121 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/TextBlockInterceptorUDrawable.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/TextBlockInterceptorUDrawable.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 10266 $ * */ package net.sourceforge.plantuml.activitydiagram3.ftile; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/UGraphicInterceptorUDrawable2.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/UGraphicInterceptorUDrawable2.java index 59a4971e0..7288eb3f1 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/UGraphicInterceptorUDrawable2.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/UGraphicInterceptorUDrawable2.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 10266 $ * */ package net.sourceforge.plantuml.activitydiagram3.ftile; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/Worm.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/Worm.java index 2cbf6f1bc..9c60286ef 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/Worm.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/Worm.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8475 $ * */ package net.sourceforge.plantuml.activitydiagram3.ftile; @@ -253,18 +250,18 @@ public class Worm implements Iterable { return points.get(points.size() - 1); } - public Worm merge(Worm other) { + public Worm merge(Worm other, MergeStrategy merge) { if (Snake.same(this.getLast(), other.getFirst()) == false) { throw new IllegalArgumentException(); } final Worm result = new Worm(); result.points.addAll(this.points); result.points.addAll(other.points); - result.mergeMe(); + result.mergeMe(merge); return result; } - private void mergeMe() { + private void mergeMe(MergeStrategy merge) { boolean change = false; do { change = false; @@ -277,6 +274,9 @@ public class Worm implements Iterable { change = change || removePattern5(); change = change || removePattern6(); change = change || removePattern7(); + if (merge == MergeStrategy.FULL) { + change = change || removePattern8(); + } } while (change); } @@ -417,4 +417,21 @@ public class Worm implements Iterable { return false; } + private boolean removePattern8() { + for (int i = 0; i < points.size() - 4; i++) { + final List patternAt = getPatternAt(i); + if (Arrays.asList(Direction.LEFT, Direction.DOWN, Direction.LEFT, Direction.DOWN).equals(patternAt) + || Arrays.asList(Direction.RIGHT, Direction.DOWN, Direction.RIGHT, Direction.DOWN) + .equals(patternAt)) { + final Point2D.Double newPoint = new Point2D.Double(points.get(i + 3).x, points.get(i + 1).y); + points.remove(i + 3); + points.remove(i + 2); + points.remove(i + 1); + points.add(i + 1, newPoint); + return true; + } + } + return false; + } + } diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/WormMutation.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/WormMutation.java index 12ded0200..19b9566df 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/WormMutation.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/WormMutation.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8475 $ * */ package net.sourceforge.plantuml.activitydiagram3.ftile; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/ConnectionVerticalDown.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/ConnectionVerticalDown.java index cb2fc84fc..4d7368bd5 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/ConnectionVerticalDown.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/ConnectionVerticalDown.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8475 $ * */ package net.sourceforge.plantuml.activitydiagram3.ftile.vcompact; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FloatingNote.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FloatingNote.java index fb05c8ec2..72a16f667 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FloatingNote.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FloatingNote.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8475 $ * */ package net.sourceforge.plantuml.activitydiagram3.ftile.vcompact; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorAddNote.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorAddNote.java index 7b525e077..eac0dce0d 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorAddNote.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorAddNote.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8475 $ * */ package net.sourceforge.plantuml.activitydiagram3.ftile.vcompact; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorAddUrl.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorAddUrl.java index b27623832..5ee1b5f8c 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorAddUrl.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorAddUrl.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8475 $ * */ package net.sourceforge.plantuml.activitydiagram3.ftile.vcompact; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorAssembly.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorAssembly.java index ebbbc67f9..8fd3bd9ae 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorAssembly.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorAssembly.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8475 $ * */ package net.sourceforge.plantuml.activitydiagram3.ftile.vcompact; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorCreateFork.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorCreateFork.java index 5f40cdf6c..9b819b533 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorCreateFork.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorCreateFork.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8475 $ * */ package net.sourceforge.plantuml.activitydiagram3.ftile.vcompact; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorCreateGroup.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorCreateGroup.java index 87efcbde2..d6879fb43 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorCreateGroup.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorCreateGroup.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8475 $ * */ package net.sourceforge.plantuml.activitydiagram3.ftile.vcompact; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorCreateSplit.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorCreateSplit.java index 7003e04aa..e44bc0812 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorCreateSplit.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorCreateSplit.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8475 $ * */ package net.sourceforge.plantuml.activitydiagram3.ftile.vcompact; @@ -52,6 +49,7 @@ import net.sourceforge.plantuml.activitydiagram3.ftile.FtileGeometry; import net.sourceforge.plantuml.activitydiagram3.ftile.FtileHeightFixed; import net.sourceforge.plantuml.activitydiagram3.ftile.FtileKilled; import net.sourceforge.plantuml.activitydiagram3.ftile.FtileUtils; +import net.sourceforge.plantuml.activitydiagram3.ftile.MergeStrategy; import net.sourceforge.plantuml.activitydiagram3.ftile.Snake; import net.sourceforge.plantuml.activitydiagram3.ftile.Swimlane; import net.sourceforge.plantuml.cucadiagram.Display; @@ -302,7 +300,7 @@ public class FtileFactoryDelegatorCreateSplit extends FtileFactoryDelegator { } final Snake s = new Snake(arrowColor); - s.goUnmergeable(); + s.goUnmergeable(MergeStrategy.NONE); s.addPoint(minX, y); s.addPoint(maxX, y); ug.draw(s); @@ -349,7 +347,7 @@ public class FtileFactoryDelegatorCreateSplit extends FtileFactoryDelegator { final Snake s = new Snake(arrowColor); // final Snake s = new Snake(HtmlColorUtils.GREEN); - s.goUnmergeable(); + s.goUnmergeable(MergeStrategy.LIMITED); s.addPoint(minX, y); s.addPoint(maxX, y); ug.draw(s); @@ -405,7 +403,7 @@ public class FtileFactoryDelegatorCreateSplit extends FtileFactoryDelegator { } final Snake s = new Snake(arrowColor, Arrows.asToDown()); s.setLabel(text); - s.goUnmergeable(); + s.goUnmergeable(MergeStrategy.NONE); s.addPoint(geo.getLeft(), geo.getOutY()); s.addPoint(geo.getLeft(), height); ug.draw(s); diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorIf.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorIf.java index 868c87d3f..2d3dc41b4 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorIf.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorIf.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8475 $ * */ package net.sourceforge.plantuml.activitydiagram3.ftile.vcompact; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorRepeat.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorRepeat.java index 0572f3669..b58ad3754 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorRepeat.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorRepeat.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8475 $ * */ package net.sourceforge.plantuml.activitydiagram3.ftile.vcompact; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorWhile.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorWhile.java index 9a42a0ea3..01607ff77 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorWhile.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorWhile.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8475 $ * */ package net.sourceforge.plantuml.activitydiagram3.ftile.vcompact; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileForkInner.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileForkInner.java index 21a0337cb..bc56d9de4 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileForkInner.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileForkInner.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8475 $ * */ package net.sourceforge.plantuml.activitydiagram3.ftile.vcompact; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileGroup.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileGroup.java index 0909edbc9..73d5dc6d3 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileGroup.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileGroup.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8475 $ * */ package net.sourceforge.plantuml.activitydiagram3.ftile.vcompact; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileIfAndStop.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileIfAndStop.java index 673328d0d..265879550 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileIfAndStop.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileIfAndStop.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8475 $ * */ package net.sourceforge.plantuml.activitydiagram3.ftile.vcompact; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileIfDown.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileIfDown.java new file mode 100644 index 000000000..ed236042f --- /dev/null +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileIfDown.java @@ -0,0 +1,353 @@ +/* ======================================================================== + * PlantUML : a free UML diagram generator + * ======================================================================== + * + * (C) Copyright 2009-2017, Arnaud Roques + * + * Project Info: http://plantuml.com + * + * 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.activitydiagram3.ftile.vcompact; + +import java.awt.geom.Point2D; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +import net.sourceforge.plantuml.Direction; +import net.sourceforge.plantuml.activitydiagram3.ftile.AbstractConnection; +import net.sourceforge.plantuml.activitydiagram3.ftile.AbstractFtile; +import net.sourceforge.plantuml.activitydiagram3.ftile.Arrows; +import net.sourceforge.plantuml.activitydiagram3.ftile.Connection; +import net.sourceforge.plantuml.activitydiagram3.ftile.ConnectionTranslatable; +import net.sourceforge.plantuml.activitydiagram3.ftile.Diamond; +import net.sourceforge.plantuml.activitydiagram3.ftile.Ftile; +import net.sourceforge.plantuml.activitydiagram3.ftile.FtileEmpty; +import net.sourceforge.plantuml.activitydiagram3.ftile.FtileFactory; +import net.sourceforge.plantuml.activitydiagram3.ftile.FtileGeometry; +import net.sourceforge.plantuml.activitydiagram3.ftile.FtileUtils; +import net.sourceforge.plantuml.activitydiagram3.ftile.Snake; +import net.sourceforge.plantuml.activitydiagram3.ftile.Swimlane; +import net.sourceforge.plantuml.graphic.Rainbow; +import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.ugraphic.UEmpty; +import net.sourceforge.plantuml.ugraphic.UGraphic; +import net.sourceforge.plantuml.ugraphic.UTranslate; + +public class FtileIfDown extends AbstractFtile { + + private final Ftile thenBlock; + private final Ftile diamond1; + private final Ftile diamond2; + private final Ftile optionalStop; + + public Set getSwimlanes() { + final Set result = new HashSet(thenBlock.getSwimlanes()); + result.add(getSwimlaneIn()); + return result; + } + + public Swimlane getSwimlaneIn() { + return diamond1.getSwimlaneIn(); + } + + public Swimlane getSwimlaneOut() { + if (optionalStop==null) { + return getSwimlaneIn(); + } + return thenBlock.getSwimlaneOut(); + } + + private FtileIfDown(Ftile thenBlock, Ftile diamond1, Ftile diamond2, Ftile optionalStop) { + super(thenBlock.skinParam()); + this.thenBlock = thenBlock; + this.diamond1 = diamond1; + this.diamond2 = diamond2; + this.optionalStop = optionalStop; + } + + public static Ftile create(Ftile diamond1, Ftile diamond2, Swimlane swimlane, Ftile thenBlock, Rainbow arrowColor, + FtileFactory ftileFactory, Ftile optionalStop) { + + final FtileIfDown result = new FtileIfDown(thenBlock, diamond1, optionalStop == null ? diamond2 + : new FtileEmpty(ftileFactory.skinParam()), optionalStop); + + final List conns = new ArrayList(); + conns.add(result.new ConnectionIn(thenBlock.getInLinkRendering().getRainbow(arrowColor))); + final boolean hasPointOut1 = thenBlock.calculateDimension(ftileFactory.getStringBounder()).hasPointOut(); + if (optionalStop == null) { + if (hasPointOut1) { + conns.add(result.new ConnectionElse(thenBlock.getInLinkRendering().getRainbow(arrowColor))); + } else { + conns.add(result.new ConnectionElseNoDiamond(thenBlock.getInLinkRendering().getRainbow(arrowColor))); + } + } + conns.add(result.new ConnectionOut(arrowColor)); + return FtileUtils.addConnection(result, conns); + } + + class ConnectionIn extends AbstractConnection implements ConnectionTranslatable { + private final Rainbow arrowColor; + + public ConnectionIn(Rainbow arrowColor) { + super(diamond1, thenBlock); + this.arrowColor = arrowColor; + } + + private Point2D getP1(final StringBounder stringBounder) { + return getTranslateDiamond1(stringBounder).getTranslated( + getFtile1().calculateDimension(stringBounder).getPointOut()); + } + + private Point2D getP2(final StringBounder stringBounder) { + return getTranslateForThen(stringBounder).getTranslated( + getFtile2().calculateDimension(stringBounder).getPointIn()); + } + + public void drawU(UGraphic ug) { + final StringBounder stringBounder = ug.getStringBounder(); + + final Snake snake = new Snake(arrowColor, Arrows.asToDown()); + snake.addPoint(getP1(stringBounder)); + snake.addPoint(getP2(stringBounder)); + + ug.draw(snake); + } + + public void drawTranslate(UGraphic ug, UTranslate translate1, UTranslate translate2) { + final StringBounder stringBounder = ug.getStringBounder(); + final Point2D p1 = getP1(stringBounder); + final Point2D p2 = getP2(stringBounder); + final Snake snake = new Snake(arrowColor, Arrows.asToDown()); + final Point2D mp1a = translate1.getTranslated(p1); + final Point2D mp2b = translate2.getTranslated(p2); + final double middle = (mp1a.getY() + mp2b.getY()) / 2.0; + snake.addPoint(mp1a); + snake.addPoint(mp1a.getX(), middle); + snake.addPoint(mp2b.getX(), middle); + snake.addPoint(mp2b); + ug.draw(snake); + } + } + + class ConnectionOut extends AbstractConnection implements ConnectionTranslatable { + private final Rainbow arrowColor; + + public ConnectionOut(Rainbow arrowColor) { + super(thenBlock, diamond2); + this.arrowColor = arrowColor; + } + + private Point2D getP1(final StringBounder stringBounder) { + return getTranslateForThen(stringBounder).getTranslated( + getFtile1().calculateDimension(stringBounder).getPointOut()); + } + + private Point2D getP2(final StringBounder stringBounder) { + return getTranslateDiamond2(stringBounder).getTranslated( + getFtile2().calculateDimension(stringBounder).getPointIn()); + } + + public void drawU(UGraphic ug) { + final StringBounder stringBounder = ug.getStringBounder(); + + if (getFtile1().calculateDimension(ug.getStringBounder()).hasPointOut() == false) { + return; + } + + final Snake snake = new Snake(arrowColor, Arrows.asToDown()); + snake.addPoint(getP1(stringBounder)); + snake.addPoint(getP2(stringBounder)); + + ug.draw(snake); + } + + public void drawTranslate(UGraphic ug, UTranslate translate1, UTranslate translate2) { + + if (getFtile1().calculateDimension(ug.getStringBounder()).hasPointOut() == false) { + return; + } + + final StringBounder stringBounder = ug.getStringBounder(); + final Point2D p1 = getP1(stringBounder); + final Point2D p2 = getP2(stringBounder); + final Snake snake = new Snake(arrowColor, Arrows.asToDown()); + final Point2D mp1a = translate1.getTranslated(p1); + final Point2D mp2b = translate2.getTranslated(p2); + final double middle = (mp1a.getY() + mp2b.getY()) / 2.0; + snake.addPoint(mp1a); + snake.addPoint(mp1a.getX(), middle); + snake.addPoint(mp2b.getX(), middle); + snake.addPoint(mp2b); + ug.draw(snake); + } + } + + class ConnectionElse extends AbstractConnection { + private final Rainbow endInlinkColor; + + public ConnectionElse(Rainbow endInlinkColor) { + super(diamond1, diamond2); + this.endInlinkColor = endInlinkColor; + } + + private Point2D getP1(StringBounder stringBounder) { + final FtileGeometry dimDiamond1 = diamond1.calculateDimension(stringBounder); + final double x = dimDiamond1.getWidth(); + final double half = (dimDiamond1.getOutY() - dimDiamond1.getInY()) / 2; + return getTranslateDiamond1(stringBounder) + .getTranslated(new Point2D.Double(x, dimDiamond1.getInY() + half)); + } + + protected Point2D getP2(final StringBounder stringBounder) { + final FtileGeometry dimDiamond2 = diamond2.calculateDimension(stringBounder); + final double x = dimDiamond2.getWidth(); + final double half = (dimDiamond2.getOutY() - dimDiamond2.getInY()) / 2; + return getTranslateDiamond2(stringBounder) + .getTranslated(new Point2D.Double(x, dimDiamond2.getInY() + half)); + } + + public void drawU(UGraphic ug) { + final StringBounder stringBounder = ug.getStringBounder(); + + final Snake snake = new Snake(endInlinkColor, Arrows.asToLeft()); + final Point2D p1 = getP1(stringBounder); + final Point2D p2 = getP2(stringBounder); + + final double x1 = p1.getX(); + final double y1 = p1.getY(); + final double x2 = p2.getX(); + final double y2 = p2.getY(); + + snake.addPoint(x1, y1); + + final FtileGeometry thenGeom = thenBlock.calculateDimension(stringBounder); + final double xmax = Math.max(x1 + Diamond.diamondHalfSize, getTranslateForThen(stringBounder).getDx() + + thenGeom.getWidth()); + + snake.addPoint(xmax, y1); + snake.addPoint(xmax, y2); + snake.addPoint(x2, y2); + snake.emphasizeDirection(Direction.DOWN); + ug.apply(new UTranslate(x2, y2 - Diamond.diamondHalfSize)).draw(new UEmpty(5, Diamond.diamondHalfSize)); + + ug.draw(snake); + + } + + } + + class ConnectionElseNoDiamond extends ConnectionElse { + + public ConnectionElseNoDiamond(Rainbow endInlinkColor) { + super(endInlinkColor); + } + + @Override + protected Point2D getP2(final StringBounder stringBounder) { + return calculateDimension(stringBounder).getPointOut(); + } + + } + + public void drawU(UGraphic ug) { + final StringBounder stringBounder = ug.getStringBounder(); + ug.apply(getTranslateForThen(stringBounder)).draw(thenBlock); + ug.apply(getTranslateDiamond1(stringBounder)).draw(diamond1); + if (optionalStop == null) { + ug.apply(getTranslateDiamond2(stringBounder)).draw(diamond2); + } else { + ug.apply(getTranslateOptionalStop(stringBounder)).draw(optionalStop); + } + } + + public FtileGeometry calculateDimension(StringBounder stringBounder) { + final FtileGeometry geoDiamond1 = diamond1.calculateDimension(stringBounder); + final FtileGeometry geoThen = thenBlock.calculateDimension(stringBounder); + final FtileGeometry geoDiamond2 = diamond2.calculateDimension(stringBounder); + final FtileGeometry geo = geoDiamond1.appendBottom(geoThen).appendBottom(geoDiamond2); + final double height = geo.getHeight() + 4 * Diamond.diamondHalfSize; + return new FtileGeometry(geo.getWidth() + Diamond.diamondHalfSize, height, geo.getLeft(), geoDiamond1.getInY(), + height); + + } + + @Override + public UTranslate getTranslateFor(Ftile child, StringBounder stringBounder) { + if (child == thenBlock) { + return getTranslateForThen(stringBounder); + } + if (child == diamond1) { + return getTranslateDiamond1(stringBounder); + } + if (child == optionalStop) { + return getTranslateOptionalStop(stringBounder); + } + if (child == diamond2) { + return getTranslateDiamond2(stringBounder); + } + throw new UnsupportedOperationException(); + } + + private UTranslate getTranslateForThen(StringBounder stringBounder) { + final FtileGeometry dimDiamond1 = diamond1.calculateDimension(stringBounder); + final FtileGeometry dimDiamond2 = diamond2.calculateDimension(stringBounder); + + final FtileGeometry dimTotal = calculateDimension(stringBounder); + final FtileGeometry dimThen = thenBlock.calculateDimension(stringBounder); + + final double y = dimDiamond1.getHeight() + + (dimTotal.getHeight() - dimDiamond1.getHeight() - dimDiamond2.getHeight() - dimThen.getHeight()) / 2; + + final double x = dimTotal.getLeft() - dimThen.getLeft(); + return new UTranslate(x, y); + + } + + private UTranslate getTranslateDiamond1(StringBounder stringBounder) { + final FtileGeometry dimTotal = calculateDimension(stringBounder); + final FtileGeometry dimDiamond1 = diamond1.calculateDimension(stringBounder); + final double y1 = 0; + final double x1 = dimTotal.getLeft() - dimDiamond1.getLeft(); + return new UTranslate(x1, y1); + } + + private UTranslate getTranslateOptionalStop(StringBounder stringBounder) { + final FtileGeometry dimTotal = calculateDimension(stringBounder); + final FtileGeometry dimDiamond1 = diamond1.calculateDimension(stringBounder); + final double y1 = 0; + final double x1 = dimTotal.getLeft() - dimDiamond1.getLeft() + dimDiamond1.getWidth(); + return new UTranslate(x1, y1); + } + + private UTranslate getTranslateDiamond2(StringBounder stringBounder) { + final FtileGeometry dimTotal = calculateDimension(stringBounder); + final FtileGeometry dimDiamond2 = diamond2.calculateDimension(stringBounder); + final double y2 = dimTotal.getHeight() - dimDiamond2.getHeight(); + final double x2 = dimTotal.getLeft() - dimDiamond2.getLeft(); + return new UTranslate(x2, y2); + } + +} diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileIfLongHorizontal.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileIfLongHorizontal.java index b5f781c8e..57d00801d 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileIfLongHorizontal.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileIfLongHorizontal.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8475 $ * */ package net.sourceforge.plantuml.activitydiagram3.ftile.vcompact; @@ -55,6 +52,7 @@ import net.sourceforge.plantuml.activitydiagram3.ftile.FtileFactory; import net.sourceforge.plantuml.activitydiagram3.ftile.FtileGeometry; import net.sourceforge.plantuml.activitydiagram3.ftile.FtileMinWidth; import net.sourceforge.plantuml.activitydiagram3.ftile.FtileUtils; +import net.sourceforge.plantuml.activitydiagram3.ftile.MergeStrategy; import net.sourceforge.plantuml.activitydiagram3.ftile.Snake; import net.sourceforge.plantuml.activitydiagram3.ftile.Swimlane; import net.sourceforge.plantuml.activitydiagram3.ftile.vcompact.cond.FtileIfWithLinks; @@ -441,7 +439,7 @@ class FtileIfLongHorizontal extends AbstractFtile { } final Snake s = new Snake(arrowColor); - s.goUnmergeable(); + s.goUnmergeable(MergeStrategy.NONE); final double height = totalDim.getHeight(); s.addPoint(minX, height); s.addPoint(maxX, height); diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileIfLongVertical.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileIfLongVertical.java index 3b636d9cb..47b5a2814 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileIfLongVertical.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileIfLongVertical.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8475 $ * */ package net.sourceforge.plantuml.activitydiagram3.ftile.vcompact; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileNoteAlone.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileNoteAlone.java index a53798b0d..e0b8b9812 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileNoteAlone.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileNoteAlone.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8475 $ * */ package net.sourceforge.plantuml.activitydiagram3.ftile.vcompact; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileRepeat.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileRepeat.java index 0ece38233..122564c34 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileRepeat.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileRepeat.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8475 $ * */ package net.sourceforge.plantuml.activitydiagram3.ftile.vcompact; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileSplit1.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileSplit1.java index 9b6e22d1d..5b3de3a19 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileSplit1.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileSplit1.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8475 $ * */ package net.sourceforge.plantuml.activitydiagram3.ftile.vcompact; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileWhile.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileWhile.java index 85ca3f26f..f0b295bae 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileWhile.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileWhile.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8475 $ * */ package net.sourceforge.plantuml.activitydiagram3.ftile.vcompact; @@ -53,6 +50,7 @@ import net.sourceforge.plantuml.activitydiagram3.ftile.Ftile; import net.sourceforge.plantuml.activitydiagram3.ftile.FtileFactory; import net.sourceforge.plantuml.activitydiagram3.ftile.FtileGeometry; import net.sourceforge.plantuml.activitydiagram3.ftile.FtileUtils; +import net.sourceforge.plantuml.activitydiagram3.ftile.MergeStrategy; import net.sourceforge.plantuml.activitydiagram3.ftile.Snake; import net.sourceforge.plantuml.activitydiagram3.ftile.Swimlane; import net.sourceforge.plantuml.activitydiagram3.ftile.vertical.FtileDiamond; @@ -64,9 +62,7 @@ import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.graphic.HtmlColor; import net.sourceforge.plantuml.graphic.Rainbow; import net.sourceforge.plantuml.graphic.StringBounder; -import net.sourceforge.plantuml.graphic.StringBounderUtils; import net.sourceforge.plantuml.graphic.TextBlock; -import net.sourceforge.plantuml.graphic.TextBlockUtils; import net.sourceforge.plantuml.svek.ConditionStyle; import net.sourceforge.plantuml.ugraphic.UChangeBackColor; import net.sourceforge.plantuml.ugraphic.UChangeColor; @@ -78,7 +74,6 @@ class FtileWhile extends AbstractFtile { private final Ftile whileBlock; private final Ftile diamond1; - private final TextBlock supplementarySouthText; public Set getSwimlanes() { final Set result = new HashSet(whileBlock.getSwimlanes()); @@ -94,20 +89,10 @@ class FtileWhile extends AbstractFtile { return getSwimlaneIn(); } - private FtileWhile(Ftile whileBlock, Ftile diamond1, TextBlock supplementarySouthText) { + private FtileWhile(Ftile whileBlock, Ftile diamond1) { super(whileBlock.skinParam()); this.whileBlock = whileBlock; this.diamond1 = diamond1; - this.supplementarySouthText = supplementarySouthText; - } - - private static TextBlock createLabel1(Display test, Display yes, ISkinSimple spriteContainer, FontConfiguration fc) { - final TextBlock tmpb = yes.create(fc, HorizontalAlignment.LEFT, spriteContainer); - if (test == null) { - return tmpb; - } - return TextBlockUtils.mergeTB(test.create(fc, HorizontalAlignment.LEFT, spriteContainer), tmpb, - HorizontalAlignment.CENTER); } public static Ftile create(Swimlane swimlane, Ftile whileBlock, Display test, HtmlColor borderColor, @@ -121,36 +106,35 @@ class FtileWhile extends AbstractFtile { final TextBlock out = out2.create(fontArrow, HorizontalAlignment.LEFT, ftileFactory.skinParam()); final Ftile diamond1; - final TextBlock supplementarySouthText; if (conditionStyle == ConditionStyle.INSIDE) { - supplementarySouthText = TextBlockUtils.empty(0, 0); diamond1 = new FtileDiamondInside(whileBlock.skinParam(), backColor, borderColor, swimlane, testTb) .withNorth(yesTb).withWest(out); } else if (conditionStyle == ConditionStyle.FOO1) { - supplementarySouthText = TextBlockUtils.empty(0, 0); diamond1 = new FtileDiamondFoo1(whileBlock.skinParam(), backColor, borderColor, swimlane, testTb) .withNorth(yesTb).withWest(out); } else if (conditionStyle == ConditionStyle.DIAMOND) { - supplementarySouthText = createLabel1(test, yes, ftileFactory.skinParam(), fontArrow); - diamond1 = new FtileDiamond(whileBlock.skinParam(), backColor, borderColor, swimlane).withWest(out) - .withSouth(supplementarySouthText); + diamond1 = new FtileDiamond(whileBlock.skinParam(), backColor, borderColor, swimlane).withNorth(testTb) + .withSouth(yesTb).withWest(out); } else { throw new IllegalStateException(); } - final FtileWhile result = new FtileWhile(whileBlock, diamond1, supplementarySouthText); + final FtileWhile result = new FtileWhile(whileBlock, diamond1); Rainbow afterEndwhileColor = arrowColor; if (afterEndwhile != null && afterEndwhile.getRainbow() != null && afterEndwhile.getRainbow().size() != 0) { afterEndwhileColor = afterEndwhile.getRainbow(); } - final Dimension2D dim = whileBlock.calculateDimension(StringBounderUtils.asStringBounder()); + final Dimension2D dim = whileBlock.calculateDimension(ftileFactory.getStringBounder()); + final Display backDisplay = whileBlock.getOutLinkRendering().getDisplay(); + final TextBlock back = backDisplay.create(fontArrow, HorizontalAlignment.LEFT, ftileFactory.skinParam()); + final List conns = new ArrayList(); if (dim.getWidth() == 0 || dim.getHeight() == 0) { conns.add(result.new ConnectionBackEmpty(endInlinkColor)); } else { conns.add(result.new ConnectionIn(whileBlock.getInLinkRendering().getRainbow(arrowColor))); - conns.add(result.new ConnectionBack(endInlinkColor)); + conns.add(result.new ConnectionBack(endInlinkColor, back)); } conns.add(result.new ConnectionOut(afterEndwhileColor)); return FtileUtils.addConnection(result, conns); @@ -196,16 +180,19 @@ class FtileWhile extends AbstractFtile { snake.addPoint(mp1a.getX(), middle); snake.addPoint(mp2b.getX(), middle); snake.addPoint(mp2b); + snake.goUnmergeable(MergeStrategy.LIMITED); ug.draw(snake); } } class ConnectionBack extends AbstractConnection implements ConnectionTranslatable { private final Rainbow endInlinkColor; + private final TextBlock back; - public ConnectionBack(Rainbow endInlinkColor) { + public ConnectionBack(Rainbow endInlinkColor, TextBlock back) { super(whileBlock, diamond1); this.endInlinkColor = endInlinkColor; + this.back = back; } private Point2D getP1(final StringBounder stringBounder) { @@ -240,8 +227,11 @@ class FtileWhile extends AbstractFtile { final double x1 = p1.getX(); final double y1 = p1.getY(); final double x2 = p2.getX() + dimDiamond1.getWidth(); - final double y2 = p2.getY() + dimDiamond1.getOutY() / 2; + // final double y2 = p2.getY() + dimDiamond1.getOutY() / 2; + final double half = (dimDiamond1.getOutY() - dimDiamond1.getInY()) / 2; + final double y2 = p2.getY() + dimDiamond1.getInY() + half; + snake.setLabel(back); snake.addPoint(x1, y1); final double y1bis = Math.max(y1, getBottom(stringBounder)) + Diamond.diamondHalfSize; snake.addPoint(x1, y1bis); @@ -281,6 +271,7 @@ class FtileWhile extends AbstractFtile { snake.addPoint(xx, y1 + Diamond.diamondHalfSize); snake.addPoint(xx, y2); snake.addPoint(x2, y2); + snake.goUnmergeable(MergeStrategy.LIMITED); ug.draw(snake); @@ -328,7 +319,9 @@ class FtileWhile extends AbstractFtile { final double x1 = p1.getX(); final double y1 = p1.getY(); final double x2 = p2.getX() + dimDiamond1.getWidth(); - final double y2 = p2.getY() + dimDiamond1.getOutY() / 2; + // final double y2 = p2.getY() + dimDiamond1.getOutY() / 2; + final double half = (dimDiamond1.getOutY() - dimDiamond1.getInY()) / 2; + final double y2 = p2.getY() + dimDiamond1.getInY() + half; snake.addPoint(x1, y1); final double y1bis = Math.max(y1, getBottom(stringBounder)) + Diamond.diamondHalfSize; @@ -374,7 +367,8 @@ class FtileWhile extends AbstractFtile { final Point2D p2 = getP2(stringBounder); final double x1 = p1.getX(); - final double y1 = p1.getY() + dimDiamond1.getOutY() / 2; + final double half = (dimDiamond1.getOutY() - dimDiamond1.getInY()) / 2; + final double y1 = p1.getY() + dimDiamond1.getInY() + half; final double x2 = p2.getX(); final double y2 = p2.getY(); @@ -382,6 +376,7 @@ class FtileWhile extends AbstractFtile { snake.addPoint(Diamond.diamondHalfSize, y1); snake.addPoint(Diamond.diamondHalfSize, y2); snake.emphasizeDirection(Direction.DOWN); + snake.goUnmergeable(MergeStrategy.LIMITED); ug.draw(snake); // ug = ug.apply(new UChangeColor(afterEndwhileColor)).apply(new UChangeBackColor(afterEndwhileColor)); @@ -390,6 +385,7 @@ class FtileWhile extends AbstractFtile { final Snake snake2 = new Snake(afterEndwhileColor); snake2.addPoint(Diamond.diamondHalfSize, y2); snake2.addPoint(x2, y2); + // snake2.goUnmergeable(MergeStrategy.LIMITED); ug.draw(snake2); } @@ -403,16 +399,17 @@ class FtileWhile extends AbstractFtile { public FtileGeometry calculateDimension(StringBounder stringBounder) { final FtileGeometry geoDiamond1 = diamond1.calculateDimension(stringBounder); - final Dimension2D dimSupplementarySouth = supplementarySouthText.calculateDimension(stringBounder); FtileGeometry geoWhile = whileBlock.calculateDimension(stringBounder); - final double diff = dimSupplementarySouth.getWidth() - geoWhile.getWidth(); + final double diff = -geoWhile.getWidth(); if (diff > 0) { geoWhile = geoWhile.addMarginX(diff / 2); + assert false; } final FtileGeometry geo = geoDiamond1.appendBottom(geoWhile); - final double height = geo.getHeight() + 4 * Diamond.diamondHalfSize + dimSupplementarySouth.getHeight(); + final double height = geo.getHeight() + 4 * Diamond.diamondHalfSize; final double dx = 2 * Diamond.diamondHalfSize; - return new FtileGeometry(geo.getWidth() + dx + Diamond.diamondHalfSize, height, geo.getLeft() + dx, 0, height); + return new FtileGeometry(geo.getWidth() + dx + Diamond.diamondHalfSize, height, geo.getLeft() + dx, + geoDiamond1.getInY(), height); } diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileWithNoteOpale.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileWithNoteOpale.java index cba9d0cf0..2eff48e7e 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileWithNoteOpale.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileWithNoteOpale.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8475 $ * */ package net.sourceforge.plantuml.activitydiagram3.ftile.vcompact; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileWithNotes.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileWithNotes.java index 8f5c65883..81fc7284d 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileWithNotes.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileWithNotes.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8475 $ * */ package net.sourceforge.plantuml.activitydiagram3.ftile.vcompact; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/UGraphicInterceptorGoto.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/UGraphicInterceptorGoto.java index 7e552a377..182f69976 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/UGraphicInterceptorGoto.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/UGraphicInterceptorGoto.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 10266 $ * */ package net.sourceforge.plantuml.activitydiagram3.ftile.vcompact; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/UGraphicInterceptorOneSwimlane.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/UGraphicInterceptorOneSwimlane.java index fcae6eb32..a4a0cbe95 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/UGraphicInterceptorOneSwimlane.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/UGraphicInterceptorOneSwimlane.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 10266 $ * */ package net.sourceforge.plantuml.activitydiagram3.ftile.vcompact; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/VCompactFactory.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/VCompactFactory.java index 6d8c28899..2566779f7 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/VCompactFactory.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/VCompactFactory.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8475 $ * */ package net.sourceforge.plantuml.activitydiagram3.ftile.vcompact; 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 5c9b211ea..818ad8909 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/cond/ConditionalBuilder.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/cond/ConditionalBuilder.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8475 $ * */ package net.sourceforge.plantuml.activitydiagram3.ftile.vcompact.cond; @@ -44,6 +41,7 @@ import net.sourceforge.plantuml.activitydiagram3.ftile.FtileFactory; import net.sourceforge.plantuml.activitydiagram3.ftile.FtileMinWidth; import net.sourceforge.plantuml.activitydiagram3.ftile.FtileUtils; import net.sourceforge.plantuml.activitydiagram3.ftile.Swimlane; +import net.sourceforge.plantuml.activitydiagram3.ftile.vcompact.FtileIfDown; import net.sourceforge.plantuml.activitydiagram3.ftile.vertical.FtileDiamond; import net.sourceforge.plantuml.activitydiagram3.ftile.vertical.FtileDiamondInside; import net.sourceforge.plantuml.creole.CreoleMode; @@ -104,10 +102,44 @@ public class ConditionalBuilder { ISkinParam skinParam, StringBounder stringBounder, FontConfiguration fcArrow, FontConfiguration fcTest) { final ConditionalBuilder builder = new ConditionalBuilder(swimlane, borderColor, backColor, arrowColor, ftileFactory, conditionStyle, branch1, branch2, skinParam, stringBounder, fcArrow, fcTest); +// if (isEmptyOrOnlySingleStop(branch2) && isEmptyOrOnlySingleStop(branch1) == false) { +// return builder.createDown(builder.getLabelBranch1(), builder.getLabelBranch2()); +// } +// if (branch1.isEmpty() && branch2.isOnlySingleStop()) { +// return builder.createDown(builder.getLabelBranch1(), builder.getLabelBranch2()); +// } +// if (isEmptyOrOnlySingleStop(branch1) && isEmptyOrOnlySingleStop(branch2) == false) { +// return builder.createDown(builder.getLabelBranch2(), builder.getLabelBranch1()); +// } +// if (branch2.isEmpty() && branch1.isOnlySingleStop()) { +// return builder.createDown(builder.getLabelBranch2(), builder.getLabelBranch1()); +// } return builder.createWithLinks(); // return builder.createWithDiamonds(); // return builder.createNude(); + } + private static boolean isEmptyOrOnlySingleStop(Branch branch) { + return branch.isEmpty() || branch.isOnlySingleStop(); + } + + private Ftile createDown(TextBlock tb1, TextBlock tb2) { + final Ftile diamond1 = getDiamond1(false, tb1, tb2); + final Ftile diamond2 = getDiamond2(); + if (branch2.isOnlySingleStop()) { + return FtileIfDown.create(diamond1, diamond2, swimlane, FtileUtils.addHorizontalMargin(tile1, 10), + arrowColor, ftileFactory, branch2.getFtile()); + } + if (branch1.isOnlySingleStop()) { + return FtileIfDown.create(diamond1, diamond2, swimlane, FtileUtils.addHorizontalMargin(tile2, 10), + arrowColor, ftileFactory, branch1.getFtile()); + } + if (branch1.isEmpty()) { + return FtileIfDown.create(diamond1, diamond2, swimlane, FtileUtils.addHorizontalMargin(tile2, 10), + arrowColor, ftileFactory, null); + } + return FtileIfDown.create(diamond1, diamond2, swimlane, FtileUtils.addHorizontalMargin(tile1, 10), arrowColor, + ftileFactory, null); } private Ftile createNude() { @@ -116,7 +148,7 @@ public class ConditionalBuilder { } private Ftile createWithDiamonds() { - final Ftile diamond1 = getDiamond1(); + final Ftile diamond1 = getDiamond1(true); final Ftile diamond2 = getDiamond2(); final FtileIfWithDiamonds ftile = new FtileIfWithDiamonds(diamond1, tile1, tile2, diamond2, swimlane, stringBounder); @@ -131,7 +163,7 @@ public class ConditionalBuilder { } private Ftile createWithLinks() { - final Ftile diamond1 = getDiamond1(); + final Ftile diamond1 = getDiamond1(true); final Ftile diamond2 = getDiamond2(); final Ftile tmp1 = FtileUtils.addHorizontalMargin(tile1, 10); final Ftile tmp2 = FtileUtils.addHorizontalMargin(tile2, 10); @@ -148,10 +180,12 @@ public class ConditionalBuilder { return result; } - private Ftile getDiamond1() { + private Ftile getDiamond1(boolean eastWest) { + return getDiamond1(eastWest, getLabelBranch1(), getLabelBranch2()); + } + + private Ftile getDiamond1(boolean eastWest, TextBlock tb1, TextBlock tb2) { final Display labelTest = branch1.getLabelTest(); - final TextBlock tb1 = getLabelBranch1(); - final TextBlock tb2 = getLabelBranch2(); final Sheet sheet = new CreoleParser(fontTest, skinParam.getDefaultTextAlignment(HorizontalAlignment.LEFT), skinParam, CreoleMode.FULL).createSheet(labelTest); @@ -160,11 +194,21 @@ public class ConditionalBuilder { final Ftile diamond1; if (conditionStyle == ConditionStyle.INSIDE) { - diamond1 = new FtileDiamondInside(tile1.skinParam(), backColor, borderColor, swimlane, tbTest) - .withWestAndEast(tb1, tb2); + if (eastWest) { + diamond1 = new FtileDiamondInside(tile1.skinParam(), backColor, borderColor, swimlane, tbTest) + .withWestAndEast(tb1, tb2); + } else { + diamond1 = new FtileDiamondInside(tile1.skinParam(), backColor, borderColor, swimlane, tbTest) + .withSouth(tb1).withEast(tb2); + } } else if (conditionStyle == ConditionStyle.DIAMOND) { - diamond1 = new FtileDiamond(tile1.skinParam(), backColor, borderColor, swimlane).withNorth(tbTest) - .withWestAndEast(tb1, tb2); + if (eastWest) { + diamond1 = new FtileDiamond(tile1.skinParam(), backColor, borderColor, swimlane).withNorth(tbTest) + .withWestAndEast(tb1, tb2); + } else { + diamond1 = new FtileDiamond(tile1.skinParam(), backColor, borderColor, swimlane).withNorth(tbTest) + .withSouth(tb1).withEast(tb2); + } } else { throw new IllegalStateException(); } diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/cond/FtileDimensionMemoize.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/cond/FtileDimensionMemoize.java index 8f864dca9..4905d91cc 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/cond/FtileDimensionMemoize.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/cond/FtileDimensionMemoize.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8475 $ * */ package net.sourceforge.plantuml.activitydiagram3.ftile.vcompact.cond; 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 f4ae077ca..19108702a 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/cond/FtileIfNude.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/cond/FtileIfNude.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8475 $ * */ package net.sourceforge.plantuml.activitydiagram3.ftile.vcompact.cond; 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 622edeaf3..dc709351a 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/cond/FtileIfWithDiamonds.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/cond/FtileIfWithDiamonds.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8475 $ * */ package net.sourceforge.plantuml.activitydiagram3.ftile.vcompact.cond; 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 124179fbe..2e848f2df 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/cond/FtileIfWithLinks.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/cond/FtileIfWithLinks.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8475 $ * */ package net.sourceforge.plantuml.activitydiagram3.ftile.vcompact.cond; @@ -49,6 +46,7 @@ import net.sourceforge.plantuml.activitydiagram3.ftile.Diamond; import net.sourceforge.plantuml.activitydiagram3.ftile.Ftile; import net.sourceforge.plantuml.activitydiagram3.ftile.FtileGeometry; import net.sourceforge.plantuml.activitydiagram3.ftile.FtileUtils; +import net.sourceforge.plantuml.activitydiagram3.ftile.MergeStrategy; import net.sourceforge.plantuml.activitydiagram3.ftile.Snake; import net.sourceforge.plantuml.activitydiagram3.ftile.Swimlane; import net.sourceforge.plantuml.graphic.Rainbow; @@ -115,7 +113,7 @@ public class FtileIfWithLinks extends FtileIfWithDiamonds { } private Point2D getP1(StringBounder stringBounder) { - final Dimension2D dimDiamond1 = diamond1.calculateDimension(stringBounder); + final FtileGeometry dimDiamond1 = diamond1.calculateDimension(stringBounder); final double diamondWidth = dimDiamond1.getWidth(); final double x; if (getFtile2() == tile1) { @@ -125,8 +123,9 @@ public class FtileIfWithLinks extends FtileIfWithDiamonds { } else { throw new IllegalStateException(); } + final double half = (dimDiamond1.getOutY() - dimDiamond1.getInY()) / 2; return getTranslateDiamond1(stringBounder) - .getTranslated(new Point2D.Double(x, dimDiamond1.getHeight() / 2)); + .getTranslated(new Point2D.Double(x, dimDiamond1.getInY() + half)); } private Point2D getP2(final StringBounder stringBounder) { @@ -165,6 +164,7 @@ public class FtileIfWithLinks extends FtileIfWithDiamonds { snake.addPoint(p1); snake.addPoint(p2.getX(), p1.getY()); snake.addPoint(p2); + snake.goUnmergeable(MergeStrategy.LIMITED); ug.draw(snake); } @@ -258,11 +258,13 @@ public class FtileIfWithLinks extends FtileIfWithDiamonds { snake.addPoint(mp1a.getX(), middle); snake.addPoint(mp2bc.getX(), middle); snake.addPoint(mp2bc); + snake.goUnmergeable(MergeStrategy.LIMITED); ug.draw(snake); final Snake small = new Snake(myArrowColor, arrow); small.addPoint(mp2bc); small.addPoint(mp2bc.getX(), mp2b.getY()); small.addPoint(mp2b); + small.goUnmergeable(MergeStrategy.LIMITED); ug.draw(small); } else { final double delta = (x2 > x1 ? -1 : 1) * 1.5 * Diamond.diamondHalfSize; @@ -272,11 +274,13 @@ public class FtileIfWithLinks extends FtileIfWithDiamonds { snake.addPoint(mp1a); snake.addPoint(mp1a.getX(), mp2bb.getY()); snake.addPoint(mp2bb); + snake.goUnmergeable(MergeStrategy.LIMITED); ug.draw(snake); final Snake small = new Snake(myArrowColor, arrow); small.addPoint(mp2bb); small.addPoint(mp2bb.getX(), mp2b.getY()); small.addPoint(mp2b); + small.goUnmergeable(MergeStrategy.LIMITED); ug.draw(small); } @@ -348,6 +352,7 @@ public class FtileIfWithLinks extends FtileIfWithDiamonds { snake.addPoint(x1, y2); snake.addPoint(mp2b); snake.addPoint(x2, dimTotal.getHeight()); + snake.goUnmergeable(MergeStrategy.LIMITED); ug.draw(snake); } @@ -368,18 +373,17 @@ public class FtileIfWithLinks extends FtileIfWithDiamonds { final List conns = new ArrayList(); conns.add(new ConnectionHorizontalThenVertical(tile1, branch1)); conns.add(new ConnectionHorizontalThenVertical(tile2, branch2)); - if (tile1.calculateDimension(stringBounder).hasPointOut() - && tile2.calculateDimension(stringBounder).hasPointOut()) { + final boolean hasPointOut1 = tile1.calculateDimension(stringBounder).hasPointOut(); + final boolean hasPointOut2 = tile2.calculateDimension(stringBounder).hasPointOut(); + if (hasPointOut1 && hasPointOut2) { conns.add(new ConnectionVerticalThenHorizontal(tile1, branch1.getInlinkRenderingColorAndStyle(), branch1 .isEmpty())); conns.add(new ConnectionVerticalThenHorizontal(tile2, branch2.getInlinkRenderingColorAndStyle(), branch2 .isEmpty())); - } else if (tile1.calculateDimension(stringBounder).hasPointOut() - && tile2.calculateDimension(stringBounder).hasPointOut() == false) { + } else if (hasPointOut1 && hasPointOut2 == false) { conns.add(new ConnectionVerticalThenHorizontalDirect(tile1, branch1.getInlinkRenderingColorAndStyle(), branch1.isEmpty())); - } else if (tile1.calculateDimension(stringBounder).hasPointOut() == false - && tile2.calculateDimension(stringBounder).hasPointOut()) { + } else if (hasPointOut1 == false && hasPointOut2) { conns.add(new ConnectionVerticalThenHorizontalDirect(tile2, branch2.getInlinkRenderingColorAndStyle(), branch2.isEmpty())); } diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileBlackBlock.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileBlackBlock.java index 69db8ce02..8862ab490 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileBlackBlock.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileBlackBlock.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8475 $ * */ package net.sourceforge.plantuml.activitydiagram3.ftile.vertical; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileBox.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileBox.java index 6fdb1e6a8..f02fa05b1 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileBox.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileBox.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8475 $ * */ package net.sourceforge.plantuml.activitydiagram3.ftile.vertical; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileCircleEnd.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileCircleEnd.java index b015cd8e2..753ba08fa 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileCircleEnd.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileCircleEnd.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5183 $ * */ package net.sourceforge.plantuml.activitydiagram3.ftile.vertical; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileCircleStart.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileCircleStart.java index 67f2f1364..310886595 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileCircleStart.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileCircleStart.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5183 $ * */ package net.sourceforge.plantuml.activitydiagram3.ftile.vertical; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileCircleStop.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileCircleStop.java index 49f45ee7a..a6d0d3a06 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileCircleStop.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileCircleStop.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5183 $ * */ package net.sourceforge.plantuml.activitydiagram3.ftile.vertical; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDecorate.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDecorate.java index 77bb11de0..ba399a531 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDecorate.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDecorate.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8475 $ * */ package net.sourceforge.plantuml.activitydiagram3.ftile.vertical; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDecorateIn.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDecorateIn.java index eec810e72..b6de936fa 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDecorateIn.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDecorateIn.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8475 $ * */ package net.sourceforge.plantuml.activitydiagram3.ftile.vertical; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDecorateOut.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDecorateOut.java index 9ae3452bb..9c36842c0 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDecorateOut.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDecorateOut.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8475 $ * */ package net.sourceforge.plantuml.activitydiagram3.ftile.vertical; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDecoratePointOut.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDecoratePointOut.java index 8fa6342d2..11215db16 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDecoratePointOut.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDecoratePointOut.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8475 $ * */ package net.sourceforge.plantuml.activitydiagram3.ftile.vertical; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamond.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamond.java index 458908fe4..90f18e35b 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamond.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamond.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5183 $ * */ package net.sourceforge.plantuml.activitydiagram3.ftile.vertical; @@ -119,15 +116,17 @@ public class FtileDiamond extends AbstractFtile { public void drawU(UGraphic ug) { + final double suppY1 = north.calculateDimension(ug.getStringBounder()).getHeight(); + ug = ug.apply(new UTranslate(0, suppY1)); ug.apply(new UChangeColor(borderColor)).apply(getThickness()).apply(new UChangeBackColor(backColor)) .draw(Diamond.asPolygon(skinParam().shadowing())); - final Dimension2D dimNorth = north.calculateDimension(ug.getStringBounder()); - north.drawU(ug.apply(new UTranslate(Diamond.diamondHalfSize * 1.5, -dimNorth.getHeight() - - Diamond.diamondHalfSize))); + // final Dimension2D dimNorth = north.calculateDimension(ug.getStringBounder()); + north.drawU(ug.apply(new UTranslate(Diamond.diamondHalfSize * 1.5, -suppY1))); - final Dimension2D dimSouth = south.calculateDimension(ug.getStringBounder()); - south.drawU(ug.apply(new UTranslate(-(dimSouth.getWidth() - 2 * Diamond.diamondHalfSize) / 2, - 2 * Diamond.diamondHalfSize))); + // final Dimension2D dimSouth = south.calculateDimension(ug.getStringBounder()); + south.drawU(ug.apply(new UTranslate(Diamond.diamondHalfSize * 1.5, 2 * Diamond.diamondHalfSize))); + // south.drawU(ug.apply(new UTranslate(-(dimSouth.getWidth() - 2 * Diamond.diamondHalfSize) / 2, + // 2 * Diamond.diamondHalfSize))); final Dimension2D dimWeat1 = west1.calculateDimension(ug.getStringBounder()); west1.drawU(ug.apply(new UTranslate(-dimWeat1.getWidth(), -dimWeat1.getHeight() + Diamond.diamondHalfSize))); @@ -138,8 +137,9 @@ public class FtileDiamond extends AbstractFtile { } public FtileGeometry calculateDimension(StringBounder stringBounder) { - final Dimension2D dim = new Dimension2DDouble(Diamond.diamondHalfSize * 2, Diamond.diamondHalfSize * 2); - return new FtileGeometry(dim, dim.getWidth() / 2, 0, dim.getHeight()); + final double suppY1 = north.calculateDimension(stringBounder).getHeight(); + final Dimension2D dim = new Dimension2DDouble(Diamond.diamondHalfSize * 2, Diamond.diamondHalfSize * 2 + suppY1); + return new FtileGeometry(dim, dim.getWidth() / 2, suppY1, dim.getHeight()); } public Ftile withWestAndEast(TextBlock tb1, TextBlock tb2) { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamondFoo1.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamondFoo1.java index 4c131a3a0..e5e9c6897 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamondFoo1.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamondFoo1.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5183 $ * */ package net.sourceforge.plantuml.activitydiagram3.ftile.vertical; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamondInside.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamondInside.java index 88b222196..54c27e116 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamondInside.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamondInside.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5183 $ * */ package net.sourceforge.plantuml.activitydiagram3.ftile.vertical; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamondInside2.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamondInside2.java index 4360ae9c8..a3d65fa2f 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamondInside2.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamondInside2.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5183 $ * */ package net.sourceforge.plantuml.activitydiagram3.ftile.vertical; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamondInside3.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamondInside3.java index 887858a61..b8ee9b11c 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamondInside3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vertical/FtileDiamondInside3.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5183 $ * */ package net.sourceforge.plantuml.activitydiagram3.ftile.vertical; diff --git a/src/net/sourceforge/plantuml/anim/AffineTransformation.java b/src/net/sourceforge/plantuml/anim/AffineTransformation.java index 860355d38..826d35057 100644 --- a/src/net/sourceforge/plantuml/anim/AffineTransformation.java +++ b/src/net/sourceforge/plantuml/anim/AffineTransformation.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6170 $ * */ package net.sourceforge.plantuml.anim; diff --git a/src/net/sourceforge/plantuml/anim/Animation.java b/src/net/sourceforge/plantuml/anim/Animation.java index b3352ea17..fc6d011da 100644 --- a/src/net/sourceforge/plantuml/anim/Animation.java +++ b/src/net/sourceforge/plantuml/anim/Animation.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6170 $ * */ package net.sourceforge.plantuml.anim; diff --git a/src/net/sourceforge/plantuml/anim/AnimationDecoder.java b/src/net/sourceforge/plantuml/anim/AnimationDecoder.java index 7824c8fea..48cc04509 100644 --- a/src/net/sourceforge/plantuml/anim/AnimationDecoder.java +++ b/src/net/sourceforge/plantuml/anim/AnimationDecoder.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6170 $ * */ package net.sourceforge.plantuml.anim; diff --git a/src/net/sourceforge/plantuml/anim/AnimationScript.java b/src/net/sourceforge/plantuml/anim/AnimationScript.java index baa22a548..16ba88084 100644 --- a/src/net/sourceforge/plantuml/anim/AnimationScript.java +++ b/src/net/sourceforge/plantuml/anim/AnimationScript.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6170 $ * */ package net.sourceforge.plantuml.anim; diff --git a/src/net/sourceforge/plantuml/ant/PlantUmlTask.java b/src/net/sourceforge/plantuml/ant/PlantUmlTask.java index fc01a5bd8..f886c5e3a 100644 --- a/src/net/sourceforge/plantuml/ant/PlantUmlTask.java +++ b/src/net/sourceforge/plantuml/ant/PlantUmlTask.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19636 $ * */ package net.sourceforge.plantuml.ant; @@ -301,6 +298,9 @@ public class PlantUmlTask extends Task { if ("eps".equalsIgnoreCase(s)) { option.setFileFormat(FileFormat.EPS); } + if ("braille".equalsIgnoreCase(s)) { + option.setFileFormat(FileFormat.BRAILLE_PNG); + } if ("pdf".equalsIgnoreCase(s)) { option.setFileFormat(FileFormat.PDF); } diff --git a/src/net/sourceforge/plantuml/api/CountRate.java b/src/net/sourceforge/plantuml/api/CountRate.java index c4121fff7..5e85e0d76 100644 --- a/src/net/sourceforge/plantuml/api/CountRate.java +++ b/src/net/sourceforge/plantuml/api/CountRate.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 9786 $ * */ package net.sourceforge.plantuml.api; diff --git a/src/net/sourceforge/plantuml/api/ImageDataComplex.java b/src/net/sourceforge/plantuml/api/ImageDataComplex.java index b4b823d7e..c57cff2ea 100644 --- a/src/net/sourceforge/plantuml/api/ImageDataComplex.java +++ b/src/net/sourceforge/plantuml/api/ImageDataComplex.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 9885 $ * */ package net.sourceforge.plantuml.api; diff --git a/src/net/sourceforge/plantuml/api/ImageDataSimple.java b/src/net/sourceforge/plantuml/api/ImageDataSimple.java index e5ba8e6f9..c1c521112 100644 --- a/src/net/sourceforge/plantuml/api/ImageDataSimple.java +++ b/src/net/sourceforge/plantuml/api/ImageDataSimple.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 9885 $ * */ package net.sourceforge.plantuml.api; diff --git a/src/net/sourceforge/plantuml/api/MagicArray.java b/src/net/sourceforge/plantuml/api/MagicArray.java index a723cd26d..d624cfd23 100644 --- a/src/net/sourceforge/plantuml/api/MagicArray.java +++ b/src/net/sourceforge/plantuml/api/MagicArray.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 9786 $ * */ package net.sourceforge.plantuml.api; diff --git a/src/net/sourceforge/plantuml/api/MyRunnable.java b/src/net/sourceforge/plantuml/api/MyRunnable.java index 73a964e6b..6c8467db7 100644 --- a/src/net/sourceforge/plantuml/api/MyRunnable.java +++ b/src/net/sourceforge/plantuml/api/MyRunnable.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 9786 $ * */ package net.sourceforge.plantuml.api; diff --git a/src/net/sourceforge/plantuml/api/NiceNumber.java b/src/net/sourceforge/plantuml/api/NiceNumber.java index b89f05e37..0b1634baf 100644 --- a/src/net/sourceforge/plantuml/api/NiceNumber.java +++ b/src/net/sourceforge/plantuml/api/NiceNumber.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 9786 $ * */ package net.sourceforge.plantuml.api; diff --git a/src/net/sourceforge/plantuml/api/PSystemFactory.java b/src/net/sourceforge/plantuml/api/PSystemFactory.java index b3581e2c9..d85ac1f93 100644 --- a/src/net/sourceforge/plantuml/api/PSystemFactory.java +++ b/src/net/sourceforge/plantuml/api/PSystemFactory.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 9786 $ * */ package net.sourceforge.plantuml.api; diff --git a/src/net/sourceforge/plantuml/api/PlantumlUtils.java b/src/net/sourceforge/plantuml/api/PlantumlUtils.java index 75dae28b6..4895aa299 100644 --- a/src/net/sourceforge/plantuml/api/PlantumlUtils.java +++ b/src/net/sourceforge/plantuml/api/PlantumlUtils.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 9786 $ * */ package net.sourceforge.plantuml.api; diff --git a/src/net/sourceforge/plantuml/api/TimeoutExecutor.java b/src/net/sourceforge/plantuml/api/TimeoutExecutor.java index f9860f2ca..ca1ef0785 100644 --- a/src/net/sourceforge/plantuml/api/TimeoutExecutor.java +++ b/src/net/sourceforge/plantuml/api/TimeoutExecutor.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 9786 $ * */ package net.sourceforge.plantuml.api; diff --git a/src/net/sourceforge/plantuml/api/mda/option2/MDADiagram.java b/src/net/sourceforge/plantuml/api/mda/option2/MDADiagram.java index 8fc1ef49a..108fc4893 100644 --- a/src/net/sourceforge/plantuml/api/mda/option2/MDADiagram.java +++ b/src/net/sourceforge/plantuml/api/mda/option2/MDADiagram.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 9786 $ * */ package net.sourceforge.plantuml.api.mda.option2; diff --git a/src/net/sourceforge/plantuml/api/mda/option2/MDAEntity.java b/src/net/sourceforge/plantuml/api/mda/option2/MDAEntity.java index 19e493760..cfa1e65ad 100644 --- a/src/net/sourceforge/plantuml/api/mda/option2/MDAEntity.java +++ b/src/net/sourceforge/plantuml/api/mda/option2/MDAEntity.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 9786 $ * */ package net.sourceforge.plantuml.api.mda.option2; diff --git a/src/net/sourceforge/plantuml/api/mda/option2/MDAPackage.java b/src/net/sourceforge/plantuml/api/mda/option2/MDAPackage.java index 2e8b77a09..f9bd4974d 100644 --- a/src/net/sourceforge/plantuml/api/mda/option2/MDAPackage.java +++ b/src/net/sourceforge/plantuml/api/mda/option2/MDAPackage.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 9786 $ * */ package net.sourceforge.plantuml.api.mda.option2; diff --git a/src/net/sourceforge/plantuml/api/mda/option2/MDAUtils.java b/src/net/sourceforge/plantuml/api/mda/option2/MDAUtils.java index 6ff9f0055..d5bdbf6a2 100644 --- a/src/net/sourceforge/plantuml/api/mda/option2/MDAUtils.java +++ b/src/net/sourceforge/plantuml/api/mda/option2/MDAUtils.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 9786 $ * */ package net.sourceforge.plantuml.api.mda.option2; diff --git a/src/net/sourceforge/plantuml/api/mda/option3/MDAVisitor.java b/src/net/sourceforge/plantuml/api/mda/option3/MDAVisitor.java index a5f79ac7a..975f6b576 100644 --- a/src/net/sourceforge/plantuml/api/mda/option3/MDAVisitor.java +++ b/src/net/sourceforge/plantuml/api/mda/option3/MDAVisitor.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 9786 $ * */ package net.sourceforge.plantuml.api.mda.option3; diff --git a/src/net/sourceforge/plantuml/applet/VersionApplet.java b/src/net/sourceforge/plantuml/applet/VersionApplet.java index 12c962b64..2d19a2429 100644 --- a/src/net/sourceforge/plantuml/applet/VersionApplet.java +++ b/src/net/sourceforge/plantuml/applet/VersionApplet.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * diff --git a/src/net/sourceforge/plantuml/asciiart/AbstractComponentText.java b/src/net/sourceforge/plantuml/asciiart/AbstractComponentText.java index 329c04fcf..cd0a3bf6b 100644 --- a/src/net/sourceforge/plantuml/asciiart/AbstractComponentText.java +++ b/src/net/sourceforge/plantuml/asciiart/AbstractComponentText.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4169 $ * */ package net.sourceforge.plantuml.asciiart; diff --git a/src/net/sourceforge/plantuml/asciiart/BasicCharArea.java b/src/net/sourceforge/plantuml/asciiart/BasicCharArea.java index 4bab45642..73a19bc2d 100644 --- a/src/net/sourceforge/plantuml/asciiart/BasicCharArea.java +++ b/src/net/sourceforge/plantuml/asciiart/BasicCharArea.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3826 $ * */ package net.sourceforge.plantuml.asciiart; diff --git a/src/net/sourceforge/plantuml/asciiart/BasicCharAreaImpl.java b/src/net/sourceforge/plantuml/asciiart/BasicCharAreaImpl.java index af3a3b99c..6c8d16fe8 100644 --- a/src/net/sourceforge/plantuml/asciiart/BasicCharAreaImpl.java +++ b/src/net/sourceforge/plantuml/asciiart/BasicCharAreaImpl.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.asciiart; diff --git a/src/net/sourceforge/plantuml/asciiart/ComponentTextActiveLine.java b/src/net/sourceforge/plantuml/asciiart/ComponentTextActiveLine.java index 4023f5b65..0209dcc65 100644 --- a/src/net/sourceforge/plantuml/asciiart/ComponentTextActiveLine.java +++ b/src/net/sourceforge/plantuml/asciiart/ComponentTextActiveLine.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4169 $ * */ package net.sourceforge.plantuml.asciiart; diff --git a/src/net/sourceforge/plantuml/asciiart/ComponentTextActor.java b/src/net/sourceforge/plantuml/asciiart/ComponentTextActor.java index dd4d9b532..88229bcaa 100644 --- a/src/net/sourceforge/plantuml/asciiart/ComponentTextActor.java +++ b/src/net/sourceforge/plantuml/asciiart/ComponentTextActor.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4169 $ * */ package net.sourceforge.plantuml.asciiart; diff --git a/src/net/sourceforge/plantuml/asciiart/ComponentTextArrow.java b/src/net/sourceforge/plantuml/asciiart/ComponentTextArrow.java index f3b798fcd..f3bc90a91 100644 --- a/src/net/sourceforge/plantuml/asciiart/ComponentTextArrow.java +++ b/src/net/sourceforge/plantuml/asciiart/ComponentTextArrow.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4169 $ * */ package net.sourceforge.plantuml.asciiart; diff --git a/src/net/sourceforge/plantuml/asciiart/ComponentTextDivider.java b/src/net/sourceforge/plantuml/asciiart/ComponentTextDivider.java index cf65b5509..03fab6a86 100644 --- a/src/net/sourceforge/plantuml/asciiart/ComponentTextDivider.java +++ b/src/net/sourceforge/plantuml/asciiart/ComponentTextDivider.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4169 $ * */ package net.sourceforge.plantuml.asciiart; diff --git a/src/net/sourceforge/plantuml/asciiart/ComponentTextGroupingBody.java b/src/net/sourceforge/plantuml/asciiart/ComponentTextGroupingBody.java index 0e978f60e..dfb4ed82f 100644 --- a/src/net/sourceforge/plantuml/asciiart/ComponentTextGroupingBody.java +++ b/src/net/sourceforge/plantuml/asciiart/ComponentTextGroupingBody.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4169 $ * */ package net.sourceforge.plantuml.asciiart; diff --git a/src/net/sourceforge/plantuml/asciiart/ComponentTextGroupingElse.java b/src/net/sourceforge/plantuml/asciiart/ComponentTextGroupingElse.java index 111af9282..55da2aafa 100644 --- a/src/net/sourceforge/plantuml/asciiart/ComponentTextGroupingElse.java +++ b/src/net/sourceforge/plantuml/asciiart/ComponentTextGroupingElse.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4169 $ * */ package net.sourceforge.plantuml.asciiart; diff --git a/src/net/sourceforge/plantuml/asciiart/ComponentTextGroupingHeader.java b/src/net/sourceforge/plantuml/asciiart/ComponentTextGroupingHeader.java index 8e06a5c03..6e644a60f 100644 --- a/src/net/sourceforge/plantuml/asciiart/ComponentTextGroupingHeader.java +++ b/src/net/sourceforge/plantuml/asciiart/ComponentTextGroupingHeader.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4169 $ * */ package net.sourceforge.plantuml.asciiart; diff --git a/src/net/sourceforge/plantuml/asciiart/ComponentTextGroupingTail.java b/src/net/sourceforge/plantuml/asciiart/ComponentTextGroupingTail.java index 10a7ba9f1..9d316e34a 100644 --- a/src/net/sourceforge/plantuml/asciiart/ComponentTextGroupingTail.java +++ b/src/net/sourceforge/plantuml/asciiart/ComponentTextGroupingTail.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4169 $ * */ package net.sourceforge.plantuml.asciiart; diff --git a/src/net/sourceforge/plantuml/asciiart/ComponentTextLine.java b/src/net/sourceforge/plantuml/asciiart/ComponentTextLine.java index 548fba7c0..b86ec6ad6 100644 --- a/src/net/sourceforge/plantuml/asciiart/ComponentTextLine.java +++ b/src/net/sourceforge/plantuml/asciiart/ComponentTextLine.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4169 $ * */ package net.sourceforge.plantuml.asciiart; diff --git a/src/net/sourceforge/plantuml/asciiart/ComponentTextNewpage.java b/src/net/sourceforge/plantuml/asciiart/ComponentTextNewpage.java index 554405b3f..0d22bd176 100644 --- a/src/net/sourceforge/plantuml/asciiart/ComponentTextNewpage.java +++ b/src/net/sourceforge/plantuml/asciiart/ComponentTextNewpage.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4169 $ * */ package net.sourceforge.plantuml.asciiart; diff --git a/src/net/sourceforge/plantuml/asciiart/ComponentTextNote.java b/src/net/sourceforge/plantuml/asciiart/ComponentTextNote.java index a65692ce4..691d7077d 100644 --- a/src/net/sourceforge/plantuml/asciiart/ComponentTextNote.java +++ b/src/net/sourceforge/plantuml/asciiart/ComponentTextNote.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4169 $ * */ package net.sourceforge.plantuml.asciiart; diff --git a/src/net/sourceforge/plantuml/asciiart/ComponentTextParticipant.java b/src/net/sourceforge/plantuml/asciiart/ComponentTextParticipant.java index d082c045c..bbcc6a049 100644 --- a/src/net/sourceforge/plantuml/asciiart/ComponentTextParticipant.java +++ b/src/net/sourceforge/plantuml/asciiart/ComponentTextParticipant.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4169 $ * */ package net.sourceforge.plantuml.asciiart; diff --git a/src/net/sourceforge/plantuml/asciiart/ComponentTextSelfArrow.java b/src/net/sourceforge/plantuml/asciiart/ComponentTextSelfArrow.java index f6da4b404..515d532b1 100644 --- a/src/net/sourceforge/plantuml/asciiart/ComponentTextSelfArrow.java +++ b/src/net/sourceforge/plantuml/asciiart/ComponentTextSelfArrow.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4169 $ * */ package net.sourceforge.plantuml.asciiart; diff --git a/src/net/sourceforge/plantuml/asciiart/TextSkin.java b/src/net/sourceforge/plantuml/asciiart/TextSkin.java index 27412332b..7a3edc8a3 100644 --- a/src/net/sourceforge/plantuml/asciiart/TextSkin.java +++ b/src/net/sourceforge/plantuml/asciiart/TextSkin.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19529 $ * */ package net.sourceforge.plantuml.asciiart; diff --git a/src/net/sourceforge/plantuml/asciiart/TextStringBounder.java b/src/net/sourceforge/plantuml/asciiart/TextStringBounder.java index 124952621..5ccf37bd6 100644 --- a/src/net/sourceforge/plantuml/asciiart/TextStringBounder.java +++ b/src/net/sourceforge/plantuml/asciiart/TextStringBounder.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4246 $ * */ package net.sourceforge.plantuml.asciiart; diff --git a/src/net/sourceforge/plantuml/asciiart/TranslatedCharArea.java b/src/net/sourceforge/plantuml/asciiart/TranslatedCharArea.java index 27340426d..5f13ac8df 100644 --- a/src/net/sourceforge/plantuml/asciiart/TranslatedCharArea.java +++ b/src/net/sourceforge/plantuml/asciiart/TranslatedCharArea.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5109 $ * */ package net.sourceforge.plantuml.asciiart; diff --git a/src/net/sourceforge/plantuml/asciiart/UmlCharArea.java b/src/net/sourceforge/plantuml/asciiart/UmlCharArea.java index c87d81a2a..280641fa1 100644 --- a/src/net/sourceforge/plantuml/asciiart/UmlCharArea.java +++ b/src/net/sourceforge/plantuml/asciiart/UmlCharArea.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3826 $ * */ package net.sourceforge.plantuml.asciiart; diff --git a/src/net/sourceforge/plantuml/asciiart/UmlCharAreaImpl.java b/src/net/sourceforge/plantuml/asciiart/UmlCharAreaImpl.java index 8a9d3f88f..f1d506a71 100644 --- a/src/net/sourceforge/plantuml/asciiart/UmlCharAreaImpl.java +++ b/src/net/sourceforge/plantuml/asciiart/UmlCharAreaImpl.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19885 $ * */ package net.sourceforge.plantuml.asciiart; diff --git a/src/net/sourceforge/plantuml/braille/BrailleChar.java b/src/net/sourceforge/plantuml/braille/BrailleChar.java new file mode 100644 index 000000000..0e62004ed --- /dev/null +++ b/src/net/sourceforge/plantuml/braille/BrailleChar.java @@ -0,0 +1,168 @@ +/* ======================================================================== + * PlantUML : a free UML diagram generator + * ======================================================================== + * + * (C) Copyright 2009-2017, Arnaud Roques + * + * Project Info: http://plantuml.com + * + * 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.braille; + +public class BrailleChar { + + private final int id; + + private BrailleChar(int id) { + this.id = id; + } + + public void draw(BrailleGrid grid, double xv, double yv) { + final int x = grid.toInt(xv); + final int y = grid.toInt(yv); + drawOneSpot(grid, x + 0, y + 0, 1); + drawOneSpot(grid, x + 0, y + 1, 2); + drawOneSpot(grid, x + 0, y + 2, 4); + drawOneSpot(grid, x + 1, y + 0, 8); + drawOneSpot(grid, x + 1, y + 1, 16); + drawOneSpot(grid, x + 1, y + 2, 32); + } + + private void drawOneSpot(BrailleGrid grid, int x, int y, int check) { + if ((id & check) != 0) { + grid.setState(x, y, true); + } + + } + + public static BrailleChar fromChar(char c) { + if (c == 'a' || c == 'A' || c == '1') { + return new BrailleChar(1); + } + if (c == 'b' || c == 'B' || c == '2') { + return new BrailleChar(1 + 2); + } + if (c == 'c' || c == 'C' || c == '3') { + return new BrailleChar(1 + 8); + } + if (c == 'd' || c == 'D' || c == '4') { + return new BrailleChar(1 + 8 + 16); + } + if (c == 'e' || c == 'E' || c == '5') { + return new BrailleChar(1 + 16); + } + if (c == 'f' || c == 'F' || c == '6') { + return new BrailleChar(1 + 8 + 2); + } + if (c == 'g' || c == 'G' || c == '7') { + return new BrailleChar(1 + 2 + 8 + 16); + } + if (c == 'h' || c == 'H' || c == '8') { + return new BrailleChar(1 + 2 + 16); + } + if (c == 'i' || c == 'I' || c == '9') { + return new BrailleChar(2 + 8); + } + if (c == 'j' || c == 'J' || c == '0') { + return new BrailleChar(2 + 8 + 16); + } + if (c == 'k' || c == 'K') { + return new BrailleChar(1 + 4); + } + if (c == 'l' || c == 'L') { + return new BrailleChar(1 + 2 + 4); + } + if (c == 'm' || c == 'M') { + return new BrailleChar(1 + 4 + 8); + } + if (c == 'n' || c == 'N') { + return new BrailleChar(1 + 4 + 8 + 16); + } + if (c == 'o' || c == 'O') { + return new BrailleChar(1 + 4 + 16); + } + if (c == 'p' || c == 'P') { + return new BrailleChar(1 + 2 + 4 + 8); + } + if (c == 'q' || c == 'Q') { + return new BrailleChar(1 + 2 + 4 + 8 + 16); + } + if (c == 'r' || c == 'R') { + return new BrailleChar(1 + 2 + 4 + 16); + } + if (c == 's' || c == 'S') { + return new BrailleChar(2 + 4 + 8); + } + if (c == 't' || c == 'T') { + return new BrailleChar(2 + 4 + 8 + 16); + } + if (c == 'u' || c == 'U') { + return new BrailleChar(1 + 4 + 32); + } + if (c == 'v' || c == 'V') { + return new BrailleChar(1 + 2 + 4 + 32); + } + if (c == 'w' || c == 'W') { + return new BrailleChar(2 + 8 + 16 + 32); + } + if (c == 'x' || c == 'X') { + return new BrailleChar(1 + 4 + 8 + 32); + } + if (c == 'y' || c == 'Y') { + return new BrailleChar(1 + 4 + 8 + 16 + 32); + } + if (c == 'z' || c == 'Z') { + return new BrailleChar(1 + 4 + 16 + 32); + } + if (c == ' ') { + return new BrailleChar(0); + } + if (c == '\'') { + return new BrailleChar(2); + } + if (c == ';') { + return new BrailleChar(2 + 4); + } + if (c == ':') { + return new BrailleChar(2 + 16); + } + if (c == '!') { + return new BrailleChar(2 + 4 + 16); + } + if (c == '(' || c == ')') { + return new BrailleChar(2 + 4 + 16 + 32); + } + if (c == '?' || c == '.' || c == '\"') { + return new BrailleChar(2 + 4 + 32); + } + if (c == ',') { + return new BrailleChar(4); + } + if (c == '-') { + return new BrailleChar(4 + 32); + } + return new BrailleChar(63); + } + +} diff --git a/src/net/sourceforge/plantuml/braille/BrailleCharFactory.java b/src/net/sourceforge/plantuml/braille/BrailleCharFactory.java new file mode 100644 index 000000000..4d5c4e20b --- /dev/null +++ b/src/net/sourceforge/plantuml/braille/BrailleCharFactory.java @@ -0,0 +1,47 @@ +/* ======================================================================== + * PlantUML : a free UML diagram generator + * ======================================================================== + * + * (C) Copyright 2009-2017, Arnaud Roques + * + * Project Info: http://plantuml.com + * + * 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.braille; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +public class BrailleCharFactory { + + public static List build(String s) { + final List result = new ArrayList(); + for (int i = 0; i < s.length(); i++) { + result.add(BrailleChar.fromChar(s.charAt(i))); + } + return Collections.unmodifiableList(result); + } + +} diff --git a/src/net/sourceforge/plantuml/braille/BrailleDrawer.java b/src/net/sourceforge/plantuml/braille/BrailleDrawer.java index ac1b126a4..eae3343f1 100644 --- a/src/net/sourceforge/plantuml/braille/BrailleDrawer.java +++ b/src/net/sourceforge/plantuml/braille/BrailleDrawer.java @@ -23,22 +23,21 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6170 $ * */ package net.sourceforge.plantuml.braille; +import net.sourceforge.plantuml.graphic.HtmlColorSetSimple; import net.sourceforge.plantuml.graphic.HtmlColorUtils; import net.sourceforge.plantuml.graphic.UDrawable; import net.sourceforge.plantuml.ugraphic.UChangeBackColor; import net.sourceforge.plantuml.ugraphic.UChangeColor; import net.sourceforge.plantuml.ugraphic.UEllipse; import net.sourceforge.plantuml.ugraphic.UGraphic; +import net.sourceforge.plantuml.ugraphic.ULine; import net.sourceforge.plantuml.ugraphic.UTranslate; public class BrailleDrawer implements UDrawable { @@ -52,6 +51,15 @@ public class BrailleDrawer implements UDrawable { } public void drawU(UGraphic ug) { + ug = ug.apply(new UChangeColor(new HtmlColorSetSimple().getColorIfValid("#F0F0F0"))); + for (int x = grid.getMinX(); x <= grid.getMaxX(); x++) { + ug.apply(new UTranslate(x * step + spotSize + 1, 0)).draw( + new ULine(0, (grid.getMaxY() - grid.getMinY()) * step)); + } + for (int y = grid.getMinY(); y <= grid.getMaxY(); y++) { + ug.apply(new UTranslate(0, y * step + spotSize + 1)).draw( + new ULine((grid.getMaxX() - grid.getMinX()) * step, 0)); + } ug = ug.apply(new UChangeColor(HtmlColorUtils.BLACK)).apply(new UChangeBackColor(HtmlColorUtils.BLACK)); for (int x = grid.getMinX(); x <= grid.getMaxX(); x++) { for (int y = grid.getMinY(); y <= grid.getMaxY(); y++) { diff --git a/src/net/sourceforge/plantuml/braille/BrailleGrid.java b/src/net/sourceforge/plantuml/braille/BrailleGrid.java index e2165a632..fde7978db 100644 --- a/src/net/sourceforge/plantuml/braille/BrailleGrid.java +++ b/src/net/sourceforge/plantuml/braille/BrailleGrid.java @@ -23,19 +23,21 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6170 $ * */ package net.sourceforge.plantuml.braille; +import java.awt.geom.CubicCurve2D; +import java.awt.geom.Point2D; import java.util.HashSet; +import java.util.List; import java.util.Set; +import net.sourceforge.plantuml.posimo.DotPath; + public class BrailleGrid { private int minX; @@ -55,6 +57,10 @@ public class BrailleGrid { return on.contains(coords); } + private void setStateDouble(double x, double y, boolean state) { + setState(toInt(x), toInt(y), state); + } + public void setState(int x, int y, boolean state) { final Coords coords = new Coords(x, y); if (state) { @@ -110,7 +116,7 @@ public class BrailleGrid { } } - private int toInt(double value) { + public int toInt(double value) { return (int) Math.round(value / quanta); } @@ -124,4 +130,50 @@ public class BrailleGrid { } } + + public double getQuanta() { + return quanta; + } + + public void drawDotPath(double x, double y, DotPath shape) { + for (CubicCurve2D.Double bez : shape.getBeziers()) { + drawCubic(x, y, bez); + + } + } + + private void drawCubic(double x, double y, CubicCurve2D.Double bez) { + drawPointInternal(x, y, bez.getP1()); + drawPointInternal(x, y, bez.getP2()); + if (bez.getP1().distance(bez.getP2()) > quanta) { + final CubicCurve2D.Double part1 = new CubicCurve2D.Double(); + final CubicCurve2D.Double part2 = new CubicCurve2D.Double(); + bez.subdivide(part1, part2); + drawCubic(x, y, part1); + drawCubic(x, y, part2); + } + } + + private void drawPointInternal(double x, double y, Point2D pt) { + setStateDouble(x + pt.getX(), y + pt.getY(), true); + } + + public void drawPolygon(List points) { + for (int i = 0; i < points.size() - 1; i++) { + drawLineInternal(points.get(i), points.get(i + 1)); + } + drawLineInternal(points.get(points.size() - 1), points.get(0)); + + } + + private void drawLineInternal(Point2D a, Point2D b) { + drawPointInternal(0, 0, a); + drawPointInternal(0, 0, b); + if (a.distance(b) > quanta) { + final Point2D middle = new Point2D.Double((a.getX() + b.getX()) / 2, (a.getY() + b.getY()) / 2); + drawLineInternal(a, middle); + drawLineInternal(middle, b); + + } + } } diff --git a/src/net/sourceforge/plantuml/braille/BrailleUtils.java b/src/net/sourceforge/plantuml/braille/BrailleUtils.java index 109cddd3b..ed69d7a3a 100644 --- a/src/net/sourceforge/plantuml/braille/BrailleUtils.java +++ b/src/net/sourceforge/plantuml/braille/BrailleUtils.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6170 $ * */ package net.sourceforge.plantuml.braille; diff --git a/src/net/sourceforge/plantuml/braille/Coords.java b/src/net/sourceforge/plantuml/braille/Coords.java index 02f0de60f..61eed9b65 100644 --- a/src/net/sourceforge/plantuml/braille/Coords.java +++ b/src/net/sourceforge/plantuml/braille/Coords.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6170 $ * */ package net.sourceforge.plantuml.braille; diff --git a/src/net/sourceforge/plantuml/braille/DriverCenteredCharacterBraille.java b/src/net/sourceforge/plantuml/braille/DriverCenteredCharacterBraille.java new file mode 100644 index 000000000..f521e0b16 --- /dev/null +++ b/src/net/sourceforge/plantuml/braille/DriverCenteredCharacterBraille.java @@ -0,0 +1,51 @@ +/* ======================================================================== + * PlantUML : a free UML diagram generator + * ======================================================================== + * + * (C) Copyright 2009-2017, Arnaud Roques + * + * Project Info: http://plantuml.com + * + * 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.braille; + +import net.sourceforge.plantuml.ugraphic.ColorMapper; +import net.sourceforge.plantuml.ugraphic.UCenteredCharacter; +import net.sourceforge.plantuml.ugraphic.UDriver; +import net.sourceforge.plantuml.ugraphic.UParam; +import net.sourceforge.plantuml.ugraphic.UShape; + +public class DriverCenteredCharacterBraille implements UDriver { + + public void draw(UShape ushape, double x, double y, ColorMapper mapper, UParam param, BrailleGrid grid) { + final UCenteredCharacter characterCircled = (UCenteredCharacter) ushape; + + final double xpos = x; + final double ypos = y; + + final BrailleChar bchar = BrailleCharFactory.build("" + characterCircled.getChar()).get(0); + bchar.draw(grid, xpos, ypos); + } + +} diff --git a/src/net/sourceforge/plantuml/braille/DriverDotPathBraille.java b/src/net/sourceforge/plantuml/braille/DriverDotPathBraille.java new file mode 100644 index 000000000..91f1a2f14 --- /dev/null +++ b/src/net/sourceforge/plantuml/braille/DriverDotPathBraille.java @@ -0,0 +1,48 @@ +/* ======================================================================== + * PlantUML : a free UML diagram generator + * ======================================================================== + * + * (C) Copyright 2009-2017, Arnaud Roques + * + * Project Info: http://plantuml.com + * + * 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.braille; + +import net.sourceforge.plantuml.posimo.DotPath; +import net.sourceforge.plantuml.ugraphic.ColorMapper; +import net.sourceforge.plantuml.ugraphic.UDriver; +import net.sourceforge.plantuml.ugraphic.UParam; +import net.sourceforge.plantuml.ugraphic.UShape; + +public class DriverDotPathBraille implements UDriver { + + public void draw(UShape ushape, double x, double y, ColorMapper mapper, UParam param, BrailleGrid grid) { + final DotPath shape = (DotPath) ushape; + + if (param.getColor() != null) { + grid.drawDotPath(x, y, shape); + } + } +} diff --git a/src/net/sourceforge/plantuml/braille/DriverLineBraille.java b/src/net/sourceforge/plantuml/braille/DriverLineBraille.java index ffae14aca..e452b907d 100644 --- a/src/net/sourceforge/plantuml/braille/DriverLineBraille.java +++ b/src/net/sourceforge/plantuml/braille/DriverLineBraille.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * diff --git a/src/net/sourceforge/plantuml/braille/DriverNoneBraille.java b/src/net/sourceforge/plantuml/braille/DriverNoneBraille.java index bfd48aff3..2e22e2126 100644 --- a/src/net/sourceforge/plantuml/braille/DriverNoneBraille.java +++ b/src/net/sourceforge/plantuml/braille/DriverNoneBraille.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * diff --git a/src/net/sourceforge/plantuml/braille/DriverPolygonBraille.java b/src/net/sourceforge/plantuml/braille/DriverPolygonBraille.java new file mode 100644 index 000000000..6153c0c87 --- /dev/null +++ b/src/net/sourceforge/plantuml/braille/DriverPolygonBraille.java @@ -0,0 +1,74 @@ +/* ======================================================================== + * PlantUML : a free UML diagram generator + * ======================================================================== + * + * (C) Copyright 2009-2017, Arnaud Roques + * + * Project Info: http://plantuml.com + * + * 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.braille; + +import java.awt.geom.Point2D; +import java.util.ArrayList; +import java.util.List; + +import net.sourceforge.plantuml.ugraphic.ClipContainer; +import net.sourceforge.plantuml.ugraphic.ColorMapper; +import net.sourceforge.plantuml.ugraphic.UClip; +import net.sourceforge.plantuml.ugraphic.UDriver; +import net.sourceforge.plantuml.ugraphic.UParam; +import net.sourceforge.plantuml.ugraphic.UPolygon; +import net.sourceforge.plantuml.ugraphic.UShape; +import net.sourceforge.plantuml.ugraphic.UTranslate; + +public class DriverPolygonBraille implements UDriver { + + private final ClipContainer clipContainer; + + public DriverPolygonBraille(ClipContainer clipContainer) { + this.clipContainer = clipContainer; + } + + public void draw(UShape ushape, double x, double y, ColorMapper mapper, UParam param, BrailleGrid grid) { + final UPolygon shape = (UPolygon) ushape; + + final List points = new ArrayList(); + int i = 0; + + for (Point2D pt : shape.getPoints()) { + points.add(new UTranslate(x, y).getTranslated(pt)); + } + + final UClip clip = clipContainer.getClip(); + if (clip != null) { + for (Point2D pt : points) { + if (clip.isInside(pt) == false) { + return; + } + } + } + + grid.drawPolygon(points); + } +} diff --git a/src/net/sourceforge/plantuml/braille/DriverRectangleBraille.java b/src/net/sourceforge/plantuml/braille/DriverRectangleBraille.java index c7976e547..066abe1f5 100644 --- a/src/net/sourceforge/plantuml/braille/DriverRectangleBraille.java +++ b/src/net/sourceforge/plantuml/braille/DriverRectangleBraille.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * diff --git a/src/net/sourceforge/plantuml/braille/DriverTextBraille.java b/src/net/sourceforge/plantuml/braille/DriverTextBraille.java new file mode 100644 index 000000000..d1cc95aee --- /dev/null +++ b/src/net/sourceforge/plantuml/braille/DriverTextBraille.java @@ -0,0 +1,55 @@ +/* ======================================================================== + * PlantUML : a free UML diagram generator + * ======================================================================== + * + * (C) Copyright 2009-2017, Arnaud Roques + * + * Project Info: http://plantuml.com + * + * 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.braille; + +import net.sourceforge.plantuml.ugraphic.ColorMapper; +import net.sourceforge.plantuml.ugraphic.UDriver; +import net.sourceforge.plantuml.ugraphic.UParam; +import net.sourceforge.plantuml.ugraphic.UShape; +import net.sourceforge.plantuml.ugraphic.UText; + +public class DriverTextBraille implements UDriver { + + public DriverTextBraille() { + } + + public void draw(UShape ushape, double x, double y, ColorMapper mapper, UParam param, BrailleGrid grid) { + final UText text = (UText) ushape; + + y -= grid.getQuanta() * 3; + x += grid.getQuanta(); + + for (BrailleChar bchar : BrailleCharFactory.build(text.getText())) { + bchar.draw(grid, x, y); + x += grid.getQuanta() * 3; + } + + } +} diff --git a/src/net/sourceforge/plantuml/braille/UGraphicBraille.java b/src/net/sourceforge/plantuml/braille/UGraphicBraille.java index 9912d60d0..957c45f09 100644 --- a/src/net/sourceforge/plantuml/braille/UGraphicBraille.java +++ b/src/net/sourceforge/plantuml/braille/UGraphicBraille.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * @@ -39,7 +37,6 @@ import net.sourceforge.plantuml.FileFormatOption; import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.graphic.HtmlColorUtils; import net.sourceforge.plantuml.graphic.StringBounder; -import net.sourceforge.plantuml.graphic.TextBlockUtils; import net.sourceforge.plantuml.posimo.DotPath; import net.sourceforge.plantuml.ugraphic.AbstractCommonUGraphic; import net.sourceforge.plantuml.ugraphic.AbstractUGraphic; @@ -57,9 +54,10 @@ import net.sourceforge.plantuml.ugraphic.UPolygon; import net.sourceforge.plantuml.ugraphic.URectangle; import net.sourceforge.plantuml.ugraphic.UText; +// https://www.branah.com/braille-translator public class UGraphicBraille extends AbstractUGraphic implements ClipContainer, UGraphic2 { - private final StringBounder stringBounder; + public static final int QUANTA = 4; private final BrailleGrid grid; @Override @@ -68,12 +66,11 @@ public class UGraphicBraille extends AbstractUGraphic implements Cl } public UGraphicBraille(ColorMapper colorMapper, FileFormat fileFormat) { - this(colorMapper, new BrailleGrid(4)); + this(colorMapper, new BrailleGrid(QUANTA)); } private UGraphicBraille(UGraphicBraille other) { super(other); - this.stringBounder = other.stringBounder; this.grid = other.grid; register(); } @@ -98,24 +95,24 @@ public class UGraphicBraille extends AbstractUGraphic implements Cl private UGraphicBraille(ColorMapper colorMapper, BrailleGrid grid) { super(colorMapper, grid); this.grid = grid; - this.stringBounder = TextBlockUtils.getDummyStringBounder(); register(); } private void register() { + registerDriver(URectangle.class, new DriverNoneBraille()); registerDriver(URectangle.class, new DriverRectangleBraille(this)); - registerDriver(UText.class, new DriverNoneBraille()); + registerDriver(UText.class, new DriverTextBraille()); registerDriver(ULine.class, new DriverLineBraille(this)); - registerDriver(UPolygon.class, new DriverNoneBraille()); + registerDriver(UPolygon.class, new DriverPolygonBraille(this)); registerDriver(UEllipse.class, new DriverNoneBraille()); registerDriver(UImage.class, new DriverNoneBraille()); registerDriver(UPath.class, new DriverNoneBraille()); - registerDriver(DotPath.class, new DriverNoneBraille()); - registerDriver(UCenteredCharacter.class, new DriverNoneBraille()); + registerDriver(DotPath.class, new DriverDotPathBraille()); + registerDriver(UCenteredCharacter.class, new DriverCenteredCharacterBraille()); } public StringBounder getStringBounder() { - return stringBounder; + return FileFormat.BRAILLE_PNG.getDefaultStringBounder(); } public void startUrl(Url url) { diff --git a/src/net/sourceforge/plantuml/classdiagram/AbstractEntityDiagram.java b/src/net/sourceforge/plantuml/classdiagram/AbstractEntityDiagram.java index dbcb2e31e..9accd94e0 100644 --- a/src/net/sourceforge/plantuml/classdiagram/AbstractEntityDiagram.java +++ b/src/net/sourceforge/plantuml/classdiagram/AbstractEntityDiagram.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.classdiagram; diff --git a/src/net/sourceforge/plantuml/classdiagram/ClassDiagram.java b/src/net/sourceforge/plantuml/classdiagram/ClassDiagram.java index b49b92351..5acad302f 100644 --- a/src/net/sourceforge/plantuml/classdiagram/ClassDiagram.java +++ b/src/net/sourceforge/plantuml/classdiagram/ClassDiagram.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19886 $ * */ package net.sourceforge.plantuml.classdiagram; diff --git a/src/net/sourceforge/plantuml/classdiagram/ClassDiagramFactory.java b/src/net/sourceforge/plantuml/classdiagram/ClassDiagramFactory.java index e453ae70d..93155d3ca 100644 --- a/src/net/sourceforge/plantuml/classdiagram/ClassDiagramFactory.java +++ b/src/net/sourceforge/plantuml/classdiagram/ClassDiagramFactory.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 10006 $ * */ package net.sourceforge.plantuml.classdiagram; diff --git a/src/net/sourceforge/plantuml/classdiagram/FullLayout.java b/src/net/sourceforge/plantuml/classdiagram/FullLayout.java index f6c8badb8..69ebbc9ed 100644 --- a/src/net/sourceforge/plantuml/classdiagram/FullLayout.java +++ b/src/net/sourceforge/plantuml/classdiagram/FullLayout.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 14203 $ * */ package net.sourceforge.plantuml.classdiagram; diff --git a/src/net/sourceforge/plantuml/classdiagram/RowLayout.java b/src/net/sourceforge/plantuml/classdiagram/RowLayout.java index 4be925e32..90f6a339a 100644 --- a/src/net/sourceforge/plantuml/classdiagram/RowLayout.java +++ b/src/net/sourceforge/plantuml/classdiagram/RowLayout.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 14203 $ * */ package net.sourceforge.plantuml.classdiagram; diff --git a/src/net/sourceforge/plantuml/classdiagram/command/CommandAddMethod.java b/src/net/sourceforge/plantuml/classdiagram/command/CommandAddMethod.java index 422a8eeca..1652b5e9a 100644 --- a/src/net/sourceforge/plantuml/classdiagram/command/CommandAddMethod.java +++ b/src/net/sourceforge/plantuml/classdiagram/command/CommandAddMethod.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.classdiagram.command; diff --git a/src/net/sourceforge/plantuml/classdiagram/command/CommandAllowMixing.java b/src/net/sourceforge/plantuml/classdiagram/command/CommandAllowMixing.java index 72189ba11..17ba76f82 100644 --- a/src/net/sourceforge/plantuml/classdiagram/command/CommandAllowMixing.java +++ b/src/net/sourceforge/plantuml/classdiagram/command/CommandAllowMixing.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 7715 $ * */ package net.sourceforge.plantuml.classdiagram.command; diff --git a/src/net/sourceforge/plantuml/classdiagram/command/CommandCreateClass.java b/src/net/sourceforge/plantuml/classdiagram/command/CommandCreateClass.java index dd9a50487..edb7b3a0c 100644 --- a/src/net/sourceforge/plantuml/classdiagram/command/CommandCreateClass.java +++ b/src/net/sourceforge/plantuml/classdiagram/command/CommandCreateClass.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5075 $ * */ package net.sourceforge.plantuml.classdiagram.command; diff --git a/src/net/sourceforge/plantuml/classdiagram/command/CommandCreateClassMultilines.java b/src/net/sourceforge/plantuml/classdiagram/command/CommandCreateClassMultilines.java index 469274f88..bcfd053f4 100644 --- a/src/net/sourceforge/plantuml/classdiagram/command/CommandCreateClassMultilines.java +++ b/src/net/sourceforge/plantuml/classdiagram/command/CommandCreateClassMultilines.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4161 $ * */ package net.sourceforge.plantuml.classdiagram.command; diff --git a/src/net/sourceforge/plantuml/classdiagram/command/CommandCreateElementFull2.java b/src/net/sourceforge/plantuml/classdiagram/command/CommandCreateElementFull2.java index 00b95af51..0b3da693f 100644 --- a/src/net/sourceforge/plantuml/classdiagram/command/CommandCreateElementFull2.java +++ b/src/net/sourceforge/plantuml/classdiagram/command/CommandCreateElementFull2.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 7715 $ * */ package net.sourceforge.plantuml.classdiagram.command; diff --git a/src/net/sourceforge/plantuml/classdiagram/command/CommandDiamondAssociation.java b/src/net/sourceforge/plantuml/classdiagram/command/CommandDiamondAssociation.java index c4c09ae1a..ef6757474 100644 --- a/src/net/sourceforge/plantuml/classdiagram/command/CommandDiamondAssociation.java +++ b/src/net/sourceforge/plantuml/classdiagram/command/CommandDiamondAssociation.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5618 $ * */ package net.sourceforge.plantuml.classdiagram.command; diff --git a/src/net/sourceforge/plantuml/classdiagram/command/CommandHideShow.java b/src/net/sourceforge/plantuml/classdiagram/command/CommandHideShow.java index 67ac4a191..090a4c39e 100644 --- a/src/net/sourceforge/plantuml/classdiagram/command/CommandHideShow.java +++ b/src/net/sourceforge/plantuml/classdiagram/command/CommandHideShow.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5019 $ * */ package net.sourceforge.plantuml.classdiagram.command; diff --git a/src/net/sourceforge/plantuml/classdiagram/command/CommandHideShow3.java b/src/net/sourceforge/plantuml/classdiagram/command/CommandHideShow3.java index 2bed9c7b6..4274a1e90 100644 --- a/src/net/sourceforge/plantuml/classdiagram/command/CommandHideShow3.java +++ b/src/net/sourceforge/plantuml/classdiagram/command/CommandHideShow3.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5019 $ * */ package net.sourceforge.plantuml.classdiagram.command; diff --git a/src/net/sourceforge/plantuml/classdiagram/command/CommandHideShowSpecificClass.java b/src/net/sourceforge/plantuml/classdiagram/command/CommandHideShowSpecificClass.java index b71308bee..13560396e 100644 --- a/src/net/sourceforge/plantuml/classdiagram/command/CommandHideShowSpecificClass.java +++ b/src/net/sourceforge/plantuml/classdiagram/command/CommandHideShowSpecificClass.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5019 $ * */ package net.sourceforge.plantuml.classdiagram.command; diff --git a/src/net/sourceforge/plantuml/classdiagram/command/CommandHideShowSpecificStereotype.java b/src/net/sourceforge/plantuml/classdiagram/command/CommandHideShowSpecificStereotype.java index e94560e16..e1b148cc4 100644 --- a/src/net/sourceforge/plantuml/classdiagram/command/CommandHideShowSpecificStereotype.java +++ b/src/net/sourceforge/plantuml/classdiagram/command/CommandHideShowSpecificStereotype.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5019 $ * */ package net.sourceforge.plantuml.classdiagram.command; diff --git a/src/net/sourceforge/plantuml/classdiagram/command/CommandImport.java b/src/net/sourceforge/plantuml/classdiagram/command/CommandImport.java index db01486f5..d779ae850 100644 --- a/src/net/sourceforge/plantuml/classdiagram/command/CommandImport.java +++ b/src/net/sourceforge/plantuml/classdiagram/command/CommandImport.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.classdiagram.command; diff --git a/src/net/sourceforge/plantuml/classdiagram/command/CommandLayoutNewLine.java b/src/net/sourceforge/plantuml/classdiagram/command/CommandLayoutNewLine.java index 88f654af0..eb6669701 100644 --- a/src/net/sourceforge/plantuml/classdiagram/command/CommandLayoutNewLine.java +++ b/src/net/sourceforge/plantuml/classdiagram/command/CommandLayoutNewLine.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 7715 $ * */ package net.sourceforge.plantuml.classdiagram.command; diff --git a/src/net/sourceforge/plantuml/classdiagram/command/CommandLinkClass.java b/src/net/sourceforge/plantuml/classdiagram/command/CommandLinkClass.java index 63be65b29..79c20181c 100644 --- a/src/net/sourceforge/plantuml/classdiagram/command/CommandLinkClass.java +++ b/src/net/sourceforge/plantuml/classdiagram/command/CommandLinkClass.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5436 $ * */ package net.sourceforge.plantuml.classdiagram.command; diff --git a/src/net/sourceforge/plantuml/classdiagram/command/CommandLinkLollipop.java b/src/net/sourceforge/plantuml/classdiagram/command/CommandLinkLollipop.java index f360f21c9..2c3389409 100644 --- a/src/net/sourceforge/plantuml/classdiagram/command/CommandLinkLollipop.java +++ b/src/net/sourceforge/plantuml/classdiagram/command/CommandLinkLollipop.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5436 $ * */ package net.sourceforge.plantuml.classdiagram.command; diff --git a/src/net/sourceforge/plantuml/classdiagram/command/CommandNamespaceSeparator.java b/src/net/sourceforge/plantuml/classdiagram/command/CommandNamespaceSeparator.java index 72d1ad397..e9c567a61 100644 --- a/src/net/sourceforge/plantuml/classdiagram/command/CommandNamespaceSeparator.java +++ b/src/net/sourceforge/plantuml/classdiagram/command/CommandNamespaceSeparator.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 9434 $ * */ package net.sourceforge.plantuml.classdiagram.command; diff --git a/src/net/sourceforge/plantuml/classdiagram/command/CommandStereotype.java b/src/net/sourceforge/plantuml/classdiagram/command/CommandStereotype.java index c8a264131..89ea37a9a 100644 --- a/src/net/sourceforge/plantuml/classdiagram/command/CommandStereotype.java +++ b/src/net/sourceforge/plantuml/classdiagram/command/CommandStereotype.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.classdiagram.command; diff --git a/src/net/sourceforge/plantuml/classdiagram/command/CommandUrl.java b/src/net/sourceforge/plantuml/classdiagram/command/CommandUrl.java index 55a50cc2e..62c40824d 100644 --- a/src/net/sourceforge/plantuml/classdiagram/command/CommandUrl.java +++ b/src/net/sourceforge/plantuml/classdiagram/command/CommandUrl.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4161 $ * */ package net.sourceforge.plantuml.classdiagram.command; diff --git a/src/net/sourceforge/plantuml/classdiagram/command/GenericRegexProducer.java b/src/net/sourceforge/plantuml/classdiagram/command/GenericRegexProducer.java index b1a4932f3..0a8061a31 100644 --- a/src/net/sourceforge/plantuml/classdiagram/command/GenericRegexProducer.java +++ b/src/net/sourceforge/plantuml/classdiagram/command/GenericRegexProducer.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5075 $ * */ package net.sourceforge.plantuml.classdiagram.command; diff --git a/src/net/sourceforge/plantuml/classdiagram/command/JavaClass.java b/src/net/sourceforge/plantuml/classdiagram/command/JavaClass.java index fd9cb2d2d..df74e38d8 100644 --- a/src/net/sourceforge/plantuml/classdiagram/command/JavaClass.java +++ b/src/net/sourceforge/plantuml/classdiagram/command/JavaClass.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.classdiagram.command; diff --git a/src/net/sourceforge/plantuml/classdiagram/command/JavaFile.java b/src/net/sourceforge/plantuml/classdiagram/command/JavaFile.java index 7aa6c5691..8b091ae00 100644 --- a/src/net/sourceforge/plantuml/classdiagram/command/JavaFile.java +++ b/src/net/sourceforge/plantuml/classdiagram/command/JavaFile.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19880 $ * */ package net.sourceforge.plantuml.classdiagram.command; diff --git a/src/net/sourceforge/plantuml/code/ArobaseStringCompressor.java b/src/net/sourceforge/plantuml/code/ArobaseStringCompressor.java index e05c1f5c1..4a762a623 100644 --- a/src/net/sourceforge/plantuml/code/ArobaseStringCompressor.java +++ b/src/net/sourceforge/plantuml/code/ArobaseStringCompressor.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19880 $ * */ package net.sourceforge.plantuml.code; diff --git a/src/net/sourceforge/plantuml/code/AsciiEncoder.java b/src/net/sourceforge/plantuml/code/AsciiEncoder.java index af31f632e..02da8f26d 100644 --- a/src/net/sourceforge/plantuml/code/AsciiEncoder.java +++ b/src/net/sourceforge/plantuml/code/AsciiEncoder.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19934 $ * */ package net.sourceforge.plantuml.code; diff --git a/src/net/sourceforge/plantuml/code/Base64Coder.java b/src/net/sourceforge/plantuml/code/Base64Coder.java index 75afef1bb..44064e987 100644 --- a/src/net/sourceforge/plantuml/code/Base64Coder.java +++ b/src/net/sourceforge/plantuml/code/Base64Coder.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6170 $ * */ // Copyright 2003-2010 Christian d'Heureuse, Inventec Informatik AG, Zurich, Switzerland diff --git a/src/net/sourceforge/plantuml/code/Compression.java b/src/net/sourceforge/plantuml/code/Compression.java index fd7972bbd..0ef766a26 100644 --- a/src/net/sourceforge/plantuml/code/Compression.java +++ b/src/net/sourceforge/plantuml/code/Compression.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.code; diff --git a/src/net/sourceforge/plantuml/code/CompressionGZip.java b/src/net/sourceforge/plantuml/code/CompressionGZip.java index e58ebda85..9e9f0569f 100644 --- a/src/net/sourceforge/plantuml/code/CompressionGZip.java +++ b/src/net/sourceforge/plantuml/code/CompressionGZip.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.code; diff --git a/src/net/sourceforge/plantuml/code/CompressionHuffman.java b/src/net/sourceforge/plantuml/code/CompressionHuffman.java index 8cb39c62e..42fd9cc7f 100644 --- a/src/net/sourceforge/plantuml/code/CompressionHuffman.java +++ b/src/net/sourceforge/plantuml/code/CompressionHuffman.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.code; diff --git a/src/net/sourceforge/plantuml/code/CompressionNone.java b/src/net/sourceforge/plantuml/code/CompressionNone.java index 3d78e5b81..5852ff6da 100644 --- a/src/net/sourceforge/plantuml/code/CompressionNone.java +++ b/src/net/sourceforge/plantuml/code/CompressionNone.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.code; diff --git a/src/net/sourceforge/plantuml/code/CompressionZlib.java b/src/net/sourceforge/plantuml/code/CompressionZlib.java index 183fe7196..66daf310e 100644 --- a/src/net/sourceforge/plantuml/code/CompressionZlib.java +++ b/src/net/sourceforge/plantuml/code/CompressionZlib.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3827 $ * */ package net.sourceforge.plantuml.code; diff --git a/src/net/sourceforge/plantuml/code/StringCompressor.java b/src/net/sourceforge/plantuml/code/StringCompressor.java index 2ac6e35b2..7b26e0d82 100644 --- a/src/net/sourceforge/plantuml/code/StringCompressor.java +++ b/src/net/sourceforge/plantuml/code/StringCompressor.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.code; diff --git a/src/net/sourceforge/plantuml/code/StringCompressorNone.java b/src/net/sourceforge/plantuml/code/StringCompressorNone.java index 54c08e32c..44ec34f14 100644 --- a/src/net/sourceforge/plantuml/code/StringCompressorNone.java +++ b/src/net/sourceforge/plantuml/code/StringCompressorNone.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.code; diff --git a/src/net/sourceforge/plantuml/code/Transcoder.java b/src/net/sourceforge/plantuml/code/Transcoder.java index 6c33d27d7..8c00e6503 100644 --- a/src/net/sourceforge/plantuml/code/Transcoder.java +++ b/src/net/sourceforge/plantuml/code/Transcoder.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.code; diff --git a/src/net/sourceforge/plantuml/code/TranscoderImpl.java b/src/net/sourceforge/plantuml/code/TranscoderImpl.java index e6b3832fb..33b6e3ee2 100644 --- a/src/net/sourceforge/plantuml/code/TranscoderImpl.java +++ b/src/net/sourceforge/plantuml/code/TranscoderImpl.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5667 $ * */ package net.sourceforge.plantuml.code; diff --git a/src/net/sourceforge/plantuml/code/TranscoderSmart.java b/src/net/sourceforge/plantuml/code/TranscoderSmart.java index e0e4ce808..12c95247a 100644 --- a/src/net/sourceforge/plantuml/code/TranscoderSmart.java +++ b/src/net/sourceforge/plantuml/code/TranscoderSmart.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5667 $ * */ package net.sourceforge.plantuml.code; diff --git a/src/net/sourceforge/plantuml/code/TranscoderUtil.java b/src/net/sourceforge/plantuml/code/TranscoderUtil.java index c179cf266..0f258bfa8 100644 --- a/src/net/sourceforge/plantuml/code/TranscoderUtil.java +++ b/src/net/sourceforge/plantuml/code/TranscoderUtil.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5667 $ * */ package net.sourceforge.plantuml.code; diff --git a/src/net/sourceforge/plantuml/code/URLEncoder.java b/src/net/sourceforge/plantuml/code/URLEncoder.java index 2c0a1b4d5..16b161d64 100644 --- a/src/net/sourceforge/plantuml/code/URLEncoder.java +++ b/src/net/sourceforge/plantuml/code/URLEncoder.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.code; diff --git a/src/net/sourceforge/plantuml/command/BlocLines.java b/src/net/sourceforge/plantuml/command/BlocLines.java index e5f52b54e..cb59e0f34 100644 --- a/src/net/sourceforge/plantuml/command/BlocLines.java +++ b/src/net/sourceforge/plantuml/command/BlocLines.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 16351 $ * */ package net.sourceforge.plantuml.command; diff --git a/src/net/sourceforge/plantuml/command/Command.java b/src/net/sourceforge/plantuml/command/Command.java index fae767ccd..1af82eac2 100644 --- a/src/net/sourceforge/plantuml/command/Command.java +++ b/src/net/sourceforge/plantuml/command/Command.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.command; diff --git a/src/net/sourceforge/plantuml/command/CommandAffineTransform.java b/src/net/sourceforge/plantuml/command/CommandAffineTransform.java index 8ba4c192f..7253abb63 100644 --- a/src/net/sourceforge/plantuml/command/CommandAffineTransform.java +++ b/src/net/sourceforge/plantuml/command/CommandAffineTransform.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4762 $ * */ package net.sourceforge.plantuml.command; diff --git a/src/net/sourceforge/plantuml/command/CommandAffineTransformMultiline.java b/src/net/sourceforge/plantuml/command/CommandAffineTransformMultiline.java index d32874392..ea8b05b94 100644 --- a/src/net/sourceforge/plantuml/command/CommandAffineTransformMultiline.java +++ b/src/net/sourceforge/plantuml/command/CommandAffineTransformMultiline.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5957 $ * */ package net.sourceforge.plantuml.command; diff --git a/src/net/sourceforge/plantuml/command/CommandCaption.java b/src/net/sourceforge/plantuml/command/CommandCaption.java index 44eb0a788..a4e620806 100644 --- a/src/net/sourceforge/plantuml/command/CommandCaption.java +++ b/src/net/sourceforge/plantuml/command/CommandCaption.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 18788 $ * */ package net.sourceforge.plantuml.command; diff --git a/src/net/sourceforge/plantuml/command/CommandComment.java b/src/net/sourceforge/plantuml/command/CommandComment.java index 4a4ddd30d..0b9218e73 100644 --- a/src/net/sourceforge/plantuml/command/CommandComment.java +++ b/src/net/sourceforge/plantuml/command/CommandComment.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4762 $ * */ package net.sourceforge.plantuml.command; diff --git a/src/net/sourceforge/plantuml/command/CommandControl.java b/src/net/sourceforge/plantuml/command/CommandControl.java index fafb0db6a..772108952 100644 --- a/src/net/sourceforge/plantuml/command/CommandControl.java +++ b/src/net/sourceforge/plantuml/command/CommandControl.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.command; diff --git a/src/net/sourceforge/plantuml/command/CommandDecoratorMultine.java b/src/net/sourceforge/plantuml/command/CommandDecoratorMultine.java index 04a1cb867..3179e3bfd 100644 --- a/src/net/sourceforge/plantuml/command/CommandDecoratorMultine.java +++ b/src/net/sourceforge/plantuml/command/CommandDecoratorMultine.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 12235 $ * */ package net.sourceforge.plantuml.command; diff --git a/src/net/sourceforge/plantuml/command/CommandEndPackage.java b/src/net/sourceforge/plantuml/command/CommandEndPackage.java index cd00c7054..9aa1c67c4 100644 --- a/src/net/sourceforge/plantuml/command/CommandEndPackage.java +++ b/src/net/sourceforge/plantuml/command/CommandEndPackage.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.command; diff --git a/src/net/sourceforge/plantuml/command/CommandExecutionResult.java b/src/net/sourceforge/plantuml/command/CommandExecutionResult.java index b015aaaf3..347925b9a 100644 --- a/src/net/sourceforge/plantuml/command/CommandExecutionResult.java +++ b/src/net/sourceforge/plantuml/command/CommandExecutionResult.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3828 $ * */ package net.sourceforge.plantuml.command; diff --git a/src/net/sourceforge/plantuml/command/CommandFootboxIgnored.java b/src/net/sourceforge/plantuml/command/CommandFootboxIgnored.java index ed5fcc0a5..d7e0d3d55 100644 --- a/src/net/sourceforge/plantuml/command/CommandFootboxIgnored.java +++ b/src/net/sourceforge/plantuml/command/CommandFootboxIgnored.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 12235 $ * */ package net.sourceforge.plantuml.command; diff --git a/src/net/sourceforge/plantuml/command/CommandFooter.java b/src/net/sourceforge/plantuml/command/CommandFooter.java index 30773da98..288334982 100644 --- a/src/net/sourceforge/plantuml/command/CommandFooter.java +++ b/src/net/sourceforge/plantuml/command/CommandFooter.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19885 $ * */ package net.sourceforge.plantuml.command; diff --git a/src/net/sourceforge/plantuml/command/CommandHeader.java b/src/net/sourceforge/plantuml/command/CommandHeader.java index 2798c9c95..977b78acd 100644 --- a/src/net/sourceforge/plantuml/command/CommandHeader.java +++ b/src/net/sourceforge/plantuml/command/CommandHeader.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.command; diff --git a/src/net/sourceforge/plantuml/command/CommandHideUnlinked.java b/src/net/sourceforge/plantuml/command/CommandHideUnlinked.java index 167aafedc..f69489b4b 100644 --- a/src/net/sourceforge/plantuml/command/CommandHideUnlinked.java +++ b/src/net/sourceforge/plantuml/command/CommandHideUnlinked.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4762 $ * */ package net.sourceforge.plantuml.command; diff --git a/src/net/sourceforge/plantuml/command/CommandMinwidth.java b/src/net/sourceforge/plantuml/command/CommandMinwidth.java index 294784f86..f494c07de 100644 --- a/src/net/sourceforge/plantuml/command/CommandMinwidth.java +++ b/src/net/sourceforge/plantuml/command/CommandMinwidth.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.command; diff --git a/src/net/sourceforge/plantuml/command/CommandMultilines.java b/src/net/sourceforge/plantuml/command/CommandMultilines.java index 70f6cbc11..1891234be 100644 --- a/src/net/sourceforge/plantuml/command/CommandMultilines.java +++ b/src/net/sourceforge/plantuml/command/CommandMultilines.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19880 $ * */ package net.sourceforge.plantuml.command; diff --git a/src/net/sourceforge/plantuml/command/CommandMultilines2.java b/src/net/sourceforge/plantuml/command/CommandMultilines2.java index 76d0a78bf..d5ab1203d 100644 --- a/src/net/sourceforge/plantuml/command/CommandMultilines2.java +++ b/src/net/sourceforge/plantuml/command/CommandMultilines2.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5041 $ * */ package net.sourceforge.plantuml.command; diff --git a/src/net/sourceforge/plantuml/command/CommandMultilines3.java b/src/net/sourceforge/plantuml/command/CommandMultilines3.java index c2782e773..0137b3ed4 100644 --- a/src/net/sourceforge/plantuml/command/CommandMultilines3.java +++ b/src/net/sourceforge/plantuml/command/CommandMultilines3.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5041 $ * */ package net.sourceforge.plantuml.command; diff --git a/src/net/sourceforge/plantuml/command/CommandMultilinesBracket.java b/src/net/sourceforge/plantuml/command/CommandMultilinesBracket.java index f228cf4b9..ebfbb825b 100644 --- a/src/net/sourceforge/plantuml/command/CommandMultilinesBracket.java +++ b/src/net/sourceforge/plantuml/command/CommandMultilinesBracket.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5041 $ * */ package net.sourceforge.plantuml.command; diff --git a/src/net/sourceforge/plantuml/command/CommandMultilinesComment.java b/src/net/sourceforge/plantuml/command/CommandMultilinesComment.java index f1946a000..dc338850b 100644 --- a/src/net/sourceforge/plantuml/command/CommandMultilinesComment.java +++ b/src/net/sourceforge/plantuml/command/CommandMultilinesComment.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5957 $ * */ package net.sourceforge.plantuml.command; diff --git a/src/net/sourceforge/plantuml/command/CommandMultilinesFooter.java b/src/net/sourceforge/plantuml/command/CommandMultilinesFooter.java index e03538ca3..e55c4946a 100644 --- a/src/net/sourceforge/plantuml/command/CommandMultilinesFooter.java +++ b/src/net/sourceforge/plantuml/command/CommandMultilinesFooter.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19880 $ * */ package net.sourceforge.plantuml.command; diff --git a/src/net/sourceforge/plantuml/command/CommandMultilinesHeader.java b/src/net/sourceforge/plantuml/command/CommandMultilinesHeader.java index 6eaae8971..8eb10c602 100644 --- a/src/net/sourceforge/plantuml/command/CommandMultilinesHeader.java +++ b/src/net/sourceforge/plantuml/command/CommandMultilinesHeader.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19880 $ * */ package net.sourceforge.plantuml.command; diff --git a/src/net/sourceforge/plantuml/command/CommandMultilinesLegend.java b/src/net/sourceforge/plantuml/command/CommandMultilinesLegend.java index e043b6cf2..61cd9230d 100644 --- a/src/net/sourceforge/plantuml/command/CommandMultilinesLegend.java +++ b/src/net/sourceforge/plantuml/command/CommandMultilinesLegend.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 10779 $ * */ package net.sourceforge.plantuml.command; diff --git a/src/net/sourceforge/plantuml/command/CommandMultilinesTitle.java b/src/net/sourceforge/plantuml/command/CommandMultilinesTitle.java index 605bd68a6..93a7b1a1e 100644 --- a/src/net/sourceforge/plantuml/command/CommandMultilinesTitle.java +++ b/src/net/sourceforge/plantuml/command/CommandMultilinesTitle.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.command; diff --git a/src/net/sourceforge/plantuml/command/CommandNamespace.java b/src/net/sourceforge/plantuml/command/CommandNamespace.java index a552ccf73..60fd0b608 100644 --- a/src/net/sourceforge/plantuml/command/CommandNamespace.java +++ b/src/net/sourceforge/plantuml/command/CommandNamespace.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3979 $ * */ package net.sourceforge.plantuml.command; diff --git a/src/net/sourceforge/plantuml/command/CommandNope.java b/src/net/sourceforge/plantuml/command/CommandNope.java index cd1670635..31064e9b6 100644 --- a/src/net/sourceforge/plantuml/command/CommandNope.java +++ b/src/net/sourceforge/plantuml/command/CommandNope.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4762 $ * */ package net.sourceforge.plantuml.command; diff --git a/src/net/sourceforge/plantuml/command/CommandPackage.java b/src/net/sourceforge/plantuml/command/CommandPackage.java index f797ad94b..e8d41c4af 100644 --- a/src/net/sourceforge/plantuml/command/CommandPackage.java +++ b/src/net/sourceforge/plantuml/command/CommandPackage.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 7800 $ * */ package net.sourceforge.plantuml.command; diff --git a/src/net/sourceforge/plantuml/command/CommandPackageEmpty.java b/src/net/sourceforge/plantuml/command/CommandPackageEmpty.java index ed98a51be..8d12e1884 100644 --- a/src/net/sourceforge/plantuml/command/CommandPackageEmpty.java +++ b/src/net/sourceforge/plantuml/command/CommandPackageEmpty.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6209 $ * */ package net.sourceforge.plantuml.command; diff --git a/src/net/sourceforge/plantuml/command/CommandPage.java b/src/net/sourceforge/plantuml/command/CommandPage.java index c408ce3cb..a6bdbda85 100644 --- a/src/net/sourceforge/plantuml/command/CommandPage.java +++ b/src/net/sourceforge/plantuml/command/CommandPage.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.command; diff --git a/src/net/sourceforge/plantuml/command/CommandPragma.java b/src/net/sourceforge/plantuml/command/CommandPragma.java index 42495035f..ad4063da4 100644 --- a/src/net/sourceforge/plantuml/command/CommandPragma.java +++ b/src/net/sourceforge/plantuml/command/CommandPragma.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3828 $ * */ package net.sourceforge.plantuml.command; diff --git a/src/net/sourceforge/plantuml/command/CommandRankDir.java b/src/net/sourceforge/plantuml/command/CommandRankDir.java index 787392e67..f92023b4e 100644 --- a/src/net/sourceforge/plantuml/command/CommandRankDir.java +++ b/src/net/sourceforge/plantuml/command/CommandRankDir.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * diff --git a/src/net/sourceforge/plantuml/command/CommandRotate.java b/src/net/sourceforge/plantuml/command/CommandRotate.java index 31098019f..ca883df16 100644 --- a/src/net/sourceforge/plantuml/command/CommandRotate.java +++ b/src/net/sourceforge/plantuml/command/CommandRotate.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.command; diff --git a/src/net/sourceforge/plantuml/command/CommandScale.java b/src/net/sourceforge/plantuml/command/CommandScale.java index d1935dce1..c96f7728e 100644 --- a/src/net/sourceforge/plantuml/command/CommandScale.java +++ b/src/net/sourceforge/plantuml/command/CommandScale.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4762 $ * */ package net.sourceforge.plantuml.command; diff --git a/src/net/sourceforge/plantuml/command/CommandScaleMaxHeight.java b/src/net/sourceforge/plantuml/command/CommandScaleMaxHeight.java index de9d55bf3..993aaf60d 100644 --- a/src/net/sourceforge/plantuml/command/CommandScaleMaxHeight.java +++ b/src/net/sourceforge/plantuml/command/CommandScaleMaxHeight.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4762 $ * */ package net.sourceforge.plantuml.command; diff --git a/src/net/sourceforge/plantuml/command/CommandScaleMaxWidth.java b/src/net/sourceforge/plantuml/command/CommandScaleMaxWidth.java index 678be41c6..1466d4358 100644 --- a/src/net/sourceforge/plantuml/command/CommandScaleMaxWidth.java +++ b/src/net/sourceforge/plantuml/command/CommandScaleMaxWidth.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4762 $ * */ package net.sourceforge.plantuml.command; diff --git a/src/net/sourceforge/plantuml/command/CommandScaleMaxWidthAndHeight.java b/src/net/sourceforge/plantuml/command/CommandScaleMaxWidthAndHeight.java index 213564f6a..d5580f740 100644 --- a/src/net/sourceforge/plantuml/command/CommandScaleMaxWidthAndHeight.java +++ b/src/net/sourceforge/plantuml/command/CommandScaleMaxWidthAndHeight.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4762 $ * */ package net.sourceforge.plantuml.command; diff --git a/src/net/sourceforge/plantuml/command/CommandScaleWidthAndHeight.java b/src/net/sourceforge/plantuml/command/CommandScaleWidthAndHeight.java index 8f3f44171..fcd7bb917 100644 --- a/src/net/sourceforge/plantuml/command/CommandScaleWidthAndHeight.java +++ b/src/net/sourceforge/plantuml/command/CommandScaleWidthAndHeight.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4762 $ * */ package net.sourceforge.plantuml.command; diff --git a/src/net/sourceforge/plantuml/command/CommandScaleWidthOrHeight.java b/src/net/sourceforge/plantuml/command/CommandScaleWidthOrHeight.java index 0f9eda45b..641b676e0 100644 --- a/src/net/sourceforge/plantuml/command/CommandScaleWidthOrHeight.java +++ b/src/net/sourceforge/plantuml/command/CommandScaleWidthOrHeight.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4762 $ * */ package net.sourceforge.plantuml.command; diff --git a/src/net/sourceforge/plantuml/command/CommandSkinParam.java b/src/net/sourceforge/plantuml/command/CommandSkinParam.java index f896c1e3d..78f81b88d 100644 --- a/src/net/sourceforge/plantuml/command/CommandSkinParam.java +++ b/src/net/sourceforge/plantuml/command/CommandSkinParam.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.command; diff --git a/src/net/sourceforge/plantuml/command/CommandSkinParamMultilines.java b/src/net/sourceforge/plantuml/command/CommandSkinParamMultilines.java index 0ee89cb16..5956538cd 100644 --- a/src/net/sourceforge/plantuml/command/CommandSkinParamMultilines.java +++ b/src/net/sourceforge/plantuml/command/CommandSkinParamMultilines.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5727 $ * */ package net.sourceforge.plantuml.command; diff --git a/src/net/sourceforge/plantuml/command/CommandSpriteFile.java b/src/net/sourceforge/plantuml/command/CommandSpriteFile.java index 37cc19b18..778cb7ead 100644 --- a/src/net/sourceforge/plantuml/command/CommandSpriteFile.java +++ b/src/net/sourceforge/plantuml/command/CommandSpriteFile.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3828 $ * */ package net.sourceforge.plantuml.command; diff --git a/src/net/sourceforge/plantuml/command/CommandTitle.java b/src/net/sourceforge/plantuml/command/CommandTitle.java index 7a7afa7d4..cebc5aac3 100644 --- a/src/net/sourceforge/plantuml/command/CommandTitle.java +++ b/src/net/sourceforge/plantuml/command/CommandTitle.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.command; diff --git a/src/net/sourceforge/plantuml/command/FactorySpriteCommand.java b/src/net/sourceforge/plantuml/command/FactorySpriteCommand.java index 83bc5c0e1..6cc1e9837 100644 --- a/src/net/sourceforge/plantuml/command/FactorySpriteCommand.java +++ b/src/net/sourceforge/plantuml/command/FactorySpriteCommand.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 7558 $ * */ package net.sourceforge.plantuml.command; diff --git a/src/net/sourceforge/plantuml/command/MultilinesStrategy.java b/src/net/sourceforge/plantuml/command/MultilinesStrategy.java index c94385fd5..944561658 100644 --- a/src/net/sourceforge/plantuml/command/MultilinesStrategy.java +++ b/src/net/sourceforge/plantuml/command/MultilinesStrategy.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5041 $ * */ package net.sourceforge.plantuml.command; diff --git a/src/net/sourceforge/plantuml/command/PSystemAbstractFactory.java b/src/net/sourceforge/plantuml/command/PSystemAbstractFactory.java index 759c24eef..73d0ab9cd 100644 --- a/src/net/sourceforge/plantuml/command/PSystemAbstractFactory.java +++ b/src/net/sourceforge/plantuml/command/PSystemAbstractFactory.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 10006 $ * */ package net.sourceforge.plantuml.command; diff --git a/src/net/sourceforge/plantuml/command/PSystemBasicFactory.java b/src/net/sourceforge/plantuml/command/PSystemBasicFactory.java index 397a85f7b..dfa093bd5 100644 --- a/src/net/sourceforge/plantuml/command/PSystemBasicFactory.java +++ b/src/net/sourceforge/plantuml/command/PSystemBasicFactory.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3830 $ * */ package net.sourceforge.plantuml.command; diff --git a/src/net/sourceforge/plantuml/command/PSystemSingleLineFactory.java b/src/net/sourceforge/plantuml/command/PSystemSingleLineFactory.java index d72f93301..7859d2f8c 100644 --- a/src/net/sourceforge/plantuml/command/PSystemSingleLineFactory.java +++ b/src/net/sourceforge/plantuml/command/PSystemSingleLineFactory.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 10298 $ * */ package net.sourceforge.plantuml.command; diff --git a/src/net/sourceforge/plantuml/command/Position.java b/src/net/sourceforge/plantuml/command/Position.java index 685bae2fc..a780d7cba 100644 --- a/src/net/sourceforge/plantuml/command/Position.java +++ b/src/net/sourceforge/plantuml/command/Position.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.command; diff --git a/src/net/sourceforge/plantuml/command/ProtectedCommand.java b/src/net/sourceforge/plantuml/command/ProtectedCommand.java index 7161b05e2..f6531782a 100644 --- a/src/net/sourceforge/plantuml/command/ProtectedCommand.java +++ b/src/net/sourceforge/plantuml/command/ProtectedCommand.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3828 $ * */ package net.sourceforge.plantuml.command; diff --git a/src/net/sourceforge/plantuml/command/SingleLineCommand.java b/src/net/sourceforge/plantuml/command/SingleLineCommand.java index ad6e50353..3f70e079a 100644 --- a/src/net/sourceforge/plantuml/command/SingleLineCommand.java +++ b/src/net/sourceforge/plantuml/command/SingleLineCommand.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19880 $ * */ package net.sourceforge.plantuml.command; diff --git a/src/net/sourceforge/plantuml/command/SingleLineCommand2.java b/src/net/sourceforge/plantuml/command/SingleLineCommand2.java index 5c836e3a9..5a74683fa 100644 --- a/src/net/sourceforge/plantuml/command/SingleLineCommand2.java +++ b/src/net/sourceforge/plantuml/command/SingleLineCommand2.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5041 $ * */ package net.sourceforge.plantuml.command; diff --git a/src/net/sourceforge/plantuml/command/UmlDiagramFactory.java b/src/net/sourceforge/plantuml/command/UmlDiagramFactory.java index 18cedb756..38f868687 100644 --- a/src/net/sourceforge/plantuml/command/UmlDiagramFactory.java +++ b/src/net/sourceforge/plantuml/command/UmlDiagramFactory.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 10006 $ * */ package net.sourceforge.plantuml.command; diff --git a/src/net/sourceforge/plantuml/command/note/FactoryNoteActivityCommand.java b/src/net/sourceforge/plantuml/command/note/FactoryNoteActivityCommand.java index 1f95fa745..c1e31528c 100644 --- a/src/net/sourceforge/plantuml/command/note/FactoryNoteActivityCommand.java +++ b/src/net/sourceforge/plantuml/command/note/FactoryNoteActivityCommand.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 7558 $ * */ package net.sourceforge.plantuml.command.note; diff --git a/src/net/sourceforge/plantuml/command/note/FactoryNoteCommand.java b/src/net/sourceforge/plantuml/command/note/FactoryNoteCommand.java index 6094f4836..2dd984a35 100644 --- a/src/net/sourceforge/plantuml/command/note/FactoryNoteCommand.java +++ b/src/net/sourceforge/plantuml/command/note/FactoryNoteCommand.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 7558 $ * */ package net.sourceforge.plantuml.command.note; diff --git a/src/net/sourceforge/plantuml/command/note/FactoryNoteOnEntityCommand.java b/src/net/sourceforge/plantuml/command/note/FactoryNoteOnEntityCommand.java index 4aeb6191b..ad0e08f8d 100644 --- a/src/net/sourceforge/plantuml/command/note/FactoryNoteOnEntityCommand.java +++ b/src/net/sourceforge/plantuml/command/note/FactoryNoteOnEntityCommand.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 7558 $ * */ package net.sourceforge.plantuml.command.note; diff --git a/src/net/sourceforge/plantuml/command/note/FactoryNoteOnLinkCommand.java b/src/net/sourceforge/plantuml/command/note/FactoryNoteOnLinkCommand.java index efe064469..d60df90b9 100644 --- a/src/net/sourceforge/plantuml/command/note/FactoryNoteOnLinkCommand.java +++ b/src/net/sourceforge/plantuml/command/note/FactoryNoteOnLinkCommand.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 7558 $ * */ package net.sourceforge.plantuml.command.note; diff --git a/src/net/sourceforge/plantuml/command/note/FactoryTipOnEntityCommand.java b/src/net/sourceforge/plantuml/command/note/FactoryTipOnEntityCommand.java index ab3894ddf..aa9dbe467 100644 --- a/src/net/sourceforge/plantuml/command/note/FactoryTipOnEntityCommand.java +++ b/src/net/sourceforge/plantuml/command/note/FactoryTipOnEntityCommand.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 7558 $ * */ package net.sourceforge.plantuml.command.note; diff --git a/src/net/sourceforge/plantuml/command/note/SingleMultiFactoryCommand.java b/src/net/sourceforge/plantuml/command/note/SingleMultiFactoryCommand.java index 2351d1327..121bfa831 100644 --- a/src/net/sourceforge/plantuml/command/note/SingleMultiFactoryCommand.java +++ b/src/net/sourceforge/plantuml/command/note/SingleMultiFactoryCommand.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 7558 $ * */ package net.sourceforge.plantuml.command.note; diff --git a/src/net/sourceforge/plantuml/command/note/sequence/FactorySequenceNoteCommand.java b/src/net/sourceforge/plantuml/command/note/sequence/FactorySequenceNoteCommand.java index 99134f997..a76f275c3 100644 --- a/src/net/sourceforge/plantuml/command/note/sequence/FactorySequenceNoteCommand.java +++ b/src/net/sourceforge/plantuml/command/note/sequence/FactorySequenceNoteCommand.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 7558 $ * */ package net.sourceforge.plantuml.command.note.sequence; diff --git a/src/net/sourceforge/plantuml/command/note/sequence/FactorySequenceNoteOnArrowCommand.java b/src/net/sourceforge/plantuml/command/note/sequence/FactorySequenceNoteOnArrowCommand.java index 0d715ebb6..149ca3cac 100644 --- a/src/net/sourceforge/plantuml/command/note/sequence/FactorySequenceNoteOnArrowCommand.java +++ b/src/net/sourceforge/plantuml/command/note/sequence/FactorySequenceNoteOnArrowCommand.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 7558 $ * */ package net.sourceforge.plantuml.command.note.sequence; diff --git a/src/net/sourceforge/plantuml/command/note/sequence/FactorySequenceNoteOverSeveralCommand.java b/src/net/sourceforge/plantuml/command/note/sequence/FactorySequenceNoteOverSeveralCommand.java index 38426bcc3..38f7e38f1 100644 --- a/src/net/sourceforge/plantuml/command/note/sequence/FactorySequenceNoteOverSeveralCommand.java +++ b/src/net/sourceforge/plantuml/command/note/sequence/FactorySequenceNoteOverSeveralCommand.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 7558 $ * */ package net.sourceforge.plantuml.command.note.sequence; diff --git a/src/net/sourceforge/plantuml/command/regex/IRegex.java b/src/net/sourceforge/plantuml/command/regex/IRegex.java index 5b8e2ad52..745b36522 100644 --- a/src/net/sourceforge/plantuml/command/regex/IRegex.java +++ b/src/net/sourceforge/plantuml/command/regex/IRegex.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4762 $ * */ package net.sourceforge.plantuml.command.regex; diff --git a/src/net/sourceforge/plantuml/command/regex/Matcher2.java b/src/net/sourceforge/plantuml/command/regex/Matcher2.java index 18ef92218..2f25cb06d 100644 --- a/src/net/sourceforge/plantuml/command/regex/Matcher2.java +++ b/src/net/sourceforge/plantuml/command/regex/Matcher2.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4762 $ * */ package net.sourceforge.plantuml.command.regex; diff --git a/src/net/sourceforge/plantuml/command/regex/MatcherIterator.java b/src/net/sourceforge/plantuml/command/regex/MatcherIterator.java index dec35743b..a52974405 100644 --- a/src/net/sourceforge/plantuml/command/regex/MatcherIterator.java +++ b/src/net/sourceforge/plantuml/command/regex/MatcherIterator.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4762 $ * */ package net.sourceforge.plantuml.command.regex; diff --git a/src/net/sourceforge/plantuml/command/regex/MyPattern.java b/src/net/sourceforge/plantuml/command/regex/MyPattern.java index 64a91641d..e27a571f7 100644 --- a/src/net/sourceforge/plantuml/command/regex/MyPattern.java +++ b/src/net/sourceforge/plantuml/command/regex/MyPattern.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4762 $ * */ package net.sourceforge.plantuml.command.regex; diff --git a/src/net/sourceforge/plantuml/command/regex/Pattern2.java b/src/net/sourceforge/plantuml/command/regex/Pattern2.java index a40dddd60..ebeb8cac4 100644 --- a/src/net/sourceforge/plantuml/command/regex/Pattern2.java +++ b/src/net/sourceforge/plantuml/command/regex/Pattern2.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4762 $ * */ package net.sourceforge.plantuml.command.regex; diff --git a/src/net/sourceforge/plantuml/command/regex/RegexComposed.java b/src/net/sourceforge/plantuml/command/regex/RegexComposed.java index 338d61120..79702564d 100644 --- a/src/net/sourceforge/plantuml/command/regex/RegexComposed.java +++ b/src/net/sourceforge/plantuml/command/regex/RegexComposed.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4762 $ * */ package net.sourceforge.plantuml.command.regex; diff --git a/src/net/sourceforge/plantuml/command/regex/RegexConcat.java b/src/net/sourceforge/plantuml/command/regex/RegexConcat.java index 5735c9b41..d8a466dad 100644 --- a/src/net/sourceforge/plantuml/command/regex/RegexConcat.java +++ b/src/net/sourceforge/plantuml/command/regex/RegexConcat.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4762 $ * */ package net.sourceforge.plantuml.command.regex; diff --git a/src/net/sourceforge/plantuml/command/regex/RegexLeaf.java b/src/net/sourceforge/plantuml/command/regex/RegexLeaf.java index 7785f345d..59c70f251 100644 --- a/src/net/sourceforge/plantuml/command/regex/RegexLeaf.java +++ b/src/net/sourceforge/plantuml/command/regex/RegexLeaf.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4762 $ * */ package net.sourceforge.plantuml.command.regex; diff --git a/src/net/sourceforge/plantuml/command/regex/RegexOptional.java b/src/net/sourceforge/plantuml/command/regex/RegexOptional.java index 9d7ad69eb..15b7567cd 100644 --- a/src/net/sourceforge/plantuml/command/regex/RegexOptional.java +++ b/src/net/sourceforge/plantuml/command/regex/RegexOptional.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4762 $ * */ package net.sourceforge.plantuml.command.regex; diff --git a/src/net/sourceforge/plantuml/command/regex/RegexOr.java b/src/net/sourceforge/plantuml/command/regex/RegexOr.java index 4f108a5fc..24827cc23 100644 --- a/src/net/sourceforge/plantuml/command/regex/RegexOr.java +++ b/src/net/sourceforge/plantuml/command/regex/RegexOr.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4762 $ * */ package net.sourceforge.plantuml.command.regex; diff --git a/src/net/sourceforge/plantuml/command/regex/RegexPartialMatch.java b/src/net/sourceforge/plantuml/command/regex/RegexPartialMatch.java index f825b231c..ad9e3694c 100644 --- a/src/net/sourceforge/plantuml/command/regex/RegexPartialMatch.java +++ b/src/net/sourceforge/plantuml/command/regex/RegexPartialMatch.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4762 $ * */ package net.sourceforge.plantuml.command.regex; diff --git a/src/net/sourceforge/plantuml/command/regex/RegexResult.java b/src/net/sourceforge/plantuml/command/regex/RegexResult.java index 04407fbad..83c9f573e 100644 --- a/src/net/sourceforge/plantuml/command/regex/RegexResult.java +++ b/src/net/sourceforge/plantuml/command/regex/RegexResult.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4762 $ * */ package net.sourceforge.plantuml.command.regex; diff --git a/src/net/sourceforge/plantuml/compositediagram/CompositeDiagram.java b/src/net/sourceforge/plantuml/compositediagram/CompositeDiagram.java index 10181b3af..d3d2cc73b 100644 --- a/src/net/sourceforge/plantuml/compositediagram/CompositeDiagram.java +++ b/src/net/sourceforge/plantuml/compositediagram/CompositeDiagram.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3851 $ * */ package net.sourceforge.plantuml.compositediagram; diff --git a/src/net/sourceforge/plantuml/compositediagram/CompositeDiagramFactory.java b/src/net/sourceforge/plantuml/compositediagram/CompositeDiagramFactory.java index 221f0b32f..6392e4701 100644 --- a/src/net/sourceforge/plantuml/compositediagram/CompositeDiagramFactory.java +++ b/src/net/sourceforge/plantuml/compositediagram/CompositeDiagramFactory.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3885 $ * */ package net.sourceforge.plantuml.compositediagram; diff --git a/src/net/sourceforge/plantuml/compositediagram/command/CommandCreateBlock.java b/src/net/sourceforge/plantuml/compositediagram/command/CommandCreateBlock.java index 3062c5299..0db65edac 100644 --- a/src/net/sourceforge/plantuml/compositediagram/command/CommandCreateBlock.java +++ b/src/net/sourceforge/plantuml/compositediagram/command/CommandCreateBlock.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3837 $ * */ package net.sourceforge.plantuml.compositediagram.command; diff --git a/src/net/sourceforge/plantuml/compositediagram/command/CommandCreatePackageBlock.java b/src/net/sourceforge/plantuml/compositediagram/command/CommandCreatePackageBlock.java index e1865d093..6c2d1e083 100644 --- a/src/net/sourceforge/plantuml/compositediagram/command/CommandCreatePackageBlock.java +++ b/src/net/sourceforge/plantuml/compositediagram/command/CommandCreatePackageBlock.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4762 $ * */ package net.sourceforge.plantuml.compositediagram.command; diff --git a/src/net/sourceforge/plantuml/compositediagram/command/CommandEndPackageBlock.java b/src/net/sourceforge/plantuml/compositediagram/command/CommandEndPackageBlock.java index b75b96340..f5c840e42 100644 --- a/src/net/sourceforge/plantuml/compositediagram/command/CommandEndPackageBlock.java +++ b/src/net/sourceforge/plantuml/compositediagram/command/CommandEndPackageBlock.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4762 $ * */ package net.sourceforge.plantuml.compositediagram.command; diff --git a/src/net/sourceforge/plantuml/compositediagram/command/CommandLinkBlock.java b/src/net/sourceforge/plantuml/compositediagram/command/CommandLinkBlock.java index 236056740..06f918202 100644 --- a/src/net/sourceforge/plantuml/compositediagram/command/CommandLinkBlock.java +++ b/src/net/sourceforge/plantuml/compositediagram/command/CommandLinkBlock.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * diff --git a/src/net/sourceforge/plantuml/core/Diagram.java b/src/net/sourceforge/plantuml/core/Diagram.java index fc8bc70b7..68e7e7a74 100644 --- a/src/net/sourceforge/plantuml/core/Diagram.java +++ b/src/net/sourceforge/plantuml/core/Diagram.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.core; diff --git a/src/net/sourceforge/plantuml/core/DiagramDescription.java b/src/net/sourceforge/plantuml/core/DiagramDescription.java index 5309bded7..386843762 100644 --- a/src/net/sourceforge/plantuml/core/DiagramDescription.java +++ b/src/net/sourceforge/plantuml/core/DiagramDescription.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 11351 $ * */ package net.sourceforge.plantuml.core; diff --git a/src/net/sourceforge/plantuml/core/DiagramDescriptionImpl.java b/src/net/sourceforge/plantuml/core/DiagramDescriptionImpl.java index 8af1403c6..7197364aa 100644 --- a/src/net/sourceforge/plantuml/core/DiagramDescriptionImpl.java +++ b/src/net/sourceforge/plantuml/core/DiagramDescriptionImpl.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 11351 $ * */ package net.sourceforge.plantuml.core; diff --git a/src/net/sourceforge/plantuml/core/DiagramType.java b/src/net/sourceforge/plantuml/core/DiagramType.java index e23af1c08..9c4469ba2 100644 --- a/src/net/sourceforge/plantuml/core/DiagramType.java +++ b/src/net/sourceforge/plantuml/core/DiagramType.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4768 $ * */ package net.sourceforge.plantuml.core; diff --git a/src/net/sourceforge/plantuml/core/ImageData.java b/src/net/sourceforge/plantuml/core/ImageData.java index 3101abd05..38376b934 100644 --- a/src/net/sourceforge/plantuml/core/ImageData.java +++ b/src/net/sourceforge/plantuml/core/ImageData.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 9885 $ * */ package net.sourceforge.plantuml.core; diff --git a/src/net/sourceforge/plantuml/core/UmlSource.java b/src/net/sourceforge/plantuml/core/UmlSource.java index f638f5fcc..410d0a572 100644 --- a/src/net/sourceforge/plantuml/core/UmlSource.java +++ b/src/net/sourceforge/plantuml/core/UmlSource.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4768 $ * */ package net.sourceforge.plantuml.core; diff --git a/src/net/sourceforge/plantuml/creole/Atom.java b/src/net/sourceforge/plantuml/creole/Atom.java index 220376fa0..71eebbbf5 100644 --- a/src/net/sourceforge/plantuml/creole/Atom.java +++ b/src/net/sourceforge/plantuml/creole/Atom.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 11025 $ * */ package net.sourceforge.plantuml.creole; diff --git a/src/net/sourceforge/plantuml/creole/AtomEmbededSystem.java b/src/net/sourceforge/plantuml/creole/AtomEmbededSystem.java index d90fe22ae..b17cd5f98 100644 --- a/src/net/sourceforge/plantuml/creole/AtomEmbededSystem.java +++ b/src/net/sourceforge/plantuml/creole/AtomEmbededSystem.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6009 $ * */ package net.sourceforge.plantuml.creole; diff --git a/src/net/sourceforge/plantuml/creole/AtomImg.java b/src/net/sourceforge/plantuml/creole/AtomImg.java index 25b2ce764..f1d9c5ee1 100644 --- a/src/net/sourceforge/plantuml/creole/AtomImg.java +++ b/src/net/sourceforge/plantuml/creole/AtomImg.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 11025 $ * */ package net.sourceforge.plantuml.creole; @@ -52,6 +49,7 @@ import net.sourceforge.plantuml.code.Base64Coder; import net.sourceforge.plantuml.graphic.FontConfiguration; import net.sourceforge.plantuml.graphic.ImgValign; import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.graphic.TileImageSvg; import net.sourceforge.plantuml.ugraphic.UFont; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.UImage; @@ -92,8 +90,7 @@ public class AtomImg implements Atom { return AtomText.create("(File not found: " + f + ")", fc); } if (f.getName().endsWith(".svg")) { - // return new AtomImg(new TileImageSvg(f)); - throw new UnsupportedOperationException(); + return new AtomImgSvg(new TileImageSvg(f)); } final BufferedImage read = ImageIO.read(f); if (read == null) { diff --git a/src/net/sourceforge/plantuml/graphic/StringBounderUtils.java b/src/net/sourceforge/plantuml/creole/AtomImgSvg.java similarity index 54% rename from src/net/sourceforge/plantuml/graphic/StringBounderUtils.java rename to src/net/sourceforge/plantuml/creole/AtomImgSvg.java index a3626dd87..dde09398d 100644 --- a/src/net/sourceforge/plantuml/graphic/StringBounderUtils.java +++ b/src/net/sourceforge/plantuml/creole/AtomImgSvg.java @@ -23,38 +23,37 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19265 $ * */ -package net.sourceforge.plantuml.graphic; +package net.sourceforge.plantuml.creole; -import java.awt.FontMetrics; -import java.awt.Graphics2D; import java.awt.geom.Dimension2D; -import java.awt.geom.Rectangle2D; -import java.awt.image.BufferedImage; -import net.sourceforge.plantuml.Dimension2DDouble; -import net.sourceforge.plantuml.ugraphic.UFont; +import net.sourceforge.plantuml.graphic.StringBounder; +import net.sourceforge.plantuml.graphic.TileImageSvg; +import net.sourceforge.plantuml.ugraphic.UGraphic; -public class StringBounderUtils { +public class AtomImgSvg implements Atom { - final static BufferedImage imDummy = new BufferedImage(10, 10, BufferedImage.TYPE_INT_RGB); - final static Graphics2D gg = imDummy.createGraphics(); - - public static StringBounder asStringBounder() { + private final TileImageSvg tileImageSvg; - return new StringBounder() { - public Dimension2D calculateDimension(UFont font, String text) { - final FontMetrics fm = gg.getFontMetrics(font.getFont()); - final Rectangle2D rect = fm.getStringBounds(text, gg); - return new Dimension2DDouble(rect.getWidth(), rect.getHeight()); - } - }; + public AtomImgSvg(TileImageSvg tileImageSvg) { + this.tileImageSvg = tileImageSvg; } + + public Dimension2D calculateDimension(StringBounder stringBounder) { + return tileImageSvg.calculateDimension(stringBounder); + } + + public double getStartingAltitude(StringBounder stringBounder) { + return 0; + } + + public void drawU(UGraphic ug) { + tileImageSvg.drawU(ug); + } + } diff --git a/src/net/sourceforge/plantuml/creole/AtomOpenIcon.java b/src/net/sourceforge/plantuml/creole/AtomOpenIcon.java index d20937fcb..5bfff4876 100644 --- a/src/net/sourceforge/plantuml/creole/AtomOpenIcon.java +++ b/src/net/sourceforge/plantuml/creole/AtomOpenIcon.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 11025 $ * */ package net.sourceforge.plantuml.creole; diff --git a/src/net/sourceforge/plantuml/creole/AtomSpace.java b/src/net/sourceforge/plantuml/creole/AtomSpace.java index fa74820c5..f612683a3 100644 --- a/src/net/sourceforge/plantuml/creole/AtomSpace.java +++ b/src/net/sourceforge/plantuml/creole/AtomSpace.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 11025 $ * */ package net.sourceforge.plantuml.creole; diff --git a/src/net/sourceforge/plantuml/creole/AtomSprite.java b/src/net/sourceforge/plantuml/creole/AtomSprite.java index a15245b43..f8bba0c49 100644 --- a/src/net/sourceforge/plantuml/creole/AtomSprite.java +++ b/src/net/sourceforge/plantuml/creole/AtomSprite.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 11025 $ * */ package net.sourceforge.plantuml.creole; diff --git a/src/net/sourceforge/plantuml/creole/AtomTable.java b/src/net/sourceforge/plantuml/creole/AtomTable.java index d3cddf240..2703743c5 100644 --- a/src/net/sourceforge/plantuml/creole/AtomTable.java +++ b/src/net/sourceforge/plantuml/creole/AtomTable.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 11025 $ * */ package net.sourceforge.plantuml.creole; diff --git a/src/net/sourceforge/plantuml/creole/AtomText.java b/src/net/sourceforge/plantuml/creole/AtomText.java index c70dca3d0..5d8712503 100644 --- a/src/net/sourceforge/plantuml/creole/AtomText.java +++ b/src/net/sourceforge/plantuml/creole/AtomText.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 11025 $ * */ package net.sourceforge.plantuml.creole; diff --git a/src/net/sourceforge/plantuml/creole/AtomTree.java b/src/net/sourceforge/plantuml/creole/AtomTree.java index 0a548374b..3b7ed3df3 100644 --- a/src/net/sourceforge/plantuml/creole/AtomTree.java +++ b/src/net/sourceforge/plantuml/creole/AtomTree.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 11025 $ * */ package net.sourceforge.plantuml.creole; diff --git a/src/net/sourceforge/plantuml/creole/AtomWithMargin.java b/src/net/sourceforge/plantuml/creole/AtomWithMargin.java index 0de9f784c..6780f238f 100644 --- a/src/net/sourceforge/plantuml/creole/AtomWithMargin.java +++ b/src/net/sourceforge/plantuml/creole/AtomWithMargin.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 11025 $ * */ package net.sourceforge.plantuml.creole; diff --git a/src/net/sourceforge/plantuml/creole/Bullet.java b/src/net/sourceforge/plantuml/creole/Bullet.java index bb24c6791..1b1a099e3 100644 --- a/src/net/sourceforge/plantuml/creole/Bullet.java +++ b/src/net/sourceforge/plantuml/creole/Bullet.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 11025 $ * */ package net.sourceforge.plantuml.creole; diff --git a/src/net/sourceforge/plantuml/creole/Command.java b/src/net/sourceforge/plantuml/creole/Command.java index 35a2ec160..3b172fd7f 100644 --- a/src/net/sourceforge/plantuml/creole/Command.java +++ b/src/net/sourceforge/plantuml/creole/Command.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 11025 $ * */ package net.sourceforge.plantuml.creole; diff --git a/src/net/sourceforge/plantuml/creole/CommandCreoleColorAndSizeChange.java b/src/net/sourceforge/plantuml/creole/CommandCreoleColorAndSizeChange.java index c65eca8ec..0f95f2638 100644 --- a/src/net/sourceforge/plantuml/creole/CommandCreoleColorAndSizeChange.java +++ b/src/net/sourceforge/plantuml/creole/CommandCreoleColorAndSizeChange.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 11025 $ * */ package net.sourceforge.plantuml.creole; diff --git a/src/net/sourceforge/plantuml/creole/CommandCreoleColorChange.java b/src/net/sourceforge/plantuml/creole/CommandCreoleColorChange.java index 78756b63f..95f49e306 100644 --- a/src/net/sourceforge/plantuml/creole/CommandCreoleColorChange.java +++ b/src/net/sourceforge/plantuml/creole/CommandCreoleColorChange.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 11025 $ * */ package net.sourceforge.plantuml.creole; diff --git a/src/net/sourceforge/plantuml/creole/CommandCreoleExposantChange.java b/src/net/sourceforge/plantuml/creole/CommandCreoleExposantChange.java index e6eee8cc1..da1b68472 100644 --- a/src/net/sourceforge/plantuml/creole/CommandCreoleExposantChange.java +++ b/src/net/sourceforge/plantuml/creole/CommandCreoleExposantChange.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 11025 $ * */ package net.sourceforge.plantuml.creole; diff --git a/src/net/sourceforge/plantuml/creole/CommandCreoleFontFamilyChange.java b/src/net/sourceforge/plantuml/creole/CommandCreoleFontFamilyChange.java index 8e4dc8959..c0fe16566 100644 --- a/src/net/sourceforge/plantuml/creole/CommandCreoleFontFamilyChange.java +++ b/src/net/sourceforge/plantuml/creole/CommandCreoleFontFamilyChange.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 11025 $ * */ package net.sourceforge.plantuml.creole; diff --git a/src/net/sourceforge/plantuml/creole/CommandCreoleImg.java b/src/net/sourceforge/plantuml/creole/CommandCreoleImg.java index 86702e0d1..cbd87ed15 100644 --- a/src/net/sourceforge/plantuml/creole/CommandCreoleImg.java +++ b/src/net/sourceforge/plantuml/creole/CommandCreoleImg.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 11025 $ * */ package net.sourceforge.plantuml.creole; diff --git a/src/net/sourceforge/plantuml/creole/CommandCreoleMonospaced.java b/src/net/sourceforge/plantuml/creole/CommandCreoleMonospaced.java index 295c49199..e810d2b63 100644 --- a/src/net/sourceforge/plantuml/creole/CommandCreoleMonospaced.java +++ b/src/net/sourceforge/plantuml/creole/CommandCreoleMonospaced.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 11025 $ * */ package net.sourceforge.plantuml.creole; diff --git a/src/net/sourceforge/plantuml/creole/CommandCreoleOpenIcon.java b/src/net/sourceforge/plantuml/creole/CommandCreoleOpenIcon.java index 5a2283996..5cf32b8b5 100644 --- a/src/net/sourceforge/plantuml/creole/CommandCreoleOpenIcon.java +++ b/src/net/sourceforge/plantuml/creole/CommandCreoleOpenIcon.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 11025 $ * */ package net.sourceforge.plantuml.creole; diff --git a/src/net/sourceforge/plantuml/creole/CommandCreoleSizeChange.java b/src/net/sourceforge/plantuml/creole/CommandCreoleSizeChange.java index 34795d6dc..789827096 100644 --- a/src/net/sourceforge/plantuml/creole/CommandCreoleSizeChange.java +++ b/src/net/sourceforge/plantuml/creole/CommandCreoleSizeChange.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 11025 $ * */ package net.sourceforge.plantuml.creole; diff --git a/src/net/sourceforge/plantuml/creole/CommandCreoleSpace.java b/src/net/sourceforge/plantuml/creole/CommandCreoleSpace.java index aa0c28ecd..cda56554d 100644 --- a/src/net/sourceforge/plantuml/creole/CommandCreoleSpace.java +++ b/src/net/sourceforge/plantuml/creole/CommandCreoleSpace.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 11025 $ * */ package net.sourceforge.plantuml.creole; diff --git a/src/net/sourceforge/plantuml/creole/CommandCreoleSprite.java b/src/net/sourceforge/plantuml/creole/CommandCreoleSprite.java index 71104d91e..bf35cd521 100644 --- a/src/net/sourceforge/plantuml/creole/CommandCreoleSprite.java +++ b/src/net/sourceforge/plantuml/creole/CommandCreoleSprite.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 11025 $ * */ package net.sourceforge.plantuml.creole; diff --git a/src/net/sourceforge/plantuml/creole/CommandCreoleStyle.java b/src/net/sourceforge/plantuml/creole/CommandCreoleStyle.java index b3df4dc6c..e586283f8 100644 --- a/src/net/sourceforge/plantuml/creole/CommandCreoleStyle.java +++ b/src/net/sourceforge/plantuml/creole/CommandCreoleStyle.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 11025 $ * */ package net.sourceforge.plantuml.creole; diff --git a/src/net/sourceforge/plantuml/creole/CommandCreoleSvgAttributeChange.java b/src/net/sourceforge/plantuml/creole/CommandCreoleSvgAttributeChange.java index ebb4ab98d..0cf76d674 100644 --- a/src/net/sourceforge/plantuml/creole/CommandCreoleSvgAttributeChange.java +++ b/src/net/sourceforge/plantuml/creole/CommandCreoleSvgAttributeChange.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 11025 $ * */ package net.sourceforge.plantuml.creole; diff --git a/src/net/sourceforge/plantuml/creole/CommandCreoleUrl.java b/src/net/sourceforge/plantuml/creole/CommandCreoleUrl.java index 1d3fe8126..95d244538 100644 --- a/src/net/sourceforge/plantuml/creole/CommandCreoleUrl.java +++ b/src/net/sourceforge/plantuml/creole/CommandCreoleUrl.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 11025 $ * */ package net.sourceforge.plantuml.creole; diff --git a/src/net/sourceforge/plantuml/creole/CreoleContext.java b/src/net/sourceforge/plantuml/creole/CreoleContext.java index daa8b6d6c..bb7bcb991 100644 --- a/src/net/sourceforge/plantuml/creole/CreoleContext.java +++ b/src/net/sourceforge/plantuml/creole/CreoleContext.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 11025 $ * */ package net.sourceforge.plantuml.creole; diff --git a/src/net/sourceforge/plantuml/creole/CreoleHorizontalLine.java b/src/net/sourceforge/plantuml/creole/CreoleHorizontalLine.java index 01b1a2d0e..849fd4c55 100644 --- a/src/net/sourceforge/plantuml/creole/CreoleHorizontalLine.java +++ b/src/net/sourceforge/plantuml/creole/CreoleHorizontalLine.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 11025 $ * */ package net.sourceforge.plantuml.creole; diff --git a/src/net/sourceforge/plantuml/creole/CreoleMode.java b/src/net/sourceforge/plantuml/creole/CreoleMode.java index 8c13c8338..904d442f6 100644 --- a/src/net/sourceforge/plantuml/creole/CreoleMode.java +++ b/src/net/sourceforge/plantuml/creole/CreoleMode.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 11025 $ * */ package net.sourceforge.plantuml.creole; diff --git a/src/net/sourceforge/plantuml/creole/CreoleParser.java b/src/net/sourceforge/plantuml/creole/CreoleParser.java index ddb274ce8..50ea53a58 100644 --- a/src/net/sourceforge/plantuml/creole/CreoleParser.java +++ b/src/net/sourceforge/plantuml/creole/CreoleParser.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 11025 $ * */ package net.sourceforge.plantuml.creole; diff --git a/src/net/sourceforge/plantuml/creole/CreoleStripeSimpleParser.java b/src/net/sourceforge/plantuml/creole/CreoleStripeSimpleParser.java index 7244711fb..a6b597d4f 100644 --- a/src/net/sourceforge/plantuml/creole/CreoleStripeSimpleParser.java +++ b/src/net/sourceforge/plantuml/creole/CreoleStripeSimpleParser.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 11025 $ * */ package net.sourceforge.plantuml.creole; diff --git a/src/net/sourceforge/plantuml/creole/Fission.java b/src/net/sourceforge/plantuml/creole/Fission.java index 08b096845..f1121614d 100644 --- a/src/net/sourceforge/plantuml/creole/Fission.java +++ b/src/net/sourceforge/plantuml/creole/Fission.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 11025 $ * */ package net.sourceforge.plantuml.creole; diff --git a/src/net/sourceforge/plantuml/creole/PSystemCreole.java b/src/net/sourceforge/plantuml/creole/PSystemCreole.java index e9454ba75..03eb907e6 100644 --- a/src/net/sourceforge/plantuml/creole/PSystemCreole.java +++ b/src/net/sourceforge/plantuml/creole/PSystemCreole.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4041 $ * */ package net.sourceforge.plantuml.creole; diff --git a/src/net/sourceforge/plantuml/creole/PSystemCreoleFactory.java b/src/net/sourceforge/plantuml/creole/PSystemCreoleFactory.java index a05703916..5ab4d487d 100644 --- a/src/net/sourceforge/plantuml/creole/PSystemCreoleFactory.java +++ b/src/net/sourceforge/plantuml/creole/PSystemCreoleFactory.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3830 $ * */ package net.sourceforge.plantuml.creole; diff --git a/src/net/sourceforge/plantuml/creole/Position.java b/src/net/sourceforge/plantuml/creole/Position.java index f4a9f737f..cbc0732d0 100644 --- a/src/net/sourceforge/plantuml/creole/Position.java +++ b/src/net/sourceforge/plantuml/creole/Position.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 11025 $ * */ package net.sourceforge.plantuml.creole; diff --git a/src/net/sourceforge/plantuml/creole/Sea.java b/src/net/sourceforge/plantuml/creole/Sea.java index 772ec1266..e0e8a775f 100644 --- a/src/net/sourceforge/plantuml/creole/Sea.java +++ b/src/net/sourceforge/plantuml/creole/Sea.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 11025 $ * */ package net.sourceforge.plantuml.creole; diff --git a/src/net/sourceforge/plantuml/creole/Sheet.java b/src/net/sourceforge/plantuml/creole/Sheet.java index b1b09271a..0119a3687 100644 --- a/src/net/sourceforge/plantuml/creole/Sheet.java +++ b/src/net/sourceforge/plantuml/creole/Sheet.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 11025 $ * */ package net.sourceforge.plantuml.creole; diff --git a/src/net/sourceforge/plantuml/creole/SheetBlock1.java b/src/net/sourceforge/plantuml/creole/SheetBlock1.java index 8555dfc34..6c378e9e8 100644 --- a/src/net/sourceforge/plantuml/creole/SheetBlock1.java +++ b/src/net/sourceforge/plantuml/creole/SheetBlock1.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 11025 $ * */ package net.sourceforge.plantuml.creole; diff --git a/src/net/sourceforge/plantuml/creole/SheetBlock2.java b/src/net/sourceforge/plantuml/creole/SheetBlock2.java index b4567ea73..4a46e6fba 100644 --- a/src/net/sourceforge/plantuml/creole/SheetBlock2.java +++ b/src/net/sourceforge/plantuml/creole/SheetBlock2.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 11025 $ * */ package net.sourceforge.plantuml.creole; diff --git a/src/net/sourceforge/plantuml/creole/Stencil.java b/src/net/sourceforge/plantuml/creole/Stencil.java index 75ded1566..9f8e2a80a 100644 --- a/src/net/sourceforge/plantuml/creole/Stencil.java +++ b/src/net/sourceforge/plantuml/creole/Stencil.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 11025 $ * */ package net.sourceforge.plantuml.creole; diff --git a/src/net/sourceforge/plantuml/creole/Stripe.java b/src/net/sourceforge/plantuml/creole/Stripe.java index 14140eacc..04511780d 100644 --- a/src/net/sourceforge/plantuml/creole/Stripe.java +++ b/src/net/sourceforge/plantuml/creole/Stripe.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 11025 $ * */ package net.sourceforge.plantuml.creole; diff --git a/src/net/sourceforge/plantuml/creole/StripeSimple.java b/src/net/sourceforge/plantuml/creole/StripeSimple.java index f278b918a..922b21ad6 100644 --- a/src/net/sourceforge/plantuml/creole/StripeSimple.java +++ b/src/net/sourceforge/plantuml/creole/StripeSimple.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 11025 $ * */ package net.sourceforge.plantuml.creole; diff --git a/src/net/sourceforge/plantuml/creole/StripeStyle.java b/src/net/sourceforge/plantuml/creole/StripeStyle.java index 7a1440fea..fbb4d12b8 100644 --- a/src/net/sourceforge/plantuml/creole/StripeStyle.java +++ b/src/net/sourceforge/plantuml/creole/StripeStyle.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 11025 $ * */ package net.sourceforge.plantuml.creole; diff --git a/src/net/sourceforge/plantuml/creole/StripeStyleType.java b/src/net/sourceforge/plantuml/creole/StripeStyleType.java index c88ba65bf..ec9c2ac90 100644 --- a/src/net/sourceforge/plantuml/creole/StripeStyleType.java +++ b/src/net/sourceforge/plantuml/creole/StripeStyleType.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 11025 $ * */ package net.sourceforge.plantuml.creole; diff --git a/src/net/sourceforge/plantuml/creole/StripeTable.java b/src/net/sourceforge/plantuml/creole/StripeTable.java index f4eb16927..f8de37b06 100644 --- a/src/net/sourceforge/plantuml/creole/StripeTable.java +++ b/src/net/sourceforge/plantuml/creole/StripeTable.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 11025 $ * */ package net.sourceforge.plantuml.creole; diff --git a/src/net/sourceforge/plantuml/creole/StripeTree.java b/src/net/sourceforge/plantuml/creole/StripeTree.java index d98fea725..b8b78a888 100644 --- a/src/net/sourceforge/plantuml/creole/StripeTree.java +++ b/src/net/sourceforge/plantuml/creole/StripeTree.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 11025 $ * */ package net.sourceforge.plantuml.creole; diff --git a/src/net/sourceforge/plantuml/creole/UCreole.java b/src/net/sourceforge/plantuml/creole/UCreole.java index f62172979..c19673845 100644 --- a/src/net/sourceforge/plantuml/creole/UCreole.java +++ b/src/net/sourceforge/plantuml/creole/UCreole.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 11025 $ * */ package net.sourceforge.plantuml.creole; diff --git a/src/net/sourceforge/plantuml/cucadiagram/Bodier.java b/src/net/sourceforge/plantuml/cucadiagram/Bodier.java index d0282113f..5e12bb463 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/Bodier.java +++ b/src/net/sourceforge/plantuml/cucadiagram/Bodier.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 7755 $ * */ package net.sourceforge.plantuml.cucadiagram; diff --git a/src/net/sourceforge/plantuml/cucadiagram/BodyEnhanced.java b/src/net/sourceforge/plantuml/cucadiagram/BodyEnhanced.java index 6d3539620..8c660a1c6 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/BodyEnhanced.java +++ b/src/net/sourceforge/plantuml/cucadiagram/BodyEnhanced.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 7637 $ * */ package net.sourceforge.plantuml.cucadiagram; diff --git a/src/net/sourceforge/plantuml/cucadiagram/BodyEnhanced2.java b/src/net/sourceforge/plantuml/cucadiagram/BodyEnhanced2.java index 81be38af4..bb32a5c93 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/BodyEnhanced2.java +++ b/src/net/sourceforge/plantuml/cucadiagram/BodyEnhanced2.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 7637 $ * */ package net.sourceforge.plantuml.cucadiagram; diff --git a/src/net/sourceforge/plantuml/cucadiagram/Code.java b/src/net/sourceforge/plantuml/cucadiagram/Code.java index 275193f7a..eeed3cb1a 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/Code.java +++ b/src/net/sourceforge/plantuml/cucadiagram/Code.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8770 $ * */ package net.sourceforge.plantuml.cucadiagram; diff --git a/src/net/sourceforge/plantuml/cucadiagram/CucaDiagram.java b/src/net/sourceforge/plantuml/cucadiagram/CucaDiagram.java index d4ca25703..983b900b4 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/CucaDiagram.java +++ b/src/net/sourceforge/plantuml/cucadiagram/CucaDiagram.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 20149 $ * */ package net.sourceforge.plantuml.cucadiagram; @@ -325,8 +322,8 @@ public abstract class CucaDiagram extends UmlDiagram implements GroupHierarchy, // final CucaDiagramFileMaker maker = OptionFlags.USE_HECTOR ? new CucaDiagramFileMakerHectorC1(this) // : new CucaDiagramFileMakerSvek(this); - final CucaDiagramFileMaker maker = this.isUseJDot() ? new CucaDiagramFileMakerJDot(this) - : new CucaDiagramFileMakerSvek(this); + final CucaDiagramFileMaker maker = this.isUseJDot() ? new CucaDiagramFileMakerJDot(this, + fileFormat.getDefaultStringBounder()) : new CucaDiagramFileMakerSvek(this); final ImageData result = maker.createFile(os, getDotStrings(), fileFormatOption); if (result == null) { diff --git a/src/net/sourceforge/plantuml/cucadiagram/Display.java b/src/net/sourceforge/plantuml/cucadiagram/Display.java index 211f5f77a..732f12450 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/Display.java +++ b/src/net/sourceforge/plantuml/cucadiagram/Display.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8218 $ * */ package net.sourceforge.plantuml.cucadiagram; diff --git a/src/net/sourceforge/plantuml/cucadiagram/DisplayPositionned.java b/src/net/sourceforge/plantuml/cucadiagram/DisplayPositionned.java index 0138f0e73..7301f5be7 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/DisplayPositionned.java +++ b/src/net/sourceforge/plantuml/cucadiagram/DisplayPositionned.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8218 $ * */ package net.sourceforge.plantuml.cucadiagram; diff --git a/src/net/sourceforge/plantuml/cucadiagram/EntityGender.java b/src/net/sourceforge/plantuml/cucadiagram/EntityGender.java index da0a530b9..dd6eb6413 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/EntityGender.java +++ b/src/net/sourceforge/plantuml/cucadiagram/EntityGender.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3829 $ * */ package net.sourceforge.plantuml.cucadiagram; diff --git a/src/net/sourceforge/plantuml/cucadiagram/EntityGenderUtils.java b/src/net/sourceforge/plantuml/cucadiagram/EntityGenderUtils.java index 2d09678f6..ba287ef93 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/EntityGenderUtils.java +++ b/src/net/sourceforge/plantuml/cucadiagram/EntityGenderUtils.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3829 $ * */ package net.sourceforge.plantuml.cucadiagram; diff --git a/src/net/sourceforge/plantuml/cucadiagram/EntityPort.java b/src/net/sourceforge/plantuml/cucadiagram/EntityPort.java index 482ec99ad..88f52e7d6 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/EntityPort.java +++ b/src/net/sourceforge/plantuml/cucadiagram/EntityPort.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19635 $ * */ package net.sourceforge.plantuml.cucadiagram; diff --git a/src/net/sourceforge/plantuml/cucadiagram/EntityPortion.java b/src/net/sourceforge/plantuml/cucadiagram/EntityPortion.java index e1aaa44f9..333e1b53c 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/EntityPortion.java +++ b/src/net/sourceforge/plantuml/cucadiagram/EntityPortion.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3829 $ * */ package net.sourceforge.plantuml.cucadiagram; diff --git a/src/net/sourceforge/plantuml/cucadiagram/EntityPosition.java b/src/net/sourceforge/plantuml/cucadiagram/EntityPosition.java index 826be2c20..2f100d5f1 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/EntityPosition.java +++ b/src/net/sourceforge/plantuml/cucadiagram/EntityPosition.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8140 $ * */ package net.sourceforge.plantuml.cucadiagram; diff --git a/src/net/sourceforge/plantuml/cucadiagram/EntityUtils.java b/src/net/sourceforge/plantuml/cucadiagram/EntityUtils.java index e3d165552..6bd1b0aee 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/EntityUtils.java +++ b/src/net/sourceforge/plantuml/cucadiagram/EntityUtils.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4749 $ * */ package net.sourceforge.plantuml.cucadiagram; diff --git a/src/net/sourceforge/plantuml/cucadiagram/GroupHierarchy.java b/src/net/sourceforge/plantuml/cucadiagram/GroupHierarchy.java index 2521db161..19bad56fa 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/GroupHierarchy.java +++ b/src/net/sourceforge/plantuml/cucadiagram/GroupHierarchy.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.cucadiagram; diff --git a/src/net/sourceforge/plantuml/cucadiagram/GroupPrinter.java b/src/net/sourceforge/plantuml/cucadiagram/GroupPrinter.java index 14d70a9ed..ee0ae31d6 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/GroupPrinter.java +++ b/src/net/sourceforge/plantuml/cucadiagram/GroupPrinter.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8218 $ * */ package net.sourceforge.plantuml.cucadiagram; diff --git a/src/net/sourceforge/plantuml/cucadiagram/GroupRoot.java b/src/net/sourceforge/plantuml/cucadiagram/GroupRoot.java index dd80dfb61..931b51d24 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/GroupRoot.java +++ b/src/net/sourceforge/plantuml/cucadiagram/GroupRoot.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8218 $ * */ package net.sourceforge.plantuml.cucadiagram; diff --git a/src/net/sourceforge/plantuml/cucadiagram/GroupType.java b/src/net/sourceforge/plantuml/cucadiagram/GroupType.java index 7675dcb51..cd1ea9548 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/GroupType.java +++ b/src/net/sourceforge/plantuml/cucadiagram/GroupType.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.cucadiagram; diff --git a/src/net/sourceforge/plantuml/cucadiagram/IEntity.java b/src/net/sourceforge/plantuml/cucadiagram/IEntity.java index f7ae70133..d0e8a365d 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/IEntity.java +++ b/src/net/sourceforge/plantuml/cucadiagram/IEntity.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8218 $ * */ package net.sourceforge.plantuml.cucadiagram; diff --git a/src/net/sourceforge/plantuml/cucadiagram/IGroup.java b/src/net/sourceforge/plantuml/cucadiagram/IGroup.java index 6ad1c324d..5281815e7 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/IGroup.java +++ b/src/net/sourceforge/plantuml/cucadiagram/IGroup.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8218 $ * */ package net.sourceforge.plantuml.cucadiagram; diff --git a/src/net/sourceforge/plantuml/cucadiagram/ILeaf.java b/src/net/sourceforge/plantuml/cucadiagram/ILeaf.java index dda2c7a30..8c78e4a65 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/ILeaf.java +++ b/src/net/sourceforge/plantuml/cucadiagram/ILeaf.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4749 $ * */ package net.sourceforge.plantuml.cucadiagram; diff --git a/src/net/sourceforge/plantuml/cucadiagram/Ident.java b/src/net/sourceforge/plantuml/cucadiagram/Ident.java index d8b22d533..4140a10dd 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/Ident.java +++ b/src/net/sourceforge/plantuml/cucadiagram/Ident.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8770 $ * */ package net.sourceforge.plantuml.cucadiagram; diff --git a/src/net/sourceforge/plantuml/cucadiagram/LeafType.java b/src/net/sourceforge/plantuml/cucadiagram/LeafType.java index f88069045..2e89cac90 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/LeafType.java +++ b/src/net/sourceforge/plantuml/cucadiagram/LeafType.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.cucadiagram; diff --git a/src/net/sourceforge/plantuml/cucadiagram/Link.java b/src/net/sourceforge/plantuml/cucadiagram/Link.java index 6d06c3353..e31fa9a91 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/Link.java +++ b/src/net/sourceforge/plantuml/cucadiagram/Link.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 20057 $ * */ package net.sourceforge.plantuml.cucadiagram; diff --git a/src/net/sourceforge/plantuml/cucadiagram/LinkArrow.java b/src/net/sourceforge/plantuml/cucadiagram/LinkArrow.java index 1e0ce47af..db77ef886 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/LinkArrow.java +++ b/src/net/sourceforge/plantuml/cucadiagram/LinkArrow.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 7601 $ * */ package net.sourceforge.plantuml.cucadiagram; diff --git a/src/net/sourceforge/plantuml/cucadiagram/LinkDecor.java b/src/net/sourceforge/plantuml/cucadiagram/LinkDecor.java index d36059f37..2d336cd72 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/LinkDecor.java +++ b/src/net/sourceforge/plantuml/cucadiagram/LinkDecor.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4604 $ * */ package net.sourceforge.plantuml.cucadiagram; diff --git a/src/net/sourceforge/plantuml/cucadiagram/LinkHat.java b/src/net/sourceforge/plantuml/cucadiagram/LinkHat.java index 1042353ab..ebe5247c5 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/LinkHat.java +++ b/src/net/sourceforge/plantuml/cucadiagram/LinkHat.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4604 $ * */ package net.sourceforge.plantuml.cucadiagram; diff --git a/src/net/sourceforge/plantuml/cucadiagram/LinkMiddleDecor.java b/src/net/sourceforge/plantuml/cucadiagram/LinkMiddleDecor.java index 616d0c7d8..486ee09d5 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/LinkMiddleDecor.java +++ b/src/net/sourceforge/plantuml/cucadiagram/LinkMiddleDecor.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4604 $ * */ package net.sourceforge.plantuml.cucadiagram; diff --git a/src/net/sourceforge/plantuml/cucadiagram/LinkStyle.java b/src/net/sourceforge/plantuml/cucadiagram/LinkStyle.java index 2b3ec3b97..451a7c97e 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/LinkStyle.java +++ b/src/net/sourceforge/plantuml/cucadiagram/LinkStyle.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4604 $ * */ package net.sourceforge.plantuml.cucadiagram; diff --git a/src/net/sourceforge/plantuml/cucadiagram/LinkType.java b/src/net/sourceforge/plantuml/cucadiagram/LinkType.java index ea23453ce..9048e1ca0 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/LinkType.java +++ b/src/net/sourceforge/plantuml/cucadiagram/LinkType.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4604 $ * */ package net.sourceforge.plantuml.cucadiagram; diff --git a/src/net/sourceforge/plantuml/cucadiagram/LongCode.java b/src/net/sourceforge/plantuml/cucadiagram/LongCode.java index a20a98253..a41710937 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/LongCode.java +++ b/src/net/sourceforge/plantuml/cucadiagram/LongCode.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8770 $ * */ package net.sourceforge.plantuml.cucadiagram; diff --git a/src/net/sourceforge/plantuml/cucadiagram/Magma.java b/src/net/sourceforge/plantuml/cucadiagram/Magma.java index c56712024..09900de0a 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/Magma.java +++ b/src/net/sourceforge/plantuml/cucadiagram/Magma.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 10006 $ * */ package net.sourceforge.plantuml.cucadiagram; diff --git a/src/net/sourceforge/plantuml/cucadiagram/MagmaList.java b/src/net/sourceforge/plantuml/cucadiagram/MagmaList.java index 7854b7387..74b25ad6d 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/MagmaList.java +++ b/src/net/sourceforge/plantuml/cucadiagram/MagmaList.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 10006 $ * */ package net.sourceforge.plantuml.cucadiagram; diff --git a/src/net/sourceforge/plantuml/cucadiagram/Member.java b/src/net/sourceforge/plantuml/cucadiagram/Member.java index d0c962fc1..4e95d732c 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/Member.java +++ b/src/net/sourceforge/plantuml/cucadiagram/Member.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4749 $ * */ package net.sourceforge.plantuml.cucadiagram; diff --git a/src/net/sourceforge/plantuml/cucadiagram/MemberImpl.java b/src/net/sourceforge/plantuml/cucadiagram/MemberImpl.java index 7f69214c3..f1a336859 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/MemberImpl.java +++ b/src/net/sourceforge/plantuml/cucadiagram/MemberImpl.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4749 $ * */ package net.sourceforge.plantuml.cucadiagram; diff --git a/src/net/sourceforge/plantuml/cucadiagram/MethodsOrFieldsArea.java b/src/net/sourceforge/plantuml/cucadiagram/MethodsOrFieldsArea.java index a8809da28..fff1f4a87 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/MethodsOrFieldsArea.java +++ b/src/net/sourceforge/plantuml/cucadiagram/MethodsOrFieldsArea.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4749 $ * */ package net.sourceforge.plantuml.cucadiagram; diff --git a/src/net/sourceforge/plantuml/cucadiagram/Namespace.java b/src/net/sourceforge/plantuml/cucadiagram/Namespace.java index c0d49fa63..405adb3a6 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/Namespace.java +++ b/src/net/sourceforge/plantuml/cucadiagram/Namespace.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8770 $ * */ package net.sourceforge.plantuml.cucadiagram; diff --git a/src/net/sourceforge/plantuml/cucadiagram/PortionShower.java b/src/net/sourceforge/plantuml/cucadiagram/PortionShower.java index 06da6931a..d1eaf6fc5 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/PortionShower.java +++ b/src/net/sourceforge/plantuml/cucadiagram/PortionShower.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4192 $ * */ package net.sourceforge.plantuml.cucadiagram; diff --git a/src/net/sourceforge/plantuml/cucadiagram/Rankdir.java b/src/net/sourceforge/plantuml/cucadiagram/Rankdir.java index c8d912226..b5aae74ba 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/Rankdir.java +++ b/src/net/sourceforge/plantuml/cucadiagram/Rankdir.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.cucadiagram; diff --git a/src/net/sourceforge/plantuml/cucadiagram/RuleType.java b/src/net/sourceforge/plantuml/cucadiagram/RuleType.java index 31bc557fe..cda035c49 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/RuleType.java +++ b/src/net/sourceforge/plantuml/cucadiagram/RuleType.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3829 $ * */ package net.sourceforge.plantuml.cucadiagram; diff --git a/src/net/sourceforge/plantuml/cucadiagram/SquareLinker.java b/src/net/sourceforge/plantuml/cucadiagram/SquareLinker.java index 80e033761..b56870083 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/SquareLinker.java +++ b/src/net/sourceforge/plantuml/cucadiagram/SquareLinker.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 10006 $ * */ package net.sourceforge.plantuml.cucadiagram; diff --git a/src/net/sourceforge/plantuml/cucadiagram/SquareMaker.java b/src/net/sourceforge/plantuml/cucadiagram/SquareMaker.java index e22e0c418..1bac6a25f 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/SquareMaker.java +++ b/src/net/sourceforge/plantuml/cucadiagram/SquareMaker.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 10006 $ * */ package net.sourceforge.plantuml.cucadiagram; diff --git a/src/net/sourceforge/plantuml/cucadiagram/Stereotype.java b/src/net/sourceforge/plantuml/cucadiagram/Stereotype.java index 616185e50..c60469c7c 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/Stereotype.java +++ b/src/net/sourceforge/plantuml/cucadiagram/Stereotype.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19880 $ * */ package net.sourceforge.plantuml.cucadiagram; diff --git a/src/net/sourceforge/plantuml/cucadiagram/UnparsableGraphvizException.java b/src/net/sourceforge/plantuml/cucadiagram/UnparsableGraphvizException.java index f4ea7ff23..3fa998ec7 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/UnparsableGraphvizException.java +++ b/src/net/sourceforge/plantuml/cucadiagram/UnparsableGraphvizException.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 9631 $ * */ package net.sourceforge.plantuml.cucadiagram; diff --git a/src/net/sourceforge/plantuml/cucadiagram/dot/AbstractGraphviz.java b/src/net/sourceforge/plantuml/cucadiagram/dot/AbstractGraphviz.java index f5d14e46e..e76f0106e 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/dot/AbstractGraphviz.java +++ b/src/net/sourceforge/plantuml/cucadiagram/dot/AbstractGraphviz.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 20172 $ * */ package net.sourceforge.plantuml.cucadiagram.dot; diff --git a/src/net/sourceforge/plantuml/cucadiagram/dot/CucaDiagramPngMaker3.java b/src/net/sourceforge/plantuml/cucadiagram/dot/CucaDiagramPngMaker3.java deleted file mode 100644 index cc62d282a..000000000 --- a/src/net/sourceforge/plantuml/cucadiagram/dot/CucaDiagramPngMaker3.java +++ /dev/null @@ -1,159 +0,0 @@ -/* ======================================================================== - * PlantUML : a free UML diagram generator - * ======================================================================== - * - * (C) Copyright 2009-2017, Arnaud Roques - * - * Project Info: http://plantuml.com - * - * 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. - * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] - * - * Original Author: Arnaud Roques - * - * Revision $Revision: 19109 $ - * - */ -package net.sourceforge.plantuml.cucadiagram.dot; - -import java.awt.Color; -import java.awt.Graphics2D; -import java.awt.geom.AffineTransform; -import java.awt.geom.Dimension2D; -import java.io.IOException; -import java.io.OutputStream; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - -import javax.imageio.ImageIO; - -import net.sourceforge.plantuml.Dimension2DDouble; -import net.sourceforge.plantuml.EmptyImageBuilder; -import net.sourceforge.plantuml.Log; -import net.sourceforge.plantuml.cucadiagram.CucaDiagram; -import net.sourceforge.plantuml.cucadiagram.IEntity; -import net.sourceforge.plantuml.cucadiagram.Link; -import net.sourceforge.plantuml.graph.ANode; -import net.sourceforge.plantuml.graph.ANodeImpl; -import net.sourceforge.plantuml.graph.Board; -import net.sourceforge.plantuml.graph.BoardExplorer; -import net.sourceforge.plantuml.graph.Graph5; -import net.sourceforge.plantuml.graph.Heap; -import net.sourceforge.plantuml.graph.Zoda2; - -public final class CucaDiagramPngMaker3 { - - private final CucaDiagram diagram; - - public CucaDiagramPngMaker3(CucaDiagram diagram) { - this.diagram = diagram; - } - - public void createPng(OutputStream os) throws IOException { - final Zoda2 zoda2 = new Zoda2(); - - for (Link link : diagram.getLinks()) { - final String s = link.getEntity1().getCode() + "->" + link.getEntity2().getCode(); - // Log.error("CucaDiagramPngMaker3:: " + s); - final int diffHeight = link.getLength() - 1; - // Log.error("CucaDiagramPngMaker3:: " + s + " " + diffHeight); - zoda2.addLink(s, diffHeight, link); - } - for (IEntity ent : diagram.getLeafsvalues()) { - ANode n = zoda2.getNode(ent.getCode().getFullName()); - if (n == null) { - n = zoda2.createAloneNode(ent.getCode().getFullName()); - } - ((ANodeImpl) n).setUserData(ent); - } - - final List graphs = getGraphs3(zoda2.getHeaps()); - - final Dimension2D totalDim = getTotalDimension(graphs); - final EmptyImageBuilder im = new EmptyImageBuilder(totalDim.getWidth(), totalDim.getHeight(), - Color.WHITE); - - double x = 0; - - final Graphics2D g2d = im.getGraphics2D(); - - for (Graph5 g : graphs) { - g2d.setTransform(new AffineTransform()); - g2d.translate(x, 0); - g.draw(g2d); - x += g.getDimension().getWidth(); - } - - ImageIO.write(im.getBufferedImage(), "png", os); - } - - private Dimension2D getTotalDimension(List graphs) { - double width = 0; - double height = 0; - for (Graph5 g : graphs) { - width += g.getDimension().getWidth(); - height = Math.max(height, g.getDimension().getHeight()); - } - return new Dimension2DDouble(width, height); - - } - - private List getGraphs3(Collection heaps) { - final List result = new ArrayList(); - for (Heap h : heaps) { - h.computeRows(); - Board board = new Board(h.getNodes(), h.getLinks()); - - final BoardExplorer boardExplorer = new BoardExplorer(board); - final long start = System.currentTimeMillis(); - for (int i = 0; i < 400; i++) { - final boolean finished = boardExplorer.onePass(); - if (finished) { - break; - } - if (i % 100 == 0) { - Log.info("" + i + " boardExplorer.getBestCost()=" + boardExplorer.getBestCost() + " " - + boardExplorer.collectionSize()); - } - } - Log.info("################# DURATION = " + (System.currentTimeMillis() - start)); - board = boardExplorer.getBestBoard(); - - result.add(new Graph5(board)); - } - return result; - } - -// public List createPng(File pngFile) throws IOException { -// OutputStream os = null; -// try { -// os = new BufferedOutputStream(new FileOutputStream(pngFile)); -// createPng(os); -// } finally { -// if (os != null) { -// os.close(); -// } -// } -// -// return new PngSplitter(pngFile, diagram.getHorizontalPages(), diagram.getVerticalPages(), diagram.getMetadata(), 96) -// .getFiles(); -// } -} diff --git a/src/net/sourceforge/plantuml/cucadiagram/dot/CucaDiagramSimplifierActivity.java b/src/net/sourceforge/plantuml/cucadiagram/dot/CucaDiagramSimplifierActivity.java index 9c6bf4722..09bee13a3 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/dot/CucaDiagramSimplifierActivity.java +++ b/src/net/sourceforge/plantuml/cucadiagram/dot/CucaDiagramSimplifierActivity.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6710 $ * */ package net.sourceforge.plantuml.cucadiagram.dot; @@ -41,48 +38,51 @@ import java.util.List; import net.sourceforge.plantuml.cucadiagram.CucaDiagram; import net.sourceforge.plantuml.cucadiagram.IGroup; import net.sourceforge.plantuml.cucadiagram.LeafType; +import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.svek.GroupPngMakerActivity; import net.sourceforge.plantuml.svek.IEntityImage; public final class CucaDiagramSimplifierActivity { private final CucaDiagram diagram; + private final StringBounder stringBounder; - public CucaDiagramSimplifierActivity(CucaDiagram diagram, List dotStrings) throws IOException, - InterruptedException { + public CucaDiagramSimplifierActivity(CucaDiagram diagram, List dotStrings, StringBounder stringBounder) + throws IOException, InterruptedException { this.diagram = diagram; + this.stringBounder = stringBounder; boolean changed; do { changed = false; final Collection groups = new ArrayList(diagram.getGroups(false)); for (IGroup g : groups) { if (diagram.isAutarkic(g)) { -// final EntityType type; -// if (g.zgetGroupType() == GroupType.INNER_ACTIVITY) { -// type = EntityType.ACTIVITY; -// } else if (g.zgetGroupType() == GroupType.CONCURRENT_ACTIVITY) { -// type = EntityType.ACTIVITY_CONCURRENT; -// } else { -// throw new IllegalStateException(); -// } - + // final EntityType type; + // if (g.zgetGroupType() == GroupType.INNER_ACTIVITY) { + // type = EntityType.ACTIVITY; + // } else if (g.zgetGroupType() == GroupType.CONCURRENT_ACTIVITY) { + // type = EntityType.ACTIVITY_CONCURRENT; + // } else { + // throw new IllegalStateException(); + // } + final IEntityImage img = computeImage(g); g.overideImage(img, LeafType.ACTIVITY); - + changed = true; } } } while (changed); } -// private void computeImageGroup(EntityMutable g, EntityMutable proxy, List dotStrings) throws IOException, -// InterruptedException { -// final GroupPngMakerActivity maker = new GroupPngMakerActivity(diagram, g); -// proxy.setSvekImage(maker.getImage()); -// } + // private void computeImageGroup(EntityMutable g, EntityMutable proxy, List dotStrings) throws IOException, + // InterruptedException { + // final GroupPngMakerActivity maker = new GroupPngMakerActivity(diagram, g); + // proxy.setSvekImage(maker.getImage()); + // } private IEntityImage computeImage(IGroup g) throws IOException, InterruptedException { - final GroupPngMakerActivity maker = new GroupPngMakerActivity(diagram, g); + final GroupPngMakerActivity maker = new GroupPngMakerActivity(diagram, g, stringBounder); return maker.getImage(); } diff --git a/src/net/sourceforge/plantuml/cucadiagram/dot/CucaDiagramSimplifierState.java b/src/net/sourceforge/plantuml/cucadiagram/dot/CucaDiagramSimplifierState.java index e806f1ce9..9a5f5e34c 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/dot/CucaDiagramSimplifierState.java +++ b/src/net/sourceforge/plantuml/cucadiagram/dot/CucaDiagramSimplifierState.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6710 $ * */ package net.sourceforge.plantuml.cucadiagram.dot; @@ -44,16 +41,19 @@ import net.sourceforge.plantuml.cucadiagram.GroupRoot; import net.sourceforge.plantuml.cucadiagram.GroupType; import net.sourceforge.plantuml.cucadiagram.IGroup; import net.sourceforge.plantuml.cucadiagram.LeafType; +import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.svek.GroupPngMakerState; import net.sourceforge.plantuml.svek.IEntityImage; public final class CucaDiagramSimplifierState { private final CucaDiagram diagram; + private final StringBounder stringBounder; - public CucaDiagramSimplifierState(CucaDiagram diagram, List dotStrings) throws IOException, - InterruptedException { + public CucaDiagramSimplifierState(CucaDiagram diagram, List dotStrings, StringBounder stringBounder) + throws IOException, InterruptedException { this.diagram = diagram; + this.stringBounder = stringBounder; boolean changed; do { changed = false; @@ -107,7 +107,7 @@ public final class CucaDiagramSimplifierState { } private IEntityImage computeImage(IGroup g) throws IOException, InterruptedException { - final GroupPngMakerState maker = new GroupPngMakerState(diagram, g); + final GroupPngMakerState maker = new GroupPngMakerState(diagram, g, stringBounder); return maker.getImage(); } diff --git a/src/net/sourceforge/plantuml/cucadiagram/dot/CucaDiagramTxtMaker.java b/src/net/sourceforge/plantuml/cucadiagram/dot/CucaDiagramTxtMaker.java index bf6e1bb8a..a134a5f22 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/dot/CucaDiagramTxtMaker.java +++ b/src/net/sourceforge/plantuml/cucadiagram/dot/CucaDiagramTxtMaker.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5079 $ * */ package net.sourceforge.plantuml.cucadiagram.dot; diff --git a/src/net/sourceforge/plantuml/cucadiagram/dot/DebugTrace.java b/src/net/sourceforge/plantuml/cucadiagram/dot/DebugTrace.java index af1470c4f..0862511ce 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/dot/DebugTrace.java +++ b/src/net/sourceforge/plantuml/cucadiagram/dot/DebugTrace.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 10765 $ * */ package net.sourceforge.plantuml.cucadiagram.dot; diff --git a/src/net/sourceforge/plantuml/cucadiagram/dot/DotData.java b/src/net/sourceforge/plantuml/cucadiagram/dot/DotData.java index c6c21f23b..4d3f53f94 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/dot/DotData.java +++ b/src/net/sourceforge/plantuml/cucadiagram/dot/DotData.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.cucadiagram.dot; diff --git a/src/net/sourceforge/plantuml/cucadiagram/dot/DotMaker2.java b/src/net/sourceforge/plantuml/cucadiagram/dot/DotMaker2.java index 13d1ea1bb..db4367de2 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/dot/DotMaker2.java +++ b/src/net/sourceforge/plantuml/cucadiagram/dot/DotMaker2.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 7899 $ * */ package net.sourceforge.plantuml.cucadiagram.dot; diff --git a/src/net/sourceforge/plantuml/cucadiagram/dot/DotSplines.java b/src/net/sourceforge/plantuml/cucadiagram/dot/DotSplines.java index ae1a3ce80..c636e25d9 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/dot/DotSplines.java +++ b/src/net/sourceforge/plantuml/cucadiagram/dot/DotSplines.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6222 $ * */ package net.sourceforge.plantuml.cucadiagram.dot; diff --git a/src/net/sourceforge/plantuml/cucadiagram/dot/ExeState.java b/src/net/sourceforge/plantuml/cucadiagram/dot/ExeState.java index c9e6c5472..b4ed0dd08 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/dot/ExeState.java +++ b/src/net/sourceforge/plantuml/cucadiagram/dot/ExeState.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 20169 $ * */ package net.sourceforge.plantuml.cucadiagram.dot; diff --git a/src/net/sourceforge/plantuml/cucadiagram/dot/Graphviz.java b/src/net/sourceforge/plantuml/cucadiagram/dot/Graphviz.java index 86e817b18..1c2a893e6 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/dot/Graphviz.java +++ b/src/net/sourceforge/plantuml/cucadiagram/dot/Graphviz.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 20172 $ * */ package net.sourceforge.plantuml.cucadiagram.dot; diff --git a/src/net/sourceforge/plantuml/cucadiagram/dot/GraphvizLinux.java b/src/net/sourceforge/plantuml/cucadiagram/dot/GraphvizLinux.java index e8a7119e5..f9f27186f 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/dot/GraphvizLinux.java +++ b/src/net/sourceforge/plantuml/cucadiagram/dot/GraphvizLinux.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19395 $ * */ package net.sourceforge.plantuml.cucadiagram.dot; diff --git a/src/net/sourceforge/plantuml/cucadiagram/dot/GraphvizUtils.java b/src/net/sourceforge/plantuml/cucadiagram/dot/GraphvizUtils.java index 0187d832f..997d2cee1 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/dot/GraphvizUtils.java +++ b/src/net/sourceforge/plantuml/cucadiagram/dot/GraphvizUtils.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 20173 $ * */ package net.sourceforge.plantuml.cucadiagram.dot; diff --git a/src/net/sourceforge/plantuml/cucadiagram/dot/GraphvizVersion.java b/src/net/sourceforge/plantuml/cucadiagram/dot/GraphvizVersion.java index 02c569fdd..70503b637 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/dot/GraphvizVersion.java +++ b/src/net/sourceforge/plantuml/cucadiagram/dot/GraphvizVersion.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 11325 $ * */ package net.sourceforge.plantuml.cucadiagram.dot; diff --git a/src/net/sourceforge/plantuml/cucadiagram/dot/GraphvizVersionFinder.java b/src/net/sourceforge/plantuml/cucadiagram/dot/GraphvizVersionFinder.java index 90b9560b3..8e4201225 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/dot/GraphvizVersionFinder.java +++ b/src/net/sourceforge/plantuml/cucadiagram/dot/GraphvizVersionFinder.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 11325 $ * */ package net.sourceforge.plantuml.cucadiagram.dot; diff --git a/src/net/sourceforge/plantuml/cucadiagram/dot/GraphvizVersions.java b/src/net/sourceforge/plantuml/cucadiagram/dot/GraphvizVersions.java index aa72102ff..976c3b3ad 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/dot/GraphvizVersions.java +++ b/src/net/sourceforge/plantuml/cucadiagram/dot/GraphvizVersions.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 11325 $ * */ package net.sourceforge.plantuml.cucadiagram.dot; diff --git a/src/net/sourceforge/plantuml/cucadiagram/dot/GraphvizWindows.java b/src/net/sourceforge/plantuml/cucadiagram/dot/GraphvizWindows.java index f8735a2dd..4de5019cb 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/dot/GraphvizWindows.java +++ b/src/net/sourceforge/plantuml/cucadiagram/dot/GraphvizWindows.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19395 $ * */ package net.sourceforge.plantuml.cucadiagram.dot; diff --git a/src/net/sourceforge/plantuml/cucadiagram/dot/Neighborhood.java b/src/net/sourceforge/plantuml/cucadiagram/dot/Neighborhood.java index 6f94f3766..9e7a9dcb6 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/dot/Neighborhood.java +++ b/src/net/sourceforge/plantuml/cucadiagram/dot/Neighborhood.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 15529 $ * */ package net.sourceforge.plantuml.cucadiagram.dot; diff --git a/src/net/sourceforge/plantuml/cucadiagram/dot/ProcessRunner.java b/src/net/sourceforge/plantuml/cucadiagram/dot/ProcessRunner.java index bb281b2d6..a8450eb8a 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/dot/ProcessRunner.java +++ b/src/net/sourceforge/plantuml/cucadiagram/dot/ProcessRunner.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 10765 $ * */ package net.sourceforge.plantuml.cucadiagram.dot; diff --git a/src/net/sourceforge/plantuml/cucadiagram/dot/ProcessState.java b/src/net/sourceforge/plantuml/cucadiagram/dot/ProcessState.java index 0c297745c..169904c14 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/dot/ProcessState.java +++ b/src/net/sourceforge/plantuml/cucadiagram/dot/ProcessState.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 10765 $ * */ package net.sourceforge.plantuml.cucadiagram.dot; diff --git a/src/net/sourceforge/plantuml/cucadiagram/entity/EntityFactory.java b/src/net/sourceforge/plantuml/cucadiagram/entity/EntityFactory.java index 11834e440..2b5badcd6 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/entity/EntityFactory.java +++ b/src/net/sourceforge/plantuml/cucadiagram/entity/EntityFactory.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 7736 $ * */ package net.sourceforge.plantuml.cucadiagram.entity; diff --git a/src/net/sourceforge/plantuml/cucadiagram/entity/EntityImpl.java b/src/net/sourceforge/plantuml/cucadiagram/entity/EntityImpl.java index 6725f5778..936459304 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/entity/EntityImpl.java +++ b/src/net/sourceforge/plantuml/cucadiagram/entity/EntityImpl.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 7755 $ * */ package net.sourceforge.plantuml.cucadiagram.entity; diff --git a/src/net/sourceforge/plantuml/cute/Arc.java b/src/net/sourceforge/plantuml/cute/Arc.java index b21f7173e..84babc9ce 100644 --- a/src/net/sourceforge/plantuml/cute/Arc.java +++ b/src/net/sourceforge/plantuml/cute/Arc.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4041 $ * */ package net.sourceforge.plantuml.cute; diff --git a/src/net/sourceforge/plantuml/cute/Balloon.java b/src/net/sourceforge/plantuml/cute/Balloon.java index 5dcf34414..146665541 100644 --- a/src/net/sourceforge/plantuml/cute/Balloon.java +++ b/src/net/sourceforge/plantuml/cute/Balloon.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4041 $ * */ package net.sourceforge.plantuml.cute; diff --git a/src/net/sourceforge/plantuml/cute/BetweenCorners.java b/src/net/sourceforge/plantuml/cute/BetweenCorners.java index d95904731..fa886f091 100644 --- a/src/net/sourceforge/plantuml/cute/BetweenCorners.java +++ b/src/net/sourceforge/plantuml/cute/BetweenCorners.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4041 $ * */ package net.sourceforge.plantuml.cute; diff --git a/src/net/sourceforge/plantuml/cute/Cheese.java b/src/net/sourceforge/plantuml/cute/Cheese.java index 2a86f6e97..d7674012a 100644 --- a/src/net/sourceforge/plantuml/cute/Cheese.java +++ b/src/net/sourceforge/plantuml/cute/Cheese.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4041 $ * */ package net.sourceforge.plantuml.cute; diff --git a/src/net/sourceforge/plantuml/cute/Circle.java b/src/net/sourceforge/plantuml/cute/Circle.java index 665759c21..8dbf8c15f 100644 --- a/src/net/sourceforge/plantuml/cute/Circle.java +++ b/src/net/sourceforge/plantuml/cute/Circle.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4041 $ * */ package net.sourceforge.plantuml.cute; diff --git a/src/net/sourceforge/plantuml/cute/Corner.java b/src/net/sourceforge/plantuml/cute/Corner.java index ef0f01dc9..624c5cdc8 100644 --- a/src/net/sourceforge/plantuml/cute/Corner.java +++ b/src/net/sourceforge/plantuml/cute/Corner.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4041 $ * */ package net.sourceforge.plantuml.cute; diff --git a/src/net/sourceforge/plantuml/cute/Crossing.java b/src/net/sourceforge/plantuml/cute/Crossing.java index 30df26200..838a227ea 100644 --- a/src/net/sourceforge/plantuml/cute/Crossing.java +++ b/src/net/sourceforge/plantuml/cute/Crossing.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4041 $ * */ package net.sourceforge.plantuml.cute; diff --git a/src/net/sourceforge/plantuml/cute/CrossingSegment.java b/src/net/sourceforge/plantuml/cute/CrossingSegment.java index 5c885cb4a..ecb8d66c0 100644 --- a/src/net/sourceforge/plantuml/cute/CrossingSegment.java +++ b/src/net/sourceforge/plantuml/cute/CrossingSegment.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4041 $ * */ package net.sourceforge.plantuml.cute; diff --git a/src/net/sourceforge/plantuml/cute/CrossingSimple.java b/src/net/sourceforge/plantuml/cute/CrossingSimple.java index 5bde98cfc..65b5e8954 100644 --- a/src/net/sourceforge/plantuml/cute/CrossingSimple.java +++ b/src/net/sourceforge/plantuml/cute/CrossingSimple.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4041 $ * */ package net.sourceforge.plantuml.cute; diff --git a/src/net/sourceforge/plantuml/cute/CutePath.java b/src/net/sourceforge/plantuml/cute/CutePath.java index 25532ab64..f7b89df0c 100644 --- a/src/net/sourceforge/plantuml/cute/CutePath.java +++ b/src/net/sourceforge/plantuml/cute/CutePath.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4041 $ * */ package net.sourceforge.plantuml.cute; diff --git a/src/net/sourceforge/plantuml/cute/CuteShape.java b/src/net/sourceforge/plantuml/cute/CuteShape.java index 442feb5e7..e92239a8b 100644 --- a/src/net/sourceforge/plantuml/cute/CuteShape.java +++ b/src/net/sourceforge/plantuml/cute/CuteShape.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4041 $ * */ package net.sourceforge.plantuml.cute; diff --git a/src/net/sourceforge/plantuml/cute/CuteShapeFactory.java b/src/net/sourceforge/plantuml/cute/CuteShapeFactory.java index 23fa7dc6b..b9f487b99 100644 --- a/src/net/sourceforge/plantuml/cute/CuteShapeFactory.java +++ b/src/net/sourceforge/plantuml/cute/CuteShapeFactory.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4041 $ * */ package net.sourceforge.plantuml.cute; diff --git a/src/net/sourceforge/plantuml/cute/Group.java b/src/net/sourceforge/plantuml/cute/Group.java index ed68cbffc..e5751f74a 100644 --- a/src/net/sourceforge/plantuml/cute/Group.java +++ b/src/net/sourceforge/plantuml/cute/Group.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4041 $ * */ package net.sourceforge.plantuml.cute; diff --git a/src/net/sourceforge/plantuml/cute/InfiniteLine.java b/src/net/sourceforge/plantuml/cute/InfiniteLine.java index e92c41484..c22f688df 100644 --- a/src/net/sourceforge/plantuml/cute/InfiniteLine.java +++ b/src/net/sourceforge/plantuml/cute/InfiniteLine.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4041 $ * */ package net.sourceforge.plantuml.cute; diff --git a/src/net/sourceforge/plantuml/cute/MyDouble.java b/src/net/sourceforge/plantuml/cute/MyDouble.java index e9d083d1c..ecc2f7887 100644 --- a/src/net/sourceforge/plantuml/cute/MyDouble.java +++ b/src/net/sourceforge/plantuml/cute/MyDouble.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4041 $ * */ package net.sourceforge.plantuml.cute; diff --git a/src/net/sourceforge/plantuml/cute/MyPoint2D.java b/src/net/sourceforge/plantuml/cute/MyPoint2D.java index d0545da13..aacb8f2a6 100644 --- a/src/net/sourceforge/plantuml/cute/MyPoint2D.java +++ b/src/net/sourceforge/plantuml/cute/MyPoint2D.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4041 $ * */ package net.sourceforge.plantuml.cute; diff --git a/src/net/sourceforge/plantuml/cute/PSystemCute.java b/src/net/sourceforge/plantuml/cute/PSystemCute.java index c630dc244..b71dff7a8 100644 --- a/src/net/sourceforge/plantuml/cute/PSystemCute.java +++ b/src/net/sourceforge/plantuml/cute/PSystemCute.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4041 $ * */ package net.sourceforge.plantuml.cute; diff --git a/src/net/sourceforge/plantuml/cute/PSystemCuteFactory.java b/src/net/sourceforge/plantuml/cute/PSystemCuteFactory.java index 36e4b6385..a87402b4d 100644 --- a/src/net/sourceforge/plantuml/cute/PSystemCuteFactory.java +++ b/src/net/sourceforge/plantuml/cute/PSystemCuteFactory.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3830 $ * */ package net.sourceforge.plantuml.cute; diff --git a/src/net/sourceforge/plantuml/cute/Positionned.java b/src/net/sourceforge/plantuml/cute/Positionned.java index a6b832a63..fa080e992 100644 --- a/src/net/sourceforge/plantuml/cute/Positionned.java +++ b/src/net/sourceforge/plantuml/cute/Positionned.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4041 $ * */ package net.sourceforge.plantuml.cute; diff --git a/src/net/sourceforge/plantuml/cute/PositionnedImpl.java b/src/net/sourceforge/plantuml/cute/PositionnedImpl.java index 3e1bf6e1e..9171601de 100644 --- a/src/net/sourceforge/plantuml/cute/PositionnedImpl.java +++ b/src/net/sourceforge/plantuml/cute/PositionnedImpl.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4041 $ * */ package net.sourceforge.plantuml.cute; diff --git a/src/net/sourceforge/plantuml/cute/Rectangle.java b/src/net/sourceforge/plantuml/cute/Rectangle.java index 1342df2f0..cb01ba2fb 100644 --- a/src/net/sourceforge/plantuml/cute/Rectangle.java +++ b/src/net/sourceforge/plantuml/cute/Rectangle.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4041 $ * */ package net.sourceforge.plantuml.cute; diff --git a/src/net/sourceforge/plantuml/cute/RotationZoom.java b/src/net/sourceforge/plantuml/cute/RotationZoom.java index c9dac7b0c..ac239b3fe 100644 --- a/src/net/sourceforge/plantuml/cute/RotationZoom.java +++ b/src/net/sourceforge/plantuml/cute/RotationZoom.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4041 $ * */ package net.sourceforge.plantuml.cute; diff --git a/src/net/sourceforge/plantuml/cute/Segment.java b/src/net/sourceforge/plantuml/cute/Segment.java index ef7e226ca..483d5c69e 100644 --- a/src/net/sourceforge/plantuml/cute/Segment.java +++ b/src/net/sourceforge/plantuml/cute/Segment.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4041 $ * */ package net.sourceforge.plantuml.cute; diff --git a/src/net/sourceforge/plantuml/cute/Stick.java b/src/net/sourceforge/plantuml/cute/Stick.java index 0df690338..c3b9a907c 100644 --- a/src/net/sourceforge/plantuml/cute/Stick.java +++ b/src/net/sourceforge/plantuml/cute/Stick.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4041 $ * */ package net.sourceforge.plantuml.cute; diff --git a/src/net/sourceforge/plantuml/cute/Tension.java b/src/net/sourceforge/plantuml/cute/Tension.java index 4399d3148..68dfc31a1 100644 --- a/src/net/sourceforge/plantuml/cute/Tension.java +++ b/src/net/sourceforge/plantuml/cute/Tension.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4041 $ * */ package net.sourceforge.plantuml.cute; diff --git a/src/net/sourceforge/plantuml/cute/Triangle.java b/src/net/sourceforge/plantuml/cute/Triangle.java index d22aa9325..16643c03c 100644 --- a/src/net/sourceforge/plantuml/cute/Triangle.java +++ b/src/net/sourceforge/plantuml/cute/Triangle.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4041 $ * */ package net.sourceforge.plantuml.cute; diff --git a/src/net/sourceforge/plantuml/cute/TriangleCorner.java b/src/net/sourceforge/plantuml/cute/TriangleCorner.java index c65b60bbd..965712aa2 100644 --- a/src/net/sourceforge/plantuml/cute/TriangleCorner.java +++ b/src/net/sourceforge/plantuml/cute/TriangleCorner.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4041 $ * */ package net.sourceforge.plantuml.cute; diff --git a/src/net/sourceforge/plantuml/cute/TriangleCornerSimple.java b/src/net/sourceforge/plantuml/cute/TriangleCornerSimple.java index b06140cc9..af671d5ac 100644 --- a/src/net/sourceforge/plantuml/cute/TriangleCornerSimple.java +++ b/src/net/sourceforge/plantuml/cute/TriangleCornerSimple.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4041 $ * */ package net.sourceforge.plantuml.cute; diff --git a/src/net/sourceforge/plantuml/cute/VarArgs.java b/src/net/sourceforge/plantuml/cute/VarArgs.java index 9aa4be1cc..825917e32 100644 --- a/src/net/sourceforge/plantuml/cute/VarArgs.java +++ b/src/net/sourceforge/plantuml/cute/VarArgs.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4041 $ * */ package net.sourceforge.plantuml.cute; diff --git a/src/net/sourceforge/plantuml/dedication/DecoderInputStream.java b/src/net/sourceforge/plantuml/dedication/DecoderInputStream.java index f369ecb1b..3af93db27 100644 --- a/src/net/sourceforge/plantuml/dedication/DecoderInputStream.java +++ b/src/net/sourceforge/plantuml/dedication/DecoderInputStream.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4041 $ * */ package net.sourceforge.plantuml.dedication; diff --git a/src/net/sourceforge/plantuml/dedication/Dedication.java b/src/net/sourceforge/plantuml/dedication/Dedication.java index 5caad48f0..ee0ab142f 100644 --- a/src/net/sourceforge/plantuml/dedication/Dedication.java +++ b/src/net/sourceforge/plantuml/dedication/Dedication.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4041 $ * */ package net.sourceforge.plantuml.dedication; diff --git a/src/net/sourceforge/plantuml/dedication/Dedications.java b/src/net/sourceforge/plantuml/dedication/Dedications.java index 0ebce9325..9784eb2f7 100644 --- a/src/net/sourceforge/plantuml/dedication/Dedications.java +++ b/src/net/sourceforge/plantuml/dedication/Dedications.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4041 $ * */ package net.sourceforge.plantuml.dedication; diff --git a/src/net/sourceforge/plantuml/dedication/PSystemDedication.java b/src/net/sourceforge/plantuml/dedication/PSystemDedication.java index f862966c4..20b28196d 100644 --- a/src/net/sourceforge/plantuml/dedication/PSystemDedication.java +++ b/src/net/sourceforge/plantuml/dedication/PSystemDedication.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4041 $ * */ package net.sourceforge.plantuml.dedication; diff --git a/src/net/sourceforge/plantuml/dedication/PSystemDedicationFactory.java b/src/net/sourceforge/plantuml/dedication/PSystemDedicationFactory.java index 4b79179a8..6a92ecada 100644 --- a/src/net/sourceforge/plantuml/dedication/PSystemDedicationFactory.java +++ b/src/net/sourceforge/plantuml/dedication/PSystemDedicationFactory.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3837 $ * */ package net.sourceforge.plantuml.dedication; diff --git a/src/net/sourceforge/plantuml/dedication/QBlock.java b/src/net/sourceforge/plantuml/dedication/QBlock.java index c7ad2c135..c70180aaf 100644 --- a/src/net/sourceforge/plantuml/dedication/QBlock.java +++ b/src/net/sourceforge/plantuml/dedication/QBlock.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4041 $ * */ package net.sourceforge.plantuml.dedication; diff --git a/src/net/sourceforge/plantuml/dedication/QBlocks.java b/src/net/sourceforge/plantuml/dedication/QBlocks.java index eaedac4c3..f09d4927c 100644 --- a/src/net/sourceforge/plantuml/dedication/QBlocks.java +++ b/src/net/sourceforge/plantuml/dedication/QBlocks.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4041 $ * */ package net.sourceforge.plantuml.dedication; diff --git a/src/net/sourceforge/plantuml/dedication/TurningBytes.java b/src/net/sourceforge/plantuml/dedication/TurningBytes.java index 75682e2f6..2c7c3278e 100644 --- a/src/net/sourceforge/plantuml/dedication/TurningBytes.java +++ b/src/net/sourceforge/plantuml/dedication/TurningBytes.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4041 $ * */ package net.sourceforge.plantuml.dedication; diff --git a/src/net/sourceforge/plantuml/descdiagram/DescriptionDiagram.java b/src/net/sourceforge/plantuml/descdiagram/DescriptionDiagram.java index 32e781004..d6731873e 100644 --- a/src/net/sourceforge/plantuml/descdiagram/DescriptionDiagram.java +++ b/src/net/sourceforge/plantuml/descdiagram/DescriptionDiagram.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8532 $ * */ package net.sourceforge.plantuml.descdiagram; diff --git a/src/net/sourceforge/plantuml/descdiagram/DescriptionDiagramFactory.java b/src/net/sourceforge/plantuml/descdiagram/DescriptionDiagramFactory.java index 5fdd53ae4..d7f1b4529 100644 --- a/src/net/sourceforge/plantuml/descdiagram/DescriptionDiagramFactory.java +++ b/src/net/sourceforge/plantuml/descdiagram/DescriptionDiagramFactory.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 7920 $ * */ package net.sourceforge.plantuml.descdiagram; diff --git a/src/net/sourceforge/plantuml/descdiagram/command/CommandCreateElementFull.java b/src/net/sourceforge/plantuml/descdiagram/command/CommandCreateElementFull.java index 5183a25cd..7065fbf62 100644 --- a/src/net/sourceforge/plantuml/descdiagram/command/CommandCreateElementFull.java +++ b/src/net/sourceforge/plantuml/descdiagram/command/CommandCreateElementFull.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 7715 $ * */ package net.sourceforge.plantuml.descdiagram.command; diff --git a/src/net/sourceforge/plantuml/descdiagram/command/CommandCreateElementMultilines.java b/src/net/sourceforge/plantuml/descdiagram/command/CommandCreateElementMultilines.java index a3ef342c4..95831609d 100644 --- a/src/net/sourceforge/plantuml/descdiagram/command/CommandCreateElementMultilines.java +++ b/src/net/sourceforge/plantuml/descdiagram/command/CommandCreateElementMultilines.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4161 $ * */ package net.sourceforge.plantuml.descdiagram.command; diff --git a/src/net/sourceforge/plantuml/descdiagram/command/CommandLinkElement.java b/src/net/sourceforge/plantuml/descdiagram/command/CommandLinkElement.java index bc888f7dd..2dcec021f 100644 --- a/src/net/sourceforge/plantuml/descdiagram/command/CommandLinkElement.java +++ b/src/net/sourceforge/plantuml/descdiagram/command/CommandLinkElement.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * diff --git a/src/net/sourceforge/plantuml/descdiagram/command/CommandNamespaceSeparator.java b/src/net/sourceforge/plantuml/descdiagram/command/CommandNamespaceSeparator.java index c2b0e8111..497975be7 100644 --- a/src/net/sourceforge/plantuml/descdiagram/command/CommandNamespaceSeparator.java +++ b/src/net/sourceforge/plantuml/descdiagram/command/CommandNamespaceSeparator.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 9434 $ * */ package net.sourceforge.plantuml.descdiagram.command; diff --git a/src/net/sourceforge/plantuml/descdiagram/command/CommandNewpage.java b/src/net/sourceforge/plantuml/descdiagram/command/CommandNewpage.java index 1f4b936b5..fd34d17f2 100644 --- a/src/net/sourceforge/plantuml/descdiagram/command/CommandNewpage.java +++ b/src/net/sourceforge/plantuml/descdiagram/command/CommandNewpage.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 7800 $ * */ package net.sourceforge.plantuml.descdiagram.command; diff --git a/src/net/sourceforge/plantuml/descdiagram/command/CommandPackageWithUSymbol.java b/src/net/sourceforge/plantuml/descdiagram/command/CommandPackageWithUSymbol.java index b99f12725..5977adba2 100644 --- a/src/net/sourceforge/plantuml/descdiagram/command/CommandPackageWithUSymbol.java +++ b/src/net/sourceforge/plantuml/descdiagram/command/CommandPackageWithUSymbol.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 7800 $ * */ package net.sourceforge.plantuml.descdiagram.command; diff --git a/src/net/sourceforge/plantuml/directdot/PSystemDot.java b/src/net/sourceforge/plantuml/directdot/PSystemDot.java index 9f9312ca6..dc5935e32 100644 --- a/src/net/sourceforge/plantuml/directdot/PSystemDot.java +++ b/src/net/sourceforge/plantuml/directdot/PSystemDot.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * diff --git a/src/net/sourceforge/plantuml/directdot/PSystemDotFactory.java b/src/net/sourceforge/plantuml/directdot/PSystemDotFactory.java index c65644200..b87c003e0 100644 --- a/src/net/sourceforge/plantuml/directdot/PSystemDotFactory.java +++ b/src/net/sourceforge/plantuml/directdot/PSystemDotFactory.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * diff --git a/src/net/sourceforge/plantuml/ditaa/PSystemDitaa.java b/src/net/sourceforge/plantuml/ditaa/PSystemDitaa.java index 937fbf072..8fe34797d 100644 --- a/src/net/sourceforge/plantuml/ditaa/PSystemDitaa.java +++ b/src/net/sourceforge/plantuml/ditaa/PSystemDitaa.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * diff --git a/src/net/sourceforge/plantuml/ditaa/PSystemDitaaFactory.java b/src/net/sourceforge/plantuml/ditaa/PSystemDitaaFactory.java index 1fe81e556..63f78e9e2 100644 --- a/src/net/sourceforge/plantuml/ditaa/PSystemDitaaFactory.java +++ b/src/net/sourceforge/plantuml/ditaa/PSystemDitaaFactory.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * diff --git a/src/net/sourceforge/plantuml/donors/PSystemDonors.java b/src/net/sourceforge/plantuml/donors/PSystemDonors.java index 5c7dcf489..51c378785 100644 --- a/src/net/sourceforge/plantuml/donors/PSystemDonors.java +++ b/src/net/sourceforge/plantuml/donors/PSystemDonors.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4041 $ * */ package net.sourceforge.plantuml.donors; @@ -58,7 +55,7 @@ import net.sourceforge.plantuml.version.PSystemVersion; public class PSystemDonors extends AbstractPSystem { - public static final String DONORS = "UDfTaq5osp0CHVSu1TUQv12AbRgLxIHZf-bCTh24MBHfGYKff_BPkkl52hcLIPahOGY0_mDFkSd-7tBmGe6SocrWgx62LyhYuICiEOREGpwMuXRcBbvH3nlQeWyQhNhYna9kQtPgpXJED7n-V4Z6c8uMbfWyP0CKUWoqWJosvXDikYYXXxdEfiSobAFApiCcKDkGLJFcLlmLuplaON6yAMK7CpRQgZLtdg3iRkwpFOkHCMWrh1BLU4n3UIetz0jjBUESDLgwxj3rudHzjMrty9Ig3sTuDlea1OMk3gByUgCjFFfhQvk8oEW4nVceW-lL4Xkk4SfXwEyDIliaBoCJroNdqCkOB0R94tsYg_mddWuJLxQUX9TABOsCb3sxeC_mDLxN32jTDMJK0shJfmxCEHNZ_Qsqaj3UbrZzxCYhejiwbDMQQF-Dzu6gHYqSUeoITYJ49Wly742J5BNWaqwvkP3pFVhN2Ek4vU69YS-zLBS9PNmO1lN03YsQzawzKq1kFQp5BxfQBVImQVXYs0tZN_tvRSo5WSY7ILWLkfPNkXoEmnyWQAQEV0BCCAWN7DbPwudyt6YrGQpblt8xKZ_8xiZTgLN--csJH-upjZ2doV-Kpi5MmizHlOc7GeXUn4n7mzhbJreImL-1InMx"; + public static final String DONORS = "UDfTKyjosp0ClEChUDQa7w5OYLlvaOoTfZEvmH9YqQ88bPIKoj_MMt-iK5gPj7aYXdZiBfQfIVuVSl1C7JcLsewjnW9UA0c76rXp29s7T2x50onTUA8HzdH0tscqQikLXTIMxDIIgJlJT7r_bumv7IsiCHfaEyZq76W3QMZD0-px0664fKwkZsN8PvIzXtr7RKLMBPXRuPVDSyZ3ghafPGSBDjgg7VUU8EzltfCJ2v4vQ3Li8jJOnA6CIWtzGbkAd8jAIzSZkb6OxYwqxH6sCVhk34z63rAGwQ8Mv9SNRU71NrhR24H20sJdHdTkL6kik4J89z7VAfJsKLv29gnBJZsAJ1OxoHDyWYl_1vxgArQsbD0LeiaZ7jnOyuUljJGoKlRaEds6ho6xPDZeeYAZxb6RCMPWpZ4Oxs-XvOJsIux5pvwyolg3Grcj2VHV-THHKQcLGuy1uP74iT42FoQZIOfQyQ1ZttmwvtlWhn5saPUd4J7jv2JLRUGohYUXxjcXHTFUgJVga5iFE-6BhbGhFMqQ7WsxIVxDdz_6V7eW-CD4NXLthI_kSZYBFvcWkcRa8yDCGZtZx9sTleAV6gtsYANyAtSazOFiaToTsgGlt_Pfy7t25fPqzPzY7MmX_cdKgt38nD6haEbeMhlyf3KHR4CDDV0mn9zaGFWBXv0VcW00"; public ImageData exportDiagram(OutputStream os, int num, FileFormatOption fileFormat) throws IOException { final GraphicStrings result = getGraphicStrings(); diff --git a/src/net/sourceforge/plantuml/donors/PSystemDonorsFactory.java b/src/net/sourceforge/plantuml/donors/PSystemDonorsFactory.java index 2d812a9e7..f6dc0e87a 100644 --- a/src/net/sourceforge/plantuml/donors/PSystemDonorsFactory.java +++ b/src/net/sourceforge/plantuml/donors/PSystemDonorsFactory.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3837 $ * */ package net.sourceforge.plantuml.donors; diff --git a/src/net/sourceforge/plantuml/eggs/EggUtils.java b/src/net/sourceforge/plantuml/eggs/EggUtils.java index a80a4c7ae..e1b292d4f 100644 --- a/src/net/sourceforge/plantuml/eggs/EggUtils.java +++ b/src/net/sourceforge/plantuml/eggs/EggUtils.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.eggs; diff --git a/src/net/sourceforge/plantuml/eggs/GraphicsPath.java b/src/net/sourceforge/plantuml/eggs/GraphicsPath.java index ea44e0787..010e0f84e 100644 --- a/src/net/sourceforge/plantuml/eggs/GraphicsPath.java +++ b/src/net/sourceforge/plantuml/eggs/GraphicsPath.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4125 $ * */ package net.sourceforge.plantuml.eggs; diff --git a/src/net/sourceforge/plantuml/eggs/PSystemAppleTwo.java b/src/net/sourceforge/plantuml/eggs/PSystemAppleTwo.java index f86fd1677..0e21165bb 100644 --- a/src/net/sourceforge/plantuml/eggs/PSystemAppleTwo.java +++ b/src/net/sourceforge/plantuml/eggs/PSystemAppleTwo.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4041 $ * */ package net.sourceforge.plantuml.eggs; diff --git a/src/net/sourceforge/plantuml/eggs/PSystemAppleTwoFactory.java b/src/net/sourceforge/plantuml/eggs/PSystemAppleTwoFactory.java index fdd041015..479f1999c 100644 --- a/src/net/sourceforge/plantuml/eggs/PSystemAppleTwoFactory.java +++ b/src/net/sourceforge/plantuml/eggs/PSystemAppleTwoFactory.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3830 $ * */ package net.sourceforge.plantuml.eggs; diff --git a/src/net/sourceforge/plantuml/eggs/PSystemCharlie.java b/src/net/sourceforge/plantuml/eggs/PSystemCharlie.java index a4722522a..186efc442 100644 --- a/src/net/sourceforge/plantuml/eggs/PSystemCharlie.java +++ b/src/net/sourceforge/plantuml/eggs/PSystemCharlie.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * diff --git a/src/net/sourceforge/plantuml/eggs/PSystemCharlieFactory.java b/src/net/sourceforge/plantuml/eggs/PSystemCharlieFactory.java index ece9bef51..06ea1a925 100644 --- a/src/net/sourceforge/plantuml/eggs/PSystemCharlieFactory.java +++ b/src/net/sourceforge/plantuml/eggs/PSystemCharlieFactory.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3830 $ * */ package net.sourceforge.plantuml.eggs; diff --git a/src/net/sourceforge/plantuml/eggs/PSystemEgg.java b/src/net/sourceforge/plantuml/eggs/PSystemEgg.java index 27379505e..1308970ad 100644 --- a/src/net/sourceforge/plantuml/eggs/PSystemEgg.java +++ b/src/net/sourceforge/plantuml/eggs/PSystemEgg.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.eggs; diff --git a/src/net/sourceforge/plantuml/eggs/PSystemEggFactory.java b/src/net/sourceforge/plantuml/eggs/PSystemEggFactory.java index 2cb256ec3..47cb82d2c 100644 --- a/src/net/sourceforge/plantuml/eggs/PSystemEggFactory.java +++ b/src/net/sourceforge/plantuml/eggs/PSystemEggFactory.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 10298 $ * */ package net.sourceforge.plantuml.eggs; diff --git a/src/net/sourceforge/plantuml/eggs/PSystemLost.java b/src/net/sourceforge/plantuml/eggs/PSystemLost.java index c38a4710d..c45057a33 100644 --- a/src/net/sourceforge/plantuml/eggs/PSystemLost.java +++ b/src/net/sourceforge/plantuml/eggs/PSystemLost.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4041 $ * */ package net.sourceforge.plantuml.eggs; diff --git a/src/net/sourceforge/plantuml/eggs/PSystemLostFactory.java b/src/net/sourceforge/plantuml/eggs/PSystemLostFactory.java index 0e2c08a0f..20ae87e2c 100644 --- a/src/net/sourceforge/plantuml/eggs/PSystemLostFactory.java +++ b/src/net/sourceforge/plantuml/eggs/PSystemLostFactory.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3830 $ * */ package net.sourceforge.plantuml.eggs; diff --git a/src/net/sourceforge/plantuml/eggs/PSystemMemorial.java b/src/net/sourceforge/plantuml/eggs/PSystemMemorial.java index a4817b0c5..c6d03164c 100644 --- a/src/net/sourceforge/plantuml/eggs/PSystemMemorial.java +++ b/src/net/sourceforge/plantuml/eggs/PSystemMemorial.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * diff --git a/src/net/sourceforge/plantuml/eggs/PSystemMemorialFactory.java b/src/net/sourceforge/plantuml/eggs/PSystemMemorialFactory.java index 0b3f8f210..e8171ecf6 100644 --- a/src/net/sourceforge/plantuml/eggs/PSystemMemorialFactory.java +++ b/src/net/sourceforge/plantuml/eggs/PSystemMemorialFactory.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3830 $ * */ package net.sourceforge.plantuml.eggs; diff --git a/src/net/sourceforge/plantuml/eggs/PSystemPath.java b/src/net/sourceforge/plantuml/eggs/PSystemPath.java index 109269e5f..d51a14870 100644 --- a/src/net/sourceforge/plantuml/eggs/PSystemPath.java +++ b/src/net/sourceforge/plantuml/eggs/PSystemPath.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4041 $ * */ package net.sourceforge.plantuml.eggs; diff --git a/src/net/sourceforge/plantuml/eggs/PSystemPathFactory.java b/src/net/sourceforge/plantuml/eggs/PSystemPathFactory.java index 06bdcf261..48c0c500c 100644 --- a/src/net/sourceforge/plantuml/eggs/PSystemPathFactory.java +++ b/src/net/sourceforge/plantuml/eggs/PSystemPathFactory.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3830 $ * */ package net.sourceforge.plantuml.eggs; diff --git a/src/net/sourceforge/plantuml/eggs/PSystemRIP.java b/src/net/sourceforge/plantuml/eggs/PSystemRIP.java index f526fae87..5e3ea6b42 100644 --- a/src/net/sourceforge/plantuml/eggs/PSystemRIP.java +++ b/src/net/sourceforge/plantuml/eggs/PSystemRIP.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4041 $ * */ package net.sourceforge.plantuml.eggs; diff --git a/src/net/sourceforge/plantuml/eggs/PSystemRIPFactory.java b/src/net/sourceforge/plantuml/eggs/PSystemRIPFactory.java index aa797f246..f76d9577a 100644 --- a/src/net/sourceforge/plantuml/eggs/PSystemRIPFactory.java +++ b/src/net/sourceforge/plantuml/eggs/PSystemRIPFactory.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3830 $ * */ package net.sourceforge.plantuml.eggs; diff --git a/src/net/sourceforge/plantuml/eggs/SentenceDecoder.java b/src/net/sourceforge/plantuml/eggs/SentenceDecoder.java index 266c2e0f9..e7be10ae0 100644 --- a/src/net/sourceforge/plantuml/eggs/SentenceDecoder.java +++ b/src/net/sourceforge/plantuml/eggs/SentenceDecoder.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.eggs; diff --git a/src/net/sourceforge/plantuml/eggs/SentenceProducer.java b/src/net/sourceforge/plantuml/eggs/SentenceProducer.java index bf13903f2..506e261d0 100644 --- a/src/net/sourceforge/plantuml/eggs/SentenceProducer.java +++ b/src/net/sourceforge/plantuml/eggs/SentenceProducer.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.eggs; diff --git a/src/net/sourceforge/plantuml/eps/EpsGraphics.java b/src/net/sourceforge/plantuml/eps/EpsGraphics.java index c2451c86a..099409565 100644 --- a/src/net/sourceforge/plantuml/eps/EpsGraphics.java +++ b/src/net/sourceforge/plantuml/eps/EpsGraphics.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4207 $ * */ package net.sourceforge.plantuml.eps; diff --git a/src/net/sourceforge/plantuml/eps/EpsGraphicsMacro.java b/src/net/sourceforge/plantuml/eps/EpsGraphicsMacro.java index 29e864cc1..ea7c5d8e6 100644 --- a/src/net/sourceforge/plantuml/eps/EpsGraphicsMacro.java +++ b/src/net/sourceforge/plantuml/eps/EpsGraphicsMacro.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4207 $ * */ package net.sourceforge.plantuml.eps; diff --git a/src/net/sourceforge/plantuml/eps/EpsGraphicsMacroAndText.java b/src/net/sourceforge/plantuml/eps/EpsGraphicsMacroAndText.java index 5f7172fc5..56a34f49a 100644 --- a/src/net/sourceforge/plantuml/eps/EpsGraphicsMacroAndText.java +++ b/src/net/sourceforge/plantuml/eps/EpsGraphicsMacroAndText.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4207 $ * */ package net.sourceforge.plantuml.eps; diff --git a/src/net/sourceforge/plantuml/eps/EpsStrategy.java b/src/net/sourceforge/plantuml/eps/EpsStrategy.java index e2cd65d71..14facace7 100644 --- a/src/net/sourceforge/plantuml/eps/EpsStrategy.java +++ b/src/net/sourceforge/plantuml/eps/EpsStrategy.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4207 $ * */ package net.sourceforge.plantuml.eps; diff --git a/src/net/sourceforge/plantuml/eps/PostScriptCommand.java b/src/net/sourceforge/plantuml/eps/PostScriptCommand.java index fc1a6749a..0de5f0a52 100644 --- a/src/net/sourceforge/plantuml/eps/PostScriptCommand.java +++ b/src/net/sourceforge/plantuml/eps/PostScriptCommand.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4207 $ * */ package net.sourceforge.plantuml.eps; diff --git a/src/net/sourceforge/plantuml/eps/PostScriptCommandCurveTo.java b/src/net/sourceforge/plantuml/eps/PostScriptCommandCurveTo.java index 6763de984..ac7e04f30 100644 --- a/src/net/sourceforge/plantuml/eps/PostScriptCommandCurveTo.java +++ b/src/net/sourceforge/plantuml/eps/PostScriptCommandCurveTo.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4207 $ * */ package net.sourceforge.plantuml.eps; diff --git a/src/net/sourceforge/plantuml/eps/PostScriptCommandLineTo.java b/src/net/sourceforge/plantuml/eps/PostScriptCommandLineTo.java index eab6f74dc..b7916bab7 100644 --- a/src/net/sourceforge/plantuml/eps/PostScriptCommandLineTo.java +++ b/src/net/sourceforge/plantuml/eps/PostScriptCommandLineTo.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4207 $ * */ package net.sourceforge.plantuml.eps; diff --git a/src/net/sourceforge/plantuml/eps/PostScriptCommandMacro.java b/src/net/sourceforge/plantuml/eps/PostScriptCommandMacro.java index 3ef966250..e33c6c4a9 100644 --- a/src/net/sourceforge/plantuml/eps/PostScriptCommandMacro.java +++ b/src/net/sourceforge/plantuml/eps/PostScriptCommandMacro.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4207 $ * */ package net.sourceforge.plantuml.eps; diff --git a/src/net/sourceforge/plantuml/eps/PostScriptCommandMoveTo.java b/src/net/sourceforge/plantuml/eps/PostScriptCommandMoveTo.java index 4d58b8a35..a3a7b9400 100644 --- a/src/net/sourceforge/plantuml/eps/PostScriptCommandMoveTo.java +++ b/src/net/sourceforge/plantuml/eps/PostScriptCommandMoveTo.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4207 $ * */ package net.sourceforge.plantuml.eps; diff --git a/src/net/sourceforge/plantuml/eps/PostScriptCommandQuadTo.java b/src/net/sourceforge/plantuml/eps/PostScriptCommandQuadTo.java index 5962e91a1..1d41de00d 100644 --- a/src/net/sourceforge/plantuml/eps/PostScriptCommandQuadTo.java +++ b/src/net/sourceforge/plantuml/eps/PostScriptCommandQuadTo.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4207 $ * */ package net.sourceforge.plantuml.eps; diff --git a/src/net/sourceforge/plantuml/eps/PostScriptCommandRaw.java b/src/net/sourceforge/plantuml/eps/PostScriptCommandRaw.java index a40e2a115..775b47869 100644 --- a/src/net/sourceforge/plantuml/eps/PostScriptCommandRaw.java +++ b/src/net/sourceforge/plantuml/eps/PostScriptCommandRaw.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4207 $ * */ package net.sourceforge.plantuml.eps; diff --git a/src/net/sourceforge/plantuml/eps/PostScriptData.java b/src/net/sourceforge/plantuml/eps/PostScriptData.java index 65b652dde..fe5ea7fb8 100644 --- a/src/net/sourceforge/plantuml/eps/PostScriptData.java +++ b/src/net/sourceforge/plantuml/eps/PostScriptData.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4207 $ * */ package net.sourceforge.plantuml.eps; diff --git a/src/net/sourceforge/plantuml/flashcode/FlashCodeFactory.java b/src/net/sourceforge/plantuml/flashcode/FlashCodeFactory.java index 8a22cde63..0fb1ed5cd 100644 --- a/src/net/sourceforge/plantuml/flashcode/FlashCodeFactory.java +++ b/src/net/sourceforge/plantuml/flashcode/FlashCodeFactory.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8515 $ * */ package net.sourceforge.plantuml.flashcode; diff --git a/src/net/sourceforge/plantuml/flashcode/FlashCodeUtils.java b/src/net/sourceforge/plantuml/flashcode/FlashCodeUtils.java index ba81f5f66..af7f4a302 100644 --- a/src/net/sourceforge/plantuml/flashcode/FlashCodeUtils.java +++ b/src/net/sourceforge/plantuml/flashcode/FlashCodeUtils.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8515 $ * */ package net.sourceforge.plantuml.flashcode; diff --git a/src/net/sourceforge/plantuml/flashcode/FlashCodeUtilsNone.java b/src/net/sourceforge/plantuml/flashcode/FlashCodeUtilsNone.java index ee4b2b191..46274db44 100644 --- a/src/net/sourceforge/plantuml/flashcode/FlashCodeUtilsNone.java +++ b/src/net/sourceforge/plantuml/flashcode/FlashCodeUtilsNone.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8515 $ * */ package net.sourceforge.plantuml.flashcode; diff --git a/src/net/sourceforge/plantuml/flashcode/FlashCodeUtilsZxing.java b/src/net/sourceforge/plantuml/flashcode/FlashCodeUtilsZxing.java index 318371150..b4191ee75 100644 --- a/src/net/sourceforge/plantuml/flashcode/FlashCodeUtilsZxing.java +++ b/src/net/sourceforge/plantuml/flashcode/FlashCodeUtilsZxing.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8515 $ * */ package net.sourceforge.plantuml.flashcode; diff --git a/src/net/sourceforge/plantuml/flowdiagram/ActivityBox.java b/src/net/sourceforge/plantuml/flowdiagram/ActivityBox.java index 3b244157e..469e1e26d 100644 --- a/src/net/sourceforge/plantuml/flowdiagram/ActivityBox.java +++ b/src/net/sourceforge/plantuml/flowdiagram/ActivityBox.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8475 $ * */ package net.sourceforge.plantuml.flowdiagram; diff --git a/src/net/sourceforge/plantuml/flowdiagram/CommandLineSimple.java b/src/net/sourceforge/plantuml/flowdiagram/CommandLineSimple.java index 41977dd9f..e045a90ba 100644 --- a/src/net/sourceforge/plantuml/flowdiagram/CommandLineSimple.java +++ b/src/net/sourceforge/plantuml/flowdiagram/CommandLineSimple.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5075 $ * */ package net.sourceforge.plantuml.flowdiagram; diff --git a/src/net/sourceforge/plantuml/flowdiagram/CommandLink.java b/src/net/sourceforge/plantuml/flowdiagram/CommandLink.java index 2170bf0d5..64b7c6393 100644 --- a/src/net/sourceforge/plantuml/flowdiagram/CommandLink.java +++ b/src/net/sourceforge/plantuml/flowdiagram/CommandLink.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5075 $ * */ package net.sourceforge.plantuml.flowdiagram; diff --git a/src/net/sourceforge/plantuml/flowdiagram/FlowDiagram.java b/src/net/sourceforge/plantuml/flowdiagram/FlowDiagram.java index bf09139af..7352b2a08 100644 --- a/src/net/sourceforge/plantuml/flowdiagram/FlowDiagram.java +++ b/src/net/sourceforge/plantuml/flowdiagram/FlowDiagram.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8475 $ * */ package net.sourceforge.plantuml.flowdiagram; diff --git a/src/net/sourceforge/plantuml/flowdiagram/FlowDiagramFactory.java b/src/net/sourceforge/plantuml/flowdiagram/FlowDiagramFactory.java index e594aff05..640d82186 100644 --- a/src/net/sourceforge/plantuml/flowdiagram/FlowDiagramFactory.java +++ b/src/net/sourceforge/plantuml/flowdiagram/FlowDiagramFactory.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8475 $ * */ package net.sourceforge.plantuml.flowdiagram; diff --git a/src/net/sourceforge/plantuml/font/PSystemListFonts.java b/src/net/sourceforge/plantuml/font/PSystemListFonts.java index 572787534..1b000d490 100644 --- a/src/net/sourceforge/plantuml/font/PSystemListFonts.java +++ b/src/net/sourceforge/plantuml/font/PSystemListFonts.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4041 $ * */ package net.sourceforge.plantuml.font; diff --git a/src/net/sourceforge/plantuml/font/PSystemListFontsFactory.java b/src/net/sourceforge/plantuml/font/PSystemListFontsFactory.java index 1757d59e0..f4c3b7831 100644 --- a/src/net/sourceforge/plantuml/font/PSystemListFontsFactory.java +++ b/src/net/sourceforge/plantuml/font/PSystemListFontsFactory.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3830 $ * */ package net.sourceforge.plantuml.font; diff --git a/src/net/sourceforge/plantuml/ftp/FtpConnexion.java b/src/net/sourceforge/plantuml/ftp/FtpConnexion.java index 1d3aec79c..5495032a8 100644 --- a/src/net/sourceforge/plantuml/ftp/FtpConnexion.java +++ b/src/net/sourceforge/plantuml/ftp/FtpConnexion.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3830 $ * */ package net.sourceforge.plantuml.ftp; diff --git a/src/net/sourceforge/plantuml/ftp/FtpLoop.java b/src/net/sourceforge/plantuml/ftp/FtpLoop.java index e0a79c707..777152ef6 100644 --- a/src/net/sourceforge/plantuml/ftp/FtpLoop.java +++ b/src/net/sourceforge/plantuml/ftp/FtpLoop.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3830 $ * */ package net.sourceforge.plantuml.ftp; diff --git a/src/net/sourceforge/plantuml/ftp/FtpServer.java b/src/net/sourceforge/plantuml/ftp/FtpServer.java index db8fede7a..c0c4c1be9 100644 --- a/src/net/sourceforge/plantuml/ftp/FtpServer.java +++ b/src/net/sourceforge/plantuml/ftp/FtpServer.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3830 $ * */ package net.sourceforge.plantuml.ftp; diff --git a/src/net/sourceforge/plantuml/fun/IconLoader.java b/src/net/sourceforge/plantuml/fun/IconLoader.java index 81ddb6ca4..01b4aafa3 100644 --- a/src/net/sourceforge/plantuml/fun/IconLoader.java +++ b/src/net/sourceforge/plantuml/fun/IconLoader.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * diff --git a/src/net/sourceforge/plantuml/geom/AbstractFigure.java b/src/net/sourceforge/plantuml/geom/AbstractFigure.java index b75f41897..f6fdf5d21 100644 --- a/src/net/sourceforge/plantuml/geom/AbstractFigure.java +++ b/src/net/sourceforge/plantuml/geom/AbstractFigure.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.geom; diff --git a/src/net/sourceforge/plantuml/geom/AbstractLineSegment.java b/src/net/sourceforge/plantuml/geom/AbstractLineSegment.java index 4dd1367fb..774bcc72d 100644 --- a/src/net/sourceforge/plantuml/geom/AbstractLineSegment.java +++ b/src/net/sourceforge/plantuml/geom/AbstractLineSegment.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.geom; diff --git a/src/net/sourceforge/plantuml/geom/AbstractPolyline.java b/src/net/sourceforge/plantuml/geom/AbstractPolyline.java index 8d9de3645..22b6c315b 100644 --- a/src/net/sourceforge/plantuml/geom/AbstractPolyline.java +++ b/src/net/sourceforge/plantuml/geom/AbstractPolyline.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.geom; diff --git a/src/net/sourceforge/plantuml/geom/Box.java b/src/net/sourceforge/plantuml/geom/Box.java index d52efe79f..8fd302a0f 100644 --- a/src/net/sourceforge/plantuml/geom/Box.java +++ b/src/net/sourceforge/plantuml/geom/Box.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.geom; diff --git a/src/net/sourceforge/plantuml/geom/ClosedArea.java b/src/net/sourceforge/plantuml/geom/ClosedArea.java index b10a0ac3c..df7fb80f4 100644 --- a/src/net/sourceforge/plantuml/geom/ClosedArea.java +++ b/src/net/sourceforge/plantuml/geom/ClosedArea.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.geom; diff --git a/src/net/sourceforge/plantuml/geom/CollectionUtils.java b/src/net/sourceforge/plantuml/geom/CollectionUtils.java index 4d2d889f4..184f82d75 100644 --- a/src/net/sourceforge/plantuml/geom/CollectionUtils.java +++ b/src/net/sourceforge/plantuml/geom/CollectionUtils.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.geom; diff --git a/src/net/sourceforge/plantuml/geom/Dijkstra.java b/src/net/sourceforge/plantuml/geom/Dijkstra.java index 337b905a9..3d9117170 100644 --- a/src/net/sourceforge/plantuml/geom/Dijkstra.java +++ b/src/net/sourceforge/plantuml/geom/Dijkstra.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.geom; diff --git a/src/net/sourceforge/plantuml/geom/InflateData.java b/src/net/sourceforge/plantuml/geom/InflateData.java index 14ebac98e..9ab530584 100644 --- a/src/net/sourceforge/plantuml/geom/InflateData.java +++ b/src/net/sourceforge/plantuml/geom/InflateData.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.geom; diff --git a/src/net/sourceforge/plantuml/geom/InflationTransform.java b/src/net/sourceforge/plantuml/geom/InflationTransform.java index 62ad719d2..5c12a378e 100644 --- a/src/net/sourceforge/plantuml/geom/InflationTransform.java +++ b/src/net/sourceforge/plantuml/geom/InflationTransform.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.geom; diff --git a/src/net/sourceforge/plantuml/geom/Kingdom.java b/src/net/sourceforge/plantuml/geom/Kingdom.java index 25edd5111..8bbf550c9 100644 --- a/src/net/sourceforge/plantuml/geom/Kingdom.java +++ b/src/net/sourceforge/plantuml/geom/Kingdom.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.geom; diff --git a/src/net/sourceforge/plantuml/geom/LineSegmentDouble.java b/src/net/sourceforge/plantuml/geom/LineSegmentDouble.java index 5b16d5cb6..5ab6a11b7 100644 --- a/src/net/sourceforge/plantuml/geom/LineSegmentDouble.java +++ b/src/net/sourceforge/plantuml/geom/LineSegmentDouble.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.geom; diff --git a/src/net/sourceforge/plantuml/geom/LineSegmentInt.java b/src/net/sourceforge/plantuml/geom/LineSegmentInt.java index 2e700dbab..ad13dcfa0 100644 --- a/src/net/sourceforge/plantuml/geom/LineSegmentInt.java +++ b/src/net/sourceforge/plantuml/geom/LineSegmentInt.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.geom; diff --git a/src/net/sourceforge/plantuml/geom/Neighborhood.java b/src/net/sourceforge/plantuml/geom/Neighborhood.java index d545be864..fa361742a 100644 --- a/src/net/sourceforge/plantuml/geom/Neighborhood.java +++ b/src/net/sourceforge/plantuml/geom/Neighborhood.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.geom; diff --git a/src/net/sourceforge/plantuml/geom/Orientation.java b/src/net/sourceforge/plantuml/geom/Orientation.java index 9921b4241..140bdbfa6 100644 --- a/src/net/sourceforge/plantuml/geom/Orientation.java +++ b/src/net/sourceforge/plantuml/geom/Orientation.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.geom; diff --git a/src/net/sourceforge/plantuml/geom/Point2DInt.java b/src/net/sourceforge/plantuml/geom/Point2DInt.java index c5f3592ae..ff50c11c8 100644 --- a/src/net/sourceforge/plantuml/geom/Point2DInt.java +++ b/src/net/sourceforge/plantuml/geom/Point2DInt.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.geom; diff --git a/src/net/sourceforge/plantuml/geom/Pointable.java b/src/net/sourceforge/plantuml/geom/Pointable.java index 6fd8381b8..7fc769ab8 100644 --- a/src/net/sourceforge/plantuml/geom/Pointable.java +++ b/src/net/sourceforge/plantuml/geom/Pointable.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.geom; diff --git a/src/net/sourceforge/plantuml/geom/Polyline.java b/src/net/sourceforge/plantuml/geom/Polyline.java index a43e2470b..a22c9c266 100644 --- a/src/net/sourceforge/plantuml/geom/Polyline.java +++ b/src/net/sourceforge/plantuml/geom/Polyline.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.geom; diff --git a/src/net/sourceforge/plantuml/geom/PolylineBreakeable.java b/src/net/sourceforge/plantuml/geom/PolylineBreakeable.java index 1fbd1f705..53d1ad72f 100644 --- a/src/net/sourceforge/plantuml/geom/PolylineBreakeable.java +++ b/src/net/sourceforge/plantuml/geom/PolylineBreakeable.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.geom; diff --git a/src/net/sourceforge/plantuml/geom/PolylineImpl.java b/src/net/sourceforge/plantuml/geom/PolylineImpl.java index 6381075a6..d4c19aff3 100644 --- a/src/net/sourceforge/plantuml/geom/PolylineImpl.java +++ b/src/net/sourceforge/plantuml/geom/PolylineImpl.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.geom; diff --git a/src/net/sourceforge/plantuml/geom/Singularity.java b/src/net/sourceforge/plantuml/geom/Singularity.java index 9091c7c38..8acce153e 100644 --- a/src/net/sourceforge/plantuml/geom/Singularity.java +++ b/src/net/sourceforge/plantuml/geom/Singularity.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.geom; diff --git a/src/net/sourceforge/plantuml/geom/SpiderWeb.java b/src/net/sourceforge/plantuml/geom/SpiderWeb.java index 080ac1b80..7c16aeae7 100644 --- a/src/net/sourceforge/plantuml/geom/SpiderWeb.java +++ b/src/net/sourceforge/plantuml/geom/SpiderWeb.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.geom; diff --git a/src/net/sourceforge/plantuml/geom/XMoveable.java b/src/net/sourceforge/plantuml/geom/XMoveable.java index 0a8f2aeab..41a477cc4 100644 --- a/src/net/sourceforge/plantuml/geom/XMoveable.java +++ b/src/net/sourceforge/plantuml/geom/XMoveable.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.geom; diff --git a/src/net/sourceforge/plantuml/geom/kinetic/Frame.java b/src/net/sourceforge/plantuml/geom/kinetic/Frame.java index 121e1304f..310a155e4 100644 --- a/src/net/sourceforge/plantuml/geom/kinetic/Frame.java +++ b/src/net/sourceforge/plantuml/geom/kinetic/Frame.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.geom.kinetic; diff --git a/src/net/sourceforge/plantuml/geom/kinetic/MoveObserver.java b/src/net/sourceforge/plantuml/geom/kinetic/MoveObserver.java index 0319766ef..1f9f255cc 100644 --- a/src/net/sourceforge/plantuml/geom/kinetic/MoveObserver.java +++ b/src/net/sourceforge/plantuml/geom/kinetic/MoveObserver.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.geom.kinetic; diff --git a/src/net/sourceforge/plantuml/geom/kinetic/Path.java b/src/net/sourceforge/plantuml/geom/kinetic/Path.java index 2c9a89fbe..bbf2f20ec 100644 --- a/src/net/sourceforge/plantuml/geom/kinetic/Path.java +++ b/src/net/sourceforge/plantuml/geom/kinetic/Path.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.geom.kinetic; diff --git a/src/net/sourceforge/plantuml/geom/kinetic/Point2DCharge.java b/src/net/sourceforge/plantuml/geom/kinetic/Point2DCharge.java index 7c5d288cf..5897aee5c 100644 --- a/src/net/sourceforge/plantuml/geom/kinetic/Point2DCharge.java +++ b/src/net/sourceforge/plantuml/geom/kinetic/Point2DCharge.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.geom.kinetic; diff --git a/src/net/sourceforge/plantuml/geom/kinetic/Quadrant.java b/src/net/sourceforge/plantuml/geom/kinetic/Quadrant.java index e8753121d..bca425288 100644 --- a/src/net/sourceforge/plantuml/geom/kinetic/Quadrant.java +++ b/src/net/sourceforge/plantuml/geom/kinetic/Quadrant.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.geom.kinetic; diff --git a/src/net/sourceforge/plantuml/geom/kinetic/QuadrantMapper.java b/src/net/sourceforge/plantuml/geom/kinetic/QuadrantMapper.java index f0fe351b2..d59909bcc 100644 --- a/src/net/sourceforge/plantuml/geom/kinetic/QuadrantMapper.java +++ b/src/net/sourceforge/plantuml/geom/kinetic/QuadrantMapper.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.geom.kinetic; diff --git a/src/net/sourceforge/plantuml/geom/kinetic/SegmentCutter.java b/src/net/sourceforge/plantuml/geom/kinetic/SegmentCutter.java index d99a5777e..348168833 100644 --- a/src/net/sourceforge/plantuml/geom/kinetic/SegmentCutter.java +++ b/src/net/sourceforge/plantuml/geom/kinetic/SegmentCutter.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.geom.kinetic; diff --git a/src/net/sourceforge/plantuml/geom/kinetic/VectorForce.java b/src/net/sourceforge/plantuml/geom/kinetic/VectorForce.java index c19669dcc..5a19150cb 100644 --- a/src/net/sourceforge/plantuml/geom/kinetic/VectorForce.java +++ b/src/net/sourceforge/plantuml/geom/kinetic/VectorForce.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.geom.kinetic; diff --git a/src/net/sourceforge/plantuml/geom/kinetic/World.java b/src/net/sourceforge/plantuml/geom/kinetic/World.java index 42f0fe02c..1871dd6ba 100644 --- a/src/net/sourceforge/plantuml/geom/kinetic/World.java +++ b/src/net/sourceforge/plantuml/geom/kinetic/World.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.geom.kinetic; diff --git a/src/net/sourceforge/plantuml/golem/Magnet.java b/src/net/sourceforge/plantuml/golem/Magnet.java index 6f00ef464..12cd5935d 100644 --- a/src/net/sourceforge/plantuml/golem/Magnet.java +++ b/src/net/sourceforge/plantuml/golem/Magnet.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 7715 $ * */ package net.sourceforge.plantuml.golem; diff --git a/src/net/sourceforge/plantuml/golem/MinMaxDouble.java b/src/net/sourceforge/plantuml/golem/MinMaxDouble.java index 47e6585ea..0a2f10d8f 100644 --- a/src/net/sourceforge/plantuml/golem/MinMaxDouble.java +++ b/src/net/sourceforge/plantuml/golem/MinMaxDouble.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.golem; diff --git a/src/net/sourceforge/plantuml/golem/MinMaxGolem.java b/src/net/sourceforge/plantuml/golem/MinMaxGolem.java index 9f49c1dbf..eff8e4f7c 100644 --- a/src/net/sourceforge/plantuml/golem/MinMaxGolem.java +++ b/src/net/sourceforge/plantuml/golem/MinMaxGolem.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.golem; diff --git a/src/net/sourceforge/plantuml/golem/Path.java b/src/net/sourceforge/plantuml/golem/Path.java index 1a5bbda8e..4a507d6ed 100644 --- a/src/net/sourceforge/plantuml/golem/Path.java +++ b/src/net/sourceforge/plantuml/golem/Path.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 7715 $ * */ package net.sourceforge.plantuml.golem; diff --git a/src/net/sourceforge/plantuml/golem/Position.java b/src/net/sourceforge/plantuml/golem/Position.java index 8c10a41dd..9e42893e0 100644 --- a/src/net/sourceforge/plantuml/golem/Position.java +++ b/src/net/sourceforge/plantuml/golem/Position.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 7715 $ * */ package net.sourceforge.plantuml.golem; diff --git a/src/net/sourceforge/plantuml/golem/Square.java b/src/net/sourceforge/plantuml/golem/Square.java index 94902bde1..1cc6d5ae1 100644 --- a/src/net/sourceforge/plantuml/golem/Square.java +++ b/src/net/sourceforge/plantuml/golem/Square.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 7715 $ * */ package net.sourceforge.plantuml.golem; diff --git a/src/net/sourceforge/plantuml/golem/Tile.java b/src/net/sourceforge/plantuml/golem/Tile.java index 413cbca43..afcaa66bf 100644 --- a/src/net/sourceforge/plantuml/golem/Tile.java +++ b/src/net/sourceforge/plantuml/golem/Tile.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 7715 $ * */ package net.sourceforge.plantuml.golem; diff --git a/src/net/sourceforge/plantuml/golem/TileArea.java b/src/net/sourceforge/plantuml/golem/TileArea.java index 0c5587fc2..585d36d6e 100644 --- a/src/net/sourceforge/plantuml/golem/TileArea.java +++ b/src/net/sourceforge/plantuml/golem/TileArea.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 7715 $ * */ package net.sourceforge.plantuml.golem; diff --git a/src/net/sourceforge/plantuml/golem/TileGeometry.java b/src/net/sourceforge/plantuml/golem/TileGeometry.java index e6f1ecfbd..1f9e65e77 100644 --- a/src/net/sourceforge/plantuml/golem/TileGeometry.java +++ b/src/net/sourceforge/plantuml/golem/TileGeometry.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 7715 $ * */ package net.sourceforge.plantuml.golem; diff --git a/src/net/sourceforge/plantuml/golem/TilesField.java b/src/net/sourceforge/plantuml/golem/TilesField.java index 02f47feae..f3c639d67 100644 --- a/src/net/sourceforge/plantuml/golem/TilesField.java +++ b/src/net/sourceforge/plantuml/golem/TilesField.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 7715 $ * */ package net.sourceforge.plantuml.golem; diff --git a/src/net/sourceforge/plantuml/graph/ALink.java b/src/net/sourceforge/plantuml/graph/ALink.java index 6a4dd733f..f4d01b6f6 100644 --- a/src/net/sourceforge/plantuml/graph/ALink.java +++ b/src/net/sourceforge/plantuml/graph/ALink.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.graph; diff --git a/src/net/sourceforge/plantuml/graph/ALinkImpl.java b/src/net/sourceforge/plantuml/graph/ALinkImpl.java index 6d28bcc70..8652f562d 100644 --- a/src/net/sourceforge/plantuml/graph/ALinkImpl.java +++ b/src/net/sourceforge/plantuml/graph/ALinkImpl.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.graph; diff --git a/src/net/sourceforge/plantuml/graph/ANode.java b/src/net/sourceforge/plantuml/graph/ANode.java index b93e445dd..7629f22d1 100644 --- a/src/net/sourceforge/plantuml/graph/ANode.java +++ b/src/net/sourceforge/plantuml/graph/ANode.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.graph; diff --git a/src/net/sourceforge/plantuml/graph/ANodeImpl.java b/src/net/sourceforge/plantuml/graph/ANodeImpl.java index 127b29480..6bc36eff6 100644 --- a/src/net/sourceforge/plantuml/graph/ANodeImpl.java +++ b/src/net/sourceforge/plantuml/graph/ANodeImpl.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.graph; diff --git a/src/net/sourceforge/plantuml/graph/AbstractEntityImage.java b/src/net/sourceforge/plantuml/graph/AbstractEntityImage.java index 69fb4f85d..4d993b76b 100644 --- a/src/net/sourceforge/plantuml/graph/AbstractEntityImage.java +++ b/src/net/sourceforge/plantuml/graph/AbstractEntityImage.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19885 $ * */ package net.sourceforge.plantuml.graph; diff --git a/src/net/sourceforge/plantuml/graph/Board.java b/src/net/sourceforge/plantuml/graph/Board.java index 525d59935..6866e801f 100644 --- a/src/net/sourceforge/plantuml/graph/Board.java +++ b/src/net/sourceforge/plantuml/graph/Board.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.graph; diff --git a/src/net/sourceforge/plantuml/graph/BoardCollection.java b/src/net/sourceforge/plantuml/graph/BoardCollection.java index 883e7f23e..f0a93433e 100644 --- a/src/net/sourceforge/plantuml/graph/BoardCollection.java +++ b/src/net/sourceforge/plantuml/graph/BoardCollection.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.graph; diff --git a/src/net/sourceforge/plantuml/graph/BoardExplorer.java b/src/net/sourceforge/plantuml/graph/BoardExplorer.java index a5e3fc551..cb086aa92 100644 --- a/src/net/sourceforge/plantuml/graph/BoardExplorer.java +++ b/src/net/sourceforge/plantuml/graph/BoardExplorer.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.graph; diff --git a/src/net/sourceforge/plantuml/graph/CostComputer.java b/src/net/sourceforge/plantuml/graph/CostComputer.java index aed1289fd..6b20f3033 100644 --- a/src/net/sourceforge/plantuml/graph/CostComputer.java +++ b/src/net/sourceforge/plantuml/graph/CostComputer.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.graph; diff --git a/src/net/sourceforge/plantuml/graph/Elastane.java b/src/net/sourceforge/plantuml/graph/Elastane.java deleted file mode 100644 index 127ff3bc4..000000000 --- a/src/net/sourceforge/plantuml/graph/Elastane.java +++ /dev/null @@ -1,368 +0,0 @@ -/* ======================================================================== - * PlantUML : a free UML diagram generator - * ======================================================================== - * - * (C) Copyright 2009-2017, Arnaud Roques - * - * Project Info: http://plantuml.com - * - * 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. - * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] - * - * Original Author: Arnaud Roques - * - * Revision $Revision: 19885 $ - * - */ -package net.sourceforge.plantuml.graph; - -import java.awt.Color; -import java.awt.Graphics2D; -import java.awt.Shape; -import java.awt.geom.AffineTransform; -import java.awt.geom.Dimension2D; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import net.sourceforge.plantuml.Dimension2DDouble; -import net.sourceforge.plantuml.Log; -import net.sourceforge.plantuml.SpriteContainerEmpty; -import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.cucadiagram.IEntity; -import net.sourceforge.plantuml.cucadiagram.Link; -import net.sourceforge.plantuml.geom.Box; -import net.sourceforge.plantuml.geom.CollectionUtils; -import net.sourceforge.plantuml.geom.Point2DInt; -import net.sourceforge.plantuml.geom.PolylineBreakeable; -import net.sourceforge.plantuml.geom.XMoveable; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.graphic.StringBounderUtils; -import net.sourceforge.plantuml.graphic.TextBlock; -import net.sourceforge.plantuml.ugraphic.ColorMapperIdentity; -import net.sourceforge.plantuml.ugraphic.UFont; - -public class Elastane { - - private static final int STEP = 4; - private static final int OUTER_BOX = 20; - - final private Color red = new Color(Integer.parseInt("A80036", 16)); - - private final Galaxy4 galaxy; - - private final double margin = 30; - - private int minX = Integer.MAX_VALUE; - private int maxX = Integer.MIN_VALUE; - private int minY = Integer.MAX_VALUE; - private int maxY = Integer.MIN_VALUE; - - Elastane(Galaxy4 galaxy) { - this.galaxy = galaxy; - } - - private final Map boxes = new LinkedHashMap(); - private final Map lines = new LinkedHashMap(); - - public void addBox(ANode node, int w, int h) { - final int row = node.getRow(); - final int col = galaxy.getBoard().getCol(node); - final Point2DInt pos = galaxy.getMainPoint(row, col); - final Box box = new Box(pos.getXint() - w / 2, pos.getYint() - h / 2, w, h); - boxes.put(node, box); - assert boxOverlap() == false; - } - - private double getCost() { - if (boxOverlap()) { - return Double.MAX_VALUE; - } - double result = 0; - for (ALink alink : galaxy.getLines().keySet()) { - final PolylineBreakeable orig = lines.get(alink); - final PolylineBreakeable p = orig; - result += getLength(p); - final Box b1 = boxes.get(alink.getNode1()); - final Box b2 = boxes.get(alink.getNode2()); - result += getCostBoxIntersect(p, b1, b2); - - for (ALink alink2 : galaxy.getLines().keySet()) { - if (alink == alink2) { - continue; - } - final PolylineBreakeable other = lines.get(alink2); - if (p.doesTouch(other)) { - result += getLength(other); - // return Double.MAX_VALUE; - } - // result += p.getDistance(other); - } - } - - return result; - } - - private double getLength(final PolylineBreakeable mutedPolyline) { - final double len = mutedPolyline.getLength(); - assert len > 0; - return Math.log(1 + len); - } - - private double getCostBoxIntersect(PolylineBreakeable polyline, Box b1, Box b2) { - double result = 0; - for (Box b : boxes.values()) { - if (b == b1 || b == b2) { - continue; - } - if (polyline.intersectBox(b)) { - final double dist = polyline.getDistance(b); - assert dist >= 0; - assert dist != Double.MAX_VALUE; - // Log.println("dist=" + dist + " exp=" + (100000 - - // dist)); - result += 100000 - dist; - } - - } - return result; - } - - private void initLines() { - for (ALink alink : galaxy.getLines().keySet()) { - final PolylineBreakeable p = galaxy.getPolyline(alink); - final Box b1 = boxes.get(alink.getNode1()); - final Box b2 = boxes.get(alink.getNode2()); - lines.put(alink, p.copy(b1, b2)); - } - - } - - private boolean boxOverlap() { - final List all = new ArrayList(); - for (Box b : boxes.values()) { - all.add(b.outerBox(OUTER_BOX)); - } - for (int i = 0; i < all.size() - 1; i++) { - for (int j = i + 1; j < all.size(); j++) { - if (all.get(i).intersectBox(all.get(j))) { - return true; - } - } - } - return false; - } - - private void moveX(Collection boxes, int delta, double initCost, boolean trace) { - for (XMoveable b : boxes) { - b.moveX(delta); - } - // if (trace) { - // final double diff = getCost() - initCost; - // Log.println("moving " + boxes + " " + delta + " diff=" + - // diff); - // } - // for (Map.Entry entry : lines.entrySet()) { - // if (isConcerned(entry.getKey(), boxes)) { - // entry.getValue().moveX(delta); - // } - // - // } - } - - private boolean isConcerned(ALink link, Collection moved) { - final Box b1 = boxes.get(link.getNode1()); - final Box b2 = boxes.get(link.getNode2()); - return moved.contains(b1) && moved.contains(b2); - } - - private boolean onePass(Collection> subLists) { - boolean changed = false; - for (Collection toMove : subLists) { - final double initCost = getCost(); - - assert reversable(initCost, toMove); - - moveX(toMove, STEP, initCost, true); - if (getCost() < initCost) { - changed = true; - } else { - moveX(toMove, -STEP, initCost, false); - moveX(toMove, -STEP, initCost, true); - if (getCost() < initCost) { - changed = true; - } else { - moveX(toMove, STEP, initCost, false); - assert getCost() == initCost : "c1=" + getCost() + " init=" + initCost; - } - } - assert getCost() <= initCost; - - } - // Log.println("COSTB=" + getCost()); - return changed; - } - - private boolean reversable(double initCost, Collection toMove) { - moveX(toMove, STEP, 0, false); - moveX(toMove, -STEP, 0, false); - assert getCost() == initCost; - moveX(toMove, STEP, 0, false); - moveX(toMove, -STEP * 2, 0, false); - moveX(toMove, STEP, 0, false); - assert getCost() == initCost; - return true; - } - - private Collection convertANodeSet(Set nodesSet, Map> linkMoveables) { - final Collection result = new HashSet(); - for (ANode n : nodesSet) { - assert boxes.get(n) != null; - result.add(boxes.get(n)); - } - // for (ALink link : galaxy.getBoard().getAllLinks(nodesSet)) { - // result.addAll(linkMoveables.get(link)); - // - // } - return result; - } - - public void draw(final Graphics2D g2d) { - final AffineTransform at = g2d.getTransform(); - g2d.translate(-minX + margin, -minY + margin); - - g2d.setColor(red); - for (Map.Entry ent : lines.entrySet()) { - final ALink alink = ent.getKey(); - final Link l = (Link) alink.getUserData(); - final GeneralPathFactory factory = new GeneralPathFactory(l.getType()); - final Box b1 = boxes.get(alink.getNode1()); - final Box b2 = boxes.get(alink.getNode2()); - final PolylineBreakeable polyline = ent.getValue(); - final Shape shape = factory.getLink(polyline, b1, b2); - - final String label = l.getLabel().get(0).toString(); - if (label != null) { - // polyline.getFirst().getCenter(); - final TextBlock textBlock = Display.create(label).create( - FontConfiguration.blackBlueTrue(UFont.getCurrentFont(g2d)), HorizontalAlignment.LEFT, - new SpriteContainerEmpty()); - textBlock.calculateDimension(StringBounderUtils.asStringBounder()); - } - - g2d.setColor(red); - g2d.draw(shape); - } - - g2d.setColor(Color.BLACK); - for (Map.Entry ent : boxes.entrySet()) { - final ANode node = ent.getKey(); - final AbstractEntityImage image = images(node.getRow(), galaxy.getBoard().getCol(node)); - assert image != null; - final Box box = ent.getValue(); - g2d.translate(box.getX(), box.getY()); - image.draw(new ColorMapperIdentity(), g2d); - g2d.translate(-box.getX(), -box.getY()); - } - g2d.setTransform(at); - } - - public void init() { - initLines(); - final Set> nodesGroups = new HashSet>(); - final Collection nodes = galaxy.getBoard().getNodes(); - for (ANode root : nodes) { - for (int i = 0; i < galaxy.getBoard().getLinks().size(); i++) { - final Set group = galaxy.getBoard().getConnectedNodes(root, i); - if (group.size() < nodes.size()) { - nodesGroups.add(group); - } - } - } - final Collection> xmoveableGroups = new ArrayList>(); - final Map> linkMoveables = new HashMap>(); - - for (Map.Entry entry : lines.entrySet()) { - final PolylineBreakeable p = entry.getValue(); - final List freedoms = p.getFreedoms(); - // Log.println("freedoms=" + freedoms); - if (freedoms.size() > 0) { - linkMoveables.put(entry.getKey(), freedoms); - // xmoveableGroups.addAll(CollectionUtils.selectUpTo(freedoms, - // freedoms.size())); - xmoveableGroups.addAll(CollectionUtils.selectUpTo(freedoms, 1)); - } - } - - for (Set nodesSet : nodesGroups) { - xmoveableGroups.add(convertANodeSet(nodesSet, linkMoveables)); - } - - assert getCost() != Double.MAX_VALUE; - for (int i = 0; i < 3000; i++) { - final boolean changed = onePass(xmoveableGroups); - if (changed == false) { - break; - } - } - - for (Box box : boxes.values()) { - minX = Math.min(minX, box.getMinX()); - maxX = Math.max(maxX, box.getMaxX()); - minY = Math.min(minY, box.getMinY()); - maxY = Math.max(maxY, box.getMaxY()); - } - - for (PolylineBreakeable polyline : lines.values()) { - minX = Math.min(minX, polyline.getMinX()); - maxX = Math.max(maxX, polyline.getMaxX()); - minY = Math.min(minY, polyline.getMinY()); - maxY = Math.max(maxY, polyline.getMaxY()); - } - - } - - private AbstractEntityImage images(int r, int c) { - final ANode n = galaxy.getBoard().getNodeAt(r, c); - if (n == null) { - return null; - } - return new EntityImageFactory().createEntityImage((IEntity) n.getUserData()); - } - - public Dimension2D getDimension() { - final Dimension2DDouble dim = new Dimension2DDouble(maxX - minX + 2 * margin, maxY - minY + 2 * margin); - Log.info("Dim=" + dim); - return dim; - } - - // private Point2DInt transform(Point2DInt src) { - // return new Point2DInt(xMargin + widthCell / 2 + src.getXint() * - // (widthCell + xMargin), yMargin + heightCell / 2 - // + src.getYint() * (heightCell + yMargin)); - // } - -} diff --git a/src/net/sourceforge/plantuml/graph/ElectricCharge.java b/src/net/sourceforge/plantuml/graph/ElectricCharge.java index 99b545a8c..a4706369c 100644 --- a/src/net/sourceforge/plantuml/graph/ElectricCharge.java +++ b/src/net/sourceforge/plantuml/graph/ElectricCharge.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.graph; diff --git a/src/net/sourceforge/plantuml/graph/ElectricWord.java b/src/net/sourceforge/plantuml/graph/ElectricWord.java index 96cadfb00..d9c288f96 100644 --- a/src/net/sourceforge/plantuml/graph/ElectricWord.java +++ b/src/net/sourceforge/plantuml/graph/ElectricWord.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.graph; diff --git a/src/net/sourceforge/plantuml/graph/EntityImageActivity.java b/src/net/sourceforge/plantuml/graph/EntityImageActivity.java deleted file mode 100644 index 46f016b5b..000000000 --- a/src/net/sourceforge/plantuml/graph/EntityImageActivity.java +++ /dev/null @@ -1,101 +0,0 @@ -/* ======================================================================== - * PlantUML : a free UML diagram generator - * ======================================================================== - * - * (C) Copyright 2009-2017, Arnaud Roques - * - * Project Info: http://plantuml.com - * - * 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. - * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] - * - * Original Author: Arnaud Roques - * - * Revision $Revision: 19885 $ - * - */ -package net.sourceforge.plantuml.graph; - -import java.awt.Color; -import java.awt.Graphics2D; -import java.awt.Polygon; -import java.awt.geom.Dimension2D; - -import net.sourceforge.plantuml.Dimension2DDouble; -import net.sourceforge.plantuml.SpriteContainerEmpty; -import net.sourceforge.plantuml.cucadiagram.IEntity; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.graphic.StringBounder; -import net.sourceforge.plantuml.graphic.StringBounderUtils; -import net.sourceforge.plantuml.graphic.TextBlock; -import net.sourceforge.plantuml.ugraphic.ColorMapper; - -class EntityImageActivity extends AbstractEntityImage { - - final private TextBlock text; - - private final int xMargin = 10; - private final int yMargin = 6; - - public EntityImageActivity(IEntity entity) { - super(entity); - this.text = entity.getDisplay().create(FontConfiguration.blackBlueTrue(getFont14()), - HorizontalAlignment.CENTER, new SpriteContainerEmpty()); - } - - @Override - public Dimension2D getDimension(StringBounder stringBounder) { - final Dimension2D dim = text.calculateDimension(stringBounder); - return Dimension2DDouble.delta(dim, 2 * xMargin, 2 * yMargin); - } - - @Override - public void draw(ColorMapper colorMapper, Graphics2D g2d) { - final Dimension2D dimTotal = getDimension(StringBounderUtils.asStringBounder()); - - final int width = (int) dimTotal.getWidth(); - final int height = (int) dimTotal.getHeight(); - - final Polygon p = new Polygon(); - p.addPoint(0, yMargin * 2); - p.addPoint(xMargin * 2, 0); - - p.addPoint(width - 2 * xMargin, 0); - p.addPoint(width, 2 * yMargin); - - p.addPoint(width, height - 2 * yMargin); - p.addPoint(width - 2 * xMargin, height); - - p.addPoint(xMargin * 2, height); - p.addPoint(0, height - 2 * yMargin); - - g2d.setColor(colorMapper.getMappedColor(getYellow())); - g2d.fill(p); - // g2d.fillRect(0, 0, width, height); - - g2d.setColor(colorMapper.getMappedColor(getRed())); - g2d.draw(p); - // g2d.drawRect(0, 0, width - 1, height - 1); - g2d.setColor(Color.BLACK); - // text.drawTOBEREMOVED(colorMapper, g2d, xMargin, yMargin); - - } -} diff --git a/src/net/sourceforge/plantuml/graph/EntityImageActivityBar.java b/src/net/sourceforge/plantuml/graph/EntityImageActivityBar.java index c7c6a5f05..58a8b3cd7 100644 --- a/src/net/sourceforge/plantuml/graph/EntityImageActivityBar.java +++ b/src/net/sourceforge/plantuml/graph/EntityImageActivityBar.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.graph; diff --git a/src/net/sourceforge/plantuml/graph/EntityImageActivityBranch.java b/src/net/sourceforge/plantuml/graph/EntityImageActivityBranch.java index 2fadd1e66..2199356b5 100644 --- a/src/net/sourceforge/plantuml/graph/EntityImageActivityBranch.java +++ b/src/net/sourceforge/plantuml/graph/EntityImageActivityBranch.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.graph; diff --git a/src/net/sourceforge/plantuml/graph/EntityImageActivityCircle.java b/src/net/sourceforge/plantuml/graph/EntityImageActivityCircle.java index cf121397d..40ece090f 100644 --- a/src/net/sourceforge/plantuml/graph/EntityImageActivityCircle.java +++ b/src/net/sourceforge/plantuml/graph/EntityImageActivityCircle.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.graph; diff --git a/src/net/sourceforge/plantuml/graph/EntityImageCircleInterface.java b/src/net/sourceforge/plantuml/graph/EntityImageCircleInterface.java index 54129d4c2..ceb01e809 100644 --- a/src/net/sourceforge/plantuml/graph/EntityImageCircleInterface.java +++ b/src/net/sourceforge/plantuml/graph/EntityImageCircleInterface.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.graph; diff --git a/src/net/sourceforge/plantuml/graph/EntityImageDefault.java b/src/net/sourceforge/plantuml/graph/EntityImageDefault.java deleted file mode 100644 index 612ee0966..000000000 --- a/src/net/sourceforge/plantuml/graph/EntityImageDefault.java +++ /dev/null @@ -1,75 +0,0 @@ -/* ======================================================================== - * PlantUML : a free UML diagram generator - * ======================================================================== - * - * (C) Copyright 2009-2017, Arnaud Roques - * - * Project Info: http://plantuml.com - * - * 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. - * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] - * - * Original Author: Arnaud Roques - * - * Revision $Revision: 19267 $ - * - */ -package net.sourceforge.plantuml.graph; - -import java.awt.Color; -import java.awt.Graphics2D; -import java.awt.geom.Dimension2D; - -import net.sourceforge.plantuml.Dimension2DDouble; -import net.sourceforge.plantuml.SpriteContainerEmpty; -import net.sourceforge.plantuml.cucadiagram.IEntity; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.graphic.StringBounder; -import net.sourceforge.plantuml.graphic.StringBounderUtils; -import net.sourceforge.plantuml.graphic.TextBlock; -import net.sourceforge.plantuml.ugraphic.ColorMapper; - -class EntityImageDefault extends AbstractEntityImage { - - final private TextBlock textBlock; - - public EntityImageDefault(IEntity entity) { - super(entity); - this.textBlock = entity.getDisplay().create(FontConfiguration.blackBlueTrue(getFont14()), - HorizontalAlignment.CENTER, new SpriteContainerEmpty()); - } - - @Override - public Dimension2D getDimension(StringBounder stringBounder) { - final Dimension2D dim = textBlock.calculateDimension(stringBounder); - return new Dimension2DDouble(dim.getWidth(), dim.getHeight()); - } - - @Override - public void draw(ColorMapper colorMapper, Graphics2D g2d) { - final Dimension2D dim = textBlock.calculateDimension(StringBounderUtils.asStringBounder()); - final int width = (int) dim.getWidth(); - final int height = (int) dim.getHeight(); - g2d.setColor(Color.BLACK); - g2d.drawRect(0, 0, width, height); - // textBlock.drawTOBEREMOVED(colorMapper, g2d, 0, 0); - } -} diff --git a/src/net/sourceforge/plantuml/graph/EntityImageFactory.java b/src/net/sourceforge/plantuml/graph/EntityImageFactory.java index 197e48190..dd7f009f8 100644 --- a/src/net/sourceforge/plantuml/graph/EntityImageFactory.java +++ b/src/net/sourceforge/plantuml/graph/EntityImageFactory.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.graph; diff --git a/src/net/sourceforge/plantuml/graph/EntityImageNote.java b/src/net/sourceforge/plantuml/graph/EntityImageNote.java deleted file mode 100644 index 1a340bfc0..000000000 --- a/src/net/sourceforge/plantuml/graph/EntityImageNote.java +++ /dev/null @@ -1,96 +0,0 @@ -/* ======================================================================== - * PlantUML : a free UML diagram generator - * ======================================================================== - * - * (C) Copyright 2009-2017, Arnaud Roques - * - * Project Info: http://plantuml.com - * - * 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. - * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] - * - * Original Author: Arnaud Roques - * - * Revision $Revision: 19267 $ - * - */ -package net.sourceforge.plantuml.graph; - -import java.awt.Color; -import java.awt.Graphics2D; -import java.awt.Polygon; -import java.awt.geom.Dimension2D; - -import net.sourceforge.plantuml.Dimension2DDouble; -import net.sourceforge.plantuml.SpriteContainerEmpty; -import net.sourceforge.plantuml.cucadiagram.IEntity; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.graphic.StringBounder; -import net.sourceforge.plantuml.graphic.StringBounderUtils; -import net.sourceforge.plantuml.graphic.TextBlock; -import net.sourceforge.plantuml.ugraphic.ColorMapper; - -class EntityImageNote extends AbstractEntityImage { - - final private TextBlock text; - - private final int xMargin = 10; - private final int yMargin = 10; - - public EntityImageNote(IEntity entity) { - super(entity); - this.text = entity.getDisplay().create(FontConfiguration.blackBlueTrue(getFont14()), - HorizontalAlignment.CENTER, new SpriteContainerEmpty()); - } - - @Override - public Dimension2D getDimension(StringBounder stringBounder) { - final Dimension2D dim = text.calculateDimension(stringBounder); - return Dimension2DDouble.delta(dim, 2 * xMargin, 2 * yMargin); - } - - @Override - public void draw(ColorMapper colorMapper, Graphics2D g2d) { - final Dimension2D dimTotal = getDimension(StringBounderUtils.asStringBounder()); - - final int width = (int) dimTotal.getWidth(); - final int height = (int) dimTotal.getHeight(); - - final Polygon p = new Polygon(); - p.addPoint(0, 0); - p.addPoint(width - xMargin, 0); - p.addPoint(width, yMargin); - p.addPoint(width, height); - p.addPoint(0, height); - - g2d.setColor(colorMapper.getMappedColor(getYellowNote())); - g2d.fill(p); - - g2d.setColor(colorMapper.getMappedColor(getRed())); - g2d.draw(p); - g2d.drawLine(width - xMargin, 0, width - xMargin, yMargin); - g2d.drawLine(width - xMargin, yMargin, width, yMargin); - - g2d.setColor(Color.BLACK); - // text.drawTOBEREMOVED(colorMapper, g2d, xMargin, yMargin); - - } -} diff --git a/src/net/sourceforge/plantuml/graph/EntityImageUsecase.java b/src/net/sourceforge/plantuml/graph/EntityImageUsecase.java deleted file mode 100644 index 6ae98f67a..000000000 --- a/src/net/sourceforge/plantuml/graph/EntityImageUsecase.java +++ /dev/null @@ -1,103 +0,0 @@ -/* ======================================================================== - * PlantUML : a free UML diagram generator - * ======================================================================== - * - * (C) Copyright 2009-2017, Arnaud Roques - * - * Project Info: http://plantuml.com - * - * 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. - * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] - * - * Original Author: Arnaud Roques - * - * Revision $Revision: 19885 $ - * - */ -package net.sourceforge.plantuml.graph; - -import java.awt.Color; -import java.awt.Graphics2D; -import java.awt.geom.Dimension2D; -import java.awt.geom.GeneralPath; -import java.awt.geom.QuadCurve2D; - -import net.sourceforge.plantuml.Dimension2DDouble; -import net.sourceforge.plantuml.SpriteContainerEmpty; -import net.sourceforge.plantuml.cucadiagram.IEntity; -import net.sourceforge.plantuml.graphic.FontConfiguration; -import net.sourceforge.plantuml.graphic.HorizontalAlignment; -import net.sourceforge.plantuml.graphic.StringBounder; -import net.sourceforge.plantuml.graphic.StringBounderUtils; -import net.sourceforge.plantuml.graphic.TextBlock; -import net.sourceforge.plantuml.ugraphic.ColorMapper; - -class EntityImageUsecase extends AbstractEntityImage { - - final private TextBlock name; - - public EntityImageUsecase(IEntity entity) { - super(entity); - this.name = entity.getDisplay().create(FontConfiguration.blackBlueTrue(getFont14()), - HorizontalAlignment.CENTER, new SpriteContainerEmpty()); - } - - @Override - public Dimension2D getDimension(StringBounder stringBounder) { - final Dimension2D nameDim = name.calculateDimension(stringBounder); - // final double eps = Math.sqrt(nameDim.getWidth() / - // nameDim.getHeight()); - // final double diag = Math.sqrt(nameDim.getWidth() * nameDim.getWidth() - // + nameDim.getHeight() - // * nameDim.getHeight()); - // return new Dimension2DDouble(diag * eps, diag / eps); - final double eps = 1.7; - return new Dimension2DDouble(nameDim.getWidth() * eps, nameDim.getHeight() * eps); - } - - @Override - public void draw(ColorMapper colorMapper, Graphics2D g2d) { - final Dimension2D dimTotal = getDimension(StringBounderUtils.asStringBounder()); - - // Shape ellipse = new Ellipse2D.Double(0, 0, dimTotal.getWidth(), - // dimTotal.getHeight()); - final GeneralPath ellipse = new GeneralPath(); - final double h = dimTotal.getHeight(); - final double w = dimTotal.getWidth(); - ellipse.append(new QuadCurve2D.Double(0, h / 2, 0, 0, w / 2, 0), true); - ellipse.append(new QuadCurve2D.Double(w / 2, 0, w, 0, w, h / 2), true); - ellipse.append(new QuadCurve2D.Double(w, h / 2, w, h, w / 2, h), true); - ellipse.append(new QuadCurve2D.Double(w / 2, h, 0, h, 0, h / 2), true); - g2d.setColor(colorMapper.getMappedColor(getYellow())); - g2d.fill(ellipse); - - g2d.setColor(colorMapper.getMappedColor(getRed())); - g2d.draw(ellipse); - - // final Dimension2D nameDim = name.calculateDimension(StringBounderUtils.asStringBounder(g2d)); - // final double posx = (w - nameDim.getWidth()) / 2; - // final double posy = (h - nameDim.getHeight()) / 2; - // final Shape rect = new Rectangle2D.Double(posx, posy, nameDim.getWidth(), nameDim.getHeight()); - // g2d.draw(rect); - - g2d.setColor(Color.BLACK); - // name.drawTOBEREMOVED(colorMapper, g2d, posx, posy); - } -} diff --git a/src/net/sourceforge/plantuml/graph/Galaxy4.java b/src/net/sourceforge/plantuml/graph/Galaxy4.java index 8c6792dac..bc1e2a051 100644 --- a/src/net/sourceforge/plantuml/graph/Galaxy4.java +++ b/src/net/sourceforge/plantuml/graph/Galaxy4.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.graph; diff --git a/src/net/sourceforge/plantuml/graph/GeneralPathFactory.java b/src/net/sourceforge/plantuml/graph/GeneralPathFactory.java index 862bc7b47..e8f7b6062 100644 --- a/src/net/sourceforge/plantuml/graph/GeneralPathFactory.java +++ b/src/net/sourceforge/plantuml/graph/GeneralPathFactory.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.graph; diff --git a/src/net/sourceforge/plantuml/graph/Graph1.java b/src/net/sourceforge/plantuml/graph/Graph1.java index 3034b7d7b..efc3d8e24 100644 --- a/src/net/sourceforge/plantuml/graph/Graph1.java +++ b/src/net/sourceforge/plantuml/graph/Graph1.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.graph; diff --git a/src/net/sourceforge/plantuml/graph/Graph2.java b/src/net/sourceforge/plantuml/graph/Graph2.java deleted file mode 100644 index f76bc2b5e..000000000 --- a/src/net/sourceforge/plantuml/graph/Graph2.java +++ /dev/null @@ -1,90 +0,0 @@ -/* ======================================================================== - * PlantUML : a free UML diagram generator - * ======================================================================== - * - * (C) Copyright 2009-2017, Arnaud Roques - * - * Project Info: http://plantuml.com - * - * 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. - * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] - * - * Original Author: Arnaud Roques - * - * Revision $Revision: 19885 $ - * - */ -package net.sourceforge.plantuml.graph; - -import java.awt.Graphics2D; -import java.awt.geom.Dimension2D; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import net.sourceforge.plantuml.cucadiagram.IEntity; -import net.sourceforge.plantuml.graphic.StringBounderUtils; - -public class Graph2 { - - private final Elastane elastane; - private int widthCell; - private int heightCell; - - public Graph2(Board board) { - board.normalize(); - - for (ANode n : board.getNodes()) { - final Dimension2D dim = images(n).getDimension(StringBounderUtils.asStringBounder()); - widthCell = Math.max(widthCell, (int) dim.getWidth()); - heightCell = Math.max(heightCell, (int) dim.getHeight()); - } - final Galaxy4 galaxy = new Galaxy4(board, widthCell, heightCell); - elastane = new Elastane(galaxy); - - for (ANode n : board.getNodes()) { - final Dimension2D dim = images(n).getDimension(StringBounderUtils.asStringBounder()); - elastane.addBox(n, (int) dim.getWidth(), (int) dim.getHeight()); - } - - final List links = new ArrayList(board.getLinks()); - Collections.sort(links, board.getLinkComparator()); - for (ALink link : links) { - galaxy.addLink(link); - } - - elastane.init(); - - } - - private AbstractEntityImage images(ANode n) { - return new EntityImageFactory().createEntityImage((IEntity)n.getUserData()); - } - - public Dimension2D getDimension() { - return elastane.getDimension(); - - } - - public void draw(final Graphics2D g2d) { - elastane.draw(g2d); - } - -} diff --git a/src/net/sourceforge/plantuml/graph/Graph3.java b/src/net/sourceforge/plantuml/graph/Graph3.java deleted file mode 100644 index 625b26b3c..000000000 --- a/src/net/sourceforge/plantuml/graph/Graph3.java +++ /dev/null @@ -1,470 +0,0 @@ -/* ======================================================================== - * PlantUML : a free UML diagram generator - * ======================================================================== - * - * (C) Copyright 2009-2017, Arnaud Roques - * - * Project Info: http://plantuml.com - * - * 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. - * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] - * - * Original Author: Arnaud Roques - * - * Revision $Revision: 19885 $ - * - */ -package net.sourceforge.plantuml.graph; - -import java.awt.Color; -import java.awt.Graphics2D; -import java.awt.geom.Dimension2D; -import java.awt.geom.Line2D; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashSet; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import net.sourceforge.plantuml.Dimension2DDouble; -import net.sourceforge.plantuml.Log; -import net.sourceforge.plantuml.cucadiagram.IEntity; -import net.sourceforge.plantuml.geom.InflationTransform; -import net.sourceforge.plantuml.geom.Kingdom; -import net.sourceforge.plantuml.geom.LineSegmentInt; -import net.sourceforge.plantuml.geom.Point2DInt; -import net.sourceforge.plantuml.geom.Pointable; -import net.sourceforge.plantuml.geom.Polyline; -import net.sourceforge.plantuml.geom.PolylineImpl; -import net.sourceforge.plantuml.geom.XMoveable; -import net.sourceforge.plantuml.geom.kinetic.Frame; -import net.sourceforge.plantuml.geom.kinetic.Path; -import net.sourceforge.plantuml.geom.kinetic.Point2DCharge; -import net.sourceforge.plantuml.geom.kinetic.World; -import net.sourceforge.plantuml.graphic.StringBounderUtils; -import net.sourceforge.plantuml.ugraphic.ColorMapperIdentity; - -public class Graph3 { - - private final int spaceWidth = 40; - private final int spaceHeight = 40; - private final int minDistBetweenPoint = 20; - - // private final int boxWidth = 20; - // private final int boxHeight = 20; - - private final double margin = 30; - private final Board board; - private final List polylines = new ArrayList(); - private final Map nodePoints = new LinkedHashMap(); - - private int maxRow; - private int maxCol; - - class ANodePoint implements Pointable, XMoveable { - final private ANode node; - private int deltaX = 0; - private int deltaY = 0; - - public ANodePoint(ANode node) { - this.node = node; - } - - public Point2DInt getPosition() { - return new Point2DInt(board.getCol(node) * spaceWidth + deltaX, node.getRow() * spaceHeight + deltaY); - } - - public void moveX(int delta) { - this.deltaX += delta; - } - - public void moveY(int delta) { - this.deltaY += delta; - } - - public ANode getNode() { - return node; - } - - } - - private Collection convertANodeSet(Set nodesSet) { - final Collection result = new HashSet(); - for (ANode n : nodesSet) { - assert nodePoints.get(n) != null; - result.add(nodePoints.get(n)); - } - return result; - } - - private int addedWidth = 0; - private int addedHeight = 0; - - public Graph3(Board board) { - board.normalize(); - this.board = board; - for (ANode n : board.getNodes()) { - maxRow = Math.max(maxRow, n.getRow()); - maxCol = Math.max(maxCol, board.getCol(n)); - } - for (ANode n : board.getNodes()) { - nodePoints.put(n, new ANodePoint(n)); - } - - // for (ALink link : board.getLinks()) { - // final Pointable pp1 = nodePoints.get(link.getNode1()); - // final Pointable pp2 = nodePoints.get(link.getNode2()); - // polylines.add(new PolylineImpl(pp1, pp2)); - // } - // manyPasses(board); - // polylines.clear(); - - computePolylines(board); - - final InflationTransform inflationTransform = new InflationTransform(); - for (ANodePoint nodePoint : nodePoints.values()) { - final Point2DInt p = nodePoint.getPosition(); - final AbstractEntityImage image = getImage(nodePoint.getNode()); - - int widthCell = (int) image.getDimension(StringBounderUtils.asStringBounder()).getWidth(); - int heightCell = (int) image.getDimension(StringBounderUtils.asStringBounder()).getHeight(); - if (widthCell % 2 == 1) { - widthCell++; - } - if (heightCell % 2 == 1) { - heightCell++; - } - - inflationTransform.addInflationX(p.getXint(), widthCell); - addedWidth += widthCell; - inflationTransform.addInflationY(p.getYint(), heightCell); - addedHeight += heightCell; - } - - for (PolylineImpl p : polylines) { - p.inflate(inflationTransform); - } - - for (ANodePoint nodePoint : nodePoints.values()) { - final Point2DInt pos = nodePoint.getPosition(); - final Point2DInt pos2 = inflationTransform.inflatePoint2DInt(pos); - nodePoint.moveX(pos2.getXint() - pos.getXint()); - nodePoint.moveY(pos2.getYint() - pos.getYint()); - } - - // Kinematic - for (ANodePoint point : nodePoints.values()) { - final double x = point.getPosition().getX(); - final double y = point.getPosition().getY(); - final Dimension2D dim = getImage(point.getNode()).getDimension( - StringBounderUtils.asStringBounder()); - final Frame frame = new Frame(x, y, (int) dim.getWidth(), (int) dim.getHeight()); - frames.put(point, frame); - world.addFrame(frame); - } - - for (PolylineImpl polyline : polylines) { - final Frame f1 = frames.get(polyline.getStart()); - final Frame f2 = frames.get(polyline.getEnd()); - final Path path = new Path(f1, f2); - for (Point2DInt pt : polyline.getIntermediates()) { - path.addIntermediate(new Point2DCharge(pt.getX(), pt.getY())); - } - world.addPath(path); - } - - world.renderContinue(); - Log.info("Starting moving"); - final long start = System.currentTimeMillis(); - final int limit = 100; - for (int i = 0; i < limit; i++) { - Log.info("i=" + i); - final double move = world.onePass(); - if (move < 1) { - Log.info("i=" + i + " " + move); - // break; - } - if (i == limit - 1) { - Log.info("Aborting"); - } - } - final long duration = System.currentTimeMillis() - start; - Log.info("Ending moving (" + duration + " ms)"); - - } - - private final World world = new World(); - private final Map frames = new LinkedHashMap(); - - private void computePolylines(Board board) { - final Collection latter = new ArrayList(); - final Kingdom kingdom = new Kingdom(); - final List links = new ArrayList(board.getLinks()); - Collections.sort(links, board.getLinkComparator()); - for (ALink link : links) { - final Pointable pp1 = nodePoints.get(link.getNode1()); - final Pointable pp2 = nodePoints.get(link.getNode2()); - if (kingdom.isSimpleSegmentPossible(pp1.getPosition(), pp2.getPosition())) { - Log.println("OK for " + link); - kingdom.addDirectLink(pp1.getPosition(), pp2.getPosition()); - polylines.add(new PolylineImpl(pp1, pp2)); - } else { - Log.println("Latter for " + link); - latter.add(link); - } - } - - Log.println("latters=" + latter.size()); - for (ALink link : latter) { - Log.println("Alatter=" + link); - } - for (ALink link : latter) { - Log.println("Blatter=" + link); - final Pointable pp1 = nodePoints.get(link.getNode1()); - final Pointable pp2 = nodePoints.get(link.getNode2()); - polylines.add((PolylineImpl) kingdom.getPath(pp1, pp2)); - } - } - - private void manyPasses(Board board) { - final Collection> xmoveableGroups = getXMoveables(board); - - Log.println("COST_INIT=" + getCost()); - for (int i = 0; i < 300; i++) { - final boolean changed = onePass(xmoveableGroups); - if (changed == false) { - break; - } - } - Log.println("COST_FIN=" + getCost()); - } - - private Collection> getXMoveables(Board board) { - final Set> nodesGroups = new HashSet>(); - final Collection nodes = board.getNodes(); - for (ANode root : nodes) { - for (int i = 0; i < board.getLinks().size(); i++) { - final Set group = board.getConnectedNodes(root, i); - if (group.size() < nodes.size()) { - nodesGroups.add(group); - } - } - } - - final Collection> xmoveableGroups = new ArrayList>(); - for (Set nodesSet : nodesGroups) { - xmoveableGroups.add(convertANodeSet(nodesSet)); - } - return xmoveableGroups; - } - - private void moveX(Collection boxes, int delta) { - for (XMoveable b : boxes) { - b.moveX(delta); - } - } - - private static final int STEP = 1; - - private boolean onePass(Collection> subLists) { - boolean changed = false; - for (Collection toMove : subLists) { - final double initCost = getCost(); - - assert reversable(initCost, toMove); - - moveX(toMove, STEP); - if (getCost() < initCost) { - changed = true; - } else { - moveX(toMove, -STEP); - moveX(toMove, -STEP); - if (getCost() < initCost) { - changed = true; - } else { - moveX(toMove, STEP); - assert getCost() == initCost : "c1=" + getCost() + " init=" + initCost; - } - } - assert getCost() <= initCost; - - } - // Log.println("COSTB=" + getCost()); - return changed; - } - - private boolean reversable(double initCost, Collection toMove) { - moveX(toMove, STEP); - moveX(toMove, -STEP); - assert getCost() == initCost; - moveX(toMove, STEP); - moveX(toMove, -STEP * 2); - moveX(toMove, STEP); - assert getCost() == initCost; - return true; - } - - private double getCostOld() { - if (mindistRespected() == false) { - return Double.MAX_VALUE; - } - double result = 0; - for (PolylineImpl p : polylines) { - result += getLength(p); - - for (PolylineImpl other : polylines) { - if (other == p) { - continue; - } - if (p.doesTouch(other)) { - result += getLength(other); - } - } - } - - return result; - } - - private double getCost() { - double result = 0; - for (PolylineImpl p1 : polylines) { - for (PolylineImpl p2 : polylines) { - result += getCost(p1, p2); - } - } - - final List all = new ArrayList(nodePoints.values()); - for (int i = 0; i < all.size() - 1; i++) { - for (int j = i + 1; j < all.size(); j++) { - final double len = new LineSegmentInt(all.get(i).getPosition(), all.get(j).getPosition()).getLength(); - result += minDistBetweenPoint * minDistBetweenPoint / len / len; - } - } - - return result; - } - - private double getCost(PolylineImpl p1, PolylineImpl p2) { - assert p1.nbSegments() == 1; - assert p2.nbSegments() == 1; - - final LineSegmentInt seg1 = p1.getFirst(); - final LineSegmentInt seg2 = p2.getFirst(); - - final double len1 = seg1.getLength(); - if (p1 == p2) { - return len1 / minDistBetweenPoint; - } - final double len2 = seg2.getLength(); - - // return len1 * len2 * Math.exp(-seg1.getDistance(seg2)); - return len1 * len2 / seg1.getDistance(seg2) / minDistBetweenPoint / minDistBetweenPoint; - // return len1 * len2 * Math.exp(-seg1.getDistance(seg2)) / - // minDistBetweenPoint / minDistBetweenPoint; - } - - private boolean mindistRespected() { - final List all = new ArrayList(nodePoints.values()); - for (int i = 0; i < all.size() - 1; i++) { - for (int j = i + 1; j < all.size(); j++) { - final double len = new LineSegmentInt(all.get(i).getPosition(), all.get(j).getPosition()).getLength(); - if (len <= minDistBetweenPoint) { - return false; - } - } - } - return true; - } - - private double getLength(final Polyline p) { - final double len = p.getLength(); - assert len > 0; - return Math.log(1 + len); - } - - public Dimension2D getDimension() { - final double width = spaceWidth * maxCol; - final int height = spaceWidth * maxRow; // + boxHeight * (maxRow + 1); - return new Dimension2DDouble(width + 2 * margin + addedWidth, height + 2 * margin + addedHeight); - - } - - public void draw(final Graphics2D g2d) { - g2d.translate(margin, margin); - - for (Path p : world.getPaths()) { - for (Line2D seg : p.segments()) { - g2d.setColor(Color.BLUE); - g2d.draw(seg); - g2d.setColor(Color.RED); - g2d.drawOval((int) seg.getX1(), (int) seg.getY1(), 1, 1); - } - } - - g2d.setColor(Color.GREEN); - for (ANodePoint nodePoint : nodePoints.values()) { - final Frame frame = frames.get(nodePoint); - final AbstractEntityImage image = getImage(nodePoint.getNode()); - final double width = image.getDimension(StringBounderUtils.asStringBounder()).getWidth(); - final double height = image.getDimension(StringBounderUtils.asStringBounder()).getHeight(); - g2d.translate(frame.getX() - width / 2, frame.getY() - height / 2); - image.draw(new ColorMapperIdentity(), g2d); - g2d.translate(-frame.getX() + width / 2, -frame.getY() + height / 2); - } - - } - - public void draw2(final Graphics2D g2d) { - g2d.translate(margin, margin); - - g2d.setColor(Color.BLUE); - for (Polyline p : polylines) { - if (p == null) { - Log.println("Polyline NULL!!"); - continue; - } - for (LineSegmentInt seg : p.segments()) { - g2d.drawLine(seg.getP1().getXint(), seg.getP1().getYint(), seg.getP2().getXint(), seg.getP2().getYint()); - } - } - - g2d.setColor(Color.GREEN); - for (ANodePoint nodePoint : nodePoints.values()) { - final Point2DInt p = nodePoint.getPosition(); - // Log.println("p=" + p); - final AbstractEntityImage image = getImage(nodePoint.getNode()); - final int width = (int) (image.getDimension(StringBounderUtils.asStringBounder()).getWidth()); - final int height = (int) (image.getDimension(StringBounderUtils.asStringBounder()).getHeight()); - g2d.translate(p.getXint() - width / 2, p.getYint() - height / 2); - image.draw(new ColorMapperIdentity(), g2d); - g2d.translate(-p.getXint() + width / 2, -p.getYint() + height / 2); - // g2d.fillOval(p.getXint() - 2, p.getYint() - 2, 5, 5); - // g2d.drawRect(p.getXint() - 4, p.getYint() - 4, 8, 8); - } - } - - private AbstractEntityImage getImage(ANode n) { - return new EntityImageFactory().createEntityImage((IEntity) n.getUserData()); - } - -} diff --git a/src/net/sourceforge/plantuml/graph/Graph4.java b/src/net/sourceforge/plantuml/graph/Graph4.java deleted file mode 100644 index da4a49991..000000000 --- a/src/net/sourceforge/plantuml/graph/Graph4.java +++ /dev/null @@ -1,257 +0,0 @@ -/* ======================================================================== - * PlantUML : a free UML diagram generator - * ======================================================================== - * - * (C) Copyright 2009-2017, Arnaud Roques - * - * Project Info: http://plantuml.com - * - * 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. - * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] - * - * Original Author: Arnaud Roques - * - * Revision $Revision: 19885 $ - * - */ -package net.sourceforge.plantuml.graph; - -import java.awt.Color; -import java.awt.Graphics2D; -import java.awt.geom.CubicCurve2D; -import java.awt.geom.Dimension2D; -import java.awt.geom.Rectangle2D; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashMap; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - -import net.sourceforge.plantuml.Dimension2DDouble; -import net.sourceforge.plantuml.Log; -import net.sourceforge.plantuml.cucadiagram.IEntity; -import net.sourceforge.plantuml.geom.InflationTransform; -import net.sourceforge.plantuml.geom.Point2DInt; -import net.sourceforge.plantuml.geom.Pointable; -import net.sourceforge.plantuml.geom.XMoveable; -import net.sourceforge.plantuml.geom.kinetic.Frame; -import net.sourceforge.plantuml.graph2.CubicCurveFactory; -import net.sourceforge.plantuml.graph2.MyCurve; -import net.sourceforge.plantuml.graph2.RectanglesCollection; -import net.sourceforge.plantuml.graphic.StringBounderUtils; -import net.sourceforge.plantuml.ugraphic.ColorMapperIdentity; - -public class Graph4 { - - private final int spaceWidth = 40; - private final int spaceHeight = 40; - - private final double margin = 30; - private final Board board; - - private final Map nodePoints = new LinkedHashMap(); - private final Map frames = new LinkedHashMap(); - - private int maxRow; - private int maxCol; - - private int addedWidth = 0; - private int addedHeight = 0; - - class ANodePoint implements Pointable, XMoveable { - final private ANode node; - private int deltaX = 0; - private int deltaY = 0; - - public ANodePoint(ANode node) { - this.node = node; - } - - public Point2DInt getPosition() { - return new Point2DInt(board.getCol(node) * spaceWidth + deltaX, node.getRow() * spaceHeight + deltaY); - } - - public void moveX(int delta) { - this.deltaX += delta; - } - - public void moveY(int delta) { - this.deltaY += delta; - } - - public ANode getNode() { - return node; - } - - } - - public Graph4(Board board) { - board.normalize(); - this.board = board; - for (ANode n : board.getNodes()) { - maxRow = Math.max(maxRow, n.getRow()); - maxCol = Math.max(maxCol, board.getCol(n)); - } - for (ANode n : board.getNodes()) { - nodePoints.put(n, new ANodePoint(n)); - } - - final InflationTransform inflationTransform = new InflationTransform(); - for (ANodePoint nodePoint : nodePoints.values()) { - final Point2DInt p = nodePoint.getPosition(); - final AbstractEntityImage image = getImage(nodePoint.getNode()); - - int widthCell = (int) image.getDimension(StringBounderUtils.asStringBounder()).getWidth(); - int heightCell = (int) image.getDimension(StringBounderUtils.asStringBounder()).getHeight(); - if (widthCell % 2 == 1) { - widthCell++; - } - if (heightCell % 2 == 1) { - heightCell++; - } - - inflationTransform.addInflationX(p.getXint(), widthCell); - addedWidth += widthCell; - inflationTransform.addInflationY(p.getYint(), heightCell); - addedHeight += heightCell; - } - - for (ANodePoint nodePoint : nodePoints.values()) { - final Point2DInt pos = nodePoint.getPosition(); - final Point2DInt pos2 = inflationTransform.inflatePoint2DInt(pos); - nodePoint.moveX(pos2.getXint() - pos.getXint()); - nodePoint.moveY(pos2.getYint() - pos.getYint()); - } - - // Kinematic - for (ANodePoint point : nodePoints.values()) { - final double x = point.getPosition().getX(); - final double y = point.getPosition().getY(); - final Dimension2D dim = getImage(point.getNode()).getDimension( - StringBounderUtils.asStringBounder()); - final int width = (int) dim.getWidth(); - final int height = (int) dim.getHeight(); - final Frame frame = new Frame(x - width / 2, y - height / 2, width, height); - frames.put(point, frame); - } - - } - - public Dimension2D getDimension() { - final double width = spaceWidth * maxCol; - final int height = spaceWidth * maxRow; - return new Dimension2DDouble(width + 2 * margin + addedWidth, height + 2 * margin + addedHeight); - - } - - private final List alreadyCurve = new ArrayList(); - - public void draw(final Graphics2D g2d) { - g2d.translate(margin, margin); - - g2d.setColor(Color.BLUE); - - final long start = System.currentTimeMillis(); - alreadyCurve.clear(); - for (ALink link : getSortedLinks()) { - final ANodePoint p1 = nodePoints.get(link.getNode1()); - final ANodePoint p2 = nodePoints.get(link.getNode2()); - final RectanglesCollection forbidden = getForbidden(link); - if (forbidden.size() != nodePoints.size() - 2) { - throw new IllegalStateException(); - } - final MyCurve line = getCurveLink(p1, p2, forbidden); - alreadyCurve.add(line); - line.draw(g2d); - } - final long tps5 = System.currentTimeMillis() - start; - Log.println("TPS5 = " + tps5); - - g2d.setColor(Color.GREEN); - for (ANodePoint nodePoint : nodePoints.values()) { - final Frame frame = frames.get(nodePoint); - final AbstractEntityImage image = getImage(nodePoint.getNode()); - g2d.translate(frame.getX(), frame.getY()); - image.draw(new ColorMapperIdentity(), g2d); - g2d.translate(-frame.getX(), -frame.getY()); - } - - } - - private List getSortedLinks() { - final Map lengths = new HashMap(); - for (ALink link : board.getLinks()) { - final ANodePoint p1 = nodePoints.get(link.getNode1()); - final ANodePoint p2 = nodePoints.get(link.getNode2()); - lengths.put(link, p1.getPosition().distance(p2.getPosition())); - } - final List all = new ArrayList(lengths.keySet()); - Collections.sort(all, new Comparator() { - public int compare(ALink l1, ALink l2) { - final double diff = lengths.get(l1) - lengths.get(l2); - return (int) Math.signum(diff); - } - }); - return all; - } - - private MyCurve getCurveLink(final ANodePoint p1, final ANodePoint p2, RectanglesCollection forbidden) { - final int x1 = p1.getPosition().getXint(); - final int y1 = p1.getPosition().getYint(); - final int x2 = p2.getPosition().getXint(); - final int y2 = p2.getPosition().getYint(); - final CubicCurve2D.Double curve = new CubicCurve2D.Double(x1, y1, x1, y1, x2, y2, x2, y2); - final MyCurve result = new MyCurve(curve); - if (result.intersects(forbidden) || result.intersects(alreadyCurve)) { - final CubicCurveFactory factory = new CubicCurveFactory(p1.getPosition(), p2.getPosition()); - for (Rectangle2D.Double r : forbidden) { - factory.addForbidden(r); - } - for (MyCurve c : alreadyCurve) { - factory.addForbidden(c); - } - return factory.getCubicCurve2D(); - - } - return result; - } - - private RectanglesCollection getForbidden(ALink link) { - final RectanglesCollection result = new RectanglesCollection(); - for (Map.Entry entry : nodePoints.entrySet()) { - final ANode node = entry.getKey(); - if (link.getNode1().equals(node) || link.getNode2().equals(node)) { - continue; - } - final ANodePoint nodePoints = entry.getValue(); - final Frame frame = frames.get(nodePoints); - result.add(new Rectangle2D.Double(frame.getX(), frame.getY(), frame.getWidth(), frame.getHeight())); - } - - return result; - } - - private AbstractEntityImage getImage(ANode n) { - return new EntityImageFactory().createEntityImage((IEntity) n.getUserData()); - } - -} diff --git a/src/net/sourceforge/plantuml/graph/Graph5.java b/src/net/sourceforge/plantuml/graph/Graph5.java deleted file mode 100644 index 97115e8ca..000000000 --- a/src/net/sourceforge/plantuml/graph/Graph5.java +++ /dev/null @@ -1,182 +0,0 @@ -/* ======================================================================== - * PlantUML : a free UML diagram generator - * ======================================================================== - * - * (C) Copyright 2009-2017, Arnaud Roques - * - * Project Info: http://plantuml.com - * - * 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. - * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] - * - * Original Author: Arnaud Roques - * - * Revision $Revision: 19885 $ - * - */ -package net.sourceforge.plantuml.graph; - -import java.awt.Color; -import java.awt.Graphics2D; -import java.awt.geom.Dimension2D; -import java.awt.geom.Line2D; -import java.awt.geom.Point2D; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - -import net.sourceforge.plantuml.Dimension2DDouble; -import net.sourceforge.plantuml.cucadiagram.IEntity; -import net.sourceforge.plantuml.graph2.IInflationTransform; -import net.sourceforge.plantuml.graph2.InflationTransform2; -import net.sourceforge.plantuml.graph2.Plan; -import net.sourceforge.plantuml.graph2.Polyline2; -import net.sourceforge.plantuml.graphic.StringBounderUtils; -import net.sourceforge.plantuml.ugraphic.ColorMapperIdentity; - -public class Graph5 { - - private final int spaceWidth = 40; - private final int spaceHeight = 40; - - private final double margin = 20; - private final Board board; - - private int maxRow; - private int maxCol; - - private final Plan plan = new Plan(); - private final IInflationTransform inflationTransform = new InflationTransform2(); - // private final IInflationTransform inflationTransform = new - // IdentityInflationTransform(); - - private AbstractEntityImage getImage(ANode n) { - return new EntityImageFactory().createEntityImage((IEntity) n.getUserData()); - } - - public Graph5(Board board) { - board.normalize(); - this.board = board; - for (ANode n : board.getNodes()) { - maxRow = Math.max(maxRow, n.getRow()); - maxCol = Math.max(maxCol, board.getCol(n)); - final Point2D.Double pos = getPosition(n); - plan.addPoint2D(pos); - // Log.println("n=" + n + " pos=" + pos); - } - for (ANode n : board.getNodes()) { - final AbstractEntityImage image = getImage(n); - final Point2D.Double pos = getPosition(n); - final int widthCell = (int) image.getDimension(StringBounderUtils.asStringBounder()) - .getWidth() + 20; - final int heightCell = (int) image.getDimension(StringBounderUtils.asStringBounder()) - .getHeight() + 20; - inflationTransform.addInflationX(pos.getX(), widthCell); - inflationTransform.addInflationY(pos.getY(), heightCell); - } - - // Log.println("inflationTransform=" + inflationTransform); - - } - - public Point2D.Double getPosition(ANode node) { - return new Point2D.Double(board.getCol(node) * spaceWidth, node.getRow() * spaceHeight); - } - - public Dimension2D getDimension() { - final double width = spaceWidth * maxCol; - final int height = spaceWidth * maxRow; - return new Dimension2DDouble(width + 2 * margin + inflationTransform.getTotalInflationX(), height + 2 * margin - + inflationTransform.getTotalInflationY()); - - } - - public void draw(final Graphics2D g2d) { - g2d.translate(margin, margin); - g2d.setColor(Color.BLUE); - - for (ALink link : getSortedLinks()) { - final Point2D start = getPosition(link.getNode1()); - final Point2D end = getPosition(link.getNode2()); - - final List lines = buildPath(start, end); - final Polyline2 polyline = buildPolyline(start, end, lines); - polyline.draw(g2d); - } - - for (ANode n : board.getNodes()) { - final AbstractEntityImage image = getImage(n); - Point2D pos = getPosition(n); - pos = inflationTransform.inflatePoint2D(pos); - final double x = pos.getX() - image.getDimension(StringBounderUtils.asStringBounder()).getWidth() / 2; - final double y = pos.getY() - image.getDimension(StringBounderUtils.asStringBounder()).getHeight() / 2; - g2d.translate(x, y); - image.draw(new ColorMapperIdentity(), g2d); - g2d.translate(-x, -y); - } - - } - - private Polyline2 buildPolyline(final Point2D start, final Point2D end, final List lines) { - final Polyline2 polyline = new Polyline2(inflationTransform.inflatePoint2D(start), inflationTransform - .inflatePoint2D(end)); - final List list = inflationTransform.inflate(lines); - for (Line2D.Double l1 : list) { - polyline.addLine(l1); - } - return polyline; - } - - private List buildPath(final Point2D start, final Point2D end) { - Point2D current = start; - final List interm = plan.getIntermediatePoints(start, end); - final List lines = new ArrayList(); - for (final Point2D.Double inter : interm) { - plan.addPoint2D(inter); - lines.add(new Line2D.Double(current, inter)); - plan.createLink(current, inter); - current = inter; - } - lines.add(new Line2D.Double(current, end)); - plan.createLink(current, end); - return lines; - } - - private List getSortedLinks() { - final Map lengths = new LinkedHashMap(); - for (ALink link : board.getLinks()) { - final Point2D.Double p1 = getPosition(link.getNode1()); - final Point2D.Double p2 = getPosition(link.getNode2()); - lengths.put(link, p1.distance(p2)); - } - final List all = new ArrayList(lengths.keySet()); - Collections.sort(all, new Comparator() { - public int compare(ALink l1, ALink l2) { - final double diff = lengths.get(l1) - lengths.get(l2); - return (int) Math.signum(diff); - } - }); - return all; - } - -} diff --git a/src/net/sourceforge/plantuml/graph/Heap.java b/src/net/sourceforge/plantuml/graph/Heap.java index 26d0b9ed5..e0f326155 100644 --- a/src/net/sourceforge/plantuml/graph/Heap.java +++ b/src/net/sourceforge/plantuml/graph/Heap.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.graph; diff --git a/src/net/sourceforge/plantuml/graph/KenavoCostComputer.java b/src/net/sourceforge/plantuml/graph/KenavoCostComputer.java index 42c6551c4..e7d14835b 100644 --- a/src/net/sourceforge/plantuml/graph/KenavoCostComputer.java +++ b/src/net/sourceforge/plantuml/graph/KenavoCostComputer.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.graph; diff --git a/src/net/sourceforge/plantuml/graph/LenghtLinkComparator.java b/src/net/sourceforge/plantuml/graph/LenghtLinkComparator.java index f74316aad..388ddeafe 100644 --- a/src/net/sourceforge/plantuml/graph/LenghtLinkComparator.java +++ b/src/net/sourceforge/plantuml/graph/LenghtLinkComparator.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.graph; diff --git a/src/net/sourceforge/plantuml/graph/LinkString.java b/src/net/sourceforge/plantuml/graph/LinkString.java index 7afd60f21..a31b89359 100644 --- a/src/net/sourceforge/plantuml/graph/LinkString.java +++ b/src/net/sourceforge/plantuml/graph/LinkString.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19880 $ * */ package net.sourceforge.plantuml.graph; diff --git a/src/net/sourceforge/plantuml/graph/MethodsOrFieldsArea.java b/src/net/sourceforge/plantuml/graph/MethodsOrFieldsArea.java index ddfa1d934..df818c59c 100644 --- a/src/net/sourceforge/plantuml/graph/MethodsOrFieldsArea.java +++ b/src/net/sourceforge/plantuml/graph/MethodsOrFieldsArea.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19885 $ * */ package net.sourceforge.plantuml.graph; diff --git a/src/net/sourceforge/plantuml/graph/Move.java b/src/net/sourceforge/plantuml/graph/Move.java index 29bb0b5cf..4a49288bd 100644 --- a/src/net/sourceforge/plantuml/graph/Move.java +++ b/src/net/sourceforge/plantuml/graph/Move.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.graph; diff --git a/src/net/sourceforge/plantuml/graph/Oven.java b/src/net/sourceforge/plantuml/graph/Oven.java index 00c1d4db8..e067343af 100644 --- a/src/net/sourceforge/plantuml/graph/Oven.java +++ b/src/net/sourceforge/plantuml/graph/Oven.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.graph; diff --git a/src/net/sourceforge/plantuml/graph/SimpleCostComputer.java b/src/net/sourceforge/plantuml/graph/SimpleCostComputer.java index ebd2e9c98..55dcd3a7c 100644 --- a/src/net/sourceforge/plantuml/graph/SimpleCostComputer.java +++ b/src/net/sourceforge/plantuml/graph/SimpleCostComputer.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.graph; diff --git a/src/net/sourceforge/plantuml/graph/SortedCollection.java b/src/net/sourceforge/plantuml/graph/SortedCollection.java index c338d01fc..93b45dfd5 100644 --- a/src/net/sourceforge/plantuml/graph/SortedCollection.java +++ b/src/net/sourceforge/plantuml/graph/SortedCollection.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.graph; diff --git a/src/net/sourceforge/plantuml/graph/SortedCollectionArrayList.java b/src/net/sourceforge/plantuml/graph/SortedCollectionArrayList.java index e2d78b980..1ef3839ab 100644 --- a/src/net/sourceforge/plantuml/graph/SortedCollectionArrayList.java +++ b/src/net/sourceforge/plantuml/graph/SortedCollectionArrayList.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.graph; diff --git a/src/net/sourceforge/plantuml/graph/SortedCollectionLinked.java b/src/net/sourceforge/plantuml/graph/SortedCollectionLinked.java index af2f87455..72866771a 100644 --- a/src/net/sourceforge/plantuml/graph/SortedCollectionLinked.java +++ b/src/net/sourceforge/plantuml/graph/SortedCollectionLinked.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.graph; diff --git a/src/net/sourceforge/plantuml/graph/Zoda1.java b/src/net/sourceforge/plantuml/graph/Zoda1.java index d85b8a955..bb4f74c08 100644 --- a/src/net/sourceforge/plantuml/graph/Zoda1.java +++ b/src/net/sourceforge/plantuml/graph/Zoda1.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.graph; diff --git a/src/net/sourceforge/plantuml/graph/Zoda2.java b/src/net/sourceforge/plantuml/graph/Zoda2.java index a55a32fd5..d88f52103 100644 --- a/src/net/sourceforge/plantuml/graph/Zoda2.java +++ b/src/net/sourceforge/plantuml/graph/Zoda2.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.graph; diff --git a/src/net/sourceforge/plantuml/graph2/CubicCurveFactory.java b/src/net/sourceforge/plantuml/graph2/CubicCurveFactory.java index 649ad63f4..691079aef 100644 --- a/src/net/sourceforge/plantuml/graph2/CubicCurveFactory.java +++ b/src/net/sourceforge/plantuml/graph2/CubicCurveFactory.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.graph2; diff --git a/src/net/sourceforge/plantuml/graph2/Dijkstra.java b/src/net/sourceforge/plantuml/graph2/Dijkstra.java index e39cda479..0f982ae16 100644 --- a/src/net/sourceforge/plantuml/graph2/Dijkstra.java +++ b/src/net/sourceforge/plantuml/graph2/Dijkstra.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.graph2; diff --git a/src/net/sourceforge/plantuml/graph2/GeomUtils.java b/src/net/sourceforge/plantuml/graph2/GeomUtils.java index b71e92600..9222d3aba 100644 --- a/src/net/sourceforge/plantuml/graph2/GeomUtils.java +++ b/src/net/sourceforge/plantuml/graph2/GeomUtils.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.graph2; diff --git a/src/net/sourceforge/plantuml/graph2/IInflationTransform.java b/src/net/sourceforge/plantuml/graph2/IInflationTransform.java index 9e7fc6053..14693a0ca 100644 --- a/src/net/sourceforge/plantuml/graph2/IInflationTransform.java +++ b/src/net/sourceforge/plantuml/graph2/IInflationTransform.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.graph2; diff --git a/src/net/sourceforge/plantuml/graph2/IdentityInflationTransform.java b/src/net/sourceforge/plantuml/graph2/IdentityInflationTransform.java index 6a6156d04..850031d53 100644 --- a/src/net/sourceforge/plantuml/graph2/IdentityInflationTransform.java +++ b/src/net/sourceforge/plantuml/graph2/IdentityInflationTransform.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.graph2; diff --git a/src/net/sourceforge/plantuml/graph2/InflateData2.java b/src/net/sourceforge/plantuml/graph2/InflateData2.java index 885363da0..e79cffa3e 100644 --- a/src/net/sourceforge/plantuml/graph2/InflateData2.java +++ b/src/net/sourceforge/plantuml/graph2/InflateData2.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.graph2; diff --git a/src/net/sourceforge/plantuml/graph2/InflationTransform2.java b/src/net/sourceforge/plantuml/graph2/InflationTransform2.java index 2ddd6c13f..84211f731 100644 --- a/src/net/sourceforge/plantuml/graph2/InflationTransform2.java +++ b/src/net/sourceforge/plantuml/graph2/InflationTransform2.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.graph2; diff --git a/src/net/sourceforge/plantuml/graph2/MagicPointsFactory.java b/src/net/sourceforge/plantuml/graph2/MagicPointsFactory.java index ce0765e61..2163aaad1 100644 --- a/src/net/sourceforge/plantuml/graph2/MagicPointsFactory.java +++ b/src/net/sourceforge/plantuml/graph2/MagicPointsFactory.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.graph2; diff --git a/src/net/sourceforge/plantuml/graph2/MagicPointsFactory2.java b/src/net/sourceforge/plantuml/graph2/MagicPointsFactory2.java index f82647c45..95f82ef83 100644 --- a/src/net/sourceforge/plantuml/graph2/MagicPointsFactory2.java +++ b/src/net/sourceforge/plantuml/graph2/MagicPointsFactory2.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.graph2; diff --git a/src/net/sourceforge/plantuml/graph2/Measurer.java b/src/net/sourceforge/plantuml/graph2/Measurer.java index de3398217..e5047a7b2 100644 --- a/src/net/sourceforge/plantuml/graph2/Measurer.java +++ b/src/net/sourceforge/plantuml/graph2/Measurer.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.graph2; diff --git a/src/net/sourceforge/plantuml/graph2/MyCurve.java b/src/net/sourceforge/plantuml/graph2/MyCurve.java index 822cf3a57..2691f2a53 100644 --- a/src/net/sourceforge/plantuml/graph2/MyCurve.java +++ b/src/net/sourceforge/plantuml/graph2/MyCurve.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.graph2; diff --git a/src/net/sourceforge/plantuml/graph2/Neighborhood2.java b/src/net/sourceforge/plantuml/graph2/Neighborhood2.java index 00d7146ec..31b06f08d 100644 --- a/src/net/sourceforge/plantuml/graph2/Neighborhood2.java +++ b/src/net/sourceforge/plantuml/graph2/Neighborhood2.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.graph2; diff --git a/src/net/sourceforge/plantuml/graph2/Plan.java b/src/net/sourceforge/plantuml/graph2/Plan.java index 684e95295..3e4dbfb72 100644 --- a/src/net/sourceforge/plantuml/graph2/Plan.java +++ b/src/net/sourceforge/plantuml/graph2/Plan.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.graph2; diff --git a/src/net/sourceforge/plantuml/graph2/Polyline2.java b/src/net/sourceforge/plantuml/graph2/Polyline2.java index 588354a03..60a057cc8 100644 --- a/src/net/sourceforge/plantuml/graph2/Polyline2.java +++ b/src/net/sourceforge/plantuml/graph2/Polyline2.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.graph2; diff --git a/src/net/sourceforge/plantuml/graph2/RectanglesCollection.java b/src/net/sourceforge/plantuml/graph2/RectanglesCollection.java index d0334ac26..819cd1fac 100644 --- a/src/net/sourceforge/plantuml/graph2/RectanglesCollection.java +++ b/src/net/sourceforge/plantuml/graph2/RectanglesCollection.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.graph2; diff --git a/src/net/sourceforge/plantuml/graph2/Singularity2.java b/src/net/sourceforge/plantuml/graph2/Singularity2.java index 642238ade..bef2b8929 100644 --- a/src/net/sourceforge/plantuml/graph2/Singularity2.java +++ b/src/net/sourceforge/plantuml/graph2/Singularity2.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.graph2; diff --git a/src/net/sourceforge/plantuml/graph2/SortedList.java b/src/net/sourceforge/plantuml/graph2/SortedList.java index 345c0abf2..91bf6dcb7 100644 --- a/src/net/sourceforge/plantuml/graph2/SortedList.java +++ b/src/net/sourceforge/plantuml/graph2/SortedList.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.graph2; diff --git a/src/net/sourceforge/plantuml/graph2/SortedListImpl.java b/src/net/sourceforge/plantuml/graph2/SortedListImpl.java index 8414c201a..25ac5d4ea 100644 --- a/src/net/sourceforge/plantuml/graph2/SortedListImpl.java +++ b/src/net/sourceforge/plantuml/graph2/SortedListImpl.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.graph2; diff --git a/src/net/sourceforge/plantuml/graphic/AbstractTextBlock.java b/src/net/sourceforge/plantuml/graphic/AbstractTextBlock.java index b56adabd8..19fc638a8 100644 --- a/src/net/sourceforge/plantuml/graphic/AbstractTextBlock.java +++ b/src/net/sourceforge/plantuml/graphic/AbstractTextBlock.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 16264 $ * */ package net.sourceforge.plantuml.graphic; diff --git a/src/net/sourceforge/plantuml/graphic/AddStyle.java b/src/net/sourceforge/plantuml/graphic/AddStyle.java index 7ccf35eef..aeb321a6d 100644 --- a/src/net/sourceforge/plantuml/graphic/AddStyle.java +++ b/src/net/sourceforge/plantuml/graphic/AddStyle.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.graphic; diff --git a/src/net/sourceforge/plantuml/graphic/CircledCharacter.java b/src/net/sourceforge/plantuml/graphic/CircledCharacter.java index 7719e1660..aa6152559 100644 --- a/src/net/sourceforge/plantuml/graphic/CircledCharacter.java +++ b/src/net/sourceforge/plantuml/graphic/CircledCharacter.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.graphic; diff --git a/src/net/sourceforge/plantuml/graphic/ColorAndSizeChange.java b/src/net/sourceforge/plantuml/graphic/ColorAndSizeChange.java index f46637f4d..e4a81c1ed 100644 --- a/src/net/sourceforge/plantuml/graphic/ColorAndSizeChange.java +++ b/src/net/sourceforge/plantuml/graphic/ColorAndSizeChange.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19880 $ * */ package net.sourceforge.plantuml.graphic; diff --git a/src/net/sourceforge/plantuml/graphic/ColorChange.java b/src/net/sourceforge/plantuml/graphic/ColorChange.java index cc1f720f5..17dbddecc 100644 --- a/src/net/sourceforge/plantuml/graphic/ColorChange.java +++ b/src/net/sourceforge/plantuml/graphic/ColorChange.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3834 $ * */ package net.sourceforge.plantuml.graphic; diff --git a/src/net/sourceforge/plantuml/graphic/DateEventUtils.java b/src/net/sourceforge/plantuml/graphic/DateEventUtils.java index bf715f518..6559661b2 100644 --- a/src/net/sourceforge/plantuml/graphic/DateEventUtils.java +++ b/src/net/sourceforge/plantuml/graphic/DateEventUtils.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 10930 $ * */ package net.sourceforge.plantuml.graphic; @@ -103,9 +100,9 @@ public class DateEventUtils { final String name = portrait.getName(); final String quote = portrait.getQuote(); final String age = "" + portrait.getAge() + " years old"; - final UFont font = new UFont("SansSerif", Font.BOLD, 12); + final UFont font12 = new UFont("SansSerif", Font.BOLD, 12); TextBlock comment = Display.create(name, age, quote).create( - new FontConfiguration(font, color, HtmlColorUtils.BLUE, true), HorizontalAlignment.LEFT, + new FontConfiguration(font12, color, HtmlColorUtils.BLUE, true), HorizontalAlignment.LEFT, new SpriteContainerEmpty()); comment = TextBlockUtils.withMinWidth(TextBlockUtils.withMargin(comment, 4, 4), 800, HorizontalAlignment.LEFT); @@ -129,7 +126,26 @@ public class DateEventUtils { }; final TextBlock bottom = TextBlockUtils.mergeTB(bottom0, TextBlockUtils.mergeLR(bottom1, comment, VerticalAlignment.CENTER), HorizontalAlignment.LEFT); - return TextBlockUtils.mergeTB(textBlock, bottom, HorizontalAlignment.LEFT); + final TextBlock mergeTB = TextBlockUtils.mergeTB(textBlock, bottom, HorizontalAlignment.LEFT); + + final String arabic1 = "\u0625\u0646 \u0627\u0644\u0625\u0631\u0647\u0627\u0628\u064A\u064A\u0646 \u0628\u0627\u0633\u0645 \u0627\u0644\u0625\u0633\u0644\u0627\u0645 \u0644\u064A\u0633\u0648\u0627 \u0645\u0633\u0644\u0645\u064A\u0646\u060C \u0648\u0644\u0627 \u064A\u0631\u0628\u0637\u0647\u0645 \u0628\u0627\u0644\u0625\u0633\u0644\u0627\u0645 \u0625\u0644\u0627 \u0627\u0644\u062F\u0648\u0627\u0641\u0639 \u0627\u0644\u062A\u064A \u064A\u0631\u0643\u0628\u0648\u0646 \u0639\u0644\u064A\u0647\u0627 \u0644\u062A\u0628\u0631\u064A\u0631 \u062C\u0631\u0627\u0626\u0645\u0647\u0645 \u0648\u062D\u0645\u0627\u0642\u0627\u062A\u0647\u0645."; + final String arabic2 = "\u0641\u0647\u0645 \u0642\u0648\u0645 \u0636\u0627\u0644\u0648\u0646\u060C \u0645\u0635\u064A\u0631\u0647\u0645 \u062C\u0647\u0646\u0645 \u062E\u0627\u0644\u062F\u064A\u0646 \u0641\u064A\u0647\u0627 \u0623\u0628\u062F\u0627."; + final String english1 = "Those who engage in terrorism, in the name of Islam, are not Muslims."; + final String english2 = "Their only link to Islam is the pretexts they use to justify their crimes and their folly."; + final String english3 = "They have strayed from the right path, and their fate is to dwell forever in hell."; + final TextBlock arabic = Display + .create(" ", + arabic1, + arabic2, + "\u0635\u0627\u062D\u0628 \u0627\u0644\u062C\u0644\u0627\u0644\u0629 \u0627\u0644\u0645\u0644\u0643 \u0645\u062D\u0645\u062F \u0627\u0644\u0633\u0627\u062F\u0633 \u0623\u0645\u064A\u0631 \u0627\u0644\u0645\u0624\u0645\u0646\u064A\u0646 \u0646\u0635\u0631\u0647 \u0627\u0644\u0644\u0647") + .create(new FontConfiguration(font12, color, HtmlColorUtils.BLUE, true), HorizontalAlignment.RIGHT, + new SpriteContainerEmpty()); + final TextBlock english = Display.create(english1, english2, english3, + "-- His Majesty the King Mohammed the Sixth, Commander of the Faithful").create( + new FontConfiguration(font12, color, HtmlColorUtils.BLUE, true), HorizontalAlignment.LEFT, + new SpriteContainerEmpty()); + return TextBlockUtils.mergeTB(mergeTB, TextBlockUtils.mergeTB(arabic, english, HorizontalAlignment.LEFT), + HorizontalAlignment.LEFT); } private static TextBlock addCharlie(TextBlock textBlock) { diff --git a/src/net/sourceforge/plantuml/graphic/DisplayUtils.java b/src/net/sourceforge/plantuml/graphic/DisplayUtils.java index cfea2a23d..d9319ffbc 100644 --- a/src/net/sourceforge/plantuml/graphic/DisplayUtils.java +++ b/src/net/sourceforge/plantuml/graphic/DisplayUtils.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 10307 $ * */ package net.sourceforge.plantuml.graphic; diff --git a/src/net/sourceforge/plantuml/graphic/EmbededSystemLine.java b/src/net/sourceforge/plantuml/graphic/EmbededSystemLine.java index 067221de5..b32634520 100644 --- a/src/net/sourceforge/plantuml/graphic/EmbededSystemLine.java +++ b/src/net/sourceforge/plantuml/graphic/EmbededSystemLine.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6009 $ * */ package net.sourceforge.plantuml.graphic; diff --git a/src/net/sourceforge/plantuml/graphic/ExposantChange.java b/src/net/sourceforge/plantuml/graphic/ExposantChange.java index 9c9dee9d1..d90d42978 100644 --- a/src/net/sourceforge/plantuml/graphic/ExposantChange.java +++ b/src/net/sourceforge/plantuml/graphic/ExposantChange.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3834 $ * */ package net.sourceforge.plantuml.graphic; diff --git a/src/net/sourceforge/plantuml/graphic/FontChange.java b/src/net/sourceforge/plantuml/graphic/FontChange.java index 72e56e305..3fbce5bc5 100644 --- a/src/net/sourceforge/plantuml/graphic/FontChange.java +++ b/src/net/sourceforge/plantuml/graphic/FontChange.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.graphic; diff --git a/src/net/sourceforge/plantuml/graphic/FontConfiguration.java b/src/net/sourceforge/plantuml/graphic/FontConfiguration.java index c6b2b07be..7519c1d86 100644 --- a/src/net/sourceforge/plantuml/graphic/FontConfiguration.java +++ b/src/net/sourceforge/plantuml/graphic/FontConfiguration.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.graphic; diff --git a/src/net/sourceforge/plantuml/graphic/FontFamilyChange.java b/src/net/sourceforge/plantuml/graphic/FontFamilyChange.java index 9ed80fff4..47acfd945 100644 --- a/src/net/sourceforge/plantuml/graphic/FontFamilyChange.java +++ b/src/net/sourceforge/plantuml/graphic/FontFamilyChange.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3834 $ * */ package net.sourceforge.plantuml.graphic; diff --git a/src/net/sourceforge/plantuml/graphic/FontPosition.java b/src/net/sourceforge/plantuml/graphic/FontPosition.java index 944938537..28ef070de 100644 --- a/src/net/sourceforge/plantuml/graphic/FontPosition.java +++ b/src/net/sourceforge/plantuml/graphic/FontPosition.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 7951 $ * */ package net.sourceforge.plantuml.graphic; diff --git a/src/net/sourceforge/plantuml/graphic/FontStyle.java b/src/net/sourceforge/plantuml/graphic/FontStyle.java index f2db7e306..5923e25ec 100644 --- a/src/net/sourceforge/plantuml/graphic/FontStyle.java +++ b/src/net/sourceforge/plantuml/graphic/FontStyle.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19880 $ * */ package net.sourceforge.plantuml.graphic; diff --git a/src/net/sourceforge/plantuml/graphic/GraphicPosition.java b/src/net/sourceforge/plantuml/graphic/GraphicPosition.java index b43455a71..897a9afce 100644 --- a/src/net/sourceforge/plantuml/graphic/GraphicPosition.java +++ b/src/net/sourceforge/plantuml/graphic/GraphicPosition.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5138 $ * */ package net.sourceforge.plantuml.graphic; diff --git a/src/net/sourceforge/plantuml/graphic/GraphicStrings.java b/src/net/sourceforge/plantuml/graphic/GraphicStrings.java index b72e7b7b2..a1bd563e0 100644 --- a/src/net/sourceforge/plantuml/graphic/GraphicStrings.java +++ b/src/net/sourceforge/plantuml/graphic/GraphicStrings.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.graphic; diff --git a/src/net/sourceforge/plantuml/graphic/HorizontalAlignment.java b/src/net/sourceforge/plantuml/graphic/HorizontalAlignment.java index 617995e65..dd42ab78a 100644 --- a/src/net/sourceforge/plantuml/graphic/HorizontalAlignment.java +++ b/src/net/sourceforge/plantuml/graphic/HorizontalAlignment.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.graphic; diff --git a/src/net/sourceforge/plantuml/graphic/HtmlColor.java b/src/net/sourceforge/plantuml/graphic/HtmlColor.java index dce208d1c..2f1fdbbdf 100644 --- a/src/net/sourceforge/plantuml/graphic/HtmlColor.java +++ b/src/net/sourceforge/plantuml/graphic/HtmlColor.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.graphic; diff --git a/src/net/sourceforge/plantuml/graphic/HtmlColorAndStyle.java b/src/net/sourceforge/plantuml/graphic/HtmlColorAndStyle.java index 8eaa53634..d15b3bc62 100644 --- a/src/net/sourceforge/plantuml/graphic/HtmlColorAndStyle.java +++ b/src/net/sourceforge/plantuml/graphic/HtmlColorAndStyle.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.graphic; diff --git a/src/net/sourceforge/plantuml/graphic/HtmlColorGradient.java b/src/net/sourceforge/plantuml/graphic/HtmlColorGradient.java index 57812372d..1b42640e5 100644 --- a/src/net/sourceforge/plantuml/graphic/HtmlColorGradient.java +++ b/src/net/sourceforge/plantuml/graphic/HtmlColorGradient.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * diff --git a/src/net/sourceforge/plantuml/graphic/HtmlColorSet.java b/src/net/sourceforge/plantuml/graphic/HtmlColorSet.java index 538872f9d..1bc9f34af 100644 --- a/src/net/sourceforge/plantuml/graphic/HtmlColorSet.java +++ b/src/net/sourceforge/plantuml/graphic/HtmlColorSet.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 7946 $ * */ package net.sourceforge.plantuml.graphic; diff --git a/src/net/sourceforge/plantuml/graphic/HtmlColorSetSimple.java b/src/net/sourceforge/plantuml/graphic/HtmlColorSetSimple.java index 0b6a09f71..97ee0fd17 100644 --- a/src/net/sourceforge/plantuml/graphic/HtmlColorSetSimple.java +++ b/src/net/sourceforge/plantuml/graphic/HtmlColorSetSimple.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 7946 $ * */ package net.sourceforge.plantuml.graphic; diff --git a/src/net/sourceforge/plantuml/graphic/HtmlColorSimple.java b/src/net/sourceforge/plantuml/graphic/HtmlColorSimple.java index acd447613..66abdbe15 100644 --- a/src/net/sourceforge/plantuml/graphic/HtmlColorSimple.java +++ b/src/net/sourceforge/plantuml/graphic/HtmlColorSimple.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 7946 $ * */ package net.sourceforge.plantuml.graphic; diff --git a/src/net/sourceforge/plantuml/graphic/HtmlColorTransparent.java b/src/net/sourceforge/plantuml/graphic/HtmlColorTransparent.java index 274dbd3fd..10ea384a6 100644 --- a/src/net/sourceforge/plantuml/graphic/HtmlColorTransparent.java +++ b/src/net/sourceforge/plantuml/graphic/HtmlColorTransparent.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * diff --git a/src/net/sourceforge/plantuml/graphic/HtmlColorUserDef.java b/src/net/sourceforge/plantuml/graphic/HtmlColorUserDef.java index 48ce0d7da..3bc245aed 100644 --- a/src/net/sourceforge/plantuml/graphic/HtmlColorUserDef.java +++ b/src/net/sourceforge/plantuml/graphic/HtmlColorUserDef.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 7946 $ * */ package net.sourceforge.plantuml.graphic; diff --git a/src/net/sourceforge/plantuml/graphic/HtmlColorUtils.java b/src/net/sourceforge/plantuml/graphic/HtmlColorUtils.java index ea09ae875..39466c641 100644 --- a/src/net/sourceforge/plantuml/graphic/HtmlColorUtils.java +++ b/src/net/sourceforge/plantuml/graphic/HtmlColorUtils.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 7946 $ * */ package net.sourceforge.plantuml.graphic; diff --git a/src/net/sourceforge/plantuml/graphic/HtmlCommand.java b/src/net/sourceforge/plantuml/graphic/HtmlCommand.java index 840f51bc3..19bff13a3 100644 --- a/src/net/sourceforge/plantuml/graphic/HtmlCommand.java +++ b/src/net/sourceforge/plantuml/graphic/HtmlCommand.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.graphic; diff --git a/src/net/sourceforge/plantuml/graphic/HtmlCommandFactory.java b/src/net/sourceforge/plantuml/graphic/HtmlCommandFactory.java index cf1b0f7c1..bb2bdf9dd 100644 --- a/src/net/sourceforge/plantuml/graphic/HtmlCommandFactory.java +++ b/src/net/sourceforge/plantuml/graphic/HtmlCommandFactory.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19878 $ * */ package net.sourceforge.plantuml.graphic; diff --git a/src/net/sourceforge/plantuml/graphic/IHtmlColorSet.java b/src/net/sourceforge/plantuml/graphic/IHtmlColorSet.java index 2ad6ea2f1..23a2575c5 100644 --- a/src/net/sourceforge/plantuml/graphic/IHtmlColorSet.java +++ b/src/net/sourceforge/plantuml/graphic/IHtmlColorSet.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 7946 $ * */ package net.sourceforge.plantuml.graphic; diff --git a/src/net/sourceforge/plantuml/graphic/Img.java b/src/net/sourceforge/plantuml/graphic/Img.java index 0c74c72b8..ac40ef7f5 100644 --- a/src/net/sourceforge/plantuml/graphic/Img.java +++ b/src/net/sourceforge/plantuml/graphic/Img.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19880 $ * */ package net.sourceforge.plantuml.graphic; diff --git a/src/net/sourceforge/plantuml/graphic/ImgValign.java b/src/net/sourceforge/plantuml/graphic/ImgValign.java index 1d3ba30d5..597f19164 100644 --- a/src/net/sourceforge/plantuml/graphic/ImgValign.java +++ b/src/net/sourceforge/plantuml/graphic/ImgValign.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.graphic; diff --git a/src/net/sourceforge/plantuml/graphic/Line.java b/src/net/sourceforge/plantuml/graphic/Line.java index 693ce7177..91a95ac27 100644 --- a/src/net/sourceforge/plantuml/graphic/Line.java +++ b/src/net/sourceforge/plantuml/graphic/Line.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.graphic; diff --git a/src/net/sourceforge/plantuml/graphic/QuoteUtils.java b/src/net/sourceforge/plantuml/graphic/QuoteUtils.java index 36b293730..e43f6ac03 100644 --- a/src/net/sourceforge/plantuml/graphic/QuoteUtils.java +++ b/src/net/sourceforge/plantuml/graphic/QuoteUtils.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 10930 $ * */ package net.sourceforge.plantuml.graphic; @@ -183,7 +180,14 @@ public class QuoteUtils { "You know that thing you just did? Don't do that", // "It took me a long time to understand that if you want to do this job well you have to stay detached.", // "Do you like your morning tea weak or strong ?", // - "Winter is coming" // + "Winter is coming", // + "What fools these mortals be!", // + "Something wicked this way comes.", // + "I think I get it, what was it? Poker Night? Bachelor Party?", // + "It's alright to be scared. Remember, there is no courage without fear.", // + "Through readiness and discipline we are masters of our fate.", // + "With great power comes great responsibility", // + "If a machine can learn the value of human life, maybe we can too ?" // ); private QuoteUtils() { diff --git a/src/net/sourceforge/plantuml/graphic/Rainbow.java b/src/net/sourceforge/plantuml/graphic/Rainbow.java index 3900e2c42..b1691c867 100644 --- a/src/net/sourceforge/plantuml/graphic/Rainbow.java +++ b/src/net/sourceforge/plantuml/graphic/Rainbow.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.graphic; diff --git a/src/net/sourceforge/plantuml/graphic/RemoveStyle.java b/src/net/sourceforge/plantuml/graphic/RemoveStyle.java index 5901bbb5c..0f4ccd48a 100644 --- a/src/net/sourceforge/plantuml/graphic/RemoveStyle.java +++ b/src/net/sourceforge/plantuml/graphic/RemoveStyle.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.graphic; diff --git a/src/net/sourceforge/plantuml/graphic/ResetFont.java b/src/net/sourceforge/plantuml/graphic/ResetFont.java index 521ad32c3..e360e7795 100644 --- a/src/net/sourceforge/plantuml/graphic/ResetFont.java +++ b/src/net/sourceforge/plantuml/graphic/ResetFont.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.graphic; diff --git a/src/net/sourceforge/plantuml/graphic/SingleLine.java b/src/net/sourceforge/plantuml/graphic/SingleLine.java index 244c6026c..e368e1246 100644 --- a/src/net/sourceforge/plantuml/graphic/SingleLine.java +++ b/src/net/sourceforge/plantuml/graphic/SingleLine.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19273 $ * */ package net.sourceforge.plantuml.graphic; diff --git a/src/net/sourceforge/plantuml/graphic/SizeChange.java b/src/net/sourceforge/plantuml/graphic/SizeChange.java index 1c530b035..6e8f597ba 100644 --- a/src/net/sourceforge/plantuml/graphic/SizeChange.java +++ b/src/net/sourceforge/plantuml/graphic/SizeChange.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3834 $ * */ package net.sourceforge.plantuml.graphic; diff --git a/src/net/sourceforge/plantuml/graphic/SkinParameter.java b/src/net/sourceforge/plantuml/graphic/SkinParameter.java index 9bf0bb10d..3a0eddc8a 100644 --- a/src/net/sourceforge/plantuml/graphic/SkinParameter.java +++ b/src/net/sourceforge/plantuml/graphic/SkinParameter.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8066 $ * */ package net.sourceforge.plantuml.graphic; diff --git a/src/net/sourceforge/plantuml/graphic/Splitter.java b/src/net/sourceforge/plantuml/graphic/Splitter.java index 51eb43546..dff66d8cd 100644 --- a/src/net/sourceforge/plantuml/graphic/Splitter.java +++ b/src/net/sourceforge/plantuml/graphic/Splitter.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19880 $ * */ package net.sourceforge.plantuml.graphic; diff --git a/src/net/sourceforge/plantuml/graphic/SpriteCommand.java b/src/net/sourceforge/plantuml/graphic/SpriteCommand.java index a052bb860..8fe419cb5 100644 --- a/src/net/sourceforge/plantuml/graphic/SpriteCommand.java +++ b/src/net/sourceforge/plantuml/graphic/SpriteCommand.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5705 $ * */ package net.sourceforge.plantuml.graphic; diff --git a/src/net/sourceforge/plantuml/graphic/StringBounder.java b/src/net/sourceforge/plantuml/graphic/StringBounder.java index fa7251bcb..ef5d6c56e 100644 --- a/src/net/sourceforge/plantuml/graphic/StringBounder.java +++ b/src/net/sourceforge/plantuml/graphic/StringBounder.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.graphic; diff --git a/src/net/sourceforge/plantuml/graphic/SvgAttributes.java b/src/net/sourceforge/plantuml/graphic/SvgAttributes.java index 9bdedddb7..a0675ad54 100644 --- a/src/net/sourceforge/plantuml/graphic/SvgAttributes.java +++ b/src/net/sourceforge/plantuml/graphic/SvgAttributes.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8096 $ * */ package net.sourceforge.plantuml.graphic; diff --git a/src/net/sourceforge/plantuml/graphic/SvgAttributesChange.java b/src/net/sourceforge/plantuml/graphic/SvgAttributesChange.java index 3112f751b..37e200f52 100644 --- a/src/net/sourceforge/plantuml/graphic/SvgAttributesChange.java +++ b/src/net/sourceforge/plantuml/graphic/SvgAttributesChange.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3834 $ * */ package net.sourceforge.plantuml.graphic; diff --git a/src/net/sourceforge/plantuml/graphic/SymbolContext.java b/src/net/sourceforge/plantuml/graphic/SymbolContext.java index d9947f28e..9d20deefe 100644 --- a/src/net/sourceforge/plantuml/graphic/SymbolContext.java +++ b/src/net/sourceforge/plantuml/graphic/SymbolContext.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8066 $ * */ package net.sourceforge.plantuml.graphic; diff --git a/src/net/sourceforge/plantuml/graphic/Text.java b/src/net/sourceforge/plantuml/graphic/Text.java index af16e66a8..940c080a1 100644 --- a/src/net/sourceforge/plantuml/graphic/Text.java +++ b/src/net/sourceforge/plantuml/graphic/Text.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.graphic; diff --git a/src/net/sourceforge/plantuml/graphic/TextBlock.java b/src/net/sourceforge/plantuml/graphic/TextBlock.java index f8df1f31b..87bc38e1e 100644 --- a/src/net/sourceforge/plantuml/graphic/TextBlock.java +++ b/src/net/sourceforge/plantuml/graphic/TextBlock.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.graphic; diff --git a/src/net/sourceforge/plantuml/graphic/TextBlockArrow.java b/src/net/sourceforge/plantuml/graphic/TextBlockArrow.java index 157fc8103..d5edf1daf 100644 --- a/src/net/sourceforge/plantuml/graphic/TextBlockArrow.java +++ b/src/net/sourceforge/plantuml/graphic/TextBlockArrow.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 7163 $ * */ package net.sourceforge.plantuml.graphic; diff --git a/src/net/sourceforge/plantuml/graphic/TextBlockBordered.java b/src/net/sourceforge/plantuml/graphic/TextBlockBordered.java index 1ac110e16..8ba35fc39 100644 --- a/src/net/sourceforge/plantuml/graphic/TextBlockBordered.java +++ b/src/net/sourceforge/plantuml/graphic/TextBlockBordered.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6577 $ * */ package net.sourceforge.plantuml.graphic; diff --git a/src/net/sourceforge/plantuml/graphic/TextBlockCompressed.java b/src/net/sourceforge/plantuml/graphic/TextBlockCompressed.java index 00a971958..92618d07e 100644 --- a/src/net/sourceforge/plantuml/graphic/TextBlockCompressed.java +++ b/src/net/sourceforge/plantuml/graphic/TextBlockCompressed.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 10266 $ * */ package net.sourceforge.plantuml.graphic; diff --git a/src/net/sourceforge/plantuml/graphic/TextBlockCompressed2.java b/src/net/sourceforge/plantuml/graphic/TextBlockCompressed2.java index 0d1c03d7d..2fb1f3990 100644 --- a/src/net/sourceforge/plantuml/graphic/TextBlockCompressed2.java +++ b/src/net/sourceforge/plantuml/graphic/TextBlockCompressed2.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 10266 $ * */ package net.sourceforge.plantuml.graphic; diff --git a/src/net/sourceforge/plantuml/graphic/TextBlockEmpty.java b/src/net/sourceforge/plantuml/graphic/TextBlockEmpty.java index 41c914625..de71a9bb5 100644 --- a/src/net/sourceforge/plantuml/graphic/TextBlockEmpty.java +++ b/src/net/sourceforge/plantuml/graphic/TextBlockEmpty.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4125 $ * */ package net.sourceforge.plantuml.graphic; diff --git a/src/net/sourceforge/plantuml/graphic/TextBlockGeneric.java b/src/net/sourceforge/plantuml/graphic/TextBlockGeneric.java index 7cf0ae344..5a4118b25 100644 --- a/src/net/sourceforge/plantuml/graphic/TextBlockGeneric.java +++ b/src/net/sourceforge/plantuml/graphic/TextBlockGeneric.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6577 $ * */ package net.sourceforge.plantuml.graphic; diff --git a/src/net/sourceforge/plantuml/graphic/TextBlockHorizontal.java b/src/net/sourceforge/plantuml/graphic/TextBlockHorizontal.java index 797ecf454..49c59525d 100644 --- a/src/net/sourceforge/plantuml/graphic/TextBlockHorizontal.java +++ b/src/net/sourceforge/plantuml/graphic/TextBlockHorizontal.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6577 $ * */ package net.sourceforge.plantuml.graphic; diff --git a/src/net/sourceforge/plantuml/graphic/TextBlockLineBefore.java b/src/net/sourceforge/plantuml/graphic/TextBlockLineBefore.java index dfe34bee5..f3724962d 100644 --- a/src/net/sourceforge/plantuml/graphic/TextBlockLineBefore.java +++ b/src/net/sourceforge/plantuml/graphic/TextBlockLineBefore.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6577 $ * */ package net.sourceforge.plantuml.graphic; diff --git a/src/net/sourceforge/plantuml/graphic/TextBlockMarged.java b/src/net/sourceforge/plantuml/graphic/TextBlockMarged.java index 03863ab83..6d01f4187 100644 --- a/src/net/sourceforge/plantuml/graphic/TextBlockMarged.java +++ b/src/net/sourceforge/plantuml/graphic/TextBlockMarged.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6577 $ * */ package net.sourceforge.plantuml.graphic; diff --git a/src/net/sourceforge/plantuml/graphic/TextBlockMinWidth.java b/src/net/sourceforge/plantuml/graphic/TextBlockMinWidth.java index cb920ef1e..04b7212fd 100644 --- a/src/net/sourceforge/plantuml/graphic/TextBlockMinWidth.java +++ b/src/net/sourceforge/plantuml/graphic/TextBlockMinWidth.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6577 $ * */ package net.sourceforge.plantuml.graphic; diff --git a/src/net/sourceforge/plantuml/graphic/TextBlockRecentred.java b/src/net/sourceforge/plantuml/graphic/TextBlockRecentred.java index 90a6077b8..71bcd92f1 100644 --- a/src/net/sourceforge/plantuml/graphic/TextBlockRecentred.java +++ b/src/net/sourceforge/plantuml/graphic/TextBlockRecentred.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 10266 $ * */ package net.sourceforge.plantuml.graphic; @@ -49,12 +46,12 @@ public class TextBlockRecentred extends AbstractTextBlock implements TextBlockBa } public void drawU(final UGraphic ug) { - final MinMax minMax = TextBlockUtils.getMinMax(textBlock); + final MinMax minMax = TextBlockUtils.getMinMax(textBlock, ug.getStringBounder()); textBlock.drawU(ug.apply(new UTranslate(-minMax.getMinX(), -minMax.getMinY()))); } public Dimension2D calculateDimension(StringBounder stringBounder) { - final MinMax minMax = TextBlockUtils.getMinMax(textBlock); + final MinMax minMax = TextBlockUtils.getMinMax(textBlock, stringBounder); return minMax.getDimension(); } diff --git a/src/net/sourceforge/plantuml/graphic/TextBlockSimple.java b/src/net/sourceforge/plantuml/graphic/TextBlockSimple.java index bb9171277..cd42cf56e 100644 --- a/src/net/sourceforge/plantuml/graphic/TextBlockSimple.java +++ b/src/net/sourceforge/plantuml/graphic/TextBlockSimple.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19999 $ * */ package net.sourceforge.plantuml.graphic; diff --git a/src/net/sourceforge/plantuml/graphic/TextBlockSprited.java b/src/net/sourceforge/plantuml/graphic/TextBlockSprited.java index d2eda559b..51e0c8eb1 100644 --- a/src/net/sourceforge/plantuml/graphic/TextBlockSprited.java +++ b/src/net/sourceforge/plantuml/graphic/TextBlockSprited.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.graphic; diff --git a/src/net/sourceforge/plantuml/graphic/TextBlockUtils.java b/src/net/sourceforge/plantuml/graphic/TextBlockUtils.java index 4b3ac70d8..bec91e393 100644 --- a/src/net/sourceforge/plantuml/graphic/TextBlockUtils.java +++ b/src/net/sourceforge/plantuml/graphic/TextBlockUtils.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19267 $ * */ package net.sourceforge.plantuml.graphic; @@ -96,15 +93,15 @@ public class TextBlockUtils { } private static final Graphics2D gg; - private static final StringBounder dummyStringBounder; +// private static final StringBounder dummyStringBounder; static { final BufferedImage imDummy = new BufferedImage(10, 10, BufferedImage.TYPE_INT_RGB); gg = imDummy.createGraphics(); - dummyStringBounder = StringBounderUtils.asStringBounder(); +// dummyStringBounder = StringBounderUtils.asStringBounder(); } - public static boolean isEmpty(TextBlock text) { + public static boolean isEmpty(TextBlock text, StringBounder dummyStringBounder) { if (text == null) { return true; } @@ -112,21 +109,21 @@ public class TextBlockUtils { return dim.getHeight() == 0 && dim.getWidth() == 0; } - public static StringBounder getDummyStringBounder() { - return dummyStringBounder; - } +// public static StringBounder getDummyStringBounder() { +// return dummyStringBounder; +// } public static FontRenderContext getFontRenderContext() { return gg.getFontRenderContext(); } - public static MinMax getMinMax(TextBlock tb) { - return getMinMax(tb, dummyStringBounder); - } +// public static MinMax getMinMax(TextBlock tb) { +// return getMinMax(tb, dummyStringBounder); +// } - public static Dimension2D getDimension(TextBlock tb) { - return tb.calculateDimension(dummyStringBounder); - } +// public static Dimension2D getDimension(TextBlock tb) { +// return tb.calculateDimension(dummyStringBounder); +// } public static LineMetrics getLineMetrics(UFont font, String text) { return font.getLineMetrics(gg, text); diff --git a/src/net/sourceforge/plantuml/graphic/TextBlockVertical2.java b/src/net/sourceforge/plantuml/graphic/TextBlockVertical2.java index 052efa1aa..fface4acd 100644 --- a/src/net/sourceforge/plantuml/graphic/TextBlockVertical2.java +++ b/src/net/sourceforge/plantuml/graphic/TextBlockVertical2.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6577 $ * */ package net.sourceforge.plantuml.graphic; diff --git a/src/net/sourceforge/plantuml/graphic/TextBlockWidth.java b/src/net/sourceforge/plantuml/graphic/TextBlockWidth.java index 86eaedb65..3073ee78d 100644 --- a/src/net/sourceforge/plantuml/graphic/TextBlockWidth.java +++ b/src/net/sourceforge/plantuml/graphic/TextBlockWidth.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 7163 $ * */ package net.sourceforge.plantuml.graphic; diff --git a/src/net/sourceforge/plantuml/graphic/TextBlockWidthAdapter.java b/src/net/sourceforge/plantuml/graphic/TextBlockWidthAdapter.java index 9db03cdd8..4a86e2261 100644 --- a/src/net/sourceforge/plantuml/graphic/TextBlockWidthAdapter.java +++ b/src/net/sourceforge/plantuml/graphic/TextBlockWidthAdapter.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 7163 $ * */ package net.sourceforge.plantuml.graphic; diff --git a/src/net/sourceforge/plantuml/graphic/TextLink.java b/src/net/sourceforge/plantuml/graphic/TextLink.java index 4bfb6cb45..f08561377 100644 --- a/src/net/sourceforge/plantuml/graphic/TextLink.java +++ b/src/net/sourceforge/plantuml/graphic/TextLink.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 7715 $ * */ package net.sourceforge.plantuml.graphic; diff --git a/src/net/sourceforge/plantuml/graphic/TileImage.java b/src/net/sourceforge/plantuml/graphic/TileImage.java index 0cc8fa3eb..a805ca9fb 100644 --- a/src/net/sourceforge/plantuml/graphic/TileImage.java +++ b/src/net/sourceforge/plantuml/graphic/TileImage.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.graphic; diff --git a/src/net/sourceforge/plantuml/graphic/TileImageSvg.java b/src/net/sourceforge/plantuml/graphic/TileImageSvg.java index 4964d736c..09b90e3ad 100644 --- a/src/net/sourceforge/plantuml/graphic/TileImageSvg.java +++ b/src/net/sourceforge/plantuml/graphic/TileImageSvg.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 10269 $ * */ package net.sourceforge.plantuml.graphic; diff --git a/src/net/sourceforge/plantuml/graphic/TileText.java b/src/net/sourceforge/plantuml/graphic/TileText.java index 5eac9e31b..8e47f9307 100644 --- a/src/net/sourceforge/plantuml/graphic/TileText.java +++ b/src/net/sourceforge/plantuml/graphic/TileText.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.graphic; diff --git a/src/net/sourceforge/plantuml/graphic/UDrawable.java b/src/net/sourceforge/plantuml/graphic/UDrawable.java index 315418fcd..56c128b6c 100644 --- a/src/net/sourceforge/plantuml/graphic/UDrawable.java +++ b/src/net/sourceforge/plantuml/graphic/UDrawable.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6577 $ * */ package net.sourceforge.plantuml.graphic; diff --git a/src/net/sourceforge/plantuml/graphic/UDrawableUtils.java b/src/net/sourceforge/plantuml/graphic/UDrawableUtils.java index 3ce77711b..ba547a1f2 100644 --- a/src/net/sourceforge/plantuml/graphic/UDrawableUtils.java +++ b/src/net/sourceforge/plantuml/graphic/UDrawableUtils.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6577 $ * */ package net.sourceforge.plantuml.graphic; diff --git a/src/net/sourceforge/plantuml/graphic/UGraphicDelegator.java b/src/net/sourceforge/plantuml/graphic/UGraphicDelegator.java index 9a06a914f..61c90f607 100644 --- a/src/net/sourceforge/plantuml/graphic/UGraphicDelegator.java +++ b/src/net/sourceforge/plantuml/graphic/UGraphicDelegator.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 10266 $ * */ package net.sourceforge.plantuml.graphic; diff --git a/src/net/sourceforge/plantuml/graphic/UGraphicInterceptorUDrawable.java b/src/net/sourceforge/plantuml/graphic/UGraphicInterceptorUDrawable.java index 700592521..02728edc1 100644 --- a/src/net/sourceforge/plantuml/graphic/UGraphicInterceptorUDrawable.java +++ b/src/net/sourceforge/plantuml/graphic/UGraphicInterceptorUDrawable.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 10266 $ * */ package net.sourceforge.plantuml.graphic; diff --git a/src/net/sourceforge/plantuml/graphic/USymbol.java b/src/net/sourceforge/plantuml/graphic/USymbol.java index 333b1fa9e..70f206fbf 100644 --- a/src/net/sourceforge/plantuml/graphic/USymbol.java +++ b/src/net/sourceforge/plantuml/graphic/USymbol.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8066 $ * */ package net.sourceforge.plantuml.graphic; diff --git a/src/net/sourceforge/plantuml/graphic/USymbolActor.java b/src/net/sourceforge/plantuml/graphic/USymbolActor.java index 51df94015..a93e3d864 100644 --- a/src/net/sourceforge/plantuml/graphic/USymbolActor.java +++ b/src/net/sourceforge/plantuml/graphic/USymbolActor.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8066 $ * */ package net.sourceforge.plantuml.graphic; diff --git a/src/net/sourceforge/plantuml/graphic/USymbolArtifact.java b/src/net/sourceforge/plantuml/graphic/USymbolArtifact.java index 57e3db764..12f7126c6 100644 --- a/src/net/sourceforge/plantuml/graphic/USymbolArtifact.java +++ b/src/net/sourceforge/plantuml/graphic/USymbolArtifact.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8066 $ * */ package net.sourceforge.plantuml.graphic; diff --git a/src/net/sourceforge/plantuml/graphic/USymbolBoundary.java b/src/net/sourceforge/plantuml/graphic/USymbolBoundary.java index eab45733c..c57fdee76 100644 --- a/src/net/sourceforge/plantuml/graphic/USymbolBoundary.java +++ b/src/net/sourceforge/plantuml/graphic/USymbolBoundary.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8066 $ * */ package net.sourceforge.plantuml.graphic; diff --git a/src/net/sourceforge/plantuml/graphic/USymbolCard.java b/src/net/sourceforge/plantuml/graphic/USymbolCard.java index c9378b924..219d5de6d 100644 --- a/src/net/sourceforge/plantuml/graphic/USymbolCard.java +++ b/src/net/sourceforge/plantuml/graphic/USymbolCard.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8066 $ * */ package net.sourceforge.plantuml.graphic; diff --git a/src/net/sourceforge/plantuml/graphic/USymbolCloud.java b/src/net/sourceforge/plantuml/graphic/USymbolCloud.java index b3807a949..8c751f068 100644 --- a/src/net/sourceforge/plantuml/graphic/USymbolCloud.java +++ b/src/net/sourceforge/plantuml/graphic/USymbolCloud.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8066 $ * */ package net.sourceforge.plantuml.graphic; diff --git a/src/net/sourceforge/plantuml/graphic/USymbolComponent1.java b/src/net/sourceforge/plantuml/graphic/USymbolComponent1.java index e2d3b7eda..de47245c7 100644 --- a/src/net/sourceforge/plantuml/graphic/USymbolComponent1.java +++ b/src/net/sourceforge/plantuml/graphic/USymbolComponent1.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8066 $ * */ package net.sourceforge.plantuml.graphic; diff --git a/src/net/sourceforge/plantuml/graphic/USymbolComponent2.java b/src/net/sourceforge/plantuml/graphic/USymbolComponent2.java index e02c755c0..04c52c576 100644 --- a/src/net/sourceforge/plantuml/graphic/USymbolComponent2.java +++ b/src/net/sourceforge/plantuml/graphic/USymbolComponent2.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8066 $ * */ package net.sourceforge.plantuml.graphic; diff --git a/src/net/sourceforge/plantuml/graphic/USymbolControl.java b/src/net/sourceforge/plantuml/graphic/USymbolControl.java index 3f512104f..a271a7ea4 100644 --- a/src/net/sourceforge/plantuml/graphic/USymbolControl.java +++ b/src/net/sourceforge/plantuml/graphic/USymbolControl.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8066 $ * */ package net.sourceforge.plantuml.graphic; diff --git a/src/net/sourceforge/plantuml/graphic/USymbolDatabase.java b/src/net/sourceforge/plantuml/graphic/USymbolDatabase.java index 3e5a69c7a..39fcd38e4 100644 --- a/src/net/sourceforge/plantuml/graphic/USymbolDatabase.java +++ b/src/net/sourceforge/plantuml/graphic/USymbolDatabase.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8066 $ * */ package net.sourceforge.plantuml.graphic; diff --git a/src/net/sourceforge/plantuml/graphic/USymbolEntityDomain.java b/src/net/sourceforge/plantuml/graphic/USymbolEntityDomain.java index 67aba9cf6..16e3ec3b2 100644 --- a/src/net/sourceforge/plantuml/graphic/USymbolEntityDomain.java +++ b/src/net/sourceforge/plantuml/graphic/USymbolEntityDomain.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8066 $ * */ package net.sourceforge.plantuml.graphic; diff --git a/src/net/sourceforge/plantuml/graphic/USymbolFolder.java b/src/net/sourceforge/plantuml/graphic/USymbolFolder.java index 030ac67c0..5d2be7d0e 100644 --- a/src/net/sourceforge/plantuml/graphic/USymbolFolder.java +++ b/src/net/sourceforge/plantuml/graphic/USymbolFolder.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8066 $ * */ package net.sourceforge.plantuml.graphic; diff --git a/src/net/sourceforge/plantuml/graphic/USymbolFrame.java b/src/net/sourceforge/plantuml/graphic/USymbolFrame.java index b6c9cc143..8ae4145ab 100644 --- a/src/net/sourceforge/plantuml/graphic/USymbolFrame.java +++ b/src/net/sourceforge/plantuml/graphic/USymbolFrame.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8066 $ * */ package net.sourceforge.plantuml.graphic; diff --git a/src/net/sourceforge/plantuml/graphic/USymbolInterface.java b/src/net/sourceforge/plantuml/graphic/USymbolInterface.java index 1c9468d23..60ebef075 100644 --- a/src/net/sourceforge/plantuml/graphic/USymbolInterface.java +++ b/src/net/sourceforge/plantuml/graphic/USymbolInterface.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8066 $ * */ package net.sourceforge.plantuml.graphic; diff --git a/src/net/sourceforge/plantuml/graphic/USymbolNode.java b/src/net/sourceforge/plantuml/graphic/USymbolNode.java index b29f642b5..0942bc508 100644 --- a/src/net/sourceforge/plantuml/graphic/USymbolNode.java +++ b/src/net/sourceforge/plantuml/graphic/USymbolNode.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8066 $ * */ package net.sourceforge.plantuml.graphic; diff --git a/src/net/sourceforge/plantuml/graphic/USymbolQueue.java b/src/net/sourceforge/plantuml/graphic/USymbolQueue.java index ee78915b3..265bd91f6 100644 --- a/src/net/sourceforge/plantuml/graphic/USymbolQueue.java +++ b/src/net/sourceforge/plantuml/graphic/USymbolQueue.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8066 $ * */ package net.sourceforge.plantuml.graphic; diff --git a/src/net/sourceforge/plantuml/graphic/USymbolRect.java b/src/net/sourceforge/plantuml/graphic/USymbolRect.java index c2a54237f..58aee93a4 100644 --- a/src/net/sourceforge/plantuml/graphic/USymbolRect.java +++ b/src/net/sourceforge/plantuml/graphic/USymbolRect.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8066 $ * */ package net.sourceforge.plantuml.graphic; diff --git a/src/net/sourceforge/plantuml/graphic/USymbolSimpleAbstract.java b/src/net/sourceforge/plantuml/graphic/USymbolSimpleAbstract.java index d10d6670e..4488a466e 100644 --- a/src/net/sourceforge/plantuml/graphic/USymbolSimpleAbstract.java +++ b/src/net/sourceforge/plantuml/graphic/USymbolSimpleAbstract.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8066 $ * */ package net.sourceforge.plantuml.graphic; diff --git a/src/net/sourceforge/plantuml/graphic/USymbolStorage.java b/src/net/sourceforge/plantuml/graphic/USymbolStorage.java index 87e47bf95..f8cce43f9 100644 --- a/src/net/sourceforge/plantuml/graphic/USymbolStorage.java +++ b/src/net/sourceforge/plantuml/graphic/USymbolStorage.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8066 $ * */ package net.sourceforge.plantuml.graphic; diff --git a/src/net/sourceforge/plantuml/graphic/USymbolTogether.java b/src/net/sourceforge/plantuml/graphic/USymbolTogether.java index 5c9086359..692a8161a 100644 --- a/src/net/sourceforge/plantuml/graphic/USymbolTogether.java +++ b/src/net/sourceforge/plantuml/graphic/USymbolTogether.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8066 $ * */ package net.sourceforge.plantuml.graphic; diff --git a/src/net/sourceforge/plantuml/graphic/UnusedSpace.java b/src/net/sourceforge/plantuml/graphic/UnusedSpace.java index ba5b706f4..7d6c91b7c 100644 --- a/src/net/sourceforge/plantuml/graphic/UnusedSpace.java +++ b/src/net/sourceforge/plantuml/graphic/UnusedSpace.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4107 $ * */ package net.sourceforge.plantuml.graphic; diff --git a/src/net/sourceforge/plantuml/graphic/VerticalAlignment.java b/src/net/sourceforge/plantuml/graphic/VerticalAlignment.java index 742f6c428..fe26f0f99 100644 --- a/src/net/sourceforge/plantuml/graphic/VerticalAlignment.java +++ b/src/net/sourceforge/plantuml/graphic/VerticalAlignment.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 9786 $ * */ package net.sourceforge.plantuml.graphic; diff --git a/src/net/sourceforge/plantuml/graphic/VerticalPosition.java b/src/net/sourceforge/plantuml/graphic/VerticalPosition.java index 970ccff16..b3f6a4e97 100644 --- a/src/net/sourceforge/plantuml/graphic/VerticalPosition.java +++ b/src/net/sourceforge/plantuml/graphic/VerticalPosition.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.graphic; diff --git a/src/net/sourceforge/plantuml/graphic/color/ColorParser.java b/src/net/sourceforge/plantuml/graphic/color/ColorParser.java index 3a28340d7..267b41f8b 100644 --- a/src/net/sourceforge/plantuml/graphic/color/ColorParser.java +++ b/src/net/sourceforge/plantuml/graphic/color/ColorParser.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 7946 $ * */ package net.sourceforge.plantuml.graphic.color; diff --git a/src/net/sourceforge/plantuml/graphic/color/ColorType.java b/src/net/sourceforge/plantuml/graphic/color/ColorType.java index 9f7169ca9..70a4820fd 100644 --- a/src/net/sourceforge/plantuml/graphic/color/ColorType.java +++ b/src/net/sourceforge/plantuml/graphic/color/ColorType.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 7946 $ * */ package net.sourceforge.plantuml.graphic.color; diff --git a/src/net/sourceforge/plantuml/graphic/color/Colors.java b/src/net/sourceforge/plantuml/graphic/color/Colors.java index 5d0cfd266..2059f06ac 100644 --- a/src/net/sourceforge/plantuml/graphic/color/Colors.java +++ b/src/net/sourceforge/plantuml/graphic/color/Colors.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 7946 $ * */ package net.sourceforge.plantuml.graphic.color; diff --git a/src/net/sourceforge/plantuml/hector/Box2D.java b/src/net/sourceforge/plantuml/hector/Box2D.java index d16aca87e..f649f7b13 100644 --- a/src/net/sourceforge/plantuml/hector/Box2D.java +++ b/src/net/sourceforge/plantuml/hector/Box2D.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 9786 $ * */ package net.sourceforge.plantuml.hector; diff --git a/src/net/sourceforge/plantuml/hector/CucaDiagramFileMakerHector.java b/src/net/sourceforge/plantuml/hector/CucaDiagramFileMakerHector.java deleted file mode 100644 index eaafab899..000000000 --- a/src/net/sourceforge/plantuml/hector/CucaDiagramFileMakerHector.java +++ /dev/null @@ -1,104 +0,0 @@ -/* ======================================================================== - * PlantUML : a free UML diagram generator - * ======================================================================== - * - * (C) Copyright 2009-2017, Arnaud Roques - * - * Project Info: http://plantuml.com - * - * 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. - * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] - * - * Original Author: Arnaud Roques - * - * Revision $Revision: 6711 $ - * - */ -package net.sourceforge.plantuml.hector; - -import java.awt.geom.Dimension2D; -import java.io.IOException; -import java.io.OutputStream; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - -import net.sourceforge.plantuml.Dimension2DDouble; -import net.sourceforge.plantuml.FileFormatOption; -import net.sourceforge.plantuml.core.ImageData; -import net.sourceforge.plantuml.cucadiagram.CucaDiagram; -import net.sourceforge.plantuml.cucadiagram.ILeaf; -import net.sourceforge.plantuml.graphic.TextBlockUtils; -import net.sourceforge.plantuml.svek.CucaDiagramFileMaker; -import net.sourceforge.plantuml.svek.DotDataImageBuilder; -import net.sourceforge.plantuml.svek.IEntityImage; -import net.sourceforge.plantuml.ugraphic.UGraphic2; -import net.sourceforge.plantuml.ugraphic.UTranslate; - -public class CucaDiagramFileMakerHector implements CucaDiagramFileMaker { - - private final CucaDiagram diagram; - - public CucaDiagramFileMakerHector(CucaDiagram diagram) { - this.diagram = diagram; - } - - final private Map images = new LinkedHashMap(); - - public ImageData createFile(OutputStream os, List dotStrings, FileFormatOption fileFormatOption) - throws IOException { - double singleWidth = 0; - double singleHeight = 0; - int nb = 0; - for (ILeaf leaf : diagram.getLeafsvalues()) { - final IEntityImage image = computeImage(leaf); - final Dimension2D dim = TextBlockUtils.getDimension(image); - if (dim.getWidth() > singleWidth) { - singleWidth = dim.getWidth(); - } - if (dim.getHeight() > singleHeight) { - singleHeight = dim.getHeight(); - } - images.put(leaf, image); - nb++; - } - final double margin = 10; - final Dimension2D dim = new Dimension2DDouble(2 * margin + nb * singleWidth, singleHeight + 2 * margin); - UGraphic2 ug = null;// fileFormatOption.createUGraphic(diagram.getColorMapper(), diagram.getDpiFactor(fileFormatOption), - // dim, null, false); - ug = (UGraphic2) ug.apply(new UTranslate(margin, margin)); - - double pos = 0; - for (IEntityImage im : images.values()) { - im.drawU(ug.apply(new UTranslate(pos, 0))); - pos += singleWidth; - } - -// ug.writeImageTOBEMOVED(os, null, diagram.getDpi(fileFormatOption)); -// return new ImageDataSimple(dim); - throw new UnsupportedOperationException(); - } - - private IEntityImage computeImage(final ILeaf leaf) { - final IEntityImage image = DotDataImageBuilder.createEntityImageBlock(leaf, diagram.getSkinParam(), - false, diagram, null, null, null); - return image; - } -} diff --git a/src/net/sourceforge/plantuml/hector/CucaDiagramFileMakerHector2.java b/src/net/sourceforge/plantuml/hector/CucaDiagramFileMakerHector2.java deleted file mode 100644 index a059ee14e..000000000 --- a/src/net/sourceforge/plantuml/hector/CucaDiagramFileMakerHector2.java +++ /dev/null @@ -1,179 +0,0 @@ -/* ======================================================================== - * PlantUML : a free UML diagram generator - * ======================================================================== - * - * (C) Copyright 2009-2017, Arnaud Roques - * - * Project Info: http://plantuml.com - * - * 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. - * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] - * - * Original Author: Arnaud Roques - * - * Revision $Revision: 6711 $ - * - */ -package net.sourceforge.plantuml.hector; - -import java.awt.geom.Dimension2D; -import java.io.IOException; -import java.io.OutputStream; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - -import net.sourceforge.plantuml.ColorParam; -import net.sourceforge.plantuml.Dimension2DDouble; -import net.sourceforge.plantuml.FileFormatOption; -import net.sourceforge.plantuml.core.ImageData; -import net.sourceforge.plantuml.cucadiagram.CucaDiagram; -import net.sourceforge.plantuml.cucadiagram.ILeaf; -import net.sourceforge.plantuml.cucadiagram.Link; -import net.sourceforge.plantuml.graphic.HtmlColor; -import net.sourceforge.plantuml.graphic.TextBlockUtils; -import net.sourceforge.plantuml.skin.rose.Rose; -import net.sourceforge.plantuml.svek.CucaDiagramFileMaker; -import net.sourceforge.plantuml.svek.DotDataImageBuilder; -import net.sourceforge.plantuml.svek.IEntityImage; -import net.sourceforge.plantuml.ugraphic.MinMax; -import net.sourceforge.plantuml.ugraphic.UChangeColor; -import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UGraphic2; -import net.sourceforge.plantuml.ugraphic.ULine; -import net.sourceforge.plantuml.ugraphic.UStroke; -import net.sourceforge.plantuml.ugraphic.UTranslate; - -public class CucaDiagramFileMakerHector2 implements CucaDiagramFileMaker { - - private final CucaDiagram diagram; - private SkeletonConfiguration configuration; - - private double singleWidth; - private double singleHeight; - private double nodeMargin = 40; - - public CucaDiagramFileMakerHector2(CucaDiagram diagram) { - this.diagram = diagram; - } - - final private Map images = new LinkedHashMap(); - - final private Map links = new LinkedHashMap(); - - private double getX(Pin pin) { - return singleWidth * configuration.getCol(pin); - } - - private double getY(Pin pin) { - return singleHeight * pin.getRow(); - } - - private double getCenterX(Pin pin) { - return singleWidth * configuration.getCol(pin) + singleWidth / 2.0; - } - - private double getCenterY(Pin pin) { - return singleHeight * pin.getRow() + singleHeight / 2.0; - } - - public ImageData createFile(OutputStream os, List dotStrings, FileFormatOption fileFormatOption) - throws IOException { - final PinFactory pinFactory = new PinFactory(); - final SkeletonBuilder skeletonBuilder = new SkeletonBuilder(); - for (Link link : diagram.getLinks()) { - final PinLink pinLink = pinFactory.createPinLink(link); - links.put(link, pinLink); - skeletonBuilder.add(pinLink); - } - - final Skeleton skeleton = skeletonBuilder.createSkeletons().get(0); - this.configuration = SkeletonConfiguration.getDefault(skeleton); - - this.singleWidth = 0; - this.singleHeight = 0; - - for (Pin pin : skeleton.getPins()) { - final ILeaf leaf = (ILeaf) pin.getUserData(); - final IEntityImage image = computeImage(leaf); - final Dimension2D dim = TextBlockUtils.getDimension(image); - if (dim.getWidth() > singleWidth) { - singleWidth = dim.getWidth(); - } - if (dim.getHeight() > singleHeight) { - singleHeight = dim.getHeight(); - } - images.put(pin, image); - } - singleHeight += nodeMargin; - singleWidth += nodeMargin; - - MinMax minMax = MinMax.getEmpty(false); - for (Pin pin : skeleton.getPins()) { - minMax = minMax.addPoint(getX(pin), getY(pin)); - minMax = minMax.addPoint(getX(pin) + singleWidth, getY(pin) + singleHeight); - } - - final double borderMargin = 10; - - final Dimension2D dimTotal = new Dimension2DDouble(2 * borderMargin + minMax.getMaxX(), 2 * borderMargin - + minMax.getMaxY()); - UGraphic2 ug = null;//fileFormatOption.createUGraphic(diagram.getColorMapper(), diagram.getDpiFactor(fileFormatOption), - // dimTotal, null, false); - ug = (UGraphic2) ug.apply(new UTranslate(borderMargin, borderMargin)); - - for (PinLink pinLink : skeleton.getPinLinks()) { - drawPinLink(ug, pinLink); - } - - for (Map.Entry ent : images.entrySet()) { - final Pin pin = ent.getKey(); - final IEntityImage im = ent.getValue(); - final double x = getX(pin); - final double y = getY(pin); - final Dimension2D dimImage = im.calculateDimension(ug.getStringBounder()); - im.drawU(ug.apply(new UTranslate(x + (singleWidth - dimImage.getWidth()) / 2, y - + (singleHeight - dimImage.getHeight()) / 2))); - } - -// ug.writeImageTOBEMOVED(os, null, diagram.getDpi(fileFormatOption)); -// return new ImageDataSimple(dimTotal); - throw new UnsupportedOperationException(); - } - - private void drawPinLink(UGraphic ug, PinLink pinLink) { - final Rose rose = new Rose(); - final HtmlColor color = rose.getHtmlColor(diagram.getSkinParam(), ColorParam.classArrow); - ug = ug.apply(new UChangeColor(color)).apply(new UStroke(1.5)); - final double x1 = getCenterX(pinLink.getPin1()); - final double y1 = getCenterY(pinLink.getPin1()); - final double x2 = getCenterX(pinLink.getPin2()); - final double y2 = getCenterY(pinLink.getPin2()); - ug = ug.apply(new UTranslate(x1, y1)); - ug.draw(new ULine(x2 - x1, y2 - y1)); - - } - - private IEntityImage computeImage(final ILeaf leaf) { - final IEntityImage image = DotDataImageBuilder.createEntityImageBlock(leaf, diagram.getSkinParam(), - false, diagram, null, null, null); - return image; - } -} diff --git a/src/net/sourceforge/plantuml/hector/CucaDiagramFileMakerHector3.java b/src/net/sourceforge/plantuml/hector/CucaDiagramFileMakerHector3.java deleted file mode 100644 index f69986961..000000000 --- a/src/net/sourceforge/plantuml/hector/CucaDiagramFileMakerHector3.java +++ /dev/null @@ -1,180 +0,0 @@ -/* ======================================================================== - * PlantUML : a free UML diagram generator - * ======================================================================== - * - * (C) Copyright 2009-2017, Arnaud Roques - * - * Project Info: http://plantuml.com - * - * 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. - * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] - * - * Original Author: Arnaud Roques - * - * Revision $Revision: 6711 $ - * - */ -package net.sourceforge.plantuml.hector; - -import java.awt.geom.Dimension2D; -import java.io.IOException; -import java.io.OutputStream; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - -import net.sourceforge.plantuml.ColorParam; -import net.sourceforge.plantuml.Dimension2DDouble; -import net.sourceforge.plantuml.FileFormatOption; -import net.sourceforge.plantuml.core.ImageData; -import net.sourceforge.plantuml.cucadiagram.CucaDiagram; -import net.sourceforge.plantuml.cucadiagram.ILeaf; -import net.sourceforge.plantuml.cucadiagram.Link; -import net.sourceforge.plantuml.graphic.HtmlColor; -import net.sourceforge.plantuml.graphic.TextBlockUtils; -import net.sourceforge.plantuml.skin.rose.Rose; -import net.sourceforge.plantuml.svek.CucaDiagramFileMaker; -import net.sourceforge.plantuml.svek.DotDataImageBuilder; -import net.sourceforge.plantuml.svek.IEntityImage; -import net.sourceforge.plantuml.ugraphic.MinMax; -import net.sourceforge.plantuml.ugraphic.UChangeColor; -import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UGraphic2; -import net.sourceforge.plantuml.ugraphic.ULine; -import net.sourceforge.plantuml.ugraphic.UStroke; -import net.sourceforge.plantuml.ugraphic.UTranslate; - -public class CucaDiagramFileMakerHector3 implements CucaDiagramFileMaker { - - private final CucaDiagram diagram; - private SkeletonConfiguration configuration; - - private double singleWidth; - private double singleHeight; - private double nodeMargin = 40; - - public CucaDiagramFileMakerHector3(CucaDiagram diagram) { - this.diagram = diagram; - } - - final private Map images = new LinkedHashMap(); - - final private Map links = new LinkedHashMap(); - - private double getX(Pin pin) { - return singleWidth * configuration.getCol(pin); - } - - private double getY(Pin pin) { - return singleHeight * pin.getRow(); - } - - private double getCenterX(Pin pin) { - return singleWidth * configuration.getCol(pin) + singleWidth / 2.0; - } - - private double getCenterY(Pin pin) { - return singleHeight * pin.getRow() + singleHeight / 2.0; - } - - public ImageData createFile(OutputStream os, List dotStrings, FileFormatOption fileFormatOption) - throws IOException { - final PinFactory pinFactory = new PinFactory(); - final SkeletonBuilder skeletonBuilder = new SkeletonBuilder(); - for (Link link : diagram.getLinks()) { - final PinLink pinLink = pinFactory.createPinLink(link); - links.put(link, pinLink); - skeletonBuilder.add(pinLink); - } - - final Skeleton skeleton = skeletonBuilder.createSkeletons().get(0); - this.configuration = SkeletonConfiguration.getDefault(skeleton); - - this.singleWidth = 0; - this.singleHeight = 0; - - for (Pin pin : skeleton.getPins()) { - final ILeaf leaf = (ILeaf) pin.getUserData(); - final IEntityImage image = computeImage(leaf); - final Dimension2D dim = TextBlockUtils.getDimension(image); - if (dim.getWidth() > singleWidth) { - singleWidth = dim.getWidth(); - } - if (dim.getHeight() > singleHeight) { - singleHeight = dim.getHeight(); - } - images.put(pin, image); - } - singleHeight += nodeMargin; - singleWidth += nodeMargin; - - MinMax minMax = MinMax.getEmpty(false); - for (Pin pin : skeleton.getPins()) { - minMax = minMax.addPoint(getX(pin), getY(pin)); - minMax = minMax.addPoint(getX(pin) + singleWidth, getY(pin) + singleHeight); - } - - final double borderMargin = 10; - - final Dimension2D dimTotal = new Dimension2DDouble(2 * borderMargin + minMax.getMaxX(), 2 * borderMargin - + minMax.getMaxY()); - UGraphic2 ug = null;// fileFormatOption.createUGraphic(diagram.getColorMapper(), - // diagram.getDpiFactor(fileFormatOption), - // dimTotal, null, false); - ug = (UGraphic2) ug.apply(new UTranslate(borderMargin, borderMargin)); - - for (PinLink pinLink : skeleton.getPinLinks()) { - drawPinLink(ug, pinLink); - } - - for (Map.Entry ent : images.entrySet()) { - final Pin pin = ent.getKey(); - final IEntityImage im = ent.getValue(); - final double x = getX(pin); - final double y = getY(pin); - final Dimension2D dimImage = im.calculateDimension(ug.getStringBounder()); - im.drawU(ug.apply(new UTranslate(x + (singleWidth - dimImage.getWidth()) / 2, y - + (singleHeight - dimImage.getHeight()) / 2))); - } - - // ug.writeImageTOBEMOVED(os, null, diagram.getDpi(fileFormatOption)); - // return new ImageDataSimple(dimTotal); - throw new UnsupportedOperationException(); - } - - private void drawPinLink(UGraphic ug, PinLink pinLink) { - final Rose rose = new Rose(); - final HtmlColor color = rose.getHtmlColor(diagram.getSkinParam(), ColorParam.classArrow); - ug = ug.apply(new UChangeColor(color)).apply(new UStroke(1.5)); - final double x1 = getCenterX(pinLink.getPin1()); - final double y1 = getCenterY(pinLink.getPin1()); - final double x2 = getCenterX(pinLink.getPin2()); - final double y2 = getCenterY(pinLink.getPin2()); - ug = ug.apply(new UTranslate(x1, y1)); - ug.draw(new ULine(x2 - x1, y2 - y1)); - - } - - private IEntityImage computeImage(final ILeaf leaf) { - final IEntityImage image = DotDataImageBuilder.createEntityImageBlock(leaf, diagram.getSkinParam(), - false, diagram, null, null, null); - return image; - } -} diff --git a/src/net/sourceforge/plantuml/hector/CucaDiagramFileMakerHector4.java b/src/net/sourceforge/plantuml/hector/CucaDiagramFileMakerHector4.java deleted file mode 100644 index 1e71645b1..000000000 --- a/src/net/sourceforge/plantuml/hector/CucaDiagramFileMakerHector4.java +++ /dev/null @@ -1,195 +0,0 @@ -/* ======================================================================== - * PlantUML : a free UML diagram generator - * ======================================================================== - * - * (C) Copyright 2009-2017, Arnaud Roques - * - * Project Info: http://plantuml.com - * - * 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. - * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] - * - * Original Author: Arnaud Roques - * - * Revision $Revision: 6711 $ - * - */ -package net.sourceforge.plantuml.hector; - -import java.awt.geom.Dimension2D; -import java.io.IOException; -import java.io.OutputStream; -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - -import net.sourceforge.plantuml.ColorParam; -import net.sourceforge.plantuml.Dimension2DDouble; -import net.sourceforge.plantuml.FileFormatOption; -import net.sourceforge.plantuml.core.ImageData; -import net.sourceforge.plantuml.cucadiagram.CucaDiagram; -import net.sourceforge.plantuml.cucadiagram.ILeaf; -import net.sourceforge.plantuml.cucadiagram.Link; -import net.sourceforge.plantuml.graphic.HtmlColor; -import net.sourceforge.plantuml.graphic.TextBlockUtils; -import net.sourceforge.plantuml.skin.rose.Rose; -import net.sourceforge.plantuml.svek.CucaDiagramFileMaker; -import net.sourceforge.plantuml.svek.DotDataImageBuilder; -import net.sourceforge.plantuml.svek.IEntityImage; -import net.sourceforge.plantuml.ugraphic.MinMax; -import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UGraphic2; -import net.sourceforge.plantuml.ugraphic.UTranslate; - -public class CucaDiagramFileMakerHector4 implements CucaDiagramFileMaker { - - private final CucaDiagram diagram; - private SkeletonConfiguration configuration; - - private double singleWidth; - private double singleHeight; - private double nodeMargin = 40; - - public CucaDiagramFileMakerHector4(CucaDiagram diagram) { - this.diagram = diagram; - } - - final private Map images = new LinkedHashMap(); - final private Map boxes = new LinkedHashMap(); - - final private Map links = new LinkedHashMap(); - - final private List forbidden = new ArrayList(); - - private double getX(Pin pin) { - return singleWidth * configuration.getCol(pin); - } - - private double getY(Pin pin) { - return singleHeight * pin.getRow(); - } - - private double getCenterX(Pin pin) { - return singleWidth * configuration.getCol(pin) + singleWidth / 2.0; - } - - private double getCenterY(Pin pin) { - return singleHeight * pin.getRow() + singleHeight / 2.0; - } - - public ImageData createFile(OutputStream os, List dotStrings, FileFormatOption fileFormatOption) - throws IOException { - final PinFactory pinFactory = new PinFactory(); - final SkeletonBuilder skeletonBuilder = new SkeletonBuilder(); - links.clear(); - for (Link link : diagram.getLinks()) { - final PinLink pinLink = pinFactory.createPinLink(link); - links.put(link, pinLink); - skeletonBuilder.add(pinLink); - } - - final Skeleton skeleton = skeletonBuilder.createSkeletons().get(0); - this.configuration = SkeletonConfigurationUtils.getBest(skeleton); - - this.singleWidth = 0; - this.singleHeight = 0; - - images.clear(); - for (Pin pin : skeleton.getPins()) { - final ILeaf leaf = (ILeaf) pin.getUserData(); - final IEntityImage image = computeImage(leaf); - final Dimension2D dim = TextBlockUtils.getDimension(image); - if (dim.getWidth() > singleWidth) { - singleWidth = dim.getWidth(); - } - if (dim.getHeight() > singleHeight) { - singleHeight = dim.getHeight(); - } - images.put(pin, image); - } - singleHeight += nodeMargin; - singleWidth += nodeMargin; - - MinMax minMax = MinMax.getEmpty(false); - for (Pin pin : skeleton.getPins()) { - minMax = minMax.addPoint(getX(pin), getY(pin)); - minMax = minMax.addPoint(getX(pin) + singleWidth, getY(pin) + singleHeight); - } - - final double borderMargin = 10; - - final Dimension2D dimTotal = new Dimension2DDouble(2 * borderMargin + minMax.getMaxX(), 2 * borderMargin - + minMax.getMaxY()); - UGraphic2 ug = null; //fileFormatOption.createUGraphic(diagram.getColorMapper(), diagram.getDpiFactor(fileFormatOption), - // dimTotal, null, false); - ug = (UGraphic2) ug.apply(new UTranslate(borderMargin, borderMargin)); - - forbidden.clear(); - for (Map.Entry ent : images.entrySet()) { - final Pin pin = ent.getKey(); - final IEntityImage im = ent.getValue(); - final Dimension2D dimImage = im.calculateDimension(ug.getStringBounder()); - final double x = getX(pin) + (singleWidth - dimImage.getWidth()) / 2; - final double y = getY(pin) + (singleHeight - dimImage.getHeight()) / 2; - final Box2D box = Box2D.create(x, y, dimImage); - boxes.put(pin, box); - forbidden.add(box); - } - - for (PinLink pinLink : skeleton.getPinLinks()) { - drawPinLink(ug, pinLink); - } - - for (Map.Entry ent : images.entrySet()) { - final Pin pin = ent.getKey(); - final IEntityImage im = ent.getValue(); - final Dimension2D dimImage = im.calculateDimension(ug.getStringBounder()); - final double x = getX(pin) + (singleWidth - dimImage.getWidth()) / 2; - final double y = getY(pin) + (singleHeight - dimImage.getHeight()) / 2; - im.drawU(ug.apply(new UTranslate(x, y))); - } - -// ug.writeImageTOBEMOVED(os, null, diagram.getDpi(fileFormatOption)); -// return new ImageDataSimple(dimTotal); - throw new UnsupportedOperationException(); - } - - private void drawPinLink(UGraphic ug, PinLink pinLink) { - final double x1 = getCenterX(pinLink.getPin1()); - final double y1 = getCenterY(pinLink.getPin1()); - final double x2 = getCenterX(pinLink.getPin2()); - final double y2 = getCenterY(pinLink.getPin2()); - - final Rose rose = new Rose(); - final HtmlColor color = rose.getHtmlColor(diagram.getSkinParam(), ColorParam.classArrow); - final List b = new ArrayList(forbidden); - b.remove(boxes.get(pinLink.getPin1())); - b.remove(boxes.get(pinLink.getPin2())); - final SmartConnection connection = new SmartConnection(x1, y1, x2, y2, b); - connection.draw(ug, color); - } - - private IEntityImage computeImage(final ILeaf leaf) { - final IEntityImage image = DotDataImageBuilder.createEntityImageBlock(leaf, diagram.getSkinParam(), - false, diagram, null, null, null); - return image; - } -} diff --git a/src/net/sourceforge/plantuml/hector/CucaDiagramFileMakerHectorB1.java b/src/net/sourceforge/plantuml/hector/CucaDiagramFileMakerHectorB1.java index 6e424c3aa..42d167cde 100644 --- a/src/net/sourceforge/plantuml/hector/CucaDiagramFileMakerHectorB1.java +++ b/src/net/sourceforge/plantuml/hector/CucaDiagramFileMakerHectorB1.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6711 $ * */ package net.sourceforge.plantuml.hector; diff --git a/src/net/sourceforge/plantuml/hector/CucaDiagramFileMakerHectorB2.java b/src/net/sourceforge/plantuml/hector/CucaDiagramFileMakerHectorB2.java deleted file mode 100644 index b88dd4b63..000000000 --- a/src/net/sourceforge/plantuml/hector/CucaDiagramFileMakerHectorB2.java +++ /dev/null @@ -1,201 +0,0 @@ -/* ======================================================================== - * PlantUML : a free UML diagram generator - * ======================================================================== - * - * (C) Copyright 2009-2017, Arnaud Roques - * - * Project Info: http://plantuml.com - * - * 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. - * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] - * - * Original Author: Arnaud Roques - * - * Revision $Revision: 6711 $ - * - */ -package net.sourceforge.plantuml.hector; - -import java.awt.geom.Dimension2D; -import java.awt.geom.Point2D; -import java.io.IOException; -import java.io.OutputStream; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - -import net.sourceforge.plantuml.ColorParam; -import net.sourceforge.plantuml.Dimension2DDouble; -import net.sourceforge.plantuml.FileFormatOption; -import net.sourceforge.plantuml.core.ImageData; -import net.sourceforge.plantuml.cucadiagram.CucaDiagram; -import net.sourceforge.plantuml.cucadiagram.ILeaf; -import net.sourceforge.plantuml.cucadiagram.Link; -import net.sourceforge.plantuml.graphic.HtmlColor; -import net.sourceforge.plantuml.graphic.HtmlColorUtils; -import net.sourceforge.plantuml.graphic.TextBlockUtils; -import net.sourceforge.plantuml.skin.rose.Rose; -import net.sourceforge.plantuml.svek.CucaDiagramFileMaker; -import net.sourceforge.plantuml.svek.DotDataImageBuilder; -import net.sourceforge.plantuml.svek.IEntityImage; -import net.sourceforge.plantuml.ugraphic.MinMax; -import net.sourceforge.plantuml.ugraphic.UChangeBackColor; -import net.sourceforge.plantuml.ugraphic.UChangeColor; -import net.sourceforge.plantuml.ugraphic.UGraphic; -import net.sourceforge.plantuml.ugraphic.UGraphic2; -import net.sourceforge.plantuml.ugraphic.URectangle; -import net.sourceforge.plantuml.ugraphic.UShape; -import net.sourceforge.plantuml.ugraphic.UTranslate; - -public class CucaDiagramFileMakerHectorB2 implements CucaDiagramFileMaker { - - private final CucaDiagram diagram; - private SkeletonConfiguration configuration; - - private double singleWidth; - private double singleHeight; - private double nodeDistanceX = 30; - private double nodeDistanceY = 50; - - private UnlinarCompressedPlan unlinarCompressedPlan; - - public CucaDiagramFileMakerHectorB2(CucaDiagram diagram) { - this.diagram = diagram; - } - - final private Map images = new LinkedHashMap(); - // final private Map boxes = new LinkedHashMap(); - - final private Map links = new LinkedHashMap(); - - // final private List forbidden = new ArrayList(); - - private double getX(Pin pin) { - return nodeDistanceX * configuration.getCol(pin); - } - - private double getY(Pin pin) { - return nodeDistanceY * pin.getRow(); - } - - private Point2D getPoint(Pin pin) { - return new Point2D.Double(getX(pin), getY(pin)); - } - - // private double getCenterX(Pin pin) { - // return singleWidth * configuration.getCol(pin) + singleWidth / 2.0; - // } - // - // private double getCenterY(Pin pin) { - // return singleHeight * pin.getRow() + singleHeight / 2.0; - // } - - public ImageData createFile(OutputStream os, List dotStrings, FileFormatOption fileFormatOption) - throws IOException { - final PinFactory pinFactory = new PinFactory(); - final SkeletonBuilder skeletonBuilder = new SkeletonBuilder(); - links.clear(); - for (Link link : diagram.getLinks()) { - final PinLink pinLink = pinFactory.createPinLink(link); - links.put(link, pinLink); - skeletonBuilder.add(pinLink); - } - - final Skeleton skeleton = skeletonBuilder.createSkeletons().get(0); - this.configuration = SkeletonConfigurationUtils.getBest(skeleton); - - this.singleWidth = 0; - this.singleHeight = 0; - - images.clear(); - for (Pin pin : skeleton.getPins()) { - final ILeaf leaf = (ILeaf) pin.getUserData(); - final IEntityImage image = computeImage(leaf); - final Dimension2D dim = TextBlockUtils.getDimension(image); - if (dim.getWidth() > singleWidth) { - singleWidth = dim.getWidth(); - } - if (dim.getHeight() > singleHeight) { - singleHeight = dim.getHeight(); - } - images.put(pin, image); - } - - unlinarCompressedPlan = new UnlinarCompressedPlan(singleWidth, nodeDistanceX, singleHeight, nodeDistanceY); - - MinMax minMax = MinMax.getEmpty(false); - for (Pin pin : skeleton.getPins()) { - minMax = minMax.addPoint(unlinarCompressedPlan.uncompress(getX(pin), getY(pin), - UnlinearCompression.Rounding.BORDER_2)); - } - - final double borderMargin = 10; - - final Dimension2D dimTotal = new Dimension2DDouble(2 * borderMargin + minMax.getMaxX(), 2 * borderMargin - + minMax.getMaxY()); - UGraphic2 ug = null; // fileFormatOption.createUGraphic(diagram.getColorMapper(), diagram.getDpiFactor(fileFormatOption), - // dimTotal, null, false); - ug = (UGraphic2) ug.apply(new UTranslate(borderMargin, borderMargin)); - - for (PinLink pinLink : skeleton.getPinLinks()) { - drawPinLink(ug, pinLink); - } - - for (Pin pin : skeleton.getPins()) { - drawPin(ug, pin); - } - -// ug.writeImageTOBEMOVED(os, null, diagram.getDpi(fileFormatOption)); -// return new ImageDataSimple(dimTotal); - throw new UnsupportedOperationException(); - } - - private void drawPin(UGraphic ug, Pin pin) { - final Point2D pt = unlinarCompressedPlan.uncompress(getPoint(pin), UnlinearCompression.Rounding.BORDER_1); - - final double x = pt.getX(); - final double y = pt.getY(); - final UShape rect = new URectangle(unlinarCompressedPlan.getInnerX(), unlinarCompressedPlan.getInnerY()); - ug.apply(new UChangeColor(HtmlColorUtils.BLACK)).apply(new UChangeBackColor(HtmlColorUtils.BLACK)).apply( - new UTranslate(x, y)).draw(rect); - } - - private void drawPinLink(UGraphic ug, PinLink pinLink) { - final Point2D pp1 = getPoint(pinLink.getPin1()); - final Point2D pp2 = getPoint(pinLink.getPin2()); - - final Rose rose = new Rose(); - final HtmlColor color = rose.getHtmlColor(diagram.getSkinParam(), ColorParam.classArrow); - - final HectorPath path = unlinarCompressedPlan.uncompressSegment(pp1, pp2); - path.draw(ug, color); - -// final Point2D p1 = unlinarCompressedPlan.uncompress(pp1, UnlinearCompression.Rounding.CENTRAL); -// final Point2D p2 = unlinarCompressedPlan.uncompress(pp2, UnlinearCompression.Rounding.CENTRAL); -// final SmartConnection connection = new SmartConnection(p1, p2, new ArrayList()); -// connection.draw(ug, color); - } - - private IEntityImage computeImage(final ILeaf leaf) { - final IEntityImage image = DotDataImageBuilder.createEntityImageBlock(leaf, diagram.getSkinParam(), - false, diagram, null, null, null); - return image; - } -} diff --git a/src/net/sourceforge/plantuml/hector/GrowingTree.java b/src/net/sourceforge/plantuml/hector/GrowingTree.java index eebb6e1ce..3b671d01e 100644 --- a/src/net/sourceforge/plantuml/hector/GrowingTree.java +++ b/src/net/sourceforge/plantuml/hector/GrowingTree.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5079 $ * */ package net.sourceforge.plantuml.hector; diff --git a/src/net/sourceforge/plantuml/hector/HectorPath.java b/src/net/sourceforge/plantuml/hector/HectorPath.java index 5868924e4..6b1dd2e82 100644 --- a/src/net/sourceforge/plantuml/hector/HectorPath.java +++ b/src/net/sourceforge/plantuml/hector/HectorPath.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5079 $ * */ package net.sourceforge.plantuml.hector; diff --git a/src/net/sourceforge/plantuml/hector/Pin.java b/src/net/sourceforge/plantuml/hector/Pin.java index 51c3382d4..c71f11964 100644 --- a/src/net/sourceforge/plantuml/hector/Pin.java +++ b/src/net/sourceforge/plantuml/hector/Pin.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5079 $ * */ package net.sourceforge.plantuml.hector; diff --git a/src/net/sourceforge/plantuml/hector/PinFactory.java b/src/net/sourceforge/plantuml/hector/PinFactory.java index 43b280f66..91bede01b 100644 --- a/src/net/sourceforge/plantuml/hector/PinFactory.java +++ b/src/net/sourceforge/plantuml/hector/PinFactory.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5079 $ * */ package net.sourceforge.plantuml.hector; diff --git a/src/net/sourceforge/plantuml/hector/PinLink.java b/src/net/sourceforge/plantuml/hector/PinLink.java index b99338a12..9501da286 100644 --- a/src/net/sourceforge/plantuml/hector/PinLink.java +++ b/src/net/sourceforge/plantuml/hector/PinLink.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5079 $ * */ package net.sourceforge.plantuml.hector; diff --git a/src/net/sourceforge/plantuml/hector/PinLinksContinuousSet.java b/src/net/sourceforge/plantuml/hector/PinLinksContinuousSet.java index f631cc2e1..ed7eac636 100644 --- a/src/net/sourceforge/plantuml/hector/PinLinksContinuousSet.java +++ b/src/net/sourceforge/plantuml/hector/PinLinksContinuousSet.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5079 $ * */ package net.sourceforge.plantuml.hector; diff --git a/src/net/sourceforge/plantuml/hector/Skeleton.java b/src/net/sourceforge/plantuml/hector/Skeleton.java index a2023e990..7a2601379 100644 --- a/src/net/sourceforge/plantuml/hector/Skeleton.java +++ b/src/net/sourceforge/plantuml/hector/Skeleton.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5079 $ * */ package net.sourceforge.plantuml.hector; diff --git a/src/net/sourceforge/plantuml/hector/SkeletonBuilder.java b/src/net/sourceforge/plantuml/hector/SkeletonBuilder.java index 9e7fc36fb..46d44e839 100644 --- a/src/net/sourceforge/plantuml/hector/SkeletonBuilder.java +++ b/src/net/sourceforge/plantuml/hector/SkeletonBuilder.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5079 $ * */ package net.sourceforge.plantuml.hector; diff --git a/src/net/sourceforge/plantuml/hector/SkeletonConfiguration.java b/src/net/sourceforge/plantuml/hector/SkeletonConfiguration.java index f9b6ade2f..4ce0aafe1 100644 --- a/src/net/sourceforge/plantuml/hector/SkeletonConfiguration.java +++ b/src/net/sourceforge/plantuml/hector/SkeletonConfiguration.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5079 $ * */ package net.sourceforge.plantuml.hector; diff --git a/src/net/sourceforge/plantuml/hector/SkeletonConfigurationComparator.java b/src/net/sourceforge/plantuml/hector/SkeletonConfigurationComparator.java index 70a3f86ae..972ea75d4 100644 --- a/src/net/sourceforge/plantuml/hector/SkeletonConfigurationComparator.java +++ b/src/net/sourceforge/plantuml/hector/SkeletonConfigurationComparator.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5079 $ * */ package net.sourceforge.plantuml.hector; diff --git a/src/net/sourceforge/plantuml/hector/SkeletonConfigurationEvaluator.java b/src/net/sourceforge/plantuml/hector/SkeletonConfigurationEvaluator.java index af2d46eb7..86759eaf7 100644 --- a/src/net/sourceforge/plantuml/hector/SkeletonConfigurationEvaluator.java +++ b/src/net/sourceforge/plantuml/hector/SkeletonConfigurationEvaluator.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5079 $ * */ package net.sourceforge.plantuml.hector; diff --git a/src/net/sourceforge/plantuml/hector/SkeletonConfigurationEvaluatorLineLenght.java b/src/net/sourceforge/plantuml/hector/SkeletonConfigurationEvaluatorLineLenght.java index b4e45707b..4053c2829 100644 --- a/src/net/sourceforge/plantuml/hector/SkeletonConfigurationEvaluatorLineLenght.java +++ b/src/net/sourceforge/plantuml/hector/SkeletonConfigurationEvaluatorLineLenght.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5079 $ * */ package net.sourceforge.plantuml.hector; diff --git a/src/net/sourceforge/plantuml/hector/SkeletonConfigurationSet.java b/src/net/sourceforge/plantuml/hector/SkeletonConfigurationSet.java index 499f78ebb..170015461 100644 --- a/src/net/sourceforge/plantuml/hector/SkeletonConfigurationSet.java +++ b/src/net/sourceforge/plantuml/hector/SkeletonConfigurationSet.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5079 $ * */ package net.sourceforge.plantuml.hector; diff --git a/src/net/sourceforge/plantuml/hector/SkeletonConfigurationUtils.java b/src/net/sourceforge/plantuml/hector/SkeletonConfigurationUtils.java index 43820a9b3..29c1132f4 100644 --- a/src/net/sourceforge/plantuml/hector/SkeletonConfigurationUtils.java +++ b/src/net/sourceforge/plantuml/hector/SkeletonConfigurationUtils.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5079 $ * */ package net.sourceforge.plantuml.hector; diff --git a/src/net/sourceforge/plantuml/hector/SkeletonConfigurations.java b/src/net/sourceforge/plantuml/hector/SkeletonConfigurations.java index da25cf353..2c0118988 100644 --- a/src/net/sourceforge/plantuml/hector/SkeletonConfigurations.java +++ b/src/net/sourceforge/plantuml/hector/SkeletonConfigurations.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5079 $ * */ package net.sourceforge.plantuml.hector; diff --git a/src/net/sourceforge/plantuml/hector/SkeletonMutation.java b/src/net/sourceforge/plantuml/hector/SkeletonMutation.java index 48308c138..134ed0dee 100644 --- a/src/net/sourceforge/plantuml/hector/SkeletonMutation.java +++ b/src/net/sourceforge/plantuml/hector/SkeletonMutation.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5079 $ * */ package net.sourceforge.plantuml.hector; diff --git a/src/net/sourceforge/plantuml/hector/SmartConnection.java b/src/net/sourceforge/plantuml/hector/SmartConnection.java index 7e11da0e9..bc3295f68 100644 --- a/src/net/sourceforge/plantuml/hector/SmartConnection.java +++ b/src/net/sourceforge/plantuml/hector/SmartConnection.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5079 $ * */ package net.sourceforge.plantuml.hector; diff --git a/src/net/sourceforge/plantuml/hector/UnlinarCompressedPlan.java b/src/net/sourceforge/plantuml/hector/UnlinarCompressedPlan.java index 1654091ab..a84469581 100644 --- a/src/net/sourceforge/plantuml/hector/UnlinarCompressedPlan.java +++ b/src/net/sourceforge/plantuml/hector/UnlinarCompressedPlan.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5079 $ * */ package net.sourceforge.plantuml.hector; diff --git a/src/net/sourceforge/plantuml/hector/UnlinearCompression.java b/src/net/sourceforge/plantuml/hector/UnlinearCompression.java index c50886d63..949392f19 100644 --- a/src/net/sourceforge/plantuml/hector/UnlinearCompression.java +++ b/src/net/sourceforge/plantuml/hector/UnlinearCompression.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5079 $ * */ package net.sourceforge.plantuml.hector; diff --git a/src/net/sourceforge/plantuml/hector2/CucaDiagramFileMakerHectorC1.java b/src/net/sourceforge/plantuml/hector2/CucaDiagramFileMakerHectorC1.java deleted file mode 100644 index a73dbbde0..000000000 --- a/src/net/sourceforge/plantuml/hector2/CucaDiagramFileMakerHectorC1.java +++ /dev/null @@ -1,102 +0,0 @@ -/* ======================================================================== - * PlantUML : a free UML diagram generator - * ======================================================================== - * - * (C) Copyright 2009-2017, Arnaud Roques - * - * Project Info: http://plantuml.com - * - * 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. - * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] - * - * Original Author: Arnaud Roques - * - * Revision $Revision: 6711 $ - * - */ -package net.sourceforge.plantuml.hector2; - -import java.awt.geom.Dimension2D; -import java.io.IOException; -import java.io.OutputStream; -import java.util.List; - -import net.sourceforge.plantuml.FileFormatOption; -import net.sourceforge.plantuml.core.ImageData; -import net.sourceforge.plantuml.cucadiagram.CucaDiagram; -import net.sourceforge.plantuml.cucadiagram.Link; -import net.sourceforge.plantuml.graphic.TextBlockUtils; -import net.sourceforge.plantuml.hector2.continuity.Skeleton; -import net.sourceforge.plantuml.hector2.continuity.SkeletonBuilder; -import net.sourceforge.plantuml.hector2.graphic.Foo2; -import net.sourceforge.plantuml.hector2.layering.Layer; -import net.sourceforge.plantuml.hector2.layering.LayerFactory; -import net.sourceforge.plantuml.hector2.mpos.Distribution; -import net.sourceforge.plantuml.hector2.mpos.MutationLayer; -import net.sourceforge.plantuml.svek.CucaDiagramFileMaker; -import net.sourceforge.plantuml.ugraphic.UGraphic2; - -public class CucaDiagramFileMakerHectorC1 implements CucaDiagramFileMaker { - - private final CucaDiagram diagram; - - public CucaDiagramFileMakerHectorC1(CucaDiagram diagram) { - this.diagram = diagram; - } - - public ImageData createFile(OutputStream os, List dotStrings, FileFormatOption fileFormatOption) - throws IOException { - final SkeletonBuilder skeletonBuilder = new SkeletonBuilder(); - for (Link link : diagram.getLinks()) { - skeletonBuilder.add(link); - } - final List skeletons = skeletonBuilder.getSkeletons(); - if (skeletons.size() != 1) { - throw new UnsupportedOperationException("size=" + skeletons.size()); - } - final List layers = new LayerFactory().getLayers(skeletons.get(0)); - // System.err.println("layers=" + layers); - - final Distribution distribution = new Distribution(layers); - final double cost1 = distribution.cost(diagram.getLinks()); - System.err.println("cost1=" + cost1); - - final List mutations = distribution.getPossibleMutations(); - for (MutationLayer m : mutations) { - System.err.println(m.toString()); - final Distribution muted = distribution.mute(m); - final double cost2 = muted.cost(diagram.getLinks()); - System.err.println("cost2=" + cost2); - } - - final Foo2 foo2 = new Foo2(distribution, diagram); - - final Dimension2D dimTotal = foo2.calculateDimension(TextBlockUtils.getDummyStringBounder()); - - UGraphic2 ug = null; //fileFormatOption.createUGraphic(diagram.getColorMapper(), diagram.getDpiFactor(fileFormatOption), - //dimTotal, null, false); - foo2.drawU(ug); - -// ug.writeImageTOBEMOVED(os, null, diagram.getDpi(fileFormatOption)); -// return new ImageDataSimple(dimTotal); - throw new UnsupportedOperationException(); - } - -} diff --git a/src/net/sourceforge/plantuml/hector2/MinMax.java b/src/net/sourceforge/plantuml/hector2/MinMax.java index 8b7335c47..ad7e1a10f 100644 --- a/src/net/sourceforge/plantuml/hector2/MinMax.java +++ b/src/net/sourceforge/plantuml/hector2/MinMax.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6711 $ * */ package net.sourceforge.plantuml.hector2; diff --git a/src/net/sourceforge/plantuml/hector2/continuity/Skeleton.java b/src/net/sourceforge/plantuml/hector2/continuity/Skeleton.java index af814a869..1e1bd762a 100644 --- a/src/net/sourceforge/plantuml/hector2/continuity/Skeleton.java +++ b/src/net/sourceforge/plantuml/hector2/continuity/Skeleton.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5079 $ * */ package net.sourceforge.plantuml.hector2.continuity; diff --git a/src/net/sourceforge/plantuml/hector2/continuity/SkeletonBuilder.java b/src/net/sourceforge/plantuml/hector2/continuity/SkeletonBuilder.java index b4482b6cc..bb8362516 100644 --- a/src/net/sourceforge/plantuml/hector2/continuity/SkeletonBuilder.java +++ b/src/net/sourceforge/plantuml/hector2/continuity/SkeletonBuilder.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5079 $ * */ package net.sourceforge.plantuml.hector2.continuity; diff --git a/src/net/sourceforge/plantuml/hector2/graphic/Foo1.java b/src/net/sourceforge/plantuml/hector2/graphic/Foo1.java index 5c5772d41..0dffae6c9 100644 --- a/src/net/sourceforge/plantuml/hector2/graphic/Foo1.java +++ b/src/net/sourceforge/plantuml/hector2/graphic/Foo1.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5079 $ * */ package net.sourceforge.plantuml.hector2.graphic; diff --git a/src/net/sourceforge/plantuml/hector2/graphic/Foo2.java b/src/net/sourceforge/plantuml/hector2/graphic/Foo2.java index d48ac78c1..177ac356e 100644 --- a/src/net/sourceforge/plantuml/hector2/graphic/Foo2.java +++ b/src/net/sourceforge/plantuml/hector2/graphic/Foo2.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5079 $ * */ package net.sourceforge.plantuml.hector2.graphic; diff --git a/src/net/sourceforge/plantuml/hector2/layering/Layer.java b/src/net/sourceforge/plantuml/hector2/layering/Layer.java index a2d53924e..6f5e5a554 100644 --- a/src/net/sourceforge/plantuml/hector2/layering/Layer.java +++ b/src/net/sourceforge/plantuml/hector2/layering/Layer.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5079 $ * */ package net.sourceforge.plantuml.hector2.layering; diff --git a/src/net/sourceforge/plantuml/hector2/layering/LayerFactory.java b/src/net/sourceforge/plantuml/hector2/layering/LayerFactory.java index 2690221fc..00a3135fd 100644 --- a/src/net/sourceforge/plantuml/hector2/layering/LayerFactory.java +++ b/src/net/sourceforge/plantuml/hector2/layering/LayerFactory.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5079 $ * */ package net.sourceforge.plantuml.hector2.layering; diff --git a/src/net/sourceforge/plantuml/hector2/mpos/Distribution.java b/src/net/sourceforge/plantuml/hector2/mpos/Distribution.java index 27b31226d..03913b6c8 100644 --- a/src/net/sourceforge/plantuml/hector2/mpos/Distribution.java +++ b/src/net/sourceforge/plantuml/hector2/mpos/Distribution.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5079 $ * */ package net.sourceforge.plantuml.hector2.mpos; diff --git a/src/net/sourceforge/plantuml/hector2/mpos/MutationLayer.java b/src/net/sourceforge/plantuml/hector2/mpos/MutationLayer.java index 00629bc5a..40f9b8885 100644 --- a/src/net/sourceforge/plantuml/hector2/mpos/MutationLayer.java +++ b/src/net/sourceforge/plantuml/hector2/mpos/MutationLayer.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5079 $ * */ package net.sourceforge.plantuml.hector2.mpos; diff --git a/src/net/sourceforge/plantuml/hector2/mpos/MutationLayerMove.java b/src/net/sourceforge/plantuml/hector2/mpos/MutationLayerMove.java index d22f36c37..120239a16 100644 --- a/src/net/sourceforge/plantuml/hector2/mpos/MutationLayerMove.java +++ b/src/net/sourceforge/plantuml/hector2/mpos/MutationLayerMove.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5079 $ * */ package net.sourceforge.plantuml.hector2.mpos; diff --git a/src/net/sourceforge/plantuml/html/CucaDiagramHtmlMaker.java b/src/net/sourceforge/plantuml/html/CucaDiagramHtmlMaker.java index c664da6e9..56dbc6aae 100644 --- a/src/net/sourceforge/plantuml/html/CucaDiagramHtmlMaker.java +++ b/src/net/sourceforge/plantuml/html/CucaDiagramHtmlMaker.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5079 $ * */ package net.sourceforge.plantuml.html; diff --git a/src/net/sourceforge/plantuml/html/LinkHtmlPrinter.java b/src/net/sourceforge/plantuml/html/LinkHtmlPrinter.java index 914bbc2a6..6323c996f 100644 --- a/src/net/sourceforge/plantuml/html/LinkHtmlPrinter.java +++ b/src/net/sourceforge/plantuml/html/LinkHtmlPrinter.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5079 $ * */ package net.sourceforge.plantuml.html; diff --git a/src/net/sourceforge/plantuml/jcckit/PSystemJcckit.java b/src/net/sourceforge/plantuml/jcckit/PSystemJcckit.java index d1975378d..bfdd1c3ef 100644 --- a/src/net/sourceforge/plantuml/jcckit/PSystemJcckit.java +++ b/src/net/sourceforge/plantuml/jcckit/PSystemJcckit.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4041 $ * */ package net.sourceforge.plantuml.jcckit; diff --git a/src/net/sourceforge/plantuml/jcckit/PSystemJcckitFactory.java b/src/net/sourceforge/plantuml/jcckit/PSystemJcckitFactory.java index ced91c52b..b68a3e106 100644 --- a/src/net/sourceforge/plantuml/jcckit/PSystemJcckitFactory.java +++ b/src/net/sourceforge/plantuml/jcckit/PSystemJcckitFactory.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3837 $ * */ package net.sourceforge.plantuml.jcckit; diff --git a/src/net/sourceforge/plantuml/jdot/CucaDiagramFileMakerJDot.java b/src/net/sourceforge/plantuml/jdot/CucaDiagramFileMakerJDot.java index aa0c62032..8e9ee4370 100644 --- a/src/net/sourceforge/plantuml/jdot/CucaDiagramFileMakerJDot.java +++ b/src/net/sourceforge/plantuml/jdot/CucaDiagramFileMakerJDot.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 18280 $ * */ package net.sourceforge.plantuml.jdot; @@ -116,7 +113,7 @@ public class CucaDiagramFileMakerJDot implements CucaDiagramFileMaker { private final CucaDiagram diagram; - private final StringBounder stringBounder = TextBlockUtils.getDummyStringBounder(); + private final StringBounder stringBounder; private final Map nodes = new LinkedHashMap(); private final Map edges = new LinkedHashMap(); private final Map clusters = new LinkedHashMap(); @@ -170,8 +167,9 @@ public class CucaDiagramFileMakerJDot implements CucaDiagramFileMaker { } - public CucaDiagramFileMakerJDot(CucaDiagram diagram) { + public CucaDiagramFileMakerJDot(CucaDiagram diagram, StringBounder stringBounder) { this.diagram = diagram; + this.stringBounder = stringBounder; this.dotStringFactory = new DotStringFactory(stringBounder, diagram); printGroups(diagram.getRootGroup()); @@ -434,7 +432,7 @@ public class CucaDiagramFileMakerJDot implements CucaDiagramFileMaker { diagram.getAnimation(), diagram.getSkinParam().handwritten()); imageBuilder.setUDrawable(new Drawing(null)); - final Dimension2D dim = imageBuilder.getFinalDimension(); + final Dimension2D dim = imageBuilder.getFinalDimension(stringBounder); imageBuilder.setUDrawable(new Drawing(new YMirror(dim.getHeight()))); @@ -484,7 +482,7 @@ public class CucaDiagramFileMakerJDot implements CucaDiagramFileMaker { final FontConfiguration labelFont = new FontConfiguration(skinParam, FontParam.GENERIC_ARROW, null); final TextBlock label = link.getLabel().create(labelFont, skinParam.getDefaultTextAlignment(HorizontalAlignment.CENTER), skinParam); - if (TextBlockUtils.isEmpty(label)) { + if (TextBlockUtils.isEmpty(label, stringBounder)) { return label; } return TextBlockUtils.withMargin(label, marginLabel, marginLabel); @@ -528,7 +526,7 @@ public class CucaDiagramFileMakerJDot implements CucaDiagramFileMaker { // + (length - 1) + " "); final TextBlock label = getLabel(link); - if (TextBlockUtils.isEmpty(label) == false) { + if (TextBlockUtils.isEmpty(label, stringBounder) == false) { final Dimension2D dimLabel = label.calculateDimension(stringBounder); // System.err.println("dimLabel = " + dimLabel); final CString hackDim = Macro.createHackInitDimensionFromLabel((int) dimLabel.getWidth(), diff --git a/src/net/sourceforge/plantuml/jdot/JDotPath.java b/src/net/sourceforge/plantuml/jdot/JDotPath.java index 650de53f4..1dbebe70c 100644 --- a/src/net/sourceforge/plantuml/jdot/JDotPath.java +++ b/src/net/sourceforge/plantuml/jdot/JDotPath.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 18280 $ * */ package net.sourceforge.plantuml.jdot; diff --git a/src/net/sourceforge/plantuml/jdot/YMirror.java b/src/net/sourceforge/plantuml/jdot/YMirror.java index 725fad70c..284c71759 100644 --- a/src/net/sourceforge/plantuml/jdot/YMirror.java +++ b/src/net/sourceforge/plantuml/jdot/YMirror.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.jdot; diff --git a/src/net/sourceforge/plantuml/jungle/CommandAddLevel.java b/src/net/sourceforge/plantuml/jungle/CommandAddLevel.java index f9f242c7d..86144171b 100644 --- a/src/net/sourceforge/plantuml/jungle/CommandAddLevel.java +++ b/src/net/sourceforge/plantuml/jungle/CommandAddLevel.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5424 $ * */ package net.sourceforge.plantuml.jungle; diff --git a/src/net/sourceforge/plantuml/jungle/CommandEmpty.java b/src/net/sourceforge/plantuml/jungle/CommandEmpty.java index 833b6cdc1..da99b99b4 100644 --- a/src/net/sourceforge/plantuml/jungle/CommandEmpty.java +++ b/src/net/sourceforge/plantuml/jungle/CommandEmpty.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5424 $ * */ package net.sourceforge.plantuml.jungle; diff --git a/src/net/sourceforge/plantuml/jungle/GNode.java b/src/net/sourceforge/plantuml/jungle/GNode.java index 8093020ae..7245ff536 100644 --- a/src/net/sourceforge/plantuml/jungle/GNode.java +++ b/src/net/sourceforge/plantuml/jungle/GNode.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8475 $ * */ package net.sourceforge.plantuml.jungle; diff --git a/src/net/sourceforge/plantuml/jungle/GNodeUtils.java b/src/net/sourceforge/plantuml/jungle/GNodeUtils.java index ef46c8fa8..0ab9c504d 100644 --- a/src/net/sourceforge/plantuml/jungle/GNodeUtils.java +++ b/src/net/sourceforge/plantuml/jungle/GNodeUtils.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8475 $ * */ package net.sourceforge.plantuml.jungle; diff --git a/src/net/sourceforge/plantuml/jungle/GTile.java b/src/net/sourceforge/plantuml/jungle/GTile.java index 0be4404b1..13a4e6a01 100644 --- a/src/net/sourceforge/plantuml/jungle/GTile.java +++ b/src/net/sourceforge/plantuml/jungle/GTile.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8475 $ * */ package net.sourceforge.plantuml.jungle; diff --git a/src/net/sourceforge/plantuml/jungle/GTileGeometry.java b/src/net/sourceforge/plantuml/jungle/GTileGeometry.java index d8e1418c3..f815b8e8c 100644 --- a/src/net/sourceforge/plantuml/jungle/GTileGeometry.java +++ b/src/net/sourceforge/plantuml/jungle/GTileGeometry.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8475 $ * */ package net.sourceforge.plantuml.jungle; diff --git a/src/net/sourceforge/plantuml/jungle/GTileLeftRight.java b/src/net/sourceforge/plantuml/jungle/GTileLeftRight.java index adc32c233..bda8c6878 100644 --- a/src/net/sourceforge/plantuml/jungle/GTileLeftRight.java +++ b/src/net/sourceforge/plantuml/jungle/GTileLeftRight.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8475 $ * */ package net.sourceforge.plantuml.jungle; diff --git a/src/net/sourceforge/plantuml/jungle/GTileNode.java b/src/net/sourceforge/plantuml/jungle/GTileNode.java index d59b90fa0..f0a249317 100644 --- a/src/net/sourceforge/plantuml/jungle/GTileNode.java +++ b/src/net/sourceforge/plantuml/jungle/GTileNode.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8475 $ * */ package net.sourceforge.plantuml.jungle; diff --git a/src/net/sourceforge/plantuml/jungle/GTileOneLevelFactory.java b/src/net/sourceforge/plantuml/jungle/GTileOneLevelFactory.java index 5693e341d..9fe20df83 100644 --- a/src/net/sourceforge/plantuml/jungle/GTileOneLevelFactory.java +++ b/src/net/sourceforge/plantuml/jungle/GTileOneLevelFactory.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8475 $ * */ package net.sourceforge.plantuml.jungle; diff --git a/src/net/sourceforge/plantuml/jungle/GTileStack.java b/src/net/sourceforge/plantuml/jungle/GTileStack.java index 923ba803f..67bcedfc7 100644 --- a/src/net/sourceforge/plantuml/jungle/GTileStack.java +++ b/src/net/sourceforge/plantuml/jungle/GTileStack.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8475 $ * */ package net.sourceforge.plantuml.jungle; diff --git a/src/net/sourceforge/plantuml/jungle/Needle.java b/src/net/sourceforge/plantuml/jungle/Needle.java index 9f2ec3bae..4fd8f3387 100644 --- a/src/net/sourceforge/plantuml/jungle/Needle.java +++ b/src/net/sourceforge/plantuml/jungle/Needle.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8475 $ * */ package net.sourceforge.plantuml.jungle; diff --git a/src/net/sourceforge/plantuml/jungle/PSystemTree.java b/src/net/sourceforge/plantuml/jungle/PSystemTree.java index 32dfa04aa..97d0cf28c 100644 --- a/src/net/sourceforge/plantuml/jungle/PSystemTree.java +++ b/src/net/sourceforge/plantuml/jungle/PSystemTree.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * @@ -44,7 +42,6 @@ import net.sourceforge.plantuml.core.DiagramDescriptionImpl; import net.sourceforge.plantuml.core.ImageData; import net.sourceforge.plantuml.cucadiagram.Display; import net.sourceforge.plantuml.graphic.HtmlColorUtils; -import net.sourceforge.plantuml.graphic.TextBlockUtils; import net.sourceforge.plantuml.graphic.UDrawable; import net.sourceforge.plantuml.graphic.UDrawableUtils; import net.sourceforge.plantuml.ugraphic.ColorMapperIdentity; @@ -66,7 +63,7 @@ public class PSystemTree extends AbstractPSystem { 5, 5, null, false); if (rendering == Rendering.NEEDLE) { final UDrawable tmp = Needle.getNeedle(root, 200, 0, 60); - final LimitFinder limitFinder = new LimitFinder(TextBlockUtils.getDummyStringBounder(), true); + final LimitFinder limitFinder = new LimitFinder(fileFormat.getDefaultStringBounder(), true); tmp.drawU(limitFinder); final double minY = limitFinder.getMinY(); builder.setUDrawable(UDrawableUtils.move(tmp, 0, -minY)); diff --git a/src/net/sourceforge/plantuml/jungle/PSystemTreeFactory.java b/src/net/sourceforge/plantuml/jungle/PSystemTreeFactory.java index c931b66b9..e62800329 100644 --- a/src/net/sourceforge/plantuml/jungle/PSystemTreeFactory.java +++ b/src/net/sourceforge/plantuml/jungle/PSystemTreeFactory.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * diff --git a/src/net/sourceforge/plantuml/jungle/Rendering.java b/src/net/sourceforge/plantuml/jungle/Rendering.java index b6e3360e5..136855028 100644 --- a/src/net/sourceforge/plantuml/jungle/Rendering.java +++ b/src/net/sourceforge/plantuml/jungle/Rendering.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8475 $ * */ package net.sourceforge.plantuml.jungle; diff --git a/src/net/sourceforge/plantuml/logo/LogoScanner.java b/src/net/sourceforge/plantuml/logo/LogoScanner.java index 0f7339f00..9a722a5dd 100644 --- a/src/net/sourceforge/plantuml/logo/LogoScanner.java +++ b/src/net/sourceforge/plantuml/logo/LogoScanner.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4041 $ * */ package net.sourceforge.plantuml.logo; diff --git a/src/net/sourceforge/plantuml/logo/LogoToken.java b/src/net/sourceforge/plantuml/logo/LogoToken.java index 87219ba3d..7b1d65897 100644 --- a/src/net/sourceforge/plantuml/logo/LogoToken.java +++ b/src/net/sourceforge/plantuml/logo/LogoToken.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4041 $ * */ package net.sourceforge.plantuml.logo; diff --git a/src/net/sourceforge/plantuml/logo/PSystemLogo.java b/src/net/sourceforge/plantuml/logo/PSystemLogo.java index f7a4f7b0c..fdf862efe 100644 --- a/src/net/sourceforge/plantuml/logo/PSystemLogo.java +++ b/src/net/sourceforge/plantuml/logo/PSystemLogo.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4041 $ * */ package net.sourceforge.plantuml.logo; diff --git a/src/net/sourceforge/plantuml/logo/PSystemLogoFactory.java b/src/net/sourceforge/plantuml/logo/PSystemLogoFactory.java index 408904b59..cb3edd39f 100644 --- a/src/net/sourceforge/plantuml/logo/PSystemLogoFactory.java +++ b/src/net/sourceforge/plantuml/logo/PSystemLogoFactory.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3830 $ * */ package net.sourceforge.plantuml.logo; diff --git a/src/net/sourceforge/plantuml/logo/TinyJavaLogo.java b/src/net/sourceforge/plantuml/logo/TinyJavaLogo.java index f2b245cf6..6b413eaaf 100644 --- a/src/net/sourceforge/plantuml/logo/TinyJavaLogo.java +++ b/src/net/sourceforge/plantuml/logo/TinyJavaLogo.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4041 $ * */ package net.sourceforge.plantuml.logo; diff --git a/src/net/sourceforge/plantuml/logo/TurtleGraphicsPane.java b/src/net/sourceforge/plantuml/logo/TurtleGraphicsPane.java index fd71bbe71..92708077c 100644 --- a/src/net/sourceforge/plantuml/logo/TurtleGraphicsPane.java +++ b/src/net/sourceforge/plantuml/logo/TurtleGraphicsPane.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4041 $ * */ package net.sourceforge.plantuml.logo; diff --git a/src/net/sourceforge/plantuml/mda/MDADiagramImpl.java b/src/net/sourceforge/plantuml/mda/MDADiagramImpl.java index 6aedb02e4..d56171c90 100644 --- a/src/net/sourceforge/plantuml/mda/MDADiagramImpl.java +++ b/src/net/sourceforge/plantuml/mda/MDADiagramImpl.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 9786 $ * */ package net.sourceforge.plantuml.mda; diff --git a/src/net/sourceforge/plantuml/mda/MDAEntityImpl.java b/src/net/sourceforge/plantuml/mda/MDAEntityImpl.java index 0a824c912..6ab4e693f 100644 --- a/src/net/sourceforge/plantuml/mda/MDAEntityImpl.java +++ b/src/net/sourceforge/plantuml/mda/MDAEntityImpl.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 9786 $ * */ package net.sourceforge.plantuml.mda; diff --git a/src/net/sourceforge/plantuml/mda/MDAPackageImpl.java b/src/net/sourceforge/plantuml/mda/MDAPackageImpl.java index ee44e76cf..6f4c57067 100644 --- a/src/net/sourceforge/plantuml/mda/MDAPackageImpl.java +++ b/src/net/sourceforge/plantuml/mda/MDAPackageImpl.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 9786 $ * */ package net.sourceforge.plantuml.mda; diff --git a/src/net/sourceforge/plantuml/objectdiagram/AbstractClassOrObjectDiagram.java b/src/net/sourceforge/plantuml/objectdiagram/AbstractClassOrObjectDiagram.java index 451530209..10a715a29 100644 --- a/src/net/sourceforge/plantuml/objectdiagram/AbstractClassOrObjectDiagram.java +++ b/src/net/sourceforge/plantuml/objectdiagram/AbstractClassOrObjectDiagram.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4159 $ * */ package net.sourceforge.plantuml.objectdiagram; diff --git a/src/net/sourceforge/plantuml/objectdiagram/ObjectDiagram.java b/src/net/sourceforge/plantuml/objectdiagram/ObjectDiagram.java index f78c42a57..286bcff1e 100644 --- a/src/net/sourceforge/plantuml/objectdiagram/ObjectDiagram.java +++ b/src/net/sourceforge/plantuml/objectdiagram/ObjectDiagram.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4159 $ * */ package net.sourceforge.plantuml.objectdiagram; diff --git a/src/net/sourceforge/plantuml/objectdiagram/ObjectDiagramFactory.java b/src/net/sourceforge/plantuml/objectdiagram/ObjectDiagramFactory.java index 29aeb6788..28dc5fb36 100644 --- a/src/net/sourceforge/plantuml/objectdiagram/ObjectDiagramFactory.java +++ b/src/net/sourceforge/plantuml/objectdiagram/ObjectDiagramFactory.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4192 $ * */ package net.sourceforge.plantuml.objectdiagram; diff --git a/src/net/sourceforge/plantuml/objectdiagram/command/CommandAddData.java b/src/net/sourceforge/plantuml/objectdiagram/command/CommandAddData.java index bc645edaa..37824d891 100644 --- a/src/net/sourceforge/plantuml/objectdiagram/command/CommandAddData.java +++ b/src/net/sourceforge/plantuml/objectdiagram/command/CommandAddData.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4546 $ * */ package net.sourceforge.plantuml.objectdiagram.command; diff --git a/src/net/sourceforge/plantuml/objectdiagram/command/CommandCreateEntityObject.java b/src/net/sourceforge/plantuml/objectdiagram/command/CommandCreateEntityObject.java index 0f5b715c7..c555323d9 100644 --- a/src/net/sourceforge/plantuml/objectdiagram/command/CommandCreateEntityObject.java +++ b/src/net/sourceforge/plantuml/objectdiagram/command/CommandCreateEntityObject.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4161 $ * */ package net.sourceforge.plantuml.objectdiagram.command; diff --git a/src/net/sourceforge/plantuml/objectdiagram/command/CommandCreateEntityObjectMultilines.java b/src/net/sourceforge/plantuml/objectdiagram/command/CommandCreateEntityObjectMultilines.java index 7296d8d51..dc2a83afe 100644 --- a/src/net/sourceforge/plantuml/objectdiagram/command/CommandCreateEntityObjectMultilines.java +++ b/src/net/sourceforge/plantuml/objectdiagram/command/CommandCreateEntityObjectMultilines.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4161 $ * */ package net.sourceforge.plantuml.objectdiagram.command; diff --git a/src/net/sourceforge/plantuml/openiconic/Movement.java b/src/net/sourceforge/plantuml/openiconic/Movement.java index f16641b83..b748e2a80 100644 --- a/src/net/sourceforge/plantuml/openiconic/Movement.java +++ b/src/net/sourceforge/plantuml/openiconic/Movement.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 12819 $ * */ package net.sourceforge.plantuml.openiconic; diff --git a/src/net/sourceforge/plantuml/openiconic/OpenIcon.java b/src/net/sourceforge/plantuml/openiconic/OpenIcon.java index ccd29744d..cd0350102 100644 --- a/src/net/sourceforge/plantuml/openiconic/OpenIcon.java +++ b/src/net/sourceforge/plantuml/openiconic/OpenIcon.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 12819 $ * */ package net.sourceforge.plantuml.openiconic; diff --git a/src/net/sourceforge/plantuml/openiconic/PSystemListOpenIconic.java b/src/net/sourceforge/plantuml/openiconic/PSystemListOpenIconic.java index c1bb0af38..466aba72e 100644 --- a/src/net/sourceforge/plantuml/openiconic/PSystemListOpenIconic.java +++ b/src/net/sourceforge/plantuml/openiconic/PSystemListOpenIconic.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4041 $ * */ package net.sourceforge.plantuml.openiconic; diff --git a/src/net/sourceforge/plantuml/openiconic/PSystemListOpenIconicFactory.java b/src/net/sourceforge/plantuml/openiconic/PSystemListOpenIconicFactory.java index b77857608..4e37fb6de 100644 --- a/src/net/sourceforge/plantuml/openiconic/PSystemListOpenIconicFactory.java +++ b/src/net/sourceforge/plantuml/openiconic/PSystemListOpenIconicFactory.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3830 $ * */ package net.sourceforge.plantuml.openiconic; diff --git a/src/net/sourceforge/plantuml/openiconic/PSystemOpenIconic.java b/src/net/sourceforge/plantuml/openiconic/PSystemOpenIconic.java index 13ef157fd..8b058d939 100644 --- a/src/net/sourceforge/plantuml/openiconic/PSystemOpenIconic.java +++ b/src/net/sourceforge/plantuml/openiconic/PSystemOpenIconic.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4041 $ * */ package net.sourceforge.plantuml.openiconic; diff --git a/src/net/sourceforge/plantuml/openiconic/PSystemOpenIconicFactory.java b/src/net/sourceforge/plantuml/openiconic/PSystemOpenIconicFactory.java index bfb3830b0..76c6d5f90 100644 --- a/src/net/sourceforge/plantuml/openiconic/PSystemOpenIconicFactory.java +++ b/src/net/sourceforge/plantuml/openiconic/PSystemOpenIconicFactory.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3830 $ * */ package net.sourceforge.plantuml.openiconic; diff --git a/src/net/sourceforge/plantuml/openiconic/StringDecipher.java b/src/net/sourceforge/plantuml/openiconic/StringDecipher.java index 478a214b7..506b158a9 100644 --- a/src/net/sourceforge/plantuml/openiconic/StringDecipher.java +++ b/src/net/sourceforge/plantuml/openiconic/StringDecipher.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 12819 $ * */ package net.sourceforge.plantuml.openiconic; diff --git a/src/net/sourceforge/plantuml/openiconic/SvgCommand.java b/src/net/sourceforge/plantuml/openiconic/SvgCommand.java index 9deac82b0..d92051caa 100644 --- a/src/net/sourceforge/plantuml/openiconic/SvgCommand.java +++ b/src/net/sourceforge/plantuml/openiconic/SvgCommand.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 12819 $ * */ package net.sourceforge.plantuml.openiconic; diff --git a/src/net/sourceforge/plantuml/openiconic/SvgCommandLetter.java b/src/net/sourceforge/plantuml/openiconic/SvgCommandLetter.java index e059c0187..6db50a15e 100644 --- a/src/net/sourceforge/plantuml/openiconic/SvgCommandLetter.java +++ b/src/net/sourceforge/plantuml/openiconic/SvgCommandLetter.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 12819 $ * */ package net.sourceforge.plantuml.openiconic; diff --git a/src/net/sourceforge/plantuml/openiconic/SvgCommandNumber.java b/src/net/sourceforge/plantuml/openiconic/SvgCommandNumber.java index 7331e9064..5b843858a 100644 --- a/src/net/sourceforge/plantuml/openiconic/SvgCommandNumber.java +++ b/src/net/sourceforge/plantuml/openiconic/SvgCommandNumber.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 12819 $ * */ package net.sourceforge.plantuml.openiconic; diff --git a/src/net/sourceforge/plantuml/openiconic/SvgPath.java b/src/net/sourceforge/plantuml/openiconic/SvgPath.java index dc25e9ad0..3805248f6 100644 --- a/src/net/sourceforge/plantuml/openiconic/SvgPath.java +++ b/src/net/sourceforge/plantuml/openiconic/SvgPath.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 12819 $ * */ package net.sourceforge.plantuml.openiconic; diff --git a/src/net/sourceforge/plantuml/openiconic/SvgPosition.java b/src/net/sourceforge/plantuml/openiconic/SvgPosition.java index f99314408..6b39bc5dc 100644 --- a/src/net/sourceforge/plantuml/openiconic/SvgPosition.java +++ b/src/net/sourceforge/plantuml/openiconic/SvgPosition.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 12819 $ * */ package net.sourceforge.plantuml.openiconic; diff --git a/src/net/sourceforge/plantuml/openiconic/data/DummyIcon.java b/src/net/sourceforge/plantuml/openiconic/data/DummyIcon.java index 2cba379d3..655a8ef70 100644 --- a/src/net/sourceforge/plantuml/openiconic/data/DummyIcon.java +++ b/src/net/sourceforge/plantuml/openiconic/data/DummyIcon.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 12819 $ * */ package net.sourceforge.plantuml.openiconic.data; diff --git a/src/net/sourceforge/plantuml/oregon/BasicGame.java b/src/net/sourceforge/plantuml/oregon/BasicGame.java index 8c028b666..462c94a84 100644 --- a/src/net/sourceforge/plantuml/oregon/BasicGame.java +++ b/src/net/sourceforge/plantuml/oregon/BasicGame.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4639 $ * */ package net.sourceforge.plantuml.oregon; diff --git a/src/net/sourceforge/plantuml/oregon/Keyboard.java b/src/net/sourceforge/plantuml/oregon/Keyboard.java index 585d34275..13655c826 100644 --- a/src/net/sourceforge/plantuml/oregon/Keyboard.java +++ b/src/net/sourceforge/plantuml/oregon/Keyboard.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4639 $ * */ package net.sourceforge.plantuml.oregon; diff --git a/src/net/sourceforge/plantuml/oregon/KeyboardList.java b/src/net/sourceforge/plantuml/oregon/KeyboardList.java index c852f2f66..3529ca8fb 100644 --- a/src/net/sourceforge/plantuml/oregon/KeyboardList.java +++ b/src/net/sourceforge/plantuml/oregon/KeyboardList.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4639 $ * */ package net.sourceforge.plantuml.oregon; diff --git a/src/net/sourceforge/plantuml/oregon/MagicTable.java b/src/net/sourceforge/plantuml/oregon/MagicTable.java index e64b644bf..989006cab 100644 --- a/src/net/sourceforge/plantuml/oregon/MagicTable.java +++ b/src/net/sourceforge/plantuml/oregon/MagicTable.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4639 $ * */ package net.sourceforge.plantuml.oregon; diff --git a/src/net/sourceforge/plantuml/oregon/NoInputException.java b/src/net/sourceforge/plantuml/oregon/NoInputException.java index 52ba4a092..72e4aba94 100644 --- a/src/net/sourceforge/plantuml/oregon/NoInputException.java +++ b/src/net/sourceforge/plantuml/oregon/NoInputException.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4639 $ * */ package net.sourceforge.plantuml.oregon; diff --git a/src/net/sourceforge/plantuml/oregon/OregonBasicGame.java b/src/net/sourceforge/plantuml/oregon/OregonBasicGame.java index a77c6bcb6..73071c795 100644 --- a/src/net/sourceforge/plantuml/oregon/OregonBasicGame.java +++ b/src/net/sourceforge/plantuml/oregon/OregonBasicGame.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4639 $ * */ package net.sourceforge.plantuml.oregon; diff --git a/src/net/sourceforge/plantuml/oregon/PSystemOregon.java b/src/net/sourceforge/plantuml/oregon/PSystemOregon.java index ca0b569a5..d376ada7e 100644 --- a/src/net/sourceforge/plantuml/oregon/PSystemOregon.java +++ b/src/net/sourceforge/plantuml/oregon/PSystemOregon.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4041 $ * */ package net.sourceforge.plantuml.oregon; diff --git a/src/net/sourceforge/plantuml/oregon/PSystemOregonFactory.java b/src/net/sourceforge/plantuml/oregon/PSystemOregonFactory.java index 227c43c90..99699038a 100644 --- a/src/net/sourceforge/plantuml/oregon/PSystemOregonFactory.java +++ b/src/net/sourceforge/plantuml/oregon/PSystemOregonFactory.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3837 $ * */ package net.sourceforge.plantuml.oregon; diff --git a/src/net/sourceforge/plantuml/oregon/Screen.java b/src/net/sourceforge/plantuml/oregon/Screen.java index 47bb9289f..f6d60ae6b 100644 --- a/src/net/sourceforge/plantuml/oregon/Screen.java +++ b/src/net/sourceforge/plantuml/oregon/Screen.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4639 $ * */ package net.sourceforge.plantuml.oregon; diff --git a/src/net/sourceforge/plantuml/oregon/SecureCoder.java b/src/net/sourceforge/plantuml/oregon/SecureCoder.java index eddd54308..f9755ae8f 100644 --- a/src/net/sourceforge/plantuml/oregon/SecureCoder.java +++ b/src/net/sourceforge/plantuml/oregon/SecureCoder.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4639 $ * */ package net.sourceforge.plantuml.oregon; diff --git a/src/net/sourceforge/plantuml/oregon/SmartKeyboard.java b/src/net/sourceforge/plantuml/oregon/SmartKeyboard.java index eb9726987..a9d2be215 100644 --- a/src/net/sourceforge/plantuml/oregon/SmartKeyboard.java +++ b/src/net/sourceforge/plantuml/oregon/SmartKeyboard.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4639 $ * */ package net.sourceforge.plantuml.oregon; diff --git a/src/net/sourceforge/plantuml/pdf/PdfConverter.java b/src/net/sourceforge/plantuml/pdf/PdfConverter.java index 37161321a..ae7bcddec 100644 --- a/src/net/sourceforge/plantuml/pdf/PdfConverter.java +++ b/src/net/sourceforge/plantuml/pdf/PdfConverter.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6600 $ * */ package net.sourceforge.plantuml.pdf; diff --git a/src/net/sourceforge/plantuml/png/Metadata.java b/src/net/sourceforge/plantuml/png/Metadata.java index ad2e8615b..07b52ead0 100644 --- a/src/net/sourceforge/plantuml/png/Metadata.java +++ b/src/net/sourceforge/plantuml/png/Metadata.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.png; diff --git a/src/net/sourceforge/plantuml/png/MetadataTag.java b/src/net/sourceforge/plantuml/png/MetadataTag.java index 85c7541ea..bddd4a8b7 100644 --- a/src/net/sourceforge/plantuml/png/MetadataTag.java +++ b/src/net/sourceforge/plantuml/png/MetadataTag.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.png; diff --git a/src/net/sourceforge/plantuml/png/PngFlashcoder.java b/src/net/sourceforge/plantuml/png/PngFlashcoder.java index c6efee6a7..0f041d591 100644 --- a/src/net/sourceforge/plantuml/png/PngFlashcoder.java +++ b/src/net/sourceforge/plantuml/png/PngFlashcoder.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6009 $ * */ package net.sourceforge.plantuml.png; diff --git a/src/net/sourceforge/plantuml/png/PngIO.java b/src/net/sourceforge/plantuml/png/PngIO.java index 724fa8736..37b25c42c 100644 --- a/src/net/sourceforge/plantuml/png/PngIO.java +++ b/src/net/sourceforge/plantuml/png/PngIO.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19254 $ * */ package net.sourceforge.plantuml.png; diff --git a/src/net/sourceforge/plantuml/png/PngIOMetadata.java b/src/net/sourceforge/plantuml/png/PngIOMetadata.java index f505cc338..fdb20afd2 100644 --- a/src/net/sourceforge/plantuml/png/PngIOMetadata.java +++ b/src/net/sourceforge/plantuml/png/PngIOMetadata.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4231 $ * */ package net.sourceforge.plantuml.png; diff --git a/src/net/sourceforge/plantuml/png/PngRotation.java b/src/net/sourceforge/plantuml/png/PngRotation.java index 319d2d662..5d8504956 100644 --- a/src/net/sourceforge/plantuml/png/PngRotation.java +++ b/src/net/sourceforge/plantuml/png/PngRotation.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.png; diff --git a/src/net/sourceforge/plantuml/png/PngSegment.java b/src/net/sourceforge/plantuml/png/PngSegment.java index abfaa9eb6..18965cac3 100644 --- a/src/net/sourceforge/plantuml/png/PngSegment.java +++ b/src/net/sourceforge/plantuml/png/PngSegment.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.png; diff --git a/src/net/sourceforge/plantuml/png/PngSizer.java b/src/net/sourceforge/plantuml/png/PngSizer.java index 320e44acc..3c9d16060 100644 --- a/src/net/sourceforge/plantuml/png/PngSizer.java +++ b/src/net/sourceforge/plantuml/png/PngSizer.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.png; diff --git a/src/net/sourceforge/plantuml/png/PngSplitter.java b/src/net/sourceforge/plantuml/png/PngSplitter.java index d8ddcd4fe..e2c45733f 100644 --- a/src/net/sourceforge/plantuml/png/PngSplitter.java +++ b/src/net/sourceforge/plantuml/png/PngSplitter.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.png; diff --git a/src/net/sourceforge/plantuml/png/PngTitler.java b/src/net/sourceforge/plantuml/png/PngTitler.java index 51a179b8a..f8860d909 100644 --- a/src/net/sourceforge/plantuml/png/PngTitler.java +++ b/src/net/sourceforge/plantuml/png/PngTitler.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.png; diff --git a/src/net/sourceforge/plantuml/posimo/AbstractEntityImage2.java b/src/net/sourceforge/plantuml/posimo/AbstractEntityImage2.java index 38cf4cbdb..d69ca2314 100644 --- a/src/net/sourceforge/plantuml/posimo/AbstractEntityImage2.java +++ b/src/net/sourceforge/plantuml/posimo/AbstractEntityImage2.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3831 $ * */ package net.sourceforge.plantuml.posimo; diff --git a/src/net/sourceforge/plantuml/posimo/BezierUtils.java b/src/net/sourceforge/plantuml/posimo/BezierUtils.java index bfc07dd33..fd904ca64 100644 --- a/src/net/sourceforge/plantuml/posimo/BezierUtils.java +++ b/src/net/sourceforge/plantuml/posimo/BezierUtils.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.posimo; diff --git a/src/net/sourceforge/plantuml/posimo/Block.java b/src/net/sourceforge/plantuml/posimo/Block.java index 33e34421c..6f0271ea5 100644 --- a/src/net/sourceforge/plantuml/posimo/Block.java +++ b/src/net/sourceforge/plantuml/posimo/Block.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.posimo; diff --git a/src/net/sourceforge/plantuml/posimo/Cluster.java b/src/net/sourceforge/plantuml/posimo/Cluster.java index d5adf6b8e..c09b893ed 100644 --- a/src/net/sourceforge/plantuml/posimo/Cluster.java +++ b/src/net/sourceforge/plantuml/posimo/Cluster.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.posimo; diff --git a/src/net/sourceforge/plantuml/posimo/Clusterable.java b/src/net/sourceforge/plantuml/posimo/Clusterable.java index 3c7dcb8f0..c48f6e671 100644 --- a/src/net/sourceforge/plantuml/posimo/Clusterable.java +++ b/src/net/sourceforge/plantuml/posimo/Clusterable.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.posimo; diff --git a/src/net/sourceforge/plantuml/posimo/Decor.java b/src/net/sourceforge/plantuml/posimo/Decor.java index 1e44407db..ad513ff16 100644 --- a/src/net/sourceforge/plantuml/posimo/Decor.java +++ b/src/net/sourceforge/plantuml/posimo/Decor.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.posimo; diff --git a/src/net/sourceforge/plantuml/posimo/DecorInterfaceProvider.java b/src/net/sourceforge/plantuml/posimo/DecorInterfaceProvider.java index f9a62786a..b07b8b030 100644 --- a/src/net/sourceforge/plantuml/posimo/DecorInterfaceProvider.java +++ b/src/net/sourceforge/plantuml/posimo/DecorInterfaceProvider.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.posimo; diff --git a/src/net/sourceforge/plantuml/posimo/DotPath.java b/src/net/sourceforge/plantuml/posimo/DotPath.java index 676273272..7ebd5eaea 100644 --- a/src/net/sourceforge/plantuml/posimo/DotPath.java +++ b/src/net/sourceforge/plantuml/posimo/DotPath.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.posimo; diff --git a/src/net/sourceforge/plantuml/posimo/DotxMaker.java b/src/net/sourceforge/plantuml/posimo/DotxMaker.java index 517377191..34ec1694a 100644 --- a/src/net/sourceforge/plantuml/posimo/DotxMaker.java +++ b/src/net/sourceforge/plantuml/posimo/DotxMaker.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.posimo; diff --git a/src/net/sourceforge/plantuml/posimo/EntityImageNote2.java b/src/net/sourceforge/plantuml/posimo/EntityImageNote2.java index e128a3d69..0b565256f 100644 --- a/src/net/sourceforge/plantuml/posimo/EntityImageNote2.java +++ b/src/net/sourceforge/plantuml/posimo/EntityImageNote2.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5183 $ * */ package net.sourceforge.plantuml.posimo; diff --git a/src/net/sourceforge/plantuml/posimo/Frame.java b/src/net/sourceforge/plantuml/posimo/Frame.java index 945b618ae..27d56efa6 100644 --- a/src/net/sourceforge/plantuml/posimo/Frame.java +++ b/src/net/sourceforge/plantuml/posimo/Frame.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.posimo; diff --git a/src/net/sourceforge/plantuml/posimo/GraphvizSolverB.java b/src/net/sourceforge/plantuml/posimo/GraphvizSolverB.java index 2f1df51d5..9d6d9c926 100644 --- a/src/net/sourceforge/plantuml/posimo/GraphvizSolverB.java +++ b/src/net/sourceforge/plantuml/posimo/GraphvizSolverB.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.posimo; diff --git a/src/net/sourceforge/plantuml/posimo/IEntityImageBlock.java b/src/net/sourceforge/plantuml/posimo/IEntityImageBlock.java index eadfd10e5..afb28545f 100644 --- a/src/net/sourceforge/plantuml/posimo/IEntityImageBlock.java +++ b/src/net/sourceforge/plantuml/posimo/IEntityImageBlock.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.posimo; diff --git a/src/net/sourceforge/plantuml/posimo/Label.java b/src/net/sourceforge/plantuml/posimo/Label.java index 59783f314..9126e64be 100644 --- a/src/net/sourceforge/plantuml/posimo/Label.java +++ b/src/net/sourceforge/plantuml/posimo/Label.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.posimo; diff --git a/src/net/sourceforge/plantuml/posimo/LabelImage.java b/src/net/sourceforge/plantuml/posimo/LabelImage.java index 9e00a9da2..9dee55488 100644 --- a/src/net/sourceforge/plantuml/posimo/LabelImage.java +++ b/src/net/sourceforge/plantuml/posimo/LabelImage.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.posimo; diff --git a/src/net/sourceforge/plantuml/posimo/LineRectIntersection.java b/src/net/sourceforge/plantuml/posimo/LineRectIntersection.java index 949a208c6..ed3969b95 100644 --- a/src/net/sourceforge/plantuml/posimo/LineRectIntersection.java +++ b/src/net/sourceforge/plantuml/posimo/LineRectIntersection.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.posimo; diff --git a/src/net/sourceforge/plantuml/posimo/LineSegmentIntersection.java b/src/net/sourceforge/plantuml/posimo/LineSegmentIntersection.java index c8ff5e3bc..3e16d43cb 100644 --- a/src/net/sourceforge/plantuml/posimo/LineSegmentIntersection.java +++ b/src/net/sourceforge/plantuml/posimo/LineSegmentIntersection.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.posimo; diff --git a/src/net/sourceforge/plantuml/posimo/MargedBlock.java b/src/net/sourceforge/plantuml/posimo/MargedBlock.java index 0d9c68904..baab9fe31 100644 --- a/src/net/sourceforge/plantuml/posimo/MargedBlock.java +++ b/src/net/sourceforge/plantuml/posimo/MargedBlock.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.posimo; diff --git a/src/net/sourceforge/plantuml/posimo/Mirror.java b/src/net/sourceforge/plantuml/posimo/Mirror.java index ebfe44a2e..b412c9fbf 100644 --- a/src/net/sourceforge/plantuml/posimo/Mirror.java +++ b/src/net/sourceforge/plantuml/posimo/Mirror.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.posimo; diff --git a/src/net/sourceforge/plantuml/posimo/Moveable.java b/src/net/sourceforge/plantuml/posimo/Moveable.java index 1677d273b..1c20817fd 100644 --- a/src/net/sourceforge/plantuml/posimo/Moveable.java +++ b/src/net/sourceforge/plantuml/posimo/Moveable.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.posimo; diff --git a/src/net/sourceforge/plantuml/posimo/Path.java b/src/net/sourceforge/plantuml/posimo/Path.java index 7b6d62b8c..bd302ac15 100644 --- a/src/net/sourceforge/plantuml/posimo/Path.java +++ b/src/net/sourceforge/plantuml/posimo/Path.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.posimo; diff --git a/src/net/sourceforge/plantuml/posimo/PathDrawer.java b/src/net/sourceforge/plantuml/posimo/PathDrawer.java index dcf668142..00916b911 100644 --- a/src/net/sourceforge/plantuml/posimo/PathDrawer.java +++ b/src/net/sourceforge/plantuml/posimo/PathDrawer.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.posimo; diff --git a/src/net/sourceforge/plantuml/posimo/PathDrawerInterface.java b/src/net/sourceforge/plantuml/posimo/PathDrawerInterface.java index 82542013a..306bc150a 100644 --- a/src/net/sourceforge/plantuml/posimo/PathDrawerInterface.java +++ b/src/net/sourceforge/plantuml/posimo/PathDrawerInterface.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.posimo; diff --git a/src/net/sourceforge/plantuml/posimo/Positionable.java b/src/net/sourceforge/plantuml/posimo/Positionable.java index 3a4c3ce5f..802937622 100644 --- a/src/net/sourceforge/plantuml/posimo/Positionable.java +++ b/src/net/sourceforge/plantuml/posimo/Positionable.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.posimo; diff --git a/src/net/sourceforge/plantuml/posimo/PositionableImpl.java b/src/net/sourceforge/plantuml/posimo/PositionableImpl.java index 83bf321f0..f1680ffe4 100644 --- a/src/net/sourceforge/plantuml/posimo/PositionableImpl.java +++ b/src/net/sourceforge/plantuml/posimo/PositionableImpl.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.posimo; diff --git a/src/net/sourceforge/plantuml/posimo/PositionableUtils.java b/src/net/sourceforge/plantuml/posimo/PositionableUtils.java index 3bfb5bdc5..af8e9099a 100644 --- a/src/net/sourceforge/plantuml/posimo/PositionableUtils.java +++ b/src/net/sourceforge/plantuml/posimo/PositionableUtils.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.posimo; diff --git a/src/net/sourceforge/plantuml/posimo/Racorder.java b/src/net/sourceforge/plantuml/posimo/Racorder.java index 40884c4d1..4a4b16110 100644 --- a/src/net/sourceforge/plantuml/posimo/Racorder.java +++ b/src/net/sourceforge/plantuml/posimo/Racorder.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.posimo; diff --git a/src/net/sourceforge/plantuml/posimo/RacorderAbstract.java b/src/net/sourceforge/plantuml/posimo/RacorderAbstract.java index b03eabc12..5360d2b9a 100644 --- a/src/net/sourceforge/plantuml/posimo/RacorderAbstract.java +++ b/src/net/sourceforge/plantuml/posimo/RacorderAbstract.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.posimo; diff --git a/src/net/sourceforge/plantuml/posimo/RacorderFollowTangeante.java b/src/net/sourceforge/plantuml/posimo/RacorderFollowTangeante.java index 34bc4857a..f887d8c48 100644 --- a/src/net/sourceforge/plantuml/posimo/RacorderFollowTangeante.java +++ b/src/net/sourceforge/plantuml/posimo/RacorderFollowTangeante.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.posimo; diff --git a/src/net/sourceforge/plantuml/posimo/RacorderFollowTangeanteOld.java b/src/net/sourceforge/plantuml/posimo/RacorderFollowTangeanteOld.java index 94c405215..c8cd192f0 100644 --- a/src/net/sourceforge/plantuml/posimo/RacorderFollowTangeanteOld.java +++ b/src/net/sourceforge/plantuml/posimo/RacorderFollowTangeanteOld.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.posimo; diff --git a/src/net/sourceforge/plantuml/posimo/RacorderInToCenter.java b/src/net/sourceforge/plantuml/posimo/RacorderInToCenter.java index 1f4eb7163..5779c2c57 100644 --- a/src/net/sourceforge/plantuml/posimo/RacorderInToCenter.java +++ b/src/net/sourceforge/plantuml/posimo/RacorderInToCenter.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.posimo; diff --git a/src/net/sourceforge/plantuml/posimo/RacorderOrthogonal.java b/src/net/sourceforge/plantuml/posimo/RacorderOrthogonal.java index 7d0bf3a76..1c8904388 100644 --- a/src/net/sourceforge/plantuml/posimo/RacorderOrthogonal.java +++ b/src/net/sourceforge/plantuml/posimo/RacorderOrthogonal.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.posimo; diff --git a/src/net/sourceforge/plantuml/posimo/SimpleDrawer.java b/src/net/sourceforge/plantuml/posimo/SimpleDrawer.java index c86a1b3e7..9261ea813 100644 --- a/src/net/sourceforge/plantuml/posimo/SimpleDrawer.java +++ b/src/net/sourceforge/plantuml/posimo/SimpleDrawer.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.posimo; diff --git a/src/net/sourceforge/plantuml/posimo/TwoLinesIntersection.java b/src/net/sourceforge/plantuml/posimo/TwoLinesIntersection.java index 6ef1ae5cb..5bf1912e5 100644 --- a/src/net/sourceforge/plantuml/posimo/TwoLinesIntersection.java +++ b/src/net/sourceforge/plantuml/posimo/TwoLinesIntersection.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.posimo; diff --git a/src/net/sourceforge/plantuml/postit/Area.java b/src/net/sourceforge/plantuml/postit/Area.java index fe7b09534..b4a059f27 100644 --- a/src/net/sourceforge/plantuml/postit/Area.java +++ b/src/net/sourceforge/plantuml/postit/Area.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4167 $ * */ package net.sourceforge.plantuml.postit; diff --git a/src/net/sourceforge/plantuml/postit/AreaLayout.java b/src/net/sourceforge/plantuml/postit/AreaLayout.java index 2e2e393fe..42ce304bd 100644 --- a/src/net/sourceforge/plantuml/postit/AreaLayout.java +++ b/src/net/sourceforge/plantuml/postit/AreaLayout.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4167 $ * */ package net.sourceforge.plantuml.postit; diff --git a/src/net/sourceforge/plantuml/postit/AreaLayoutFixedWidth.java b/src/net/sourceforge/plantuml/postit/AreaLayoutFixedWidth.java index dd071849c..3582e3d67 100644 --- a/src/net/sourceforge/plantuml/postit/AreaLayoutFixedWidth.java +++ b/src/net/sourceforge/plantuml/postit/AreaLayoutFixedWidth.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4167 $ * */ package net.sourceforge.plantuml.postit; diff --git a/src/net/sourceforge/plantuml/postit/CommandCreatePostIt.java b/src/net/sourceforge/plantuml/postit/CommandCreatePostIt.java index 910863675..93e86050a 100644 --- a/src/net/sourceforge/plantuml/postit/CommandCreatePostIt.java +++ b/src/net/sourceforge/plantuml/postit/CommandCreatePostIt.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5424 $ * */ package net.sourceforge.plantuml.postit; diff --git a/src/net/sourceforge/plantuml/postit/CommandWidth.java b/src/net/sourceforge/plantuml/postit/CommandWidth.java index b1f59434f..4ed66df00 100644 --- a/src/net/sourceforge/plantuml/postit/CommandWidth.java +++ b/src/net/sourceforge/plantuml/postit/CommandWidth.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4762 $ * */ package net.sourceforge.plantuml.postit; diff --git a/src/net/sourceforge/plantuml/postit/Elastic.java b/src/net/sourceforge/plantuml/postit/Elastic.java index 55bc683d2..4109d2a54 100644 --- a/src/net/sourceforge/plantuml/postit/Elastic.java +++ b/src/net/sourceforge/plantuml/postit/Elastic.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4167 $ * */ package net.sourceforge.plantuml.postit; diff --git a/src/net/sourceforge/plantuml/postit/PostIdDiagramFactory.java b/src/net/sourceforge/plantuml/postit/PostIdDiagramFactory.java index 230364c02..80eda7d8b 100644 --- a/src/net/sourceforge/plantuml/postit/PostIdDiagramFactory.java +++ b/src/net/sourceforge/plantuml/postit/PostIdDiagramFactory.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6137 $ * */ package net.sourceforge.plantuml.postit; diff --git a/src/net/sourceforge/plantuml/postit/PostIt.java b/src/net/sourceforge/plantuml/postit/PostIt.java index eabb0fc22..2ae7edf17 100644 --- a/src/net/sourceforge/plantuml/postit/PostIt.java +++ b/src/net/sourceforge/plantuml/postit/PostIt.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4167 $ * */ package net.sourceforge.plantuml.postit; diff --git a/src/net/sourceforge/plantuml/postit/PostItDiagram.java b/src/net/sourceforge/plantuml/postit/PostItDiagram.java index 9d1312a6d..6e63fc172 100644 --- a/src/net/sourceforge/plantuml/postit/PostItDiagram.java +++ b/src/net/sourceforge/plantuml/postit/PostItDiagram.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4167 $ * */ package net.sourceforge.plantuml.postit; @@ -51,7 +48,6 @@ import net.sourceforge.plantuml.core.DiagramDescription; import net.sourceforge.plantuml.core.DiagramDescriptionImpl; import net.sourceforge.plantuml.core.ImageData; import net.sourceforge.plantuml.cucadiagram.Display; -import net.sourceforge.plantuml.graphic.TextBlockUtils; import net.sourceforge.plantuml.png.PngIO; import net.sourceforge.plantuml.ugraphic.ColorMapperIdentity; import net.sourceforge.plantuml.ugraphic.UGraphic; @@ -71,7 +67,8 @@ public class PostItDiagram extends UmlDiagram { } @Override - final protected ImageData exportDiagramInternal(OutputStream os, int index, FileFormatOption fileFormatOption) throws IOException { + final protected ImageData exportDiagramInternal(OutputStream os, int index, FileFormatOption fileFormatOption) + throws IOException { final UGraphic ug = createImage(fileFormatOption); drawU(ug); if (ug instanceof UGraphicG2d) { @@ -118,7 +115,7 @@ public class PostItDiagram extends UmlDiagram { .getMappedColor(this.getSkinParam().getBackgroundColor()); final FileFormat fileFormat = fileFormatOption.getFileFormat(); if (fileFormat == FileFormat.PNG) { - final double height = getDefaultArea().heightWhenWidthIs(width, TextBlockUtils.getDummyStringBounder()); + final double height = getDefaultArea().heightWhenWidthIs(width, fileFormat.getDefaultStringBounder()); final EmptyImageBuilder builder = new EmptyImageBuilder(width, height, backColor); final Graphics2D graphics2D = builder.getGraphics2D(); diff --git a/src/net/sourceforge/plantuml/preproc/Defines.java b/src/net/sourceforge/plantuml/preproc/Defines.java index 6cde52b8d..ae306189c 100644 --- a/src/net/sourceforge/plantuml/preproc/Defines.java +++ b/src/net/sourceforge/plantuml/preproc/Defines.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.preproc; diff --git a/src/net/sourceforge/plantuml/preproc/FileWithSuffix.java b/src/net/sourceforge/plantuml/preproc/FileWithSuffix.java index 83b620d67..95fc91338 100644 --- a/src/net/sourceforge/plantuml/preproc/FileWithSuffix.java +++ b/src/net/sourceforge/plantuml/preproc/FileWithSuffix.java @@ -23,13 +23,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * Modified by: Nicolas Jouanin * - * Revision $Revision: 16359 $ * */ package net.sourceforge.plantuml.preproc; diff --git a/src/net/sourceforge/plantuml/preproc/IfManager.java b/src/net/sourceforge/plantuml/preproc/IfManager.java index 735dde36d..f5ba017df 100644 --- a/src/net/sourceforge/plantuml/preproc/IfManager.java +++ b/src/net/sourceforge/plantuml/preproc/IfManager.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19880 $ * */ package net.sourceforge.plantuml.preproc; diff --git a/src/net/sourceforge/plantuml/preproc/IfManagerNegatif.java b/src/net/sourceforge/plantuml/preproc/IfManagerNegatif.java index 6ada5ef82..603cb3d19 100644 --- a/src/net/sourceforge/plantuml/preproc/IfManagerNegatif.java +++ b/src/net/sourceforge/plantuml/preproc/IfManagerNegatif.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19880 $ * */ package net.sourceforge.plantuml.preproc; diff --git a/src/net/sourceforge/plantuml/preproc/IfManagerPositif.java b/src/net/sourceforge/plantuml/preproc/IfManagerPositif.java index 4925b0c9e..1225f4901 100644 --- a/src/net/sourceforge/plantuml/preproc/IfManagerPositif.java +++ b/src/net/sourceforge/plantuml/preproc/IfManagerPositif.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19880 $ * */ package net.sourceforge.plantuml.preproc; diff --git a/src/net/sourceforge/plantuml/preproc/Preprocessor.java b/src/net/sourceforge/plantuml/preproc/Preprocessor.java index d511ddce6..618e08ee5 100644 --- a/src/net/sourceforge/plantuml/preproc/Preprocessor.java +++ b/src/net/sourceforge/plantuml/preproc/Preprocessor.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19880 $ * */ package net.sourceforge.plantuml.preproc; diff --git a/src/net/sourceforge/plantuml/preproc/PreprocessorInclude.java b/src/net/sourceforge/plantuml/preproc/PreprocessorInclude.java index 88b478d4a..12e4aa2fd 100644 --- a/src/net/sourceforge/plantuml/preproc/PreprocessorInclude.java +++ b/src/net/sourceforge/plantuml/preproc/PreprocessorInclude.java @@ -23,13 +23,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * Modified by: Nicolas Jouanin * - * Revision $Revision: 19880 $ * */ package net.sourceforge.plantuml.preproc; diff --git a/src/net/sourceforge/plantuml/preproc/ReadLine.java b/src/net/sourceforge/plantuml/preproc/ReadLine.java index a03910f2e..24ae833f1 100644 --- a/src/net/sourceforge/plantuml/preproc/ReadLine.java +++ b/src/net/sourceforge/plantuml/preproc/ReadLine.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.preproc; diff --git a/src/net/sourceforge/plantuml/preproc/ReadLineInsertable.java b/src/net/sourceforge/plantuml/preproc/ReadLineInsertable.java index f7d81fa41..41a038e3e 100644 --- a/src/net/sourceforge/plantuml/preproc/ReadLineInsertable.java +++ b/src/net/sourceforge/plantuml/preproc/ReadLineInsertable.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 12235 $ * */ package net.sourceforge.plantuml.preproc; diff --git a/src/net/sourceforge/plantuml/preproc/ReadLineReader.java b/src/net/sourceforge/plantuml/preproc/ReadLineReader.java index ccc4a5366..21d2caea1 100644 --- a/src/net/sourceforge/plantuml/preproc/ReadLineReader.java +++ b/src/net/sourceforge/plantuml/preproc/ReadLineReader.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3835 $ * */ package net.sourceforge.plantuml.preproc; diff --git a/src/net/sourceforge/plantuml/preproc/StartDiagramExtractReader.java b/src/net/sourceforge/plantuml/preproc/StartDiagramExtractReader.java index 91e71d068..3ed78065a 100644 --- a/src/net/sourceforge/plantuml/preproc/StartDiagramExtractReader.java +++ b/src/net/sourceforge/plantuml/preproc/StartDiagramExtractReader.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3835 $ * */ package net.sourceforge.plantuml.preproc; diff --git a/src/net/sourceforge/plantuml/preproc/UncommentReadLine.java b/src/net/sourceforge/plantuml/preproc/UncommentReadLine.java index c7ea60597..9337ddb83 100644 --- a/src/net/sourceforge/plantuml/preproc/UncommentReadLine.java +++ b/src/net/sourceforge/plantuml/preproc/UncommentReadLine.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5200 $ * */ package net.sourceforge.plantuml.preproc; diff --git a/src/net/sourceforge/plantuml/printskin/PrintSkin.java b/src/net/sourceforge/plantuml/printskin/PrintSkin.java index 1ebe91474..20367dbb7 100644 --- a/src/net/sourceforge/plantuml/printskin/PrintSkin.java +++ b/src/net/sourceforge/plantuml/printskin/PrintSkin.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19885 $ * */ package net.sourceforge.plantuml.printskin; diff --git a/src/net/sourceforge/plantuml/printskin/PrintSkinFactory.java b/src/net/sourceforge/plantuml/printskin/PrintSkinFactory.java index fcfc5f029..a77691a77 100644 --- a/src/net/sourceforge/plantuml/printskin/PrintSkinFactory.java +++ b/src/net/sourceforge/plantuml/printskin/PrintSkinFactory.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 10298 $ * */ package net.sourceforge.plantuml.printskin; diff --git a/src/net/sourceforge/plantuml/project/BasicInstantArithmetic.java b/src/net/sourceforge/plantuml/project/BasicInstantArithmetic.java index b3711722a..baafe38db 100644 --- a/src/net/sourceforge/plantuml/project/BasicInstantArithmetic.java +++ b/src/net/sourceforge/plantuml/project/BasicInstantArithmetic.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6104 $ * */ package net.sourceforge.plantuml.project; diff --git a/src/net/sourceforge/plantuml/project/Constant.java b/src/net/sourceforge/plantuml/project/Constant.java index c8dda4497..dafbbcbb0 100644 --- a/src/net/sourceforge/plantuml/project/Constant.java +++ b/src/net/sourceforge/plantuml/project/Constant.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6104 $ * */ package net.sourceforge.plantuml.project; diff --git a/src/net/sourceforge/plantuml/project/Day.java b/src/net/sourceforge/plantuml/project/Day.java index 81f00e999..bf2228f04 100644 --- a/src/net/sourceforge/plantuml/project/Day.java +++ b/src/net/sourceforge/plantuml/project/Day.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6104 $ * */ package net.sourceforge.plantuml.project; diff --git a/src/net/sourceforge/plantuml/project/DayClose.java b/src/net/sourceforge/plantuml/project/DayClose.java index a71cd3032..e77c31969 100644 --- a/src/net/sourceforge/plantuml/project/DayClose.java +++ b/src/net/sourceforge/plantuml/project/DayClose.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6104 $ * */ package net.sourceforge.plantuml.project; diff --git a/src/net/sourceforge/plantuml/project/DayCloseNone.java b/src/net/sourceforge/plantuml/project/DayCloseNone.java index a37b4670c..951a11a4c 100644 --- a/src/net/sourceforge/plantuml/project/DayCloseNone.java +++ b/src/net/sourceforge/plantuml/project/DayCloseNone.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6104 $ * */ package net.sourceforge.plantuml.project; diff --git a/src/net/sourceforge/plantuml/project/DayCloseOr.java b/src/net/sourceforge/plantuml/project/DayCloseOr.java index 515e60516..5d86dbf49 100644 --- a/src/net/sourceforge/plantuml/project/DayCloseOr.java +++ b/src/net/sourceforge/plantuml/project/DayCloseOr.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6104 $ * */ package net.sourceforge.plantuml.project; diff --git a/src/net/sourceforge/plantuml/project/DayCloseWeekDay.java b/src/net/sourceforge/plantuml/project/DayCloseWeekDay.java index 2bfa1ec73..534064c3d 100644 --- a/src/net/sourceforge/plantuml/project/DayCloseWeekDay.java +++ b/src/net/sourceforge/plantuml/project/DayCloseWeekDay.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6104 $ * */ package net.sourceforge.plantuml.project; diff --git a/src/net/sourceforge/plantuml/project/Duration.java b/src/net/sourceforge/plantuml/project/Duration.java index 70c90da2d..9e659af38 100644 --- a/src/net/sourceforge/plantuml/project/Duration.java +++ b/src/net/sourceforge/plantuml/project/Duration.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6104 $ * */ package net.sourceforge.plantuml.project; diff --git a/src/net/sourceforge/plantuml/project/Expression.java b/src/net/sourceforge/plantuml/project/Expression.java index 417659378..63324f83f 100644 --- a/src/net/sourceforge/plantuml/project/Expression.java +++ b/src/net/sourceforge/plantuml/project/Expression.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6104 $ * */ package net.sourceforge.plantuml.project; diff --git a/src/net/sourceforge/plantuml/project/Formal.java b/src/net/sourceforge/plantuml/project/Formal.java index 78ff8f4f8..cd4d2f0e4 100644 --- a/src/net/sourceforge/plantuml/project/Formal.java +++ b/src/net/sourceforge/plantuml/project/Formal.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6104 $ * */ package net.sourceforge.plantuml.project; diff --git a/src/net/sourceforge/plantuml/project/FormalAddition.java b/src/net/sourceforge/plantuml/project/FormalAddition.java index e3cef59e8..4428b9b0b 100644 --- a/src/net/sourceforge/plantuml/project/FormalAddition.java +++ b/src/net/sourceforge/plantuml/project/FormalAddition.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6104 $ * */ package net.sourceforge.plantuml.project; diff --git a/src/net/sourceforge/plantuml/project/FormalAdditionInstantDuration.java b/src/net/sourceforge/plantuml/project/FormalAdditionInstantDuration.java index 1ffb8844c..629802278 100644 --- a/src/net/sourceforge/plantuml/project/FormalAdditionInstantDuration.java +++ b/src/net/sourceforge/plantuml/project/FormalAdditionInstantDuration.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6104 $ * */ package net.sourceforge.plantuml.project; diff --git a/src/net/sourceforge/plantuml/project/FreeVariable.java b/src/net/sourceforge/plantuml/project/FreeVariable.java index 835f25efa..a42bf1f73 100644 --- a/src/net/sourceforge/plantuml/project/FreeVariable.java +++ b/src/net/sourceforge/plantuml/project/FreeVariable.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6104 $ * */ package net.sourceforge.plantuml.project; diff --git a/src/net/sourceforge/plantuml/project/IncompleteItem.java b/src/net/sourceforge/plantuml/project/IncompleteItem.java index dac41884e..f1419745e 100644 --- a/src/net/sourceforge/plantuml/project/IncompleteItem.java +++ b/src/net/sourceforge/plantuml/project/IncompleteItem.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6104 $ * */ package net.sourceforge.plantuml.project; diff --git a/src/net/sourceforge/plantuml/project/Instant.java b/src/net/sourceforge/plantuml/project/Instant.java index 461f85d40..a60622fbc 100644 --- a/src/net/sourceforge/plantuml/project/Instant.java +++ b/src/net/sourceforge/plantuml/project/Instant.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6104 $ * */ package net.sourceforge.plantuml.project; diff --git a/src/net/sourceforge/plantuml/project/InstantArithmetic.java b/src/net/sourceforge/plantuml/project/InstantArithmetic.java index d25f3022b..9c84c84e3 100644 --- a/src/net/sourceforge/plantuml/project/InstantArithmetic.java +++ b/src/net/sourceforge/plantuml/project/InstantArithmetic.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6104 $ * */ package net.sourceforge.plantuml.project; diff --git a/src/net/sourceforge/plantuml/project/Item.java b/src/net/sourceforge/plantuml/project/Item.java index f6bb9d2d7..b53ef37ac 100644 --- a/src/net/sourceforge/plantuml/project/Item.java +++ b/src/net/sourceforge/plantuml/project/Item.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6104 $ * */ package net.sourceforge.plantuml.project; diff --git a/src/net/sourceforge/plantuml/project/ItemCaract.java b/src/net/sourceforge/plantuml/project/ItemCaract.java index 1eb599b85..a2efc225a 100644 --- a/src/net/sourceforge/plantuml/project/ItemCaract.java +++ b/src/net/sourceforge/plantuml/project/ItemCaract.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6104 $ * */ package net.sourceforge.plantuml.project; diff --git a/src/net/sourceforge/plantuml/project/ItemComparator.java b/src/net/sourceforge/plantuml/project/ItemComparator.java index 5a4f695bd..6ad847212 100644 --- a/src/net/sourceforge/plantuml/project/ItemComparator.java +++ b/src/net/sourceforge/plantuml/project/ItemComparator.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6104 $ * */ package net.sourceforge.plantuml.project; diff --git a/src/net/sourceforge/plantuml/project/Jalon.java b/src/net/sourceforge/plantuml/project/Jalon.java index 6ffd0759a..4b2dd95bc 100644 --- a/src/net/sourceforge/plantuml/project/Jalon.java +++ b/src/net/sourceforge/plantuml/project/Jalon.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6104 $ * */ package net.sourceforge.plantuml.project; diff --git a/src/net/sourceforge/plantuml/project/Load.java b/src/net/sourceforge/plantuml/project/Load.java index 2c1a230aa..220d9882e 100644 --- a/src/net/sourceforge/plantuml/project/Load.java +++ b/src/net/sourceforge/plantuml/project/Load.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6104 $ * */ package net.sourceforge.plantuml.project; diff --git a/src/net/sourceforge/plantuml/project/Month.java b/src/net/sourceforge/plantuml/project/Month.java index f48bdea18..87f26785d 100644 --- a/src/net/sourceforge/plantuml/project/Month.java +++ b/src/net/sourceforge/plantuml/project/Month.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6104 $ * */ package net.sourceforge.plantuml.project; diff --git a/src/net/sourceforge/plantuml/project/Numeric.java b/src/net/sourceforge/plantuml/project/Numeric.java index 7151fce44..0a9c7365d 100644 --- a/src/net/sourceforge/plantuml/project/Numeric.java +++ b/src/net/sourceforge/plantuml/project/Numeric.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6104 $ * */ package net.sourceforge.plantuml.project; diff --git a/src/net/sourceforge/plantuml/project/NumericNumber.java b/src/net/sourceforge/plantuml/project/NumericNumber.java index 653d509df..de215d2ec 100644 --- a/src/net/sourceforge/plantuml/project/NumericNumber.java +++ b/src/net/sourceforge/plantuml/project/NumericNumber.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6104 $ * */ package net.sourceforge.plantuml.project; diff --git a/src/net/sourceforge/plantuml/project/NumericType.java b/src/net/sourceforge/plantuml/project/NumericType.java index fa9411880..ccd2e42dc 100644 --- a/src/net/sourceforge/plantuml/project/NumericType.java +++ b/src/net/sourceforge/plantuml/project/NumericType.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6104 $ * */ package net.sourceforge.plantuml.project; diff --git a/src/net/sourceforge/plantuml/project/PSystemProject.java b/src/net/sourceforge/plantuml/project/PSystemProject.java index 895ea87ac..e605429ca 100644 --- a/src/net/sourceforge/plantuml/project/PSystemProject.java +++ b/src/net/sourceforge/plantuml/project/PSystemProject.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6104 $ * */ package net.sourceforge.plantuml.project; diff --git a/src/net/sourceforge/plantuml/project/ParentItem.java b/src/net/sourceforge/plantuml/project/ParentItem.java index dfa4f960c..1996b8bf9 100644 --- a/src/net/sourceforge/plantuml/project/ParentItem.java +++ b/src/net/sourceforge/plantuml/project/ParentItem.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6104 $ * */ package net.sourceforge.plantuml.project; diff --git a/src/net/sourceforge/plantuml/project/Project.java b/src/net/sourceforge/plantuml/project/Project.java index 930b36705..afd277f41 100644 --- a/src/net/sourceforge/plantuml/project/Project.java +++ b/src/net/sourceforge/plantuml/project/Project.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6104 $ * */ package net.sourceforge.plantuml.project; diff --git a/src/net/sourceforge/plantuml/project/Ressource.java b/src/net/sourceforge/plantuml/project/Ressource.java index e752d54d3..16be633d6 100644 --- a/src/net/sourceforge/plantuml/project/Ressource.java +++ b/src/net/sourceforge/plantuml/project/Ressource.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6104 $ * */ package net.sourceforge.plantuml.project; diff --git a/src/net/sourceforge/plantuml/project/WeekDay.java b/src/net/sourceforge/plantuml/project/WeekDay.java index 648de98cc..948d1d2cb 100644 --- a/src/net/sourceforge/plantuml/project/WeekDay.java +++ b/src/net/sourceforge/plantuml/project/WeekDay.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6104 $ * */ package net.sourceforge.plantuml.project; diff --git a/src/net/sourceforge/plantuml/project/command/CommandAffectation.java b/src/net/sourceforge/plantuml/project/command/CommandAffectation.java index d6e67565a..17e5fc64d 100644 --- a/src/net/sourceforge/plantuml/project/command/CommandAffectation.java +++ b/src/net/sourceforge/plantuml/project/command/CommandAffectation.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5884 $ * */ package net.sourceforge.plantuml.project.command; diff --git a/src/net/sourceforge/plantuml/project/command/CommandCloseWeekDay.java b/src/net/sourceforge/plantuml/project/command/CommandCloseWeekDay.java index ae7ad98a4..0a0fe19eb 100644 --- a/src/net/sourceforge/plantuml/project/command/CommandCloseWeekDay.java +++ b/src/net/sourceforge/plantuml/project/command/CommandCloseWeekDay.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5884 $ * */ package net.sourceforge.plantuml.project.command; diff --git a/src/net/sourceforge/plantuml/project/graphic/GanttDiagram.java b/src/net/sourceforge/plantuml/project/graphic/GanttDiagram.java index af9cb6ead..8bf06d435 100644 --- a/src/net/sourceforge/plantuml/project/graphic/GanttDiagram.java +++ b/src/net/sourceforge/plantuml/project/graphic/GanttDiagram.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6104 $ * */ package net.sourceforge.plantuml.project.graphic; diff --git a/src/net/sourceforge/plantuml/project/graphic/ItemHeader.java b/src/net/sourceforge/plantuml/project/graphic/ItemHeader.java index 7f1ebb278..ed2a337ff 100644 --- a/src/net/sourceforge/plantuml/project/graphic/ItemHeader.java +++ b/src/net/sourceforge/plantuml/project/graphic/ItemHeader.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6104 $ * */ package net.sourceforge.plantuml.project.graphic; diff --git a/src/net/sourceforge/plantuml/project/graphic/TimeScale.java b/src/net/sourceforge/plantuml/project/graphic/TimeScale.java index b0ec8fe08..d1a1d73e6 100644 --- a/src/net/sourceforge/plantuml/project/graphic/TimeScale.java +++ b/src/net/sourceforge/plantuml/project/graphic/TimeScale.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6104 $ * */ package net.sourceforge.plantuml.project.graphic; diff --git a/src/net/sourceforge/plantuml/project2/Day.java b/src/net/sourceforge/plantuml/project2/Day.java index 81b202f19..ae334f885 100644 --- a/src/net/sourceforge/plantuml/project2/Day.java +++ b/src/net/sourceforge/plantuml/project2/Day.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6104 $ * */ package net.sourceforge.plantuml.project2; diff --git a/src/net/sourceforge/plantuml/project2/GanttDiagram2.java b/src/net/sourceforge/plantuml/project2/GanttDiagram2.java index a8d0de236..a661c1c33 100644 --- a/src/net/sourceforge/plantuml/project2/GanttDiagram2.java +++ b/src/net/sourceforge/plantuml/project2/GanttDiagram2.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6104 $ * */ package net.sourceforge.plantuml.project2; diff --git a/src/net/sourceforge/plantuml/project2/Knowledge.java b/src/net/sourceforge/plantuml/project2/Knowledge.java index 0c92dab4d..494f5ed0e 100644 --- a/src/net/sourceforge/plantuml/project2/Knowledge.java +++ b/src/net/sourceforge/plantuml/project2/Knowledge.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6104 $ * */ package net.sourceforge.plantuml.project2; diff --git a/src/net/sourceforge/plantuml/project2/PSystemProject2.java b/src/net/sourceforge/plantuml/project2/PSystemProject2.java index 74466be4e..2fca4def4 100644 --- a/src/net/sourceforge/plantuml/project2/PSystemProject2.java +++ b/src/net/sourceforge/plantuml/project2/PSystemProject2.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6104 $ * */ package net.sourceforge.plantuml.project2; diff --git a/src/net/sourceforge/plantuml/project2/PSystemProjectFactory2.java b/src/net/sourceforge/plantuml/project2/PSystemProjectFactory2.java index cec5de8c1..62f38fd31 100644 --- a/src/net/sourceforge/plantuml/project2/PSystemProjectFactory2.java +++ b/src/net/sourceforge/plantuml/project2/PSystemProjectFactory2.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6002 $ * */ package net.sourceforge.plantuml.project2; diff --git a/src/net/sourceforge/plantuml/project2/Project2.java b/src/net/sourceforge/plantuml/project2/Project2.java index f224094a4..3c1c77c43 100644 --- a/src/net/sourceforge/plantuml/project2/Project2.java +++ b/src/net/sourceforge/plantuml/project2/Project2.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6104 $ * */ package net.sourceforge.plantuml.project2; diff --git a/src/net/sourceforge/plantuml/project2/Ressource.java b/src/net/sourceforge/plantuml/project2/Ressource.java index 38c42853d..ba41d8687 100644 --- a/src/net/sourceforge/plantuml/project2/Ressource.java +++ b/src/net/sourceforge/plantuml/project2/Ressource.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6104 $ * */ package net.sourceforge.plantuml.project2; diff --git a/src/net/sourceforge/plantuml/project2/Row.java b/src/net/sourceforge/plantuml/project2/Row.java index a89c8551f..c1da4489e 100644 --- a/src/net/sourceforge/plantuml/project2/Row.java +++ b/src/net/sourceforge/plantuml/project2/Row.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3835 $ * */ package net.sourceforge.plantuml.project2; diff --git a/src/net/sourceforge/plantuml/project2/RowMerge.java b/src/net/sourceforge/plantuml/project2/RowMerge.java index 8bb79ce8c..8e7496229 100644 --- a/src/net/sourceforge/plantuml/project2/RowMerge.java +++ b/src/net/sourceforge/plantuml/project2/RowMerge.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6104 $ * */ package net.sourceforge.plantuml.project2; diff --git a/src/net/sourceforge/plantuml/project2/RowOverwrite.java b/src/net/sourceforge/plantuml/project2/RowOverwrite.java index ed021fa18..02f3ec816 100644 --- a/src/net/sourceforge/plantuml/project2/RowOverwrite.java +++ b/src/net/sourceforge/plantuml/project2/RowOverwrite.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6104 $ * */ package net.sourceforge.plantuml.project2; diff --git a/src/net/sourceforge/plantuml/project2/RowSimple.java b/src/net/sourceforge/plantuml/project2/RowSimple.java index b3868589b..83eef856e 100644 --- a/src/net/sourceforge/plantuml/project2/RowSimple.java +++ b/src/net/sourceforge/plantuml/project2/RowSimple.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3835 $ * */ package net.sourceforge.plantuml.project2; diff --git a/src/net/sourceforge/plantuml/project2/RowUtils.java b/src/net/sourceforge/plantuml/project2/RowUtils.java index 20d21ac26..9a9454c40 100644 --- a/src/net/sourceforge/plantuml/project2/RowUtils.java +++ b/src/net/sourceforge/plantuml/project2/RowUtils.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3835 $ * */ package net.sourceforge.plantuml.project2; diff --git a/src/net/sourceforge/plantuml/project2/Task.java b/src/net/sourceforge/plantuml/project2/Task.java index 5af35cfcb..2e04519b2 100644 --- a/src/net/sourceforge/plantuml/project2/Task.java +++ b/src/net/sourceforge/plantuml/project2/Task.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6104 $ * */ package net.sourceforge.plantuml.project2; diff --git a/src/net/sourceforge/plantuml/project2/TaskAttribute.java b/src/net/sourceforge/plantuml/project2/TaskAttribute.java index 76c0e60a2..0af6000e1 100644 --- a/src/net/sourceforge/plantuml/project2/TaskAttribute.java +++ b/src/net/sourceforge/plantuml/project2/TaskAttribute.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6104 $ * */ package net.sourceforge.plantuml.project2; diff --git a/src/net/sourceforge/plantuml/project2/TaskContainer.java b/src/net/sourceforge/plantuml/project2/TaskContainer.java index b8079d1c6..949235565 100644 --- a/src/net/sourceforge/plantuml/project2/TaskContainer.java +++ b/src/net/sourceforge/plantuml/project2/TaskContainer.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6104 $ * */ package net.sourceforge.plantuml.project2; diff --git a/src/net/sourceforge/plantuml/project2/TaskImpl.java b/src/net/sourceforge/plantuml/project2/TaskImpl.java index 27652843b..f826f9434 100644 --- a/src/net/sourceforge/plantuml/project2/TaskImpl.java +++ b/src/net/sourceforge/plantuml/project2/TaskImpl.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6104 $ * */ package net.sourceforge.plantuml.project2; diff --git a/src/net/sourceforge/plantuml/project2/TaskMerge.java b/src/net/sourceforge/plantuml/project2/TaskMerge.java index 5b0774a57..cbe95f7e6 100644 --- a/src/net/sourceforge/plantuml/project2/TaskMerge.java +++ b/src/net/sourceforge/plantuml/project2/TaskMerge.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6104 $ * */ package net.sourceforge.plantuml.project2; diff --git a/src/net/sourceforge/plantuml/project2/TimeConverter.java b/src/net/sourceforge/plantuml/project2/TimeConverter.java index c78291da3..003681047 100644 --- a/src/net/sourceforge/plantuml/project2/TimeConverter.java +++ b/src/net/sourceforge/plantuml/project2/TimeConverter.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3835 $ * */ package net.sourceforge.plantuml.project2; diff --git a/src/net/sourceforge/plantuml/project2/TimeConverterDay.java b/src/net/sourceforge/plantuml/project2/TimeConverterDay.java index 632bfe2f3..ba152b8ea 100644 --- a/src/net/sourceforge/plantuml/project2/TimeConverterDay.java +++ b/src/net/sourceforge/plantuml/project2/TimeConverterDay.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3835 $ * */ package net.sourceforge.plantuml.project2; diff --git a/src/net/sourceforge/plantuml/project2/TimeElement.java b/src/net/sourceforge/plantuml/project2/TimeElement.java index a5c33fe4b..afca4dbdf 100644 --- a/src/net/sourceforge/plantuml/project2/TimeElement.java +++ b/src/net/sourceforge/plantuml/project2/TimeElement.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3835 $ * */ package net.sourceforge.plantuml.project2; diff --git a/src/net/sourceforge/plantuml/project2/TimeHeaderDay.java b/src/net/sourceforge/plantuml/project2/TimeHeaderDay.java index c200f2568..5538937f6 100644 --- a/src/net/sourceforge/plantuml/project2/TimeHeaderDay.java +++ b/src/net/sourceforge/plantuml/project2/TimeHeaderDay.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6104 $ * */ package net.sourceforge.plantuml.project2; diff --git a/src/net/sourceforge/plantuml/project2/TimeHeaderMonth.java b/src/net/sourceforge/plantuml/project2/TimeHeaderMonth.java index f16b24548..af6b7b2e0 100644 --- a/src/net/sourceforge/plantuml/project2/TimeHeaderMonth.java +++ b/src/net/sourceforge/plantuml/project2/TimeHeaderMonth.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6104 $ * */ package net.sourceforge.plantuml.project2; diff --git a/src/net/sourceforge/plantuml/project2/TimeLine.java b/src/net/sourceforge/plantuml/project2/TimeLine.java index b7373ebdb..ae5fc0996 100644 --- a/src/net/sourceforge/plantuml/project2/TimeLine.java +++ b/src/net/sourceforge/plantuml/project2/TimeLine.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3835 $ * */ package net.sourceforge.plantuml.project2; diff --git a/src/net/sourceforge/plantuml/project2/TimeLineDay.java b/src/net/sourceforge/plantuml/project2/TimeLineDay.java index e27efb6e4..9f4ad217f 100644 --- a/src/net/sourceforge/plantuml/project2/TimeLineDay.java +++ b/src/net/sourceforge/plantuml/project2/TimeLineDay.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3835 $ * */ package net.sourceforge.plantuml.project2; diff --git a/src/net/sourceforge/plantuml/project2/TimeResolution.java b/src/net/sourceforge/plantuml/project2/TimeResolution.java index 49b98fe49..f2c5a2ead 100644 --- a/src/net/sourceforge/plantuml/project2/TimeResolution.java +++ b/src/net/sourceforge/plantuml/project2/TimeResolution.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3835 $ * */ package net.sourceforge.plantuml.project2; diff --git a/src/net/sourceforge/plantuml/project2/TimeUtils.java b/src/net/sourceforge/plantuml/project2/TimeUtils.java index 96124b8cd..fcad4f374 100644 --- a/src/net/sourceforge/plantuml/project2/TimeUtils.java +++ b/src/net/sourceforge/plantuml/project2/TimeUtils.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3835 $ * */ package net.sourceforge.plantuml.project2; diff --git a/src/net/sourceforge/plantuml/project2/Value.java b/src/net/sourceforge/plantuml/project2/Value.java index 522048511..f370f54a9 100644 --- a/src/net/sourceforge/plantuml/project2/Value.java +++ b/src/net/sourceforge/plantuml/project2/Value.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6104 $ * */ package net.sourceforge.plantuml.project2; diff --git a/src/net/sourceforge/plantuml/project2/ValueInt.java b/src/net/sourceforge/plantuml/project2/ValueInt.java index d93b9e276..b56a775c8 100644 --- a/src/net/sourceforge/plantuml/project2/ValueInt.java +++ b/src/net/sourceforge/plantuml/project2/ValueInt.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6104 $ * */ package net.sourceforge.plantuml.project2; diff --git a/src/net/sourceforge/plantuml/project2/ValueTime.java b/src/net/sourceforge/plantuml/project2/ValueTime.java index d608ce71d..a7ebbeded 100644 --- a/src/net/sourceforge/plantuml/project2/ValueTime.java +++ b/src/net/sourceforge/plantuml/project2/ValueTime.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6104 $ * */ package net.sourceforge.plantuml.project2; diff --git a/src/net/sourceforge/plantuml/project2/command/CommandAffectation.java b/src/net/sourceforge/plantuml/project2/command/CommandAffectation.java index 70cfa4b7f..753e532d1 100644 --- a/src/net/sourceforge/plantuml/project2/command/CommandAffectation.java +++ b/src/net/sourceforge/plantuml/project2/command/CommandAffectation.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5884 $ * */ package net.sourceforge.plantuml.project2.command; diff --git a/src/net/sourceforge/plantuml/project2/command/CommandCloseWeekDay.java b/src/net/sourceforge/plantuml/project2/command/CommandCloseWeekDay.java index 2acfec394..acd32e1ad 100644 --- a/src/net/sourceforge/plantuml/project2/command/CommandCloseWeekDay.java +++ b/src/net/sourceforge/plantuml/project2/command/CommandCloseWeekDay.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5884 $ * */ package net.sourceforge.plantuml.project2.command; diff --git a/src/net/sourceforge/plantuml/real/AbstractReal.java b/src/net/sourceforge/plantuml/real/AbstractReal.java index 700bb3c5d..d6b829de4 100644 --- a/src/net/sourceforge/plantuml/real/AbstractReal.java +++ b/src/net/sourceforge/plantuml/real/AbstractReal.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4636 $ * */ package net.sourceforge.plantuml.real; diff --git a/src/net/sourceforge/plantuml/real/PositiveForce.java b/src/net/sourceforge/plantuml/real/PositiveForce.java index ceeddbe6a..a8e7cf2ef 100644 --- a/src/net/sourceforge/plantuml/real/PositiveForce.java +++ b/src/net/sourceforge/plantuml/real/PositiveForce.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4636 $ * */ package net.sourceforge.plantuml.real; diff --git a/src/net/sourceforge/plantuml/real/Real.java b/src/net/sourceforge/plantuml/real/Real.java index e24c602f4..437909f70 100644 --- a/src/net/sourceforge/plantuml/real/Real.java +++ b/src/net/sourceforge/plantuml/real/Real.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4636 $ * */ package net.sourceforge.plantuml.real; diff --git a/src/net/sourceforge/plantuml/real/RealDelta.java b/src/net/sourceforge/plantuml/real/RealDelta.java index 2d6d74337..0aa0d4e84 100644 --- a/src/net/sourceforge/plantuml/real/RealDelta.java +++ b/src/net/sourceforge/plantuml/real/RealDelta.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4636 $ * */ package net.sourceforge.plantuml.real; diff --git a/src/net/sourceforge/plantuml/real/RealImpl.java b/src/net/sourceforge/plantuml/real/RealImpl.java index 9d8c61c3a..86a1bf170 100644 --- a/src/net/sourceforge/plantuml/real/RealImpl.java +++ b/src/net/sourceforge/plantuml/real/RealImpl.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4636 $ * */ package net.sourceforge.plantuml.real; diff --git a/src/net/sourceforge/plantuml/real/RealLine.java b/src/net/sourceforge/plantuml/real/RealLine.java index 3561a2d24..e59c3628e 100644 --- a/src/net/sourceforge/plantuml/real/RealLine.java +++ b/src/net/sourceforge/plantuml/real/RealLine.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4636 $ * */ package net.sourceforge.plantuml.real; diff --git a/src/net/sourceforge/plantuml/real/RealMax.java b/src/net/sourceforge/plantuml/real/RealMax.java index fe0a63350..27372246a 100644 --- a/src/net/sourceforge/plantuml/real/RealMax.java +++ b/src/net/sourceforge/plantuml/real/RealMax.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4636 $ * */ package net.sourceforge.plantuml.real; diff --git a/src/net/sourceforge/plantuml/real/RealMiddle.java b/src/net/sourceforge/plantuml/real/RealMiddle.java index 2ccdb3e8f..2eb6cdfbf 100644 --- a/src/net/sourceforge/plantuml/real/RealMiddle.java +++ b/src/net/sourceforge/plantuml/real/RealMiddle.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4636 $ * */ package net.sourceforge.plantuml.real; diff --git a/src/net/sourceforge/plantuml/real/RealMiddle2.java b/src/net/sourceforge/plantuml/real/RealMiddle2.java index f22b0ab27..6a4e5d74b 100644 --- a/src/net/sourceforge/plantuml/real/RealMiddle2.java +++ b/src/net/sourceforge/plantuml/real/RealMiddle2.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4636 $ * */ package net.sourceforge.plantuml.real; diff --git a/src/net/sourceforge/plantuml/real/RealMin.java b/src/net/sourceforge/plantuml/real/RealMin.java index 27aa33814..f00371ba1 100644 --- a/src/net/sourceforge/plantuml/real/RealMin.java +++ b/src/net/sourceforge/plantuml/real/RealMin.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4636 $ * */ package net.sourceforge.plantuml.real; diff --git a/src/net/sourceforge/plantuml/real/RealMoveable.java b/src/net/sourceforge/plantuml/real/RealMoveable.java index f3afbcd3a..95ba54a4a 100644 --- a/src/net/sourceforge/plantuml/real/RealMoveable.java +++ b/src/net/sourceforge/plantuml/real/RealMoveable.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4636 $ * */ package net.sourceforge.plantuml.real; diff --git a/src/net/sourceforge/plantuml/real/RealOrigin.java b/src/net/sourceforge/plantuml/real/RealOrigin.java index a175059dd..a15ed5cdd 100644 --- a/src/net/sourceforge/plantuml/real/RealOrigin.java +++ b/src/net/sourceforge/plantuml/real/RealOrigin.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4636 $ * */ package net.sourceforge.plantuml.real; diff --git a/src/net/sourceforge/plantuml/real/RealUtils.java b/src/net/sourceforge/plantuml/real/RealUtils.java index ab15c3a5e..f608575e8 100644 --- a/src/net/sourceforge/plantuml/real/RealUtils.java +++ b/src/net/sourceforge/plantuml/real/RealUtils.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4636 $ * */ package net.sourceforge.plantuml.real; diff --git a/src/net/sourceforge/plantuml/salt/Cell.java b/src/net/sourceforge/plantuml/salt/Cell.java index 0280d96aa..b49c0683f 100644 --- a/src/net/sourceforge/plantuml/salt/Cell.java +++ b/src/net/sourceforge/plantuml/salt/Cell.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3835 $ * */ package net.sourceforge.plantuml.salt; diff --git a/src/net/sourceforge/plantuml/salt/DataSource.java b/src/net/sourceforge/plantuml/salt/DataSource.java index f77a7d85b..607a3fe06 100644 --- a/src/net/sourceforge/plantuml/salt/DataSource.java +++ b/src/net/sourceforge/plantuml/salt/DataSource.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3835 $ * */ package net.sourceforge.plantuml.salt; diff --git a/src/net/sourceforge/plantuml/salt/DataSourceImpl.java b/src/net/sourceforge/plantuml/salt/DataSourceImpl.java index 9ef6c439b..d4838d8d0 100644 --- a/src/net/sourceforge/plantuml/salt/DataSourceImpl.java +++ b/src/net/sourceforge/plantuml/salt/DataSourceImpl.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3835 $ * */ package net.sourceforge.plantuml.salt; diff --git a/src/net/sourceforge/plantuml/salt/Dictionary.java b/src/net/sourceforge/plantuml/salt/Dictionary.java index 2d370c44c..5df935db0 100644 --- a/src/net/sourceforge/plantuml/salt/Dictionary.java +++ b/src/net/sourceforge/plantuml/salt/Dictionary.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3835 $ * */ package net.sourceforge.plantuml.salt; diff --git a/src/net/sourceforge/plantuml/salt/PSystemSalt.java b/src/net/sourceforge/plantuml/salt/PSystemSalt.java index 0e4de43ad..94b9b40eb 100644 --- a/src/net/sourceforge/plantuml/salt/PSystemSalt.java +++ b/src/net/sourceforge/plantuml/salt/PSystemSalt.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4041 $ * */ package net.sourceforge.plantuml.salt; @@ -53,7 +50,6 @@ import net.sourceforge.plantuml.core.DiagramDescription; import net.sourceforge.plantuml.core.DiagramDescriptionImpl; import net.sourceforge.plantuml.core.ImageData; import net.sourceforge.plantuml.graphic.HtmlColorUtils; -import net.sourceforge.plantuml.graphic.TextBlockUtils; import net.sourceforge.plantuml.graphic.UDrawable; import net.sourceforge.plantuml.salt.element.Element; import net.sourceforge.plantuml.ugraphic.ColorMapperIdentity; @@ -83,9 +79,9 @@ public class PSystemSalt extends AbstractPSystem { public ImageData exportDiagram(OutputStream os, int num, FileFormatOption fileFormat) throws IOException { final Element salt = SaltUtils.createElement(data); - final Dimension2D size = salt.getPreferredDimension(TextBlockUtils.getDummyStringBounder(), 0, 0); - final ImageBuilder builder = new ImageBuilder(new ColorMapperIdentity(), 1.0, HtmlColorUtils.WHITE, null, - null, 5, 5, null, false); + final Dimension2D size = salt.getPreferredDimension(fileFormat.getDefaultStringBounder(), 0, 0); + final ImageBuilder builder = new ImageBuilder(new ColorMapperIdentity(), 1.0, HtmlColorUtils.WHITE, null, null, + 5, 5, null, false); builder.setUDrawable(new UDrawable() { public void drawU(UGraphic ug) { diff --git a/src/net/sourceforge/plantuml/salt/PSystemSaltFactory.java b/src/net/sourceforge/plantuml/salt/PSystemSaltFactory.java index 34e95c34c..deb1fdb53 100644 --- a/src/net/sourceforge/plantuml/salt/PSystemSaltFactory.java +++ b/src/net/sourceforge/plantuml/salt/PSystemSaltFactory.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3837 $ * */ package net.sourceforge.plantuml.salt; diff --git a/src/net/sourceforge/plantuml/salt/Position.java b/src/net/sourceforge/plantuml/salt/Position.java index eefee7cde..c2b4dc591 100644 --- a/src/net/sourceforge/plantuml/salt/Position.java +++ b/src/net/sourceforge/plantuml/salt/Position.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3835 $ * */ package net.sourceforge.plantuml.salt; diff --git a/src/net/sourceforge/plantuml/salt/Positionner2.java b/src/net/sourceforge/plantuml/salt/Positionner2.java index 50816b379..c2d4542aa 100644 --- a/src/net/sourceforge/plantuml/salt/Positionner2.java +++ b/src/net/sourceforge/plantuml/salt/Positionner2.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3835 $ * */ package net.sourceforge.plantuml.salt; diff --git a/src/net/sourceforge/plantuml/salt/SaltUtils.java b/src/net/sourceforge/plantuml/salt/SaltUtils.java index 4c9bf38de..2522aed09 100644 --- a/src/net/sourceforge/plantuml/salt/SaltUtils.java +++ b/src/net/sourceforge/plantuml/salt/SaltUtils.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3835 $ * */ package net.sourceforge.plantuml.salt; diff --git a/src/net/sourceforge/plantuml/salt/Terminated.java b/src/net/sourceforge/plantuml/salt/Terminated.java index 32e76d080..5b1dec565 100644 --- a/src/net/sourceforge/plantuml/salt/Terminated.java +++ b/src/net/sourceforge/plantuml/salt/Terminated.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3835 $ * */ package net.sourceforge.plantuml.salt; diff --git a/src/net/sourceforge/plantuml/salt/Terminator.java b/src/net/sourceforge/plantuml/salt/Terminator.java index e779baa30..46113aeae 100644 --- a/src/net/sourceforge/plantuml/salt/Terminator.java +++ b/src/net/sourceforge/plantuml/salt/Terminator.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3835 $ * */ package net.sourceforge.plantuml.salt; diff --git a/src/net/sourceforge/plantuml/salt/element/AbstractElement.java b/src/net/sourceforge/plantuml/salt/element/AbstractElement.java index dbf23be2c..39af12915 100644 --- a/src/net/sourceforge/plantuml/salt/element/AbstractElement.java +++ b/src/net/sourceforge/plantuml/salt/element/AbstractElement.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3835 $ * */ package net.sourceforge.plantuml.salt.element; diff --git a/src/net/sourceforge/plantuml/salt/element/AbstractElementText.java b/src/net/sourceforge/plantuml/salt/element/AbstractElementText.java index fb5fe37d1..a949b0231 100644 --- a/src/net/sourceforge/plantuml/salt/element/AbstractElementText.java +++ b/src/net/sourceforge/plantuml/salt/element/AbstractElementText.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3835 $ * */ package net.sourceforge.plantuml.salt.element; diff --git a/src/net/sourceforge/plantuml/salt/element/Element.java b/src/net/sourceforge/plantuml/salt/element/Element.java index 51cd3d922..5573d3a2b 100644 --- a/src/net/sourceforge/plantuml/salt/element/Element.java +++ b/src/net/sourceforge/plantuml/salt/element/Element.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3835 $ * */ package net.sourceforge.plantuml.salt.element; diff --git a/src/net/sourceforge/plantuml/salt/element/ElementBorder.java b/src/net/sourceforge/plantuml/salt/element/ElementBorder.java index 5b2e83184..1a1ae4bfb 100644 --- a/src/net/sourceforge/plantuml/salt/element/ElementBorder.java +++ b/src/net/sourceforge/plantuml/salt/element/ElementBorder.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3835 $ * */ package net.sourceforge.plantuml.salt.element; diff --git a/src/net/sourceforge/plantuml/salt/element/ElementButton.java b/src/net/sourceforge/plantuml/salt/element/ElementButton.java index 12a5af423..9e466822c 100644 --- a/src/net/sourceforge/plantuml/salt/element/ElementButton.java +++ b/src/net/sourceforge/plantuml/salt/element/ElementButton.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3835 $ * */ package net.sourceforge.plantuml.salt.element; diff --git a/src/net/sourceforge/plantuml/salt/element/ElementDroplist.java b/src/net/sourceforge/plantuml/salt/element/ElementDroplist.java index 897d9ca98..4804bd365 100644 --- a/src/net/sourceforge/plantuml/salt/element/ElementDroplist.java +++ b/src/net/sourceforge/plantuml/salt/element/ElementDroplist.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3835 $ * */ package net.sourceforge.plantuml.salt.element; diff --git a/src/net/sourceforge/plantuml/salt/element/ElementEmpty.java b/src/net/sourceforge/plantuml/salt/element/ElementEmpty.java index f66191d52..386bdbfb9 100644 --- a/src/net/sourceforge/plantuml/salt/element/ElementEmpty.java +++ b/src/net/sourceforge/plantuml/salt/element/ElementEmpty.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3835 $ * */ package net.sourceforge.plantuml.salt.element; diff --git a/src/net/sourceforge/plantuml/salt/element/ElementImage.java b/src/net/sourceforge/plantuml/salt/element/ElementImage.java index a66a707c1..45c8f11eb 100644 --- a/src/net/sourceforge/plantuml/salt/element/ElementImage.java +++ b/src/net/sourceforge/plantuml/salt/element/ElementImage.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3835 $ * */ package net.sourceforge.plantuml.salt.element; diff --git a/src/net/sourceforge/plantuml/salt/element/ElementLine.java b/src/net/sourceforge/plantuml/salt/element/ElementLine.java index d7da232a7..b641af67e 100644 --- a/src/net/sourceforge/plantuml/salt/element/ElementLine.java +++ b/src/net/sourceforge/plantuml/salt/element/ElementLine.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3835 $ * */ package net.sourceforge.plantuml.salt.element; diff --git a/src/net/sourceforge/plantuml/salt/element/ElementMenuBar.java b/src/net/sourceforge/plantuml/salt/element/ElementMenuBar.java index 8e859bff8..d9c52e157 100644 --- a/src/net/sourceforge/plantuml/salt/element/ElementMenuBar.java +++ b/src/net/sourceforge/plantuml/salt/element/ElementMenuBar.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3835 $ * */ package net.sourceforge.plantuml.salt.element; diff --git a/src/net/sourceforge/plantuml/salt/element/ElementMenuEntry.java b/src/net/sourceforge/plantuml/salt/element/ElementMenuEntry.java index 8072158a0..1a00bae9b 100644 --- a/src/net/sourceforge/plantuml/salt/element/ElementMenuEntry.java +++ b/src/net/sourceforge/plantuml/salt/element/ElementMenuEntry.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3835 $ * */ package net.sourceforge.plantuml.salt.element; diff --git a/src/net/sourceforge/plantuml/salt/element/ElementMenuPopup.java b/src/net/sourceforge/plantuml/salt/element/ElementMenuPopup.java index 52bd8ba3f..ea6653826 100644 --- a/src/net/sourceforge/plantuml/salt/element/ElementMenuPopup.java +++ b/src/net/sourceforge/plantuml/salt/element/ElementMenuPopup.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3835 $ * */ package net.sourceforge.plantuml.salt.element; diff --git a/src/net/sourceforge/plantuml/salt/element/ElementPyramid.java b/src/net/sourceforge/plantuml/salt/element/ElementPyramid.java index 1bdbe81e0..51f41f27e 100644 --- a/src/net/sourceforge/plantuml/salt/element/ElementPyramid.java +++ b/src/net/sourceforge/plantuml/salt/element/ElementPyramid.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3835 $ * */ package net.sourceforge.plantuml.salt.element; diff --git a/src/net/sourceforge/plantuml/salt/element/ElementRadioCheckbox.java b/src/net/sourceforge/plantuml/salt/element/ElementRadioCheckbox.java index ddf0310a9..6b46bebf1 100644 --- a/src/net/sourceforge/plantuml/salt/element/ElementRadioCheckbox.java +++ b/src/net/sourceforge/plantuml/salt/element/ElementRadioCheckbox.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3835 $ * */ package net.sourceforge.plantuml.salt.element; diff --git a/src/net/sourceforge/plantuml/salt/element/ElementTabBar.java b/src/net/sourceforge/plantuml/salt/element/ElementTabBar.java index 8ec75c3c3..79e262fc6 100644 --- a/src/net/sourceforge/plantuml/salt/element/ElementTabBar.java +++ b/src/net/sourceforge/plantuml/salt/element/ElementTabBar.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3835 $ * */ package net.sourceforge.plantuml.salt.element; diff --git a/src/net/sourceforge/plantuml/salt/element/ElementText.java b/src/net/sourceforge/plantuml/salt/element/ElementText.java index d2b7fee98..0567a4745 100644 --- a/src/net/sourceforge/plantuml/salt/element/ElementText.java +++ b/src/net/sourceforge/plantuml/salt/element/ElementText.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3835 $ * */ package net.sourceforge.plantuml.salt.element; diff --git a/src/net/sourceforge/plantuml/salt/element/ElementTextField.java b/src/net/sourceforge/plantuml/salt/element/ElementTextField.java index dc51f09a6..fbe87fa32 100644 --- a/src/net/sourceforge/plantuml/salt/element/ElementTextField.java +++ b/src/net/sourceforge/plantuml/salt/element/ElementTextField.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3835 $ * */ package net.sourceforge.plantuml.salt.element; diff --git a/src/net/sourceforge/plantuml/salt/element/ElementTree.java b/src/net/sourceforge/plantuml/salt/element/ElementTree.java index ccf6e6285..b87b6e5eb 100644 --- a/src/net/sourceforge/plantuml/salt/element/ElementTree.java +++ b/src/net/sourceforge/plantuml/salt/element/ElementTree.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3835 $ * */ package net.sourceforge.plantuml.salt.element; diff --git a/src/net/sourceforge/plantuml/salt/element/ElementTreeEntry.java b/src/net/sourceforge/plantuml/salt/element/ElementTreeEntry.java index c18ad77a9..aa276180d 100644 --- a/src/net/sourceforge/plantuml/salt/element/ElementTreeEntry.java +++ b/src/net/sourceforge/plantuml/salt/element/ElementTreeEntry.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3835 $ * */ package net.sourceforge.plantuml.salt.element; diff --git a/src/net/sourceforge/plantuml/salt/element/Grid.java b/src/net/sourceforge/plantuml/salt/element/Grid.java index 26ca3fa54..4bca75f3b 100644 --- a/src/net/sourceforge/plantuml/salt/element/Grid.java +++ b/src/net/sourceforge/plantuml/salt/element/Grid.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3835 $ * */ package net.sourceforge.plantuml.salt.element; diff --git a/src/net/sourceforge/plantuml/salt/element/Grid2.java b/src/net/sourceforge/plantuml/salt/element/Grid2.java index 157dc06a1..a66efb8eb 100644 --- a/src/net/sourceforge/plantuml/salt/element/Grid2.java +++ b/src/net/sourceforge/plantuml/salt/element/Grid2.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3835 $ * */ package net.sourceforge.plantuml.salt.element; diff --git a/src/net/sourceforge/plantuml/salt/element/LeftFirst.java b/src/net/sourceforge/plantuml/salt/element/LeftFirst.java index acf762ca2..107c6539c 100644 --- a/src/net/sourceforge/plantuml/salt/element/LeftFirst.java +++ b/src/net/sourceforge/plantuml/salt/element/LeftFirst.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3835 $ * */ package net.sourceforge.plantuml.salt.element; diff --git a/src/net/sourceforge/plantuml/salt/element/ListWidth.java b/src/net/sourceforge/plantuml/salt/element/ListWidth.java index cba91a57e..34d36d3b0 100644 --- a/src/net/sourceforge/plantuml/salt/element/ListWidth.java +++ b/src/net/sourceforge/plantuml/salt/element/ListWidth.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3835 $ * */ package net.sourceforge.plantuml.salt.element; diff --git a/src/net/sourceforge/plantuml/salt/element/Segment.java b/src/net/sourceforge/plantuml/salt/element/Segment.java index 7346a6e24..e36f87d66 100644 --- a/src/net/sourceforge/plantuml/salt/element/Segment.java +++ b/src/net/sourceforge/plantuml/salt/element/Segment.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3835 $ * */ package net.sourceforge.plantuml.salt.element; diff --git a/src/net/sourceforge/plantuml/salt/element/Skeleton.java b/src/net/sourceforge/plantuml/salt/element/Skeleton.java index df0e8b498..c39056feb 100644 --- a/src/net/sourceforge/plantuml/salt/element/Skeleton.java +++ b/src/net/sourceforge/plantuml/salt/element/Skeleton.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3835 $ * */ package net.sourceforge.plantuml.salt.element; diff --git a/src/net/sourceforge/plantuml/salt/element/Skeleton2.java b/src/net/sourceforge/plantuml/salt/element/Skeleton2.java index 46d0a3983..baf5542c7 100644 --- a/src/net/sourceforge/plantuml/salt/element/Skeleton2.java +++ b/src/net/sourceforge/plantuml/salt/element/Skeleton2.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3835 $ * */ package net.sourceforge.plantuml.salt.element; diff --git a/src/net/sourceforge/plantuml/salt/element/TableStrategy.java b/src/net/sourceforge/plantuml/salt/element/TableStrategy.java index 4b538df64..e7a744339 100644 --- a/src/net/sourceforge/plantuml/salt/element/TableStrategy.java +++ b/src/net/sourceforge/plantuml/salt/element/TableStrategy.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3835 $ * */ package net.sourceforge.plantuml.salt.element; diff --git a/src/net/sourceforge/plantuml/salt/element/TopFirst.java b/src/net/sourceforge/plantuml/salt/element/TopFirst.java index 14f572569..c22bc601f 100644 --- a/src/net/sourceforge/plantuml/salt/element/TopFirst.java +++ b/src/net/sourceforge/plantuml/salt/element/TopFirst.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3835 $ * */ package net.sourceforge.plantuml.salt.element; diff --git a/src/net/sourceforge/plantuml/salt/element/WrappedElement.java b/src/net/sourceforge/plantuml/salt/element/WrappedElement.java index 91afb229a..a8e767c13 100644 --- a/src/net/sourceforge/plantuml/salt/element/WrappedElement.java +++ b/src/net/sourceforge/plantuml/salt/element/WrappedElement.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3835 $ * */ package net.sourceforge.plantuml.salt.element; diff --git a/src/net/sourceforge/plantuml/salt/factory/AbstractElementFactoryComplex.java b/src/net/sourceforge/plantuml/salt/factory/AbstractElementFactoryComplex.java index 7e5f4577f..cd989ea46 100644 --- a/src/net/sourceforge/plantuml/salt/factory/AbstractElementFactoryComplex.java +++ b/src/net/sourceforge/plantuml/salt/factory/AbstractElementFactoryComplex.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3835 $ * */ package net.sourceforge.plantuml.salt.factory; diff --git a/src/net/sourceforge/plantuml/salt/factory/ElementFactory.java b/src/net/sourceforge/plantuml/salt/factory/ElementFactory.java index 307b7b1d6..7daacaeb3 100644 --- a/src/net/sourceforge/plantuml/salt/factory/ElementFactory.java +++ b/src/net/sourceforge/plantuml/salt/factory/ElementFactory.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3835 $ * */ package net.sourceforge.plantuml.salt.factory; diff --git a/src/net/sourceforge/plantuml/salt/factory/ElementFactoryBorder.java b/src/net/sourceforge/plantuml/salt/factory/ElementFactoryBorder.java index 47acb7250..6f32f08bc 100644 --- a/src/net/sourceforge/plantuml/salt/factory/ElementFactoryBorder.java +++ b/src/net/sourceforge/plantuml/salt/factory/ElementFactoryBorder.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3835 $ * */ package net.sourceforge.plantuml.salt.factory; diff --git a/src/net/sourceforge/plantuml/salt/factory/ElementFactoryButton.java b/src/net/sourceforge/plantuml/salt/factory/ElementFactoryButton.java index ac7fe8d73..23132e406 100644 --- a/src/net/sourceforge/plantuml/salt/factory/ElementFactoryButton.java +++ b/src/net/sourceforge/plantuml/salt/factory/ElementFactoryButton.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3835 $ * */ package net.sourceforge.plantuml.salt.factory; diff --git a/src/net/sourceforge/plantuml/salt/factory/ElementFactoryCheckboxOff.java b/src/net/sourceforge/plantuml/salt/factory/ElementFactoryCheckboxOff.java index c2ed7a76f..ee467e1d0 100644 --- a/src/net/sourceforge/plantuml/salt/factory/ElementFactoryCheckboxOff.java +++ b/src/net/sourceforge/plantuml/salt/factory/ElementFactoryCheckboxOff.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3835 $ * */ package net.sourceforge.plantuml.salt.factory; diff --git a/src/net/sourceforge/plantuml/salt/factory/ElementFactoryCheckboxOn.java b/src/net/sourceforge/plantuml/salt/factory/ElementFactoryCheckboxOn.java index 571edb180..33671cb6e 100644 --- a/src/net/sourceforge/plantuml/salt/factory/ElementFactoryCheckboxOn.java +++ b/src/net/sourceforge/plantuml/salt/factory/ElementFactoryCheckboxOn.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3835 $ * */ package net.sourceforge.plantuml.salt.factory; diff --git a/src/net/sourceforge/plantuml/salt/factory/ElementFactoryDroplist.java b/src/net/sourceforge/plantuml/salt/factory/ElementFactoryDroplist.java index 6771918e6..6b014b01f 100644 --- a/src/net/sourceforge/plantuml/salt/factory/ElementFactoryDroplist.java +++ b/src/net/sourceforge/plantuml/salt/factory/ElementFactoryDroplist.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3835 $ * */ package net.sourceforge.plantuml.salt.factory; diff --git a/src/net/sourceforge/plantuml/salt/factory/ElementFactoryImage.java b/src/net/sourceforge/plantuml/salt/factory/ElementFactoryImage.java index 2e3f20802..8391a79b3 100644 --- a/src/net/sourceforge/plantuml/salt/factory/ElementFactoryImage.java +++ b/src/net/sourceforge/plantuml/salt/factory/ElementFactoryImage.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3835 $ * */ package net.sourceforge.plantuml.salt.factory; diff --git a/src/net/sourceforge/plantuml/salt/factory/ElementFactoryLine.java b/src/net/sourceforge/plantuml/salt/factory/ElementFactoryLine.java index f207b5ea8..8c432e014 100644 --- a/src/net/sourceforge/plantuml/salt/factory/ElementFactoryLine.java +++ b/src/net/sourceforge/plantuml/salt/factory/ElementFactoryLine.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3835 $ * */ package net.sourceforge.plantuml.salt.factory; diff --git a/src/net/sourceforge/plantuml/salt/factory/ElementFactoryMenu.java b/src/net/sourceforge/plantuml/salt/factory/ElementFactoryMenu.java index 3121da68a..6b5a4fd44 100644 --- a/src/net/sourceforge/plantuml/salt/factory/ElementFactoryMenu.java +++ b/src/net/sourceforge/plantuml/salt/factory/ElementFactoryMenu.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3835 $ * */ package net.sourceforge.plantuml.salt.factory; diff --git a/src/net/sourceforge/plantuml/salt/factory/ElementFactoryPyramid.java b/src/net/sourceforge/plantuml/salt/factory/ElementFactoryPyramid.java index c7d2f83ca..90228db42 100644 --- a/src/net/sourceforge/plantuml/salt/factory/ElementFactoryPyramid.java +++ b/src/net/sourceforge/plantuml/salt/factory/ElementFactoryPyramid.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3835 $ * */ package net.sourceforge.plantuml.salt.factory; diff --git a/src/net/sourceforge/plantuml/salt/factory/ElementFactoryRadioOff.java b/src/net/sourceforge/plantuml/salt/factory/ElementFactoryRadioOff.java index e68a3a15e..7a776e142 100644 --- a/src/net/sourceforge/plantuml/salt/factory/ElementFactoryRadioOff.java +++ b/src/net/sourceforge/plantuml/salt/factory/ElementFactoryRadioOff.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3835 $ * */ package net.sourceforge.plantuml.salt.factory; diff --git a/src/net/sourceforge/plantuml/salt/factory/ElementFactoryRadioOn.java b/src/net/sourceforge/plantuml/salt/factory/ElementFactoryRadioOn.java index 2240b97bc..56effc0dd 100644 --- a/src/net/sourceforge/plantuml/salt/factory/ElementFactoryRadioOn.java +++ b/src/net/sourceforge/plantuml/salt/factory/ElementFactoryRadioOn.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3835 $ * */ package net.sourceforge.plantuml.salt.factory; diff --git a/src/net/sourceforge/plantuml/salt/factory/ElementFactoryRetrieveFromDictonnary.java b/src/net/sourceforge/plantuml/salt/factory/ElementFactoryRetrieveFromDictonnary.java index bf74bd269..1ddb7ffd1 100644 --- a/src/net/sourceforge/plantuml/salt/factory/ElementFactoryRetrieveFromDictonnary.java +++ b/src/net/sourceforge/plantuml/salt/factory/ElementFactoryRetrieveFromDictonnary.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3835 $ * */ package net.sourceforge.plantuml.salt.factory; diff --git a/src/net/sourceforge/plantuml/salt/factory/ElementFactoryTab.java b/src/net/sourceforge/plantuml/salt/factory/ElementFactoryTab.java index f239ad3b3..f3625a90d 100644 --- a/src/net/sourceforge/plantuml/salt/factory/ElementFactoryTab.java +++ b/src/net/sourceforge/plantuml/salt/factory/ElementFactoryTab.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3835 $ * */ package net.sourceforge.plantuml.salt.factory; diff --git a/src/net/sourceforge/plantuml/salt/factory/ElementFactoryText.java b/src/net/sourceforge/plantuml/salt/factory/ElementFactoryText.java index 7825300c8..be9336e5b 100644 --- a/src/net/sourceforge/plantuml/salt/factory/ElementFactoryText.java +++ b/src/net/sourceforge/plantuml/salt/factory/ElementFactoryText.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3835 $ * */ package net.sourceforge.plantuml.salt.factory; diff --git a/src/net/sourceforge/plantuml/salt/factory/ElementFactoryTextField.java b/src/net/sourceforge/plantuml/salt/factory/ElementFactoryTextField.java index 004e1cf26..dc6e75799 100644 --- a/src/net/sourceforge/plantuml/salt/factory/ElementFactoryTextField.java +++ b/src/net/sourceforge/plantuml/salt/factory/ElementFactoryTextField.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3835 $ * */ package net.sourceforge.plantuml.salt.factory; diff --git a/src/net/sourceforge/plantuml/salt/factory/ElementFactoryTree.java b/src/net/sourceforge/plantuml/salt/factory/ElementFactoryTree.java index 557bc9e58..be60bf947 100644 --- a/src/net/sourceforge/plantuml/salt/factory/ElementFactoryTree.java +++ b/src/net/sourceforge/plantuml/salt/factory/ElementFactoryTree.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3835 $ * */ package net.sourceforge.plantuml.salt.factory; diff --git a/src/net/sourceforge/plantuml/sequencediagram/AbstractEvent.java b/src/net/sourceforge/plantuml/sequencediagram/AbstractEvent.java index 9f614b972..aba7c34da 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/AbstractEvent.java +++ b/src/net/sourceforge/plantuml/sequencediagram/AbstractEvent.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 12235 $ * */ package net.sourceforge.plantuml.sequencediagram; diff --git a/src/net/sourceforge/plantuml/sequencediagram/AbstractMessage.java b/src/net/sourceforge/plantuml/sequencediagram/AbstractMessage.java index 9b6752d8b..09e4a41c9 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/AbstractMessage.java +++ b/src/net/sourceforge/plantuml/sequencediagram/AbstractMessage.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4636 $ * */ package net.sourceforge.plantuml.sequencediagram; diff --git a/src/net/sourceforge/plantuml/sequencediagram/Delay.java b/src/net/sourceforge/plantuml/sequencediagram/Delay.java index 95ad58312..632a1982b 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/Delay.java +++ b/src/net/sourceforge/plantuml/sequencediagram/Delay.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3835 $ * */ package net.sourceforge.plantuml.sequencediagram; diff --git a/src/net/sourceforge/plantuml/sequencediagram/Divider.java b/src/net/sourceforge/plantuml/sequencediagram/Divider.java index 59bf15c5f..51fe9eecb 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/Divider.java +++ b/src/net/sourceforge/plantuml/sequencediagram/Divider.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3835 $ * */ package net.sourceforge.plantuml.sequencediagram; diff --git a/src/net/sourceforge/plantuml/sequencediagram/Englober.java b/src/net/sourceforge/plantuml/sequencediagram/Englober.java index 965b304c9..5d8872ac4 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/Englober.java +++ b/src/net/sourceforge/plantuml/sequencediagram/Englober.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4836 $ * */ package net.sourceforge.plantuml.sequencediagram; @@ -40,7 +37,6 @@ import net.sourceforge.plantuml.Dimension2DDouble; import net.sourceforge.plantuml.ISkinParam; import net.sourceforge.plantuml.SkinParamBackcolored; import net.sourceforge.plantuml.graphic.StringBounder; -import net.sourceforge.plantuml.graphic.TextBlockUtils; import net.sourceforge.plantuml.real.Real; import net.sourceforge.plantuml.real.RealUtils; import net.sourceforge.plantuml.sequencediagram.teoz.LivingSpace; @@ -62,13 +58,13 @@ public class Englober { final private Real core2; @Deprecated - public Englober(ParticipantEnglober participantEnglober, Participant first, ISkinParam skinParam, Skin skin) { - this(participantEnglober, first, convertFunctionToBeRemoved(skinParam, skin)); + public Englober(ParticipantEnglober participantEnglober, Participant first, ISkinParam skinParam, Skin skin, + StringBounder stringBounder) { + this(participantEnglober, first, convertFunctionToBeRemoved(skinParam, skin, stringBounder)); } - private static TileArguments convertFunctionToBeRemoved(ISkinParam skinParam, Skin skin) { - final TileArguments result = new TileArguments(TextBlockUtils.getDummyStringBounder(), null, skin, skinParam, - null); + private static TileArguments convertFunctionToBeRemoved(ISkinParam skinParam, Skin skin, StringBounder stringBounder) { + final TileArguments result = new TileArguments(stringBounder, null, skin, skinParam, null); return result; } @@ -208,5 +204,4 @@ public class Englober { return getX2().addFixed(10); } - } diff --git a/src/net/sourceforge/plantuml/sequencediagram/Event.java b/src/net/sourceforge/plantuml/sequencediagram/Event.java index a6d7b8c63..1928c27b7 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/Event.java +++ b/src/net/sourceforge/plantuml/sequencediagram/Event.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.sequencediagram; diff --git a/src/net/sourceforge/plantuml/sequencediagram/EventWithDeactivate.java b/src/net/sourceforge/plantuml/sequencediagram/EventWithDeactivate.java index de4f9b1d1..8a552cd9b 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/EventWithDeactivate.java +++ b/src/net/sourceforge/plantuml/sequencediagram/EventWithDeactivate.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4636 $ * */ package net.sourceforge.plantuml.sequencediagram; diff --git a/src/net/sourceforge/plantuml/sequencediagram/Grouping.java b/src/net/sourceforge/plantuml/sequencediagram/Grouping.java index d73301263..14c9f0701 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/Grouping.java +++ b/src/net/sourceforge/plantuml/sequencediagram/Grouping.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4320 $ * */ package net.sourceforge.plantuml.sequencediagram; diff --git a/src/net/sourceforge/plantuml/sequencediagram/GroupingLeaf.java b/src/net/sourceforge/plantuml/sequencediagram/GroupingLeaf.java index d8472f21a..d2fdf42c8 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/GroupingLeaf.java +++ b/src/net/sourceforge/plantuml/sequencediagram/GroupingLeaf.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.sequencediagram; diff --git a/src/net/sourceforge/plantuml/sequencediagram/GroupingStart.java b/src/net/sourceforge/plantuml/sequencediagram/GroupingStart.java index c3849f27d..5aadfaccb 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/GroupingStart.java +++ b/src/net/sourceforge/plantuml/sequencediagram/GroupingStart.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4282 $ * */ package net.sourceforge.plantuml.sequencediagram; diff --git a/src/net/sourceforge/plantuml/sequencediagram/GroupingType.java b/src/net/sourceforge/plantuml/sequencediagram/GroupingType.java index 51f28a8c1..ff02c9566 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/GroupingType.java +++ b/src/net/sourceforge/plantuml/sequencediagram/GroupingType.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.sequencediagram; diff --git a/src/net/sourceforge/plantuml/sequencediagram/HSpace.java b/src/net/sourceforge/plantuml/sequencediagram/HSpace.java index 9fd6938dd..229892548 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/HSpace.java +++ b/src/net/sourceforge/plantuml/sequencediagram/HSpace.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3835 $ * */ package net.sourceforge.plantuml.sequencediagram; diff --git a/src/net/sourceforge/plantuml/sequencediagram/InGroupable.java b/src/net/sourceforge/plantuml/sequencediagram/InGroupable.java index c6f9bc062..449958ee7 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/InGroupable.java +++ b/src/net/sourceforge/plantuml/sequencediagram/InGroupable.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4259 $ * */ package net.sourceforge.plantuml.sequencediagram; diff --git a/src/net/sourceforge/plantuml/sequencediagram/InGroupableList.java b/src/net/sourceforge/plantuml/sequencediagram/InGroupableList.java index efde1eff2..0ad30b243 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/InGroupableList.java +++ b/src/net/sourceforge/plantuml/sequencediagram/InGroupableList.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4259 $ * */ package net.sourceforge.plantuml.sequencediagram; diff --git a/src/net/sourceforge/plantuml/sequencediagram/LifeEvent.java b/src/net/sourceforge/plantuml/sequencediagram/LifeEvent.java index 45b852a1c..78ad110b5 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/LifeEvent.java +++ b/src/net/sourceforge/plantuml/sequencediagram/LifeEvent.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.sequencediagram; diff --git a/src/net/sourceforge/plantuml/sequencediagram/LifeEventType.java b/src/net/sourceforge/plantuml/sequencediagram/LifeEventType.java index c5042f489..12949a6fc 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/LifeEventType.java +++ b/src/net/sourceforge/plantuml/sequencediagram/LifeEventType.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.sequencediagram; diff --git a/src/net/sourceforge/plantuml/sequencediagram/Message.java b/src/net/sourceforge/plantuml/sequencediagram/Message.java index 64fe03596..bf38fb888 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/Message.java +++ b/src/net/sourceforge/plantuml/sequencediagram/Message.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.sequencediagram; diff --git a/src/net/sourceforge/plantuml/sequencediagram/MessageExo.java b/src/net/sourceforge/plantuml/sequencediagram/MessageExo.java index bb4bd5ae5..15932fb3f 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/MessageExo.java +++ b/src/net/sourceforge/plantuml/sequencediagram/MessageExo.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4636 $ * */ package net.sourceforge.plantuml.sequencediagram; diff --git a/src/net/sourceforge/plantuml/sequencediagram/MessageExoType.java b/src/net/sourceforge/plantuml/sequencediagram/MessageExoType.java index e4d4d24be..ce70db7df 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/MessageExoType.java +++ b/src/net/sourceforge/plantuml/sequencediagram/MessageExoType.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4636 $ * */ package net.sourceforge.plantuml.sequencediagram; diff --git a/src/net/sourceforge/plantuml/sequencediagram/MessageNumber.java b/src/net/sourceforge/plantuml/sequencediagram/MessageNumber.java index 85e60a974..de1d1d113 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/MessageNumber.java +++ b/src/net/sourceforge/plantuml/sequencediagram/MessageNumber.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.sequencediagram; diff --git a/src/net/sourceforge/plantuml/sequencediagram/Newpage.java b/src/net/sourceforge/plantuml/sequencediagram/Newpage.java index ce1b4c502..6dbc8e4d2 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/Newpage.java +++ b/src/net/sourceforge/plantuml/sequencediagram/Newpage.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.sequencediagram; diff --git a/src/net/sourceforge/plantuml/sequencediagram/Note.java b/src/net/sourceforge/plantuml/sequencediagram/Note.java index 3a78b6f6f..3e83dd357 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/Note.java +++ b/src/net/sourceforge/plantuml/sequencediagram/Note.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.sequencediagram; diff --git a/src/net/sourceforge/plantuml/sequencediagram/NotePosition.java b/src/net/sourceforge/plantuml/sequencediagram/NotePosition.java index 9258c9447..92781dbb4 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/NotePosition.java +++ b/src/net/sourceforge/plantuml/sequencediagram/NotePosition.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19813 $ * */ package net.sourceforge.plantuml.sequencediagram; diff --git a/src/net/sourceforge/plantuml/sequencediagram/NoteStyle.java b/src/net/sourceforge/plantuml/sequencediagram/NoteStyle.java index 4935cbae3..261296ca2 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/NoteStyle.java +++ b/src/net/sourceforge/plantuml/sequencediagram/NoteStyle.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6575 $ * */ package net.sourceforge.plantuml.sequencediagram; diff --git a/src/net/sourceforge/plantuml/sequencediagram/NoteType.java b/src/net/sourceforge/plantuml/sequencediagram/NoteType.java index 58ba22954..9331bb934 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/NoteType.java +++ b/src/net/sourceforge/plantuml/sequencediagram/NoteType.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.sequencediagram; diff --git a/src/net/sourceforge/plantuml/sequencediagram/Notes.java b/src/net/sourceforge/plantuml/sequencediagram/Notes.java index c2294e3f3..d76e1e513 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/Notes.java +++ b/src/net/sourceforge/plantuml/sequencediagram/Notes.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 9786 $ * */ package net.sourceforge.plantuml.sequencediagram; diff --git a/src/net/sourceforge/plantuml/sequencediagram/Participant.java b/src/net/sourceforge/plantuml/sequencediagram/Participant.java index 3e7024da3..02256a68c 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/Participant.java +++ b/src/net/sourceforge/plantuml/sequencediagram/Participant.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19161 $ * */ package net.sourceforge.plantuml.sequencediagram; diff --git a/src/net/sourceforge/plantuml/sequencediagram/ParticipantEnglober.java b/src/net/sourceforge/plantuml/sequencediagram/ParticipantEnglober.java index 282a7147f..ebc7dcd52 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/ParticipantEnglober.java +++ b/src/net/sourceforge/plantuml/sequencediagram/ParticipantEnglober.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4836 $ * */ package net.sourceforge.plantuml.sequencediagram; diff --git a/src/net/sourceforge/plantuml/sequencediagram/ParticipantType.java b/src/net/sourceforge/plantuml/sequencediagram/ParticipantType.java index 69da78ec0..f0fd248d3 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/ParticipantType.java +++ b/src/net/sourceforge/plantuml/sequencediagram/ParticipantType.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19978 $ * */ package net.sourceforge.plantuml.sequencediagram; diff --git a/src/net/sourceforge/plantuml/sequencediagram/Reference.java b/src/net/sourceforge/plantuml/sequencediagram/Reference.java index 69732db48..281ec6658 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/Reference.java +++ b/src/net/sourceforge/plantuml/sequencediagram/Reference.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6097 $ * */ package net.sourceforge.plantuml.sequencediagram; diff --git a/src/net/sourceforge/plantuml/sequencediagram/SequenceDiagram.java b/src/net/sourceforge/plantuml/sequencediagram/SequenceDiagram.java index fb03f39f8..c0c24829a 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/SequenceDiagram.java +++ b/src/net/sourceforge/plantuml/sequencediagram/SequenceDiagram.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * diff --git a/src/net/sourceforge/plantuml/sequencediagram/SequenceDiagramFactory.java b/src/net/sourceforge/plantuml/sequencediagram/SequenceDiagramFactory.java index e027ca507..79b7980a1 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/SequenceDiagramFactory.java +++ b/src/net/sourceforge/plantuml/sequencediagram/SequenceDiagramFactory.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 10006 $ * */ package net.sourceforge.plantuml.sequencediagram; diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandActivate.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandActivate.java index a8a029b24..4f9038939 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandActivate.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandActivate.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.sequencediagram.command; diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandActivate2.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandActivate2.java index 0bdfdd131..e028f7e77 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandActivate2.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandActivate2.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.sequencediagram.command; diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandArrow.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandArrow.java index e9558e1dc..851acdf7d 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandArrow.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandArrow.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5424 $ * */ package net.sourceforge.plantuml.sequencediagram.command; diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandAutoNewpage.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandAutoNewpage.java index bc67fe2c8..c4ed882bf 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandAutoNewpage.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandAutoNewpage.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4762 $ * */ package net.sourceforge.plantuml.sequencediagram.command; diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandAutoactivate.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandAutoactivate.java index 58506fe60..2a29e600e 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandAutoactivate.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandAutoactivate.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4762 $ * */ package net.sourceforge.plantuml.sequencediagram.command; diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandAutonumber.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandAutonumber.java index 4315aee00..0fa372f83 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandAutonumber.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandAutonumber.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.sequencediagram.command; diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandAutonumberResume.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandAutonumberResume.java index a9c4b64c4..84350bd67 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandAutonumberResume.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandAutonumberResume.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 12235 $ * */ package net.sourceforge.plantuml.sequencediagram.command; diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandAutonumberStop.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandAutonumberStop.java index 79eca4808..68cee5d6d 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandAutonumberStop.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandAutonumberStop.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 12235 $ * */ package net.sourceforge.plantuml.sequencediagram.command; diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandBoxEnd.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandBoxEnd.java index 734165f92..6bf77e8ab 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandBoxEnd.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandBoxEnd.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4762 $ * */ package net.sourceforge.plantuml.sequencediagram.command; diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandBoxStart.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandBoxStart.java index 79f2bbdaf..384606629 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandBoxStart.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandBoxStart.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4762 $ * */ package net.sourceforge.plantuml.sequencediagram.command; diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandDelay.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandDelay.java index f17a81783..515bb6e91 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandDelay.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandDelay.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5158 $ * */ package net.sourceforge.plantuml.sequencediagram.command; diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandDivider.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandDivider.java index 12b84aa59..f254884c1 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandDivider.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandDivider.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3835 $ * */ package net.sourceforge.plantuml.sequencediagram.command; diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandExoArrowAny.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandExoArrowAny.java index 45d82c51e..12ba5c190 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandExoArrowAny.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandExoArrowAny.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4636 $ * */ package net.sourceforge.plantuml.sequencediagram.command; diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandExoArrowLeft.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandExoArrowLeft.java index c39c6fb0d..745d67617 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandExoArrowLeft.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandExoArrowLeft.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4636 $ * */ package net.sourceforge.plantuml.sequencediagram.command; diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandExoArrowRight.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandExoArrowRight.java index 004ed5258..4abcfffe5 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandExoArrowRight.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandExoArrowRight.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4636 $ * */ package net.sourceforge.plantuml.sequencediagram.command; diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandFootbox.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandFootbox.java index 19da0fa9f..9ffdf0dbf 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandFootbox.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandFootbox.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.sequencediagram.command; diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandFootboxOld.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandFootboxOld.java index 6307b84c5..577247687 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandFootboxOld.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandFootboxOld.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4762 $ * */ package net.sourceforge.plantuml.sequencediagram.command; diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandGrouping.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandGrouping.java index 7807a6377..601342a08 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandGrouping.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandGrouping.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19885 $ * */ package net.sourceforge.plantuml.sequencediagram.command; diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandHSpace.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandHSpace.java index 7517b2a2c..cbf3f52a9 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandHSpace.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandHSpace.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3835 $ * */ package net.sourceforge.plantuml.sequencediagram.command; diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandIgnoreNewpage.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandIgnoreNewpage.java index cd1d22351..d51a1cb88 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandIgnoreNewpage.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandIgnoreNewpage.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4762 $ * */ package net.sourceforge.plantuml.sequencediagram.command; diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandNewpage.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandNewpage.java index 64b807534..2d5c5ad51 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandNewpage.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandNewpage.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.sequencediagram.command; diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipant.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipant.java index 6e6113641..ca8970630 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipant.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipant.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6109 $ * */ package net.sourceforge.plantuml.sequencediagram.command; diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipantA.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipantA.java index 631e3c402..7324fd576 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipantA.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipantA.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6109 $ * */ package net.sourceforge.plantuml.sequencediagram.command; diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipantA2.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipantA2.java index bf4679ef4..99c4cc040 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipantA2.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipantA2.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6109 $ * */ package net.sourceforge.plantuml.sequencediagram.command; diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipantA3.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipantA3.java index e624a7a18..3b8d7951d 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipantA3.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipantA3.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6109 $ * */ package net.sourceforge.plantuml.sequencediagram.command; diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipantA4.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipantA4.java index 5a3a4e805..e1c2da7a3 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipantA4.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipantA4.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6109 $ * */ package net.sourceforge.plantuml.sequencediagram.command; diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandReferenceMultilinesOverSeveral.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandReferenceMultilinesOverSeveral.java index 37f72ca8a..80b0e97a4 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandReferenceMultilinesOverSeveral.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandReferenceMultilinesOverSeveral.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5884 $ * */ package net.sourceforge.plantuml.sequencediagram.command; diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandReferenceOverSeveral.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandReferenceOverSeveral.java index d686ecb60..e5b66686a 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandReferenceOverSeveral.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandReferenceOverSeveral.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3835 $ * */ package net.sourceforge.plantuml.sequencediagram.command; diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandReturn.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandReturn.java index bd5db929c..971ddf3d4 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandReturn.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandReturn.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 7272 $ * */ package net.sourceforge.plantuml.sequencediagram.command; diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandSkin.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandSkin.java index daf42e524..86f994813 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandSkin.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandSkin.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.sequencediagram.command; diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandUrl.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandUrl.java index 7aaf1a8b3..20e8632a3 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandUrl.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandUrl.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4161 $ * */ package net.sourceforge.plantuml.sequencediagram.command; diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/Arrow.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/Arrow.java index 21fd05ca4..4982a806d 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/Arrow.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/Arrow.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.sequencediagram.graphic; diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/ArrowAndNoteBox.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/ArrowAndNoteBox.java index 84772079c..f704fba1a 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/ArrowAndNoteBox.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/ArrowAndNoteBox.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.sequencediagram.graphic; diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/ArrowAndParticipant.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/ArrowAndParticipant.java index 32271107c..ba9ff7d09 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/ArrowAndParticipant.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/ArrowAndParticipant.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4721 $ * */ package net.sourceforge.plantuml.sequencediagram.graphic; diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/Constraint.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/Constraint.java index 31efa43f7..fa294a1f2 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/Constraint.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/Constraint.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.sequencediagram.graphic; diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/ConstraintSet.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/ConstraintSet.java index bc62da88c..6bda7fef5 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/ConstraintSet.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/ConstraintSet.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.sequencediagram.graphic; diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/DrawableSet.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/DrawableSet.java index b64774127..6298f1b0e 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/DrawableSet.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/DrawableSet.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19976 $ * */ package net.sourceforge.plantuml.sequencediagram.graphic; @@ -140,7 +137,7 @@ public class DrawableSet { public double getHeadAndEngloberHeight(Participant p, StringBounder stringBounder) { final LivingParticipantBox box = participants.get(p); final double height = box.getParticipantBox().getHeadHeight(stringBounder); - final Englober englober = getParticipantEnglober(p); + final Englober englober = getParticipantEnglober(p, stringBounder); if (englober == null) { return height; } @@ -150,7 +147,7 @@ public class DrawableSet { return height + heightEnglober; } - public List getExistingParticipantEnglober() { + public List getExistingParticipantEnglober(StringBounder stringBounder) { final List result = new ArrayList(); Englober pending = null; for (Map.Entry ent : participantEnglobers2.entrySet()) { @@ -164,7 +161,7 @@ public class DrawableSet { pending.add(ent.getKey()); continue; } - pending = new Englober(englober, ent.getKey(), getSkinParam(), skin); + pending = new Englober(englober, ent.getKey(), getSkinParam(), skin, stringBounder); result.add(pending); } return Collections.unmodifiableList(result); @@ -172,7 +169,7 @@ public class DrawableSet { public double getOffsetForEnglobers(StringBounder stringBounder) { double result = 0; - for (Englober englober : getExistingParticipantEnglober()) { + for (Englober englober : getExistingParticipantEnglober(stringBounder)) { final Component comp = skin.createComponent(ComponentType.ENGLOBER, null, skinParam, englober .getParticipantEnglober().getTitle()); final double height = comp.getPreferredHeight(stringBounder); @@ -187,7 +184,8 @@ public class DrawableSet { static private final int MARGIN_FOR_ENGLOBERS1 = 2; public double getTailHeight(StringBounder stringBounder, boolean showTail) { - final double marginForEnglobers = getExistingParticipantEnglober().size() > 0 ? MARGIN_FOR_ENGLOBERS : 0; + final double marginForEnglobers = getExistingParticipantEnglober(stringBounder).size() > 0 ? MARGIN_FOR_ENGLOBERS + : 0; if (showTail == false) { return 1 + marginForEnglobers; @@ -329,7 +327,7 @@ public class DrawableSet { } private void drawEnglobers(UGraphic ug, double height, Context2D context) { - for (Englober englober : getExistingParticipantEnglober()) { + for (Englober englober : getExistingParticipantEnglober(ug.getStringBounder())) { double x1 = getX1(englober); final double x2 = getX2(ug.getStringBounder(), englober); @@ -380,8 +378,8 @@ public class DrawableSet { line.drawU(ug, getSkin(), skinParam); } - private Englober getParticipantEnglober(Participant p) { - for (Englober pe : getExistingParticipantEnglober()) { + private Englober getParticipantEnglober(Participant p, StringBounder stringBounder) { + for (Englober pe : getExistingParticipantEnglober(stringBounder)) { if (pe.contains(p)) { return pe; } diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/DrawableSetInitializer.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/DrawableSetInitializer.java index b9ac151ab..34e11bfc2 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/DrawableSetInitializer.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/DrawableSetInitializer.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19978 $ * */ package net.sourceforge.plantuml.sequencediagram.graphic; @@ -205,7 +202,7 @@ class DrawableSetInitializer { } private void takeParticipantEngloberTitleWidth3(StringBounder stringBounder) { - for (Englober pe : drawableSet.getExistingParticipantEnglober()) { + for (Englober pe : drawableSet.getExistingParticipantEnglober(stringBounder)) { final double preferredWidth = drawableSet.getEngloberPreferedWidth(stringBounder, pe.getParticipantEnglober()); final ParticipantBox first = drawableSet.getLivingParticipantBox(pe.getFirst2TOBEPRIVATE()) diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/FileMaker.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/FileMaker.java index e57e3eae2..5683e259d 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/FileMaker.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/FileMaker.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.sequencediagram.graphic; diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/FreeYStrategy.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/FreeYStrategy.java index 41777d7ba..dcb2f7c49 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/FreeYStrategy.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/FreeYStrategy.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 7340 $ * */ package net.sourceforge.plantuml.sequencediagram.graphic; diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/FreeYStrategyBasic.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/FreeYStrategyBasic.java index cbff52e2d..ff701120e 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/FreeYStrategyBasic.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/FreeYStrategyBasic.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 7340 $ * */ package net.sourceforge.plantuml.sequencediagram.graphic; diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/Frontier.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/Frontier.java index 38d484d27..7bab025ce 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/Frontier.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/Frontier.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 7340 $ * */ package net.sourceforge.plantuml.sequencediagram.graphic; diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/FrontierComplex.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/FrontierComplex.java index 383230f1b..96cd2216c 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/FrontierComplex.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/FrontierComplex.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 7340 $ * */ package net.sourceforge.plantuml.sequencediagram.graphic; diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/FrontierSimple.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/FrontierSimple.java index 3d12fd14f..e04952ce9 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/FrontierSimple.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/FrontierSimple.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 7340 $ * */ package net.sourceforge.plantuml.sequencediagram.graphic; diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/FrontierStack.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/FrontierStack.java index 535dff0f8..bb0a7882e 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/FrontierStack.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/FrontierStack.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 7340 $ * */ package net.sourceforge.plantuml.sequencediagram.graphic; diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/FrontierStackImpl.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/FrontierStackImpl.java index dc3b302e1..2631dc412 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/FrontierStackImpl.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/FrontierStackImpl.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 7340 $ * */ package net.sourceforge.plantuml.sequencediagram.graphic; diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/GraphicalDelayText.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/GraphicalDelayText.java index a47f03f44..233e03620 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/GraphicalDelayText.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/GraphicalDelayText.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3916 $ * */ package net.sourceforge.plantuml.sequencediagram.graphic; diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/GraphicalDivider.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/GraphicalDivider.java index 2c40734ae..752edc50f 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/GraphicalDivider.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/GraphicalDivider.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3916 $ * */ package net.sourceforge.plantuml.sequencediagram.graphic; diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/GraphicalElement.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/GraphicalElement.java index 8c923e5a7..53579e609 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/GraphicalElement.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/GraphicalElement.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.sequencediagram.graphic; diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/GraphicalElementLiveEvent.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/GraphicalElementLiveEvent.java index d0e01b95f..54c8bfbc8 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/GraphicalElementLiveEvent.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/GraphicalElementLiveEvent.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 12235 $ * */ package net.sourceforge.plantuml.sequencediagram.graphic; diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/GraphicalHSpace.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/GraphicalHSpace.java index 27fe31308..7609320a9 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/GraphicalHSpace.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/GraphicalHSpace.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3916 $ * */ package net.sourceforge.plantuml.sequencediagram.graphic; diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/GraphicalNewpage.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/GraphicalNewpage.java index b0c481972..56844f257 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/GraphicalNewpage.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/GraphicalNewpage.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.sequencediagram.graphic; diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/GraphicalReference.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/GraphicalReference.java index 31c342803..9075fa723 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/GraphicalReference.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/GraphicalReference.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3916 $ * */ package net.sourceforge.plantuml.sequencediagram.graphic; diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/GroupingGraphicalElement.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/GroupingGraphicalElement.java index 53455bf9e..d155357d7 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/GroupingGraphicalElement.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/GroupingGraphicalElement.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5873 $ * */ package net.sourceforge.plantuml.sequencediagram.graphic; diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/GroupingGraphicalElementElse.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/GroupingGraphicalElementElse.java index b2c827a97..07fd29bc7 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/GroupingGraphicalElementElse.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/GroupingGraphicalElementElse.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.sequencediagram.graphic; diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/GroupingGraphicalElementHeader.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/GroupingGraphicalElementHeader.java index ded260e9f..05f14385a 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/GroupingGraphicalElementHeader.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/GroupingGraphicalElementHeader.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.sequencediagram.graphic; diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/GroupingGraphicalElementTail.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/GroupingGraphicalElementTail.java index 3f458d6d7..551874136 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/GroupingGraphicalElementTail.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/GroupingGraphicalElementTail.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.sequencediagram.graphic; diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/InGroupablesStack.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/InGroupablesStack.java index 14fc8c568..fb271b14a 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/InGroupablesStack.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/InGroupablesStack.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 7461 $ * */ package net.sourceforge.plantuml.sequencediagram.graphic; diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/Lazy.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/Lazy.java index b69624860..73c267552 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/Lazy.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/Lazy.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3977 $ * */ package net.sourceforge.plantuml.sequencediagram.graphic; diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/LifeDestroy.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/LifeDestroy.java index 79b032919..ebd94eb17 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/LifeDestroy.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/LifeDestroy.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.sequencediagram.graphic; diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/LifeLine.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/LifeLine.java index 29fd5fb9a..6cb90828d 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/LifeLine.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/LifeLine.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.sequencediagram.graphic; diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/LifeSegmentVariation.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/LifeSegmentVariation.java index ce689c8b6..1d53a17a3 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/LifeSegmentVariation.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/LifeSegmentVariation.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.sequencediagram.graphic; diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/LivingParticipantBox.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/LivingParticipantBox.java index ba4ff5bb5..368d3325a 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/LivingParticipantBox.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/LivingParticipantBox.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.sequencediagram.graphic; diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/MessageArrow.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/MessageArrow.java index 2f756033c..e66c44c6b 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/MessageArrow.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/MessageArrow.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.sequencediagram.graphic; diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/MessageExoArrow.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/MessageExoArrow.java index 230e822ee..2ddc4ab37 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/MessageExoArrow.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/MessageExoArrow.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4274 $ * */ package net.sourceforge.plantuml.sequencediagram.graphic; diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/MessageSelfArrow.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/MessageSelfArrow.java index 0b2a58162..567fb25b1 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/MessageSelfArrow.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/MessageSelfArrow.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.sequencediagram.graphic; diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/NoteBox.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/NoteBox.java index 9b5193fa5..f7a6c3c63 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/NoteBox.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/NoteBox.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.sequencediagram.graphic; diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/NotesBoxes.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/NotesBoxes.java index 2db28eb74..ed705e78a 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/NotesBoxes.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/NotesBoxes.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 10073 $ * */ package net.sourceforge.plantuml.sequencediagram.graphic; diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/Page.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/Page.java index 05067bbc9..85de3eb8f 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/Page.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/Page.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.sequencediagram.graphic; diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/PageSplitter.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/PageSplitter.java index f9d691a22..ee670a5e1 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/PageSplitter.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/PageSplitter.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.sequencediagram.graphic; diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/ParticipantBox.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/ParticipantBox.java index fdaa93c29..56c2cf9aa 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/ParticipantBox.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/ParticipantBox.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.sequencediagram.graphic; diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/ParticipantBoxSimple.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/ParticipantBoxSimple.java index 4151eb57e..cb6773b77 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/ParticipantBoxSimple.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/ParticipantBoxSimple.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.sequencediagram.graphic; diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/ParticipantRange.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/ParticipantRange.java index 42382460f..01b1aa68c 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/ParticipantRange.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/ParticipantRange.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 7340 $ * */ package net.sourceforge.plantuml.sequencediagram.graphic; diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/Pushable.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/Pushable.java index 741f28911..f408ddcd8 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/Pushable.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/Pushable.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.sequencediagram.graphic; diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/Segment.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/Segment.java index 490ee6577..cf25ad08a 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/Segment.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/Segment.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4699 $ * */ package net.sourceforge.plantuml.sequencediagram.graphic; diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/SegmentColored.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/SegmentColored.java index 2bebb40cd..ffcd45886 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/SegmentColored.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/SegmentColored.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.sequencediagram.graphic; diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/SequenceDiagramArea.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/SequenceDiagramArea.java index 3133b44e9..1ebf14c48 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/SequenceDiagramArea.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/SequenceDiagramArea.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.sequencediagram.graphic; @@ -36,6 +33,7 @@ package net.sourceforge.plantuml.sequencediagram.graphic; import java.awt.geom.Dimension2D; import net.sourceforge.plantuml.graphic.HorizontalAlignment; +import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlockUtils; import net.sourceforge.plantuml.png.PngTitler; import net.sourceforge.plantuml.utils.MathUtils; @@ -156,15 +154,15 @@ public class SequenceDiagramArea { throw new IllegalStateException(); } - public void initFooter(PngTitler pngTitler) { - final Dimension2D dim = pngTitler.getTextDimension(TextBlockUtils.getDummyStringBounder()); + public void initFooter(PngTitler pngTitler, StringBounder stringBounder) { + final Dimension2D dim = pngTitler.getTextDimension(stringBounder); if (dim != null) { setFooterArea(dim.getWidth(), dim.getHeight(), 3); } } - public void initHeader(PngTitler pngTitler) { - final Dimension2D dim = pngTitler.getTextDimension(TextBlockUtils.getDummyStringBounder()); + public void initHeader(PngTitler pngTitler, StringBounder stringBounder) { + final Dimension2D dim = pngTitler.getTextDimension(stringBounder); if (dim != null) { setHeaderArea(dim.getWidth(), dim.getHeight(), 3); } diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/SequenceDiagramFileMakerPuma2.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/SequenceDiagramFileMakerPuma2.java index 4224f899f..328551170 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/SequenceDiagramFileMakerPuma2.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/SequenceDiagramFileMakerPuma2.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 9591 $ * */ package net.sourceforge.plantuml.sequencediagram.graphic; @@ -72,18 +69,18 @@ import net.sourceforge.plantuml.ugraphic.UTranslate; public class SequenceDiagramFileMakerPuma2 implements FileMaker { - private static final StringBounder dummyStringBounder = TextBlockUtils.getDummyStringBounder(); - private final SequenceDiagram diagram; private final DrawableSet drawableSet; private final Dimension2D fullDimension; private final List pages; private final FileFormatOption fileFormatOption; + private final StringBounder stringBounder; private double scale; public SequenceDiagramFileMakerPuma2(SequenceDiagram sequenceDiagram, Skin skin, FileFormatOption fileFormatOption) { this.diagram = sequenceDiagram; + this.stringBounder = fileFormatOption.getDefaultStringBounder(); this.fileFormatOption = fileFormatOption; final DrawableSetInitializer initializer = new DrawableSetInitializer(skin, sequenceDiagram.getSkinParam(), sequenceDiagram.isShowFootbox(), sequenceDiagram.getAutonewpage()); @@ -107,7 +104,7 @@ public class SequenceDiagramFileMakerPuma2 implements FileMaker { // } // } } - drawableSet = initializer.createDrawableSet(dummyStringBounder); + drawableSet = initializer.createDrawableSet(stringBounder); final List newpages = new ArrayList(); for (Event ev : drawableSet.getAllEvents()) { if (ev instanceof Newpage) { @@ -117,7 +114,7 @@ public class SequenceDiagramFileMakerPuma2 implements FileMaker { fullDimension = drawableSet.getDimension(); final Map positions = new LinkedHashMap(); for (Newpage n : newpages) { - positions.put(n, initializer.getYposition(dummyStringBounder, n)); + positions.put(n, initializer.getYposition(stringBounder, n)); } pages = create(drawableSet, positions, sequenceDiagram.isShowFootbox(), sequenceDiagram.getTitle().getDisplay()) .getPages(); @@ -130,12 +127,12 @@ public class SequenceDiagramFileMakerPuma2 implements FileMaker { private PageSplitter create(DrawableSet drawableSet, Map positions, boolean showFootbox, Display title) { - final double headerHeight = drawableSet.getHeadHeight(dummyStringBounder); - final double tailHeight = drawableSet.getTailHeight(dummyStringBounder, showFootbox); + final double headerHeight = drawableSet.getHeadHeight(stringBounder); + final double tailHeight = drawableSet.getTailHeight(stringBounder, showFootbox); final double signatureHeight = 0; final double newpageHeight = drawableSet.getSkin() .createComponent(ComponentType.NEWPAGE, null, drawableSet.getSkinParam(), Display.create("")) - .getPreferredHeight(dummyStringBounder); + .getPreferredHeight(stringBounder); return new PageSplitter(fullDimension.getHeight(), headerHeight, positions, tailHeight, signatureHeight, newpageHeight, title); @@ -148,18 +145,17 @@ public class SequenceDiagramFileMakerPuma2 implements FileMaker { final Component compTitle; final TextBlock caption = new AnnotatedWorker(diagram, diagram.getSkinParam()).getCaption(); - area.setCaptionArea(caption.calculateDimension(dummyStringBounder)); + area.setCaptionArea(caption.calculateDimension(stringBounder)); if (Display.isNull(page.getTitle())) { compTitle = null; } else { compTitle = drawableSet.getSkin().createComponent(ComponentType.TITLE, null, drawableSet.getSkinParam(), page.getTitle()); - area.setTitleArea(compTitle.getPreferredWidth(dummyStringBounder), - compTitle.getPreferredHeight(dummyStringBounder)); + area.setTitleArea(compTitle.getPreferredWidth(stringBounder), compTitle.getPreferredHeight(stringBounder)); } - area.initFooter(getPngTitler(FontParam.FOOTER)); - area.initHeader(getPngTitler(FontParam.HEADER)); + area.initFooter(getPngTitler(FontParam.FOOTER), stringBounder); + area.initHeader(getPngTitler(FontParam.HEADER), stringBounder); final DisplayPositionned legend = diagram.getLegend(); final TextBlock legendBlock; @@ -168,7 +164,7 @@ public class SequenceDiagramFileMakerPuma2 implements FileMaker { } else { legendBlock = EntityImageLegend.create(legend.getDisplay(), diagram.getSkinParam()); } - final Dimension2D dimLegend = TextBlockUtils.getDimension(legendBlock); + final Dimension2D dimLegend = legendBlock.calculateDimension(stringBounder); scale = getScale(area.getWidth(), area.getHeight()); diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/SequenceDiagramTxtMaker.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/SequenceDiagramTxtMaker.java index aa1e7460e..8baaf4b9e 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/SequenceDiagramTxtMaker.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/SequenceDiagramTxtMaker.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4935 $ * */ package net.sourceforge.plantuml.sequencediagram.graphic; diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/Stairs.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/Stairs.java index b4d460ed4..b8254ce37 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/Stairs.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/Stairs.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6054 $ * */ package net.sourceforge.plantuml.sequencediagram.graphic; diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/Step1Abstract.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/Step1Abstract.java index 0557d08e4..6bdafeff6 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/Step1Abstract.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/Step1Abstract.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4683 $ * */ package net.sourceforge.plantuml.sequencediagram.graphic; diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/Step1Message.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/Step1Message.java index d46bd39d0..ea1817814 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/Step1Message.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/Step1Message.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19885 $ * */ package net.sourceforge.plantuml.sequencediagram.graphic; diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/Step1MessageExo.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/Step1MessageExo.java index 6a036557c..2055cd26e 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/Step1MessageExo.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/Step1MessageExo.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4636 $ * */ package net.sourceforge.plantuml.sequencediagram.graphic; diff --git a/src/net/sourceforge/plantuml/sequencediagram/puma/FixedLink.java b/src/net/sourceforge/plantuml/sequencediagram/puma/FixedLink.java index a1bf4f1bf..b6871ee10 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/puma/FixedLink.java +++ b/src/net/sourceforge/plantuml/sequencediagram/puma/FixedLink.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4636 $ * */ package net.sourceforge.plantuml.sequencediagram.puma; diff --git a/src/net/sourceforge/plantuml/sequencediagram/puma/PSegment.java b/src/net/sourceforge/plantuml/sequencediagram/puma/PSegment.java index efa3008d7..20828c960 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/puma/PSegment.java +++ b/src/net/sourceforge/plantuml/sequencediagram/puma/PSegment.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4636 $ * */ package net.sourceforge.plantuml.sequencediagram.puma; diff --git a/src/net/sourceforge/plantuml/sequencediagram/puma/PUnivers.java b/src/net/sourceforge/plantuml/sequencediagram/puma/PUnivers.java index bd11d27c1..4077a1dd3 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/puma/PUnivers.java +++ b/src/net/sourceforge/plantuml/sequencediagram/puma/PUnivers.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4636 $ * */ package net.sourceforge.plantuml.sequencediagram.puma; diff --git a/src/net/sourceforge/plantuml/sequencediagram/puma/PushDirection.java b/src/net/sourceforge/plantuml/sequencediagram/puma/PushDirection.java index 442762433..f2c04cb17 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/puma/PushDirection.java +++ b/src/net/sourceforge/plantuml/sequencediagram/puma/PushDirection.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4636 $ * */ package net.sourceforge.plantuml.sequencediagram.puma; diff --git a/src/net/sourceforge/plantuml/sequencediagram/puma/PushSide.java b/src/net/sourceforge/plantuml/sequencediagram/puma/PushSide.java index 81b9ffc6f..02be41953 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/puma/PushSide.java +++ b/src/net/sourceforge/plantuml/sequencediagram/puma/PushSide.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4636 $ * */ package net.sourceforge.plantuml.sequencediagram.puma; diff --git a/src/net/sourceforge/plantuml/sequencediagram/puma/PushStrategy.java b/src/net/sourceforge/plantuml/sequencediagram/puma/PushStrategy.java index 6c4e67728..9cbe9a234 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/puma/PushStrategy.java +++ b/src/net/sourceforge/plantuml/sequencediagram/puma/PushStrategy.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4636 $ * */ package net.sourceforge.plantuml.sequencediagram.puma; diff --git a/src/net/sourceforge/plantuml/sequencediagram/puma/SegmentPosition.java b/src/net/sourceforge/plantuml/sequencediagram/puma/SegmentPosition.java index 98eaa5561..9decfe9ed 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/puma/SegmentPosition.java +++ b/src/net/sourceforge/plantuml/sequencediagram/puma/SegmentPosition.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4636 $ * */ package net.sourceforge.plantuml.sequencediagram.puma; diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/Bordered.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/Bordered.java index 9ccab8786..901308002 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/Bordered.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/Bordered.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4636 $ * */ package net.sourceforge.plantuml.sequencediagram.teoz; diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationExoTile.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationExoTile.java index 0cdde1fe2..5cdb3bf09 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationExoTile.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationExoTile.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4636 $ * */ package net.sourceforge.plantuml.sequencediagram.teoz; diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTile.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTile.java index 8d3dc0017..336568be0 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTile.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTile.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4636 $ * */ package net.sourceforge.plantuml.sequencediagram.teoz; diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileNoteLeft.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileNoteLeft.java index b134410cb..f912b2c5e 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileNoteLeft.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileNoteLeft.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4636 $ * */ package net.sourceforge.plantuml.sequencediagram.teoz; diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileNoteRight.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileNoteRight.java index dde92bb26..c1fd339c4 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileNoteRight.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileNoteRight.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4636 $ * */ package net.sourceforge.plantuml.sequencediagram.teoz; diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileSelf.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileSelf.java index c579dc541..6499a9034 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileSelf.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileSelf.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4636 $ * */ package net.sourceforge.plantuml.sequencediagram.teoz; diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileSelfNoteRight.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileSelfNoteRight.java index d1df73e86..1535890af 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileSelfNoteRight.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/CommunicationTileSelfNoteRight.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4636 $ * */ package net.sourceforge.plantuml.sequencediagram.teoz; diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/ComponentAdapter.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/ComponentAdapter.java index 9ee9adf69..9bf271af9 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/ComponentAdapter.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/ComponentAdapter.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 9591 $ * */ package net.sourceforge.plantuml.sequencediagram.teoz; diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/DelayTile.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/DelayTile.java index d00d06a97..eb8538fce 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/DelayTile.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/DelayTile.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4636 $ * */ package net.sourceforge.plantuml.sequencediagram.teoz; diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/DividerTile.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/DividerTile.java index d28619e69..44ce3d659 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/DividerTile.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/DividerTile.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4636 $ * */ package net.sourceforge.plantuml.sequencediagram.teoz; diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/ElseTile.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/ElseTile.java index 339b55b36..1260407c5 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/ElseTile.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/ElseTile.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4636 $ * */ package net.sourceforge.plantuml.sequencediagram.teoz; diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/EmptyTile.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/EmptyTile.java index f1380ea42..11cdbd2d5 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/EmptyTile.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/EmptyTile.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4636 $ * */ package net.sourceforge.plantuml.sequencediagram.teoz; diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/Englobers.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/Englobers.java index ae765d8dc..d388caf80 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/Englobers.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/Englobers.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4636 $ * */ package net.sourceforge.plantuml.sequencediagram.teoz; diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/EventsHistory.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/EventsHistory.java index c82ccde66..112be4103 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/EventsHistory.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/EventsHistory.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4636 $ * */ package net.sourceforge.plantuml.sequencediagram.teoz; diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/EventsHistoryMode.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/EventsHistoryMode.java index 2d71b8a2f..f194533f0 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/EventsHistoryMode.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/EventsHistoryMode.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4636 $ * */ package net.sourceforge.plantuml.sequencediagram.teoz; diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/GroupingTile.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/GroupingTile.java index f91b6fba1..8895dfa8e 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/GroupingTile.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/GroupingTile.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4636 $ * */ package net.sourceforge.plantuml.sequencediagram.teoz; diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/HSpaceTile.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/HSpaceTile.java index 9cdc8e096..1aebfc6e0 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/HSpaceTile.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/HSpaceTile.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4636 $ * */ package net.sourceforge.plantuml.sequencediagram.teoz; diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/IntegerColored.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/IntegerColored.java index 0ea8e5208..959eaf6ca 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/IntegerColored.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/IntegerColored.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6054 $ * */ package net.sourceforge.plantuml.sequencediagram.teoz; diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/LifeEventTile.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/LifeEventTile.java index d1e889fa8..1527176a1 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/LifeEventTile.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/LifeEventTile.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4636 $ * */ package net.sourceforge.plantuml.sequencediagram.teoz; diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/LiveBoxFinder.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/LiveBoxFinder.java index bd2d0160e..00813474e 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/LiveBoxFinder.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/LiveBoxFinder.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5183 $ * */ package net.sourceforge.plantuml.sequencediagram.teoz; diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/LiveBoxes.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/LiveBoxes.java index fa9430492..684c0a505 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/LiveBoxes.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/LiveBoxes.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5183 $ * */ package net.sourceforge.plantuml.sequencediagram.teoz; diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/LiveBoxesDrawer.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/LiveBoxesDrawer.java index d67cf1c34..904738c04 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/LiveBoxesDrawer.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/LiveBoxesDrawer.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5183 $ * */ package net.sourceforge.plantuml.sequencediagram.teoz; diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/LivingSpace.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/LivingSpace.java index 25c82ce40..b2450a31c 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/LivingSpace.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/LivingSpace.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4636 $ * */ package net.sourceforge.plantuml.sequencediagram.teoz; diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/LivingSpaces.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/LivingSpaces.java index ff1cb90f3..777eb50de 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/LivingSpaces.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/LivingSpaces.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4636 $ * */ package net.sourceforge.plantuml.sequencediagram.teoz; diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/MainTile.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/MainTile.java index 56bedcfcd..74364714c 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/MainTile.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/MainTile.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 9591 $ * */ package net.sourceforge.plantuml.sequencediagram.teoz; diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/MainTileAdapter.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/MainTileAdapter.java index 6b0dc605f..67c71aa89 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/MainTileAdapter.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/MainTileAdapter.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 9591 $ * */ package net.sourceforge.plantuml.sequencediagram.teoz; diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/MutingLine.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/MutingLine.java index 07e7ea856..8d63eea13 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/MutingLine.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/MutingLine.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4636 $ * */ package net.sourceforge.plantuml.sequencediagram.teoz; diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/NoteTile.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/NoteTile.java index e0cb134d0..bdf62263c 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/NoteTile.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/NoteTile.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4636 $ * */ package net.sourceforge.plantuml.sequencediagram.teoz; diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/NotesTile.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/NotesTile.java index 97ada06bc..64fdd8e81 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/NotesTile.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/NotesTile.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4636 $ * */ package net.sourceforge.plantuml.sequencediagram.teoz; diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/ReferenceTile.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/ReferenceTile.java index 2bb83e87e..5de2a0a68 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/ReferenceTile.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/ReferenceTile.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4636 $ * */ package net.sourceforge.plantuml.sequencediagram.teoz; diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/SequenceDiagramFileMakerTeoz.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/SequenceDiagramFileMakerTeoz.java index cca1ec762..24fd49aec 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/SequenceDiagramFileMakerTeoz.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/SequenceDiagramFileMakerTeoz.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 9591 $ * */ package net.sourceforge.plantuml.sequencediagram.teoz; @@ -76,6 +73,7 @@ public class SequenceDiagramFileMakerTeoz implements FileMaker { private final Skin skin; public SequenceDiagramFileMakerTeoz(SequenceDiagram sequenceDiagram, Skin skin, FileFormatOption fileFormatOption) { + this.stringBounder = fileFormatOption.getDefaultStringBounder(); this.diagram = sequenceDiagram; this.fileFormatOption = fileFormatOption; this.skin = skin; @@ -105,7 +103,7 @@ public class SequenceDiagramFileMakerTeoz implements FileMaker { } private Englobers englobers; - private final StringBounder stringBounder = TextBlockUtils.getDummyStringBounder(); + private final StringBounder stringBounder; private final TextBlock footer; private final TextBlock header; diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/Stairs2.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/Stairs2.java index 3e0db90cd..291fcd460 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/Stairs2.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/Stairs2.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6054 $ * */ package net.sourceforge.plantuml.sequencediagram.teoz; diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/StairsPosition.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/StairsPosition.java index 22140a4bd..3fb8a1e45 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/StairsPosition.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/StairsPosition.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6054 $ * */ package net.sourceforge.plantuml.sequencediagram.teoz; diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/TeozLayer.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/TeozLayer.java index c664fe824..203224f05 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/TeozLayer.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/TeozLayer.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 9591 $ * */ package net.sourceforge.plantuml.sequencediagram.teoz; diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/Tile.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/Tile.java index b6ab96a32..03e5ce32f 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/Tile.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/Tile.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4636 $ * */ package net.sourceforge.plantuml.sequencediagram.teoz; diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/TileArguments.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/TileArguments.java index 6f191cddd..b995f02e1 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/TileArguments.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/TileArguments.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 9591 $ * */ package net.sourceforge.plantuml.sequencediagram.teoz; diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/TileBuilder.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/TileBuilder.java index 46e03f4a7..a217e7a40 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/TileBuilder.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/TileBuilder.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 9591 $ * */ package net.sourceforge.plantuml.sequencediagram.teoz; diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/TileMarged.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/TileMarged.java index ca77e1d51..aabeb89a2 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/TileMarged.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/TileMarged.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4636 $ * */ package net.sourceforge.plantuml.sequencediagram.teoz; diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/TileUtils.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/TileUtils.java index 0316609e9..daab41560 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/TileUtils.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/TileUtils.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4636 $ * */ package net.sourceforge.plantuml.sequencediagram.teoz; diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/TileWithCallbackY.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/TileWithCallbackY.java index a462af644..6534179c4 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/TileWithCallbackY.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/TileWithCallbackY.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4636 $ * */ package net.sourceforge.plantuml.sequencediagram.teoz; diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/TileWithUpdateStairs.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/TileWithUpdateStairs.java index c5cc269c2..a989d9717 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/TileWithUpdateStairs.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/TileWithUpdateStairs.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4636 $ * */ package net.sourceforge.plantuml.sequencediagram.teoz; diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/UGraphicInterceptorTile.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/UGraphicInterceptorTile.java index 2bd58b199..257ce5525 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/UGraphicInterceptorTile.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/UGraphicInterceptorTile.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 10266 $ * */ package net.sourceforge.plantuml.sequencediagram.teoz; diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/YPositionedTile.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/YPositionedTile.java index e7e68dd35..142522e40 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/YPositionedTile.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/YPositionedTile.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4636 $ * */ package net.sourceforge.plantuml.sequencediagram.teoz; diff --git a/src/net/sourceforge/plantuml/skin/AbstractComponent.java b/src/net/sourceforge/plantuml/skin/AbstractComponent.java index da57eb3f5..efc47e711 100644 --- a/src/net/sourceforge/plantuml/skin/AbstractComponent.java +++ b/src/net/sourceforge/plantuml/skin/AbstractComponent.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 20080 $ * */ package net.sourceforge.plantuml.skin; diff --git a/src/net/sourceforge/plantuml/skin/AbstractTextualComponent.java b/src/net/sourceforge/plantuml/skin/AbstractTextualComponent.java index d71facc8c..9a62212e7 100644 --- a/src/net/sourceforge/plantuml/skin/AbstractTextualComponent.java +++ b/src/net/sourceforge/plantuml/skin/AbstractTextualComponent.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19971 $ * */ package net.sourceforge.plantuml.skin; diff --git a/src/net/sourceforge/plantuml/skin/Area.java b/src/net/sourceforge/plantuml/skin/Area.java index ea33af1be..bee677526 100644 --- a/src/net/sourceforge/plantuml/skin/Area.java +++ b/src/net/sourceforge/plantuml/skin/Area.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4168 $ * */ package net.sourceforge.plantuml.skin; diff --git a/src/net/sourceforge/plantuml/skin/ArrowBody.java b/src/net/sourceforge/plantuml/skin/ArrowBody.java index 3944ea79a..e027013fd 100644 --- a/src/net/sourceforge/plantuml/skin/ArrowBody.java +++ b/src/net/sourceforge/plantuml/skin/ArrowBody.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5191 $ * */ package net.sourceforge.plantuml.skin; diff --git a/src/net/sourceforge/plantuml/skin/ArrowComponent.java b/src/net/sourceforge/plantuml/skin/ArrowComponent.java index 00a06bea5..adf1f6b7f 100644 --- a/src/net/sourceforge/plantuml/skin/ArrowComponent.java +++ b/src/net/sourceforge/plantuml/skin/ArrowComponent.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.skin; diff --git a/src/net/sourceforge/plantuml/skin/ArrowConfiguration.java b/src/net/sourceforge/plantuml/skin/ArrowConfiguration.java index 039dd36c4..7adfb6c3e 100644 --- a/src/net/sourceforge/plantuml/skin/ArrowConfiguration.java +++ b/src/net/sourceforge/plantuml/skin/ArrowConfiguration.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5191 $ * */ package net.sourceforge.plantuml.skin; diff --git a/src/net/sourceforge/plantuml/skin/ArrowDecoration.java b/src/net/sourceforge/plantuml/skin/ArrowDecoration.java index ac5444f61..aa1b01e40 100644 --- a/src/net/sourceforge/plantuml/skin/ArrowDecoration.java +++ b/src/net/sourceforge/plantuml/skin/ArrowDecoration.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5191 $ * */ package net.sourceforge.plantuml.skin; diff --git a/src/net/sourceforge/plantuml/skin/ArrowDirection.java b/src/net/sourceforge/plantuml/skin/ArrowDirection.java index 35dbc2999..9d6ce6d9c 100644 --- a/src/net/sourceforge/plantuml/skin/ArrowDirection.java +++ b/src/net/sourceforge/plantuml/skin/ArrowDirection.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5191 $ * */ package net.sourceforge.plantuml.skin; diff --git a/src/net/sourceforge/plantuml/skin/ArrowDressing.java b/src/net/sourceforge/plantuml/skin/ArrowDressing.java index 370ce57e5..fa4873f36 100644 --- a/src/net/sourceforge/plantuml/skin/ArrowDressing.java +++ b/src/net/sourceforge/plantuml/skin/ArrowDressing.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5191 $ * */ package net.sourceforge.plantuml.skin; diff --git a/src/net/sourceforge/plantuml/skin/ArrowHead.java b/src/net/sourceforge/plantuml/skin/ArrowHead.java index 31745656c..1316b10b8 100644 --- a/src/net/sourceforge/plantuml/skin/ArrowHead.java +++ b/src/net/sourceforge/plantuml/skin/ArrowHead.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5191 $ * */ package net.sourceforge.plantuml.skin; diff --git a/src/net/sourceforge/plantuml/skin/ArrowPart.java b/src/net/sourceforge/plantuml/skin/ArrowPart.java index 3f13beeda..ab3d09445 100644 --- a/src/net/sourceforge/plantuml/skin/ArrowPart.java +++ b/src/net/sourceforge/plantuml/skin/ArrowPart.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5191 $ * */ package net.sourceforge.plantuml.skin; diff --git a/src/net/sourceforge/plantuml/skin/CircleInterface.java b/src/net/sourceforge/plantuml/skin/CircleInterface.java index 360102816..03ba15dcd 100644 --- a/src/net/sourceforge/plantuml/skin/CircleInterface.java +++ b/src/net/sourceforge/plantuml/skin/CircleInterface.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.skin; diff --git a/src/net/sourceforge/plantuml/skin/Component.java b/src/net/sourceforge/plantuml/skin/Component.java index 0c3de5f98..59f78dd81 100644 --- a/src/net/sourceforge/plantuml/skin/Component.java +++ b/src/net/sourceforge/plantuml/skin/Component.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.skin; diff --git a/src/net/sourceforge/plantuml/skin/ComponentType.java b/src/net/sourceforge/plantuml/skin/ComponentType.java index ec5b3cde9..eadb403d3 100644 --- a/src/net/sourceforge/plantuml/skin/ComponentType.java +++ b/src/net/sourceforge/plantuml/skin/ComponentType.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5191 $ * */ package net.sourceforge.plantuml.skin; diff --git a/src/net/sourceforge/plantuml/skin/Context2D.java b/src/net/sourceforge/plantuml/skin/Context2D.java index 771b7a0d5..e34c6337f 100644 --- a/src/net/sourceforge/plantuml/skin/Context2D.java +++ b/src/net/sourceforge/plantuml/skin/Context2D.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.skin; diff --git a/src/net/sourceforge/plantuml/skin/GrayComponent.java b/src/net/sourceforge/plantuml/skin/GrayComponent.java index 589761b18..180eebb76 100644 --- a/src/net/sourceforge/plantuml/skin/GrayComponent.java +++ b/src/net/sourceforge/plantuml/skin/GrayComponent.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19885 $ * */ package net.sourceforge.plantuml.skin; diff --git a/src/net/sourceforge/plantuml/skin/ProtectedSkin.java b/src/net/sourceforge/plantuml/skin/ProtectedSkin.java index 9089b4ab2..68a0d11aa 100644 --- a/src/net/sourceforge/plantuml/skin/ProtectedSkin.java +++ b/src/net/sourceforge/plantuml/skin/ProtectedSkin.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.skin; diff --git a/src/net/sourceforge/plantuml/skin/SimpleContext2D.java b/src/net/sourceforge/plantuml/skin/SimpleContext2D.java index 2d5384f77..5a684dd7d 100644 --- a/src/net/sourceforge/plantuml/skin/SimpleContext2D.java +++ b/src/net/sourceforge/plantuml/skin/SimpleContext2D.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.skin; diff --git a/src/net/sourceforge/plantuml/skin/Skin.java b/src/net/sourceforge/plantuml/skin/Skin.java index 4d704ef1a..49c3d846e 100644 --- a/src/net/sourceforge/plantuml/skin/Skin.java +++ b/src/net/sourceforge/plantuml/skin/Skin.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.skin; diff --git a/src/net/sourceforge/plantuml/skin/SkinUtils.java b/src/net/sourceforge/plantuml/skin/SkinUtils.java index 858970f14..ecce65b34 100644 --- a/src/net/sourceforge/plantuml/skin/SkinUtils.java +++ b/src/net/sourceforge/plantuml/skin/SkinUtils.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.skin; diff --git a/src/net/sourceforge/plantuml/skin/StickMan.java b/src/net/sourceforge/plantuml/skin/StickMan.java index bfd36d328..0c92ca523 100644 --- a/src/net/sourceforge/plantuml/skin/StickMan.java +++ b/src/net/sourceforge/plantuml/skin/StickMan.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.skin; diff --git a/src/net/sourceforge/plantuml/skin/VisibilityModifier.java b/src/net/sourceforge/plantuml/skin/VisibilityModifier.java index f1ec8f23e..c213c24ea 100644 --- a/src/net/sourceforge/plantuml/skin/VisibilityModifier.java +++ b/src/net/sourceforge/plantuml/skin/VisibilityModifier.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4189 $ * */ package net.sourceforge.plantuml.skin; diff --git a/src/net/sourceforge/plantuml/skin/bluemodern/AbstractComponentBlueModernArrow.java b/src/net/sourceforge/plantuml/skin/bluemodern/AbstractComponentBlueModernArrow.java index 4240d9eb8..34011d2cd 100644 --- a/src/net/sourceforge/plantuml/skin/bluemodern/AbstractComponentBlueModernArrow.java +++ b/src/net/sourceforge/plantuml/skin/bluemodern/AbstractComponentBlueModernArrow.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.skin.bluemodern; diff --git a/src/net/sourceforge/plantuml/skin/bluemodern/BlueModern.java b/src/net/sourceforge/plantuml/skin/bluemodern/BlueModern.java index 62d0249fd..4fc3c6920 100644 --- a/src/net/sourceforge/plantuml/skin/bluemodern/BlueModern.java +++ b/src/net/sourceforge/plantuml/skin/bluemodern/BlueModern.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.skin.bluemodern; diff --git a/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernActiveLine.java b/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernActiveLine.java index ab9d205fc..665713a16 100644 --- a/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernActiveLine.java +++ b/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernActiveLine.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.skin.bluemodern; diff --git a/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernActor.java b/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernActor.java index 17843c05b..a14f5bcc2 100644 --- a/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernActor.java +++ b/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernActor.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.skin.bluemodern; diff --git a/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernArrow.java b/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernArrow.java index 22c7b59f9..c246807ea 100644 --- a/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernArrow.java +++ b/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernArrow.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19949 $ * */ package net.sourceforge.plantuml.skin.bluemodern; diff --git a/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernDelayLine.java b/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernDelayLine.java index bc8eef8f3..5e1d8484b 100644 --- a/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernDelayLine.java +++ b/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernDelayLine.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4169 $ * */ package net.sourceforge.plantuml.skin.bluemodern; diff --git a/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernDelayText.java b/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernDelayText.java index abb4f6970..1f8093550 100644 --- a/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernDelayText.java +++ b/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernDelayText.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3837 $ * */ package net.sourceforge.plantuml.skin.bluemodern; diff --git a/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernDivider.java b/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernDivider.java index 233b3e06f..24dc26552 100644 --- a/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernDivider.java +++ b/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernDivider.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3837 $ * */ package net.sourceforge.plantuml.skin.bluemodern; diff --git a/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernEnglober.java b/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernEnglober.java index 5a2f9d986..432406d6b 100644 --- a/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernEnglober.java +++ b/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernEnglober.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4258 $ * */ package net.sourceforge.plantuml.skin.bluemodern; diff --git a/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernGroupingHeader.java b/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernGroupingHeader.java index b35b3df35..a86ab5ea8 100644 --- a/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernGroupingHeader.java +++ b/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernGroupingHeader.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19885 $ * */ package net.sourceforge.plantuml.skin.bluemodern; diff --git a/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernLine.java b/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernLine.java index bfb17778e..9668d9117 100644 --- a/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernLine.java +++ b/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernLine.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.skin.bluemodern; diff --git a/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernNewpage.java b/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernNewpage.java index eb104faa3..7d95c978e 100644 --- a/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernNewpage.java +++ b/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernNewpage.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19946 $ * */ package net.sourceforge.plantuml.skin.bluemodern; diff --git a/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernNote.java b/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernNote.java index 0642f8ebd..b981a8d05 100644 --- a/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernNote.java +++ b/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernNote.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.skin.bluemodern; diff --git a/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernParticipant.java b/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernParticipant.java index 8c77a1c15..3092b97e3 100644 --- a/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernParticipant.java +++ b/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernParticipant.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.skin.bluemodern; diff --git a/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernSelfArrow.java b/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernSelfArrow.java index 618ab6064..1baffbb9d 100644 --- a/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernSelfArrow.java +++ b/src/net/sourceforge/plantuml/skin/bluemodern/ComponentBlueModernSelfArrow.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19949 $ * */ package net.sourceforge.plantuml.skin.bluemodern; diff --git a/src/net/sourceforge/plantuml/skin/bluemodern/FillRoundShape.java b/src/net/sourceforge/plantuml/skin/bluemodern/FillRoundShape.java index ce9f2885e..57fcb067c 100644 --- a/src/net/sourceforge/plantuml/skin/bluemodern/FillRoundShape.java +++ b/src/net/sourceforge/plantuml/skin/bluemodern/FillRoundShape.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.skin.bluemodern; diff --git a/src/net/sourceforge/plantuml/skin/bluemodern/ShadowShape.java b/src/net/sourceforge/plantuml/skin/bluemodern/ShadowShape.java index d4afd9e8e..1ba46a65e 100644 --- a/src/net/sourceforge/plantuml/skin/bluemodern/ShadowShape.java +++ b/src/net/sourceforge/plantuml/skin/bluemodern/ShadowShape.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.skin.bluemodern; diff --git a/src/net/sourceforge/plantuml/skin/rose/AbstractComponentRoseArrow.java b/src/net/sourceforge/plantuml/skin/rose/AbstractComponentRoseArrow.java index 39b7912ba..2387e9217 100644 --- a/src/net/sourceforge/plantuml/skin/rose/AbstractComponentRoseArrow.java +++ b/src/net/sourceforge/plantuml/skin/rose/AbstractComponentRoseArrow.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.skin.rose; diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseActiveLine.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseActiveLine.java index 0d6a2965d..efa74e2eb 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseActiveLine.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseActiveLine.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.skin.rose; diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseActor.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseActor.java index f0dfef8fe..96e0bfe90 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseActor.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseActor.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.skin.rose; diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseArrow.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseArrow.java index f17700bed..b65265d07 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseArrow.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseArrow.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 9696 $ * */ package net.sourceforge.plantuml.skin.rose; diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseBoundary.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseBoundary.java index b7d714227..307458a54 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseBoundary.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseBoundary.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8151 $ * */ package net.sourceforge.plantuml.skin.rose; diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseControl.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseControl.java index e9827d789..eb46fe956 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseControl.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseControl.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8151 $ * */ package net.sourceforge.plantuml.skin.rose; diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseDatabase.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseDatabase.java index f3e48c762..82611fa7d 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseDatabase.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseDatabase.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8151 $ * */ package net.sourceforge.plantuml.skin.rose; diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseDelayLine.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseDelayLine.java index c02f51a21..743610abb 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseDelayLine.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseDelayLine.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5937 $ * */ package net.sourceforge.plantuml.skin.rose; diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseDelayText.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseDelayText.java index b028174a4..ba9c95b1d 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseDelayText.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseDelayText.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3837 $ * */ package net.sourceforge.plantuml.skin.rose; diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseDestroy.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseDestroy.java index 0ced0d79b..87b3a6e08 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseDestroy.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseDestroy.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.skin.rose; diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseDivider.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseDivider.java index 6ebdadb78..f5e59a74d 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseDivider.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseDivider.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3837 $ * */ package net.sourceforge.plantuml.skin.rose; diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseEnglober.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseEnglober.java index 16d51ac65..283538ad8 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseEnglober.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseEnglober.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4258 $ * */ package net.sourceforge.plantuml.skin.rose; diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseEntity.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseEntity.java index 31ac1b395..15b66e602 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseEntity.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseEntity.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8151 $ * */ package net.sourceforge.plantuml.skin.rose; diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseGroupingElse.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseGroupingElse.java index ac26096fd..d82bdc8f6 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseGroupingElse.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseGroupingElse.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19946 $ * */ package net.sourceforge.plantuml.skin.rose; diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseGroupingHeader.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseGroupingHeader.java index 936a694b4..2a1540065 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseGroupingHeader.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseGroupingHeader.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.skin.rose; diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseGroupingSpace.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseGroupingSpace.java index 729d4dda4..f52f1f004 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseGroupingSpace.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseGroupingSpace.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 7891 $ * */ package net.sourceforge.plantuml.skin.rose; diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseLine.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseLine.java index 5e71e3a82..ce500af00 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseLine.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseLine.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19945 $ * */ package net.sourceforge.plantuml.skin.rose; diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseNewpage.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseNewpage.java index 2ec2e75f0..1211ea045 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseNewpage.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseNewpage.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19946 $ * */ package net.sourceforge.plantuml.skin.rose; diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseNote.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseNote.java index a907ba05f..15743f440 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseNote.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseNote.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.skin.rose; diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseNoteBox.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseNoteBox.java index 30874cf98..48f5c65b6 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseNoteBox.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseNoteBox.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6590 $ * */ package net.sourceforge.plantuml.skin.rose; diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseNoteHexagonal.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseNoteHexagonal.java index 12cdd835e..73d5aa1ee 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseNoteHexagonal.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseNoteHexagonal.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6590 $ * */ package net.sourceforge.plantuml.skin.rose; diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseParticipant.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseParticipant.java index 21ce03a20..a6836159c 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseParticipant.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseParticipant.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19978 $ * */ package net.sourceforge.plantuml.skin.rose; diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseReference.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseReference.java index ff90a6ca7..168186887 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseReference.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseReference.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3837 $ * */ package net.sourceforge.plantuml.skin.rose; diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseSelfArrow.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseSelfArrow.java index 3bb23380d..bc4e18653 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseSelfArrow.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseSelfArrow.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19972 $ * */ package net.sourceforge.plantuml.skin.rose; diff --git a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseTitle.java b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseTitle.java index 8e2105231..b25ad8603 100644 --- a/src/net/sourceforge/plantuml/skin/rose/ComponentRoseTitle.java +++ b/src/net/sourceforge/plantuml/skin/rose/ComponentRoseTitle.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.skin.rose; diff --git a/src/net/sourceforge/plantuml/skin/rose/Rose.java b/src/net/sourceforge/plantuml/skin/rose/Rose.java index cfde4fdfc..21c6d8b91 100644 --- a/src/net/sourceforge/plantuml/skin/rose/Rose.java +++ b/src/net/sourceforge/plantuml/skin/rose/Rose.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19978 $ * */ package net.sourceforge.plantuml.skin.rose; diff --git a/src/net/sourceforge/plantuml/statediagram/StateDiagram.java b/src/net/sourceforge/plantuml/statediagram/StateDiagram.java index aa7608feb..93839c3ce 100644 --- a/src/net/sourceforge/plantuml/statediagram/StateDiagram.java +++ b/src/net/sourceforge/plantuml/statediagram/StateDiagram.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 20161 $ * */ package net.sourceforge.plantuml.statediagram; diff --git a/src/net/sourceforge/plantuml/statediagram/StateDiagramFactory.java b/src/net/sourceforge/plantuml/statediagram/StateDiagramFactory.java index 69723b618..000bbe04b 100644 --- a/src/net/sourceforge/plantuml/statediagram/StateDiagramFactory.java +++ b/src/net/sourceforge/plantuml/statediagram/StateDiagramFactory.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 10446 $ * */ package net.sourceforge.plantuml.statediagram; diff --git a/src/net/sourceforge/plantuml/statediagram/command/CommandAddField.java b/src/net/sourceforge/plantuml/statediagram/command/CommandAddField.java index 6c5ffed6a..e3b65a6d9 100644 --- a/src/net/sourceforge/plantuml/statediagram/command/CommandAddField.java +++ b/src/net/sourceforge/plantuml/statediagram/command/CommandAddField.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.statediagram.command; diff --git a/src/net/sourceforge/plantuml/statediagram/command/CommandConcurrentState.java b/src/net/sourceforge/plantuml/statediagram/command/CommandConcurrentState.java index dfd53e1f4..6a2dca5f5 100644 --- a/src/net/sourceforge/plantuml/statediagram/command/CommandConcurrentState.java +++ b/src/net/sourceforge/plantuml/statediagram/command/CommandConcurrentState.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.statediagram.command; diff --git a/src/net/sourceforge/plantuml/statediagram/command/CommandCreatePackageState.java b/src/net/sourceforge/plantuml/statediagram/command/CommandCreatePackageState.java index ba5bfe293..d43fbc9e3 100644 --- a/src/net/sourceforge/plantuml/statediagram/command/CommandCreatePackageState.java +++ b/src/net/sourceforge/plantuml/statediagram/command/CommandCreatePackageState.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4762 $ * */ package net.sourceforge.plantuml.statediagram.command; diff --git a/src/net/sourceforge/plantuml/statediagram/command/CommandCreateState.java b/src/net/sourceforge/plantuml/statediagram/command/CommandCreateState.java index 077d2ef46..c839ab195 100644 --- a/src/net/sourceforge/plantuml/statediagram/command/CommandCreateState.java +++ b/src/net/sourceforge/plantuml/statediagram/command/CommandCreateState.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.statediagram.command; diff --git a/src/net/sourceforge/plantuml/statediagram/command/CommandEndState.java b/src/net/sourceforge/plantuml/statediagram/command/CommandEndState.java index a1dc4e2bc..775c2d5d0 100644 --- a/src/net/sourceforge/plantuml/statediagram/command/CommandEndState.java +++ b/src/net/sourceforge/plantuml/statediagram/command/CommandEndState.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.statediagram.command; diff --git a/src/net/sourceforge/plantuml/statediagram/command/CommandHideEmptyDescription.java b/src/net/sourceforge/plantuml/statediagram/command/CommandHideEmptyDescription.java index 2e0950802..cc245fff5 100644 --- a/src/net/sourceforge/plantuml/statediagram/command/CommandHideEmptyDescription.java +++ b/src/net/sourceforge/plantuml/statediagram/command/CommandHideEmptyDescription.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4762 $ * */ package net.sourceforge.plantuml.statediagram.command; diff --git a/src/net/sourceforge/plantuml/statediagram/command/CommandLinkState.java b/src/net/sourceforge/plantuml/statediagram/command/CommandLinkState.java index cbd76ab5d..18ec8faf5 100644 --- a/src/net/sourceforge/plantuml/statediagram/command/CommandLinkState.java +++ b/src/net/sourceforge/plantuml/statediagram/command/CommandLinkState.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5441 $ * */ package net.sourceforge.plantuml.statediagram.command; diff --git a/src/net/sourceforge/plantuml/sudoku/GraphicsSudoku.java b/src/net/sourceforge/plantuml/sudoku/GraphicsSudoku.java index 7e855dcc8..2ece2fdee 100644 --- a/src/net/sourceforge/plantuml/sudoku/GraphicsSudoku.java +++ b/src/net/sourceforge/plantuml/sudoku/GraphicsSudoku.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19254 $ * */ package net.sourceforge.plantuml.sudoku; diff --git a/src/net/sourceforge/plantuml/sudoku/ISudoku.java b/src/net/sourceforge/plantuml/sudoku/ISudoku.java index 716b20426..057e0074f 100644 --- a/src/net/sourceforge/plantuml/sudoku/ISudoku.java +++ b/src/net/sourceforge/plantuml/sudoku/ISudoku.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.sudoku; diff --git a/src/net/sourceforge/plantuml/sudoku/PSystemSudoku.java b/src/net/sourceforge/plantuml/sudoku/PSystemSudoku.java index b83f58bef..73e3b416c 100644 --- a/src/net/sourceforge/plantuml/sudoku/PSystemSudoku.java +++ b/src/net/sourceforge/plantuml/sudoku/PSystemSudoku.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.sudoku; diff --git a/src/net/sourceforge/plantuml/sudoku/PSystemSudokuFactory.java b/src/net/sourceforge/plantuml/sudoku/PSystemSudokuFactory.java index dc5eb1a27..6c1b26349 100644 --- a/src/net/sourceforge/plantuml/sudoku/PSystemSudokuFactory.java +++ b/src/net/sourceforge/plantuml/sudoku/PSystemSudokuFactory.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 10298 $ * */ package net.sourceforge.plantuml.sudoku; diff --git a/src/net/sourceforge/plantuml/sudoku/SudokuDLX.java b/src/net/sourceforge/plantuml/sudoku/SudokuDLX.java index 291511ed1..24f3e35e0 100644 --- a/src/net/sourceforge/plantuml/sudoku/SudokuDLX.java +++ b/src/net/sourceforge/plantuml/sudoku/SudokuDLX.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.sudoku; diff --git a/src/net/sourceforge/plantuml/suggest/SuggestEngine.java b/src/net/sourceforge/plantuml/suggest/SuggestEngine.java index 44b588e18..2a8135ffd 100644 --- a/src/net/sourceforge/plantuml/suggest/SuggestEngine.java +++ b/src/net/sourceforge/plantuml/suggest/SuggestEngine.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4975 $ * */ package net.sourceforge.plantuml.suggest; diff --git a/src/net/sourceforge/plantuml/suggest/SuggestEngineResult.java b/src/net/sourceforge/plantuml/suggest/SuggestEngineResult.java index 7cbf6aa24..8c2796504 100644 --- a/src/net/sourceforge/plantuml/suggest/SuggestEngineResult.java +++ b/src/net/sourceforge/plantuml/suggest/SuggestEngineResult.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4975 $ * */ package net.sourceforge.plantuml.suggest; diff --git a/src/net/sourceforge/plantuml/suggest/SuggestEngineStatus.java b/src/net/sourceforge/plantuml/suggest/SuggestEngineStatus.java index 552c4c222..4b2d63b3d 100644 --- a/src/net/sourceforge/plantuml/suggest/SuggestEngineStatus.java +++ b/src/net/sourceforge/plantuml/suggest/SuggestEngineStatus.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4975 $ * */ package net.sourceforge.plantuml.suggest; diff --git a/src/net/sourceforge/plantuml/suggest/Variator.java b/src/net/sourceforge/plantuml/suggest/Variator.java index 2021f36f7..5920c23f1 100644 --- a/src/net/sourceforge/plantuml/suggest/Variator.java +++ b/src/net/sourceforge/plantuml/suggest/Variator.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4975 $ * */ package net.sourceforge.plantuml.suggest; diff --git a/src/net/sourceforge/plantuml/suggest/VariatorAddOneChar.java b/src/net/sourceforge/plantuml/suggest/VariatorAddOneChar.java index 9e084d826..452b19781 100644 --- a/src/net/sourceforge/plantuml/suggest/VariatorAddOneChar.java +++ b/src/net/sourceforge/plantuml/suggest/VariatorAddOneChar.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4975 $ * */ package net.sourceforge.plantuml.suggest; diff --git a/src/net/sourceforge/plantuml/suggest/VariatorAddOneCharBetweenWords.java b/src/net/sourceforge/plantuml/suggest/VariatorAddOneCharBetweenWords.java index bd8df6454..a805c984d 100644 --- a/src/net/sourceforge/plantuml/suggest/VariatorAddOneCharBetweenWords.java +++ b/src/net/sourceforge/plantuml/suggest/VariatorAddOneCharBetweenWords.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4975 $ * */ package net.sourceforge.plantuml.suggest; diff --git a/src/net/sourceforge/plantuml/suggest/VariatorAddTwoChar.java b/src/net/sourceforge/plantuml/suggest/VariatorAddTwoChar.java index 237dec47d..1e67506d4 100644 --- a/src/net/sourceforge/plantuml/suggest/VariatorAddTwoChar.java +++ b/src/net/sourceforge/plantuml/suggest/VariatorAddTwoChar.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4975 $ * */ package net.sourceforge.plantuml.suggest; diff --git a/src/net/sourceforge/plantuml/suggest/VariatorIteratorAdaptor.java b/src/net/sourceforge/plantuml/suggest/VariatorIteratorAdaptor.java index 3d8dfd4bf..bc98ff99e 100644 --- a/src/net/sourceforge/plantuml/suggest/VariatorIteratorAdaptor.java +++ b/src/net/sourceforge/plantuml/suggest/VariatorIteratorAdaptor.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4975 $ * */ package net.sourceforge.plantuml.suggest; diff --git a/src/net/sourceforge/plantuml/suggest/VariatorRemoveOneChar.java b/src/net/sourceforge/plantuml/suggest/VariatorRemoveOneChar.java index 46afda000..25c342f0f 100644 --- a/src/net/sourceforge/plantuml/suggest/VariatorRemoveOneChar.java +++ b/src/net/sourceforge/plantuml/suggest/VariatorRemoveOneChar.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4975 $ * */ package net.sourceforge.plantuml.suggest; diff --git a/src/net/sourceforge/plantuml/suggest/VariatorSwapChar.java b/src/net/sourceforge/plantuml/suggest/VariatorSwapChar.java index e0355002d..9d73f7861 100644 --- a/src/net/sourceforge/plantuml/suggest/VariatorSwapChar.java +++ b/src/net/sourceforge/plantuml/suggest/VariatorSwapChar.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4975 $ * */ package net.sourceforge.plantuml.suggest; diff --git a/src/net/sourceforge/plantuml/suggest/VariatorSwapLetter.java b/src/net/sourceforge/plantuml/suggest/VariatorSwapLetter.java index 7444ead27..2e33c08a1 100644 --- a/src/net/sourceforge/plantuml/suggest/VariatorSwapLetter.java +++ b/src/net/sourceforge/plantuml/suggest/VariatorSwapLetter.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4975 $ * */ package net.sourceforge.plantuml.suggest; diff --git a/src/net/sourceforge/plantuml/svek/AbstractEntityImage.java b/src/net/sourceforge/plantuml/svek/AbstractEntityImage.java index 7a4c2b747..c480e811c 100644 --- a/src/net/sourceforge/plantuml/svek/AbstractEntityImage.java +++ b/src/net/sourceforge/plantuml/svek/AbstractEntityImage.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3831 $ * */ package net.sourceforge.plantuml.svek; diff --git a/src/net/sourceforge/plantuml/svek/AbstractExtremityFactory.java b/src/net/sourceforge/plantuml/svek/AbstractExtremityFactory.java index aafd27139..fcdb23d39 100644 --- a/src/net/sourceforge/plantuml/svek/AbstractExtremityFactory.java +++ b/src/net/sourceforge/plantuml/svek/AbstractExtremityFactory.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.svek; diff --git a/src/net/sourceforge/plantuml/svek/ArithmeticStrategy.java b/src/net/sourceforge/plantuml/svek/ArithmeticStrategy.java index c88bb8730..79af931a4 100644 --- a/src/net/sourceforge/plantuml/svek/ArithmeticStrategy.java +++ b/src/net/sourceforge/plantuml/svek/ArithmeticStrategy.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.svek; diff --git a/src/net/sourceforge/plantuml/svek/ArithmeticStrategyMax.java b/src/net/sourceforge/plantuml/svek/ArithmeticStrategyMax.java index 3cd5d5a66..a4284a64e 100644 --- a/src/net/sourceforge/plantuml/svek/ArithmeticStrategyMax.java +++ b/src/net/sourceforge/plantuml/svek/ArithmeticStrategyMax.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.svek; diff --git a/src/net/sourceforge/plantuml/svek/ArithmeticStrategySum.java b/src/net/sourceforge/plantuml/svek/ArithmeticStrategySum.java index 47a749a33..389dae90a 100644 --- a/src/net/sourceforge/plantuml/svek/ArithmeticStrategySum.java +++ b/src/net/sourceforge/plantuml/svek/ArithmeticStrategySum.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.svek; diff --git a/src/net/sourceforge/plantuml/svek/Bibliotekon.java b/src/net/sourceforge/plantuml/svek/Bibliotekon.java index 86d05cf6c..57ac98a89 100644 --- a/src/net/sourceforge/plantuml/svek/Bibliotekon.java +++ b/src/net/sourceforge/plantuml/svek/Bibliotekon.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.svek; diff --git a/src/net/sourceforge/plantuml/svek/Boundary.java b/src/net/sourceforge/plantuml/svek/Boundary.java index 0f14fa51a..c64d5b85e 100644 --- a/src/net/sourceforge/plantuml/svek/Boundary.java +++ b/src/net/sourceforge/plantuml/svek/Boundary.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5183 $ * */ package net.sourceforge.plantuml.svek; diff --git a/src/net/sourceforge/plantuml/svek/CircleAndArrow.java b/src/net/sourceforge/plantuml/svek/CircleAndArrow.java index acd5cac60..2e8893388 100644 --- a/src/net/sourceforge/plantuml/svek/CircleAndArrow.java +++ b/src/net/sourceforge/plantuml/svek/CircleAndArrow.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.svek; diff --git a/src/net/sourceforge/plantuml/svek/CircleInterface2.java b/src/net/sourceforge/plantuml/svek/CircleInterface2.java index ac335be12..14f472732 100644 --- a/src/net/sourceforge/plantuml/svek/CircleInterface2.java +++ b/src/net/sourceforge/plantuml/svek/CircleInterface2.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5183 $ * */ package net.sourceforge.plantuml.svek; diff --git a/src/net/sourceforge/plantuml/svek/Cluster.java b/src/net/sourceforge/plantuml/svek/Cluster.java index b102c8917..8306bcabc 100644 --- a/src/net/sourceforge/plantuml/svek/Cluster.java +++ b/src/net/sourceforge/plantuml/svek/Cluster.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.svek; @@ -484,9 +481,9 @@ public class Cluster implements Moveable { return false; } - public void printCluster1(StringBuilder sb, Collection lines) { + public void printCluster1(StringBuilder sb, Collection lines, StringBounder stringBounder) { for (Shape sh : getShapesOrderedTop(lines)) { - sh.appendShape(sb); + sh.appendShape(sb, stringBounder); } } @@ -532,7 +529,7 @@ public class Cluster implements Moveable { } sb.append("}"); for (IShapePseudo sh : entries) { - sh.appendShape(sb); + sh.appendShape(sb, stringBounder); } } final List exits = getShapesEntryExit(EntityPosition.getOutputs()); @@ -543,7 +540,7 @@ public class Cluster implements Moveable { } sb.append("}"); for (Shape sh : exits) { - sh.appendShape(sb); + sh.appendShape(sb, stringBounder); } } } @@ -554,7 +551,7 @@ public class Cluster implements Moveable { boolean added = false; for (Shape sh : getShapesOrderedWithoutTop(lines)) { - sh.appendShape(sb); + sh.appendShape(sb, stringBounder); added = true; } @@ -755,7 +752,7 @@ public class Cluster implements Moveable { SvekUtils.println(sb); } SvekUtils.println(sb); - printCluster1(sb, lines); + printCluster1(sb, lines, stringBounder); final boolean added = printCluster2(sb, lines, stringBounder, dotMode, graphvizVersion, type); if (hasEntryOrExitPoint && added == false) { final String empty = "empty" + color; diff --git a/src/net/sourceforge/plantuml/svek/ClusterDecoration.java b/src/net/sourceforge/plantuml/svek/ClusterDecoration.java index ce29f543e..b44096954 100644 --- a/src/net/sourceforge/plantuml/svek/ClusterDecoration.java +++ b/src/net/sourceforge/plantuml/svek/ClusterDecoration.java @@ -23,13 +23,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * Modified by : Arno Peterson * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.svek; diff --git a/src/net/sourceforge/plantuml/svek/ClusterPosition.java b/src/net/sourceforge/plantuml/svek/ClusterPosition.java index 2dc919283..8b5d3f0a0 100644 --- a/src/net/sourceforge/plantuml/svek/ClusterPosition.java +++ b/src/net/sourceforge/plantuml/svek/ClusterPosition.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.svek; diff --git a/src/net/sourceforge/plantuml/svek/ColorSequence.java b/src/net/sourceforge/plantuml/svek/ColorSequence.java index 8d6638ade..041cf658e 100644 --- a/src/net/sourceforge/plantuml/svek/ColorSequence.java +++ b/src/net/sourceforge/plantuml/svek/ColorSequence.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6644 $ * */ package net.sourceforge.plantuml.svek; diff --git a/src/net/sourceforge/plantuml/svek/ConcurrentStateImage.java b/src/net/sourceforge/plantuml/svek/ConcurrentStateImage.java index 8b7e86fd7..0ba5a02cc 100644 --- a/src/net/sourceforge/plantuml/svek/ConcurrentStateImage.java +++ b/src/net/sourceforge/plantuml/svek/ConcurrentStateImage.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6711 $ * */ package net.sourceforge.plantuml.svek; diff --git a/src/net/sourceforge/plantuml/svek/ConditionStyle.java b/src/net/sourceforge/plantuml/svek/ConditionStyle.java index bb6abd901..78d84aa80 100644 --- a/src/net/sourceforge/plantuml/svek/ConditionStyle.java +++ b/src/net/sourceforge/plantuml/svek/ConditionStyle.java @@ -23,13 +23,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * Modified by : Arno Peterson * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.svek; diff --git a/src/net/sourceforge/plantuml/svek/Control.java b/src/net/sourceforge/plantuml/svek/Control.java index 7f6e496d4..4a9b0e5fd 100644 --- a/src/net/sourceforge/plantuml/svek/Control.java +++ b/src/net/sourceforge/plantuml/svek/Control.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5183 $ * */ package net.sourceforge.plantuml.svek; diff --git a/src/net/sourceforge/plantuml/svek/CucaDiagramFileMaker.java b/src/net/sourceforge/plantuml/svek/CucaDiagramFileMaker.java index 037e9661c..6c33f46a1 100644 --- a/src/net/sourceforge/plantuml/svek/CucaDiagramFileMaker.java +++ b/src/net/sourceforge/plantuml/svek/CucaDiagramFileMaker.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6711 $ * */ package net.sourceforge.plantuml.svek; diff --git a/src/net/sourceforge/plantuml/svek/CucaDiagramFileMakerSvek.java b/src/net/sourceforge/plantuml/svek/CucaDiagramFileMakerSvek.java index ae875ae49..4098c3fda 100644 --- a/src/net/sourceforge/plantuml/svek/CucaDiagramFileMakerSvek.java +++ b/src/net/sourceforge/plantuml/svek/CucaDiagramFileMakerSvek.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6711 $ * */ package net.sourceforge.plantuml.svek; @@ -51,7 +48,7 @@ import net.sourceforge.plantuml.cucadiagram.Link; import net.sourceforge.plantuml.cucadiagram.dot.CucaDiagramSimplifierActivity; import net.sourceforge.plantuml.cucadiagram.dot.CucaDiagramSimplifierState; import net.sourceforge.plantuml.cucadiagram.dot.DotData; -import net.sourceforge.plantuml.graphic.StringBounderUtils; +import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.ugraphic.ImageBuilder; public final class CucaDiagramFileMakerSvek implements CucaDiagramFileMaker { @@ -72,25 +69,25 @@ public final class CucaDiagramFileMakerSvek implements CucaDiagramFileMaker { } } - private DotDataImageBuilder createDotDataImageBuilder(DotMode dotMode) { + private DotDataImageBuilder createDotDataImageBuilder(DotMode dotMode, StringBounder stringBounder) { final DotData dotData = new DotData(diagram.getEntityFactory().getRootGroup(), getOrderedLinks(), diagram.getLeafsvalues(), diagram.getUmlDiagramType(), diagram.getSkinParam(), diagram, diagram, diagram.getColorMapper(), diagram.getEntityFactory(), diagram.isHideEmptyDescriptionForState(), dotMode, diagram.getNamespaceSeparator(), diagram.getPragma()); - return new DotDataImageBuilder(dotData, diagram.getEntityFactory(), diagram.getSource(), diagram.getPragma()); + return new DotDataImageBuilder(dotData, diagram.getEntityFactory(), diagram.getSource(), diagram.getPragma(), stringBounder); } private ImageData createFileInternal(OutputStream os, List dotStrings, FileFormatOption fileFormatOption) throws IOException, InterruptedException { if (diagram.getUmlDiagramType() == UmlDiagramType.ACTIVITY) { - new CucaDiagramSimplifierActivity(diagram, dotStrings); + new CucaDiagramSimplifierActivity(diagram, dotStrings, fileFormatOption.getDefaultStringBounder()); } else if (diagram.getUmlDiagramType() == UmlDiagramType.STATE) { - new CucaDiagramSimplifierState(diagram, dotStrings); + new CucaDiagramSimplifierState(diagram, dotStrings, fileFormatOption.getDefaultStringBounder()); } // System.err.println("FOO11 type=" + os.getClass()); - DotDataImageBuilder svek2 = createDotDataImageBuilder(DotMode.NORMAL); + DotDataImageBuilder svek2 = createDotDataImageBuilder(DotMode.NORMAL, fileFormatOption.getDefaultStringBounder()); BaseFile basefile = null; if (fileFormatOption.isDebugSvek() && os instanceof NamedOutputStream) { basefile = ((NamedOutputStream) os).getBasefile(); @@ -99,7 +96,7 @@ public final class CucaDiagramFileMakerSvek implements CucaDiagramFileMaker { TextBlockBackcolored result = svek2.buildImage(basefile, diagram.getDotStringSkek()); if (result instanceof GraphvizCrash) { - svek2 = createDotDataImageBuilder(DotMode.NO_LEFT_RIGHT); + svek2 = createDotDataImageBuilder(DotMode.NO_LEFT_RIGHT, fileFormatOption.getDefaultStringBounder()); result = svek2.buildImage(basefile, diagram.getDotStringSkek()); } result = new AnnotatedWorker(diagram, diagram.getSkinParam()).addAdd(result); @@ -109,7 +106,7 @@ public final class CucaDiagramFileMakerSvek implements CucaDiagramFileMaker { if (widthwarning != null && widthwarning.matches("\\d+")) { warningOrError = svek2.getWarningOrError(Integer.parseInt(widthwarning)); } - final Dimension2D dim = result.calculateDimension(StringBounderUtils.asStringBounder()); + final Dimension2D dim = result.calculateDimension(fileFormatOption.getDefaultStringBounder()); final double scale = getScale(fileFormatOption, dim); final ImageBuilder imageBuilder = new ImageBuilder(diagram.getSkinParam().getColorMapper(), scale, diff --git a/src/net/sourceforge/plantuml/svek/CucaDiagramFileMakerSvek2InternalImage.java b/src/net/sourceforge/plantuml/svek/CucaDiagramFileMakerSvek2InternalImage.java index 539513e75..c55914b2b 100644 --- a/src/net/sourceforge/plantuml/svek/CucaDiagramFileMakerSvek2InternalImage.java +++ b/src/net/sourceforge/plantuml/svek/CucaDiagramFileMakerSvek2InternalImage.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6711 $ * */ package net.sourceforge.plantuml.svek; diff --git a/src/net/sourceforge/plantuml/svek/DecorateEntityImage.java b/src/net/sourceforge/plantuml/svek/DecorateEntityImage.java index b662261f1..6b8111063 100644 --- a/src/net/sourceforge/plantuml/svek/DecorateEntityImage.java +++ b/src/net/sourceforge/plantuml/svek/DecorateEntityImage.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.svek; diff --git a/src/net/sourceforge/plantuml/svek/DecorateEntityImage3.java b/src/net/sourceforge/plantuml/svek/DecorateEntityImage3.java index dfe6620b9..b28dd1ec1 100644 --- a/src/net/sourceforge/plantuml/svek/DecorateEntityImage3.java +++ b/src/net/sourceforge/plantuml/svek/DecorateEntityImage3.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.svek; diff --git a/src/net/sourceforge/plantuml/svek/DotDataImageBuilder.java b/src/net/sourceforge/plantuml/svek/DotDataImageBuilder.java index 6efa56b29..f50826554 100644 --- a/src/net/sourceforge/plantuml/svek/DotDataImageBuilder.java +++ b/src/net/sourceforge/plantuml/svek/DotDataImageBuilder.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6711 $ * */ package net.sourceforge.plantuml.svek; @@ -81,7 +78,6 @@ import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.graphic.HtmlColor; import net.sourceforge.plantuml.graphic.HtmlColorUtils; import net.sourceforge.plantuml.graphic.StringBounder; -import net.sourceforge.plantuml.graphic.StringBounderUtils; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.TextBlockEmpty; import net.sourceforge.plantuml.graphic.TextBlockUtils; @@ -123,17 +119,15 @@ public final class DotDataImageBuilder { private final Pragma pragma; private Map maxX; - static private final StringBounder stringBounder; + private final StringBounder stringBounder; - static { - stringBounder = StringBounderUtils.asStringBounder(); - } - - public DotDataImageBuilder(DotData dotData, EntityFactory entityFactory, UmlSource source, Pragma pragma) { + public DotDataImageBuilder(DotData dotData, EntityFactory entityFactory, UmlSource source, Pragma pragma, + StringBounder stringBounder) { this.dotData = dotData; this.entityFactory = entityFactory; this.source = source; this.pragma = pragma; + this.stringBounder = stringBounder; } public IEntityImage buildImage(BaseFile basefile, String dotStrings[]) { diff --git a/src/net/sourceforge/plantuml/svek/DotMode.java b/src/net/sourceforge/plantuml/svek/DotMode.java index 6dd3656e4..3d1e0ea82 100644 --- a/src/net/sourceforge/plantuml/svek/DotMode.java +++ b/src/net/sourceforge/plantuml/svek/DotMode.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6711 $ * */ package net.sourceforge.plantuml.svek; diff --git a/src/net/sourceforge/plantuml/svek/DotStringFactory.java b/src/net/sourceforge/plantuml/svek/DotStringFactory.java index 43aca3ca2..17d509725 100644 --- a/src/net/sourceforge/plantuml/svek/DotStringFactory.java +++ b/src/net/sourceforge/plantuml/svek/DotStringFactory.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.svek; @@ -202,7 +199,7 @@ public class DotStringFactory implements Moveable { manageMinMaxCluster(sb); - root.printCluster1(sb, bibliotekon.allLines()); + root.printCluster1(sb, bibliotekon.allLines(), stringBounder); for (Line line : bibliotekon.lines0()) { line.appendLine(getGraphvizVersion(), sb); } diff --git a/src/net/sourceforge/plantuml/svek/EmptySvgException.java b/src/net/sourceforge/plantuml/svek/EmptySvgException.java index ead6ed404..4740b8dae 100644 --- a/src/net/sourceforge/plantuml/svek/EmptySvgException.java +++ b/src/net/sourceforge/plantuml/svek/EmptySvgException.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.svek; diff --git a/src/net/sourceforge/plantuml/svek/EntityDomain.java b/src/net/sourceforge/plantuml/svek/EntityDomain.java index 830769247..f0f4d64e5 100644 --- a/src/net/sourceforge/plantuml/svek/EntityDomain.java +++ b/src/net/sourceforge/plantuml/svek/EntityDomain.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5183 $ * */ package net.sourceforge.plantuml.svek; diff --git a/src/net/sourceforge/plantuml/svek/EntityImageProtected.java b/src/net/sourceforge/plantuml/svek/EntityImageProtected.java index 26a1cd7b6..a8bb5beb3 100644 --- a/src/net/sourceforge/plantuml/svek/EntityImageProtected.java +++ b/src/net/sourceforge/plantuml/svek/EntityImageProtected.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.svek; diff --git a/src/net/sourceforge/plantuml/svek/FrontierCalculator.java b/src/net/sourceforge/plantuml/svek/FrontierCalculator.java index af1d03e7d..fb2613e73 100644 --- a/src/net/sourceforge/plantuml/svek/FrontierCalculator.java +++ b/src/net/sourceforge/plantuml/svek/FrontierCalculator.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.svek; diff --git a/src/net/sourceforge/plantuml/svek/GraphvizCrash.java b/src/net/sourceforge/plantuml/svek/GraphvizCrash.java index d489c3047..a6fe974e7 100644 --- a/src/net/sourceforge/plantuml/svek/GraphvizCrash.java +++ b/src/net/sourceforge/plantuml/svek/GraphvizCrash.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6711 $ * */ package net.sourceforge.plantuml.svek; diff --git a/src/net/sourceforge/plantuml/svek/GroupPngMakerActivity.java b/src/net/sourceforge/plantuml/svek/GroupPngMakerActivity.java index 7dd0366d1..1b6a7fc74 100644 --- a/src/net/sourceforge/plantuml/svek/GroupPngMakerActivity.java +++ b/src/net/sourceforge/plantuml/svek/GroupPngMakerActivity.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6711 $ * */ package net.sourceforge.plantuml.svek; @@ -51,6 +48,7 @@ import net.sourceforge.plantuml.cucadiagram.Link; import net.sourceforge.plantuml.cucadiagram.Stereotype; import net.sourceforge.plantuml.cucadiagram.dot.DotData; import net.sourceforge.plantuml.graphic.HtmlColor; +import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.color.ColorType; import net.sourceforge.plantuml.skin.rose.Rose; import net.sourceforge.plantuml.svek.image.EntityImageState; @@ -60,6 +58,7 @@ public final class GroupPngMakerActivity { private final CucaDiagram diagram; private final IGroup group; + private final StringBounder stringBounder; class InnerGroupHierarchy implements GroupHierarchy { @@ -76,9 +75,10 @@ public final class GroupPngMakerActivity { } - public GroupPngMakerActivity(CucaDiagram diagram, IGroup group) { + public GroupPngMakerActivity(CucaDiagram diagram, IGroup group, StringBounder stringBounder) { this.diagram = diagram; this.group = group; + this.stringBounder = stringBounder; } private List getPureInnerLinks() { @@ -112,14 +112,15 @@ public final class GroupPngMakerActivity { DotMode.NORMAL, diagram.getNamespaceSeparator(), diagram.getPragma()); final DotDataImageBuilder svek2 = new DotDataImageBuilder(dotData, diagram.getEntityFactory(), - diagram.getSource(), diagram.getPragma()); + diagram.getSource(), diagram.getPragma(), stringBounder); if (group.getGroupType() == GroupType.INNER_ACTIVITY) { final Stereotype stereo = group.getStereotype(); final HtmlColor borderColor = getColor(ColorParam.activityBorder, stereo); final HtmlColor backColor = group.getColors(skinParam).getColor(ColorType.BACK) == null ? getColor( ColorParam.background, stereo) : group.getColors(skinParam).getColor(ColorType.BACK); - return new InnerActivity(svek2.buildImage(null, new String[0]), borderColor, backColor, skinParam.shadowing()); + return new InnerActivity(svek2.buildImage(null, new String[0]), borderColor, backColor, + skinParam.shadowing()); } throw new UnsupportedOperationException(group.getGroupType().toString()); diff --git a/src/net/sourceforge/plantuml/svek/GroupPngMakerState.java b/src/net/sourceforge/plantuml/svek/GroupPngMakerState.java index f11e49e1d..c0bb9beaf 100644 --- a/src/net/sourceforge/plantuml/svek/GroupPngMakerState.java +++ b/src/net/sourceforge/plantuml/svek/GroupPngMakerState.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6711 $ * */ package net.sourceforge.plantuml.svek; @@ -57,6 +54,7 @@ import net.sourceforge.plantuml.cucadiagram.dot.DotData; import net.sourceforge.plantuml.graphic.FontConfiguration; import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.graphic.HtmlColor; +import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlock; import net.sourceforge.plantuml.graphic.TextBlockEmpty; import net.sourceforge.plantuml.graphic.TextBlockWidth; @@ -69,6 +67,7 @@ public final class GroupPngMakerState { private final CucaDiagram diagram; private final IGroup group; + private final StringBounder stringBounder; class InnerGroupHierarchy implements GroupHierarchy { @@ -85,8 +84,9 @@ public final class GroupPngMakerState { } - public GroupPngMakerState(CucaDiagram diagram, IGroup group) { + public GroupPngMakerState(CucaDiagram diagram, IGroup group, StringBounder stringBounder) { this.diagram = diagram; + this.stringBounder = stringBounder; this.group = group; if (group.isGroup() == false) { throw new IllegalArgumentException(); @@ -121,7 +121,7 @@ public final class GroupPngMakerState { diagram.getPragma()); final DotDataImageBuilder svek2 = new DotDataImageBuilder(dotData, diagram.getEntityFactory(), - diagram.getSource(), diagram.getPragma()); + diagram.getSource(), diagram.getPragma(), stringBounder); if (group.getGroupType() == GroupType.CONCURRENT_STATE) { // return new InnerStateConcurrent(svek2.createFile()); diff --git a/src/net/sourceforge/plantuml/svek/HeaderLayout.java b/src/net/sourceforge/plantuml/svek/HeaderLayout.java index 762c6c9e6..d3dff6094 100644 --- a/src/net/sourceforge/plantuml/svek/HeaderLayout.java +++ b/src/net/sourceforge/plantuml/svek/HeaderLayout.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5183 $ * */ package net.sourceforge.plantuml.svek; diff --git a/src/net/sourceforge/plantuml/svek/IEntityImage.java b/src/net/sourceforge/plantuml/svek/IEntityImage.java index c10fcf685..4301df82a 100644 --- a/src/net/sourceforge/plantuml/svek/IEntityImage.java +++ b/src/net/sourceforge/plantuml/svek/IEntityImage.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.svek; diff --git a/src/net/sourceforge/plantuml/svek/IShapePseudo.java b/src/net/sourceforge/plantuml/svek/IShapePseudo.java index 5a38314ec..f7c4c9543 100644 --- a/src/net/sourceforge/plantuml/svek/IShapePseudo.java +++ b/src/net/sourceforge/plantuml/svek/IShapePseudo.java @@ -23,20 +23,19 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.svek; +import net.sourceforge.plantuml.graphic.StringBounder; + public interface IShapePseudo { String getUid(); - void appendShape(StringBuilder sb); + void appendShape(StringBuilder sb, StringBounder stringBounder); } diff --git a/src/net/sourceforge/plantuml/svek/InnerActivity.java b/src/net/sourceforge/plantuml/svek/InnerActivity.java index 8a234033e..319d3f00c 100644 --- a/src/net/sourceforge/plantuml/svek/InnerActivity.java +++ b/src/net/sourceforge/plantuml/svek/InnerActivity.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6711 $ * */ package net.sourceforge.plantuml.svek; diff --git a/src/net/sourceforge/plantuml/svek/InnerStateAutonom.java b/src/net/sourceforge/plantuml/svek/InnerStateAutonom.java index d417a9ee9..d6fe4be57 100644 --- a/src/net/sourceforge/plantuml/svek/InnerStateAutonom.java +++ b/src/net/sourceforge/plantuml/svek/InnerStateAutonom.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6711 $ * */ package net.sourceforge.plantuml.svek; diff --git a/src/net/sourceforge/plantuml/svek/Line.java b/src/net/sourceforge/plantuml/svek/Line.java index 5164ea8cc..ecba505e7 100644 --- a/src/net/sourceforge/plantuml/svek/Line.java +++ b/src/net/sourceforge/plantuml/svek/Line.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.svek; @@ -481,7 +478,7 @@ public class Line implements Moveable, Hideable { if (projectionCluster != null) { // System.err.println("Line::solveLine1 projectionCluster=" + projectionCluster.getClusterPosition()); - projectionCluster.manageEntryExitPoint(TextBlockUtils.getDummyStringBounder()); + projectionCluster.manageEntryExitPoint(stringBounder); // System.err.println("Line::solveLine2 projectionCluster=" + projectionCluster.getClusterPosition()); // if (lhead != null) // System.err.println("Line::solveLine ltail=" + lhead.getClusterPosition()); diff --git a/src/net/sourceforge/plantuml/svek/MinFinder.java b/src/net/sourceforge/plantuml/svek/MinFinder.java index d55e1bd6f..972b96093 100644 --- a/src/net/sourceforge/plantuml/svek/MinFinder.java +++ b/src/net/sourceforge/plantuml/svek/MinFinder.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.svek; diff --git a/src/net/sourceforge/plantuml/svek/Oscillator.java b/src/net/sourceforge/plantuml/svek/Oscillator.java index cb55e8a11..169f687ba 100644 --- a/src/net/sourceforge/plantuml/svek/Oscillator.java +++ b/src/net/sourceforge/plantuml/svek/Oscillator.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3831 $ * */ package net.sourceforge.plantuml.svek; diff --git a/src/net/sourceforge/plantuml/svek/PackageStyle.java b/src/net/sourceforge/plantuml/svek/PackageStyle.java index f3006444a..ae7b4d2d3 100644 --- a/src/net/sourceforge/plantuml/svek/PackageStyle.java +++ b/src/net/sourceforge/plantuml/svek/PackageStyle.java @@ -23,13 +23,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * Modified by : Arno Peterson * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.svek; diff --git a/src/net/sourceforge/plantuml/svek/PointAndAngle.java b/src/net/sourceforge/plantuml/svek/PointAndAngle.java index 05b65be0f..f6ca7ac4c 100644 --- a/src/net/sourceforge/plantuml/svek/PointAndAngle.java +++ b/src/net/sourceforge/plantuml/svek/PointAndAngle.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.svek; diff --git a/src/net/sourceforge/plantuml/svek/PointDirected.java b/src/net/sourceforge/plantuml/svek/PointDirected.java index 750fad5fc..8c89b6011 100644 --- a/src/net/sourceforge/plantuml/svek/PointDirected.java +++ b/src/net/sourceforge/plantuml/svek/PointDirected.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.svek; diff --git a/src/net/sourceforge/plantuml/svek/PortGeometry.java b/src/net/sourceforge/plantuml/svek/PortGeometry.java index e469a2c31..75533dd27 100644 --- a/src/net/sourceforge/plantuml/svek/PortGeometry.java +++ b/src/net/sourceforge/plantuml/svek/PortGeometry.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.svek; diff --git a/src/net/sourceforge/plantuml/svek/Ports.java b/src/net/sourceforge/plantuml/svek/Ports.java index c94f9a340..655276785 100644 --- a/src/net/sourceforge/plantuml/svek/Ports.java +++ b/src/net/sourceforge/plantuml/svek/Ports.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.svek; diff --git a/src/net/sourceforge/plantuml/svek/RoundedContainer.java b/src/net/sourceforge/plantuml/svek/RoundedContainer.java index d265e915e..9bd392f97 100644 --- a/src/net/sourceforge/plantuml/svek/RoundedContainer.java +++ b/src/net/sourceforge/plantuml/svek/RoundedContainer.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6711 $ * */ package net.sourceforge.plantuml.svek; diff --git a/src/net/sourceforge/plantuml/svek/Shape.java b/src/net/sourceforge/plantuml/svek/Shape.java index 58ef5072f..9643c181e 100644 --- a/src/net/sourceforge/plantuml/svek/Shape.java +++ b/src/net/sourceforge/plantuml/svek/Shape.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.svek; @@ -43,7 +40,6 @@ import net.sourceforge.plantuml.Hideable; import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.cucadiagram.EntityPosition; import net.sourceforge.plantuml.graphic.StringBounder; -import net.sourceforge.plantuml.graphic.StringBounderUtils; import net.sourceforge.plantuml.posimo.Positionable; import net.sourceforge.plantuml.svek.image.EntityImageDescription; import net.sourceforge.plantuml.svek.image.EntityImageStateBorder; @@ -115,9 +111,9 @@ public class Shape implements Positionable, IShapePseudo, Hideable { return height; } - public void appendShape(StringBuilder sb) { + public void appendShape(StringBuilder sb, StringBounder stringBounder) { if (type == ShapeType.RECTANGLE_HTML_FOR_PORTS) { - appendLabelHtmlSpecialForLink(sb); + appendLabelHtmlSpecialForLink(sb, stringBounder); return; } if (type == ShapeType.RECTANGLE && shield > 0) { @@ -175,8 +171,8 @@ public class Shape implements Positionable, IShapePseudo, Hideable { sb.append(""); } - private void appendLabelHtmlSpecialForLink(StringBuilder sb) { - final Ports ports = ((WithPorts) this.image).getPorts(StringBounderUtils.asStringBounder()); + private void appendLabelHtmlSpecialForLink(StringBuilder sb, StringBounder stringBounder) { + final Ports ports = ((WithPorts) this.image).getPorts(stringBounder); sb.append(uid); sb.append(" ["); diff --git a/src/net/sourceforge/plantuml/svek/ShapePseudoImpl.java b/src/net/sourceforge/plantuml/svek/ShapePseudoImpl.java index 02ce60996..3bf9141b1 100644 --- a/src/net/sourceforge/plantuml/svek/ShapePseudoImpl.java +++ b/src/net/sourceforge/plantuml/svek/ShapePseudoImpl.java @@ -23,16 +23,15 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.svek; +import net.sourceforge.plantuml.graphic.StringBounder; + public class ShapePseudoImpl implements IShapePseudo { private final String uid; @@ -49,7 +48,7 @@ public class ShapePseudoImpl implements IShapePseudo { return uid; } - public void appendShape(StringBuilder sb) { + public void appendShape(StringBuilder sb, StringBounder stringBounder) { sb.append(uid + " [shape=rect,label=\"\""); sb.append(",width=" + SvekUtils.pixelToInches(width)); sb.append(",height=" + SvekUtils.pixelToInches(height)); diff --git a/src/net/sourceforge/plantuml/svek/ShapeType.java b/src/net/sourceforge/plantuml/svek/ShapeType.java index d15a7d4dc..a893463f9 100644 --- a/src/net/sourceforge/plantuml/svek/ShapeType.java +++ b/src/net/sourceforge/plantuml/svek/ShapeType.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.svek; diff --git a/src/net/sourceforge/plantuml/svek/SingleStrategy.java b/src/net/sourceforge/plantuml/svek/SingleStrategy.java index 7968dd1d3..a5433bdcb 100644 --- a/src/net/sourceforge/plantuml/svek/SingleStrategy.java +++ b/src/net/sourceforge/plantuml/svek/SingleStrategy.java @@ -23,13 +23,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * Modified by : Arno Peterson * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.svek; diff --git a/src/net/sourceforge/plantuml/svek/SvekResult.java b/src/net/sourceforge/plantuml/svek/SvekResult.java index 35ac8a957..75986dab2 100644 --- a/src/net/sourceforge/plantuml/svek/SvekResult.java +++ b/src/net/sourceforge/plantuml/svek/SvekResult.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6711 $ * */ package net.sourceforge.plantuml.svek; diff --git a/src/net/sourceforge/plantuml/svek/SvekUtils.java b/src/net/sourceforge/plantuml/svek/SvekUtils.java index e8925c0a4..7eed49c43 100644 --- a/src/net/sourceforge/plantuml/svek/SvekUtils.java +++ b/src/net/sourceforge/plantuml/svek/SvekUtils.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.svek; diff --git a/src/net/sourceforge/plantuml/svek/TextBlockBackcolored.java b/src/net/sourceforge/plantuml/svek/TextBlockBackcolored.java index adf4b6c15..0e4180a96 100644 --- a/src/net/sourceforge/plantuml/svek/TextBlockBackcolored.java +++ b/src/net/sourceforge/plantuml/svek/TextBlockBackcolored.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.svek; diff --git a/src/net/sourceforge/plantuml/svek/UGraphicForSnake.java b/src/net/sourceforge/plantuml/svek/UGraphicForSnake.java index 1051a6c89..17604c0f5 100644 --- a/src/net/sourceforge/plantuml/svek/UGraphicForSnake.java +++ b/src/net/sourceforge/plantuml/svek/UGraphicForSnake.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 10266 $ * */ package net.sourceforge.plantuml.svek; @@ -81,7 +78,7 @@ public class UGraphicForSnake extends UGraphicDelegator { // } final Snake s1 = snake.move(dx, dy); final Snake s2 = newItem.snake.move(newItem.dx, newItem.dy); - final Snake merge = s1.merge(s2); + final Snake merge = s1.merge(s2, ug.getStringBounder()); if (merge == null) { return null; } diff --git a/src/net/sourceforge/plantuml/svek/Untranslated.java b/src/net/sourceforge/plantuml/svek/Untranslated.java index 1f4d82993..0bc6b19fc 100644 --- a/src/net/sourceforge/plantuml/svek/Untranslated.java +++ b/src/net/sourceforge/plantuml/svek/Untranslated.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.svek; diff --git a/src/net/sourceforge/plantuml/svek/WithPorts.java b/src/net/sourceforge/plantuml/svek/WithPorts.java index e630a0c82..8c45cb28d 100644 --- a/src/net/sourceforge/plantuml/svek/WithPorts.java +++ b/src/net/sourceforge/plantuml/svek/WithPorts.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.svek; diff --git a/src/net/sourceforge/plantuml/svek/extremity/Extremity.java b/src/net/sourceforge/plantuml/svek/extremity/Extremity.java index c93059bb4..fe3782379 100644 --- a/src/net/sourceforge/plantuml/svek/extremity/Extremity.java +++ b/src/net/sourceforge/plantuml/svek/extremity/Extremity.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.svek.extremity; diff --git a/src/net/sourceforge/plantuml/svek/extremity/ExtremityArrow.java b/src/net/sourceforge/plantuml/svek/extremity/ExtremityArrow.java index fd6381e4e..a65417529 100644 --- a/src/net/sourceforge/plantuml/svek/extremity/ExtremityArrow.java +++ b/src/net/sourceforge/plantuml/svek/extremity/ExtremityArrow.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.svek.extremity; diff --git a/src/net/sourceforge/plantuml/svek/extremity/ExtremityArrowAndCircle.java b/src/net/sourceforge/plantuml/svek/extremity/ExtremityArrowAndCircle.java index 6b580f802..cd48e739d 100644 --- a/src/net/sourceforge/plantuml/svek/extremity/ExtremityArrowAndCircle.java +++ b/src/net/sourceforge/plantuml/svek/extremity/ExtremityArrowAndCircle.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.svek.extremity; diff --git a/src/net/sourceforge/plantuml/svek/extremity/ExtremityCircle.java b/src/net/sourceforge/plantuml/svek/extremity/ExtremityCircle.java index 324b0b162..6e0bf31ad 100644 --- a/src/net/sourceforge/plantuml/svek/extremity/ExtremityCircle.java +++ b/src/net/sourceforge/plantuml/svek/extremity/ExtremityCircle.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.svek.extremity; diff --git a/src/net/sourceforge/plantuml/svek/extremity/ExtremityCircleConnect.java b/src/net/sourceforge/plantuml/svek/extremity/ExtremityCircleConnect.java index d5e394adb..07efce8bd 100644 --- a/src/net/sourceforge/plantuml/svek/extremity/ExtremityCircleConnect.java +++ b/src/net/sourceforge/plantuml/svek/extremity/ExtremityCircleConnect.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.svek.extremity; diff --git a/src/net/sourceforge/plantuml/svek/extremity/ExtremityCircleCross.java b/src/net/sourceforge/plantuml/svek/extremity/ExtremityCircleCross.java index a669d77b8..efafe98a4 100644 --- a/src/net/sourceforge/plantuml/svek/extremity/ExtremityCircleCross.java +++ b/src/net/sourceforge/plantuml/svek/extremity/ExtremityCircleCross.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.svek.extremity; diff --git a/src/net/sourceforge/plantuml/svek/extremity/ExtremityDiamond.java b/src/net/sourceforge/plantuml/svek/extremity/ExtremityDiamond.java index 1893add2a..f8dae83d9 100644 --- a/src/net/sourceforge/plantuml/svek/extremity/ExtremityDiamond.java +++ b/src/net/sourceforge/plantuml/svek/extremity/ExtremityDiamond.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.svek.extremity; diff --git a/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactory.java b/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactory.java index 0af2e4561..99ebcde94 100644 --- a/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactory.java +++ b/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactory.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.svek.extremity; diff --git a/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryArrow.java b/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryArrow.java index f9e94c16b..f689df802 100644 --- a/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryArrow.java +++ b/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryArrow.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.svek.extremity; diff --git a/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryArrowAndCircle.java b/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryArrowAndCircle.java index d54db4835..f7eefb57d 100644 --- a/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryArrowAndCircle.java +++ b/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryArrowAndCircle.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.svek.extremity; diff --git a/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryCircle.java b/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryCircle.java index 07e5be4d8..deaa54ccb 100644 --- a/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryCircle.java +++ b/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryCircle.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.svek.extremity; diff --git a/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryCircleConnect.java b/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryCircleConnect.java index dfd7d0a52..9d1833cdf 100644 --- a/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryCircleConnect.java +++ b/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryCircleConnect.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.svek.extremity; diff --git a/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryCircleCross.java b/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryCircleCross.java index 676bab930..af7cb5e87 100644 --- a/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryCircleCross.java +++ b/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryCircleCross.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.svek.extremity; diff --git a/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryDiamond.java b/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryDiamond.java index e131bf028..282fee23d 100644 --- a/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryDiamond.java +++ b/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryDiamond.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.svek.extremity; diff --git a/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryParenthesis.java b/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryParenthesis.java index 11a54c1ed..710a9a259 100644 --- a/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryParenthesis.java +++ b/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryParenthesis.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.svek.extremity; diff --git a/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryPlus.java b/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryPlus.java index f7ad192ab..7011aff30 100644 --- a/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryPlus.java +++ b/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryPlus.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.svek.extremity; diff --git a/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactorySquarre.java b/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactorySquarre.java index db6d47637..4b917a61e 100644 --- a/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactorySquarre.java +++ b/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactorySquarre.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.svek.extremity; diff --git a/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryTriangle.java b/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryTriangle.java index 8c66467c4..bb752ff85 100644 --- a/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryTriangle.java +++ b/src/net/sourceforge/plantuml/svek/extremity/ExtremityFactoryTriangle.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.svek.extremity; diff --git a/src/net/sourceforge/plantuml/svek/extremity/ExtremityParenthesis.java b/src/net/sourceforge/plantuml/svek/extremity/ExtremityParenthesis.java index d23376d21..7c54537eb 100644 --- a/src/net/sourceforge/plantuml/svek/extremity/ExtremityParenthesis.java +++ b/src/net/sourceforge/plantuml/svek/extremity/ExtremityParenthesis.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.svek.extremity; diff --git a/src/net/sourceforge/plantuml/svek/extremity/ExtremityParenthesis2.java b/src/net/sourceforge/plantuml/svek/extremity/ExtremityParenthesis2.java index 45297497f..06c854b73 100644 --- a/src/net/sourceforge/plantuml/svek/extremity/ExtremityParenthesis2.java +++ b/src/net/sourceforge/plantuml/svek/extremity/ExtremityParenthesis2.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.svek.extremity; diff --git a/src/net/sourceforge/plantuml/svek/extremity/ExtremityPlus.java b/src/net/sourceforge/plantuml/svek/extremity/ExtremityPlus.java index 94b52899f..d99081fea 100644 --- a/src/net/sourceforge/plantuml/svek/extremity/ExtremityPlus.java +++ b/src/net/sourceforge/plantuml/svek/extremity/ExtremityPlus.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.svek.extremity; diff --git a/src/net/sourceforge/plantuml/svek/extremity/ExtremitySquarre.java b/src/net/sourceforge/plantuml/svek/extremity/ExtremitySquarre.java index 7638efe72..224044c58 100644 --- a/src/net/sourceforge/plantuml/svek/extremity/ExtremitySquarre.java +++ b/src/net/sourceforge/plantuml/svek/extremity/ExtremitySquarre.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.svek.extremity; diff --git a/src/net/sourceforge/plantuml/svek/extremity/ExtremityStateLine1.java b/src/net/sourceforge/plantuml/svek/extremity/ExtremityStateLine1.java index 56ced5fff..3cf6779e2 100644 --- a/src/net/sourceforge/plantuml/svek/extremity/ExtremityStateLine1.java +++ b/src/net/sourceforge/plantuml/svek/extremity/ExtremityStateLine1.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.svek.extremity; diff --git a/src/net/sourceforge/plantuml/svek/extremity/ExtremityStateLine2.java b/src/net/sourceforge/plantuml/svek/extremity/ExtremityStateLine2.java index d821470f0..866ec7e73 100644 --- a/src/net/sourceforge/plantuml/svek/extremity/ExtremityStateLine2.java +++ b/src/net/sourceforge/plantuml/svek/extremity/ExtremityStateLine2.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.svek.extremity; diff --git a/src/net/sourceforge/plantuml/svek/extremity/ExtremityTriangle.java b/src/net/sourceforge/plantuml/svek/extremity/ExtremityTriangle.java index 0529139cb..a93b92e2f 100644 --- a/src/net/sourceforge/plantuml/svek/extremity/ExtremityTriangle.java +++ b/src/net/sourceforge/plantuml/svek/extremity/ExtremityTriangle.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.svek.extremity; diff --git a/src/net/sourceforge/plantuml/svek/extremity/MiddleCircle.java b/src/net/sourceforge/plantuml/svek/extremity/MiddleCircle.java index 75e6b4934..2924ac380 100644 --- a/src/net/sourceforge/plantuml/svek/extremity/MiddleCircle.java +++ b/src/net/sourceforge/plantuml/svek/extremity/MiddleCircle.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.svek.extremity; diff --git a/src/net/sourceforge/plantuml/svek/extremity/MiddleCircleCircled.java b/src/net/sourceforge/plantuml/svek/extremity/MiddleCircleCircled.java index 48ea5088e..9c9422407 100644 --- a/src/net/sourceforge/plantuml/svek/extremity/MiddleCircleCircled.java +++ b/src/net/sourceforge/plantuml/svek/extremity/MiddleCircleCircled.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.svek.extremity; diff --git a/src/net/sourceforge/plantuml/svek/extremity/MiddleCircleCircledMode.java b/src/net/sourceforge/plantuml/svek/extremity/MiddleCircleCircledMode.java index b8c088e1e..ecd8f8227 100644 --- a/src/net/sourceforge/plantuml/svek/extremity/MiddleCircleCircledMode.java +++ b/src/net/sourceforge/plantuml/svek/extremity/MiddleCircleCircledMode.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.svek.extremity; diff --git a/src/net/sourceforge/plantuml/svek/extremity/MiddleFactory.java b/src/net/sourceforge/plantuml/svek/extremity/MiddleFactory.java index 8122ebee4..e538c5063 100644 --- a/src/net/sourceforge/plantuml/svek/extremity/MiddleFactory.java +++ b/src/net/sourceforge/plantuml/svek/extremity/MiddleFactory.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.svek.extremity; diff --git a/src/net/sourceforge/plantuml/svek/extremity/MiddleFactoryCircle.java b/src/net/sourceforge/plantuml/svek/extremity/MiddleFactoryCircle.java index b6b032e61..b1edee9eb 100644 --- a/src/net/sourceforge/plantuml/svek/extremity/MiddleFactoryCircle.java +++ b/src/net/sourceforge/plantuml/svek/extremity/MiddleFactoryCircle.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.svek.extremity; diff --git a/src/net/sourceforge/plantuml/svek/extremity/MiddleFactoryCircleCircled.java b/src/net/sourceforge/plantuml/svek/extremity/MiddleFactoryCircleCircled.java index 470d6cae9..d97d54a1f 100644 --- a/src/net/sourceforge/plantuml/svek/extremity/MiddleFactoryCircleCircled.java +++ b/src/net/sourceforge/plantuml/svek/extremity/MiddleFactoryCircleCircled.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4236 $ * */ package net.sourceforge.plantuml.svek.extremity; diff --git a/src/net/sourceforge/plantuml/svek/image/Circle.java b/src/net/sourceforge/plantuml/svek/image/Circle.java index 2d7c78d2a..8c7932789 100644 --- a/src/net/sourceforge/plantuml/svek/image/Circle.java +++ b/src/net/sourceforge/plantuml/svek/image/Circle.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5183 $ * */ package net.sourceforge.plantuml.svek.image; diff --git a/src/net/sourceforge/plantuml/svek/image/ConnectedCircle.java b/src/net/sourceforge/plantuml/svek/image/ConnectedCircle.java index 1be3c6342..a4c5c4f07 100644 --- a/src/net/sourceforge/plantuml/svek/image/ConnectedCircle.java +++ b/src/net/sourceforge/plantuml/svek/image/ConnectedCircle.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5183 $ * */ package net.sourceforge.plantuml.svek.image; diff --git a/src/net/sourceforge/plantuml/svek/image/ContainingEllipse.java b/src/net/sourceforge/plantuml/svek/image/ContainingEllipse.java index b4377aab3..8741043e2 100644 --- a/src/net/sourceforge/plantuml/svek/image/ContainingEllipse.java +++ b/src/net/sourceforge/plantuml/svek/image/ContainingEllipse.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5183 $ * */ package net.sourceforge.plantuml.svek.image; diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageActivity.java b/src/net/sourceforge/plantuml/svek/image/EntityImageActivity.java index 5a738e596..3e33d42a7 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageActivity.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageActivity.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5183 $ * */ package net.sourceforge.plantuml.svek.image; diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageArcCircle.java b/src/net/sourceforge/plantuml/svek/image/EntityImageArcCircle.java index fe4d6d863..75aecb219 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageArcCircle.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageArcCircle.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5183 $ * */ package net.sourceforge.plantuml.svek.image; diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageAssociation.java b/src/net/sourceforge/plantuml/svek/image/EntityImageAssociation.java index 22a804321..7e97128c7 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageAssociation.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageAssociation.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5183 $ * */ package net.sourceforge.plantuml.svek.image; diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageAssociationPoint.java b/src/net/sourceforge/plantuml/svek/image/EntityImageAssociationPoint.java index 7af40c0a1..ec94d96df 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageAssociationPoint.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageAssociationPoint.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5183 $ * */ package net.sourceforge.plantuml.svek.image; diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageBranch.java b/src/net/sourceforge/plantuml/svek/image/EntityImageBranch.java index d008b3565..ebe686af7 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageBranch.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageBranch.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5183 $ * */ package net.sourceforge.plantuml.svek.image; diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageCircleEnd.java b/src/net/sourceforge/plantuml/svek/image/EntityImageCircleEnd.java index 90224dbfc..6f62ada6e 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageCircleEnd.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageCircleEnd.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5183 $ * */ package net.sourceforge.plantuml.svek.image; diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageCircleStart.java b/src/net/sourceforge/plantuml/svek/image/EntityImageCircleStart.java index 47cb6885b..cde1b6601 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageCircleStart.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageCircleStart.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5183 $ * */ package net.sourceforge.plantuml.svek.image; diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageClass.java b/src/net/sourceforge/plantuml/svek/image/EntityImageClass.java index 4a989b7e4..5d8baafaf 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageClass.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageClass.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5183 $ * */ package net.sourceforge.plantuml.svek.image; diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageClassHeader2.java b/src/net/sourceforge/plantuml/svek/image/EntityImageClassHeader2.java index d2cbb1b3e..39e4b8fc5 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageClassHeader2.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageClassHeader2.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5183 $ * */ package net.sourceforge.plantuml.svek.image; diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageDescription.java b/src/net/sourceforge/plantuml/svek/image/EntityImageDescription.java index a1ffa1831..05d64d72c 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageDescription.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageDescription.java @@ -23,13 +23,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * Modified by : Arno Peterson * - * Revision $Revision: 5183 $ * */ package net.sourceforge.plantuml.svek.image; diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageEmptyPackage.java b/src/net/sourceforge/plantuml/svek/image/EntityImageEmptyPackage.java index 3748ae24b..f84a275cd 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageEmptyPackage.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageEmptyPackage.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5183 $ * */ package net.sourceforge.plantuml.svek.image; diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageGroup.java b/src/net/sourceforge/plantuml/svek/image/EntityImageGroup.java index ce56b5e9a..b4a9cee35 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageGroup.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageGroup.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5183 $ * */ package net.sourceforge.plantuml.svek.image; diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageLollipopInterface.java b/src/net/sourceforge/plantuml/svek/image/EntityImageLollipopInterface.java index 82817fd67..ccb12c572 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageLollipopInterface.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageLollipopInterface.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5183 $ * */ package net.sourceforge.plantuml.svek.image; diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageLollipopInterfaceEye1.java b/src/net/sourceforge/plantuml/svek/image/EntityImageLollipopInterfaceEye1.java index f1d0ccd88..2329f6361 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageLollipopInterfaceEye1.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageLollipopInterfaceEye1.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5183 $ * */ package net.sourceforge.plantuml.svek.image; diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageLollipopInterfaceEye2.java b/src/net/sourceforge/plantuml/svek/image/EntityImageLollipopInterfaceEye2.java index 7365aea61..37dc35174 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageLollipopInterfaceEye2.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageLollipopInterfaceEye2.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5183 $ * */ package net.sourceforge.plantuml.svek.image; diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageNote.java b/src/net/sourceforge/plantuml/svek/image/EntityImageNote.java index af40fbaa0..8fe55fd4a 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageNote.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageNote.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5183 $ * */ package net.sourceforge.plantuml.svek.image; diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageNoteLink.java b/src/net/sourceforge/plantuml/svek/image/EntityImageNoteLink.java index 0b8e8a822..6917a3950 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageNoteLink.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageNoteLink.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5183 $ * */ package net.sourceforge.plantuml.svek.image; diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageObject.java b/src/net/sourceforge/plantuml/svek/image/EntityImageObject.java index abfe5ffa9..2d822d4b0 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageObject.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageObject.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5183 $ * */ package net.sourceforge.plantuml.svek.image; diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImagePseudoState.java b/src/net/sourceforge/plantuml/svek/image/EntityImagePseudoState.java index f9aa8e4d4..61400b197 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImagePseudoState.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImagePseudoState.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5183 $ * */ package net.sourceforge.plantuml.svek.image; diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageState.java b/src/net/sourceforge/plantuml/svek/image/EntityImageState.java index 6273f2356..10e8eb673 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageState.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageState.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5183 $ * */ package net.sourceforge.plantuml.svek.image; diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageState2.java b/src/net/sourceforge/plantuml/svek/image/EntityImageState2.java index 536ffb184..4f9c65bed 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageState2.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageState2.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5183 $ * */ package net.sourceforge.plantuml.svek.image; diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageStateBorder.java b/src/net/sourceforge/plantuml/svek/image/EntityImageStateBorder.java index 9e7ad6a3c..4f398364c 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageStateBorder.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageStateBorder.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5183 $ * */ package net.sourceforge.plantuml.svek.image; diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageStateEmptyDescription.java b/src/net/sourceforge/plantuml/svek/image/EntityImageStateEmptyDescription.java index 6dc2bcdaf..543af9864 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageStateEmptyDescription.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageStateEmptyDescription.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5183 $ * */ package net.sourceforge.plantuml.svek.image; diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageSynchroBar.java b/src/net/sourceforge/plantuml/svek/image/EntityImageSynchroBar.java index da41af207..169642601 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageSynchroBar.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageSynchroBar.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5183 $ * */ package net.sourceforge.plantuml.svek.image; diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageTips.java b/src/net/sourceforge/plantuml/svek/image/EntityImageTips.java index 6cae16d58..e977f37a7 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageTips.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageTips.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5183 $ * */ package net.sourceforge.plantuml.svek.image; diff --git a/src/net/sourceforge/plantuml/svek/image/EntityImageUseCase.java b/src/net/sourceforge/plantuml/svek/image/EntityImageUseCase.java index 46f3aec7c..ee12327d7 100644 --- a/src/net/sourceforge/plantuml/svek/image/EntityImageUseCase.java +++ b/src/net/sourceforge/plantuml/svek/image/EntityImageUseCase.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5183 $ * */ package net.sourceforge.plantuml.svek.image; diff --git a/src/net/sourceforge/plantuml/svek/image/Footprint.java b/src/net/sourceforge/plantuml/svek/image/Footprint.java index 3d4878262..d6f6b3a05 100644 --- a/src/net/sourceforge/plantuml/svek/image/Footprint.java +++ b/src/net/sourceforge/plantuml/svek/image/Footprint.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5183 $ * */ package net.sourceforge.plantuml.svek.image; diff --git a/src/net/sourceforge/plantuml/svek/image/Opale.java b/src/net/sourceforge/plantuml/svek/image/Opale.java index 19c3db8e7..ddb1a53a3 100644 --- a/src/net/sourceforge/plantuml/svek/image/Opale.java +++ b/src/net/sourceforge/plantuml/svek/image/Opale.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5183 $ * */ package net.sourceforge.plantuml.svek.image; diff --git a/src/net/sourceforge/plantuml/svek/image/SmallestEnclosingCircle.java b/src/net/sourceforge/plantuml/svek/image/SmallestEnclosingCircle.java index 1d02c6f09..0bbd46d9b 100644 --- a/src/net/sourceforge/plantuml/svek/image/SmallestEnclosingCircle.java +++ b/src/net/sourceforge/plantuml/svek/image/SmallestEnclosingCircle.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5183 $ * */ package net.sourceforge.plantuml.svek.image; diff --git a/src/net/sourceforge/plantuml/svek/image/YTransformer.java b/src/net/sourceforge/plantuml/svek/image/YTransformer.java index b814d6563..873b2541f 100644 --- a/src/net/sourceforge/plantuml/svek/image/YTransformer.java +++ b/src/net/sourceforge/plantuml/svek/image/YTransformer.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5183 $ * */ package net.sourceforge.plantuml.svek.image; diff --git a/src/net/sourceforge/plantuml/svg/SvgData.java b/src/net/sourceforge/plantuml/svg/SvgData.java index b93ca6902..022b04801 100644 --- a/src/net/sourceforge/plantuml/svg/SvgData.java +++ b/src/net/sourceforge/plantuml/svg/SvgData.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4173 $ * */ package net.sourceforge.plantuml.svg; diff --git a/src/net/sourceforge/plantuml/svg/SvgGraphics.java b/src/net/sourceforge/plantuml/svg/SvgGraphics.java index ddcc6cd5b..e792671ed 100644 --- a/src/net/sourceforge/plantuml/svg/SvgGraphics.java +++ b/src/net/sourceforge/plantuml/svg/SvgGraphics.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 20128 $ * */ package net.sourceforge.plantuml.svg; @@ -308,6 +305,9 @@ public class SvgGraphics { pendingLink2.add(0, (Element) document.createElement("a")); pendingLink2.get(0).setAttribute("target", target); pendingLink2.get(0).setAttribute("xlink:href", url); + pendingLink2.get(0).setAttribute("xlink:type", "simple"); + pendingLink2.get(0).setAttribute("xlink:actuate", "onRequest"); + pendingLink2.get(0).setAttribute("xlink:show", "new"); if (title == null) { pendingLink2.get(0).setAttribute("xlink:title", url); } else { @@ -477,8 +477,8 @@ public class SvgGraphics { filter.setAttribute("y", "0"); filter.setAttribute("width", "1"); filter.setAttribute("height", "1"); - addFilter(filter, "feFlood", "flood-color", color); - addFilter(filter, "feComposite", "in", "SourceGraphic"); + addFilter(filter, "feFlood", "flood-color", color, "result", "flood"); + addFilter(filter, "feComposite", "in", "SourceGraphic", "in2", "flood", "operator", "over"); defs.appendChild(filter); return id; } @@ -501,13 +501,9 @@ public class SvgGraphics { // // Sets the standalone property in the first line of // // the output file. - transformer.setOutputProperty(OutputKeys.STANDALONE, "yes"); - // - // Properties proprietes = new Properties(); - // proprietes.put("standalone", "yes"); - // transformer.setOutputProperties(proprietes); - // - // transformer.setParameter(OutputKeys.STANDALONE, "yes"); + transformer.setOutputProperty(OutputKeys.STANDALONE, "no"); + // transformer.setOutputProperty(OutputKeys.DOCTYPE_PUBLIC, "SVG 1.1"); + // transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "no"); return transformer; } @@ -547,6 +543,10 @@ public class SvgGraphics { root.setAttribute("width", format(maxX) + "px"); root.setAttribute("height", format(maxY) + "px"); root.setAttribute("viewBox", "0 0 " + maxXscaled + " " + maxYscaled); + root.setAttribute("zoomAndPan", "magnify"); + root.setAttribute("preserveAspectRatio", "none"); + root.setAttribute("contentScriptType", "application/ecmascript"); + root.setAttribute("contentStyleType", "text/css"); if (pendingBackground != null) { pendingBackground.setAttribute("width", format(maxX)); diff --git a/src/net/sourceforge/plantuml/swing/AboutWindow.java b/src/net/sourceforge/plantuml/swing/AboutWindow.java index a6f768510..0de432fc7 100644 --- a/src/net/sourceforge/plantuml/swing/AboutWindow.java +++ b/src/net/sourceforge/plantuml/swing/AboutWindow.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5885 $ * */ package net.sourceforge.plantuml.swing; diff --git a/src/net/sourceforge/plantuml/swing/ImageHelper.java b/src/net/sourceforge/plantuml/swing/ImageHelper.java index f97a75ea3..c558a3deb 100644 --- a/src/net/sourceforge/plantuml/swing/ImageHelper.java +++ b/src/net/sourceforge/plantuml/swing/ImageHelper.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Zane D. Purvis * - * Revision $Revision: 5885 $ * */ package net.sourceforge.plantuml.swing; diff --git a/src/net/sourceforge/plantuml/swing/ImageWindow2.java b/src/net/sourceforge/plantuml/swing/ImageWindow2.java index 45a5080e1..836981b01 100644 --- a/src/net/sourceforge/plantuml/swing/ImageWindow2.java +++ b/src/net/sourceforge/plantuml/swing/ImageWindow2.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5885 $ * */ package net.sourceforge.plantuml.swing; diff --git a/src/net/sourceforge/plantuml/swing/LicenseWindow.java b/src/net/sourceforge/plantuml/swing/LicenseWindow.java index 875b802da..c45b964da 100644 --- a/src/net/sourceforge/plantuml/swing/LicenseWindow.java +++ b/src/net/sourceforge/plantuml/swing/LicenseWindow.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5885 $ * */ package net.sourceforge.plantuml.swing; diff --git a/src/net/sourceforge/plantuml/swing/MainWindow2.java b/src/net/sourceforge/plantuml/swing/MainWindow2.java index c9357a93e..f801c4200 100644 --- a/src/net/sourceforge/plantuml/swing/MainWindow2.java +++ b/src/net/sourceforge/plantuml/swing/MainWindow2.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6533 $ * */ package net.sourceforge.plantuml.swing; diff --git a/src/net/sourceforge/plantuml/swing/ScrollablePicture.java b/src/net/sourceforge/plantuml/swing/ScrollablePicture.java index 1857b75d2..cb9657361 100644 --- a/src/net/sourceforge/plantuml/swing/ScrollablePicture.java +++ b/src/net/sourceforge/plantuml/swing/ScrollablePicture.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.swing; diff --git a/src/net/sourceforge/plantuml/swing/SimpleLine2.java b/src/net/sourceforge/plantuml/swing/SimpleLine2.java index 4d7d642cd..aa84e7a1c 100644 --- a/src/net/sourceforge/plantuml/swing/SimpleLine2.java +++ b/src/net/sourceforge/plantuml/swing/SimpleLine2.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3837 $ * */ package net.sourceforge.plantuml.swing; diff --git a/src/net/sourceforge/plantuml/swing/SpriteWindow.java b/src/net/sourceforge/plantuml/swing/SpriteWindow.java index ca8fb370f..edf57c61d 100644 --- a/src/net/sourceforge/plantuml/swing/SpriteWindow.java +++ b/src/net/sourceforge/plantuml/swing/SpriteWindow.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6533 $ * */ package net.sourceforge.plantuml.swing; diff --git a/src/net/sourceforge/plantuml/syntax/LanguageDescriptor.java b/src/net/sourceforge/plantuml/syntax/LanguageDescriptor.java index 8f1495fa3..23cdee483 100644 --- a/src/net/sourceforge/plantuml/syntax/LanguageDescriptor.java +++ b/src/net/sourceforge/plantuml/syntax/LanguageDescriptor.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4639 $ * */ package net.sourceforge.plantuml.syntax; diff --git a/src/net/sourceforge/plantuml/syntax/SyntaxChecker.java b/src/net/sourceforge/plantuml/syntax/SyntaxChecker.java index b3db95710..ae624cb1e 100644 --- a/src/net/sourceforge/plantuml/syntax/SyntaxChecker.java +++ b/src/net/sourceforge/plantuml/syntax/SyntaxChecker.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4639 $ * */ package net.sourceforge.plantuml.syntax; diff --git a/src/net/sourceforge/plantuml/syntax/SyntaxResult.java b/src/net/sourceforge/plantuml/syntax/SyntaxResult.java index f1308ed4c..968889f27 100644 --- a/src/net/sourceforge/plantuml/syntax/SyntaxResult.java +++ b/src/net/sourceforge/plantuml/syntax/SyntaxResult.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4639 $ * */ package net.sourceforge.plantuml.syntax; diff --git a/src/net/sourceforge/plantuml/telnet/AcceptTelnetClient.java b/src/net/sourceforge/plantuml/telnet/AcceptTelnetClient.java index b39e1872e..e9dd2fd3c 100644 --- a/src/net/sourceforge/plantuml/telnet/AcceptTelnetClient.java +++ b/src/net/sourceforge/plantuml/telnet/AcceptTelnetClient.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3837 $ * */ package net.sourceforge.plantuml.telnet; diff --git a/src/net/sourceforge/plantuml/telnet/TelnetServer.java b/src/net/sourceforge/plantuml/telnet/TelnetServer.java index 4e221cee3..d87707ee8 100644 --- a/src/net/sourceforge/plantuml/telnet/TelnetServer.java +++ b/src/net/sourceforge/plantuml/telnet/TelnetServer.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3837 $ * */ package net.sourceforge.plantuml.telnet; diff --git a/src/net/sourceforge/plantuml/tikz/TikzGraphics.java b/src/net/sourceforge/plantuml/tikz/TikzGraphics.java index 35d313045..f6e4e9fb5 100644 --- a/src/net/sourceforge/plantuml/tikz/TikzGraphics.java +++ b/src/net/sourceforge/plantuml/tikz/TikzGraphics.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 12561 $ * */ package net.sourceforge.plantuml.tikz; diff --git a/src/net/sourceforge/plantuml/turing/BFMachine.java b/src/net/sourceforge/plantuml/turing/BFMachine.java index a9588d68e..d7ba65bec 100644 --- a/src/net/sourceforge/plantuml/turing/BFMachine.java +++ b/src/net/sourceforge/plantuml/turing/BFMachine.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3837 $ * */ package net.sourceforge.plantuml.turing; diff --git a/src/net/sourceforge/plantuml/turing/BFToken.java b/src/net/sourceforge/plantuml/turing/BFToken.java index 708ed136c..2c38e667e 100644 --- a/src/net/sourceforge/plantuml/turing/BFToken.java +++ b/src/net/sourceforge/plantuml/turing/BFToken.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3837 $ * */ package net.sourceforge.plantuml.turing; diff --git a/src/net/sourceforge/plantuml/turing/PSystemTuring.java b/src/net/sourceforge/plantuml/turing/PSystemTuring.java index 345b365d1..cb562153f 100644 --- a/src/net/sourceforge/plantuml/turing/PSystemTuring.java +++ b/src/net/sourceforge/plantuml/turing/PSystemTuring.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * diff --git a/src/net/sourceforge/plantuml/turing/PSystemTuringFactory.java b/src/net/sourceforge/plantuml/turing/PSystemTuringFactory.java index c1671e333..ac240ad25 100644 --- a/src/net/sourceforge/plantuml/turing/PSystemTuringFactory.java +++ b/src/net/sourceforge/plantuml/turing/PSystemTuringFactory.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * diff --git a/src/net/sourceforge/plantuml/ugraphic/AbstractCommonUGraphic.java b/src/net/sourceforge/plantuml/ugraphic/AbstractCommonUGraphic.java index 732a21299..2f162f688 100644 --- a/src/net/sourceforge/plantuml/ugraphic/AbstractCommonUGraphic.java +++ b/src/net/sourceforge/plantuml/ugraphic/AbstractCommonUGraphic.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.ugraphic; diff --git a/src/net/sourceforge/plantuml/ugraphic/AbstractPlacementStrategy.java b/src/net/sourceforge/plantuml/ugraphic/AbstractPlacementStrategy.java index cf6801c89..389c1aad2 100644 --- a/src/net/sourceforge/plantuml/ugraphic/AbstractPlacementStrategy.java +++ b/src/net/sourceforge/plantuml/ugraphic/AbstractPlacementStrategy.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3837 $ * */ package net.sourceforge.plantuml.ugraphic; diff --git a/src/net/sourceforge/plantuml/ugraphic/AbstractShadowable.java b/src/net/sourceforge/plantuml/ugraphic/AbstractShadowable.java index 8f7302a8a..142c0783f 100644 --- a/src/net/sourceforge/plantuml/ugraphic/AbstractShadowable.java +++ b/src/net/sourceforge/plantuml/ugraphic/AbstractShadowable.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4901 $ * */ package net.sourceforge.plantuml.ugraphic; diff --git a/src/net/sourceforge/plantuml/ugraphic/AbstractUGraphic.java b/src/net/sourceforge/plantuml/ugraphic/AbstractUGraphic.java index c067b1b5d..94800e509 100644 --- a/src/net/sourceforge/plantuml/ugraphic/AbstractUGraphic.java +++ b/src/net/sourceforge/plantuml/ugraphic/AbstractUGraphic.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 20127 $ * */ package net.sourceforge.plantuml.ugraphic; diff --git a/src/net/sourceforge/plantuml/ugraphic/AbstractUGraphicHorizontalLine.java b/src/net/sourceforge/plantuml/ugraphic/AbstractUGraphicHorizontalLine.java index 59394fdd8..234bccf7d 100644 --- a/src/net/sourceforge/plantuml/ugraphic/AbstractUGraphicHorizontalLine.java +++ b/src/net/sourceforge/plantuml/ugraphic/AbstractUGraphicHorizontalLine.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8033 $ * */ package net.sourceforge.plantuml.ugraphic; diff --git a/src/net/sourceforge/plantuml/ugraphic/ClipContainer.java b/src/net/sourceforge/plantuml/ugraphic/ClipContainer.java index 7dbb89d87..80478f2e0 100644 --- a/src/net/sourceforge/plantuml/ugraphic/ClipContainer.java +++ b/src/net/sourceforge/plantuml/ugraphic/ClipContainer.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * diff --git a/src/net/sourceforge/plantuml/ugraphic/ColorChangerMonochrome.java b/src/net/sourceforge/plantuml/ugraphic/ColorChangerMonochrome.java index af3b5c0c9..e5783f1a8 100644 --- a/src/net/sourceforge/plantuml/ugraphic/ColorChangerMonochrome.java +++ b/src/net/sourceforge/plantuml/ugraphic/ColorChangerMonochrome.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4912 $ * */ package net.sourceforge.plantuml.ugraphic; diff --git a/src/net/sourceforge/plantuml/ugraphic/ColorMapper.java b/src/net/sourceforge/plantuml/ugraphic/ColorMapper.java index 72d0c19d2..2f60cb9c8 100644 --- a/src/net/sourceforge/plantuml/ugraphic/ColorMapper.java +++ b/src/net/sourceforge/plantuml/ugraphic/ColorMapper.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4912 $ * */ package net.sourceforge.plantuml.ugraphic; diff --git a/src/net/sourceforge/plantuml/ugraphic/ColorMapperIdentity.java b/src/net/sourceforge/plantuml/ugraphic/ColorMapperIdentity.java index 66bb18558..992ad51f3 100644 --- a/src/net/sourceforge/plantuml/ugraphic/ColorMapperIdentity.java +++ b/src/net/sourceforge/plantuml/ugraphic/ColorMapperIdentity.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4912 $ * */ package net.sourceforge.plantuml.ugraphic; diff --git a/src/net/sourceforge/plantuml/ugraphic/ColorMapperMonochrome.java b/src/net/sourceforge/plantuml/ugraphic/ColorMapperMonochrome.java index d7d32f8aa..32232875e 100644 --- a/src/net/sourceforge/plantuml/ugraphic/ColorMapperMonochrome.java +++ b/src/net/sourceforge/plantuml/ugraphic/ColorMapperMonochrome.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4912 $ * */ package net.sourceforge.plantuml.ugraphic; diff --git a/src/net/sourceforge/plantuml/ugraphic/ColorMapperTransparentWrapper.java b/src/net/sourceforge/plantuml/ugraphic/ColorMapperTransparentWrapper.java index b299e0099..7e2f5ebe5 100644 --- a/src/net/sourceforge/plantuml/ugraphic/ColorMapperTransparentWrapper.java +++ b/src/net/sourceforge/plantuml/ugraphic/ColorMapperTransparentWrapper.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4912 $ * */ package net.sourceforge.plantuml.ugraphic; diff --git a/src/net/sourceforge/plantuml/ugraphic/CompressionTransform.java b/src/net/sourceforge/plantuml/ugraphic/CompressionTransform.java index 1117bb269..7fa06e3c8 100644 --- a/src/net/sourceforge/plantuml/ugraphic/CompressionTransform.java +++ b/src/net/sourceforge/plantuml/ugraphic/CompressionTransform.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 7696 $ * */ package net.sourceforge.plantuml.ugraphic; diff --git a/src/net/sourceforge/plantuml/ugraphic/FontChecker.java b/src/net/sourceforge/plantuml/ugraphic/FontChecker.java index 3246563c8..803b0e225 100644 --- a/src/net/sourceforge/plantuml/ugraphic/FontChecker.java +++ b/src/net/sourceforge/plantuml/ugraphic/FontChecker.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3837 $ * */ package net.sourceforge.plantuml.ugraphic; diff --git a/src/net/sourceforge/plantuml/ugraphic/ImageBuilder.java b/src/net/sourceforge/plantuml/ugraphic/ImageBuilder.java index 33d71c375..1f0645d4d 100644 --- a/src/net/sourceforge/plantuml/ugraphic/ImageBuilder.java +++ b/src/net/sourceforge/plantuml/ugraphic/ImageBuilder.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 13805 $ * */ package net.sourceforge.plantuml.ugraphic; @@ -70,6 +67,7 @@ import net.sourceforge.plantuml.graphic.HtmlColor; import net.sourceforge.plantuml.graphic.HtmlColorGradient; import net.sourceforge.plantuml.graphic.HtmlColorSimple; import net.sourceforge.plantuml.graphic.HtmlColorTransparent; +import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlockUtils; import net.sourceforge.plantuml.graphic.UDrawable; import net.sourceforge.plantuml.mjpeg.MJPEGGenerator; @@ -116,16 +114,16 @@ public class ImageBuilder { public ImageData writeImageTOBEMOVED(FileFormatOption fileFormatOption, OutputStream os) throws IOException { final FileFormat fileFormat = fileFormatOption.getFileFormat(); if (fileFormat == FileFormat.MJPEG) { - return writeImageMjpeg(os); + return writeImageMjpeg(os, fileFormat.getDefaultStringBounder()); } else if (fileFormat == FileFormat.ANIMATED_GIF) { - return writeImageAnimatedGif(os); + return writeImageAnimatedGif(os, fileFormat.getDefaultStringBounder()); } return writeImageInternal(fileFormatOption, os, animation); } private ImageData writeImageInternal(FileFormatOption fileFormatOption, OutputStream os, Animation animationArg) throws IOException { - Dimension2D dim = getFinalDimension(); + Dimension2D dim = getFinalDimension(fileFormatOption.getDefaultStringBounder()); double dx = 0; double dy = 0; if (animationArg != null) { @@ -154,8 +152,8 @@ public class ImageBuilder { return new ImageDataSimple(dim); } - public Dimension2D getFinalDimension() { - final LimitFinder limitFinder = new LimitFinder(TextBlockUtils.getDummyStringBounder(), true); + public Dimension2D getFinalDimension(StringBounder stringBounder) { + final LimitFinder limitFinder = new LimitFinder(stringBounder, true); udrawable.drawU(limitFinder); Dimension2D dim = new Dimension2DDouble(limitFinder.getMaxX() + 1 + margin1 + margin2, limitFinder.getMaxY() + 1 + margin1 + margin2); @@ -173,9 +171,9 @@ public class ImageBuilder { } } - private ImageData writeImageMjpeg(OutputStream os) throws IOException { + private ImageData writeImageMjpeg(OutputStream os, StringBounder stringBounder) throws IOException { - final LimitFinder limitFinder = new LimitFinder(TextBlockUtils.getDummyStringBounder(), true); + final LimitFinder limitFinder = new LimitFinder(stringBounder, true); udrawable.drawU(limitFinder); final Dimension2D dim = new Dimension2DDouble(limitFinder.getMaxX() + 1 + margin1 + margin2, limitFinder.getMaxY() + 1 + margin1 + margin2); @@ -204,9 +202,9 @@ public class ImageBuilder { } - private ImageData writeImageAnimatedGif(OutputStream os) throws IOException { + private ImageData writeImageAnimatedGif(OutputStream os, StringBounder stringBounder) throws IOException { - final LimitFinder limitFinder = new LimitFinder(TextBlockUtils.getDummyStringBounder(), true); + final LimitFinder limitFinder = new LimitFinder(stringBounder, true); udrawable.drawU(limitFinder); final Dimension2D dim = new Dimension2DDouble(limitFinder.getMaxX() + 1 + margin1 + margin2, limitFinder.getMaxY() + 1 + margin1 + margin2); diff --git a/src/net/sourceforge/plantuml/ugraphic/InflaterSet.java b/src/net/sourceforge/plantuml/ugraphic/InflaterSet.java index 7ea0da171..edd24fa15 100644 --- a/src/net/sourceforge/plantuml/ugraphic/InflaterSet.java +++ b/src/net/sourceforge/plantuml/ugraphic/InflaterSet.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 7696 $ * */ package net.sourceforge.plantuml.ugraphic; diff --git a/src/net/sourceforge/plantuml/ugraphic/LimitFinder.java b/src/net/sourceforge/plantuml/ugraphic/LimitFinder.java index 123f34adc..15fe50ade 100644 --- a/src/net/sourceforge/plantuml/ugraphic/LimitFinder.java +++ b/src/net/sourceforge/plantuml/ugraphic/LimitFinder.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5183 $ * */ package net.sourceforge.plantuml.ugraphic; @@ -121,6 +118,8 @@ public class LimitFinder implements UGraphic { drawDotPath(x, y, (DotPath) shape); } else if (shape instanceof UImage) { drawImage(x, y, (UImage) shape); + } else if (shape instanceof UImageSvg) { + drawImageSvg(x, y, (UImageSvg) shape); } else if (shape instanceof UComment) { } else if (shape instanceof UEmpty) { drawEmpty(x, y, (UEmpty) shape); @@ -177,6 +176,11 @@ public class LimitFinder implements UGraphic { addPoint(x + shape.getWidth(), y + shape.getHeight()); } + private void drawImageSvg(double x, double y, UImageSvg shape) { + addPoint(x, y); + addPoint(x + shape.getWidth(), y + shape.getHeight()); + } + private void drawEllipse(double x, double y, UEllipse shape) { addPoint(x, y); addPoint(x + shape.getWidth(), y + shape.getHeight()); diff --git a/src/net/sourceforge/plantuml/ugraphic/MinMax.java b/src/net/sourceforge/plantuml/ugraphic/MinMax.java index ab4652fd8..ec4f30ab3 100644 --- a/src/net/sourceforge/plantuml/ugraphic/MinMax.java +++ b/src/net/sourceforge/plantuml/ugraphic/MinMax.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5183 $ * */ package net.sourceforge.plantuml.ugraphic; diff --git a/src/net/sourceforge/plantuml/ugraphic/MinMaxMutable.java b/src/net/sourceforge/plantuml/ugraphic/MinMaxMutable.java index d81e89258..43d16bf33 100644 --- a/src/net/sourceforge/plantuml/ugraphic/MinMaxMutable.java +++ b/src/net/sourceforge/plantuml/ugraphic/MinMaxMutable.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5183 $ * */ package net.sourceforge.plantuml.ugraphic; diff --git a/src/net/sourceforge/plantuml/ugraphic/PlacementStrategy.java b/src/net/sourceforge/plantuml/ugraphic/PlacementStrategy.java index 7f124c205..e17ee22eb 100644 --- a/src/net/sourceforge/plantuml/ugraphic/PlacementStrategy.java +++ b/src/net/sourceforge/plantuml/ugraphic/PlacementStrategy.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3837 $ * */ package net.sourceforge.plantuml.ugraphic; diff --git a/src/net/sourceforge/plantuml/ugraphic/PlacementStrategyVisibility.java b/src/net/sourceforge/plantuml/ugraphic/PlacementStrategyVisibility.java index 9d119dfbe..7cf51bd0b 100644 --- a/src/net/sourceforge/plantuml/ugraphic/PlacementStrategyVisibility.java +++ b/src/net/sourceforge/plantuml/ugraphic/PlacementStrategyVisibility.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3837 $ * */ package net.sourceforge.plantuml.ugraphic; diff --git a/src/net/sourceforge/plantuml/ugraphic/PlacementStrategyX1X2.java b/src/net/sourceforge/plantuml/ugraphic/PlacementStrategyX1X2.java index ef07ec069..a31996c18 100644 --- a/src/net/sourceforge/plantuml/ugraphic/PlacementStrategyX1X2.java +++ b/src/net/sourceforge/plantuml/ugraphic/PlacementStrategyX1X2.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3837 $ * */ package net.sourceforge.plantuml.ugraphic; diff --git a/src/net/sourceforge/plantuml/ugraphic/PlacementStrategyX1Y2Y3.java b/src/net/sourceforge/plantuml/ugraphic/PlacementStrategyX1Y2Y3.java index 9916f1197..ac163469f 100644 --- a/src/net/sourceforge/plantuml/ugraphic/PlacementStrategyX1Y2Y3.java +++ b/src/net/sourceforge/plantuml/ugraphic/PlacementStrategyX1Y2Y3.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3837 $ * */ package net.sourceforge.plantuml.ugraphic; diff --git a/src/net/sourceforge/plantuml/ugraphic/PlacementStrategyY1Y2.java b/src/net/sourceforge/plantuml/ugraphic/PlacementStrategyY1Y2.java index 80ed423a7..80b3c4b3c 100644 --- a/src/net/sourceforge/plantuml/ugraphic/PlacementStrategyY1Y2.java +++ b/src/net/sourceforge/plantuml/ugraphic/PlacementStrategyY1Y2.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3837 $ * */ package net.sourceforge.plantuml.ugraphic; diff --git a/src/net/sourceforge/plantuml/ugraphic/PlacementStrategyY1Y2Center.java b/src/net/sourceforge/plantuml/ugraphic/PlacementStrategyY1Y2Center.java index 6d05d7609..c60338cdf 100644 --- a/src/net/sourceforge/plantuml/ugraphic/PlacementStrategyY1Y2Center.java +++ b/src/net/sourceforge/plantuml/ugraphic/PlacementStrategyY1Y2Center.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3837 $ * */ package net.sourceforge.plantuml.ugraphic; diff --git a/src/net/sourceforge/plantuml/ugraphic/PlacementStrategyY1Y2Left.java b/src/net/sourceforge/plantuml/ugraphic/PlacementStrategyY1Y2Left.java index 7020c2419..bb8f16c9c 100644 --- a/src/net/sourceforge/plantuml/ugraphic/PlacementStrategyY1Y2Left.java +++ b/src/net/sourceforge/plantuml/ugraphic/PlacementStrategyY1Y2Left.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3837 $ * */ package net.sourceforge.plantuml.ugraphic; diff --git a/src/net/sourceforge/plantuml/ugraphic/Scalable.java b/src/net/sourceforge/plantuml/ugraphic/Scalable.java index 018b3c55b..f603629b0 100644 --- a/src/net/sourceforge/plantuml/ugraphic/Scalable.java +++ b/src/net/sourceforge/plantuml/ugraphic/Scalable.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 12235 $ * */ package net.sourceforge.plantuml.ugraphic; diff --git a/src/net/sourceforge/plantuml/ugraphic/ShadowManager.java b/src/net/sourceforge/plantuml/ugraphic/ShadowManager.java index 1df12ff8b..936ee16b4 100644 --- a/src/net/sourceforge/plantuml/ugraphic/ShadowManager.java +++ b/src/net/sourceforge/plantuml/ugraphic/ShadowManager.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6590 $ * */ package net.sourceforge.plantuml.ugraphic; diff --git a/src/net/sourceforge/plantuml/ugraphic/Shadowable.java b/src/net/sourceforge/plantuml/ugraphic/Shadowable.java index be59a7fc9..c17ae6391 100644 --- a/src/net/sourceforge/plantuml/ugraphic/Shadowable.java +++ b/src/net/sourceforge/plantuml/ugraphic/Shadowable.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * diff --git a/src/net/sourceforge/plantuml/ugraphic/Slot.java b/src/net/sourceforge/plantuml/ugraphic/Slot.java index 74a4cc729..91e4d33c7 100644 --- a/src/net/sourceforge/plantuml/ugraphic/Slot.java +++ b/src/net/sourceforge/plantuml/ugraphic/Slot.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 7696 $ * */ package net.sourceforge.plantuml.ugraphic; diff --git a/src/net/sourceforge/plantuml/ugraphic/SlotFinder.java b/src/net/sourceforge/plantuml/ugraphic/SlotFinder.java index 9b55ab0b0..fdd1ba90f 100644 --- a/src/net/sourceforge/plantuml/ugraphic/SlotFinder.java +++ b/src/net/sourceforge/plantuml/ugraphic/SlotFinder.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5183 $ * */ package net.sourceforge.plantuml.ugraphic; diff --git a/src/net/sourceforge/plantuml/ugraphic/SlotFinderX.java b/src/net/sourceforge/plantuml/ugraphic/SlotFinderX.java index 2a8f37c12..f57f327b3 100644 --- a/src/net/sourceforge/plantuml/ugraphic/SlotFinderX.java +++ b/src/net/sourceforge/plantuml/ugraphic/SlotFinderX.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5183 $ * */ package net.sourceforge.plantuml.ugraphic; diff --git a/src/net/sourceforge/plantuml/ugraphic/SlotSet.java b/src/net/sourceforge/plantuml/ugraphic/SlotSet.java index 04cc8dadd..351d972dc 100644 --- a/src/net/sourceforge/plantuml/ugraphic/SlotSet.java +++ b/src/net/sourceforge/plantuml/ugraphic/SlotSet.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 7696 $ * */ package net.sourceforge.plantuml.ugraphic; diff --git a/src/net/sourceforge/plantuml/ugraphic/TextBlockInEllipse.java b/src/net/sourceforge/plantuml/ugraphic/TextBlockInEllipse.java index dea1f81c5..f0f6d381b 100644 --- a/src/net/sourceforge/plantuml/ugraphic/TextBlockInEllipse.java +++ b/src/net/sourceforge/plantuml/ugraphic/TextBlockInEllipse.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 7715 $ * */ package net.sourceforge.plantuml.ugraphic; diff --git a/src/net/sourceforge/plantuml/ugraphic/TextLimitFinder.java b/src/net/sourceforge/plantuml/ugraphic/TextLimitFinder.java index 56a3129ef..8d9f8348f 100644 --- a/src/net/sourceforge/plantuml/ugraphic/TextLimitFinder.java +++ b/src/net/sourceforge/plantuml/ugraphic/TextLimitFinder.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5183 $ * */ package net.sourceforge.plantuml.ugraphic; diff --git a/src/net/sourceforge/plantuml/ugraphic/UAntiAliasing.java b/src/net/sourceforge/plantuml/ugraphic/UAntiAliasing.java index 1b2e44846..6d13f8fb7 100644 --- a/src/net/sourceforge/plantuml/ugraphic/UAntiAliasing.java +++ b/src/net/sourceforge/plantuml/ugraphic/UAntiAliasing.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * diff --git a/src/net/sourceforge/plantuml/ugraphic/UCenteredCharacter.java b/src/net/sourceforge/plantuml/ugraphic/UCenteredCharacter.java index 2bbab7a7a..b372e8851 100644 --- a/src/net/sourceforge/plantuml/ugraphic/UCenteredCharacter.java +++ b/src/net/sourceforge/plantuml/ugraphic/UCenteredCharacter.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 9786 $ * */ package net.sourceforge.plantuml.ugraphic; diff --git a/src/net/sourceforge/plantuml/ugraphic/UChange.java b/src/net/sourceforge/plantuml/ugraphic/UChange.java index 36c6e0e1f..2de81cde7 100644 --- a/src/net/sourceforge/plantuml/ugraphic/UChange.java +++ b/src/net/sourceforge/plantuml/ugraphic/UChange.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 9786 $ * */ package net.sourceforge.plantuml.ugraphic; diff --git a/src/net/sourceforge/plantuml/ugraphic/UChangeBackColor.java b/src/net/sourceforge/plantuml/ugraphic/UChangeBackColor.java index ff1b4b424..15f8733b2 100644 --- a/src/net/sourceforge/plantuml/ugraphic/UChangeBackColor.java +++ b/src/net/sourceforge/plantuml/ugraphic/UChangeBackColor.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 10054 $ * */ package net.sourceforge.plantuml.ugraphic; diff --git a/src/net/sourceforge/plantuml/ugraphic/UChangeColor.java b/src/net/sourceforge/plantuml/ugraphic/UChangeColor.java index 9718bbf96..d1f731c59 100644 --- a/src/net/sourceforge/plantuml/ugraphic/UChangeColor.java +++ b/src/net/sourceforge/plantuml/ugraphic/UChangeColor.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 10054 $ * */ package net.sourceforge.plantuml.ugraphic; diff --git a/src/net/sourceforge/plantuml/ugraphic/UClip.java b/src/net/sourceforge/plantuml/ugraphic/UClip.java index 10edbffda..253a765d1 100644 --- a/src/net/sourceforge/plantuml/ugraphic/UClip.java +++ b/src/net/sourceforge/plantuml/ugraphic/UClip.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * @@ -32,6 +30,7 @@ package net.sourceforge.plantuml.ugraphic; import java.awt.geom.Line2D; +import java.awt.geom.Point2D; import java.awt.geom.Rectangle2D; public class UClip implements UChange { @@ -56,12 +55,11 @@ public class UClip implements UChange { public UClip translate(double dx, double dy) { return new UClip(x + dx, y + dy, width, height); } - + public UClip translate(UTranslate translate) { return translate(translate.getDx(), translate.getDy()); } - public final double getX() { return x; } @@ -78,6 +76,10 @@ public class UClip implements UChange { return height; } + public boolean isInside(Point2D pt) { + return isInside(pt.getX(), pt.getY()); + } + public boolean isInside(double xp, double yp) { if (xp < x) { assert getClippedX(xp) != xp; diff --git a/src/net/sourceforge/plantuml/ugraphic/UComment.java b/src/net/sourceforge/plantuml/ugraphic/UComment.java index 89416af8d..4c4c778c6 100644 --- a/src/net/sourceforge/plantuml/ugraphic/UComment.java +++ b/src/net/sourceforge/plantuml/ugraphic/UComment.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.ugraphic; diff --git a/src/net/sourceforge/plantuml/ugraphic/UDriver.java b/src/net/sourceforge/plantuml/ugraphic/UDriver.java index 03f8294f9..51be49a86 100644 --- a/src/net/sourceforge/plantuml/ugraphic/UDriver.java +++ b/src/net/sourceforge/plantuml/ugraphic/UDriver.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.ugraphic; diff --git a/src/net/sourceforge/plantuml/ugraphic/UEllipse.java b/src/net/sourceforge/plantuml/ugraphic/UEllipse.java index 829759e22..c5b86980d 100644 --- a/src/net/sourceforge/plantuml/ugraphic/UEllipse.java +++ b/src/net/sourceforge/plantuml/ugraphic/UEllipse.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.ugraphic; diff --git a/src/net/sourceforge/plantuml/ugraphic/UEmpty.java b/src/net/sourceforge/plantuml/ugraphic/UEmpty.java index ffd7fc868..b3d6dfc67 100644 --- a/src/net/sourceforge/plantuml/ugraphic/UEmpty.java +++ b/src/net/sourceforge/plantuml/ugraphic/UEmpty.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * diff --git a/src/net/sourceforge/plantuml/ugraphic/UFont.java b/src/net/sourceforge/plantuml/ugraphic/UFont.java index 2752389bc..175a10e77 100644 --- a/src/net/sourceforge/plantuml/ugraphic/UFont.java +++ b/src/net/sourceforge/plantuml/ugraphic/UFont.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3837 $ * */ package net.sourceforge.plantuml.ugraphic; diff --git a/src/net/sourceforge/plantuml/ugraphic/UFontContext.java b/src/net/sourceforge/plantuml/ugraphic/UFontContext.java index 92426000f..7923c5560 100644 --- a/src/net/sourceforge/plantuml/ugraphic/UFontContext.java +++ b/src/net/sourceforge/plantuml/ugraphic/UFontContext.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3837 $ * */ package net.sourceforge.plantuml.ugraphic; diff --git a/src/net/sourceforge/plantuml/ugraphic/UFontUser.java b/src/net/sourceforge/plantuml/ugraphic/UFontUser.java index 8855daf62..61d047bdf 100644 --- a/src/net/sourceforge/plantuml/ugraphic/UFontUser.java +++ b/src/net/sourceforge/plantuml/ugraphic/UFontUser.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3837 $ * */ package net.sourceforge.plantuml.ugraphic; diff --git a/src/net/sourceforge/plantuml/ugraphic/UGraphic.java b/src/net/sourceforge/plantuml/ugraphic/UGraphic.java index 28a4741fd..cd2e7ddd8 100644 --- a/src/net/sourceforge/plantuml/ugraphic/UGraphic.java +++ b/src/net/sourceforge/plantuml/ugraphic/UGraphic.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.ugraphic; diff --git a/src/net/sourceforge/plantuml/ugraphic/UGraphic2.java b/src/net/sourceforge/plantuml/ugraphic/UGraphic2.java index 4c7011b1b..f58931d17 100644 --- a/src/net/sourceforge/plantuml/ugraphic/UGraphic2.java +++ b/src/net/sourceforge/plantuml/ugraphic/UGraphic2.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 13805 $ * */ package net.sourceforge.plantuml.ugraphic; diff --git a/src/net/sourceforge/plantuml/ugraphic/UGraphicCompress.java b/src/net/sourceforge/plantuml/ugraphic/UGraphicCompress.java index 120bbe858..152e83425 100644 --- a/src/net/sourceforge/plantuml/ugraphic/UGraphicCompress.java +++ b/src/net/sourceforge/plantuml/ugraphic/UGraphicCompress.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5183 $ * */ package net.sourceforge.plantuml.ugraphic; diff --git a/src/net/sourceforge/plantuml/ugraphic/UGraphicCompress2.java b/src/net/sourceforge/plantuml/ugraphic/UGraphicCompress2.java index bc5c872e1..786e912c4 100644 --- a/src/net/sourceforge/plantuml/ugraphic/UGraphicCompress2.java +++ b/src/net/sourceforge/plantuml/ugraphic/UGraphicCompress2.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5183 $ * */ package net.sourceforge.plantuml.ugraphic; diff --git a/src/net/sourceforge/plantuml/ugraphic/UGraphicFilter.java b/src/net/sourceforge/plantuml/ugraphic/UGraphicFilter.java index 90f30e94f..f1d0c2c71 100644 --- a/src/net/sourceforge/plantuml/ugraphic/UGraphicFilter.java +++ b/src/net/sourceforge/plantuml/ugraphic/UGraphicFilter.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5183 $ * */ package net.sourceforge.plantuml.ugraphic; diff --git a/src/net/sourceforge/plantuml/ugraphic/UGraphicNull.java b/src/net/sourceforge/plantuml/ugraphic/UGraphicNull.java index 0fdc41169..3375665d5 100644 --- a/src/net/sourceforge/plantuml/ugraphic/UGraphicNull.java +++ b/src/net/sourceforge/plantuml/ugraphic/UGraphicNull.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 13989 $ * */ package net.sourceforge.plantuml.ugraphic; @@ -37,6 +34,7 @@ import java.io.IOException; import java.io.OutputStream; import net.sourceforge.plantuml.EnsureVisible; +import net.sourceforge.plantuml.FileFormat; import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.graphic.StringBounder; import net.sourceforge.plantuml.graphic.TextBlockUtils; @@ -57,7 +55,7 @@ public class UGraphicNull extends AbstractUGraphic implements EnsureVisi } public StringBounder getStringBounder() { - return TextBlockUtils.getDummyStringBounder(); + return FileFormat.PNG.getDefaultStringBounder(); } public void startUrl(Url url) { diff --git a/src/net/sourceforge/plantuml/ugraphic/UGraphicStencil.java b/src/net/sourceforge/plantuml/ugraphic/UGraphicStencil.java index 083a99062..013643fff 100644 --- a/src/net/sourceforge/plantuml/ugraphic/UGraphicStencil.java +++ b/src/net/sourceforge/plantuml/ugraphic/UGraphicStencil.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8033 $ * */ package net.sourceforge.plantuml.ugraphic; diff --git a/src/net/sourceforge/plantuml/ugraphic/UGraphicUtils.java b/src/net/sourceforge/plantuml/ugraphic/UGraphicUtils.java index 60667b094..bd05310ef 100644 --- a/src/net/sourceforge/plantuml/ugraphic/UGraphicUtils.java +++ b/src/net/sourceforge/plantuml/ugraphic/UGraphicUtils.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4129 $ * */ package net.sourceforge.plantuml.ugraphic; diff --git a/src/net/sourceforge/plantuml/ugraphic/UHidden.java b/src/net/sourceforge/plantuml/ugraphic/UHidden.java index c9318ebe6..a64474c9f 100644 --- a/src/net/sourceforge/plantuml/ugraphic/UHidden.java +++ b/src/net/sourceforge/plantuml/ugraphic/UHidden.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * diff --git a/src/net/sourceforge/plantuml/ugraphic/UHorizontalLine.java b/src/net/sourceforge/plantuml/ugraphic/UHorizontalLine.java index c93ca50ef..fa3c287e1 100644 --- a/src/net/sourceforge/plantuml/ugraphic/UHorizontalLine.java +++ b/src/net/sourceforge/plantuml/ugraphic/UHorizontalLine.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 8126 $ * */ package net.sourceforge.plantuml.ugraphic; diff --git a/src/net/sourceforge/plantuml/ugraphic/UImage.java b/src/net/sourceforge/plantuml/ugraphic/UImage.java index 6dd2df8bd..bd0b0b0d4 100644 --- a/src/net/sourceforge/plantuml/ugraphic/UImage.java +++ b/src/net/sourceforge/plantuml/ugraphic/UImage.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19570 $ * */ package net.sourceforge.plantuml.ugraphic; diff --git a/src/net/sourceforge/plantuml/ugraphic/UImageSvg.java b/src/net/sourceforge/plantuml/ugraphic/UImageSvg.java index dd3f3b046..7a9989fc1 100644 --- a/src/net/sourceforge/plantuml/ugraphic/UImageSvg.java +++ b/src/net/sourceforge/plantuml/ugraphic/UImageSvg.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 9786 $ * */ package net.sourceforge.plantuml.ugraphic; diff --git a/src/net/sourceforge/plantuml/ugraphic/ULayoutGroup.java b/src/net/sourceforge/plantuml/ugraphic/ULayoutGroup.java index e0a1af8d2..8849f8e86 100644 --- a/src/net/sourceforge/plantuml/ugraphic/ULayoutGroup.java +++ b/src/net/sourceforge/plantuml/ugraphic/ULayoutGroup.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3837 $ * */ package net.sourceforge.plantuml.ugraphic; diff --git a/src/net/sourceforge/plantuml/ugraphic/ULine.java b/src/net/sourceforge/plantuml/ugraphic/ULine.java index ebcee7f4c..2cddedd88 100644 --- a/src/net/sourceforge/plantuml/ugraphic/ULine.java +++ b/src/net/sourceforge/plantuml/ugraphic/ULine.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.ugraphic; diff --git a/src/net/sourceforge/plantuml/ugraphic/UMotif.java b/src/net/sourceforge/plantuml/ugraphic/UMotif.java index 60ba9aa89..87031a326 100644 --- a/src/net/sourceforge/plantuml/ugraphic/UMotif.java +++ b/src/net/sourceforge/plantuml/ugraphic/UMotif.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4206 $ * */ package net.sourceforge.plantuml.ugraphic; diff --git a/src/net/sourceforge/plantuml/ugraphic/UParam.java b/src/net/sourceforge/plantuml/ugraphic/UParam.java index 10e8e52d3..bf6b4b942 100644 --- a/src/net/sourceforge/plantuml/ugraphic/UParam.java +++ b/src/net/sourceforge/plantuml/ugraphic/UParam.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.ugraphic; diff --git a/src/net/sourceforge/plantuml/ugraphic/UParamNull.java b/src/net/sourceforge/plantuml/ugraphic/UParamNull.java index 3c6ec8bc3..f98787988 100644 --- a/src/net/sourceforge/plantuml/ugraphic/UParamNull.java +++ b/src/net/sourceforge/plantuml/ugraphic/UParamNull.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 10203 $ * */ package net.sourceforge.plantuml.ugraphic; diff --git a/src/net/sourceforge/plantuml/ugraphic/UPath.java b/src/net/sourceforge/plantuml/ugraphic/UPath.java index b4b2ae871..dcf37a3b8 100644 --- a/src/net/sourceforge/plantuml/ugraphic/UPath.java +++ b/src/net/sourceforge/plantuml/ugraphic/UPath.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3837 $ * */ package net.sourceforge.plantuml.ugraphic; diff --git a/src/net/sourceforge/plantuml/ugraphic/UPattern.java b/src/net/sourceforge/plantuml/ugraphic/UPattern.java index 234c3eac1..0a9ad0876 100644 --- a/src/net/sourceforge/plantuml/ugraphic/UPattern.java +++ b/src/net/sourceforge/plantuml/ugraphic/UPattern.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 10113 $ * */ package net.sourceforge.plantuml.ugraphic; diff --git a/src/net/sourceforge/plantuml/ugraphic/UPixel.java b/src/net/sourceforge/plantuml/ugraphic/UPixel.java index 59caf7889..8bf2afb52 100644 --- a/src/net/sourceforge/plantuml/ugraphic/UPixel.java +++ b/src/net/sourceforge/plantuml/ugraphic/UPixel.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4681 $ * */ package net.sourceforge.plantuml.ugraphic; diff --git a/src/net/sourceforge/plantuml/ugraphic/UPolygon.java b/src/net/sourceforge/plantuml/ugraphic/UPolygon.java index c1b76f38e..ea0954d41 100644 --- a/src/net/sourceforge/plantuml/ugraphic/UPolygon.java +++ b/src/net/sourceforge/plantuml/ugraphic/UPolygon.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 20186 $ * */ package net.sourceforge.plantuml.ugraphic; diff --git a/src/net/sourceforge/plantuml/ugraphic/URectangle.java b/src/net/sourceforge/plantuml/ugraphic/URectangle.java index 42dbeafa0..1f28e757e 100644 --- a/src/net/sourceforge/plantuml/ugraphic/URectangle.java +++ b/src/net/sourceforge/plantuml/ugraphic/URectangle.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * diff --git a/src/net/sourceforge/plantuml/ugraphic/UScale.java b/src/net/sourceforge/plantuml/ugraphic/UScale.java index dbbb6b843..1d72ec1a6 100644 --- a/src/net/sourceforge/plantuml/ugraphic/UScale.java +++ b/src/net/sourceforge/plantuml/ugraphic/UScale.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 9786 $ * */ package net.sourceforge.plantuml.ugraphic; diff --git a/src/net/sourceforge/plantuml/ugraphic/USegment.java b/src/net/sourceforge/plantuml/ugraphic/USegment.java index fbeeab94a..47a210e76 100644 --- a/src/net/sourceforge/plantuml/ugraphic/USegment.java +++ b/src/net/sourceforge/plantuml/ugraphic/USegment.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3837 $ * */ package net.sourceforge.plantuml.ugraphic; diff --git a/src/net/sourceforge/plantuml/ugraphic/USegmentType.java b/src/net/sourceforge/plantuml/ugraphic/USegmentType.java index 2b7818201..80af6f7af 100644 --- a/src/net/sourceforge/plantuml/ugraphic/USegmentType.java +++ b/src/net/sourceforge/plantuml/ugraphic/USegmentType.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3837 $ * */ package net.sourceforge.plantuml.ugraphic; diff --git a/src/net/sourceforge/plantuml/ugraphic/UShape.java b/src/net/sourceforge/plantuml/ugraphic/UShape.java index e605fee1d..a77dc3c43 100644 --- a/src/net/sourceforge/plantuml/ugraphic/UShape.java +++ b/src/net/sourceforge/plantuml/ugraphic/UShape.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.ugraphic; diff --git a/src/net/sourceforge/plantuml/ugraphic/UStroke.java b/src/net/sourceforge/plantuml/ugraphic/UStroke.java index 4aa279f54..4aac02548 100644 --- a/src/net/sourceforge/plantuml/ugraphic/UStroke.java +++ b/src/net/sourceforge/plantuml/ugraphic/UStroke.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.ugraphic; diff --git a/src/net/sourceforge/plantuml/ugraphic/UText.java b/src/net/sourceforge/plantuml/ugraphic/UText.java index 05d7fd770..4910bb13c 100644 --- a/src/net/sourceforge/plantuml/ugraphic/UText.java +++ b/src/net/sourceforge/plantuml/ugraphic/UText.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.ugraphic; diff --git a/src/net/sourceforge/plantuml/ugraphic/UTranslate.java b/src/net/sourceforge/plantuml/ugraphic/UTranslate.java index 2f13c5269..018b7656b 100644 --- a/src/net/sourceforge/plantuml/ugraphic/UTranslate.java +++ b/src/net/sourceforge/plantuml/ugraphic/UTranslate.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 9786 $ * */ package net.sourceforge.plantuml.ugraphic; diff --git a/src/net/sourceforge/plantuml/ugraphic/arc/ExtendedGeneralPath.java b/src/net/sourceforge/plantuml/ugraphic/arc/ExtendedGeneralPath.java index d1b880bf5..c36c7e614 100644 --- a/src/net/sourceforge/plantuml/ugraphic/arc/ExtendedGeneralPath.java +++ b/src/net/sourceforge/plantuml/ugraphic/arc/ExtendedGeneralPath.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Thierry Kormann * - * Revision $Revision: 3837 $ * */ package net.sourceforge.plantuml.ugraphic.arc; diff --git a/src/net/sourceforge/plantuml/ugraphic/arc/ExtendedPathIterator.java b/src/net/sourceforge/plantuml/ugraphic/arc/ExtendedPathIterator.java index b9ceb4c36..5f83a0729 100644 --- a/src/net/sourceforge/plantuml/ugraphic/arc/ExtendedPathIterator.java +++ b/src/net/sourceforge/plantuml/ugraphic/arc/ExtendedPathIterator.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Thomas DeWeese * - * Revision $Revision: 3837 $ * */ package net.sourceforge.plantuml.ugraphic.arc; diff --git a/src/net/sourceforge/plantuml/ugraphic/crossing/UGraphicCrossing.java b/src/net/sourceforge/plantuml/ugraphic/crossing/UGraphicCrossing.java index 3977b6341..f7b3077ad 100644 --- a/src/net/sourceforge/plantuml/ugraphic/crossing/UGraphicCrossing.java +++ b/src/net/sourceforge/plantuml/ugraphic/crossing/UGraphicCrossing.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Adrian Vogt * diff --git a/src/net/sourceforge/plantuml/ugraphic/eps/DriverCenteredCharacterEps.java b/src/net/sourceforge/plantuml/ugraphic/eps/DriverCenteredCharacterEps.java index fe26b72de..41f0bb8fe 100644 --- a/src/net/sourceforge/plantuml/ugraphic/eps/DriverCenteredCharacterEps.java +++ b/src/net/sourceforge/plantuml/ugraphic/eps/DriverCenteredCharacterEps.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * diff --git a/src/net/sourceforge/plantuml/ugraphic/eps/DriverDotPathEps.java b/src/net/sourceforge/plantuml/ugraphic/eps/DriverDotPathEps.java index 0064fef2b..1ad7799d2 100644 --- a/src/net/sourceforge/plantuml/ugraphic/eps/DriverDotPathEps.java +++ b/src/net/sourceforge/plantuml/ugraphic/eps/DriverDotPathEps.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3837 $ * */ package net.sourceforge.plantuml.ugraphic.eps; diff --git a/src/net/sourceforge/plantuml/ugraphic/eps/DriverEllipseEps.java b/src/net/sourceforge/plantuml/ugraphic/eps/DriverEllipseEps.java index 97f4dfb25..d5febc556 100644 --- a/src/net/sourceforge/plantuml/ugraphic/eps/DriverEllipseEps.java +++ b/src/net/sourceforge/plantuml/ugraphic/eps/DriverEllipseEps.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * diff --git a/src/net/sourceforge/plantuml/ugraphic/eps/DriverImageEps.java b/src/net/sourceforge/plantuml/ugraphic/eps/DriverImageEps.java index 6503e401c..55ffabce2 100644 --- a/src/net/sourceforge/plantuml/ugraphic/eps/DriverImageEps.java +++ b/src/net/sourceforge/plantuml/ugraphic/eps/DriverImageEps.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * diff --git a/src/net/sourceforge/plantuml/ugraphic/eps/DriverLineEps.java b/src/net/sourceforge/plantuml/ugraphic/eps/DriverLineEps.java index 790b2373f..a3f6dcd4c 100644 --- a/src/net/sourceforge/plantuml/ugraphic/eps/DriverLineEps.java +++ b/src/net/sourceforge/plantuml/ugraphic/eps/DriverLineEps.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * diff --git a/src/net/sourceforge/plantuml/ugraphic/eps/DriverPathEps.java b/src/net/sourceforge/plantuml/ugraphic/eps/DriverPathEps.java index e968a5775..feb2c6e9c 100644 --- a/src/net/sourceforge/plantuml/ugraphic/eps/DriverPathEps.java +++ b/src/net/sourceforge/plantuml/ugraphic/eps/DriverPathEps.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * diff --git a/src/net/sourceforge/plantuml/ugraphic/eps/DriverPolygonEps.java b/src/net/sourceforge/plantuml/ugraphic/eps/DriverPolygonEps.java index 8f5819e77..4ceaaa916 100644 --- a/src/net/sourceforge/plantuml/ugraphic/eps/DriverPolygonEps.java +++ b/src/net/sourceforge/plantuml/ugraphic/eps/DriverPolygonEps.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * diff --git a/src/net/sourceforge/plantuml/ugraphic/eps/DriverRectangleEps.java b/src/net/sourceforge/plantuml/ugraphic/eps/DriverRectangleEps.java index 4c97c689d..681e66547 100644 --- a/src/net/sourceforge/plantuml/ugraphic/eps/DriverRectangleEps.java +++ b/src/net/sourceforge/plantuml/ugraphic/eps/DriverRectangleEps.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * diff --git a/src/net/sourceforge/plantuml/ugraphic/eps/DriverTextEps.java b/src/net/sourceforge/plantuml/ugraphic/eps/DriverTextEps.java index 2b0e00c54..c286eb1af 100644 --- a/src/net/sourceforge/plantuml/ugraphic/eps/DriverTextEps.java +++ b/src/net/sourceforge/plantuml/ugraphic/eps/DriverTextEps.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * @@ -39,6 +37,7 @@ import java.awt.geom.PathIterator; import java.util.ArrayList; import java.util.List; +import net.sourceforge.plantuml.FileFormat; import net.sourceforge.plantuml.eps.EpsGraphics; import net.sourceforge.plantuml.eps.EpsGraphicsMacroAndText; import net.sourceforge.plantuml.eps.EpsStrategy; @@ -65,7 +64,7 @@ public class DriverTextEps implements UDriver { private final EpsStrategy strategy; public DriverTextEps(ClipContainer clipContainer, EpsStrategy strategy) { - this.stringBounder = TextBlockUtils.getDummyStringBounder(); + this.stringBounder = FileFormat.PNG.getDefaultStringBounder(); this.clipContainer = clipContainer; this.fontRenderContext = TextBlockUtils.getFontRenderContext(); this.strategy = strategy; diff --git a/src/net/sourceforge/plantuml/ugraphic/eps/PathIteratorLimited.java b/src/net/sourceforge/plantuml/ugraphic/eps/PathIteratorLimited.java index d86bfc59d..e86b33c07 100644 --- a/src/net/sourceforge/plantuml/ugraphic/eps/PathIteratorLimited.java +++ b/src/net/sourceforge/plantuml/ugraphic/eps/PathIteratorLimited.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * diff --git a/src/net/sourceforge/plantuml/ugraphic/eps/UGraphicEps.java b/src/net/sourceforge/plantuml/ugraphic/eps/UGraphicEps.java index 1fdab5bd4..bd202c177 100644 --- a/src/net/sourceforge/plantuml/ugraphic/eps/UGraphicEps.java +++ b/src/net/sourceforge/plantuml/ugraphic/eps/UGraphicEps.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * @@ -34,11 +32,11 @@ package net.sourceforge.plantuml.ugraphic.eps; import java.io.IOException; import java.io.OutputStream; +import net.sourceforge.plantuml.FileFormat; import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.eps.EpsGraphics; import net.sourceforge.plantuml.eps.EpsStrategy; import net.sourceforge.plantuml.graphic.StringBounder; -import net.sourceforge.plantuml.graphic.TextBlockUtils; import net.sourceforge.plantuml.graphic.UDrawable; import net.sourceforge.plantuml.posimo.DotPath; import net.sourceforge.plantuml.ugraphic.AbstractCommonUGraphic; @@ -80,7 +78,7 @@ public class UGraphicEps extends AbstractUGraphic implements ClipCo private UGraphicEps(ColorMapper colorMapper, EpsStrategy strategy, EpsGraphics eps) { super(colorMapper, eps); this.strategyTOBEREMOVED = strategy; - this.stringBounder = TextBlockUtils.getDummyStringBounder(); + this.stringBounder = FileFormat.PNG.getDefaultStringBounder(); register(strategy); } diff --git a/src/net/sourceforge/plantuml/ugraphic/g2d/DriverCenteredCharacterG2d.java b/src/net/sourceforge/plantuml/ugraphic/g2d/DriverCenteredCharacterG2d.java index b52eeb389..742112786 100644 --- a/src/net/sourceforge/plantuml/ugraphic/g2d/DriverCenteredCharacterG2d.java +++ b/src/net/sourceforge/plantuml/ugraphic/g2d/DriverCenteredCharacterG2d.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 9786 $ * */ package net.sourceforge.plantuml.ugraphic.g2d; diff --git a/src/net/sourceforge/plantuml/ugraphic/g2d/DriverDotPathG2d.java b/src/net/sourceforge/plantuml/ugraphic/g2d/DriverDotPathG2d.java index 4b67123f6..afd0dec75 100644 --- a/src/net/sourceforge/plantuml/ugraphic/g2d/DriverDotPathG2d.java +++ b/src/net/sourceforge/plantuml/ugraphic/g2d/DriverDotPathG2d.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3837 $ * */ package net.sourceforge.plantuml.ugraphic.g2d; diff --git a/src/net/sourceforge/plantuml/ugraphic/g2d/DriverEllipseG2d.java b/src/net/sourceforge/plantuml/ugraphic/g2d/DriverEllipseG2d.java index b5b035150..4cddfa70e 100644 --- a/src/net/sourceforge/plantuml/ugraphic/g2d/DriverEllipseG2d.java +++ b/src/net/sourceforge/plantuml/ugraphic/g2d/DriverEllipseG2d.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.ugraphic.g2d; diff --git a/src/net/sourceforge/plantuml/ugraphic/g2d/DriverImageG2d.java b/src/net/sourceforge/plantuml/ugraphic/g2d/DriverImageG2d.java index 1cd188ddc..dd3a63312 100644 --- a/src/net/sourceforge/plantuml/ugraphic/g2d/DriverImageG2d.java +++ b/src/net/sourceforge/plantuml/ugraphic/g2d/DriverImageG2d.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.ugraphic.g2d; @@ -39,6 +36,7 @@ import net.sourceforge.plantuml.EnsureVisible; import net.sourceforge.plantuml.ugraphic.ColorMapper; import net.sourceforge.plantuml.ugraphic.UDriver; import net.sourceforge.plantuml.ugraphic.UImage; +import net.sourceforge.plantuml.ugraphic.UImageSvg; import net.sourceforge.plantuml.ugraphic.UParam; import net.sourceforge.plantuml.ugraphic.UShape; @@ -51,6 +49,9 @@ public class DriverImageG2d implements UDriver { } public void draw(UShape ushape, double x, double y, ColorMapper mapper, UParam param, Graphics2D g2d) { + if (ushape instanceof UImageSvg) { + return; + } final UImage shape = (UImage) ushape; visible.ensureVisible(x, y); visible.ensureVisible(x + shape.getWidth(), y + shape.getHeight()); diff --git a/src/net/sourceforge/plantuml/ugraphic/g2d/DriverLineG2d.java b/src/net/sourceforge/plantuml/ugraphic/g2d/DriverLineG2d.java index fac54295a..ccdd48efe 100644 --- a/src/net/sourceforge/plantuml/ugraphic/g2d/DriverLineG2d.java +++ b/src/net/sourceforge/plantuml/ugraphic/g2d/DriverLineG2d.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.ugraphic.g2d; diff --git a/src/net/sourceforge/plantuml/ugraphic/g2d/DriverPathG2d.java b/src/net/sourceforge/plantuml/ugraphic/g2d/DriverPathG2d.java index 24fc87ea7..5bd8941cb 100644 --- a/src/net/sourceforge/plantuml/ugraphic/g2d/DriverPathG2d.java +++ b/src/net/sourceforge/plantuml/ugraphic/g2d/DriverPathG2d.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3837 $ * */ package net.sourceforge.plantuml.ugraphic.g2d; diff --git a/src/net/sourceforge/plantuml/ugraphic/g2d/DriverPathG2dLegacy.java b/src/net/sourceforge/plantuml/ugraphic/g2d/DriverPathG2dLegacy.java index fb49c0ad3..8c2a68b1d 100644 --- a/src/net/sourceforge/plantuml/ugraphic/g2d/DriverPathG2dLegacy.java +++ b/src/net/sourceforge/plantuml/ugraphic/g2d/DriverPathG2dLegacy.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3837 $ * */ package net.sourceforge.plantuml.ugraphic.g2d; diff --git a/src/net/sourceforge/plantuml/ugraphic/g2d/DriverPathOldG2d.java b/src/net/sourceforge/plantuml/ugraphic/g2d/DriverPathOldG2d.java index 123a9a709..e654f5ff9 100644 --- a/src/net/sourceforge/plantuml/ugraphic/g2d/DriverPathOldG2d.java +++ b/src/net/sourceforge/plantuml/ugraphic/g2d/DriverPathOldG2d.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3837 $ * */ package net.sourceforge.plantuml.ugraphic.g2d; diff --git a/src/net/sourceforge/plantuml/ugraphic/g2d/DriverPixelG2d.java b/src/net/sourceforge/plantuml/ugraphic/g2d/DriverPixelG2d.java index 978857c7f..75bfdf213 100644 --- a/src/net/sourceforge/plantuml/ugraphic/g2d/DriverPixelG2d.java +++ b/src/net/sourceforge/plantuml/ugraphic/g2d/DriverPixelG2d.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6576 $ * */ package net.sourceforge.plantuml.ugraphic.g2d; diff --git a/src/net/sourceforge/plantuml/ugraphic/g2d/DriverPolygonG2d.java b/src/net/sourceforge/plantuml/ugraphic/g2d/DriverPolygonG2d.java index a463a77e2..5a038f1c3 100644 --- a/src/net/sourceforge/plantuml/ugraphic/g2d/DriverPolygonG2d.java +++ b/src/net/sourceforge/plantuml/ugraphic/g2d/DriverPolygonG2d.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.ugraphic.g2d; diff --git a/src/net/sourceforge/plantuml/ugraphic/g2d/DriverRectangleG2d.java b/src/net/sourceforge/plantuml/ugraphic/g2d/DriverRectangleG2d.java index 6fce347e5..8b72c7bf8 100644 --- a/src/net/sourceforge/plantuml/ugraphic/g2d/DriverRectangleG2d.java +++ b/src/net/sourceforge/plantuml/ugraphic/g2d/DriverRectangleG2d.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.ugraphic.g2d; diff --git a/src/net/sourceforge/plantuml/ugraphic/g2d/DriverShadowedG2d.java b/src/net/sourceforge/plantuml/ugraphic/g2d/DriverShadowedG2d.java index 751986348..1ebf3f32d 100644 --- a/src/net/sourceforge/plantuml/ugraphic/g2d/DriverShadowedG2d.java +++ b/src/net/sourceforge/plantuml/ugraphic/g2d/DriverShadowedG2d.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6859 $ * */ package net.sourceforge.plantuml.ugraphic.g2d; diff --git a/src/net/sourceforge/plantuml/ugraphic/g2d/DriverTextAsPathG2d.java b/src/net/sourceforge/plantuml/ugraphic/g2d/DriverTextAsPathG2d.java index 4ee9b5098..22317b7db 100644 --- a/src/net/sourceforge/plantuml/ugraphic/g2d/DriverTextAsPathG2d.java +++ b/src/net/sourceforge/plantuml/ugraphic/g2d/DriverTextAsPathG2d.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19267 $ * */ package net.sourceforge.plantuml.ugraphic.g2d; @@ -45,12 +42,12 @@ import java.awt.geom.Rectangle2D; import net.sourceforge.plantuml.Dimension2DDouble; import net.sourceforge.plantuml.EnsureVisible; +import net.sourceforge.plantuml.FileFormat; import net.sourceforge.plantuml.Log; import net.sourceforge.plantuml.graphic.FontConfiguration; import net.sourceforge.plantuml.graphic.FontStyle; import net.sourceforge.plantuml.graphic.HtmlColor; import net.sourceforge.plantuml.graphic.StringBounder; -import net.sourceforge.plantuml.graphic.StringBounderUtils; import net.sourceforge.plantuml.ugraphic.ColorMapper; import net.sourceforge.plantuml.ugraphic.UDriver; import net.sourceforge.plantuml.ugraphic.UFont; @@ -82,7 +79,7 @@ public class DriverTextAsPathG2d implements UDriver { final FontConfiguration fontConfiguration = shape.getFontConfiguration(); final UFont font = fontConfiguration.getFont().scaled(param.getScale()); - final Dimension2D dimBack = calculateDimension(StringBounderUtils.asStringBounder(), font, shape.getText()); + final Dimension2D dimBack = calculateDimension(FileFormat.PNG.getDefaultStringBounder(), font, shape.getText()); if (fontConfiguration.containsStyle(FontStyle.BACKCOLOR)) { final Color extended = mapper.getMappedColor(fontConfiguration.getExtendedColor()); if (extended != null) { @@ -107,14 +104,14 @@ public class DriverTextAsPathG2d implements UDriver { if (extended != null) { g2d.setColor(mapper.getMappedColor(extended)); } - final Dimension2D dim = calculateDimension(StringBounderUtils.asStringBounder(), font, shape.getText()); + final Dimension2D dim = calculateDimension(FileFormat.PNG.getDefaultStringBounder(), font, shape.getText()); final int ypos = (int) (y + 2.5); g2d.setStroke(new BasicStroke((float) 1)); g2d.drawLine((int) x, ypos, (int) (x + dim.getWidth()), ypos); g2d.setStroke(new BasicStroke()); } if (fontConfiguration.containsStyle(FontStyle.WAVE)) { - final Dimension2D dim = calculateDimension(StringBounderUtils.asStringBounder(), font, shape.getText()); + final Dimension2D dim = calculateDimension(FileFormat.PNG.getDefaultStringBounder(), font, shape.getText()); final int ypos = (int) (y + 2.5) - 1; final HtmlColor extended = fontConfiguration.getExtendedColor(); if (extended != null) { @@ -126,7 +123,7 @@ public class DriverTextAsPathG2d implements UDriver { } } if (fontConfiguration.containsStyle(FontStyle.STRIKE)) { - final Dimension2D dim = calculateDimension(StringBounderUtils.asStringBounder(), font, shape.getText()); + final Dimension2D dim = calculateDimension(FileFormat.PNG.getDefaultStringBounder(), font, shape.getText()); final FontMetrics fm = g2d.getFontMetrics(font.getFont()); final int ypos = (int) (y - fm.getDescent() - 0.5); final HtmlColor extended = fontConfiguration.getExtendedColor(); diff --git a/src/net/sourceforge/plantuml/ugraphic/g2d/DriverTextG2d.java b/src/net/sourceforge/plantuml/ugraphic/g2d/DriverTextG2d.java index b1b076306..6083e122c 100644 --- a/src/net/sourceforge/plantuml/ugraphic/g2d/DriverTextG2d.java +++ b/src/net/sourceforge/plantuml/ugraphic/g2d/DriverTextG2d.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 13834 $ * */ package net.sourceforge.plantuml.ugraphic.g2d; @@ -43,12 +40,12 @@ import java.awt.geom.Rectangle2D; import net.sourceforge.plantuml.Dimension2DDouble; import net.sourceforge.plantuml.EnsureVisible; +import net.sourceforge.plantuml.FileFormat; import net.sourceforge.plantuml.Log; import net.sourceforge.plantuml.graphic.FontConfiguration; import net.sourceforge.plantuml.graphic.FontStyle; import net.sourceforge.plantuml.graphic.HtmlColor; import net.sourceforge.plantuml.graphic.StringBounder; -import net.sourceforge.plantuml.graphic.StringBounderUtils; import net.sourceforge.plantuml.ugraphic.ColorMapper; import net.sourceforge.plantuml.ugraphic.UDriver; import net.sourceforge.plantuml.ugraphic.UFont; @@ -78,7 +75,7 @@ public class DriverTextG2d implements UDriver { final FontConfiguration fontConfiguration = shape.getFontConfiguration(); final UFont font = fontConfiguration.getFont().scaled(param.getScale()); - final Dimension2D dimBack = calculateDimension(StringBounderUtils.asStringBounder(), font, shape.getText()); + final Dimension2D dimBack = calculateDimension(FileFormat.PNG.getDefaultStringBounder(), font, shape.getText()); if (fontConfiguration.containsStyle(FontStyle.BACKCOLOR)) { final Color extended = mapper.getMappedColor(fontConfiguration.getExtendedColor()); if (extended != null) { @@ -100,14 +97,14 @@ public class DriverTextG2d implements UDriver { if (extended != null) { g2d.setColor(mapper.getMappedColor(extended)); } - final Dimension2D dim = calculateDimension(StringBounderUtils.asStringBounder(), font, shape.getText()); + final Dimension2D dim = calculateDimension(FileFormat.PNG.getDefaultStringBounder(), font, shape.getText()); final int ypos = (int) (y + 2.5); g2d.setStroke(new BasicStroke((float) 1)); g2d.drawLine((int) x, ypos, (int) (x + dim.getWidth()), ypos); g2d.setStroke(new BasicStroke()); } if (fontConfiguration.containsStyle(FontStyle.WAVE)) { - final Dimension2D dim = calculateDimension(StringBounderUtils.asStringBounder(), font, shape.getText()); + final Dimension2D dim = calculateDimension(FileFormat.PNG.getDefaultStringBounder(), font, shape.getText()); final int ypos = (int) (y + 2.5) - 1; final HtmlColor extended = fontConfiguration.getExtendedColor(); if (extended != null) { @@ -119,7 +116,7 @@ public class DriverTextG2d implements UDriver { } } if (fontConfiguration.containsStyle(FontStyle.STRIKE)) { - final Dimension2D dim = calculateDimension(StringBounderUtils.asStringBounder(), font, shape.getText()); + final Dimension2D dim = calculateDimension(FileFormat.PNG.getDefaultStringBounder(), font, shape.getText()); final FontMetrics fm = g2d.getFontMetrics(font.getFont()); final int ypos = (int) (y - fm.getDescent() - 0.5); final HtmlColor extended = fontConfiguration.getExtendedColor(); diff --git a/src/net/sourceforge/plantuml/ugraphic/g2d/UGraphicG2d.java b/src/net/sourceforge/plantuml/ugraphic/g2d/UGraphicG2d.java index 0b558b2ff..3a30768c3 100644 --- a/src/net/sourceforge/plantuml/ugraphic/g2d/UGraphicG2d.java +++ b/src/net/sourceforge/plantuml/ugraphic/g2d/UGraphicG2d.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19267 $ * */ package net.sourceforge.plantuml.ugraphic.g2d; @@ -47,10 +44,10 @@ import java.util.List; import java.util.Set; import net.sourceforge.plantuml.EnsureVisible; +import net.sourceforge.plantuml.FileFormat; import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.anim.AffineTransformation; import net.sourceforge.plantuml.graphic.StringBounder; -import net.sourceforge.plantuml.graphic.StringBounderUtils; import net.sourceforge.plantuml.graphic.TextBlockUtils; import net.sourceforge.plantuml.png.PngIO; import net.sourceforge.plantuml.posimo.DotPath; @@ -65,6 +62,7 @@ import net.sourceforge.plantuml.ugraphic.UEllipse; import net.sourceforge.plantuml.ugraphic.UGraphic; import net.sourceforge.plantuml.ugraphic.UGraphic2; import net.sourceforge.plantuml.ugraphic.UImage; +import net.sourceforge.plantuml.ugraphic.UImageSvg; import net.sourceforge.plantuml.ugraphic.ULine; import net.sourceforge.plantuml.ugraphic.UPath; import net.sourceforge.plantuml.ugraphic.UPixel; @@ -146,6 +144,7 @@ public class UGraphicG2d extends AbstractUGraphic implements EnsureV registerDriver(UPixel.class, new DriverPixelG2d()); registerDriver(UPolygon.class, new DriverPolygonG2d(dpiFactor, this)); registerDriver(UEllipse.class, new DriverEllipseG2d(dpiFactor, this)); + registerDriver(UImageSvg.class, new DriverImageG2d(this)); registerDriver(UImage.class, new DriverImageG2d(this)); registerDriver(DotPath.class, new DriverDotPathG2d(this)); registerDriver(UPath.class, new DriverPathG2d(dpiFactor)); @@ -153,10 +152,10 @@ public class UGraphicG2d extends AbstractUGraphic implements EnsureV } public StringBounder getStringBounder() { - if (hasAffineTransform) { - return TextBlockUtils.getDummyStringBounder(); - } - return StringBounderUtils.asStringBounder(); +// if (hasAffineTransform) { +// return TextBlockUtils.getDummyStringBounder(); +// } + return FileFormat.PNG.getDefaultStringBounder(); } @Override diff --git a/src/net/sourceforge/plantuml/ugraphic/hand/HandJiggle.java b/src/net/sourceforge/plantuml/ugraphic/hand/HandJiggle.java index 78462a4a2..2fc9b977a 100644 --- a/src/net/sourceforge/plantuml/ugraphic/hand/HandJiggle.java +++ b/src/net/sourceforge/plantuml/ugraphic/hand/HandJiggle.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Adrian Vogt * diff --git a/src/net/sourceforge/plantuml/ugraphic/hand/UDotPathHand.java b/src/net/sourceforge/plantuml/ugraphic/hand/UDotPathHand.java index f3f95608d..c168956d9 100644 --- a/src/net/sourceforge/plantuml/ugraphic/hand/UDotPathHand.java +++ b/src/net/sourceforge/plantuml/ugraphic/hand/UDotPathHand.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Adrian Vogt * diff --git a/src/net/sourceforge/plantuml/ugraphic/hand/UEllipseHand.java b/src/net/sourceforge/plantuml/ugraphic/hand/UEllipseHand.java index e66436372..5238a8a5c 100644 --- a/src/net/sourceforge/plantuml/ugraphic/hand/UEllipseHand.java +++ b/src/net/sourceforge/plantuml/ugraphic/hand/UEllipseHand.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Adrian Vogt * diff --git a/src/net/sourceforge/plantuml/ugraphic/hand/UGraphicHandwritten.java b/src/net/sourceforge/plantuml/ugraphic/hand/UGraphicHandwritten.java index 088675042..5682c1377 100644 --- a/src/net/sourceforge/plantuml/ugraphic/hand/UGraphicHandwritten.java +++ b/src/net/sourceforge/plantuml/ugraphic/hand/UGraphicHandwritten.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Adrian Vogt * diff --git a/src/net/sourceforge/plantuml/ugraphic/hand/ULineHand.java b/src/net/sourceforge/plantuml/ugraphic/hand/ULineHand.java index b305a50d5..3b9fad3d4 100644 --- a/src/net/sourceforge/plantuml/ugraphic/hand/ULineHand.java +++ b/src/net/sourceforge/plantuml/ugraphic/hand/ULineHand.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Adrian Vogt * diff --git a/src/net/sourceforge/plantuml/ugraphic/hand/UPathHand.java b/src/net/sourceforge/plantuml/ugraphic/hand/UPathHand.java index aca89a3f5..cd44d8fe7 100644 --- a/src/net/sourceforge/plantuml/ugraphic/hand/UPathHand.java +++ b/src/net/sourceforge/plantuml/ugraphic/hand/UPathHand.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Adrian Vogt * diff --git a/src/net/sourceforge/plantuml/ugraphic/hand/UPolygonHand.java b/src/net/sourceforge/plantuml/ugraphic/hand/UPolygonHand.java index aecc270a9..26051a59c 100644 --- a/src/net/sourceforge/plantuml/ugraphic/hand/UPolygonHand.java +++ b/src/net/sourceforge/plantuml/ugraphic/hand/UPolygonHand.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Adrian Vogt * diff --git a/src/net/sourceforge/plantuml/ugraphic/hand/URectangleHand.java b/src/net/sourceforge/plantuml/ugraphic/hand/URectangleHand.java index e3a001817..a69676c28 100644 --- a/src/net/sourceforge/plantuml/ugraphic/hand/URectangleHand.java +++ b/src/net/sourceforge/plantuml/ugraphic/hand/URectangleHand.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Adrian Vogt * diff --git a/src/net/sourceforge/plantuml/ugraphic/html5/DriverLineHtml5.java b/src/net/sourceforge/plantuml/ugraphic/html5/DriverLineHtml5.java index 5a98268a1..ff43132d5 100644 --- a/src/net/sourceforge/plantuml/ugraphic/html5/DriverLineHtml5.java +++ b/src/net/sourceforge/plantuml/ugraphic/html5/DriverLineHtml5.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * diff --git a/src/net/sourceforge/plantuml/ugraphic/html5/DriverNopHtml5.java b/src/net/sourceforge/plantuml/ugraphic/html5/DriverNopHtml5.java index 5a94e0ec0..5065c6a02 100644 --- a/src/net/sourceforge/plantuml/ugraphic/html5/DriverNopHtml5.java +++ b/src/net/sourceforge/plantuml/ugraphic/html5/DriverNopHtml5.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * diff --git a/src/net/sourceforge/plantuml/ugraphic/html5/DriverRectangleHtml5.java b/src/net/sourceforge/plantuml/ugraphic/html5/DriverRectangleHtml5.java index 4cb61f6a8..a7d926842 100644 --- a/src/net/sourceforge/plantuml/ugraphic/html5/DriverRectangleHtml5.java +++ b/src/net/sourceforge/plantuml/ugraphic/html5/DriverRectangleHtml5.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * diff --git a/src/net/sourceforge/plantuml/ugraphic/html5/Html5Drawer.java b/src/net/sourceforge/plantuml/ugraphic/html5/Html5Drawer.java index 86f353cf6..36606cfb0 100644 --- a/src/net/sourceforge/plantuml/ugraphic/html5/Html5Drawer.java +++ b/src/net/sourceforge/plantuml/ugraphic/html5/Html5Drawer.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * diff --git a/src/net/sourceforge/plantuml/ugraphic/html5/UGraphicHtml5.java b/src/net/sourceforge/plantuml/ugraphic/html5/UGraphicHtml5.java index a294d7d4c..401485cbb 100644 --- a/src/net/sourceforge/plantuml/ugraphic/html5/UGraphicHtml5.java +++ b/src/net/sourceforge/plantuml/ugraphic/html5/UGraphicHtml5.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * @@ -34,9 +32,9 @@ package net.sourceforge.plantuml.ugraphic.html5; import java.io.IOException; import java.io.OutputStream; +import net.sourceforge.plantuml.FileFormat; import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.graphic.StringBounder; -import net.sourceforge.plantuml.graphic.TextBlockUtils; import net.sourceforge.plantuml.ugraphic.AbstractCommonUGraphic; import net.sourceforge.plantuml.ugraphic.AbstractUGraphic; import net.sourceforge.plantuml.ugraphic.ClipContainer; @@ -58,7 +56,7 @@ public class UGraphicHtml5 extends AbstractUGraphic implements Clip public UGraphicHtml5(ColorMapper colorMapper) { super(colorMapper, new Html5Drawer()); - stringBounder = TextBlockUtils.getDummyStringBounder(); + stringBounder = FileFormat.PNG.getDefaultStringBounder(); registerDriver(URectangle.class, new DriverRectangleHtml5(this)); // registerDriver(UText.class, new DriverTextEps(imDummy, this, strategy)); registerDriver(UText.class, new DriverNopHtml5()); diff --git a/src/net/sourceforge/plantuml/ugraphic/sprite/PSystemListInternalSprites.java b/src/net/sourceforge/plantuml/ugraphic/sprite/PSystemListInternalSprites.java index f7eb1a54b..3eba39b7b 100644 --- a/src/net/sourceforge/plantuml/ugraphic/sprite/PSystemListInternalSprites.java +++ b/src/net/sourceforge/plantuml/ugraphic/sprite/PSystemListInternalSprites.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 4041 $ * */ package net.sourceforge.plantuml.ugraphic.sprite; diff --git a/src/net/sourceforge/plantuml/ugraphic/sprite/PSystemListInternalSpritesFactory.java b/src/net/sourceforge/plantuml/ugraphic/sprite/PSystemListInternalSpritesFactory.java index 6cfd1bf24..dcc36d7e0 100644 --- a/src/net/sourceforge/plantuml/ugraphic/sprite/PSystemListInternalSpritesFactory.java +++ b/src/net/sourceforge/plantuml/ugraphic/sprite/PSystemListInternalSpritesFactory.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3830 $ * */ package net.sourceforge.plantuml.ugraphic.sprite; diff --git a/src/net/sourceforge/plantuml/ugraphic/sprite/RessourcesUtils.java b/src/net/sourceforge/plantuml/ugraphic/sprite/RessourcesUtils.java index 7555b728c..07810f0b7 100644 --- a/src/net/sourceforge/plantuml/ugraphic/sprite/RessourcesUtils.java +++ b/src/net/sourceforge/plantuml/ugraphic/sprite/RessourcesUtils.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3837 $ * */ package net.sourceforge.plantuml.ugraphic.sprite; diff --git a/src/net/sourceforge/plantuml/ugraphic/sprite/Sprite.java b/src/net/sourceforge/plantuml/ugraphic/sprite/Sprite.java index a664fd251..0dab47dfa 100644 --- a/src/net/sourceforge/plantuml/ugraphic/sprite/Sprite.java +++ b/src/net/sourceforge/plantuml/ugraphic/sprite/Sprite.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3837 $ * */ package net.sourceforge.plantuml.ugraphic.sprite; diff --git a/src/net/sourceforge/plantuml/ugraphic/sprite/SpriteGrayLevel.java b/src/net/sourceforge/plantuml/ugraphic/sprite/SpriteGrayLevel.java index 4fdc89931..10b8fed26 100644 --- a/src/net/sourceforge/plantuml/ugraphic/sprite/SpriteGrayLevel.java +++ b/src/net/sourceforge/plantuml/ugraphic/sprite/SpriteGrayLevel.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3837 $ * */ package net.sourceforge.plantuml.ugraphic.sprite; diff --git a/src/net/sourceforge/plantuml/ugraphic/sprite/SpriteImage.java b/src/net/sourceforge/plantuml/ugraphic/sprite/SpriteImage.java index e698fab28..93c0d11cc 100644 --- a/src/net/sourceforge/plantuml/ugraphic/sprite/SpriteImage.java +++ b/src/net/sourceforge/plantuml/ugraphic/sprite/SpriteImage.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3837 $ * */ package net.sourceforge.plantuml.ugraphic.sprite; diff --git a/src/net/sourceforge/plantuml/ugraphic/sprite/SpriteMonochrome.java b/src/net/sourceforge/plantuml/ugraphic/sprite/SpriteMonochrome.java index 480657797..ee07d9937 100644 --- a/src/net/sourceforge/plantuml/ugraphic/sprite/SpriteMonochrome.java +++ b/src/net/sourceforge/plantuml/ugraphic/sprite/SpriteMonochrome.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3837 $ * */ package net.sourceforge.plantuml.ugraphic.sprite; diff --git a/src/net/sourceforge/plantuml/ugraphic/sprite/SpriteUtils.java b/src/net/sourceforge/plantuml/ugraphic/sprite/SpriteUtils.java index 3966748e3..f5c09e86f 100644 --- a/src/net/sourceforge/plantuml/ugraphic/sprite/SpriteUtils.java +++ b/src/net/sourceforge/plantuml/ugraphic/sprite/SpriteUtils.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3837 $ * */ package net.sourceforge.plantuml.ugraphic.sprite; diff --git a/src/net/sourceforge/plantuml/ugraphic/svg/DriverCenteredCharacterSvg.java b/src/net/sourceforge/plantuml/ugraphic/svg/DriverCenteredCharacterSvg.java index 2011deecd..d33de9e4c 100644 --- a/src/net/sourceforge/plantuml/ugraphic/svg/DriverCenteredCharacterSvg.java +++ b/src/net/sourceforge/plantuml/ugraphic/svg/DriverCenteredCharacterSvg.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * diff --git a/src/net/sourceforge/plantuml/ugraphic/svg/DriverDotPathSvg.java b/src/net/sourceforge/plantuml/ugraphic/svg/DriverDotPathSvg.java index 56f5f8bc2..98103bc89 100644 --- a/src/net/sourceforge/plantuml/ugraphic/svg/DriverDotPathSvg.java +++ b/src/net/sourceforge/plantuml/ugraphic/svg/DriverDotPathSvg.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 3837 $ * */ package net.sourceforge.plantuml.ugraphic.svg; diff --git a/src/net/sourceforge/plantuml/ugraphic/svg/DriverEllipseSvg.java b/src/net/sourceforge/plantuml/ugraphic/svg/DriverEllipseSvg.java index 0b1b9aa63..3cca660f6 100644 --- a/src/net/sourceforge/plantuml/ugraphic/svg/DriverEllipseSvg.java +++ b/src/net/sourceforge/plantuml/ugraphic/svg/DriverEllipseSvg.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * diff --git a/src/net/sourceforge/plantuml/ugraphic/svg/DriverImagePng.java b/src/net/sourceforge/plantuml/ugraphic/svg/DriverImagePng.java index 814869d0d..81a5fa42c 100644 --- a/src/net/sourceforge/plantuml/ugraphic/svg/DriverImagePng.java +++ b/src/net/sourceforge/plantuml/ugraphic/svg/DriverImagePng.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * diff --git a/src/net/sourceforge/plantuml/ugraphic/svg/DriverImageSvgSvg.java b/src/net/sourceforge/plantuml/ugraphic/svg/DriverImageSvgSvg.java index af5c1d664..76fd408f8 100644 --- a/src/net/sourceforge/plantuml/ugraphic/svg/DriverImageSvgSvg.java +++ b/src/net/sourceforge/plantuml/ugraphic/svg/DriverImageSvgSvg.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * diff --git a/src/net/sourceforge/plantuml/ugraphic/svg/DriverLineSvg.java b/src/net/sourceforge/plantuml/ugraphic/svg/DriverLineSvg.java index f115f972c..c3e830d59 100644 --- a/src/net/sourceforge/plantuml/ugraphic/svg/DriverLineSvg.java +++ b/src/net/sourceforge/plantuml/ugraphic/svg/DriverLineSvg.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * diff --git a/src/net/sourceforge/plantuml/ugraphic/svg/DriverPathSvg.java b/src/net/sourceforge/plantuml/ugraphic/svg/DriverPathSvg.java index d8058433c..b827a338e 100644 --- a/src/net/sourceforge/plantuml/ugraphic/svg/DriverPathSvg.java +++ b/src/net/sourceforge/plantuml/ugraphic/svg/DriverPathSvg.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * diff --git a/src/net/sourceforge/plantuml/ugraphic/svg/DriverPolygonSvg.java b/src/net/sourceforge/plantuml/ugraphic/svg/DriverPolygonSvg.java index 6f860d1a0..b0d400710 100644 --- a/src/net/sourceforge/plantuml/ugraphic/svg/DriverPolygonSvg.java +++ b/src/net/sourceforge/plantuml/ugraphic/svg/DriverPolygonSvg.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * diff --git a/src/net/sourceforge/plantuml/ugraphic/svg/DriverRectangleSvg.java b/src/net/sourceforge/plantuml/ugraphic/svg/DriverRectangleSvg.java index ef4044ebb..a3141bd8b 100644 --- a/src/net/sourceforge/plantuml/ugraphic/svg/DriverRectangleSvg.java +++ b/src/net/sourceforge/plantuml/ugraphic/svg/DriverRectangleSvg.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * diff --git a/src/net/sourceforge/plantuml/ugraphic/svg/DriverTextAsPathSvg.java b/src/net/sourceforge/plantuml/ugraphic/svg/DriverTextAsPathSvg.java index ae091cc54..5aa93f944 100644 --- a/src/net/sourceforge/plantuml/ugraphic/svg/DriverTextAsPathSvg.java +++ b/src/net/sourceforge/plantuml/ugraphic/svg/DriverTextAsPathSvg.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * diff --git a/src/net/sourceforge/plantuml/ugraphic/svg/DriverTextSvg.java b/src/net/sourceforge/plantuml/ugraphic/svg/DriverTextSvg.java index 7aac1df9b..ff340b7e8 100644 --- a/src/net/sourceforge/plantuml/ugraphic/svg/DriverTextSvg.java +++ b/src/net/sourceforge/plantuml/ugraphic/svg/DriverTextSvg.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * diff --git a/src/net/sourceforge/plantuml/ugraphic/svg/UGraphicSvg.java b/src/net/sourceforge/plantuml/ugraphic/svg/UGraphicSvg.java index 75d972576..7d6c33c63 100644 --- a/src/net/sourceforge/plantuml/ugraphic/svg/UGraphicSvg.java +++ b/src/net/sourceforge/plantuml/ugraphic/svg/UGraphicSvg.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * @@ -36,6 +34,7 @@ import java.io.OutputStream; import javax.xml.transform.TransformerException; +import net.sourceforge.plantuml.FileFormat; import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.graphic.HtmlColorGradient; import net.sourceforge.plantuml.graphic.StringBounder; @@ -109,7 +108,7 @@ public class UGraphicSvg extends AbstractUGraphic implements ClipCo private UGraphicSvg(ColorMapper colorMapper, SvgGraphics svg, boolean textAsPath, String linkTarget) { super(colorMapper, svg); - this.stringBounder = TextBlockUtils.getDummyStringBounder(); + this.stringBounder = FileFormat.PNG.getDefaultStringBounder(); this.textAsPath2 = textAsPath; this.target = linkTarget; register(); diff --git a/src/net/sourceforge/plantuml/ugraphic/tikz/DriverAtomTextTikz.java b/src/net/sourceforge/plantuml/ugraphic/tikz/DriverAtomTextTikz.java index e11700620..b0de69181 100644 --- a/src/net/sourceforge/plantuml/ugraphic/tikz/DriverAtomTextTikz.java +++ b/src/net/sourceforge/plantuml/ugraphic/tikz/DriverAtomTextTikz.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * diff --git a/src/net/sourceforge/plantuml/ugraphic/tikz/DriverCenteredCharacterTikz.java b/src/net/sourceforge/plantuml/ugraphic/tikz/DriverCenteredCharacterTikz.java index 1835de1a9..13ff62cdb 100644 --- a/src/net/sourceforge/plantuml/ugraphic/tikz/DriverCenteredCharacterTikz.java +++ b/src/net/sourceforge/plantuml/ugraphic/tikz/DriverCenteredCharacterTikz.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * diff --git a/src/net/sourceforge/plantuml/ugraphic/tikz/DriverDotPathTikz.java b/src/net/sourceforge/plantuml/ugraphic/tikz/DriverDotPathTikz.java index 4371cae4d..a19fc6e23 100644 --- a/src/net/sourceforge/plantuml/ugraphic/tikz/DriverDotPathTikz.java +++ b/src/net/sourceforge/plantuml/ugraphic/tikz/DriverDotPathTikz.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * diff --git a/src/net/sourceforge/plantuml/ugraphic/tikz/DriverEllipseTikz.java b/src/net/sourceforge/plantuml/ugraphic/tikz/DriverEllipseTikz.java index 921944328..f9a8e7c4c 100644 --- a/src/net/sourceforge/plantuml/ugraphic/tikz/DriverEllipseTikz.java +++ b/src/net/sourceforge/plantuml/ugraphic/tikz/DriverEllipseTikz.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * diff --git a/src/net/sourceforge/plantuml/ugraphic/tikz/DriverLineTikz.java b/src/net/sourceforge/plantuml/ugraphic/tikz/DriverLineTikz.java index 93b21781e..b8262c965 100644 --- a/src/net/sourceforge/plantuml/ugraphic/tikz/DriverLineTikz.java +++ b/src/net/sourceforge/plantuml/ugraphic/tikz/DriverLineTikz.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * diff --git a/src/net/sourceforge/plantuml/ugraphic/tikz/DriverNoneTikz.java b/src/net/sourceforge/plantuml/ugraphic/tikz/DriverNoneTikz.java index 0f4520b19..422f02f04 100644 --- a/src/net/sourceforge/plantuml/ugraphic/tikz/DriverNoneTikz.java +++ b/src/net/sourceforge/plantuml/ugraphic/tikz/DriverNoneTikz.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * diff --git a/src/net/sourceforge/plantuml/ugraphic/tikz/DriverPolygonTikz.java b/src/net/sourceforge/plantuml/ugraphic/tikz/DriverPolygonTikz.java index 02e9834cb..e7a20ce7e 100644 --- a/src/net/sourceforge/plantuml/ugraphic/tikz/DriverPolygonTikz.java +++ b/src/net/sourceforge/plantuml/ugraphic/tikz/DriverPolygonTikz.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * diff --git a/src/net/sourceforge/plantuml/ugraphic/tikz/DriverRectangleTikz.java b/src/net/sourceforge/plantuml/ugraphic/tikz/DriverRectangleTikz.java index c1e06662a..867e9a746 100644 --- a/src/net/sourceforge/plantuml/ugraphic/tikz/DriverRectangleTikz.java +++ b/src/net/sourceforge/plantuml/ugraphic/tikz/DriverRectangleTikz.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * diff --git a/src/net/sourceforge/plantuml/ugraphic/tikz/DriverUPathTikz.java b/src/net/sourceforge/plantuml/ugraphic/tikz/DriverUPathTikz.java index 274305dae..773f86a94 100644 --- a/src/net/sourceforge/plantuml/ugraphic/tikz/DriverUPathTikz.java +++ b/src/net/sourceforge/plantuml/ugraphic/tikz/DriverUPathTikz.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * diff --git a/src/net/sourceforge/plantuml/ugraphic/tikz/DriverUTextTikz.java b/src/net/sourceforge/plantuml/ugraphic/tikz/DriverUTextTikz.java index 376566357..a5a0a56d8 100644 --- a/src/net/sourceforge/plantuml/ugraphic/tikz/DriverUTextTikz.java +++ b/src/net/sourceforge/plantuml/ugraphic/tikz/DriverUTextTikz.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * diff --git a/src/net/sourceforge/plantuml/ugraphic/tikz/UGraphicTikz.java b/src/net/sourceforge/plantuml/ugraphic/tikz/UGraphicTikz.java index c3a9c284a..655249acd 100644 --- a/src/net/sourceforge/plantuml/ugraphic/tikz/UGraphicTikz.java +++ b/src/net/sourceforge/plantuml/ugraphic/tikz/UGraphicTikz.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * @@ -34,10 +32,10 @@ package net.sourceforge.plantuml.ugraphic.tikz; import java.io.IOException; import java.io.OutputStream; +import net.sourceforge.plantuml.FileFormat; import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.creole.AtomText; import net.sourceforge.plantuml.graphic.StringBounder; -import net.sourceforge.plantuml.graphic.TextBlockUtils; import net.sourceforge.plantuml.posimo.DotPath; import net.sourceforge.plantuml.tikz.TikzGraphics; import net.sourceforge.plantuml.ugraphic.AbstractCommonUGraphic; @@ -61,7 +59,7 @@ public class UGraphicTikz extends AbstractUGraphic implements Clip private UGraphicTikz(ColorMapper colorMapper, TikzGraphics tikz) { super(colorMapper, tikz); - this.stringBounder = TextBlockUtils.getDummyStringBounder(); + this.stringBounder = FileFormat.PNG.getDefaultStringBounder(); register(); } diff --git a/src/net/sourceforge/plantuml/ugraphic/txt/UGraphicTxt.java b/src/net/sourceforge/plantuml/ugraphic/txt/UGraphicTxt.java index 423625102..068e83df4 100644 --- a/src/net/sourceforge/plantuml/ugraphic/txt/UGraphicTxt.java +++ b/src/net/sourceforge/plantuml/ugraphic/txt/UGraphicTxt.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * diff --git a/src/net/sourceforge/plantuml/ugraphic/visio/DriverDotPathVdx.java b/src/net/sourceforge/plantuml/ugraphic/visio/DriverDotPathVdx.java index 56878cc08..9c04de038 100644 --- a/src/net/sourceforge/plantuml/ugraphic/visio/DriverDotPathVdx.java +++ b/src/net/sourceforge/plantuml/ugraphic/visio/DriverDotPathVdx.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * diff --git a/src/net/sourceforge/plantuml/ugraphic/visio/DriverLineVdx.java b/src/net/sourceforge/plantuml/ugraphic/visio/DriverLineVdx.java index 8541791c2..4c707c8fb 100644 --- a/src/net/sourceforge/plantuml/ugraphic/visio/DriverLineVdx.java +++ b/src/net/sourceforge/plantuml/ugraphic/visio/DriverLineVdx.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * diff --git a/src/net/sourceforge/plantuml/ugraphic/visio/DriverNoneVdx.java b/src/net/sourceforge/plantuml/ugraphic/visio/DriverNoneVdx.java index 36d7de799..55b4d5258 100644 --- a/src/net/sourceforge/plantuml/ugraphic/visio/DriverNoneVdx.java +++ b/src/net/sourceforge/plantuml/ugraphic/visio/DriverNoneVdx.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * diff --git a/src/net/sourceforge/plantuml/ugraphic/visio/DriverPolygonVdx.java b/src/net/sourceforge/plantuml/ugraphic/visio/DriverPolygonVdx.java index ecc8298d6..137c281db 100644 --- a/src/net/sourceforge/plantuml/ugraphic/visio/DriverPolygonVdx.java +++ b/src/net/sourceforge/plantuml/ugraphic/visio/DriverPolygonVdx.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * diff --git a/src/net/sourceforge/plantuml/ugraphic/visio/DriverRectangleVdx.java b/src/net/sourceforge/plantuml/ugraphic/visio/DriverRectangleVdx.java index bceb3418a..305800b0c 100644 --- a/src/net/sourceforge/plantuml/ugraphic/visio/DriverRectangleVdx.java +++ b/src/net/sourceforge/plantuml/ugraphic/visio/DriverRectangleVdx.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * diff --git a/src/net/sourceforge/plantuml/ugraphic/visio/DriverTextVdx.java b/src/net/sourceforge/plantuml/ugraphic/visio/DriverTextVdx.java index f33086695..af955a4c6 100644 --- a/src/net/sourceforge/plantuml/ugraphic/visio/DriverTextVdx.java +++ b/src/net/sourceforge/plantuml/ugraphic/visio/DriverTextVdx.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * diff --git a/src/net/sourceforge/plantuml/ugraphic/visio/DriverUPathVdx.java b/src/net/sourceforge/plantuml/ugraphic/visio/DriverUPathVdx.java index ca9f41e82..19da156ea 100644 --- a/src/net/sourceforge/plantuml/ugraphic/visio/DriverUPathVdx.java +++ b/src/net/sourceforge/plantuml/ugraphic/visio/DriverUPathVdx.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * diff --git a/src/net/sourceforge/plantuml/ugraphic/visio/UGraphicVdx.java b/src/net/sourceforge/plantuml/ugraphic/visio/UGraphicVdx.java index fe79ad300..292af9426 100644 --- a/src/net/sourceforge/plantuml/ugraphic/visio/UGraphicVdx.java +++ b/src/net/sourceforge/plantuml/ugraphic/visio/UGraphicVdx.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * @@ -34,10 +32,10 @@ package net.sourceforge.plantuml.ugraphic.visio; import java.io.IOException; import java.io.OutputStream; +import net.sourceforge.plantuml.FileFormat; import net.sourceforge.plantuml.Url; import net.sourceforge.plantuml.creole.AtomText; import net.sourceforge.plantuml.graphic.StringBounder; -import net.sourceforge.plantuml.graphic.TextBlockUtils; import net.sourceforge.plantuml.posimo.DotPath; import net.sourceforge.plantuml.ugraphic.AbstractCommonUGraphic; import net.sourceforge.plantuml.ugraphic.AbstractUGraphic; @@ -60,7 +58,7 @@ public class UGraphicVdx extends AbstractUGraphic implements Clip private UGraphicVdx(ColorMapper colorMapper, VisioGraphics visio) { super(colorMapper, visio); - this.stringBounder = TextBlockUtils.getDummyStringBounder(); + this.stringBounder = FileFormat.PNG.getDefaultStringBounder(); register(); } diff --git a/src/net/sourceforge/plantuml/ugraphic/visio/VisioGraphics.java b/src/net/sourceforge/plantuml/ugraphic/visio/VisioGraphics.java index b0e18ee43..d4a012652 100644 --- a/src/net/sourceforge/plantuml/ugraphic/visio/VisioGraphics.java +++ b/src/net/sourceforge/plantuml/ugraphic/visio/VisioGraphics.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 10277 $ * */ package net.sourceforge.plantuml.ugraphic.visio; diff --git a/src/net/sourceforge/plantuml/ugraphic/visio/VisioLine.java b/src/net/sourceforge/plantuml/ugraphic/visio/VisioLine.java index 9f8b9daf8..5e755e515 100644 --- a/src/net/sourceforge/plantuml/ugraphic/visio/VisioLine.java +++ b/src/net/sourceforge/plantuml/ugraphic/visio/VisioLine.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 10277 $ * */ package net.sourceforge.plantuml.ugraphic.visio; diff --git a/src/net/sourceforge/plantuml/ugraphic/visio/VisioRectangle.java b/src/net/sourceforge/plantuml/ugraphic/visio/VisioRectangle.java index c69693bbe..d25f280a8 100644 --- a/src/net/sourceforge/plantuml/ugraphic/visio/VisioRectangle.java +++ b/src/net/sourceforge/plantuml/ugraphic/visio/VisioRectangle.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 10277 $ * */ package net.sourceforge.plantuml.ugraphic.visio; diff --git a/src/net/sourceforge/plantuml/ugraphic/visio/VisioShape.java b/src/net/sourceforge/plantuml/ugraphic/visio/VisioShape.java index b1bcc24ea..089ffbc43 100644 --- a/src/net/sourceforge/plantuml/ugraphic/visio/VisioShape.java +++ b/src/net/sourceforge/plantuml/ugraphic/visio/VisioShape.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 10277 $ * */ package net.sourceforge.plantuml.ugraphic.visio; diff --git a/src/net/sourceforge/plantuml/ugraphic/visio/VisioText.java b/src/net/sourceforge/plantuml/ugraphic/visio/VisioText.java index d75500384..d8071d219 100644 --- a/src/net/sourceforge/plantuml/ugraphic/visio/VisioText.java +++ b/src/net/sourceforge/plantuml/ugraphic/visio/VisioText.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 10277 $ * */ package net.sourceforge.plantuml.ugraphic.visio; diff --git a/src/net/sourceforge/plantuml/utils/CharHidder.java b/src/net/sourceforge/plantuml/utils/CharHidder.java index c785ce5a9..471090901 100644 --- a/src/net/sourceforge/plantuml/utils/CharHidder.java +++ b/src/net/sourceforge/plantuml/utils/CharHidder.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5749 $ * */ package net.sourceforge.plantuml.utils; diff --git a/src/net/sourceforge/plantuml/utils/MathUtils.java b/src/net/sourceforge/plantuml/utils/MathUtils.java index 55411de1d..f52ffd80b 100644 --- a/src/net/sourceforge/plantuml/utils/MathUtils.java +++ b/src/net/sourceforge/plantuml/utils/MathUtils.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6719 $ * */ package net.sourceforge.plantuml.utils; diff --git a/src/net/sourceforge/plantuml/utils/StartUtils.java b/src/net/sourceforge/plantuml/utils/StartUtils.java index 115757360..21dca29e5 100644 --- a/src/net/sourceforge/plantuml/utils/StartUtils.java +++ b/src/net/sourceforge/plantuml/utils/StartUtils.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 6110 $ * */ package net.sourceforge.plantuml.utils; diff --git a/src/net/sourceforge/plantuml/utils/UniqueSequence.java b/src/net/sourceforge/plantuml/utils/UniqueSequence.java index 2700c6d2c..cc0845e3a 100644 --- a/src/net/sourceforge/plantuml/utils/UniqueSequence.java +++ b/src/net/sourceforge/plantuml/utils/UniqueSequence.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19109 $ * */ package net.sourceforge.plantuml.utils; diff --git a/src/net/sourceforge/plantuml/version/IteratorCounter2.java b/src/net/sourceforge/plantuml/version/IteratorCounter2.java index 19bd5a636..a70a9217a 100644 --- a/src/net/sourceforge/plantuml/version/IteratorCounter2.java +++ b/src/net/sourceforge/plantuml/version/IteratorCounter2.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * diff --git a/src/net/sourceforge/plantuml/version/IteratorCounter2Impl.java b/src/net/sourceforge/plantuml/version/IteratorCounter2Impl.java index 96e11ba83..f654cc5f9 100644 --- a/src/net/sourceforge/plantuml/version/IteratorCounter2Impl.java +++ b/src/net/sourceforge/plantuml/version/IteratorCounter2Impl.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * diff --git a/src/net/sourceforge/plantuml/version/License.java b/src/net/sourceforge/plantuml/version/License.java index f96143a8f..0720e84e6 100644 --- a/src/net/sourceforge/plantuml/version/License.java +++ b/src/net/sourceforge/plantuml/version/License.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * diff --git a/src/net/sourceforge/plantuml/version/PSystemLicense.java b/src/net/sourceforge/plantuml/version/PSystemLicense.java index fad2c93f2..ffe228691 100644 --- a/src/net/sourceforge/plantuml/version/PSystemLicense.java +++ b/src/net/sourceforge/plantuml/version/PSystemLicense.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * diff --git a/src/net/sourceforge/plantuml/version/PSystemLicenseFactory.java b/src/net/sourceforge/plantuml/version/PSystemLicenseFactory.java index d5dc90a59..93ddb145c 100644 --- a/src/net/sourceforge/plantuml/version/PSystemLicenseFactory.java +++ b/src/net/sourceforge/plantuml/version/PSystemLicenseFactory.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * diff --git a/src/net/sourceforge/plantuml/version/PSystemVersion.java b/src/net/sourceforge/plantuml/version/PSystemVersion.java index dad85a040..530465789 100644 --- a/src/net/sourceforge/plantuml/version/PSystemVersion.java +++ b/src/net/sourceforge/plantuml/version/PSystemVersion.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * diff --git a/src/net/sourceforge/plantuml/version/PSystemVersionFactory.java b/src/net/sourceforge/plantuml/version/PSystemVersionFactory.java index ea96b49df..b862b5b35 100644 --- a/src/net/sourceforge/plantuml/version/PSystemVersionFactory.java +++ b/src/net/sourceforge/plantuml/version/PSystemVersionFactory.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * diff --git a/src/net/sourceforge/plantuml/version/Version.java b/src/net/sourceforge/plantuml/version/Version.java index 6b719e9df..bb4095d4c 100644 --- a/src/net/sourceforge/plantuml/version/Version.java +++ b/src/net/sourceforge/plantuml/version/Version.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 20196 $ * */ package net.sourceforge.plantuml.version; @@ -39,7 +36,7 @@ import java.util.Date; public class Version { public static int version() { - return 8046; + return 8047; } public static String versionString() { @@ -71,7 +68,7 @@ public class Version { } public static long compileTime() { - return 1469468610162L; + return 1472140770579L; } public static String compileTimeString() { diff --git a/src/net/sourceforge/plantuml/vizjs/GraphvizJs.java b/src/net/sourceforge/plantuml/vizjs/GraphvizJs.java index 5c9b6013d..4f1df33b6 100644 --- a/src/net/sourceforge/plantuml/vizjs/GraphvizJs.java +++ b/src/net/sourceforge/plantuml/vizjs/GraphvizJs.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19398 $ * */ package net.sourceforge.plantuml.vizjs; @@ -90,6 +87,7 @@ public class GraphvizJs implements Graphviz { os.write(svg.getBytes()); return ProcessState.TERMINATED_OK(); } catch (Exception e) { + e.printStackTrace(); throw new GraphvizJsRuntimeException(e); } } diff --git a/src/net/sourceforge/plantuml/vizjs/GraphvizJsRuntimeException.java b/src/net/sourceforge/plantuml/vizjs/GraphvizJsRuntimeException.java index 0d7d275fc..78937596a 100644 --- a/src/net/sourceforge/plantuml/vizjs/GraphvizJsRuntimeException.java +++ b/src/net/sourceforge/plantuml/vizjs/GraphvizJsRuntimeException.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19398 $ * */ package net.sourceforge.plantuml.vizjs; diff --git a/src/net/sourceforge/plantuml/vizjs/VizJsEngine.java b/src/net/sourceforge/plantuml/vizjs/VizJsEngine.java index 8ac33d45d..ef58c09a9 100644 --- a/src/net/sourceforge/plantuml/vizjs/VizJsEngine.java +++ b/src/net/sourceforge/plantuml/vizjs/VizJsEngine.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 19398 $ * */ package net.sourceforge.plantuml.vizjs; diff --git a/src/net/sourceforge/plantuml/webp/Portrait.java b/src/net/sourceforge/plantuml/webp/Portrait.java index ea8a3c33e..fed750622 100644 --- a/src/net/sourceforge/plantuml/webp/Portrait.java +++ b/src/net/sourceforge/plantuml/webp/Portrait.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5749 $ * */ package net.sourceforge.plantuml.webp; diff --git a/src/net/sourceforge/plantuml/webp/Portraits.java b/src/net/sourceforge/plantuml/webp/Portraits.java index f607b4af4..1df9f1a7b 100644 --- a/src/net/sourceforge/plantuml/webp/Portraits.java +++ b/src/net/sourceforge/plantuml/webp/Portraits.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5749 $ * */ package net.sourceforge.plantuml.webp; diff --git a/src/net/sourceforge/plantuml/xmi/CucaDiagramXmiMaker.java b/src/net/sourceforge/plantuml/xmi/CucaDiagramXmiMaker.java index 2154af8c3..61f6a8eb9 100644 --- a/src/net/sourceforge/plantuml/xmi/CucaDiagramXmiMaker.java +++ b/src/net/sourceforge/plantuml/xmi/CucaDiagramXmiMaker.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5079 $ * */ package net.sourceforge.plantuml.xmi; diff --git a/src/net/sourceforge/plantuml/xmi/IXmiClassDiagram.java b/src/net/sourceforge/plantuml/xmi/IXmiClassDiagram.java index 455805ee5..b8033ed0e 100644 --- a/src/net/sourceforge/plantuml/xmi/IXmiClassDiagram.java +++ b/src/net/sourceforge/plantuml/xmi/IXmiClassDiagram.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5616 $ * */ package net.sourceforge.plantuml.xmi; diff --git a/src/net/sourceforge/plantuml/xmi/XmiClassDiagramArgo.java b/src/net/sourceforge/plantuml/xmi/XmiClassDiagramArgo.java index dbd2af21b..3f9287973 100644 --- a/src/net/sourceforge/plantuml/xmi/XmiClassDiagramArgo.java +++ b/src/net/sourceforge/plantuml/xmi/XmiClassDiagramArgo.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5616 $ * */ package net.sourceforge.plantuml.xmi; diff --git a/src/net/sourceforge/plantuml/xmi/XmiClassDiagramStandard.java b/src/net/sourceforge/plantuml/xmi/XmiClassDiagramStandard.java index 1183d7e32..0b1d2f571 100644 --- a/src/net/sourceforge/plantuml/xmi/XmiClassDiagramStandard.java +++ b/src/net/sourceforge/plantuml/xmi/XmiClassDiagramStandard.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5616 $ * */ package net.sourceforge.plantuml.xmi; diff --git a/src/net/sourceforge/plantuml/xmi/XmiClassDiagramStar.java b/src/net/sourceforge/plantuml/xmi/XmiClassDiagramStar.java index 372f3a711..051fa0d62 100644 --- a/src/net/sourceforge/plantuml/xmi/XmiClassDiagramStar.java +++ b/src/net/sourceforge/plantuml/xmi/XmiClassDiagramStar.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5616 $ * */ package net.sourceforge.plantuml.xmi; diff --git a/src/net/sourceforge/plantuml/xmi/XmiStateDiagram.java b/src/net/sourceforge/plantuml/xmi/XmiStateDiagram.java index 0d644f8ee..68d9dced1 100644 --- a/src/net/sourceforge/plantuml/xmi/XmiStateDiagram.java +++ b/src/net/sourceforge/plantuml/xmi/XmiStateDiagram.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5616 $ * */ package net.sourceforge.plantuml.xmi; diff --git a/src/net/sourceforge/plantuml/xmlsc/ScxmlStateDiagramStandard.java b/src/net/sourceforge/plantuml/xmlsc/ScxmlStateDiagramStandard.java index 294cee1cd..061de6fd8 100644 --- a/src/net/sourceforge/plantuml/xmlsc/ScxmlStateDiagramStandard.java +++ b/src/net/sourceforge/plantuml/xmlsc/ScxmlStateDiagramStandard.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5616 $ * */ package net.sourceforge.plantuml.xmlsc; diff --git a/src/net/sourceforge/plantuml/xmlsc/StateDiagramScxmlMaker.java b/src/net/sourceforge/plantuml/xmlsc/StateDiagramScxmlMaker.java index 4c9c22d80..04e938cb7 100644 --- a/src/net/sourceforge/plantuml/xmlsc/StateDiagramScxmlMaker.java +++ b/src/net/sourceforge/plantuml/xmlsc/StateDiagramScxmlMaker.java @@ -23,12 +23,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques * - * Revision $Revision: 5079 $ * */ package net.sourceforge.plantuml.xmlsc; diff --git a/src/overview.html b/src/overview.html index da906cd27..dd3a418e5 100644 --- a/src/overview.html +++ b/src/overview.html @@ -47,7 +47,7 @@ While PlantUML language description remains stable over version and follow ascen compatibility, the implementation of PlantUML changes very often over time.

So if you use classes described in this documentation, it's very likely that you will have -an issue someday, because thoses class may change without any notice. They could even be deleted. +an issue someday, because those class may change without any notice. They could even be deleted.

It used to happen more often than you think over years, because we try to constantly improve the general design of PlantUML, and this imply a continuous refactoring.

The only exception is the net.sourceforge.plantuml package, that we will keep diff --git a/src/smetana/core/debug/Debug.java b/src/smetana/core/debug/Debug.java index 5ce7f8c18..d713f6617 100644 --- a/src/smetana/core/debug/Debug.java +++ b/src/smetana/core/debug/Debug.java @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, * USA. * - * [Java is a trademark or registered trademark of Sun Microsystems, Inc. - * in the United States and other countries.] * * Original Author: Arnaud Roques *