Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit d55c9c6

Browse filesBrowse files
arnaudroquesarnaudroques
committed
Import version 1.2021.8
1 parent 138b4c1 commit d55c9c6
Copy full SHA for d55c9c6

120 files changed

+3,309-1,658Lines changed: 3309 additions & 1658 deletions

File tree

Expand file treeCollapse file tree
Open diff view settings
Filter options

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Dismiss banner
Expand file treeCollapse file tree
Open diff view settings
Collapse file

‎pom.xml‎

Copy file name to clipboardExpand all lines: pom.xml
+1-6Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535

3636
<groupId>net.sourceforge.plantuml</groupId>
3737
<artifactId>plantuml</artifactId>
38-
<version>1.2021.8-SNAPSHOT</version>
38+
<version>1.2021.9-SNAPSHOT</version>
3939
<packaging>jar</packaging>
4040

4141
<name>PlantUML</name>
@@ -227,11 +227,6 @@
227227
<mavenExecutorId>forked-path</mavenExecutorId>
228228
</configuration>
229229
</plugin>
230-
<plugin>
231-
<groupId>org.codehaus.mojo</groupId>
232-
<artifactId>versions-maven-plugin</artifactId>
233-
<version>2.8.1</version>
234-
</plugin>
235230
</plugins>
236231
</build>
237232
</project>
Collapse file

‎skin/plantuml.skin‎

