diff --git a/pom.xml b/pom.xml
index d89be7687..16e524c18 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,7 +35,7 @@
net.sourceforge.plantuml
plantuml
- 1.2021.5-SNAPSHOT
+ 1.2021.6-SNAPSHOT
jar
PlantUML
diff --git a/src/gen/annotation/Comment.java b/src/gen/annotation/Comment.java
index a97c4dc9b..61ba9974d 100644
--- a/src/gen/annotation/Comment.java
+++ b/src/gen/annotation/Comment.java
@@ -1,3 +1,21 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * (C) Copyright 2009-2020, Arnaud Roques
+ *
+ * Project Info: http://plantuml.com
+ *
+ * If you like this project or if you find it useful, you can support us at:
+ *
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ *
+ * This file is part of PlantUML.
+ *
+ * Original Author: Arnaud Roques
+ *
+ */
package gen.annotation;
import java.lang.annotation.ElementType;
diff --git a/src/gen/annotation/Difficult.java b/src/gen/annotation/Difficult.java
index 14343ed21..92f2f3a09 100644
--- a/src/gen/annotation/Difficult.java
+++ b/src/gen/annotation/Difficult.java
@@ -1,3 +1,21 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * (C) Copyright 2009-2020, Arnaud Roques
+ *
+ * Project Info: http://plantuml.com
+ *
+ * If you like this project or if you find it useful, you can support us at:
+ *
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ *
+ * This file is part of PlantUML.
+ *
+ * Original Author: Arnaud Roques
+ *
+ */
package gen.annotation;
import java.lang.annotation.ElementType;
diff --git a/src/gen/annotation/Doc.java b/src/gen/annotation/Doc.java
index b438528fa..2dac37d17 100644
--- a/src/gen/annotation/Doc.java
+++ b/src/gen/annotation/Doc.java
@@ -1,3 +1,21 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * (C) Copyright 2009-2020, Arnaud Roques
+ *
+ * Project Info: http://plantuml.com
+ *
+ * If you like this project or if you find it useful, you can support us at:
+ *
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ *
+ * This file is part of PlantUML.
+ *
+ * Original Author: Arnaud Roques
+ *
+ */
package gen.annotation;
import java.lang.annotation.ElementType;
diff --git a/src/gen/annotation/HasND_Rank.java b/src/gen/annotation/HasND_Rank.java
index 9dffa9129..1fc44c47e 100644
--- a/src/gen/annotation/HasND_Rank.java
+++ b/src/gen/annotation/HasND_Rank.java
@@ -1,3 +1,21 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * (C) Copyright 2009-2020, Arnaud Roques
+ *
+ * Project Info: http://plantuml.com
+ *
+ * If you like this project or if you find it useful, you can support us at:
+ *
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ *
+ * This file is part of PlantUML.
+ *
+ * Original Author: Arnaud Roques
+ *
+ */
package gen.annotation;
import java.lang.annotation.ElementType;
diff --git a/src/gen/annotation/Original.java b/src/gen/annotation/Original.java
index ef2ca789b..53c914f08 100644
--- a/src/gen/annotation/Original.java
+++ b/src/gen/annotation/Original.java
@@ -1,3 +1,21 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * (C) Copyright 2009-2020, Arnaud Roques
+ *
+ * Project Info: http://plantuml.com
+ *
+ * If you like this project or if you find it useful, you can support us at:
+ *
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ *
+ * This file is part of PlantUML.
+ *
+ * Original Author: Arnaud Roques
+ *
+ */
package gen.annotation;
import java.lang.annotation.ElementType;
diff --git a/src/gen/annotation/Reviewed.java b/src/gen/annotation/Reviewed.java
index 815c9823b..0c8644bb6 100644
--- a/src/gen/annotation/Reviewed.java
+++ b/src/gen/annotation/Reviewed.java
@@ -1,3 +1,21 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * (C) Copyright 2009-2020, Arnaud Roques
+ *
+ * Project Info: http://plantuml.com
+ *
+ * If you like this project or if you find it useful, you can support us at:
+ *
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ *
+ * This file is part of PlantUML.
+ *
+ * Original Author: Arnaud Roques
+ *
+ */
package gen.annotation;
import java.lang.annotation.ElementType;
diff --git a/src/gen/annotation/Todo.java b/src/gen/annotation/Todo.java
index 2f51cde69..ceb496b7a 100644
--- a/src/gen/annotation/Todo.java
+++ b/src/gen/annotation/Todo.java
@@ -1,3 +1,21 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * (C) Copyright 2009-2020, Arnaud Roques
+ *
+ * Project Info: http://plantuml.com
+ *
+ * If you like this project or if you find it useful, you can support us at:
+ *
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ *
+ * This file is part of PlantUML.
+ *
+ * Original Author: Arnaud Roques
+ *
+ */
package gen.annotation;
import java.lang.annotation.ElementType;
diff --git a/src/gen/annotation/Untraced.java b/src/gen/annotation/Untraced.java
index 90fcc4773..f838dbd1e 100644
--- a/src/gen/annotation/Untraced.java
+++ b/src/gen/annotation/Untraced.java
@@ -1,3 +1,21 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * (C) Copyright 2009-2020, Arnaud Roques
+ *
+ * Project Info: http://plantuml.com
+ *
+ * If you like this project or if you find it useful, you can support us at:
+ *
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ *
+ * This file is part of PlantUML.
+ *
+ * Original Author: Arnaud Roques
+ *
+ */
package gen.annotation;
import java.lang.annotation.ElementType;
diff --git a/src/gen/annotation/Unused.java b/src/gen/annotation/Unused.java
index 3f99cc8e2..5c7794b23 100644
--- a/src/gen/annotation/Unused.java
+++ b/src/gen/annotation/Unused.java
@@ -1,3 +1,21 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * (C) Copyright 2009-2020, Arnaud Roques
+ *
+ * Project Info: http://plantuml.com
+ *
+ * If you like this project or if you find it useful, you can support us at:
+ *
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ *
+ * This file is part of PlantUML.
+ *
+ * Original Author: Arnaud Roques
+ *
+ */
package gen.annotation;
import java.lang.annotation.ElementType;
diff --git a/src/net/sourceforge/plantuml/BackSlash.java b/src/net/sourceforge/plantuml/BackSlash.java
index 19f5a48db..a9671b578 100644
--- a/src/net/sourceforge/plantuml/BackSlash.java
+++ b/src/net/sourceforge/plantuml/BackSlash.java
@@ -68,7 +68,7 @@ public class BackSlash {
if (s == null) {
return null;
}
- final List result = new ArrayList();
+ final List result = new ArrayList<>();
final StringBuilder current = new StringBuilder();
for (int i = 0; i < s.length(); i++) {
final char c = s.charAt(i);
diff --git a/src/net/sourceforge/plantuml/BlockUml.java b/src/net/sourceforge/plantuml/BlockUml.java
index 65af8b9c1..e2c22e421 100644
--- a/src/net/sourceforge/plantuml/BlockUml.java
+++ b/src/net/sourceforge/plantuml/BlockUml.java
@@ -65,7 +65,7 @@ public class BlockUml {
private Diagram system;
private final Defines localDefines;
private final ISkinSimple skinParam;
- private final Set included = new HashSet();
+ private final Set included = new HashSet<>();
public Set getIncluded() {
return Collections.unmodifiableSet(included);
@@ -97,7 +97,7 @@ public class BlockUml {
}
public static List convert(List strings) {
- final List result = new ArrayList();
+ final List result = new ArrayList<>();
LineLocationImpl location = new LineLocationImpl("block", null);
for (String s : strings) {
location = location.oneLineRead();
@@ -109,7 +109,7 @@ public class BlockUml {
private boolean preprocessorError;
public BlockUml(List strings, Defines defines, ISkinSimple skinParam, PreprocessorModeSet mode) {
- this.rawSource = new ArrayList(strings);
+ this.rawSource = new ArrayList<>(strings);
this.localDefines = defines;
this.skinParam = skinParam;
final String s0 = strings.get(0).getTrimmed().getString();
@@ -117,7 +117,7 @@ public class BlockUml {
throw new IllegalArgumentException();
}
if (mode == null) {
- this.data = new ArrayList(strings);
+ this.data = new ArrayList<>(strings);
} else {
final TimLoader timLoader = new TimLoader(mode.getImportedFiles(), defines, mode.getCharset(),
(DefinitionsContainer) mode);
@@ -199,7 +199,7 @@ public class BlockUml {
}
public List getDefinition(boolean withHeader) {
- final List result = new ArrayList();
+ final List result = new ArrayList<>();
for (StringLocated s : data) {
result.add(s.getString());
}
diff --git a/src/net/sourceforge/plantuml/BlockUmlBuilder.java b/src/net/sourceforge/plantuml/BlockUmlBuilder.java
index 2a45019de..a44ae8b81 100644
--- a/src/net/sourceforge/plantuml/BlockUmlBuilder.java
+++ b/src/net/sourceforge/plantuml/BlockUmlBuilder.java
@@ -55,8 +55,8 @@ import net.sourceforge.plantuml.utils.StartUtils;
public final class BlockUmlBuilder implements DefinitionsContainer {
- private final List blocks = new ArrayList();
- private Set usedFiles = new HashSet();
+ private final List blocks = new ArrayList<>();
+ private Set usedFiles = new HashSet<>();
private final UncommentReadLine reader;
private final Defines defines;
private final ImportedFiles importedFiles;
@@ -92,7 +92,7 @@ public final class BlockUmlBuilder implements DefinitionsContainer {
while ((s = includer.readLine()) != null) {
if (StartUtils.isArobaseStartDiagram(s.getString())) {
- current = new ArrayList();
+ current = new ArrayList<>();
paused = false;
}
if (StartUtils.isArobasePauseDiagram(s.getString())) {
diff --git a/src/net/sourceforge/plantuml/CMapData.java b/src/net/sourceforge/plantuml/CMapData.java
index 1d2550199..4154e97b2 100644
--- a/src/net/sourceforge/plantuml/CMapData.java
+++ b/src/net/sourceforge/plantuml/CMapData.java
@@ -79,7 +79,7 @@ public class CMapData {
public static CMapData cmapString(Set allUrlEncountered, double scale) {
final CMapData cmapdata = new CMapData();
- final List all = new ArrayList(allUrlEncountered);
+ final List all = new ArrayList<>(allUrlEncountered);
Collections.sort(all, Url.SURFACE_COMPARATOR);
int seq = 1;
diff --git a/src/net/sourceforge/plantuml/DirWatcher.java b/src/net/sourceforge/plantuml/DirWatcher.java
index f4d7dac0c..7f5102359 100644
--- a/src/net/sourceforge/plantuml/DirWatcher.java
+++ b/src/net/sourceforge/plantuml/DirWatcher.java
@@ -64,7 +64,7 @@ public class DirWatcher {
public List buildCreatedFiles() throws IOException, InterruptedException {
boolean error = false;
- final List result = new ArrayList();
+ final List result = new ArrayList<>();
for (File f : dir.listFiles()) {
if (error) {
continue;
diff --git a/src/net/sourceforge/plantuml/EmptyImageBuilder.java b/src/net/sourceforge/plantuml/EmptyImageBuilder.java
index 2c1c4b5a8..f3fd01cfe 100644
--- a/src/net/sourceforge/plantuml/EmptyImageBuilder.java
+++ b/src/net/sourceforge/plantuml/EmptyImageBuilder.java
@@ -132,7 +132,7 @@ public class EmptyImageBuilder {
private List withBreaks(String watermark, Font javaFont, FontMetrics fm, int maxWidth) {
final String[] words = watermark.split("\\s+");
- final List result = new ArrayList();
+ final List result = new ArrayList<>();
String pending = "";
for (String word : words) {
final String candidate = pending.length() == 0 ? word : pending + " " + word;
diff --git a/src/net/sourceforge/plantuml/FileFormatOption.java b/src/net/sourceforge/plantuml/FileFormatOption.java
index 8ef85ce40..5217ba27f 100644
--- a/src/net/sourceforge/plantuml/FileFormatOption.java
+++ b/src/net/sourceforge/plantuml/FileFormatOption.java
@@ -83,10 +83,9 @@ public final class FileFormatOption implements Serializable {
this.useRedForError = useRedForError;
this.svgLinkTarget = svgLinkTarget;
this.debugsvek = debugsvek;
- this.tikzFontDistortion = tikzFontDistortion;
+ this.tikzFontDistortion = Objects.requireNonNull(tikzFontDistortion);
this.scale = scale;
this.preserveAspectRatio = preserveAspectRatio;
- Objects.requireNonNull(tikzFontDistortion);
}
public StringBounder getDefaultStringBounder(SvgCharSizeHack charSizeHack) {
diff --git a/src/net/sourceforge/plantuml/FileGroup.java b/src/net/sourceforge/plantuml/FileGroup.java
index 6f1704f59..b10afe481 100644
--- a/src/net/sourceforge/plantuml/FileGroup.java
+++ b/src/net/sourceforge/plantuml/FileGroup.java
@@ -46,7 +46,7 @@ import net.sourceforge.plantuml.command.regex.Pattern2;
public class FileGroup {
- private final List result = new ArrayList();
+ private final List result = new ArrayList<>();
private final String pattern;
private final List excluded;
private final Option option;
diff --git a/src/net/sourceforge/plantuml/FileSystem.java b/src/net/sourceforge/plantuml/FileSystem.java
index 69ad20c63..857b71213 100644
--- a/src/net/sourceforge/plantuml/FileSystem.java
+++ b/src/net/sourceforge/plantuml/FileSystem.java
@@ -44,7 +44,7 @@ public class FileSystem {
private final static FileSystem singleton = new FileSystem();
- private ThreadLocal currentDir = new ThreadLocal();
+ private ThreadLocal currentDir = new ThreadLocal<>();
private FileSystem() {
reset();
diff --git a/src/net/sourceforge/plantuml/LineLocationImpl.java b/src/net/sourceforge/plantuml/LineLocationImpl.java
index 09e0cc952..cbf71e1f8 100644
--- a/src/net/sourceforge/plantuml/LineLocationImpl.java
+++ b/src/net/sourceforge/plantuml/LineLocationImpl.java
@@ -53,9 +53,8 @@ public class LineLocationImpl implements LineLocation {
}
private LineLocationImpl(String desc, LineLocation parent, int position) {
- Objects.requireNonNull(desc);
this.parent = parent;
- this.desc = desc;
+ this.desc = Objects.requireNonNull(desc);
this.position = position;
}
diff --git a/src/net/sourceforge/plantuml/Log.java b/src/net/sourceforge/plantuml/Log.java
index b69ed9a70..e967b92e3 100644
--- a/src/net/sourceforge/plantuml/Log.java
+++ b/src/net/sourceforge/plantuml/Log.java
@@ -104,7 +104,7 @@ public abstract class Log {
// }
}
- // private static final ThreadLocal header2 = new ThreadLocal();
+ // private static final ThreadLocal header2 = new ThreadLocal<>();
//
public static void header(String s) {
// header2.set(s);
diff --git a/src/net/sourceforge/plantuml/NewpagedDiagram.java b/src/net/sourceforge/plantuml/NewpagedDiagram.java
index 207113786..b3f90fcb4 100644
--- a/src/net/sourceforge/plantuml/NewpagedDiagram.java
+++ b/src/net/sourceforge/plantuml/NewpagedDiagram.java
@@ -51,7 +51,7 @@ import net.sourceforge.plantuml.ugraphic.color.NoSuchColorException;
public class NewpagedDiagram extends AbstractPSystem {
- private final List diagrams = new ArrayList();
+ private final List diagrams = new ArrayList<>();
public NewpagedDiagram(AbstractPSystem diag1, AbstractPSystem diag2) {
if (diag1 instanceof NewpagedDiagram) {
diff --git a/src/net/sourceforge/plantuml/Option.java b/src/net/sourceforge/plantuml/Option.java
index 48874e634..22d0fd6e1 100644
--- a/src/net/sourceforge/plantuml/Option.java
+++ b/src/net/sourceforge/plantuml/Option.java
@@ -57,8 +57,8 @@ import net.sourceforge.plantuml.stats.StatsUtils;
public class Option {
- private final List excludes = new ArrayList();
- private final List config = new ArrayList();
+ private final List excludes = new ArrayList<>();
+ private final List config = new ArrayList<>();
private final Map defines = new LinkedHashMap();
private String charset;
private boolean computeurl = false;
@@ -91,7 +91,7 @@ public class Option {
private File outputFile = null;
private String filename;
- private final List result = new ArrayList();
+ private final List result = new ArrayList<>();
public Option() {
}
diff --git a/src/net/sourceforge/plantuml/OptionPrint.java b/src/net/sourceforge/plantuml/OptionPrint.java
index 2af474629..4fd574622 100644
--- a/src/net/sourceforge/plantuml/OptionPrint.java
+++ b/src/net/sourceforge/plantuml/OptionPrint.java
@@ -58,7 +58,7 @@ import net.sourceforge.plantuml.version.Version;
public class OptionPrint {
static public void printTestDot() throws InterruptedException {
- final List result = new ArrayList();
+ final List result = new ArrayList<>();
final int errorCode = GraphvizUtils.addDotStatus(result, false);
for (String s : result) {
if (errorCode == 0) {
@@ -187,7 +187,7 @@ public class OptionPrint {
System.out.println(v);
}
System.out.println();
- final List result = new ArrayList();
+ final List result = new ArrayList<>();
final int errorCode = GraphvizUtils.addDotStatus(result, false);
for (String s : result) {
System.out.println(s);
@@ -213,7 +213,7 @@ public class OptionPrint {
all = Arrays.asList("java.runtime.name", "Java Runtime", "java.vm.name", "JVM", "file.encoding",
"Default Encoding", "user.language", "Language", "user.country", "Country");
}
- final List result = new ArrayList();
+ final List result = new ArrayList<>();
for (int i = 0; i < all.size(); i += 2) {
result.add(all.get(i + 1) + ": " + p.getProperty(all.get(i)));
}
@@ -221,7 +221,7 @@ public class OptionPrint {
}
public static Collection interestingValues() {
- final List strings = new ArrayList();
+ final List strings = new ArrayList<>();
// if (withIp() == false) {
// strings.add("Machine: " + getHostName());
// }
diff --git a/src/net/sourceforge/plantuml/PSystemBuilder.java b/src/net/sourceforge/plantuml/PSystemBuilder.java
index 782c14eaa..5dff1b5b6 100644
--- a/src/net/sourceforge/plantuml/PSystemBuilder.java
+++ b/src/net/sourceforge/plantuml/PSystemBuilder.java
@@ -125,7 +125,7 @@ public class PSystemBuilder {
}
final DiagramType diagramType = umlSource.getDiagramType();
- final List errors = new ArrayList();
+ final List errors = new ArrayList<>();
final List factories = getAllFactories(skinParam);
for (PSystemFactory systemFactory : factories) {
if (diagramType != systemFactory.getDiagramType()) {
@@ -152,7 +152,7 @@ public class PSystemBuilder {
}
private static List getAllFactories(ISkinSimple skinParam) {
- final List factories = new ArrayList();
+ final List factories = new ArrayList<>();
factories.add(new PSystemWelcomeFactory());
factories.add(new PSystemColorsFactory());
factories.add(new SequenceDiagramFactory(skinParam));
diff --git a/src/net/sourceforge/plantuml/PSystemUtils.java b/src/net/sourceforge/plantuml/PSystemUtils.java
index 83e0a0ae5..5689230e0 100644
--- a/src/net/sourceforge/plantuml/PSystemUtils.java
+++ b/src/net/sourceforge/plantuml/PSystemUtils.java
@@ -99,7 +99,7 @@ public class PSystemUtils {
private static List exportDiagramsNewpaged(NewpagedDiagram system, SuggestedFile suggestedFile,
FileFormatOption fileFormat) throws IOException {
- final List result = new ArrayList();
+ final List result = new ArrayList<>();
final int nbImages = system.getNbImages();
for (int i = 0; i < nbImages; i++) {
@@ -187,7 +187,7 @@ public class PSystemUtils {
private static List exportDiagramsSequence(SequenceDiagram system, SuggestedFile suggestedFile,
FileFormatOption fileFormat) throws IOException {
- final List result = new ArrayList();
+ final List result = new ArrayList<>();
final int nbImages = system.getNbImages();
for (int i = 0; i < nbImages; i++) {
@@ -248,7 +248,7 @@ public class PSystemUtils {
system.getMetadata(), dpi, fileFormat.isWithMetadata(), system.getSkinParam().getSplitParam())
.getFiles();
}
- final List result2 = new ArrayList();
+ final List result2 = new ArrayList<>();
for (SFile f : result) {
result2.add(new FileImageData(f, cmap));
}
@@ -283,7 +283,7 @@ public class PSystemUtils {
system.getMetadata(), system.getDpi(fileFormat), fileFormat.isWithMetadata(), splitParam)
.getFiles();
}
- final List result2 = new ArrayList();
+ final List result2 = new ArrayList<>();
for (SFile f : result) {
result2.add(new FileImageData(f, cmap));
}
diff --git a/src/net/sourceforge/plantuml/PlainStringsDiagram.java b/src/net/sourceforge/plantuml/PlainStringsDiagram.java
index 93f027671..86c91be66 100644
--- a/src/net/sourceforge/plantuml/PlainStringsDiagram.java
+++ b/src/net/sourceforge/plantuml/PlainStringsDiagram.java
@@ -48,7 +48,7 @@ public abstract class PlainStringsDiagram extends PlainDiagram {
protected BufferedImage image = null;
protected GraphicPosition imagePosition = null;
- protected final List strings = new ArrayList();
+ protected final List strings = new ArrayList<>();
@Override
public UDrawable getRootDrawable(FileFormatOption fileFormatOption) {
diff --git a/src/net/sourceforge/plantuml/Run.java b/src/net/sourceforge/plantuml/Run.java
index b485f81b3..655b665f2 100644
--- a/src/net/sourceforge/plantuml/Run.java
+++ b/src/net/sourceforge/plantuml/Run.java
@@ -410,7 +410,7 @@ public class Run {
multithread(option, error);
return;
}
- final List files = new ArrayList();
+ final List files = new ArrayList<>();
for (String s : option.getResult()) {
if (option.isDecodeurl()) {
error.goOk();
diff --git a/src/net/sourceforge/plantuml/SkinParam.java b/src/net/sourceforge/plantuml/SkinParam.java
index e010ea12a..846465a79 100644
--- a/src/net/sourceforge/plantuml/SkinParam.java
+++ b/src/net/sourceforge/plantuml/SkinParam.java
@@ -254,7 +254,7 @@ public class SkinParam implements ISkinParam {
key = key.replaceAll("sequencearrow", "arrow");
key = key.replaceAll("align$", "alignment");
final Matcher2 mm = stereoPattern.matcher(key);
- final List result = new ArrayList();
+ final List result = new ArrayList<>();
while (mm.find()) {
final String s = mm.group(1);
result.add(key.replaceAll(stereoPatternString, "") + "<<" + s + ">>");
@@ -357,8 +357,7 @@ public class SkinParam implements ISkinParam {
}
public char getCircledCharacter(Stereotype stereotype) {
- Objects.requireNonNull(stereotype);
- final String value2 = getValue("spotchar" + stereotype.getLabel(Guillemet.DOUBLE_COMPARATOR));
+ final String value2 = getValue("spotchar" + Objects.requireNonNull(stereotype).getLabel(Guillemet.DOUBLE_COMPARATOR));
if (value2 != null && value2.length() > 0) {
return value2.charAt(0);
}
@@ -517,7 +516,7 @@ public class SkinParam implements ISkinParam {
}
public static Collection getPossibleValues() {
- final Set result = new TreeSet();
+ final Set result = new TreeSet<>();
result.add("Monochrome");
// result.add("BackgroundColor");
result.add("CircledCharacterRadius");
@@ -760,8 +759,7 @@ public class SkinParam implements ISkinParam {
}
public boolean shadowing2(Stereotype stereotype, SkinParameter skinParameter) {
- Objects.requireNonNull(skinParameter);
- final String name = skinParameter.getUpperCaseName();
+ final String name = Objects.requireNonNull(skinParameter).getUpperCaseName();
if (stereotype != null) {
checkStereotype(stereotype);
final String value2 = getValue(name + "shadowing" + stereotype.getLabel(Guillemet.DOUBLE_COMPARATOR));
@@ -789,7 +787,7 @@ public class SkinParam implements ISkinParam {
private final Map sprites = new HashMap();
public Collection getAllSpriteNames() {
- return Collections.unmodifiableCollection(new TreeSet(sprites.keySet()));
+ return Collections.unmodifiableCollection(new TreeSet<>(sprites.keySet()));
}
public void addSprite(String name, Sprite sprite) {
diff --git a/src/net/sourceforge/plantuml/SourceFileReaderAbstract.java b/src/net/sourceforge/plantuml/SourceFileReaderAbstract.java
index 1e01ebb8b..6e06d3240 100644
--- a/src/net/sourceforge/plantuml/SourceFileReaderAbstract.java
+++ b/src/net/sourceforge/plantuml/SourceFileReaderAbstract.java
@@ -139,7 +139,7 @@ public abstract class SourceFileReaderAbstract {
Log.info("Reading file: " + file);
cpt = 0;
- final List result = new ArrayList();
+ final List result = new ArrayList<>();
for (BlockUml blockUml : builder.getBlockUmls()) {
final SuggestedFile suggested = getSuggestedFile(blockUml);
diff --git a/src/net/sourceforge/plantuml/StringLocated.java b/src/net/sourceforge/plantuml/StringLocated.java
index 2c8c1e055..678eb79a4 100644
--- a/src/net/sourceforge/plantuml/StringLocated.java
+++ b/src/net/sourceforge/plantuml/StringLocated.java
@@ -71,8 +71,7 @@ final public class StringLocated {
}
public StringLocated(String s, LineLocation location, String preprocessorError) {
- Objects.requireNonNull(s);
- this.s = s;
+ this.s = Objects.requireNonNull(s);
this.location = location;
this.preprocessorError = preprocessorError;
}
diff --git a/src/net/sourceforge/plantuml/StringUtils.java b/src/net/sourceforge/plantuml/StringUtils.java
index 26e9c84da..59967bec2 100644
--- a/src/net/sourceforge/plantuml/StringUtils.java
+++ b/src/net/sourceforge/plantuml/StringUtils.java
@@ -112,7 +112,7 @@ public class StringUtils {
if (m.find() == false) {
return null;
}
- final List result = new ArrayList();
+ final List result = new ArrayList<>();
for (int i = 1; i <= m.groupCount(); i++) {
result.add(m.group(i));
}
@@ -425,7 +425,7 @@ public class StringUtils {
// == false) {
// throw new IllegalArgumentException();
// }
- final List result = new ArrayList();
+ final List result = new ArrayList<>();
final Pattern2 p = MyPattern.cmpile("([\\p{L}0-9_.]+|[%g][^%g]+[%g])");
final Matcher2 m = p.matcher(s);
while (m.find()) {
@@ -439,7 +439,7 @@ public class StringUtils {
}
public static List merge(List l1, List l2) {
- final List result = new ArrayList(l1);
+ final List result = new ArrayList<>(l1);
result.addAll(l2);
return Collections.unmodifiableList(result);
}
diff --git a/src/net/sourceforge/plantuml/TitledDiagram.java b/src/net/sourceforge/plantuml/TitledDiagram.java
index f66fd1bb6..48a43b642 100644
--- a/src/net/sourceforge/plantuml/TitledDiagram.java
+++ b/src/net/sourceforge/plantuml/TitledDiagram.java
@@ -37,8 +37,6 @@ package net.sourceforge.plantuml;
import java.io.IOException;
-import javax.script.ScriptException;
-
import net.sourceforge.plantuml.anim.Animation;
import net.sourceforge.plantuml.anim.AnimationDecoder;
import net.sourceforge.plantuml.command.CommandExecutionResult;
@@ -237,13 +235,12 @@ public abstract class TitledDiagram extends AbstractPSystem implements Diagram,
}
final public void setAnimation(Iterable animationData) {
- try {
- final AnimationDecoder animationDecoder = new AnimationDecoder(animationData);
- this.animation = Animation.create(animationDecoder.decode());
- } catch (ScriptException e) {
- e.printStackTrace();
- }
-
+// try {
+ final AnimationDecoder animationDecoder = new AnimationDecoder(animationData);
+ this.animation = Animation.create(animationDecoder.decode());
+// } catch (ScriptException e) {
+// e.printStackTrace();
+// }
}
final public Animation getAnimation() {
diff --git a/src/net/sourceforge/plantuml/UseStyle.java b/src/net/sourceforge/plantuml/UseStyle.java
index bbc2e5726..23bef5966 100644
--- a/src/net/sourceforge/plantuml/UseStyle.java
+++ b/src/net/sourceforge/plantuml/UseStyle.java
@@ -37,7 +37,7 @@ package net.sourceforge.plantuml;
public class UseStyle {
- private static final ThreadLocal useBeta = new ThreadLocal();
+ private static final ThreadLocal useBeta = new ThreadLocal<>();
static public boolean useBetaStyle() {
final Boolean result = useBeta.get();
diff --git a/src/net/sourceforge/plantuml/acearth/PSystemXearthFactory.java b/src/net/sourceforge/plantuml/acearth/PSystemXearthFactory.java
index 7166699ca..accf2b9e3 100644
--- a/src/net/sourceforge/plantuml/acearth/PSystemXearthFactory.java
+++ b/src/net/sourceforge/plantuml/acearth/PSystemXearthFactory.java
@@ -49,7 +49,7 @@ import net.sourceforge.plantuml.command.regex.Pattern2;
public class PSystemXearthFactory extends PSystemBasicFactory {
private final Map config = new LinkedHashMap();
- private final List markers = new ArrayList();
+ private final List markers = new ArrayList<>();
private int width;
private int height;
diff --git a/src/net/sourceforge/plantuml/activitydiagram/ActivityDiagram.java b/src/net/sourceforge/plantuml/activitydiagram/ActivityDiagram.java
index 922a20389..899918b37 100644
--- a/src/net/sourceforge/plantuml/activitydiagram/ActivityDiagram.java
+++ b/src/net/sourceforge/plantuml/activitydiagram/ActivityDiagram.java
@@ -37,6 +37,7 @@ package net.sourceforge.plantuml.activitydiagram;
import java.util.Arrays;
import java.util.List;
+import java.util.Objects;
import net.sourceforge.plantuml.Direction;
import net.sourceforge.plantuml.ISkinSimple;
@@ -66,8 +67,7 @@ public class ActivityDiagram extends CucaDiagram {
}
public ILeaf getOrCreateLeaf(Ident ident, Code code, LeafType type, USymbol symbol) {
- checkNotNull(ident);
- return getOrCreateLeafDefault(ident, code, type, symbol);
+ return getOrCreateLeafDefault(Objects.requireNonNull(ident), code, type, symbol);
}
private String getAutoBranch() {
@@ -134,15 +134,13 @@ public class ActivityDiagram extends CucaDiagram {
@Override
public ILeaf createLeaf(Ident idNewLong, Code code, Display display, LeafType type, USymbol symbol) {
- checkNotNull(idNewLong);
- final ILeaf result = super.createLeaf(idNewLong, code, display, type, symbol);
+ final ILeaf result = super.createLeaf(Objects.requireNonNull(idNewLong), code, display, type, symbol);
updateLasts(result);
return result;
}
public IEntity createNote(Ident idNewLong, Code code, Display display) {
- checkNotNull(idNewLong);
- return super.createLeaf(idNewLong, code, display, LeafType.NOTE, null);
+ return super.createLeaf(Objects.requireNonNull(idNewLong), code, display, LeafType.NOTE, null);
}
final protected List getDotStrings() {
diff --git a/src/net/sourceforge/plantuml/activitydiagram/ActivityDiagramFactory.java b/src/net/sourceforge/plantuml/activitydiagram/ActivityDiagramFactory.java
index 2d41edda5..b6a602a1f 100644
--- a/src/net/sourceforge/plantuml/activitydiagram/ActivityDiagramFactory.java
+++ b/src/net/sourceforge/plantuml/activitydiagram/ActivityDiagramFactory.java
@@ -70,7 +70,7 @@ public class ActivityDiagramFactory extends PSystemCommandFactory {
@Override
protected List createCommands() {
- final List cmds = new ArrayList();
+ final List cmds = new ArrayList<>();
cmds.add(new CommandFootboxIgnored());
addCommonCommands1(cmds);
cmds.add(new CommandRankDir());
diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ActivityDiagramFactory3.java b/src/net/sourceforge/plantuml/activitydiagram3/ActivityDiagramFactory3.java
index ac20baa83..b75839efc 100644
--- a/src/net/sourceforge/plantuml/activitydiagram3/ActivityDiagramFactory3.java
+++ b/src/net/sourceforge/plantuml/activitydiagram3/ActivityDiagramFactory3.java
@@ -99,7 +99,7 @@ public class ActivityDiagramFactory3 extends PSystemCommandFactory {
@Override
protected List createCommands() {
- final List cmds = new ArrayList();
+ final List cmds = new ArrayList<>();
cmds.add(new CommandFootboxIgnored());
addCommonCommands1(cmds);
diff --git a/src/net/sourceforge/plantuml/activitydiagram3/InstructionFork.java b/src/net/sourceforge/plantuml/activitydiagram3/InstructionFork.java
index b75053b52..68635fece 100644
--- a/src/net/sourceforge/plantuml/activitydiagram3/InstructionFork.java
+++ b/src/net/sourceforge/plantuml/activitydiagram3/InstructionFork.java
@@ -53,7 +53,7 @@ import net.sourceforge.plantuml.sequencediagram.NoteType;
public class InstructionFork extends WithNote implements Instruction {
- private final List forks = new ArrayList();
+ private final List forks = new ArrayList<>();
private final Instruction parent;
private final LinkRendering inlinkRendering;
private final ISkinParam skinParam;
@@ -90,7 +90,7 @@ public class InstructionFork extends WithNote implements Instruction {
}
public Ftile createFtile(FtileFactory factory) {
- final List all = new ArrayList();
+ final List all = new ArrayList<>();
for (InstructionList list : forks) {
all.add(list.createFtile(factory));
}
@@ -130,7 +130,7 @@ public class InstructionFork extends WithNote implements Instruction {
}
public Set getSwimlanes() {
- final Set result = new HashSet(InstructionList.getSwimlanes2(forks));
+ final Set result = new HashSet<>(InstructionList.getSwimlanes2(forks));
result.add(swimlaneIn);
result.add(swimlaneOut);
return result;
diff --git a/src/net/sourceforge/plantuml/activitydiagram3/InstructionIf.java b/src/net/sourceforge/plantuml/activitydiagram3/InstructionIf.java
index a3632eb27..ad908f6bc 100644
--- a/src/net/sourceforge/plantuml/activitydiagram3/InstructionIf.java
+++ b/src/net/sourceforge/plantuml/activitydiagram3/InstructionIf.java
@@ -58,7 +58,7 @@ import net.sourceforge.plantuml.ugraphic.color.HColor;
public class InstructionIf extends WithNote implements Instruction, InstructionCollection {
- private final List thens = new ArrayList();
+ private final List thens = new ArrayList<>();
private Branch elseBranch;
private boolean endifCalled = false;
private final ISkinParam skinParam;
@@ -113,7 +113,7 @@ public class InstructionIf extends WithNote implements Instruction, InstructionC
if (getPositionedNotes().size() > 0) {
result = FtileWithNoteOpale.create(result, getPositionedNotes(), skinParam, false);
}
- final List weldingPoints = new ArrayList();
+ final List weldingPoints = new ArrayList<>();
for (Branch branch : thens) {
weldingPoints.addAll(branch.getWeldingPoints());
}
@@ -191,7 +191,7 @@ public class InstructionIf extends WithNote implements Instruction, InstructionC
}
public Set getSwimlanes() {
- final Set result = new HashSet();
+ final Set result = new HashSet<>();
if (swimlane != null) {
result.add(swimlane);
}
diff --git a/src/net/sourceforge/plantuml/activitydiagram3/InstructionList.java b/src/net/sourceforge/plantuml/activitydiagram3/InstructionList.java
index 7448c350d..f30dcec79 100644
--- a/src/net/sourceforge/plantuml/activitydiagram3/InstructionList.java
+++ b/src/net/sourceforge/plantuml/activitydiagram3/InstructionList.java
@@ -54,7 +54,7 @@ import net.sourceforge.plantuml.sequencediagram.NoteType;
public class InstructionList extends WithNote implements Instruction, InstructionCollection {
- private final List all = new ArrayList();
+ private final List all = new ArrayList<>();
private final Swimlane defaultSwimlane;
public boolean containsBreak() {
@@ -96,7 +96,7 @@ public class InstructionList extends WithNote implements Instruction, Instructio
if (all.size() == 0) {
return new FtileEmpty(factory.skinParam(), defaultSwimlane);
}
- final List breaks = new ArrayList();
+ final List breaks = new ArrayList<>();
Ftile result = eventuallyAddNote(factory, null, getSwimlaneIn());
for (Instruction ins : all) {
Ftile cur = ins.createFtile(factory);
@@ -169,7 +169,7 @@ public class InstructionList extends WithNote implements Instruction, Instructio
}
public static Set getSwimlanes2(List extends Instruction> list) {
- final Set result = new HashSet();
+ final Set result = new HashSet<>();
for (Instruction ins : list) {
result.addAll(ins.getSwimlanes());
}
diff --git a/src/net/sourceforge/plantuml/activitydiagram3/InstructionRepeat.java b/src/net/sourceforge/plantuml/activitydiagram3/InstructionRepeat.java
index 348bd9829..b66fbac06 100644
--- a/src/net/sourceforge/plantuml/activitydiagram3/InstructionRepeat.java
+++ b/src/net/sourceforge/plantuml/activitydiagram3/InstructionRepeat.java
@@ -66,7 +66,7 @@ public class InstructionRepeat implements Instruction {
private LinkRendering incoming1 = LinkRendering.none();
private LinkRendering incoming2 = LinkRendering.none();
- private List backwardNotes = new ArrayList();
+ private List backwardNotes = new ArrayList<>();
private Display test = Display.NULL;
private Display yes = Display.NULL;
private Display out = Display.NULL;
diff --git a/src/net/sourceforge/plantuml/activitydiagram3/InstructionSplit.java b/src/net/sourceforge/plantuml/activitydiagram3/InstructionSplit.java
index 56ef0dbc8..e59b06970 100644
--- a/src/net/sourceforge/plantuml/activitydiagram3/InstructionSplit.java
+++ b/src/net/sourceforge/plantuml/activitydiagram3/InstructionSplit.java
@@ -50,7 +50,7 @@ import net.sourceforge.plantuml.sequencediagram.NoteType;
public class InstructionSplit implements Instruction {
- private final List splits = new ArrayList();
+ private final List splits = new ArrayList<>();
private final Instruction parent;
private final LinkRendering inlinkRendering;
private final Swimlane swimlaneIn;
@@ -82,7 +82,7 @@ public class InstructionSplit implements Instruction {
}
public Ftile createFtile(FtileFactory factory) {
- final List all = new ArrayList();
+ final List all = new ArrayList<>();
for (InstructionList list : splits) {
all.add(list.createFtile(factory));
}
diff --git a/src/net/sourceforge/plantuml/activitydiagram3/InstructionSwitch.java b/src/net/sourceforge/plantuml/activitydiagram3/InstructionSwitch.java
index 24cb3d333..8a39eb69d 100644
--- a/src/net/sourceforge/plantuml/activitydiagram3/InstructionSwitch.java
+++ b/src/net/sourceforge/plantuml/activitydiagram3/InstructionSwitch.java
@@ -51,7 +51,7 @@ import net.sourceforge.plantuml.ugraphic.color.HColor;
public class InstructionSwitch extends WithNote implements Instruction, InstructionCollection {
- private final List branches = new ArrayList();
+ private final List branches = new ArrayList<>();
private final ISkinParam skinParam;
private final Instruction parent;
@@ -94,7 +94,7 @@ public class InstructionSwitch extends WithNote implements Instruction, Instruct
// result = FtileWithNoteOpale.create(result, getPositionedNotes(), skinParam,
// false);
// }
- // final List weldingPoints = new ArrayList();
+ // final List weldingPoints = new ArrayList<>();
// for (Branch branch : branches) {
// weldingPoints.addAll(branch.getWeldingPoints());
// }
@@ -113,7 +113,7 @@ public class InstructionSwitch extends WithNote implements Instruction, Instruct
}
public Set getSwimlanes() {
- final Set result = new HashSet();
+ final Set result = new HashSet<>();
if (swimlane != null) {
result.add(swimlane);
}
diff --git a/src/net/sourceforge/plantuml/activitydiagram3/WithNote.java b/src/net/sourceforge/plantuml/activitydiagram3/WithNote.java
index 4723f09c9..e5b7b7bf7 100644
--- a/src/net/sourceforge/plantuml/activitydiagram3/WithNote.java
+++ b/src/net/sourceforge/plantuml/activitydiagram3/WithNote.java
@@ -49,7 +49,7 @@ import net.sourceforge.plantuml.sequencediagram.NoteType;
public class WithNote {
- private final Collection notes = new ArrayList();
+ private final Collection notes = new ArrayList<>();
public boolean addNote(Display note, NotePosition position, NoteType type, Colors colors, Swimlane swimlaneNote) {
this.notes.add(new PositionedNote(note, position, type, colors, swimlaneNote));
diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/CollisionDetector.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/CollisionDetector.java
index afc3b892d..5308eaeae 100644
--- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/CollisionDetector.java
+++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/CollisionDetector.java
@@ -77,8 +77,8 @@ public class CollisionDetector extends UGraphicNo implements UGraphic {
private final Context context;
static class Context {
- private final List rectangles = new ArrayList();
- private final List snakes = new ArrayList();
+ private final List rectangles = new ArrayList<>();
+ private final List snakes = new ArrayList<>();
private boolean manageSnakes;
public void drawDebug(UGraphic ug) {
diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileAssemblySimple.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileAssemblySimple.java
index 8308ce7e7..0a44acdde 100644
--- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileAssemblySimple.java
+++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileAssemblySimple.java
@@ -147,7 +147,7 @@ public class FtileAssemblySimple extends AbstractTextBlock implements Ftile {
}
public Set getSwimlanes() {
- final Set result = new HashSet();
+ final Set result = new HashSet<>();
result.addAll(tile1.getSwimlanes());
result.addAll(tile2.getSwimlanes());
return Collections.unmodifiableSet(result);
@@ -162,7 +162,7 @@ public class FtileAssemblySimple extends AbstractTextBlock implements Ftile {
}
public List getWeldingPoints() {
- final List result = new ArrayList(tile1.getWeldingPoints());
+ final List result = new ArrayList<>(tile1.getWeldingPoints());
result.addAll(tile2.getWeldingPoints());
return Collections.unmodifiableList(result);
}
diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileDecorateWelding.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileDecorateWelding.java
index 9d0c98832..d3b5e0d9e 100644
--- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileDecorateWelding.java
+++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileDecorateWelding.java
@@ -47,7 +47,7 @@ public class FtileDecorateWelding extends FtileDecorate {
public FtileDecorateWelding(final Ftile ftile, final List breaks) {
super(ftile);
- this.breaks = new ArrayList(breaks);
+ this.breaks = new ArrayList<>(breaks);
}
@Override
diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileEmpty.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileEmpty.java
index d636d0fb0..78e98455e 100644
--- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileEmpty.java
+++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileEmpty.java
@@ -103,7 +103,7 @@ public class FtileEmpty extends AbstractFtile {
}
public Set getSwimlanes() {
- final Set result = new HashSet();
+ final Set result = new HashSet<>();
if (swimlaneIn != null) {
result.add(swimlaneIn);
}
diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileWithConnection.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileWithConnection.java
index cdd3c847b..410e7c11d 100644
--- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileWithConnection.java
+++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileWithConnection.java
@@ -47,7 +47,7 @@ import net.sourceforge.plantuml.ugraphic.UGraphic;
class FtileWithConnection extends FtileDecorate {
- private final List connections = new ArrayList();
+ private final List connections = new ArrayList<>();
FtileWithConnection(Ftile ftile, Collection connections) {
super(ftile);
@@ -74,7 +74,7 @@ class FtileWithConnection extends FtileDecorate {
}
public Collection getInnerConnections() {
- final List result = new ArrayList(super.getInnerConnections());
+ final List result = new ArrayList<>(super.getInnerConnections());
result.addAll(connections);
return Collections.unmodifiableList(connections);
}
diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/Snake.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/Snake.java
index 06e6abd36..70517c9f8 100644
--- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/Snake.java
+++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/Snake.java
@@ -205,7 +205,7 @@ public class Snake implements UShape {
final double move = 2 + colorArrowSeparationSpace;
final WormMutation mutation = WormMutation.create(worm, move);
if (mutation.isDxNegative()) {
- colors = new ArrayList(colors);
+ colors = new ArrayList<>(colors);
Collections.reverse(colors);
}
final double globalMove = -1.0 * (colors.size() - 1) / 2.0;
@@ -270,7 +270,7 @@ public class Snake implements UShape {
}
public List getHorizontalLines() {
- final List result = new ArrayList();
+ final List result = new ArrayList<>();
for (int i = 0; i < worm.size() - 1; i++) {
final Point2D pt1 = worm.get(i);
final Point2D pt2 = worm.get(i + 1);
diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/Swimlanes.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/Swimlanes.java
index 1111ccadb..511f8fb93 100644
--- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/Swimlanes.java
+++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/Swimlanes.java
@@ -93,9 +93,9 @@ public class Swimlanes extends AbstractTextBlock implements TextBlock, Styleable
private final ISkinParam skinParam;;
private final Pragma pragma;
- private final List swimlanesRaw = new ArrayList();
- private final List swimlanesSpecial = new ArrayList();
- private final List dividers = new ArrayList();
+ private final List swimlanesRaw = new ArrayList<>();
+ private final List swimlanesSpecial = new ArrayList<>();
+ private final List dividers = new ArrayList<>();
private Swimlane currentSwimlane = null;
private final Instruction root = new InstructionList();
diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/WormMutation.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/WormMutation.java
index 57d206364..47d64236c 100644
--- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/WormMutation.java
+++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/WormMutation.java
@@ -43,7 +43,7 @@ import net.sourceforge.plantuml.ugraphic.UTranslate;
public class WormMutation {
- private final List translations = new ArrayList();
+ private final List translations = new ArrayList<>();
private WormMutation() {
diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/Zad.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/Zad.java
index 4228eaf4f..89cabfc25 100644
--- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/Zad.java
+++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/Zad.java
@@ -44,7 +44,7 @@ import net.sourceforge.plantuml.ugraphic.color.HColorUtils;
public class Zad {
- private final List rectangles = new ArrayList();
+ private final List rectangles = new ArrayList<>();
public void add(MinMax rect) {
// System.err.println("add " + rect);
diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/AbstractParallelFtilesBuilder.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/AbstractParallelFtilesBuilder.java
index ae3cd754d..877bd8eca 100644
--- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/AbstractParallelFtilesBuilder.java
+++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/AbstractParallelFtilesBuilder.java
@@ -65,7 +65,7 @@ public abstract class AbstractParallelFtilesBuilder {
private final ISkinParam skinParam;
private final StringBounder stringBounder;
- protected final List list99 = new ArrayList();
+ protected final List list99 = new ArrayList<>();
public StyleSignature getDefaultStyleDefinition() {
return StyleSignature.of(SName.root, SName.element, SName.activityDiagram, SName.activity);
@@ -83,7 +83,7 @@ public abstract class AbstractParallelFtilesBuilder {
protected List getFoo2(List all) {
final double maxHeight = computeMaxHeight(all);
- final List