octoleo/plantuml
1
0
Fork 0
mirror of https://github.com/octoleo/plantuml.git synced 2024-11-21 20:45:10 +00:00
Code Issues Releases Wiki Activity

refactor: Replaced stream usage with loops for Java 1.7 compatibility (!)

Browse Source
This commit is contained in:
Arnaud Roques 2024-04-06 13:02:19 +02:00
parent 7755ae5be4
commit 04eada12ab
3 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@ -1,4 +1,4 @@
# Warning, "version" should be the same in gradle.properties and Version.java # Warning, "version" should be the same in gradle.properties and Version.java
# Any idea anyone how to magically synchronize those :-) ? # Any idea anyone how to magically synchronize those :-) ?
version = 1.2024.4beta6 version = 1.2024.4beta7
org.gradle.workers.max = 3 org.gradle.workers.max = 3

27
src/net/sourceforge/plantuml/cheneer/command/CommandMultiSubclass.java
View File

@ -35,6 +35,7 @@
*/ */
package net.sourceforge.plantuml.cheneer.command; package net.sourceforge.plantuml.cheneer.command;
import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -84,15 +85,19 @@ public class CommandMultiSubclass extends SingleLineCommand2<ChenEerDiagram> {
throws NoSuchColorException { throws NoSuchColorException {
final String superclass = diagram.cleanId(arg.get("SUPERCLASS", 0)); final String superclass = diagram.cleanId(arg.get("SUPERCLASS", 0));
final String subclasses = arg.get("SUBCLASSES", 0); final String subclasses = arg.get("SUBCLASSES", 0);
final List<String> subclassIds = Arrays.stream(subclasses.split(","))
.map(String::trim) final List<String> subclassIds = new ArrayList<String>();
.map(diagram::cleanId)
.collect(Collectors.toList()); for (String subclass : subclasses.split(","))
subclassIds.add(diagram.cleanId(subclass.trim()));
final boolean isDouble = arg.get("PARTICIPATION", 0).equals("="); final boolean isDouble = arg.get("PARTICIPATION", 0).equals("=");
final String symbol = arg.get("SYMBOL", 0); final String symbol = arg.get("SYMBOL", 0);
final Quark<Entity> centerQuark = diagram.quarkInContext(false, superclass + "/" + symbol + subclasses + "/center"); final Quark<Entity> centerQuark = diagram.quarkInContext(false,
final Entity centerEntity = diagram.reallyCreateLeaf(centerQuark, Display.create(symbol), LeafType.CHEN_CIRCLE, null); superclass + "/" + symbol + subclasses + "/center");
final Entity centerEntity = diagram.reallyCreateLeaf(centerQuark, Display.create(symbol), LeafType.CHEN_CIRCLE,
null);
final Quark<Entity> superclassQuark = diagram.quarkInContext(true, superclass); final Quark<Entity> superclassQuark = diagram.quarkInContext(true, superclass);
final Entity superclassEntity = superclassQuark.getData(); final Entity superclassEntity = superclassQuark.getData();
@ -108,9 +113,7 @@ public class CommandMultiSubclass extends SingleLineCommand2<ChenEerDiagram> {
linkType = linkType.withMiddleSuperset(); linkType = linkType.withMiddleSuperset();
} }
final Link link = new Link(diagram.getEntityFactory(), diagram.getCurrentStyleBuilder(), superclassEntity, final Link link = new Link(diagram.getEntityFactory(), diagram.getCurrentStyleBuilder(), superclassEntity,
centerEntity, centerEntity, linkType, LinkArg.build(Display.NULL, 2));
linkType,
LinkArg.build(Display.NULL, 2));
link.setPortMembers(diagram.getPortId(superclassEntity.getName()), diagram.getPortId(centerEntity.getName())); link.setPortMembers(diagram.getPortId(superclassEntity.getName()), diagram.getPortId(centerEntity.getName()));
diagram.addLink(link); diagram.addLink(link);
@ -125,10 +128,8 @@ public class CommandMultiSubclass extends SingleLineCommand2<ChenEerDiagram> {
if (!symbol.equals("U")) { if (!symbol.equals("U")) {
subclassLinkType = subclassLinkType.withMiddleSuperset(); subclassLinkType = subclassLinkType.withMiddleSuperset();
} }
final Link subclassLink = new Link(diagram.getEntityFactory(), diagram.getCurrentStyleBuilder(), centerEntity, final Link subclassLink = new Link(diagram.getEntityFactory(), diagram.getCurrentStyleBuilder(),
subclassEntity, centerEntity, subclassEntity, subclassLinkType, LinkArg.build(Display.NULL, 3));
subclassLinkType,
LinkArg.build(Display.NULL, 3));
diagram.addLink(subclassLink); diagram.addLink(subclassLink);
} }

2
src/net/sourceforge/plantuml/version/Version.java
View File

@ -46,7 +46,7 @@ public class Version {
// Warning, "version" should be the same in gradle.properties and Version.java // Warning, "version" should be the same in gradle.properties and Version.java
// Any idea anyone how to magically synchronize those :-) ? // Any idea anyone how to magically synchronize those :-) ?
private static final String version = "1.2024.4beta6"; private static final String version = "1.2024.4beta7";
public static String versionString() { public static String versionString() {
return version; return version;