From cb0bcb6952ad2360d2407ee60d9bc9c6c726fe16 Mon Sep 17 00:00:00 2001 From: Arnaud Roques Date: Sun, 28 Mar 2021 12:30:15 +0200 Subject: [PATCH] Minor fixes --- src/net/sourceforge/plantuml/UrlBuilder.java | 3 ++- .../plantuml/dedication/Dedications.java | 1 + .../sourceforge/plantuml/dedication/dr_chet.png | Bin 0 -> 23598 bytes .../plantuml/graphic/QuoteUtils.java | 4 +++- .../command/CommandConstraint.java | 2 ++ .../sourceforge/plantuml/version/Version.java | 2 +- 6 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 src/net/sourceforge/plantuml/dedication/dr_chet.png diff --git a/src/net/sourceforge/plantuml/UrlBuilder.java b/src/net/sourceforge/plantuml/UrlBuilder.java index c400d4d89..2bafb0ca2 100644 --- a/src/net/sourceforge/plantuml/UrlBuilder.java +++ b/src/net/sourceforge/plantuml/UrlBuilder.java @@ -137,7 +137,8 @@ public class UrlBuilder { } private String withTopUrl(String url) { - if (url.startsWith("http:") == false && url.startsWith("https:") == false && topurl != null) { + if (url.startsWith("http:") == false && url.startsWith("https:") == false && url.startsWith("file:") == false + && topurl != null) { return topurl + url; } return url; diff --git a/src/net/sourceforge/plantuml/dedication/Dedications.java b/src/net/sourceforge/plantuml/dedication/Dedications.java index f800c39a1..5a5c4c215 100644 --- a/src/net/sourceforge/plantuml/dedication/Dedications.java +++ b/src/net/sourceforge/plantuml/dedication/Dedications.java @@ -51,6 +51,7 @@ public class Dedications { addNormal("linux_china", "linux_china"); addNormal("ARKBAN", "arkban"); addNormal("Boundaries allow discipline to create true strength", "boundaries"); + addNormal("Thank you, Dr. Chet. I wouldn't be where I am without you", "dr_chet"); addCrypted("0", "pOhci6rKgPXw32AeYXhOpSY0suoauHq5VUSwFqHLHsLYgSO6WaJ7BW5vtHBAoU6ePbcW7d8Flx99MWjPSKQTDm00"); addCrypted("1", "LTxN3hdnhSJ515qcA7IQ841axt4GXfUd3n2wgNirYCdLnyX2360Gv1OEOnJ1-gwFzRW5B3HAqLBkR6Ge0WW_Z000"); addCrypted("2", "lZqLduj4j1yRqSfAvkhbqVpqK8diklatiFeenDUXSdna9bKYQTzdS264YfUBScUVDYCp2Vcq04updoN98RwxE000"); diff --git a/src/net/sourceforge/plantuml/dedication/dr_chet.png b/src/net/sourceforge/plantuml/dedication/dr_chet.png new file mode 100644 index 0000000000000000000000000000000000000000..9d9c3930a4169e04ef650c984e76f8ac65b4b270 GIT binary patch literal 23598 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£#}Pk`)--zDb_QtPvFcU@je zwSsS*xo9KooB4TIdt`Ahc==*4|I7ZU1G=pcLKRKV@dm`AwYbJ;C#7BF<#jboLZvP z^b{#_g-5Lt9|-)qf(>`)Pdx4GHt=Vqt<3vz&~p{!Z4aP z;HG1MZ;se;pNWgAXG=R?k0gr`C?%v>3%2`@oU9wBbzXKIzT@4W9EVw$4x^2BWGE)$ zza+)v6I%X@txa)i*wVAW=Vyup`%6Ma^zam;XZ;rPx?YK+y9rk36RlUQY3H_{JHIvA6A4GHIjWu4b+JpgH$NoT+uZqMyQ zA0r4KW23h%ACBY-uIO7|oXvmN zRMoN(#!l*HVB+$!Zt%7W4-s;Tn49C`yz|?;SCqCzzjlsAv3+OpvOw}-eVJKi_q0iC z6fI(N7#dS2&($zU-{k2ydvPZf9&sL?8p@P^H zy&lLcU%4Q9S^B&!Sf0G0Jo5WPVPjt|vT*ch^&4L<%t}<*pNbi+``26I%-dw?|jcq^|zNpA7xYR10slgD76{ngxZ>7nNW8 z|1OPEA!=g%sh3tGCTMFyL89yYpwnq8Mf9pWn+f%qqdTdpUGh|H!7~@pM^Feju9Up zzN*`pd;%5_unI$U$jfHNQLs$~tBQ{DND9oR*FBgHv#9NOzF_GUfujhnwg3>ahxr!~_j{V!W+=ZM_D4JkiP zQT-urvHboT=G$(jVKU@o=D4;ZRJ7H!YC>vl*gxRN-929m<-&vYMT1=n_!&R!UcoEW zprBqQQ}AD4#JMAcVDOl!J_-1r1?{y*vS^T0f(#jQ^f^G{JHeWG2~;;YdXYDj#|DI! zf-!CCcde8Tx)hGu0Yi}ntUT-vAWGE>xG(S;m$SOI+X3N0<`%h_tj;D78#@`ml-9UT z9Knu_KW4qe=E-`hj1-FE5g5Q4N>$qTP)l8v(9+jGjTMuC-#2RggS5EJ=~?Zni9^u_ zMlYZ*fxC#Cf1H3o3>r0ZX-4h1blkr^Y6&tH&T`naK&o1q1iTH$>tmWZ)ZZWcS)utH zUu+KKhGY;xs(?e4k@WyC#bFumUDmuGx7aqa50qvC|0y%VR!jL35k(5<0_y_*nq&5* zjHSj?vqUy+TUhjg9)9aFydJTlX=hp_4YeS&xc=k(?8SQ>>LqB4j7|mq0Qa>TM1X!y6yM_+o))G(=x>Rp< FCAFVj*u?+< literal 0 HcmV?d00001 diff --git a/src/net/sourceforge/plantuml/graphic/QuoteUtils.java b/src/net/sourceforge/plantuml/graphic/QuoteUtils.java index 6b4194bdd..4a3cc0b2f 100644 --- a/src/net/sourceforge/plantuml/graphic/QuoteUtils.java +++ b/src/net/sourceforge/plantuml/graphic/QuoteUtils.java @@ -293,7 +293,9 @@ public class QuoteUtils { "Gebyy gur erfcnja, Wrerzl", "Bhoyvr dhr g'nf nhphar punapr. Fhe ha znyragraqh pn crhg znepure.", "Obl, gur fhcrevagraqrag'f tbaan or cvffrq!", "BX, jub oebhtug gur qbt?", "Rg yn, p'rfg yr qenzr...", "V'z shmml ba gur jubyr tbbq/onq guvat. Jung qb lbh zrna, 'onq'?", - "Lbh'er evtug. Ab uhzna orvat jbhyq fgnpx obbxf yvxr guvf."); + "Lbh'er evtug. Ab uhzna orvat jbhyq fgnpx obbxf yvxr guvf.", + "V nz fb pyrire gung fbzrgvzrf V qba'g haqrefgnaq n fvatyr jbeq bs jung V nz fnlvat.", + "Jnxr zr hc orsber lbh tb-tb"); private QuoteUtils() { } diff --git a/src/net/sourceforge/plantuml/timingdiagram/command/CommandConstraint.java b/src/net/sourceforge/plantuml/timingdiagram/command/CommandConstraint.java index 4edf7328d..22beedadc 100644 --- a/src/net/sourceforge/plantuml/timingdiagram/command/CommandConstraint.java +++ b/src/net/sourceforge/plantuml/timingdiagram/command/CommandConstraint.java @@ -92,8 +92,10 @@ public class CommandConstraint extends SingleLineCommand2 { if (tick1 == null) { return CommandExecutionResult.error("Unknown time label"); } + final TimeTick restore = diagram.getNow(); diagram.updateNow(tick1); final TimeTick tick2 = TimeTickBuilder.parseTimeTick("TIME2", arg, diagram); + diagram.updateNow(restore); if (tick2 == null) { return CommandExecutionResult.error("Unknown time label"); } diff --git a/src/net/sourceforge/plantuml/version/Version.java b/src/net/sourceforge/plantuml/version/Version.java index e9d864606..05fc9a50c 100644 --- a/src/net/sourceforge/plantuml/version/Version.java +++ b/src/net/sourceforge/plantuml/version/Version.java @@ -80,7 +80,7 @@ public class Version { } public static int beta() { - final int beta = 2; + final int beta = 3; return beta; }