octoleo/plantuml
1
0
Fork 0
mirror of https://github.com/octoleo/plantuml.git synced 2025-03-31 23:41:33 +00:00
Code Issues Releases Wiki Activity

Try to fix DisplayPositioned typo

Browse Source
This commit is contained in:
Arnaud Roques 2021-11-19 21:54:57 +01:00
parent bbeb280022
commit 29e652a3b0
3 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/net/sourceforge/plantuml/cucadiagram/DisplayPositioned.java
View File

@ -38,7 +38,7 @@ package net.sourceforge.plantuml.cucadiagram;
import net.sourceforge.plantuml.graphic.HorizontalAlignment; import net.sourceforge.plantuml.graphic.HorizontalAlignment;
import net.sourceforge.plantuml.graphic.VerticalAlignment; import net.sourceforge.plantuml.graphic.VerticalAlignment;
public class DisplayPositioned implements DisplayPositionned { public class DisplayPositioned extends DisplayPositionned {
private final Display display; private final Display display;
private final HorizontalAlignment horizontalAlignment; private final HorizontalAlignment horizontalAlignment;

10
src/net/sourceforge/plantuml/cucadiagram/DisplayPositionned.java
View File

@ -44,11 +44,15 @@ package net.sourceforge.plantuml.cucadiagram;
* *
*/ */
@Deprecated @Deprecated
public interface DisplayPositionned { public class DisplayPositionned {
public Display getDisplay(); public Display getDisplay() {
return null;
}
public boolean isNull(); public boolean isNull() {
return false;
}
} }

9
src/net/sourceforge/plantuml/style/StyleLoader.java
View File

@ -118,6 +118,11 @@ public class StyleLoader {
boolean inComment = false; boolean inComment = false;
for (StringLocated s : lines) { for (StringLocated s : lines) {
String trimmed = s.getTrimmed().getString(); String trimmed = s.getTrimmed().getString();
if (trimmed.startsWith("/*") || trimmed.endsWith("*/"))
continue;
if (trimmed.startsWith("/'") || trimmed.endsWith("'/"))
continue;
if (trimmed.startsWith("/*") || trimmed.startsWith("/'")) { if (trimmed.startsWith("/*") || trimmed.startsWith("/'")) {
inComment = true; inComment = true;
continue; continue;
@ -126,9 +131,9 @@ public class StyleLoader {
inComment = false; inComment = false;
continue; continue;
} }
if (inComment) { if (inComment)
continue; continue;
}
final int x = trimmed.lastIndexOf("//"); final int x = trimmed.lastIndexOf("//");
if (x != -1) { if (x != -1) {
trimmed = trimmed.substring(0, x).trim(); trimmed = trimmed.substring(0, x).trim();