Copy file name to clipboardExpand all lines: skin/plantuml.skin
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,7 @@ ganttDiagram {
289289
}
290290
timeline {
291291
BackgroundColor transparent
292+
LineColor #C0C0C0
292293
}
293294
closed {
294295
BackGroundColor #E0E8E8
Collapse file

‎src/net/sourceforge/plantuml/ISkinParam.java‎

Copy file name to clipboardExpand all lines: src/net/sourceforge/plantuml/ISkinParam.java
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public interface ISkinParam extends ISkinSimple {
7878
public UFont getFont(Stereotype stereotype, boolean inPackageTitle, FontParam... fontParam);
7979

8080
public HorizontalAlignment getHorizontalAlignment(AlignmentParam param, ArrowDirection arrowDirection,
81-
boolean isReverseDefine);
81+
boolean isReverseDefine, HorizontalAlignment overrideDefault);
8282

8383
public HorizontalAlignment getDefaultTextAlignment(HorizontalAlignment defaultValue);
8484

Collapse file

‎src/net/sourceforge/plantuml/Option.java‎

Copy file name to clipboardExpand all lines: src/net/sourceforge/plantuml/Option.java
+11Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ public class Option {
7272
private OptionPreprocOutputMode preprocessorOutput = null;
7373
private boolean failfast = false;
7474
private boolean failfast2 = false;
75+
private boolean noerror = false;
7576

7677
private boolean duration = false;
7778
private boolean debugsvek = false;
@@ -228,6 +229,8 @@ public Option(String... arg) throws InterruptedException, IOException {
228229
this.failfast = true;
229230
} else if (s.equalsIgnoreCase("-failfast2")) {
230231
this.failfast2 = true;
232+
} else if (s.equalsIgnoreCase("-noerror")) {
233+
this.noerror = true;
231234
} else if (s.equalsIgnoreCase("-checkonly")) {
232235
this.checkOnly = true;
233236
} else if (s.equalsIgnoreCase("-theme")) {
@@ -619,6 +622,14 @@ public final void setFailfast2(boolean failfast2) {
619622
this.failfast2 = failfast2;
620623
}
621624

625+
public final void setNoerror(boolean noerror) {
626+
this.noerror = noerror;
627+
}
628+
629+
public final boolean isNoerror() {
630+
return noerror;
631+
}
632+
622633
public final File getOutputFile() {
623634
return outputFile;
624635
}
Collapse file

‎src/net/sourceforge/plantuml/OptionPrint.java‎

Copy file name to clipboardExpand all lines: src/net/sourceforge/plantuml/OptionPrint.java
+2-1Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ static public void printHelp() throws InterruptedException {
108108
+ "file\tTo include file as if '!include file' were used");
109109
System.out.println(
110110
" -I" + separator + "path" + separator + "to" + separator + "*.puml\tTo include files with pattern");
111-
System.out.println(" -theme xxx\\t\\tTo use a specific theme");
111+
System.out.println(" -theme xxx\t\tTo use a specific theme");
112112
System.out.println(" -charset xxx\tTo use a specific charset (default is " + charset + ")");
113113
System.out.println(" -e[x]clude pattern\tTo exclude files that match the provided pattern");
114114
System.out.println(" -metadata\t\tTo retrieve PlantUML sources from PNG images");
@@ -133,6 +133,7 @@ static public void printHelp() throws InterruptedException {
133133
System.out.println(" -checkonly\t\tTo check the syntax of files without generating images");
134134
System.out.println(" -failfast\t\tTo stop processing as soon as a syntax error in diagram occurs");
135135
System.out.println(" -failfast2\t\tTo do a first syntax check before processing files, to fail even faster");
136+
System.out.println(" -noerror\t\tTo skip images when error in diagrams");
136137
System.out.println(" -duration\t\tTo print the duration of complete diagrams processing");
137138
System.out.println(" -nbthread N\t\tTo use (N) threads for processing");
138139
System.out.println(" -nbthread auto\tTo use " + Option.defaultNbThreads() + " threads for processing");
Collapse file

‎src/net/sourceforge/plantuml/Run.java‎

Copy file name to clipboardExpand all lines: src/net/sourceforge/plantuml/Run.java
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -493,6 +493,7 @@ private static void manageFileInternal(File f, Option option, ErrorStatus error)
493493
option.getConfig(), option.getCharset(), option.getFileFormatOption());
494494
}
495495
sourceFileReader.setCheckMetadata(option.isCheckMetadata());
496+
((SourceFileReaderAbstract) sourceFileReader).setNoerror(option.isNoerror());
496497

497498
if (option.isComputeurl()) {
498499
error.goOk();
Collapse file

‎src/net/sourceforge/plantuml/SkinParam.java‎

Copy file name to clipboardExpand all lines: src/net/sourceforge/plantuml/SkinParam.java
+4-3Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,8 @@ public HColor getHtmlColor(ColorParam param, Stereotype stereotype, boolean clic
357357
}
358358

359359
public char getCircledCharacter(Stereotype stereotype) {
360-
final String value2 = getValue("spotchar" + Objects.requireNonNull(stereotype).getLabel(Guillemet.DOUBLE_COMPARATOR));
360+
final String value2 = getValue(
361+
"spotchar" + Objects.requireNonNull(stereotype).getLabel(Guillemet.DOUBLE_COMPARATOR));
361362
if (value2 != null && value2.length() > 0) {
362363
return value2.charAt(0);
363364
}
@@ -613,7 +614,7 @@ public DotSplines getDotSplines() {
613614
}
614615

615616
public HorizontalAlignment getHorizontalAlignment(AlignmentParam param, ArrowDirection arrowDirection,
616-
boolean isReverseDefine) {
617+
boolean isReverseDefine, HorizontalAlignment overrideDefault) {
617618
final String value;
618619
switch (param) {
619620
case sequenceMessageAlignment:
@@ -662,7 +663,7 @@ public HorizontalAlignment getHorizontalAlignment(AlignmentParam param, ArrowDir
662663
}
663664
final HorizontalAlignment result = HorizontalAlignment.fromString(value);
664665
if (result == null && param == AlignmentParam.noteTextAlignment) {
665-
return getDefaultTextAlignment(HorizontalAlignment.LEFT);
666+
return getDefaultTextAlignment(overrideDefault == null ? HorizontalAlignment.LEFT : overrideDefault);
666667
} else if (result == null && param == AlignmentParam.stateMessageAlignment) {
667668
return getDefaultTextAlignment(HorizontalAlignment.CENTER);
668669
} else if (result == null) {

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.