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

fix: add together in LanguageDescriptor and improve CommandStyleImport

Browse Source
This commit is contained in:
Arnaud Roques 2023-07-12 17:46:57 +02:00
parent 11b70de43f
commit 835f82a8d6
4 changed files with 18 additions and 18 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
# Any idea anyone how to magically synchronize those :-) ?
version = 1.2023.10beta2
version = 1.2023.10beta3
org.gradle.workers.max = 3

7
src/net/sourceforge/plantuml/style/CommandStyleImport.java
View File

@ -38,7 +38,6 @@ package net.sourceforge.plantuml.style;
import java.io.IOException;
import java.io.InputStream;
import java.net.MalformedURLException;
import java.net.URL;
import net.sourceforge.plantuml.FileSystem;
import net.sourceforge.plantuml.TitledDiagram;
@ -56,7 +55,7 @@ import net.sourceforge.plantuml.utils.BlocLines;
import net.sourceforge.plantuml.utils.LineLocation;
public class CommandStyleImport extends SingleLineCommand2<TitledDiagram> {
// ::remove file when __HAXE__
// ::remove file when __HAXE__
public static final CommandStyleImport ME = new CommandStyleImport();
@ -84,8 +83,8 @@ public class CommandStyleImport extends SingleLineCommand2<TitledDiagram> {
final String path = arg.get("PATH", 0);
try {
BlocLines lines = null;
if (path.startsWith("http")) {
SURL url = SURL.create (path);
if (path.startsWith("http://") || path.startsWith("https://")) {
SURL url = SURL.create(path);
try (InputStream remoteInputStream = url.openStream()) {
lines = BlocLines.load(remoteInputStream, location);
}

25
src/net/sourceforge/plantuml/syntax/LanguageDescriptor.java
View File

@ -224,6 +224,7 @@ public class LanguageDescriptor {
keyword.add("dashed");
keyword.add("bold");
keyword.add("map");
keyword.add("together");
preproc.add("!exit");
preproc.add("!include");
@ -255,21 +256,21 @@ public class LanguageDescriptor {
public Cypher getCypher() {
final Cypher cypher = new Cypher();
for (String s : type) {
for (String s : type)
cypher.addException(s);
}
for (String s : keyword) {
for (String s : keyword)
cypher.addException(s.replace("@", ""));
}
for (String s : preproc) {
for (String s : preproc)
cypher.addException(s.substring(1));
}
for (String s : SkinParam.getPossibleValues()) {
for (String s : SkinParam.getPossibleValues())
cypher.addException(s);
}
for (String s : HColorSet.instance().names()) {
for (String s : HColorSet.instance().names())
cypher.addException(s);
}
cypher.addException("o");
return cypher;
}
@ -286,9 +287,9 @@ public class LanguageDescriptor {
private static void print(PrintStream ps, String name, Collection<String> data) {
ps.println(";" + name);
ps.println(";" + data.size());
for (String k : data) {
for (String k : data)
ps.println(k);
}
ps.println();
}

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
// Any idea anyone how to magically synchronize those :-) ?
private static final String version = "1.2023.10beta2";
private static final String version = "1.2023.10beta3";
public static String versionString() {
return version;