diff --git a/src/net/sourceforge/plantuml/AFileZipEntry.java b/src/net/sourceforge/plantuml/AFileZipEntry.java
index cd9a945fb..5169439d7 100644
--- a/src/net/sourceforge/plantuml/AFileZipEntry.java
+++ b/src/net/sourceforge/plantuml/AFileZipEntry.java
@@ -5,12 +5,12 @@
* (C) Copyright 2009-2023, Arnaud Roques
*
* Project Info: http://plantuml.com
- *
+ *
* If you like this project or if you find it useful, you can support us at:
- *
+ *
* http://plantuml.com/patreon (only 1$ per month!)
* http://plantuml.com/paypal
- *
+ *
* This file is part of PlantUML.
*
* PlantUML is free software; you can redistribute it and/or modify it
@@ -40,7 +40,7 @@ import java.io.InputStream;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
-import net.sourceforge.plantuml.log.Logger;
+import net.sourceforge.plantuml.log.Logme;
import net.sourceforge.plantuml.security.SFile;
public class AFileZipEntry implements AFile {
@@ -76,7 +76,7 @@ public class AFileZipEntry implements AFile {
zis.closeEntry();
zis.close();
} catch (IOException e) {
- Logger.error(e);
+ Logme.error(e);
}
return null;
}
@@ -89,7 +89,7 @@ public class AFileZipEntry implements AFile {
is.close();
return true;
} catch (IOException e) {
- Logger.error(e);
+ Logme.error(e);
}
}
}
diff --git a/src/net/sourceforge/plantuml/BlockUml.java b/src/net/sourceforge/plantuml/BlockUml.java
index d9104e9cf..6fddffede 100644
--- a/src/net/sourceforge/plantuml/BlockUml.java
+++ b/src/net/sourceforge/plantuml/BlockUml.java
@@ -5,12 +5,12 @@
* (C) Copyright 2009-2023, Arnaud Roques
*
* Project Info: http://plantuml.com
- *
+ *
* If you like this project or if you find it useful, you can support us at:
- *
+ *
* http://plantuml.com/patreon (only 1$ per month!)
* http://plantuml.com/paypal
- *
+ *
* This file is part of PlantUML.
*
* PlantUML is free software; you can redistribute it and/or modify it
@@ -55,7 +55,7 @@ import net.sourceforge.plantuml.code.TranscoderUtil;
import net.sourceforge.plantuml.command.regex.Matcher2;
import net.sourceforge.plantuml.core.Diagram;
import net.sourceforge.plantuml.error.PSystemErrorPreprocessor;
-import net.sourceforge.plantuml.log.Logger;
+import net.sourceforge.plantuml.log.Logme;
import net.sourceforge.plantuml.preproc.Defines;
import net.sourceforge.plantuml.preproc.FileWithSuffix;
import net.sourceforge.plantuml.preproc2.PreprocessorModeSet;
@@ -198,7 +198,7 @@ public class BlockUml {
final byte[] digest = msgDigest.digest();
return coder.encode(digest);
} catch (Exception e) {
- Logger.error(e);
+ Logme.error(e);
return "NOETAG";
}
}
diff --git a/src/net/sourceforge/plantuml/Dimension2DDouble.java b/src/net/sourceforge/plantuml/Dimension2DDouble.java
index 4b0222e17..bf091c48e 100644
--- a/src/net/sourceforge/plantuml/Dimension2DDouble.java
+++ b/src/net/sourceforge/plantuml/Dimension2DDouble.java
@@ -36,9 +36,9 @@
package net.sourceforge.plantuml;
import java.awt.Dimension;
-import net.sourceforge.plantuml.awt.geom.Dimension2D;
import java.awt.geom.Point2D;
+import net.sourceforge.plantuml.awt.geom.Dimension2D;
import net.sourceforge.plantuml.utils.MathUtils;
public class Dimension2DDouble extends Dimension2D {
diff --git a/src/net/sourceforge/plantuml/DirWatcher2.java b/src/net/sourceforge/plantuml/DirWatcher2.java
index 08df525b4..ac185198a 100644
--- a/src/net/sourceforge/plantuml/DirWatcher2.java
+++ b/src/net/sourceforge/plantuml/DirWatcher2.java
@@ -5,12 +5,12 @@
* (C) Copyright 2009-2023, Arnaud Roques
*
* Project Info: http://plantuml.com
- *
+ *
* If you like this project or if you find it useful, you can support us at:
- *
+ *
* http://plantuml.com/patreon (only 1$ per month!)
* http://plantuml.com/paypal
- *
+ *
* This file is part of PlantUML.
*
* PlantUML is free software; you can redistribute it and/or modify it
@@ -31,7 +31,7 @@
*
* Original Author: Arnaud Roques
*
- *
+ *
*/
package net.sourceforge.plantuml;
@@ -49,7 +49,7 @@ import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
-import net.sourceforge.plantuml.log.Logger;
+import net.sourceforge.plantuml.log.Logme;
import net.sourceforge.plantuml.preproc.FileWithSuffix;
public class DirWatcher2 {
@@ -99,7 +99,7 @@ public class DirWatcher2 {
modifieds.put(f, new FileWatcher(files));
return Collections.unmodifiableList(generatedImages);
} catch (Exception e) {
- Logger.error(e);
+ Logme.error(e);
return Collections.emptyList();
}
}
diff --git a/src/net/sourceforge/plantuml/EmbeddedDiagram.java b/src/net/sourceforge/plantuml/EmbeddedDiagram.java
index 574975da2..1dc9bbb72 100644
--- a/src/net/sourceforge/plantuml/EmbeddedDiagram.java
+++ b/src/net/sourceforge/plantuml/EmbeddedDiagram.java
@@ -5,12 +5,12 @@
* (C) Copyright 2009-2023, Arnaud Roques
*
* Project Info: http://plantuml.com
- *
+ *
* If you like this project or if you find it useful, you can support us at:
- *
+ *
* http://plantuml.com/patreon (only 1$ per month!)
* http://plantuml.com/paypal
- *
+ *
* This file is part of PlantUML.
*
* PlantUML is free software; you can redistribute it and/or modify it
@@ -30,7 +30,7 @@
*
*
* Original Author: Arnaud Roques
- *
+ *
*
*/
package net.sourceforge.plantuml;
@@ -49,7 +49,7 @@ import net.sourceforge.plantuml.graphic.AbstractTextBlock;
import net.sourceforge.plantuml.graphic.HorizontalAlignment;
import net.sourceforge.plantuml.graphic.Line;
import net.sourceforge.plantuml.graphic.StringBounder;
-import net.sourceforge.plantuml.log.Logger;
+import net.sourceforge.plantuml.log.Logme;
import net.sourceforge.plantuml.preproc.Defines;
import net.sourceforge.plantuml.security.SImageIO;
import net.sourceforge.plantuml.ugraphic.AffineTransformType;
@@ -82,9 +82,9 @@ class EmbeddedDiagramDraw extends AbstractTextBlock implements Line, Atom {
final BufferedImage im = getImage();
return new Dimension2DDouble(im.getWidth(), im.getHeight());
} catch (IOException e) {
- Logger.error(e);
+ Logme.error(e);
} catch (InterruptedException e) {
- Logger.error(e);
+ Logme.error(e);
}
return new Dimension2DDouble(42, 42);
}
@@ -102,9 +102,9 @@ class EmbeddedDiagramDraw extends AbstractTextBlock implements Line, Atom {
final UShape image = new UImage(new PixelImage(im, AffineTransformType.TYPE_BILINEAR));
ug.draw(image);
} catch (IOException e) {
- Logger.error(e);
+ Logme.error(e);
} catch (InterruptedException e) {
- Logger.error(e);
+ Logme.error(e);
}
}
diff --git a/src/net/sourceforge/plantuml/FileFormat.java b/src/net/sourceforge/plantuml/FileFormat.java
index b2044074d..0e42638fc 100644
--- a/src/net/sourceforge/plantuml/FileFormat.java
+++ b/src/net/sourceforge/plantuml/FileFormat.java
@@ -5,12 +5,12 @@
* (C) Copyright 2009-2023, Arnaud Roques
*
* Project Info: http://plantuml.com
- *
+ *
* If you like this project or if you find it useful, you can support us at:
- *
+ *
* http://plantuml.com/patreon (only 1$ per month!)
* http://plantuml.com/paypal
- *
+ *
* This file is part of PlantUML.
*
* PlantUML is free software; you can redistribute it and/or modify it
@@ -39,16 +39,16 @@ import java.awt.Font;
import java.awt.FontMetrics;
import java.awt.Graphics2D;
import java.awt.RenderingHints;
-import net.sourceforge.plantuml.awt.geom.Dimension2D;
import java.awt.geom.Rectangle2D;
import java.awt.image.BufferedImage;
import java.io.IOException;
+import net.sourceforge.plantuml.awt.geom.Dimension2D;
import net.sourceforge.plantuml.braille.BrailleCharFactory;
import net.sourceforge.plantuml.braille.UGraphicBraille;
import net.sourceforge.plantuml.graphic.StringBounder;
import net.sourceforge.plantuml.graphic.StringBounderRaw;
-import net.sourceforge.plantuml.log.Logger;
+import net.sourceforge.plantuml.log.Logme;
import net.sourceforge.plantuml.png.MetadataTag;
import net.sourceforge.plantuml.security.SFile;
import net.sourceforge.plantuml.svg.SvgGraphics;
@@ -57,9 +57,9 @@ import net.sourceforge.plantuml.ugraphic.debug.StringBounderDebug;
/**
* Format for output files generated by PlantUML.
- *
+ *
* @author Arnaud Roques
- *
+ *
*/
public enum FileFormat {
PNG("image/png"),
@@ -97,7 +97,7 @@ public enum FileFormat {
/**
* Returns the file format to be used for that format.
- *
+ *
* @return a string starting by a point.
*/
public String getFileSuffix() {
@@ -229,7 +229,7 @@ public enum FileFormat {
/**
* Check if this file format is Encapsulated PostScript.
- *
+ *
* @return true for EPS.
*/
public boolean isEps() {
@@ -300,7 +300,7 @@ public enum FileFormat {
}
} catch (IOException e) {
- Logger.error(e);
+ Logme.error(e);
}
return false;
}
diff --git a/src/net/sourceforge/plantuml/GeneratedImageImpl.java b/src/net/sourceforge/plantuml/GeneratedImageImpl.java
index f949b251b..308825ba9 100644
--- a/src/net/sourceforge/plantuml/GeneratedImageImpl.java
+++ b/src/net/sourceforge/plantuml/GeneratedImageImpl.java
@@ -5,12 +5,12 @@
* (C) Copyright 2009-2023, Arnaud Roques
*
* Project Info: http://plantuml.com
- *
+ *
* If you like this project or if you find it useful, you can support us at:
- *
+ *
* http://plantuml.com/patreon (only 1$ per month!)
* http://plantuml.com/paypal
- *
+ *
* This file is part of PlantUML.
*
* PlantUML is free software; you can redistribute it and/or modify it
@@ -40,7 +40,7 @@ import java.io.IOException;
import net.sourceforge.plantuml.core.Diagram;
import net.sourceforge.plantuml.error.PSystemError;
-import net.sourceforge.plantuml.log.Logger;
+import net.sourceforge.plantuml.log.Logme;
import net.sourceforge.plantuml.security.SFile;
public class GeneratedImageImpl implements GeneratedImage {
@@ -89,7 +89,7 @@ public class GeneratedImageImpl implements GeneratedImage {
return cmp;
}
} catch (IOException e) {
- Logger.error(e);
+ Logme.error(e);
}
return this.description.compareTo(this2.getDescription());
}
diff --git a/src/net/sourceforge/plantuml/Log.java b/src/net/sourceforge/plantuml/Log.java
index 9cc45079a..26be31d3f 100644
--- a/src/net/sourceforge/plantuml/Log.java
+++ b/src/net/sourceforge/plantuml/Log.java
@@ -5,12 +5,12 @@
* (C) Copyright 2009-2023, Arnaud Roques
*
* Project Info: http://plantuml.com
- *
+ *
* If you like this project or if you find it useful, you can support us at:
- *
+ *
* http://plantuml.com/patreon (only 1$ per month!)
* http://plantuml.com/paypal
- *
+ *
* This file is part of PlantUML.
*
* PlantUML is free software; you can redistribute it and/or modify it
@@ -35,34 +35,23 @@
*/
package net.sourceforge.plantuml;
-import net.sourceforge.plantuml.log.Logger;
-
-public class Log {
+public abstract class Log {
private static final long start = System.currentTimeMillis();
public synchronized static void debug(String s) {
- // noop
- }
-
- public static void println(Object s) {
- // noop
- }
-
- public static void header(String s) {
- // noop
}
public synchronized static void info(String s) {
if (OptionFlags.getInstance().isVerbose()) {
ProgressBar.clear();
- Logger.error(format(s));
+ System.err.println(format(s));
}
}
public synchronized static void error(String s) {
ProgressBar.clear();
- Logger.error(s);
+ System.err.println(s);
}
private static String format(String s) {
@@ -104,5 +93,20 @@ public class Log {
sb.append(" Mo - ");
sb.append(s);
return sb.toString();
+
+ }
+
+ public static void println(Object s) {
+ // if (header2.get() == null) {
+ // System.err.println("L = " + s);
+ // } else {
+ // System.err.println(header2.get() + " " + s);
+ // }
+ }
+
+ // private static final ThreadLocal header2 = new ThreadLocal<>();
+ //
+ public static void header(String s) {
+ // header2.set(s);
}
}
diff --git a/src/net/sourceforge/plantuml/OptionFlags.java b/src/net/sourceforge/plantuml/OptionFlags.java
index d981acdec..24211dc90 100644
--- a/src/net/sourceforge/plantuml/OptionFlags.java
+++ b/src/net/sourceforge/plantuml/OptionFlags.java
@@ -5,12 +5,12 @@
* (C) Copyright 2009-2023, Arnaud Roques
*
* Project Info: http://plantuml.com
- *
+ *
* If you like this project or if you find it useful, you can support us at:
- *
+ *
* http://plantuml.com/patreon (only 1$ per month!)
* http://plantuml.com/paypal
- *
+ *
* This file is part of PlantUML.
*
* PlantUML is free software; you can redistribute it and/or modify it
@@ -41,7 +41,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
import net.sourceforge.plantuml.core.Diagram;
import net.sourceforge.plantuml.cucadiagram.dot.GraphvizUtils;
-import net.sourceforge.plantuml.log.Logger;
+import net.sourceforge.plantuml.log.Logme;
import net.sourceforge.plantuml.security.SFile;
import net.sourceforge.plantuml.security.SecurityUtils;
@@ -218,7 +218,7 @@ public class OptionFlags {
ps.println();
} catch (FileNotFoundException e) {
Log.error("Cannot open " + logData);
- Logger.error(e);
+ Logme.error(e);
}
}
}
@@ -230,7 +230,7 @@ public class OptionFlags {
ps.println();
} catch (FileNotFoundException e) {
Log.error("Cannot open " + logData);
- Logger.error(e);
+ Logme.error(e);
}
}
diff --git a/src/net/sourceforge/plantuml/Run.java b/src/net/sourceforge/plantuml/Run.java
index 8bd63d3a4..33c056623 100644
--- a/src/net/sourceforge/plantuml/Run.java
+++ b/src/net/sourceforge/plantuml/Run.java
@@ -5,12 +5,12 @@
* (C) Copyright 2009-2023, Arnaud Roques
*
* Project Info: http://plantuml.com
- *
+ *
* If you like this project or if you find it useful, you can support us at:
- *
+ *
* http://plantuml.com/patreon (only 1$ per month!)
* http://plantuml.com/paypal
- *
+ *
* This file is part of PlantUML.
*
* PlantUML is free software; you can redistribute it and/or modify it
@@ -58,7 +58,7 @@ import net.sourceforge.plantuml.code.NoPlantumlCompressionException;
import net.sourceforge.plantuml.code.Transcoder;
import net.sourceforge.plantuml.code.TranscoderUtil;
import net.sourceforge.plantuml.ftp.FtpServer;
-import net.sourceforge.plantuml.log.Logger;
+import net.sourceforge.plantuml.log.Logme;
import net.sourceforge.plantuml.picoweb.PicoWebServer;
import net.sourceforge.plantuml.png.MetadataTag;
import net.sourceforge.plantuml.preproc.Stdlib;
@@ -404,7 +404,7 @@ public class Run {
return;
}
} catch (IOException e) {
- Logger.error(e);
+ Logme.error(e);
}
}
}
@@ -427,9 +427,9 @@ public class Run {
try {
manageFileInternal(f, option, error);
} catch (IOException e) {
- Logger.error(e);
+ Logme.error(e);
} catch (InterruptedException e) {
- Logger.error(e);
+ Logme.error(e);
}
incDone(error.hasError());
}
diff --git a/src/net/sourceforge/plantuml/SignatureUtils.java b/src/net/sourceforge/plantuml/SignatureUtils.java
index 993037993..7c26ba642 100644
--- a/src/net/sourceforge/plantuml/SignatureUtils.java
+++ b/src/net/sourceforge/plantuml/SignatureUtils.java
@@ -5,12 +5,12 @@
* (C) Copyright 2009-2023, Arnaud Roques
*
* Project Info: http://plantuml.com
- *
+ *
* If you like this project or if you find it useful, you can support us at:
- *
+ *
* http://plantuml.com/patreon (only 1$ per month!)
* http://plantuml.com/paypal
- *
+ *
* This file is part of PlantUML.
*
* PlantUML is free software; you can redistribute it and/or modify it
@@ -50,7 +50,7 @@ import javax.crypto.SecretKeyFactory;
import javax.crypto.spec.PBEKeySpec;
import net.sourceforge.plantuml.code.AsciiEncoder;
-import net.sourceforge.plantuml.log.Logger;
+import net.sourceforge.plantuml.log.Logme;
import net.sourceforge.plantuml.security.SFile;
public class SignatureUtils {
@@ -78,10 +78,10 @@ public class SignatureUtils {
final byte[] digest = getMD5raw(s);
return toString(digest);
} catch (NoSuchAlgorithmException e) {
- Logger.error(e);
+ Logme.error(e);
throw new UnsupportedOperationException(e);
} catch (UnsupportedEncodingException e) {
- Logger.error(e);
+ Logme.error(e);
throw new UnsupportedOperationException(e);
}
}
@@ -105,10 +105,10 @@ public class SignatureUtils {
assert digest.length == 16;
return toHexString(digest);
} catch (NoSuchAlgorithmException e) {
- Logger.error(e);
+ Logme.error(e);
throw new UnsupportedOperationException(e);
} catch (UnsupportedEncodingException e) {
- Logger.error(e);
+ Logme.error(e);
throw new UnsupportedOperationException(e);
}
}
@@ -119,10 +119,10 @@ public class SignatureUtils {
assert digest.length == 64;
return toHexString(digest);
} catch (NoSuchAlgorithmException e) {
- Logger.error(e);
+ Logme.error(e);
throw new UnsupportedOperationException(e);
} catch (UnsupportedEncodingException e) {
- Logger.error(e);
+ Logme.error(e);
throw new UnsupportedOperationException(e);
}
}
@@ -161,10 +161,10 @@ public class SignatureUtils {
final byte[] digest = msgDigest.digest();
return toString(digest);
} catch (NoSuchAlgorithmException e) {
- Logger.error(e);
+ Logme.error(e);
throw new UnsupportedOperationException(e);
} catch (UnsupportedEncodingException e) {
- Logger.error(e);
+ Logme.error(e);
throw new UnsupportedOperationException(e);
}
}
@@ -195,10 +195,10 @@ public class SignatureUtils {
final byte[] digest = msgDigest.digest();
return toString(digest);
} catch (NoSuchAlgorithmException e) {
- Logger.error(e);
+ Logme.error(e);
throw new UnsupportedOperationException(e);
} catch (UnsupportedEncodingException e) {
- Logger.error(e);
+ Logme.error(e);
throw new UnsupportedOperationException(e);
}
}
diff --git a/src/net/sourceforge/plantuml/SkinParam.java b/src/net/sourceforge/plantuml/SkinParam.java
index 5f5e9acf0..5d586392b 100644
--- a/src/net/sourceforge/plantuml/SkinParam.java
+++ b/src/net/sourceforge/plantuml/SkinParam.java
@@ -5,12 +5,12 @@
* (C) Copyright 2009-2023, Arnaud Roques
*
* Project Info: http://plantuml.com
- *
+ *
* If you like this project or if you find it useful, you can support us at:
- *
+ *
* http://plantuml.com/patreon (only 1$ per month!)
* http://plantuml.com/paypal
- *
+ *
* This file is part of PlantUML.
*
* PlantUML is free software; you can redistribute it and/or modify it
@@ -63,7 +63,7 @@ import net.sourceforge.plantuml.cucadiagram.Stereotype;
import net.sourceforge.plantuml.cucadiagram.dot.DotSplines;
import net.sourceforge.plantuml.graphic.HorizontalAlignment;
import net.sourceforge.plantuml.graphic.color.Colors;
-import net.sourceforge.plantuml.log.Logger;
+import net.sourceforge.plantuml.log.Logme;
import net.sourceforge.plantuml.skin.ActorStyle;
import net.sourceforge.plantuml.skin.ArrowDirection;
import net.sourceforge.plantuml.skin.Padder;
@@ -112,7 +112,7 @@ public class SkinParam implements ISkinParam {
try {
this.styleBuilder = getCurrentStyleBuilderInternal();
} catch (IOException e) {
- Logger.error(e);
+ Logme.error(e);
}
}
return styleBuilder;
@@ -179,7 +179,7 @@ public class SkinParam implements ISkinParam {
this.muteStyle(modifiedStyle);
} catch (IOException e) {
- Logger.error(e);
+ Logme.error(e);
}
}
}
diff --git a/src/net/sourceforge/plantuml/SourceFileReaderAbstract.java b/src/net/sourceforge/plantuml/SourceFileReaderAbstract.java
index 35747099f..b466eb6ba 100644
--- a/src/net/sourceforge/plantuml/SourceFileReaderAbstract.java
+++ b/src/net/sourceforge/plantuml/SourceFileReaderAbstract.java
@@ -5,12 +5,12 @@
* (C) Copyright 2009-2023, Arnaud Roques
*
* Project Info: http://plantuml.com
- *
+ *
* If you like this project or if you find it useful, you can support us at:
- *
+ *
* http://plantuml.com/patreon (only 1$ per month!)
* http://plantuml.com/paypal
- *
+ *
* This file is part of PlantUML.
*
* PlantUML is free software; you can redistribute it and/or modify it
@@ -54,10 +54,9 @@ import java.util.List;
import java.util.Set;
import net.sourceforge.plantuml.api.ImageDataSimple;
-import net.sourceforge.plantuml.api.ThemeStyle;
import net.sourceforge.plantuml.core.Diagram;
import net.sourceforge.plantuml.error.PSystemError;
-import net.sourceforge.plantuml.log.Logger;
+import net.sourceforge.plantuml.log.Logme;
import net.sourceforge.plantuml.preproc.Defines;
import net.sourceforge.plantuml.preproc.FileWithSuffix;
import net.sourceforge.plantuml.security.SFile;
@@ -160,7 +159,7 @@ public abstract class SourceFileReaderAbstract implements ISourceFileReader {
try {
system = blockUml.getDiagram();
} catch (Throwable t) {
- Logger.error(t);
+ Logme.error(t);
if (OptionFlags.getInstance().isSilentlyCompletelyIgnoreErrors() || noerror) {
continue;
}
diff --git a/src/net/sourceforge/plantuml/Splash.java b/src/net/sourceforge/plantuml/Splash.java
index 26cbeb5a8..79468d5d3 100644
--- a/src/net/sourceforge/plantuml/Splash.java
+++ b/src/net/sourceforge/plantuml/Splash.java
@@ -5,12 +5,12 @@
* (C) Copyright 2009-2023, Arnaud Roques
*
* Project Info: http://plantuml.com
- *
+ *
* If you like this project or if you find it useful, you can support us at:
- *
+ *
* http://plantuml.com/patreon (only 1$ per month!)
* http://plantuml.com/paypal
- *
+ *
* This file is part of PlantUML.
*
* PlantUML is free software; you can redistribute it and/or modify it
@@ -51,7 +51,7 @@ import java.awt.image.BufferedImage;
import java.net.URL;
import java.util.concurrent.atomic.AtomicInteger;
-import net.sourceforge.plantuml.log.Logger;
+import net.sourceforge.plantuml.log.Logme;
import net.sourceforge.plantuml.version.PSystemVersion;
public class Splash extends Window implements MouseListener, MouseMotionListener {
@@ -140,7 +140,7 @@ public class Splash extends Window implements MouseListener, MouseMotionListener
try {
Desktop.getDesktop().browse(new URL("https://plantuml.com").toURI());
} catch (Exception e) {
- Logger.error(e);
+ Logme.error(e);
}
return;
}
diff --git a/src/net/sourceforge/plantuml/TitledDiagram.java b/src/net/sourceforge/plantuml/TitledDiagram.java
index 85c73457d..007be77fd 100644
--- a/src/net/sourceforge/plantuml/TitledDiagram.java
+++ b/src/net/sourceforge/plantuml/TitledDiagram.java
@@ -5,12 +5,12 @@
* (C) Copyright 2009-2023, Arnaud Roques
*
* Project Info: http://plantuml.com
- *
+ *
* If you like this project or if you find it useful, you can support us at:
- *
+ *
* http://plantuml.com/patreon (only 1$ per month!)
* http://plantuml.com/paypal
- *
+ *
* This file is part of PlantUML.
*
* PlantUML is free software; you can redistribute it and/or modify it
@@ -261,7 +261,7 @@ public abstract class TitledDiagram extends AbstractPSystem implements Diagram,
final AnimationDecoder animationDecoder = new AnimationDecoder(animationData);
this.animation = Animation.create(animationDecoder.decode());
// } catch (ScriptException e) {
-// Logger.error(e);
+// Logme.error(e);
// }
}
diff --git a/src/net/sourceforge/plantuml/UmlDiagram.java b/src/net/sourceforge/plantuml/UmlDiagram.java
index b162c4e31..a8f8f31bb 100644
--- a/src/net/sourceforge/plantuml/UmlDiagram.java
+++ b/src/net/sourceforge/plantuml/UmlDiagram.java
@@ -5,12 +5,12 @@
* (C) Copyright 2009-2023, Arnaud Roques
*
* Project Info: http://plantuml.com
- *
+ *
* If you like this project or if you find it useful, you can support us at:
- *
+ *
* http://plantuml.com/patreon (only 1$ per month!)
* http://plantuml.com/paypal
- *
+ *
* This file is part of PlantUML.
*
* PlantUML is free software; you can redistribute it and/or modify it
@@ -39,7 +39,6 @@ import static net.sourceforge.plantuml.ugraphic.ImageBuilder.plainImageBuilder;
import java.awt.Color;
import java.awt.geom.AffineTransform;
-import net.sourceforge.plantuml.awt.geom.Dimension2D;
import java.awt.image.BufferedImage;
import java.io.BufferedOutputStream;
import java.io.ByteArrayOutputStream;
@@ -53,6 +52,7 @@ import java.util.List;
import net.sourceforge.plantuml.api.ImageDataSimple;
import net.sourceforge.plantuml.api.ThemeStyle;
+import net.sourceforge.plantuml.awt.geom.Dimension2D;
import net.sourceforge.plantuml.command.CommandExecutionResult;
import net.sourceforge.plantuml.core.Diagram;
import net.sourceforge.plantuml.core.ImageData;
@@ -65,11 +65,11 @@ import net.sourceforge.plantuml.fun.IconLoader;
import net.sourceforge.plantuml.graphic.GraphicPosition;
import net.sourceforge.plantuml.graphic.GraphicStrings;
import net.sourceforge.plantuml.graphic.UDrawable;
-import net.sourceforge.plantuml.log.Logger;
+import net.sourceforge.plantuml.log.Logme;
import net.sourceforge.plantuml.mjpeg.MJPEGGenerator;
import net.sourceforge.plantuml.pdf.PdfConverter;
-import net.sourceforge.plantuml.security.SImageIO;
import net.sourceforge.plantuml.security.SFile;
+import net.sourceforge.plantuml.security.SImageIO;
import net.sourceforge.plantuml.security.SecurityUtils;
import net.sourceforge.plantuml.style.NoStyleAvailableException;
import net.sourceforge.plantuml.svek.EmptySvgException;
@@ -136,13 +136,13 @@ public abstract class UmlDiagram extends TitledDiagram implements Diagram, Annot
this.lastInfo = new Dimension2DDouble(imageData.getWidth(), imageData.getHeight());
return imageData;
} catch (NoStyleAvailableException e) {
- // Logger.error(e);
+ // Logme.error(e);
exportDiagramError(os, e, fileFormatOption, null);
} catch (UnparsableGraphvizException e) {
- Logger.error(e);
+ Logme.error(e);
exportDiagramError(os, e.getCause(), fileFormatOption, e.getGraphvizVersion());
} catch (Throwable e) {
- // Logger.error(e);
+ // Logme.error(e);
exportDiagramError(os, e, fileFormatOption, null);
}
return ImageDataSimple.error();
@@ -171,7 +171,7 @@ public abstract class UmlDiagram extends TitledDiagram implements Diagram, Annot
im2 = utils.exportFlashcode(flash, Color.BLACK, Color.WHITE);
} catch (Throwable e) {
Log.error("Issue in flashcode generation " + e);
- // Logger.error(e);
+ // Logme.error(e);
}
if (im2 != null)
GraphvizCrash.addDecodeHint(strings);
diff --git a/src/net/sourceforge/plantuml/acearth/PSystemXearthFactory.java b/src/net/sourceforge/plantuml/acearth/PSystemXearthFactory.java
index b96e7feee..a783eabe5 100644
--- a/src/net/sourceforge/plantuml/acearth/PSystemXearthFactory.java
+++ b/src/net/sourceforge/plantuml/acearth/PSystemXearthFactory.java
@@ -47,7 +47,7 @@ import net.sourceforge.plantuml.command.regex.Matcher2;
import net.sourceforge.plantuml.command.regex.MyPattern;
import net.sourceforge.plantuml.command.regex.Pattern2;
import net.sourceforge.plantuml.core.UmlSource;
-import net.sourceforge.plantuml.log.Logger;
+import net.sourceforge.plantuml.log.Logme;
public class PSystemXearthFactory extends PSystemBasicFactory {
@@ -101,7 +101,7 @@ public class PSystemXearthFactory extends PSystemBasicFactory {
return system;
}
} catch (Exception e) {
- Logger.error(e);
+ Logme.error(e);
return null;
}
return null;
diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorIf.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorIf.java
index 932224044..1df7a5ac5 100644
--- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorIf.java
+++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorIf.java
@@ -97,8 +97,4 @@ public class FtileFactoryDelegatorIf extends FtileFactoryDelegator {
conditionEndStyle, thens.get(0), elseBranch, skinParam(), getStringBounder(), fcArrow, fcTest, url);
}
- private HColor fontColor(FontParam param) {
- return skinParam().getFontHtmlColor(null, param);
- }
-
}
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 e0ae1d65e..e7a13043b 100644
--- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/cond/ConditionalBuilder.java
+++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/cond/ConditionalBuilder.java
@@ -311,8 +311,4 @@ public class ConditionalBuilder {
&& tile2.calculateDimension(stringBounder).hasPointOut();
}
- // private HtmlColor fontColor() {
- // return skinParam.getFontHtmlColor(FontParam.ACTIVITY_DIAMOND, null);
- // }
-
}
diff --git a/src/net/sourceforge/plantuml/activitydiagram3/gtile/Gtiles.java b/src/net/sourceforge/plantuml/activitydiagram3/gtile/Gtiles.java
index 5ec1e3d67..7378e5b2d 100644
--- a/src/net/sourceforge/plantuml/activitydiagram3/gtile/Gtiles.java
+++ b/src/net/sourceforge/plantuml/activitydiagram3/gtile/Gtiles.java
@@ -94,10 +94,6 @@ public class Gtiles {
swimlane);
}
- private static HColor fontColor(ISkinParam skinParam, FontParam param) {
- return skinParam.getFontHtmlColor(null, param);
- }
-
static public Gtile withSouthMargin(Gtile orig, double south) {
return new GtileWithMargin((AbstractGtileRoot) orig, 0, south, 0);
diff --git a/src/net/sourceforge/plantuml/ant/CheckZipTask.java b/src/net/sourceforge/plantuml/ant/CheckZipTask.java
index d8943a080..f6c628a20 100644
--- a/src/net/sourceforge/plantuml/ant/CheckZipTask.java
+++ b/src/net/sourceforge/plantuml/ant/CheckZipTask.java
@@ -5,12 +5,12 @@
* (C) Copyright 2009-2023, Arnaud Roques
*
* Project Info: http://plantuml.com
- *
+ *
* If you like this project or if you find it useful, you can support us at:
- *
+ *
* http://plantuml.com/patreon (only 1$ per month!)
* http://plantuml.com/paypal
- *
+ *
* This file is part of PlantUML.
*
* PlantUML is free software; you can redistribute it and/or modify it
@@ -44,13 +44,12 @@ import java.util.List;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
-import net.sourceforge.plantuml.log.Logger;
-
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Task;
import org.apache.tools.ant.types.FileList;
import org.apache.tools.ant.types.FileSet;
+import net.sourceforge.plantuml.log.Logme;
import net.sourceforge.plantuml.security.SFile;
import net.sourceforge.plantuml.security.SecurityUtils;
@@ -86,7 +85,7 @@ public class CheckZipTask extends Task {
manageFileList(fileList);
}
} catch (IOException e) {
- Logger.error(e);
+ Logme.error(e);
throw new BuildException(e.toString());
}
}
diff --git a/src/net/sourceforge/plantuml/ant/PlantUmlTask.java b/src/net/sourceforge/plantuml/ant/PlantUmlTask.java
index 14cf1f34d..00bc76097 100644
--- a/src/net/sourceforge/plantuml/ant/PlantUmlTask.java
+++ b/src/net/sourceforge/plantuml/ant/PlantUmlTask.java
@@ -5,12 +5,12 @@
* (C) Copyright 2009-2023, Arnaud Roques
*
* Project Info: http://plantuml.com
- *
+ *
* If you like this project or if you find it useful, you can support us at:
- *
+ *
* http://plantuml.com/patreon (only 1$ per month!)
* http://plantuml.com/paypal
- *
+ *
* This file is part of PlantUML.
*
* PlantUML is free software; you can redistribute it and/or modify it
@@ -46,8 +46,6 @@ import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
-import net.sourceforge.plantuml.log.Logger;
-
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.DirectoryScanner;
import org.apache.tools.ant.Task;
@@ -62,6 +60,7 @@ import net.sourceforge.plantuml.OptionFlags;
import net.sourceforge.plantuml.SourceFileReader;
import net.sourceforge.plantuml.Splash;
import net.sourceforge.plantuml.cucadiagram.dot.GraphvizUtils;
+import net.sourceforge.plantuml.log.Logme;
import net.sourceforge.plantuml.preproc.Defines;
import net.sourceforge.plantuml.stats.StatsUtils;
@@ -132,10 +131,10 @@ public class PlantUmlTask extends Task {
}
this.log("Nb images generated: " + nbFiles.get());
} catch (IOException e) {
- Logger.error(e);
+ Logme.error(e);
throw new BuildException(e.toString());
} catch (InterruptedException e) {
- Logger.error(e);
+ Logme.error(e);
throw new BuildException(e.toString());
}
diff --git a/src/net/sourceforge/plantuml/api/ImageDataAbstract.java b/src/net/sourceforge/plantuml/api/ImageDataAbstract.java
index cf8138203..f3c690dc1 100644
--- a/src/net/sourceforge/plantuml/api/ImageDataAbstract.java
+++ b/src/net/sourceforge/plantuml/api/ImageDataAbstract.java
@@ -37,7 +37,6 @@ package net.sourceforge.plantuml.api;
import net.sourceforge.plantuml.annotation.HaxeIgnored;
import net.sourceforge.plantuml.awt.geom.Dimension2D;
-
import net.sourceforge.plantuml.core.ImageData;
public abstract class ImageDataAbstract implements ImageData {
diff --git a/src/net/sourceforge/plantuml/api/ImageDataComplex.java b/src/net/sourceforge/plantuml/api/ImageDataComplex.java
index 9f6bd4e12..7a3d90a79 100644
--- a/src/net/sourceforge/plantuml/api/ImageDataComplex.java
+++ b/src/net/sourceforge/plantuml/api/ImageDataComplex.java
@@ -35,10 +35,9 @@
*/
package net.sourceforge.plantuml.api;
-import net.sourceforge.plantuml.awt.geom.Dimension2D;
-
import net.sourceforge.plantuml.CMapData;
import net.sourceforge.plantuml.annotation.HaxeIgnored;
+import net.sourceforge.plantuml.awt.geom.Dimension2D;
public class ImageDataComplex extends ImageDataAbstract {
diff --git a/src/net/sourceforge/plantuml/api/ImageDataSimple.java b/src/net/sourceforge/plantuml/api/ImageDataSimple.java
index 659bfe1d5..132ddfa37 100644
--- a/src/net/sourceforge/plantuml/api/ImageDataSimple.java
+++ b/src/net/sourceforge/plantuml/api/ImageDataSimple.java
@@ -37,7 +37,6 @@ package net.sourceforge.plantuml.api;
import net.sourceforge.plantuml.annotation.HaxeIgnored;
import net.sourceforge.plantuml.awt.geom.Dimension2D;
-
import net.sourceforge.plantuml.core.ImageData;
public class ImageDataSimple extends ImageDataAbstract {
diff --git a/src/net/sourceforge/plantuml/api/NumberAnalyzed.java b/src/net/sourceforge/plantuml/api/NumberAnalyzed.java
index 3e35fbd24..bd4728201 100644
--- a/src/net/sourceforge/plantuml/api/NumberAnalyzed.java
+++ b/src/net/sourceforge/plantuml/api/NumberAnalyzed.java
@@ -3,12 +3,12 @@
* ========================================================================
*
* Project Info: http://plantuml.com
- *
+ *
* If you like this project or if you find it useful, you can support us at:
- *
+ *
* http://plantuml.com/patreon (only 1$ per month!)
* http://plantuml.com/paypal
- *
+ *
* This file is part of PlantUML.
*
* PlantUML is free software; you can redistribute it and/or modify it
@@ -35,8 +35,7 @@ import java.util.prefs.Preferences;
import net.sourceforge.plantuml.Log;
import net.sourceforge.plantuml.annotation.HaxeIgnored;
-import net.sourceforge.plantuml.log.Logger;
-
+import net.sourceforge.plantuml.log.Logme;
@HaxeIgnored
public class NumberAnalyzed implements INumberAnalyzed {
@@ -123,7 +122,7 @@ public class NumberAnalyzed implements INumberAnalyzed {
Long.parseLong(st.nextToken(), 36), Long.parseLong(st.nextToken(), 36), Long.parseLong(
st.nextToken(), 36), Long.parseLong(st.nextToken(), 36));
} catch (Exception e) {
- Logger.error(e);
+ Logme.error(e);
Log.info("Error reading " + value);
return null;
}
diff --git a/src/net/sourceforge/plantuml/api/NumberAnalyzed2.java b/src/net/sourceforge/plantuml/api/NumberAnalyzed2.java
index 61810caca..4977272cb 100644
--- a/src/net/sourceforge/plantuml/api/NumberAnalyzed2.java
+++ b/src/net/sourceforge/plantuml/api/NumberAnalyzed2.java
@@ -3,12 +3,12 @@
* ========================================================================
*
* Project Info: http://plantuml.com
- *
+ *
* If you like this project or if you find it useful, you can support us at:
- *
+ *
* http://plantuml.com/patreon (only 1$ per month!)
* http://plantuml.com/paypal
- *
+ *
* This file is part of PlantUML.
*
* PlantUML is free software; you can redistribute it and/or modify it
@@ -34,7 +34,7 @@ import java.util.prefs.Preferences;
import net.sourceforge.plantuml.Log;
import net.sourceforge.plantuml.annotation.HaxeIgnored;
-import net.sourceforge.plantuml.log.Logger;
+import net.sourceforge.plantuml.log.Logme;
@HaxeIgnored
public class NumberAnalyzed2 implements INumberAnalyzed {
@@ -96,7 +96,7 @@ public class NumberAnalyzed2 implements INumberAnalyzed {
Long.parseLong(st.nextToken(), 36), Long.parseLong(st.nextToken(), 36), Long.parseLong(
st.nextToken(), 36), Long.parseLong(st.nextToken(), 36));
} catch (Exception e) {
- Logger.error(e);
+ Logme.error(e);
Log.info("Error reading " + value);
return null;
}
diff --git a/src/net/sourceforge/plantuml/api/NumberAnalyzedDated.java b/src/net/sourceforge/plantuml/api/NumberAnalyzedDated.java
index 3cfb2062c..adab7d6bc 100644
--- a/src/net/sourceforge/plantuml/api/NumberAnalyzedDated.java
+++ b/src/net/sourceforge/plantuml/api/NumberAnalyzedDated.java
@@ -3,12 +3,12 @@
* ========================================================================
*
* Project Info: http://plantuml.com
- *
+ *
* If you like this project or if you find it useful, you can support us at:
- *
+ *
* http://plantuml.com/patreon (only 1$ per month!)
* http://plantuml.com/paypal
- *
+ *
* This file is part of PlantUML.
*
* PlantUML is free software; you can redistribute it and/or modify it
@@ -34,7 +34,7 @@ import java.util.prefs.Preferences;
import net.sourceforge.plantuml.Log;
import net.sourceforge.plantuml.annotation.HaxeIgnored;
-import net.sourceforge.plantuml.log.Logger;
+import net.sourceforge.plantuml.log.Logme;
@HaxeIgnored
public class NumberAnalyzedDated extends NumberAnalyzed {
@@ -105,7 +105,7 @@ public class NumberAnalyzedDated extends NumberAnalyzed {
Long.parseLong(st.nextToken(), 36), Long.parseLong(st.nextToken(), 36), Long.parseLong(
st.nextToken(), 36), st.nextToken());
} catch (Exception e) {
- Logger.error(e);
+ Logme.error(e);
Log.info("Error reading " + value);
return null;
}
diff --git a/src/net/sourceforge/plantuml/api/TimeoutExecutor.java b/src/net/sourceforge/plantuml/api/TimeoutExecutor.java
index a24a9f95b..766e2b1dc 100644
--- a/src/net/sourceforge/plantuml/api/TimeoutExecutor.java
+++ b/src/net/sourceforge/plantuml/api/TimeoutExecutor.java
@@ -5,12 +5,12 @@
* (C) Copyright 2009-2023, Arnaud Roques
*
* Project Info: http://plantuml.com
- *
+ *
* If you like this project or if you find it useful, you can support us at:
- *
+ *
* http://plantuml.com/patreon (only 1$ per month!)
* http://plantuml.com/paypal
- *
+ *
* This file is part of PlantUML.
*
* PlantUML is free software; you can redistribute it and/or modify it
@@ -35,10 +35,10 @@
*/
package net.sourceforge.plantuml.api;
-import net.sourceforge.plantuml.log.Logger;
-
import java.util.concurrent.atomic.AtomicBoolean;
+import net.sourceforge.plantuml.log.Logme;
+
public final class TimeoutExecutor {
private final long ms;
@@ -55,7 +55,7 @@ public final class TimeoutExecutor {
mainThread.join(ms);
} catch (InterruptedException e) {
System.err.println("TimeoutExecutorA " + e);
- Logger.error(e);
+ Logme.error(e);
return false;
} finally {
done = mainThread.done.get();
@@ -82,7 +82,7 @@ public final class TimeoutExecutor {
done.set(true);
} catch (InterruptedException e) {
System.err.println("TimeoutExecutorB " + e);
- Logger.error(e);
+ Logme.error(e);
}
}
diff --git a/src/net/sourceforge/plantuml/argon2/blake2/Blake2b.java b/src/net/sourceforge/plantuml/argon2/blake2/Blake2b.java
index 8112dfc62..05c4bc64a 100644
--- a/src/net/sourceforge/plantuml/argon2/blake2/Blake2b.java
+++ b/src/net/sourceforge/plantuml/argon2/blake2/Blake2b.java
@@ -26,7 +26,6 @@
package net.sourceforge.plantuml.argon2.blake2;
-import net.sourceforge.plantuml.log.Logger;
import static net.sourceforge.plantuml.argon2.blake2.Blake2b.Engine.Assert.*;
import static net.sourceforge.plantuml.argon2.blake2.Blake2b.Engine.LittleEndian.*;
@@ -897,7 +896,7 @@ public interface Blake2b {
public final static String exclusiveLowerBound = "'%s' %d is <= %d";
public final static String inclusiveLowerBound = "'%s' %d is < %d";
static String assertFail(final String name, final T v, final String err, final T spec) {
- Logger.error(new Exception());
+ new Exception().printStackTrace();
return String.format(err, name, v, spec);
}
}
diff --git a/src/net/sourceforge/plantuml/code/CompressionBrotli.java b/src/net/sourceforge/plantuml/code/CompressionBrotli.java
index 57a1a2bd8..d443e34b3 100644
--- a/src/net/sourceforge/plantuml/code/CompressionBrotli.java
+++ b/src/net/sourceforge/plantuml/code/CompressionBrotli.java
@@ -5,12 +5,12 @@
* (C) Copyright 2009-2023, Arnaud Roques
*
* Project Info: http://plantuml.com
- *
+ *
* If you like this project or if you find it useful, you can support us at:
- *
+ *
* http://plantuml.com/patreon (only 1$ per month!)
* http://plantuml.com/paypal
- *
+ *
* This file is part of PlantUML.
*
* PlantUML is free software; you can redistribute it and/or modify it
@@ -41,7 +41,7 @@ import java.io.IOException;
import net.sourceforge.plantuml.FileUtils;
import net.sourceforge.plantuml.brotli.BrotliInputStream;
-import net.sourceforge.plantuml.log.Logger;
+import net.sourceforge.plantuml.log.Logme;
public class CompressionBrotli implements Compression {
@@ -57,7 +57,7 @@ public class CompressionBrotli implements Compression {
FileUtils.copyToStream(brotli, result);
return ByteArray.from(result.toByteArray());
} catch (IOException e) {
- Logger.error(e);
+ Logme.error(e);
throw new NoPlantumlCompressionException(e);
}
}
diff --git a/src/net/sourceforge/plantuml/code/CompressionZlibAttic.java b/src/net/sourceforge/plantuml/code/CompressionZlibAttic.java
index 1095dee16..59616039a 100644
--- a/src/net/sourceforge/plantuml/code/CompressionZlibAttic.java
+++ b/src/net/sourceforge/plantuml/code/CompressionZlibAttic.java
@@ -5,12 +5,12 @@
* (C) Copyright 2009-2023, Arnaud Roques
*
* Project Info: http://plantuml.com
- *
+ *
* If you like this project or if you find it useful, you can support us at:
- *
+ *
* http://plantuml.com/patreon (only 1$ per month!)
* http://plantuml.com/paypal
- *
+ *
* This file is part of PlantUML.
*
* PlantUML is free software; you can redistribute it and/or modify it
@@ -91,7 +91,7 @@ public class CompressionZlibAttic implements Compression {
return ByteArray.from(result);
} catch (IOException e) {
- // Logger.error(e);
+ // Logme.error(e);
throw new NoPlantumlCompressionException(e);
}
@@ -115,7 +115,7 @@ public class CompressionZlibAttic implements Compression {
final byte[] result = copyArray(tmp, resultLength);
return result;
} catch (DataFormatException e) {
- // Logger.error(e);
+ // Logme.error(e);
throw new IOException(e.toString());
}
}
diff --git a/src/net/sourceforge/plantuml/code/Upf9Encoder.java b/src/net/sourceforge/plantuml/code/Upf9Encoder.java
index e59e00ef8..e97aa67a7 100644
--- a/src/net/sourceforge/plantuml/code/Upf9Encoder.java
+++ b/src/net/sourceforge/plantuml/code/Upf9Encoder.java
@@ -5,12 +5,12 @@
* (C) Copyright 2009-2023, Arnaud Roques
*
* Project Info: http://plantuml.com
- *
+ *
* If you like this project or if you find it useful, you can support us at:
- *
+ *
* http://plantuml.com/patreon (only 1$ per month!)
* http://plantuml.com/paypal
- *
+ *
* This file is part of PlantUML.
*
* PlantUML is free software; you can redistribute it and/or modify it
@@ -35,12 +35,12 @@
*/
package net.sourceforge.plantuml.code;
-import net.sourceforge.plantuml.log.Logger;
-
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
+import net.sourceforge.plantuml.log.Logme;
+
public class Upf9Encoder {
private Upf9Encoder() {
@@ -58,7 +58,7 @@ public class Upf9Encoder {
if (c == Upf9Decoder.decodeChar(new ByteArrayInputStream(result)))
return true;
} catch (IOException e) {
- Logger.error(e);
+ Logme.error(e);
}
return false;
}
diff --git a/src/net/sourceforge/plantuml/command/CommandSkinParam.java b/src/net/sourceforge/plantuml/command/CommandSkinParam.java
index ebd8c0ebf..5ea149719 100644
--- a/src/net/sourceforge/plantuml/command/CommandSkinParam.java
+++ b/src/net/sourceforge/plantuml/command/CommandSkinParam.java
@@ -5,12 +5,12 @@
* (C) Copyright 2009-2023, Arnaud Roques
*
* Project Info: http://plantuml.com
- *
+ *
* If you like this project or if you find it useful, you can support us at:
- *
+ *
* http://plantuml.com/patreon (only 1$ per month!)
* http://plantuml.com/paypal
- *
+ *
* This file is part of PlantUML.
*
* PlantUML is free software; you can redistribute it and/or modify it
@@ -30,7 +30,7 @@
*
*
* Original Author: Arnaud Roques
- *
+ *
*
*/
package net.sourceforge.plantuml.command;
@@ -64,7 +64,7 @@ public class CommandSkinParam extends SingleLineCommand2 {
diagram.setParam(arg.get("NAME", 0), arg.get("VALUE", 0));
return CommandExecutionResult.ok();
} catch (NoStyleAvailableException e) {
- // Logger.error(e);
+ // Logme.error(e);
return CommandExecutionResult.error("General failure: no style available.");
}
diff --git a/src/net/sourceforge/plantuml/command/ProtectedCommand.java b/src/net/sourceforge/plantuml/command/ProtectedCommand.java
index 85cad91fc..de8599d2a 100644
--- a/src/net/sourceforge/plantuml/command/ProtectedCommand.java
+++ b/src/net/sourceforge/plantuml/command/ProtectedCommand.java
@@ -5,12 +5,12 @@
* (C) Copyright 2009-2023, Arnaud Roques
*
* Project Info: http://plantuml.com
- *
+ *
* If you like this project or if you find it useful, you can support us at:
- *
+ *
* http://plantuml.com/patreon (only 1$ per month!)
* http://plantuml.com/paypal
- *
+ *
* This file is part of PlantUML.
*
* PlantUML is free software; you can redistribute it and/or modify it
@@ -30,7 +30,7 @@
*
*
* Original Author: Arnaud Roques
- *
+ *
*
*/
package net.sourceforge.plantuml.command;
@@ -39,7 +39,7 @@ import java.util.Objects;
import net.sourceforge.plantuml.Log;
import net.sourceforge.plantuml.core.Diagram;
-import net.sourceforge.plantuml.log.Logger;
+import net.sourceforge.plantuml.log.Logme;
import net.sourceforge.plantuml.version.Version;
public class ProtectedCommand implements Command {
@@ -59,11 +59,12 @@ public class ProtectedCommand implements Command {
// }
return result;
} catch (Throwable t) {
- Logger.error("Error ", t);
+ Log.error("Error " + t);
+ Logme.error(t);
String msg = "You should send a mail to plantuml@gmail.com or post to http://plantuml.com/qa with this log (V"
+ Version.versionString() + ")";
- Logger.error(msg);
- msg += " " + t;
+ Log.error(msg);
+ msg += " " + t.toString();
return CommandExecutionResult.error(msg, t);
}
}
diff --git a/src/net/sourceforge/plantuml/command/SkinLoader.java b/src/net/sourceforge/plantuml/command/SkinLoader.java
index 7905f6735..48444a418 100644
--- a/src/net/sourceforge/plantuml/command/SkinLoader.java
+++ b/src/net/sourceforge/plantuml/command/SkinLoader.java
@@ -5,12 +5,12 @@
* (C) Copyright 2009-2023, Arnaud Roques
*
* Project Info: http://plantuml.com
- *
+ *
* If you like this project or if you find it useful, you can support us at:
- *
+ *
* http://plantuml.com/patreon (only 1$ per month!)
* http://plantuml.com/paypal
- *
+ *
* This file is part of PlantUML.
*
* PlantUML is free software; you can redistribute it and/or modify it
@@ -30,7 +30,7 @@
*
*
* Original Author: Arnaud Roques
- *
+ *
*
*/
package net.sourceforge.plantuml.command;
@@ -106,7 +106,7 @@ public class SkinLoader {
}
return CommandExecutionResult.ok();
} catch (NoStyleAvailableException e) {
- // Logger.error(e);
+ // Logme.error(e);
return CommandExecutionResult.error("General failure: no style available.");
}
diff --git a/src/net/sourceforge/plantuml/creole/atom/Atom.java b/src/net/sourceforge/plantuml/creole/atom/Atom.java
index b44a912ae..b273506ae 100644
--- a/src/net/sourceforge/plantuml/creole/atom/Atom.java
+++ b/src/net/sourceforge/plantuml/creole/atom/Atom.java
@@ -35,9 +35,9 @@
*/
package net.sourceforge.plantuml.creole.atom;
-import net.sourceforge.plantuml.awt.geom.Dimension2D;
import java.util.List;
+import net.sourceforge.plantuml.awt.geom.Dimension2D;
import net.sourceforge.plantuml.graphic.StringBounder;
import net.sourceforge.plantuml.ugraphic.UGraphic;
import net.sourceforge.plantuml.ugraphic.UShape;
diff --git a/src/net/sourceforge/plantuml/creole/atom/AtomEmoji.java b/src/net/sourceforge/plantuml/creole/atom/AtomEmoji.java
index a942f478b..48508c0d9 100644
--- a/src/net/sourceforge/plantuml/creole/atom/AtomEmoji.java
+++ b/src/net/sourceforge/plantuml/creole/atom/AtomEmoji.java
@@ -35,9 +35,8 @@
*/
package net.sourceforge.plantuml.creole.atom;
-import net.sourceforge.plantuml.awt.geom.Dimension2D;
-
import net.sourceforge.plantuml.Dimension2DDouble;
+import net.sourceforge.plantuml.awt.geom.Dimension2D;
import net.sourceforge.plantuml.emoji.Emoji;
import net.sourceforge.plantuml.graphic.StringBounder;
import net.sourceforge.plantuml.ugraphic.UGraphic;
diff --git a/src/net/sourceforge/plantuml/creole/atom/AtomHorizontalTexts.java b/src/net/sourceforge/plantuml/creole/atom/AtomHorizontalTexts.java
index 8815df2f8..5880344a8 100644
--- a/src/net/sourceforge/plantuml/creole/atom/AtomHorizontalTexts.java
+++ b/src/net/sourceforge/plantuml/creole/atom/AtomHorizontalTexts.java
@@ -35,10 +35,10 @@
*/
package net.sourceforge.plantuml.creole.atom;
-import net.sourceforge.plantuml.awt.geom.Dimension2D;
import java.util.List;
import net.sourceforge.plantuml.Dimension2DDouble;
+import net.sourceforge.plantuml.awt.geom.Dimension2D;
import net.sourceforge.plantuml.graphic.StringBounder;
import net.sourceforge.plantuml.ugraphic.UGraphic;
import net.sourceforge.plantuml.ugraphic.UTranslate;
diff --git a/src/net/sourceforge/plantuml/creole/atom/AtomImg.java b/src/net/sourceforge/plantuml/creole/atom/AtomImg.java
index ab689df4b..69750352a 100644
--- a/src/net/sourceforge/plantuml/creole/atom/AtomImg.java
+++ b/src/net/sourceforge/plantuml/creole/atom/AtomImg.java
@@ -5,12 +5,12 @@
* (C) Copyright 2009-2023, Arnaud Roques
*
* Project Info: http://plantuml.com
- *
+ *
* If you like this project or if you find it useful, you can support us at:
- *
+ *
* http://plantuml.com/patreon (only 1$ per month!)
* http://plantuml.com/paypal
- *
+ *
* This file is part of PlantUML.
*
* PlantUML is free software; you can redistribute it and/or modify it
@@ -30,7 +30,7 @@
*
*
* Original Author: Arnaud Roques
- *
+ *
*
*/
package net.sourceforge.plantuml.creole.atom;
@@ -38,7 +38,6 @@ package net.sourceforge.plantuml.creole.atom;
import static java.nio.charset.StandardCharsets.UTF_8;
import java.awt.Color;
-import net.sourceforge.plantuml.awt.geom.Dimension2D;
import java.awt.image.BufferedImage;
import java.io.IOException;
@@ -46,6 +45,7 @@ import net.sourceforge.plantuml.Dimension2DDouble;
import net.sourceforge.plantuml.FileSystem;
import net.sourceforge.plantuml.FileUtils;
import net.sourceforge.plantuml.Url;
+import net.sourceforge.plantuml.awt.geom.Dimension2D;
import net.sourceforge.plantuml.code.Base64Coder;
import net.sourceforge.plantuml.creole.legacy.AtomTextUtils;
import net.sourceforge.plantuml.flashcode.FlashCodeFactory;
@@ -54,9 +54,9 @@ 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.log.Logger;
-import net.sourceforge.plantuml.security.SImageIO;
+import net.sourceforge.plantuml.log.Logme;
import net.sourceforge.plantuml.security.SFile;
+import net.sourceforge.plantuml.security.SImageIO;
import net.sourceforge.plantuml.security.SURL;
import net.sourceforge.plantuml.security.SecurityProfile;
import net.sourceforge.plantuml.security.SecurityUtils;
@@ -121,38 +121,38 @@ public class AtomImg extends AbstractAtom implements Atom {
try {
// Check if valid URL
if (src.startsWith("http:") || src.startsWith("https:")) {
- if (src.endsWith(".svg"))
+ if (src.endsWith(".svg"))
return buildSvgFromUrl(src, fc, SURL.create(src), scale, url);
-
+
return buildRasterFromUrl(src, fc, SURL.create(src), scale, url);
}
final SFile f = FileSystem.getInstance().getFile(src);
if (f.exists() == false) {
- if (SecurityUtils.getSecurityProfile() == SecurityProfile.UNSECURE)
+ if (SecurityUtils.getSecurityProfile() == SecurityProfile.UNSECURE)
return AtomTextUtils.createLegacy("(File not found: " + f.getPrintablePath() + ")", fc);
-
+
return AtomTextUtils.createLegacy("(Cannot decode)", fc);
}
if (f.getName().endsWith(".svg")) {
final String tmp = FileUtils.readSvg(f);
- if (tmp == null)
+ if (tmp == null)
return AtomTextUtils.createLegacy("(Cannot decode)", fc);
-
+
return new AtomImgSvg(new TileImageSvg(tmp, scale));
}
final BufferedImage read = f.readRasterImageFromFile();
if (read == null) {
- if (SecurityUtils.getSecurityProfile() == SecurityProfile.UNSECURE)
+ if (SecurityUtils.getSecurityProfile() == SecurityProfile.UNSECURE)
return AtomTextUtils.createLegacy("(Cannot decode: " + f.getPrintablePath() + ")", fc);
-
+
return AtomTextUtils.createLegacy("(Cannot decode)", fc);
}
return new AtomImg(f.readRasterImageFromFile(), scale, url, src);
} catch (IOException e) {
- Logger.error(e);
- if (SecurityUtils.getSecurityProfile() == SecurityProfile.UNSECURE)
+ Logme.error(e);
+ if (SecurityUtils.getSecurityProfile() == SecurityProfile.UNSECURE)
return AtomTextUtils.createLegacy("ERROR " + e.toString(), fc);
-
+
return AtomTextUtils.createLegacy("ERROR", fc);
}
}
diff --git a/src/net/sourceforge/plantuml/creole/atom/AtomImgSvg.java b/src/net/sourceforge/plantuml/creole/atom/AtomImgSvg.java
index 6fd1ca4db..e236261d0 100644
--- a/src/net/sourceforge/plantuml/creole/atom/AtomImgSvg.java
+++ b/src/net/sourceforge/plantuml/creole/atom/AtomImgSvg.java
@@ -36,7 +36,6 @@
package net.sourceforge.plantuml.creole.atom;
import net.sourceforge.plantuml.awt.geom.Dimension2D;
-
import net.sourceforge.plantuml.graphic.StringBounder;
import net.sourceforge.plantuml.graphic.TileImageSvg;
import net.sourceforge.plantuml.ugraphic.UGraphic;
diff --git a/src/net/sourceforge/plantuml/creole/atom/AtomMath.java b/src/net/sourceforge/plantuml/creole/atom/AtomMath.java
index dbc392d4e..a886afead 100644
--- a/src/net/sourceforge/plantuml/creole/atom/AtomMath.java
+++ b/src/net/sourceforge/plantuml/creole/atom/AtomMath.java
@@ -36,10 +36,10 @@
package net.sourceforge.plantuml.creole.atom;
import java.awt.Color;
-import net.sourceforge.plantuml.awt.geom.Dimension2D;
import java.awt.image.BufferedImage;
import net.sourceforge.plantuml.Dimension2DDouble;
+import net.sourceforge.plantuml.awt.geom.Dimension2D;
import net.sourceforge.plantuml.graphic.StringBounder;
import net.sourceforge.plantuml.math.ScientificEquationSafe;
import net.sourceforge.plantuml.ugraphic.UGraphic;
diff --git a/src/net/sourceforge/plantuml/creole/atom/AtomOpenIcon.java b/src/net/sourceforge/plantuml/creole/atom/AtomOpenIcon.java
index cf327872a..7a86f5bc8 100644
--- a/src/net/sourceforge/plantuml/creole/atom/AtomOpenIcon.java
+++ b/src/net/sourceforge/plantuml/creole/atom/AtomOpenIcon.java
@@ -35,9 +35,8 @@
*/
package net.sourceforge.plantuml.creole.atom;
-import net.sourceforge.plantuml.awt.geom.Dimension2D;
-
import net.sourceforge.plantuml.Url;
+import net.sourceforge.plantuml.awt.geom.Dimension2D;
import net.sourceforge.plantuml.graphic.FontConfiguration;
import net.sourceforge.plantuml.graphic.StringBounder;
import net.sourceforge.plantuml.graphic.TextBlock;
diff --git a/src/net/sourceforge/plantuml/creole/atom/AtomSpace.java b/src/net/sourceforge/plantuml/creole/atom/AtomSpace.java
index b270260db..eca912298 100644
--- a/src/net/sourceforge/plantuml/creole/atom/AtomSpace.java
+++ b/src/net/sourceforge/plantuml/creole/atom/AtomSpace.java
@@ -35,9 +35,8 @@
*/
package net.sourceforge.plantuml.creole.atom;
-import net.sourceforge.plantuml.awt.geom.Dimension2D;
-
import net.sourceforge.plantuml.Dimension2DDouble;
+import net.sourceforge.plantuml.awt.geom.Dimension2D;
import net.sourceforge.plantuml.graphic.StringBounder;
import net.sourceforge.plantuml.ugraphic.UGraphic;
diff --git a/src/net/sourceforge/plantuml/creole/atom/AtomSprite.java b/src/net/sourceforge/plantuml/creole/atom/AtomSprite.java
index e5320b520..e937bedb7 100644
--- a/src/net/sourceforge/plantuml/creole/atom/AtomSprite.java
+++ b/src/net/sourceforge/plantuml/creole/atom/AtomSprite.java
@@ -35,9 +35,8 @@
*/
package net.sourceforge.plantuml.creole.atom;
-import net.sourceforge.plantuml.awt.geom.Dimension2D;
-
import net.sourceforge.plantuml.Url;
+import net.sourceforge.plantuml.awt.geom.Dimension2D;
import net.sourceforge.plantuml.graphic.FontConfiguration;
import net.sourceforge.plantuml.graphic.StringBounder;
import net.sourceforge.plantuml.sprite.Sprite;
diff --git a/src/net/sourceforge/plantuml/creole/atom/AtomTable.java b/src/net/sourceforge/plantuml/creole/atom/AtomTable.java
index 7da7e7418..0a5a3345b 100644
--- a/src/net/sourceforge/plantuml/creole/atom/AtomTable.java
+++ b/src/net/sourceforge/plantuml/creole/atom/AtomTable.java
@@ -35,13 +35,13 @@
*/
package net.sourceforge.plantuml.creole.atom;
-import net.sourceforge.plantuml.awt.geom.Dimension2D;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import net.sourceforge.plantuml.Dimension2DDouble;
+import net.sourceforge.plantuml.awt.geom.Dimension2D;
import net.sourceforge.plantuml.creole.Position;
import net.sourceforge.plantuml.creole.SheetBlock1;
import net.sourceforge.plantuml.graphic.HorizontalAlignment;
diff --git a/src/net/sourceforge/plantuml/creole/atom/AtomTree.java b/src/net/sourceforge/plantuml/creole/atom/AtomTree.java
index 12c761a3f..87c10cad0 100644
--- a/src/net/sourceforge/plantuml/creole/atom/AtomTree.java
+++ b/src/net/sourceforge/plantuml/creole/atom/AtomTree.java
@@ -35,13 +35,13 @@
*/
package net.sourceforge.plantuml.creole.atom;
-import net.sourceforge.plantuml.awt.geom.Dimension2D;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import net.sourceforge.plantuml.Dimension2DDouble;
+import net.sourceforge.plantuml.awt.geom.Dimension2D;
import net.sourceforge.plantuml.graphic.StringBounder;
import net.sourceforge.plantuml.salt.element.Skeleton2;
import net.sourceforge.plantuml.ugraphic.UGraphic;
diff --git a/src/net/sourceforge/plantuml/creole/atom/AtomVerticalTexts.java b/src/net/sourceforge/plantuml/creole/atom/AtomVerticalTexts.java
index 0b9f515db..6e05a3a68 100644
--- a/src/net/sourceforge/plantuml/creole/atom/AtomVerticalTexts.java
+++ b/src/net/sourceforge/plantuml/creole/atom/AtomVerticalTexts.java
@@ -35,10 +35,10 @@
*/
package net.sourceforge.plantuml.creole.atom;
-import net.sourceforge.plantuml.awt.geom.Dimension2D;
import java.util.List;
import net.sourceforge.plantuml.Dimension2DDouble;
+import net.sourceforge.plantuml.awt.geom.Dimension2D;
import net.sourceforge.plantuml.graphic.StringBounder;
import net.sourceforge.plantuml.ugraphic.UGraphic;
import net.sourceforge.plantuml.ugraphic.UTranslate;
diff --git a/src/net/sourceforge/plantuml/creole/atom/AtomWithMargin.java b/src/net/sourceforge/plantuml/creole/atom/AtomWithMargin.java
index 7813c9664..bb6bc17a8 100644
--- a/src/net/sourceforge/plantuml/creole/atom/AtomWithMargin.java
+++ b/src/net/sourceforge/plantuml/creole/atom/AtomWithMargin.java
@@ -35,12 +35,12 @@
*/
package net.sourceforge.plantuml.creole.atom;
-import net.sourceforge.plantuml.awt.geom.Dimension2D;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import net.sourceforge.plantuml.Dimension2DDouble;
+import net.sourceforge.plantuml.awt.geom.Dimension2D;
import net.sourceforge.plantuml.graphic.StringBounder;
import net.sourceforge.plantuml.ugraphic.UGraphic;
import net.sourceforge.plantuml.ugraphic.UTranslate;
diff --git a/src/net/sourceforge/plantuml/creole/atom/Bullet.java b/src/net/sourceforge/plantuml/creole/atom/Bullet.java
index 277254f3e..87d4e25f4 100644
--- a/src/net/sourceforge/plantuml/creole/atom/Bullet.java
+++ b/src/net/sourceforge/plantuml/creole/atom/Bullet.java
@@ -35,9 +35,8 @@
*/
package net.sourceforge.plantuml.creole.atom;
-import net.sourceforge.plantuml.awt.geom.Dimension2D;
-
import net.sourceforge.plantuml.Dimension2DDouble;
+import net.sourceforge.plantuml.awt.geom.Dimension2D;
import net.sourceforge.plantuml.graphic.FontConfiguration;
import net.sourceforge.plantuml.graphic.StringBounder;
import net.sourceforge.plantuml.ugraphic.UEllipse;
diff --git a/src/net/sourceforge/plantuml/cucadiagram/Body3.java b/src/net/sourceforge/plantuml/cucadiagram/Body3.java
index 1bc87cef3..ae12f17d2 100644
--- a/src/net/sourceforge/plantuml/cucadiagram/Body3.java
+++ b/src/net/sourceforge/plantuml/cucadiagram/Body3.java
@@ -35,12 +35,12 @@
*/
package net.sourceforge.plantuml.cucadiagram;
-import net.sourceforge.plantuml.awt.geom.Dimension2D;
import java.util.ArrayList;
import java.util.List;
import net.sourceforge.plantuml.FontParam;
import net.sourceforge.plantuml.ISkinParam;
+import net.sourceforge.plantuml.awt.geom.Dimension2D;
import net.sourceforge.plantuml.graphic.AbstractTextBlock;
import net.sourceforge.plantuml.graphic.FontConfiguration;
import net.sourceforge.plantuml.graphic.HorizontalAlignment;
diff --git a/src/net/sourceforge/plantuml/cucadiagram/EntityPosition.java b/src/net/sourceforge/plantuml/cucadiagram/EntityPosition.java
index 760af97be..8efd9c3a3 100644
--- a/src/net/sourceforge/plantuml/cucadiagram/EntityPosition.java
+++ b/src/net/sourceforge/plantuml/cucadiagram/EntityPosition.java
@@ -36,11 +36,11 @@
*/
package net.sourceforge.plantuml.cucadiagram;
-import net.sourceforge.plantuml.awt.geom.Dimension2D;
import java.awt.geom.Point2D;
import java.util.EnumSet;
import net.sourceforge.plantuml.Dimension2DDouble;
+import net.sourceforge.plantuml.awt.geom.Dimension2D;
import net.sourceforge.plantuml.svek.ShapeType;
import net.sourceforge.plantuml.ugraphic.Shadowable;
import net.sourceforge.plantuml.ugraphic.UEllipse;
diff --git a/src/net/sourceforge/plantuml/cucadiagram/GroupPrinter.java b/src/net/sourceforge/plantuml/cucadiagram/GroupPrinter.java
index f6cdda0e9..7ae662fa2 100644
--- a/src/net/sourceforge/plantuml/cucadiagram/GroupPrinter.java
+++ b/src/net/sourceforge/plantuml/cucadiagram/GroupPrinter.java
@@ -5,12 +5,12 @@
* (C) Copyright 2009-2023, Arnaud Roques
*
* Project Info: http://plantuml.com
- *
+ *
* If you like this project or if you find it useful, you can support us at:
- *
+ *
* http://plantuml.com/patreon (only 1$ per month!)
* http://plantuml.com/paypal
- *
+ *
* This file is part of PlantUML.
*
* PlantUML is free software; you can redistribute it and/or modify it
@@ -30,7 +30,7 @@
*
*
* Original Author: Arnaud Roques
- *
+ *
*
*/
package net.sourceforge.plantuml.cucadiagram;
@@ -38,7 +38,7 @@ package net.sourceforge.plantuml.cucadiagram;
import java.io.IOException;
import java.io.PrintWriter;
-import net.sourceforge.plantuml.log.Logger;
+import net.sourceforge.plantuml.log.Logme;
import net.sourceforge.plantuml.security.SFile;
public class GroupPrinter {
@@ -91,7 +91,7 @@ public class GroupPrinter {
new GroupPrinter(pw).printGroup(rootGroup);
pw.println("