From 486b020a847901e74cccc0485c355e83654bcb08 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 14 Nov 2023 02:04:54 +0000 Subject: [PATCH 01/95] chore(deps): bump actions/github-script from 6 to 7 Bumps [actions/github-script](https://github.com/actions/github-script) from 6 to 7. - [Release notes](https://github.com/actions/github-script/releases) - [Commits](https://github.com/actions/github-script/compare/v6...v7) --- updated-dependencies: - dependency-name: actions/github-script dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/add-triage-label.yml | 2 +- .github/workflows/close-and-put-in-backlog.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/add-triage-label.yml b/.github/workflows/add-triage-label.yml index 56da33e00..c98272529 100644 --- a/.github/workflows/add-triage-label.yml +++ b/.github/workflows/add-triage-label.yml @@ -12,7 +12,7 @@ jobs: permissions: issues: write steps: - - uses: actions/github-script@v6 + - uses: actions/github-script@v7 with: script: | github.rest.issues.addLabels({ diff --git a/.github/workflows/close-and-put-in-backlog.yml b/.github/workflows/close-and-put-in-backlog.yml index 26afa923d..91ad3c50d 100644 --- a/.github/workflows/close-and-put-in-backlog.yml +++ b/.github/workflows/close-and-put-in-backlog.yml @@ -7,7 +7,7 @@ jobs: if: github.event.label.name == 'p:backlog' runs-on: ubuntu-latest steps: - - uses: actions/github-script@v6 + - uses: actions/github-script@v7 with: script: | const welcomeMessage = ` From 6e85bcaac94ec364f33cd2a2f62ffe1d20d218e5 Mon Sep 17 00:00:00 2001 From: The-Lum <86879521+The-Lum@users.noreply.github.com> Date: Thu, 16 Nov 2023 11:08:55 +0000 Subject: [PATCH 02/95] docs: add `package-info.java` and `readme.md` For external code: - acearth, - zxing, - jcckit, - ditaa. --- .../com/ctreber/acearth/package-info.java | 16 ++++++++++++++++ src/ext/plantuml/com/ctreber/acearth/readme.md | 12 ++++++++++++ .../plantuml/com/google/zxing/package-info.java | 16 ++++++++++++++++ src/ext/plantuml/com/google/zxing/readme.md | 15 +++++++++++++++ src/h/package-info.java | 4 ++-- src/jcckit/package-info.java | 16 ++++++++++++++++ src/jcckit/readme.md | 15 +++++++++++++++ .../ascii2image/core/package-info.java | 16 ++++++++++++++++ .../stathissideris/ascii2image/core/readme.md | 15 +++++++++++++++ src/smetana/core/package-info.java | 4 ++-- 10 files changed, 125 insertions(+), 4 deletions(-) create mode 100644 src/ext/plantuml/com/ctreber/acearth/package-info.java create mode 100644 src/ext/plantuml/com/ctreber/acearth/readme.md create mode 100644 src/ext/plantuml/com/google/zxing/package-info.java create mode 100644 src/ext/plantuml/com/google/zxing/readme.md create mode 100644 src/jcckit/package-info.java create mode 100644 src/jcckit/readme.md create mode 100644 src/org/stathissideris/ascii2image/core/package-info.java create mode 100644 src/org/stathissideris/ascii2image/core/readme.md diff --git a/src/ext/plantuml/com/ctreber/acearth/package-info.java b/src/ext/plantuml/com/ctreber/acearth/package-info.java new file mode 100644 index 000000000..8e69ae42d --- /dev/null +++ b/src/ext/plantuml/com/ctreber/acearth/package-info.java @@ -0,0 +1,16 @@ +/* + * ⚠ Disclaimer 🚩 + * This file was not part of the original package. + * It was included only on the PlantUML package + * to provide source citation and documentation. + * + */ +/** + * Internal copy of AC.earth - XEarth + * for Java (code of Christian Treber). + * + * @see ext.plantuml.com.ctreber.acearth.ACearth + * @see net.sourceforge.plantuml.acearth + * + */ +package ext.plantuml.com.ctreber.acearth; diff --git a/src/ext/plantuml/com/ctreber/acearth/readme.md b/src/ext/plantuml/com/ctreber/acearth/readme.md new file mode 100644 index 000000000..2fc76d570 --- /dev/null +++ b/src/ext/plantuml/com/ctreber/acearth/readme.md @@ -0,0 +1,12 @@ +> [!WARNING] +> **Disclaimer**: +> This file was not part of the original package. +> It was included only on the PlantUML package to provide source citation and documentation. + +# Directory Documentation for `acearth` + +## Description +Internal copy of `AC.earth` - `XEarth` for Java _(code of Christian Treber)_. + +## See more information on +- [readme of `plantuml/acearth`](../../../../../net/sourceforge/plantuml/acearth/readme.md) diff --git a/src/ext/plantuml/com/google/zxing/package-info.java b/src/ext/plantuml/com/google/zxing/package-info.java new file mode 100644 index 000000000..a2d28d364 --- /dev/null +++ b/src/ext/plantuml/com/google/zxing/package-info.java @@ -0,0 +1,16 @@ +/* + * ⚠ Disclaimer 🚩 + * This file was not part of the original package. + * It was included only on the PlantUML package + * to provide source citation and documentation. + * + */ +/** + * Internal copy of + * + * ZXing (code of Google). + * + * @see net.sourceforge.plantuml.flashcode + * + */ +package ext.plantuml.com.google.zxing; diff --git a/src/ext/plantuml/com/google/zxing/readme.md b/src/ext/plantuml/com/google/zxing/readme.md new file mode 100644 index 000000000..fb27815b3 --- /dev/null +++ b/src/ext/plantuml/com/google/zxing/readme.md @@ -0,0 +1,15 @@ +> [!WARNING] +> **Disclaimer**: +> This file was not part of the original package. +> It was included only on the PlantUML package to provide source citation and documentation. + +# Directory Documentation for `zxing` + +## Description +Internal copy of `ZXing` _(code of Google)_. + +## Credit +- :octocat: [zxing/zxing](https://github.com/zxing/zxing) + +## See more information on +- [readme of `plantuml/flashcode`](../../../../../net/sourceforge/plantuml/flashcode/readme.md) diff --git a/src/h/package-info.java b/src/h/package-info.java index dff6c2a46..154188af6 100644 --- a/src/h/package-info.java +++ b/src/h/package-info.java @@ -12,9 +12,9 @@ * *

* - * @see gen + * @see "gen" * @see gen.annotation - * @see gen.lib + * @see "gen.lib" * @see gen.plugin.dot_layout * @see smetana.core * @see net.sourceforge.plantuml.sdot diff --git a/src/jcckit/package-info.java b/src/jcckit/package-info.java new file mode 100644 index 000000000..6bc88456f --- /dev/null +++ b/src/jcckit/package-info.java @@ -0,0 +1,16 @@ +/* + * ⚠ Disclaimer 🚩 + * This file was not part of the original package. + * It was included only on the PlantUML package + * to provide source citation and documentation. + * + */ +/** + * Internal copy of + * + * JCCKit (code of Franz-Josef Elmer). + * + * @see net.sourceforge.plantuml.jcckit + * + */ +package jcckit; diff --git a/src/jcckit/readme.md b/src/jcckit/readme.md new file mode 100644 index 000000000..19b4239f5 --- /dev/null +++ b/src/jcckit/readme.md @@ -0,0 +1,15 @@ +> [!WARNING] +> **Disclaimer**: +> This file was not part of the original package. +> It was included only on the PlantUML package to provide source citation and documentation. + +# Directory Documentation for `jcckit` + +## Description +Internal copy of `JCCKit` _(code of Franz-Josef Elmer)_. + +## Credit +- [JCCKit _(on Sourceforge)_](https://jcckit.sourceforge.net) + +## See more information on +- [readme of `plantuml/jcckit`](../net/sourceforge/plantuml/jcckit/readme.md) diff --git a/src/org/stathissideris/ascii2image/core/package-info.java b/src/org/stathissideris/ascii2image/core/package-info.java new file mode 100644 index 000000000..d39d0688a --- /dev/null +++ b/src/org/stathissideris/ascii2image/core/package-info.java @@ -0,0 +1,16 @@ +/* + * ⚠ Disclaimer 🚩 + * This file was not part of the original package. + * It was included only on the PlantUML package + * to provide source citation and documentation. + * + */ +/** + * Internal copy of + * + * ditaa (code of Stathis Sideris). + * + * @see net.sourceforge.plantuml.ditaa + * + */ +package org.stathissideris.ascii2image.core; diff --git a/src/org/stathissideris/ascii2image/core/readme.md b/src/org/stathissideris/ascii2image/core/readme.md new file mode 100644 index 000000000..f79ec3ec5 --- /dev/null +++ b/src/org/stathissideris/ascii2image/core/readme.md @@ -0,0 +1,15 @@ +> [!WARNING] +> **Disclaimer**: +> This file was not part of the original package. +> It was included only on the PlantUML package to provide source citation and documentation. + +# Directory Documentation for `core` + +## Description +Internal copy of `ditaa` _(code of Stathis Sideris)_. + +## Credit +- :octocat: [stathissideris/ditaa](https://github.com/stathissideris/ditaa) + +## See more information on +- [readme of `plantuml/ditaa`](../../../../net/sourceforge/plantuml/ditaa/readme.md) diff --git a/src/smetana/core/package-info.java b/src/smetana/core/package-info.java index 05aa05a4f..0d7268531 100644 --- a/src/smetana/core/package-info.java +++ b/src/smetana/core/package-info.java @@ -5,9 +5,9 @@ * in plantuml. * * @see h - * @see gen + * @see "gen" * @see gen.annotation - * @see gen.lib + * @see "gen.lib" * @see gen.plugin.dot_layout * @see net.sourceforge.plantuml.sdot * From f91a19413baec5a3bf718a4fd7410ade13e0e13d Mon Sep 17 00:00:00 2001 From: Arnaud Roques Date: Thu, 16 Nov 2023 18:01:11 +0100 Subject: [PATCH 03/95] feat: add osa2 icon library --- stdlib/home.repx | 3 ++- stdlib/osa2-abx.repx | Bin 0 -> 4246 bytes stdlib/osa2-dex.repx | Bin 0 -> 27554 bytes 3 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 stdlib/osa2-abx.repx create mode 100644 stdlib/osa2-dex.repx diff --git a/stdlib/home.repx b/stdlib/home.repx index 94f621da5..5a3cd00a5 100644 --- a/stdlib/home.repx +++ b/stdlib/home.repx @@ -14,4 +14,5 @@ logos material office osa -tupadr3 +osa2 +tupadr3 \ No newline at end of file diff --git a/stdlib/osa2-abx.repx b/stdlib/osa2-abx.repx new file mode 100644 index 0000000000000000000000000000000000000000..03f27ade4d33bebd2528399425acbd5ca1de8b63 GIT binary patch literal 4246 zcmZvfXE+-S7ltD!uT5<=I#8Qftr00zR5e}=YR0D2rdDFK2-Q~YRiSFtD6Lgg)Lv4dUL`fdaOR62(3j7`6B zn_+-q7#okxIXt{-B78w(@eicH$41lO5;&}gF1OlK<)eV)OMHKEHP zePfkbuRG&*WtIs2mBQW|Y?zHoc)kOhH(0rx5#?jt*kg^GZlfed3@WJL3&;MNdAugb zzfbfD+wy^ZI=k!3)8^M#4ZZoC2sO5$-$CXQOG1BheCN*M{#v?v*D~wIgNJ;o!=eDvEE1wR_#aqq`z{_Op{yh`55W9Gpylr%gCeU$SjjGUFhACR&hjc`+XFb&r zEoG8Z?ppb_H}H*#W?}rox0oK!$7G+}j^rNh)cU1yrM|D(h^bLJeNH$2(rdf$MUb@D zYC*!K3+@a$@}iKxs-rHh6q13e36Pd&1QbODkYBrc=Wn-$QYN)GBfKH(fea57Jt^2W zGvz42D;vC~8y~)KY8S$_EAbquQ~+exIs`yWi*GPL2Ul8&6p7icLZ)@H>}1WUYBfM`X?bJ!CJ z;RyzdqpQg!IL*f=3kKEcj*)o<=K}g5PDmu)gzxSyZL$nj2b)VSbH+W8*%q!jhMLxC zH=w|AYbDarM%@vIprE>UJj!id$adLJO)zx+a9TED)KsZ?{2Ak~7Jx={hv^DT!$}u< zvDw}C+O|BZ%2?k7SSk?knLfdx@Qwb}3o-fr&hNh8owKV3l%~1+%DPxip0I#5Fe)W^ z;%}Y-+lSkbxk@Xus%slnwoYz+Ma&S{Z%9u`R6qEuc>Ia1(_YLc^4{a`=7EyV78&Mw z3_*wRB_CD~s~OAU2<=5D{1>^;%<$D;P6DGF*!d0w`Ud_jvaDqh>NixV;$#lRe5O_< zb>4g{NpKdH>={kEGv^VT>t?)(;UMh8rwPfDxtTT(W-2LlQ`>^wP7l*~VxLSfr>)jo zc&!)UqD5;bIoGTEF<-vv4HuX`+4z7GZjZnvk>&^&QuIj_aZAN52iCYUVF625X@Amc4bllq1N?&w;Ix!>07IN@{# z&=oW%d@zzNUOCY2(`WkXIof5jHuFcwNj4P5;FNaam*dNe9)Gbh)!nFg{)9IOo|hs0O!JXp?R>G^oB*Yd=VHVJM{2imtOn`v zYDpU$S!1(yyK&wsX$RqI+yzVU5$CcKX0b%wN-kehpHX_aTz z>sP=X#DLi~3plk&U*8AgmM!=0$z^~3@`F%v1xYuKNh&Gd!Q$v0n+I)c<-!YzQS*5X zlyamsb55~}r}ZGLD6m%R{V?KQ1K`bv8QWq1r%9%tqrxxOdv7FLJ77kH!xHU>mnb<& zOpSubG*Gt&vI3d$bzW4g_*He$!%B%8Ew77G8x$|3&;;GUm~mZ&^ZQ(_`lhRO4scBn z;H!F6xb@jhclNK-Lf3r=hY!NcRh;3!)8n~=ec>(8Pdt;UFZpE4Tkgei*GYTvBiFK4<6FqC(_Z!UqX@3~rxs{PQan z9HSR9EEmt>f?p=SZw3R>8dOp&5xUI-#0~xSMXJx}-rKS;tNmYA)TSEkKtxa`--aO^ z5&Tw*JkYlD_+%+ff9nFR7IpCIgCCj$8Q$37{fzH1NPXU3>3+tgT&HfDU$BQOwKbbo zF)?;<5mJ5&tRi&L|HO`_ez-^TDLwbxM5asAZoMo~>4n`;8KAzDAP984`R0wm89XzU zdK<1lO}DO=8Lnj}xymb0eiFBq^4RM85!cL9t^F`cEIVZs=Jk2y_URO~}PU9y@Pkp`4z zToC3rXf(Gh_Me{)-ptSY6`!v@n;;V~RQ~!bszI)_cSi{lhIooRKM$>mWkLETm)_>c zc`u$-dHWouGM=rk4bVfm_&dnrEv=GET96A#_Jh zDHMxuTfUrty=xFP8^WKajJaH0Ex=r2cN?uumELOi?DiLUVfQD~aW|%UKZd;iI8aOT8jobs=q#t%SxF8!-rn%X zY;^pfP-F=2=aUh;t&(Y^2%;%H((i?90fi8fv7y)4@5MXaH2kj6-_yl>|&i)z8H5(Qe4Et{T<)-X(=CnwAaqr~gzh3UY2b5?d)w<2+_JhZ%5lu?iSyFxe4`P~r zd+COq)+UnU{|pr{B=jxM8SI^AVX_I)aZQEdVDL{rJ#bJEr*aP0&Z%~Vt@T+ISY40l$e^vovq|y zMIN%~jaTyU=)#i!>f>UUd_;JulkQAspsUMhcpt<%Bb7yzvKb9!a!Sk) z=Rf9m?B;)2H%P$|*VSwKaxoZ?xqGDXzPzpS80!%){fDqw3{11^9`kTe@X6`78yb|Ek$HFbQKXCUZ`~g zmK32jy#d4#&VH?G9aDIf&1NOU`+It-Zu5`4PL=&(Huye9yqzHsaJ0N35Lr{Ao#;|_ zho1_FpxX9KE1Vg9Kd=2_3y2ZRYVa zHputafcn@?nMG`F{!W1>y6*i^MYTP9#tZdr4O8tJkUF)VQ^!!rBlvLC5J=lm8vKK5 z*nPPVr#$EZ-@fWs4s`J#2P5ta{JRIyy+v<+ahda(!gk5YN@podT{#OX(2QFG?v?%>n3wkX zo~1UEMRD~rOZL-jyA)3obU)3utaQ_lh*(~36!*A+f`4x%4*adk3x+9l;Y`ZmT=*SQB;e6XBN|S=TAtL$zj5b zcF@9_U^4ef|0#H}BU3jX7zW<&k~)apg!EqHI|7=Ne{(I+XL-zIWGt1GSWv z){;QW6>cOA9ABYbpQnp_Lii3sbgp?UmGLu$U1_TH03@HjM?^op_T1rP&kqx8t(S;y zpNhdbUr{}yFrkcjyM>qf)hQA3;O2pB+HKu1?s>q2H$8CRa3H^m_9Wf)e%sT?8YpQ! zXg6);I;Ax`)~xMkYHVg6y$E+a6={GDnw^Y|8SkcxiF&q3#OlJdOSeHd$>u&kcjIi=S*gm!$ejjq$PBL{-QC)lDZ%D z_GaG7?zpese4(E?rXsNTa)12c2>21^nbyN#hg;pH4o&<9J;XgupA(&Pn4zu;LLijh z6-SxrzRexza}ch%DW#t8p_&_e?e>$_tHQ(c;i_gqn{E9MamV2|fp1ah^DaG5bx+CN zbBTsRJI|pr=a`13<*}tCrGI2}grzIUMR7YFM)mRo4gV{}rwyQ6E(qP&Q@0>PoZiRD zsT^PXqI2rDAQ(9o5g-yjI4uNG#U!;M5M3kIzbJ=8j7Jqh_YI)V>d^C28pv@!HYlEU S8knb?N=$FiftGZf0R981FIFP} literal 0 HcmV?d00001 diff --git a/stdlib/osa2-dex.repx b/stdlib/osa2-dex.repx new file mode 100644 index 0000000000000000000000000000000000000000..096fffbe1ccbe15b029a2be2f9bafa931ebf0c02 GIT binary patch literal 27554 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 JH)y=r$N-~nW#j+= literal 0 HcmV?d00001 From 546174d17faa966901bf67f32d31c1a2320944cc Mon Sep 17 00:00:00 2001 From: Arnaud Roques Date: Thu, 16 Nov 2023 18:23:58 +0100 Subject: [PATCH 04/95] fix: better support for package with ELK layout https://forum.plantuml.net/13709/eclipse-layout-kernel?show=18389#a18389 --- gradle.properties | 2 +- .../plantuml/elk/CucaDiagramFileMakerElk.java | 30 ++-- .../plantuml/stats/FormatCounter.java | 5 +- .../plantuml/svek/GeneralImageBuilder.java | 2 +- .../plantuml/syntax/SyntaxChecker.java | 150 ++++++++++++++++++ .../sourceforge/plantuml/version/Version.java | 2 +- 6 files changed, 171 insertions(+), 20 deletions(-) create mode 100644 src/net/sourceforge/plantuml/syntax/SyntaxChecker.java diff --git a/gradle.properties b/gradle.properties index 39994fd2b..b1f62183a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -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.13beta1 +version = 1.2023.13beta2 org.gradle.workers.max = 3 \ No newline at end of file diff --git a/src/net/sourceforge/plantuml/elk/CucaDiagramFileMakerElk.java b/src/net/sourceforge/plantuml/elk/CucaDiagramFileMakerElk.java index 0f94cb8fe..015879156 100644 --- a/src/net/sourceforge/plantuml/elk/CucaDiagramFileMakerElk.java +++ b/src/net/sourceforge/plantuml/elk/CucaDiagramFileMakerElk.java @@ -127,6 +127,7 @@ import net.sourceforge.plantuml.style.StyleSignatureBasic; import net.sourceforge.plantuml.svek.Bibliotekon; import net.sourceforge.plantuml.svek.Cluster; import net.sourceforge.plantuml.svek.ClusterDecoration; +import net.sourceforge.plantuml.svek.ClusterHeader; import net.sourceforge.plantuml.svek.CucaDiagramFileMaker; import net.sourceforge.plantuml.svek.DotStringFactory; import net.sourceforge.plantuml.svek.GeneralImageBuilder; @@ -298,12 +299,12 @@ public class CucaDiagramFileMakerElk implements CucaDiagramFileMaker { // final double roundCorner = group.getUSymbol() == null ? 0 // : group.getUSymbol().getSkinParameter().getRoundCorner(skinParam, group.getStereotype()); - final TextBlock ztitle = getTitleBlock(group); - final TextBlock zstereo = TextBlockUtils.empty(0, 0); - final RectangleArea rectangleArea = new RectangleArea(0, 0, elkNode.getWidth(), elkNode.getHeight()); - final ClusterDecoration decoration = new ClusterDecoration(packageStyle, group.getUSymbol(), ztitle, - zstereo, rectangleArea, stroke); + final ClusterHeader clusterHeader = new ClusterHeader(group, diagram.getSkinParam(), diagram, + stringBounder); + + final ClusterDecoration decoration = new ClusterDecoration(packageStyle, group.getUSymbol(), + clusterHeader.getTitle(), clusterHeader.getStereo(), rectangleArea, stroke); final HColor borderColor = HColors.BLACK; decoration.drawU(ug.apply(UTranslate.point(corner)), backColor, borderColor, shadowing, roundCorner, @@ -314,16 +315,6 @@ public class CucaDiagramFileMakerElk implements CucaDiagramFileMaker { // ug.apply(HColorUtils.BLACK).apply(UStroke.withThickness(1.5)).apply(new UTranslate(corner)).draw(rect); } - private TextBlock getTitleBlock(Entity g) { - final Display label = g.getDisplay(); - if (label == null) - return TextBlockUtils.empty(0, 0); - - final ISkinParam skinParam = diagram.getSkinParam(); - final FontConfiguration fontConfiguration = g.getFontConfigurationForTitle(skinParam); - return label.create(fontConfiguration, HorizontalAlignment.CENTER, skinParam); - } - private HColor getBackColor(UmlDiagramType umlDiagramType) { return null; } @@ -429,7 +420,14 @@ public class CucaDiagramFileMakerElk implements CucaDiagramFileMaker { // We create the "cluster" in ELK for this group final ElkNode elkCluster = ElkGraphUtil.createNode(cluster); elkCluster.setProperty(CoreOptions.DIRECTION, Direction.DOWN); - elkCluster.setProperty(CoreOptions.PADDING, new ElkPadding(40, 15, 15, 15)); + + final ClusterHeader clusterHeader = new ClusterHeader(g, diagram.getSkinParam(), diagram, + stringBounder); + + final int titleAndAttributeHeight = clusterHeader.getTitleAndAttributeHeight(); + + final double topPadding = Math.max(25, titleAndAttributeHeight) + 15; + elkCluster.setProperty(CoreOptions.PADDING, new ElkPadding(topPadding, 15, 15, 15)); // Not sure this is usefull to put a label on a "cluster" final ElkLabel label = ElkGraphUtil.createLabel(elkCluster); diff --git a/src/net/sourceforge/plantuml/stats/FormatCounter.java b/src/net/sourceforge/plantuml/stats/FormatCounter.java index 0f376d811..fe621aed7 100644 --- a/src/net/sourceforge/plantuml/stats/FormatCounter.java +++ b/src/net/sourceforge/plantuml/stats/FormatCounter.java @@ -97,7 +97,10 @@ public class FormatCounter { final String name = removeDotSaved(key); final NumberAnalyzed value = NumberAnalyzed.load(name, prefs); if (value != null) { - final FileFormat format = FileFormat.valueOf(name.substring(prefix.length())); + final String subname = name.substring(prefix.length()); + if (subname.equals("ANIMATED_GIF")) + continue; + final FileFormat format = FileFormat.valueOf(subname); data.put(format, value); } } catch (Exception e) { diff --git a/src/net/sourceforge/plantuml/svek/GeneralImageBuilder.java b/src/net/sourceforge/plantuml/svek/GeneralImageBuilder.java index 2b76371b5..dc08ee433 100644 --- a/src/net/sourceforge/plantuml/svek/GeneralImageBuilder.java +++ b/src/net/sourceforge/plantuml/svek/GeneralImageBuilder.java @@ -617,7 +617,7 @@ public final class GeneralImageBuilder { if (g.getGroupType() == GroupType.CONCURRENT_STATE) return; - final ClusterHeader clusterHeader = new ClusterHeader((Entity) g, dotData.getSkinParam(), dotData, + final ClusterHeader clusterHeader = new ClusterHeader(g, dotData.getSkinParam(), dotData, stringBounder); dotStringFactory.openCluster(g, clusterHeader); this.printEntities(dotStringFactory, g.leafs()); diff --git a/src/net/sourceforge/plantuml/syntax/SyntaxChecker.java b/src/net/sourceforge/plantuml/syntax/SyntaxChecker.java new file mode 100644 index 000000000..399a3b3b3 --- /dev/null +++ b/src/net/sourceforge/plantuml/syntax/SyntaxChecker.java @@ -0,0 +1,150 @@ +/* ======================================================================== + * PlantUML : a free UML diagram generator + * ======================================================================== + * + * (C) Copyright 2009-2024, Arnaud Roques + * + * Project Info: https://plantuml.com + * + * If you like this project or if you find it useful, you can support us at: + * + * https://plantuml.com/patreon (only 1$ per month!) + * https://plantuml.com/paypal + * + * This file is part of PlantUML. + * + * PlantUML is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * PlantUML distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public + * License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. + * + * + * Original Author: Arnaud Roques + * + * + */ +package net.sourceforge.plantuml.syntax; + +import java.util.Collections; +import java.util.List; + +import net.sourceforge.plantuml.BlockUml; +import net.sourceforge.plantuml.ErrorUml; +import net.sourceforge.plantuml.OptionFlags; +import net.sourceforge.plantuml.SourceStringReader; +import net.sourceforge.plantuml.UmlDiagram; +import net.sourceforge.plantuml.core.Diagram; +import net.sourceforge.plantuml.error.PSystemError; +import net.sourceforge.plantuml.preproc.Defines; +import net.sourceforge.plantuml.text.BackSlash; +import net.sourceforge.plantuml.utils.LineLocation; +import net.sourceforge.plantuml.utils.LineLocationImpl; + +public class SyntaxChecker { + // ::remove folder when __HAXE__ + // ::remove file when __CORE__ + + public static SyntaxResult checkSyntax(List source) { + final StringBuilder sb = new StringBuilder(); + for (String s : source) { + sb.append(s); + sb.append(BackSlash.NEWLINE); + } + return checkSyntax(sb.toString()); + } + + public static SyntaxResult checkSyntax(String source) { + OptionFlags.getInstance().setQuiet(true); + final SyntaxResult result = new SyntaxResult(); + + if (source.startsWith("@startuml\n") == false) { + result.setError(true); + result.setLineLocation(new LineLocationImpl("", null).oneLineRead()); + result.addErrorText("No @startuml/@enduml found"); + return result; + } + if (source.endsWith("@enduml\n") == false && source.endsWith("@enduml") == false) { + result.setError(true); + result.setLineLocation(lastLineNumber(source)); + result.addErrorText("No @enduml found"); + return result; + } + final SourceStringReader sourceStringReader = new SourceStringReader(Defines.createEmpty(), source, + Collections.emptyList()); + + final List blocks = sourceStringReader.getBlocks(); + if (blocks.size() == 0) { + result.setError(true); + result.setLineLocation(lastLineNumber(source)); + result.addErrorText("No @enduml found"); + return result; + } + final Diagram system = blocks.get(0).getDiagram(); + result.setCmapData(system.hasUrl()); + if (system instanceof UmlDiagram) { + result.setUmlDiagramType(((UmlDiagram) system).getUmlDiagramType()); + result.setDescription(system.getDescription().getDescription()); + } else if (system instanceof PSystemError) { + result.setError(true); + final PSystemError sys = (PSystemError) system; + result.setLineLocation(sys.getLineLocation()); + result.setSystemError(sys); + for (ErrorUml er : sys.getErrorsUml()) + result.addErrorText(er.getError()); + } else { + result.setDescription(system.getDescription().getDescription()); + } + return result; + } + + public static SyntaxResult checkSyntaxFair(String source) { + final SyntaxResult result = new SyntaxResult(); + final SourceStringReader sourceStringReader = new SourceStringReader(Defines.createEmpty(), source, + Collections.emptyList()); + + final List blocks = sourceStringReader.getBlocks(); + if (blocks.size() == 0) { + result.setError(true); + result.setLineLocation(lastLineNumber(source)); + result.addErrorText("No @enduml found"); + return result; + } + + final Diagram system = blocks.get(0).getDiagram(); + result.setCmapData(system.hasUrl()); + if (system instanceof UmlDiagram) { + result.setUmlDiagramType(((UmlDiagram) system).getUmlDiagramType()); + result.setDescription(system.getDescription().getDescription()); + } else if (system instanceof PSystemError) { + result.setError(true); + final PSystemError sys = (PSystemError) system; + result.setLineLocation(sys.getLineLocation()); + for (ErrorUml er : sys.getErrorsUml()) { + result.addErrorText(er.getError()); + } + result.setSystemError(sys); + } else { + result.setDescription(system.getDescription().getDescription()); + } + return result; + } + + private static LineLocation lastLineNumber(String source) { + LineLocationImpl result = new LineLocationImpl("", null).oneLineRead(); + for (int i = 0; i < source.length(); i++) + if (source.charAt(i) == '\n') + result = result.oneLineRead(); + + return result; + } +} diff --git a/src/net/sourceforge/plantuml/version/Version.java b/src/net/sourceforge/plantuml/version/Version.java index f4b8d4cd1..a8d2af927 100644 --- a/src/net/sourceforge/plantuml/version/Version.java +++ b/src/net/sourceforge/plantuml/version/Version.java @@ -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.13beta1"; + private static final String version = "1.2023.13beta2"; public static String versionString() { return version; From 78a32d2743247d8990944ccb9141fcadbe4ab107 Mon Sep 17 00:00:00 2001 From: The-Lum <86879521+The-Lum@users.noreply.github.com> Date: Fri, 17 Nov 2023 10:31:18 +0000 Subject: [PATCH 05/95] docs: add `package-info.java` and `readme.md` --- src/ext/plantuml/com/ctreber/readme.md | 12 ++++++++++++ .../sourceforge/plantuml/ditaa/package-info.java | 2 ++ .../plantuml/flowdiagram/package-info.java | 7 +++++++ .../sourceforge/plantuml/flowdiagram/readme.md | 11 +++++++++++ .../plantuml/klimt/color/package-info.java | 12 ++++++++++++ .../sourceforge/plantuml/klimt/color/readme.md | 16 ++++++++++++++++ .../plantuml/klimt/creole/package-info.java | 7 +++++++ .../sourceforge/plantuml/klimt/creole/readme.md | 10 ++++++++++ src/org/stathissideris/ascii2image/readme.md | 15 +++++++++++++++ 9 files changed, 92 insertions(+) create mode 100644 src/ext/plantuml/com/ctreber/readme.md create mode 100644 src/net/sourceforge/plantuml/flowdiagram/package-info.java create mode 100644 src/net/sourceforge/plantuml/flowdiagram/readme.md create mode 100644 src/net/sourceforge/plantuml/klimt/color/package-info.java create mode 100644 src/net/sourceforge/plantuml/klimt/color/readme.md create mode 100644 src/net/sourceforge/plantuml/klimt/creole/package-info.java create mode 100644 src/net/sourceforge/plantuml/klimt/creole/readme.md create mode 100644 src/org/stathissideris/ascii2image/readme.md diff --git a/src/ext/plantuml/com/ctreber/readme.md b/src/ext/plantuml/com/ctreber/readme.md new file mode 100644 index 000000000..4438e1e93 --- /dev/null +++ b/src/ext/plantuml/com/ctreber/readme.md @@ -0,0 +1,12 @@ +> [!WARNING] +> **Disclaimer**: +> This file was not part of the original package. +> It was included only on the PlantUML package to provide source citation and documentation. + +# Directory Documentation for `ctreber` + +## Description +Internal copy of `AC.earth` - `XEarth` for Java _(code of Christian Treber)_. + +## See more information on +- [readme of `plantuml/acearth`](../../../../net/sourceforge/plantuml/acearth/readme.md) diff --git a/src/net/sourceforge/plantuml/ditaa/package-info.java b/src/net/sourceforge/plantuml/ditaa/package-info.java index c2cbdbd4c..f0a3a50f5 100644 --- a/src/net/sourceforge/plantuml/ditaa/package-info.java +++ b/src/net/sourceforge/plantuml/ditaa/package-info.java @@ -3,7 +3,9 @@ * * Ditaa Diagram. * + * @see org.stathissideris.ascii2image.core * @see org.stathissideris.ascii2image.graphics + * @see org.stathissideris.ascii2image.text * */ package net.sourceforge.plantuml.ditaa; diff --git a/src/net/sourceforge/plantuml/flowdiagram/package-info.java b/src/net/sourceforge/plantuml/flowdiagram/package-info.java new file mode 100644 index 000000000..c146b9255 --- /dev/null +++ b/src/net/sourceforge/plantuml/flowdiagram/package-info.java @@ -0,0 +1,7 @@ +/** + * Provides classes used to manage + * + * Flow Diagram. + * + */ +package net.sourceforge.plantuml.flowdiagram; diff --git a/src/net/sourceforge/plantuml/flowdiagram/readme.md b/src/net/sourceforge/plantuml/flowdiagram/readme.md new file mode 100644 index 000000000..720bea988 --- /dev/null +++ b/src/net/sourceforge/plantuml/flowdiagram/readme.md @@ -0,0 +1,11 @@ +# Directory Documentation for `flowdiagram` + +## Description +This package provides classes used to manage [PlantUML Flow Diagram](http://alphadoc.plantuml.com/doc/markdown/en/flow-diagram). + +## Link +- [Flow Diagram _(on Alpha-doc)_](http://alphadoc.plantuml.com/doc/markdown/en/flow-diagram) + +## Reference +- [GH-501](https://github.com/plantuml/plantuml/issues/501#issuecomment-805783661) +- [QA-13557](https://forum.plantuml.net/13557/support-for-the-different-%40start-commands) diff --git a/src/net/sourceforge/plantuml/klimt/color/package-info.java b/src/net/sourceforge/plantuml/klimt/color/package-info.java new file mode 100644 index 000000000..1568496a9 --- /dev/null +++ b/src/net/sourceforge/plantuml/klimt/color/package-info.java @@ -0,0 +1,12 @@ +/** + * Provides classes used to manage + * + * Color. + * + * @see net.sourceforge.plantuml.help.CommandHelpColor + * @see net.sourceforge.plantuml.eggs.PSystemColorsFactory + * @see net.sourceforge.plantuml.klimt.creole.command.CommandCreoleColorAndSizeChange + * @see net.sourceforge.plantuml.klimt.creole.command.CommandCreoleColorChange + * + */ +package net.sourceforge.plantuml.klimt.color; diff --git a/src/net/sourceforge/plantuml/klimt/color/readme.md b/src/net/sourceforge/plantuml/klimt/color/readme.md new file mode 100644 index 000000000..6d7808afb --- /dev/null +++ b/src/net/sourceforge/plantuml/klimt/color/readme.md @@ -0,0 +1,16 @@ +# Directory Documentation for `color` + +## Description +This package provides classes used to manage [PlantUML Color](https://plantuml.com/color). + +## Link +- [PlantUML Color](https://plantuml.com/color) + +## Reference + +## Credit or Inspiration +- [HSLuv, a developer friendly perceptual color space](https://www.kuon.ch/post/2020-03-08-hsluv/) by _Nicolas Goy_. +- [HSLuv color space](https://www.hsluv.org) by [_Alexei Boronine_](https://www.boronine.com) +- :octocat: [hsluv/hsluv-java](https://github.com/hsluv/hsluv-java) +- [Calculating Color Contrast](https://24ways.org/2010/calculating-color-contrast) by _Brian Suda_. +- [`HSLColor.java` _(on Web Archive)_](https://web.archive.org/web/20220328231936/http://www.camick.com/java/source/HSLColor.java) diff --git a/src/net/sourceforge/plantuml/klimt/creole/package-info.java b/src/net/sourceforge/plantuml/klimt/creole/package-info.java new file mode 100644 index 000000000..99f501c28 --- /dev/null +++ b/src/net/sourceforge/plantuml/klimt/creole/package-info.java @@ -0,0 +1,7 @@ +/** + * Provides classes used to manage + * + * Creole (markup language). + * + */ +package net.sourceforge.plantuml.klimt.creole; diff --git a/src/net/sourceforge/plantuml/klimt/creole/readme.md b/src/net/sourceforge/plantuml/klimt/creole/readme.md new file mode 100644 index 000000000..d1dd36370 --- /dev/null +++ b/src/net/sourceforge/plantuml/klimt/creole/readme.md @@ -0,0 +1,10 @@ +# Directory Documentation for `creole` + +## Description +This package provides classes used to manage [PlantUML Creole](https://plantuml.com/creole) markup language. + +## Link +- [PlantUML Creole](https://plantuml.com/creole) + +## Reference +- [Creole (markup) _(on Wikipedia)_](https://en.wikipedia.org/wiki/Creole_(markup)) diff --git a/src/org/stathissideris/ascii2image/readme.md b/src/org/stathissideris/ascii2image/readme.md new file mode 100644 index 000000000..2428d1f19 --- /dev/null +++ b/src/org/stathissideris/ascii2image/readme.md @@ -0,0 +1,15 @@ +> [!WARNING] +> **Disclaimer**: +> This file was not part of the original package. +> It was included only on the PlantUML package to provide source citation and documentation. + +# Directory Documentation for `ascii2image` + +## Description +Internal copy of `ditaa` _(code of Stathis Sideris)_. + +## Credit +- :octocat: [stathissideris/ditaa](https://github.com/stathissideris/ditaa) + +## See more information on +- [readme of `plantuml/ditaa`](../../../net/sourceforge/plantuml/ditaa/readme.md) From f35856e6b9d5ad5a08b2a87424a22b3169017362 Mon Sep 17 00:00:00 2001 From: Arnaud Roques Date: Sun, 19 Nov 2023 11:15:28 +0100 Subject: [PATCH 06/95] chore: better End Of Line management --- .gitattributes | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000000000..7d6f27a14 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +*.java text=auto From d61ebc40a08c0aafaa7e46397b39afbf2fb3457d Mon Sep 17 00:00:00 2001 From: Arnaud Roques Date: Sun, 19 Nov 2023 11:22:11 +0100 Subject: [PATCH 07/95] refactor: rename ext packages to zext to improve javadoc display --- .../plantuml/acearth/PSystemXearth.java | 6 +- .../acearth/PSystemXearthFactory.java | 2 +- .../command/CommandActivity3.java | 4 +- .../flashcode/FlashCodeUtilsZxing.java | 12 ++-- .../plantuml/skin/ActorAwesome.java | 16 +++--- .../plantuml/skin/ActorHollow.java | 18 +++--- .../plantuml/skin/ActorStickMan.java | 18 +++--- .../plantuml/com/ctreber/acearth/ACearth.java | 56 +++++++++---------- .../com/ctreber/acearth/Configuration.java | 14 ++--- .../ctreber/acearth/ConfigurationACearth.java | 16 +++--- .../plantuml/com/ctreber/acearth/MapData.java | 2 +- .../com/ctreber/acearth/MapDataReader.java | 6 +- .../ctreber/acearth/gui/CanvasACearth.java | 4 +- .../com/ctreber/acearth/gui/PixelCanvas.java | 4 +- .../com/ctreber/acearth/package-info.java | 2 +- .../com/ctreber/acearth/plugins/Plugin.java | 8 +-- .../acearth/plugins/markers/Marker.java | 16 +++--- .../plugins/markers/PluginMarkers.java | 4 +- .../acearth/projection/Projection.java | 10 ++-- .../acearth/projection/ProjectionCyl.java | 6 +- .../acearth/projection/ProjectionMerc.java | 6 +- .../acearth/projection/ProjectionOrtho.java | 6 +- .../acearth/renderer/RenderTarget.java | 2 +- .../ctreber/acearth/renderer/Renderer.java | 4 +- .../acearth/renderer/RowTypeRenderer.java | 2 +- .../renderer/RowTypeRendererScanBit.java | 6 +- .../renderer/RowTypeRendererScanDot.java | 6 +- .../acearth/scanbit/BitGeneratorMap.java | 16 +++--- .../scanbit/BitGeneratorMapDefault.java | 10 ++-- .../acearth/scanbit/BitGeneratorMapOrtho.java | 10 ++-- .../com/ctreber/acearth/scanbit/ScanBit.java | 2 +- .../acearth/scanbit/ScanBitGenerator.java | 2 +- .../com/ctreber/acearth/scanbit/ScanBuf.java | 6 +- .../acearth/scandot/DotGeneratorLines.java | 10 ++-- .../acearth/scandot/DotGeneratorStars.java | 2 +- .../com/ctreber/acearth/scandot/ScanDot.java | 4 +- .../acearth/scandot/ScanDotGenerator.java | 2 +- .../com/ctreber/acearth/shader/Shader.java | 10 ++-- .../ctreber/acearth/shader/ShaderDefault.java | 2 +- .../ctreber/acearth/shader/ShaderFlat.java | 2 +- .../ctreber/acearth/shader/ShaderOrtho.java | 2 +- .../com/ctreber/acearth/util/Coordinate.java | 2 +- .../ctreber/acearth/util/EdgeCrossing.java | 2 +- .../com/ctreber/acearth/util/Point2D.java | 2 +- .../com/ctreber/acearth/util/Point3D.java | 2 +- .../com/ctreber/acearth/util/Polygon.java | 2 +- .../ctreber/acearth/util/StringParser.java | 2 +- .../acearth/util/SunPositionCalculator.java | 2 +- .../com/ctreber/acearth/util/Toolkit.java | 2 +- .../com/ctreber/aclib/gui/MOBoolean.java | 2 +- .../ctreber/aclib/gui/MOChangeListener.java | 2 +- .../com/ctreber/aclib/gui/MODouble.java | 2 +- .../com/ctreber/aclib/gui/MOEnum.java | 2 +- .../com/ctreber/aclib/gui/MOInteger.java | 2 +- .../com/ctreber/aclib/gui/MOString.java | 2 +- .../ctreber/aclib/gui/MonitoredObject.java | 2 +- .../com/ctreber/aclib/sort/CTSort.java | 2 +- .../ctreber/aclib/sort/DefaultComparator.java | 2 +- .../com/ctreber/aclib/sort/QuickSort.java | 2 +- .../com/google/zxing/BarcodeFormat.java | 2 +- .../com/google/zxing/ChecksumException.java | 2 +- .../com/google/zxing/DecodeHintType.java | 2 +- .../com/google/zxing/EncodeHintType.java | 2 +- .../com/google/zxing/FormatException.java | 2 +- .../com/google/zxing/NotFoundException.java | 2 +- .../com/google/zxing/ReaderException.java | 2 +- .../com/google/zxing/ResultPoint.java | 2 +- .../plantuml/com/google/zxing/Writer.java | 4 +- .../com/google/zxing/WriterException.java | 2 +- .../client/j2se/MatrixToImageWriter.java | 4 +- .../com/google/zxing/common/BitArray.java | 2 +- .../com/google/zxing/common/BitMatrix.java | 2 +- .../com/google/zxing/common/BitSource.java | 2 +- .../google/zxing/common/CharacterSetECI.java | 2 +- .../google/zxing/common/DecoderResult.java | 4 +- .../google/zxing/common/DetectorResult.java | 4 +- .../plantuml/com/google/zxing/common/ECI.java | 2 +- .../com/google/zxing/common/StringUtils.java | 4 +- .../zxing/common/reedsolomon/GF256.java | 2 +- .../zxing/common/reedsolomon/GF256Poly.java | 2 +- .../reedsolomon/ReedSolomonEncoder.java | 2 +- .../reedsolomon/ReedSolomonException.java | 2 +- .../datamatrix/decoder/BitMatrixParser.java | 6 +- .../zxing/datamatrix/decoder/DataBlock.java | 2 +- .../zxing/datamatrix/decoder/Version.java | 4 +- .../com/google/zxing/package-info.java | 2 +- .../com/google/zxing/qrcode/QRCodeWriter.java | 20 +++---- .../zxing/qrcode/decoder/BitMatrixParser.java | 6 +- .../zxing/qrcode/decoder/DataBlock.java | 2 +- .../google/zxing/qrcode/decoder/DataMask.java | 4 +- .../qrcode/decoder/ErrorCorrectionLevel.java | 2 +- .../qrcode/decoder/FormatInformation.java | 2 +- .../com/google/zxing/qrcode/decoder/Mode.java | 2 +- .../google/zxing/qrcode/decoder/Version.java | 6 +- .../zxing/qrcode/encoder/BlockPair.java | 2 +- .../zxing/qrcode/encoder/ByteMatrix.java | 2 +- .../google/zxing/qrcode/encoder/Encoder.java | 22 ++++---- .../google/zxing/qrcode/encoder/MaskUtil.java | 2 +- .../zxing/qrcode/encoder/MatrixUtil.java | 8 +-- .../google/zxing/qrcode/encoder/QRCode.java | 6 +- 100 files changed, 264 insertions(+), 264 deletions(-) rename src/{ext => zext}/plantuml/com/ctreber/acearth/ACearth.java (85%) rename src/{ext => zext}/plantuml/com/ctreber/acearth/Configuration.java (85%) rename src/{ext => zext}/plantuml/com/ctreber/acearth/ConfigurationACearth.java (92%) rename src/{ext => zext}/plantuml/com/ctreber/acearth/MapData.java (99%) rename src/{ext => zext}/plantuml/com/ctreber/acearth/MapDataReader.java (95%) rename src/{ext => zext}/plantuml/com/ctreber/acearth/gui/CanvasACearth.java (80%) rename src/{ext => zext}/plantuml/com/ctreber/acearth/gui/PixelCanvas.java (92%) rename src/{ext => zext}/plantuml/com/ctreber/acearth/package-info.java (90%) rename src/{ext => zext}/plantuml/com/ctreber/acearth/plugins/Plugin.java (78%) rename src/{ext => zext}/plantuml/com/ctreber/acearth/plugins/markers/Marker.java (90%) rename src/{ext => zext}/plantuml/com/ctreber/acearth/plugins/markers/PluginMarkers.java (92%) rename src/{ext => zext}/plantuml/com/ctreber/acearth/projection/Projection.java (96%) rename src/{ext => zext}/plantuml/com/ctreber/acearth/projection/ProjectionCyl.java (90%) rename src/{ext => zext}/plantuml/com/ctreber/acearth/projection/ProjectionMerc.java (90%) rename src/{ext => zext}/plantuml/com/ctreber/acearth/projection/ProjectionOrtho.java (88%) rename src/{ext => zext}/plantuml/com/ctreber/acearth/renderer/RenderTarget.java (88%) rename src/{ext => zext}/plantuml/com/ctreber/acearth/renderer/Renderer.java (95%) rename src/{ext => zext}/plantuml/com/ctreber/acearth/renderer/RowTypeRenderer.java (92%) rename src/{ext => zext}/plantuml/com/ctreber/acearth/renderer/RowTypeRendererScanBit.java (92%) rename src/{ext => zext}/plantuml/com/ctreber/acearth/renderer/RowTypeRendererScanDot.java (89%) rename src/{ext => zext}/plantuml/com/ctreber/acearth/scanbit/BitGeneratorMap.java (88%) rename src/{ext => zext}/plantuml/com/ctreber/acearth/scanbit/BitGeneratorMapDefault.java (95%) rename src/{ext => zext}/plantuml/com/ctreber/acearth/scanbit/BitGeneratorMapOrtho.java (94%) rename src/{ext => zext}/plantuml/com/ctreber/acearth/scanbit/ScanBit.java (95%) rename src/{ext => zext}/plantuml/com/ctreber/acearth/scanbit/ScanBitGenerator.java (92%) rename src/{ext => zext}/plantuml/com/ctreber/acearth/scanbit/ScanBuf.java (96%) rename src/{ext => zext}/plantuml/com/ctreber/acearth/scandot/DotGeneratorLines.java (86%) rename src/{ext => zext}/plantuml/com/ctreber/acearth/scandot/DotGeneratorStars.java (96%) rename src/{ext => zext}/plantuml/com/ctreber/acearth/scandot/ScanDot.java (90%) rename src/{ext => zext}/plantuml/com/ctreber/acearth/scandot/ScanDotGenerator.java (89%) rename src/{ext => zext}/plantuml/com/ctreber/acearth/shader/Shader.java (92%) rename src/{ext => zext}/plantuml/com/ctreber/acearth/shader/ShaderDefault.java (97%) rename src/{ext => zext}/plantuml/com/ctreber/acearth/shader/ShaderFlat.java (91%) rename src/{ext => zext}/plantuml/com/ctreber/acearth/shader/ShaderOrtho.java (96%) rename src/{ext => zext}/plantuml/com/ctreber/acearth/util/Coordinate.java (98%) rename src/{ext => zext}/plantuml/com/ctreber/acearth/util/EdgeCrossing.java (95%) rename src/{ext => zext}/plantuml/com/ctreber/acearth/util/Point2D.java (90%) rename src/{ext => zext}/plantuml/com/ctreber/acearth/util/Point3D.java (93%) rename src/{ext => zext}/plantuml/com/ctreber/acearth/util/Polygon.java (93%) rename src/{ext => zext}/plantuml/com/ctreber/acearth/util/StringParser.java (98%) rename src/{ext => zext}/plantuml/com/ctreber/acearth/util/SunPositionCalculator.java (99%) rename src/{ext => zext}/plantuml/com/ctreber/acearth/util/Toolkit.java (98%) rename src/{ext => zext}/plantuml/com/ctreber/aclib/gui/MOBoolean.java (93%) rename src/{ext => zext}/plantuml/com/ctreber/aclib/gui/MOChangeListener.java (86%) rename src/{ext => zext}/plantuml/com/ctreber/aclib/gui/MODouble.java (96%) rename src/{ext => zext}/plantuml/com/ctreber/aclib/gui/MOEnum.java (96%) rename src/{ext => zext}/plantuml/com/ctreber/aclib/gui/MOInteger.java (96%) rename src/{ext => zext}/plantuml/com/ctreber/aclib/gui/MOString.java (91%) rename src/{ext => zext}/plantuml/com/ctreber/aclib/gui/MonitoredObject.java (95%) rename src/{ext => zext}/plantuml/com/ctreber/aclib/sort/CTSort.java (91%) rename src/{ext => zext}/plantuml/com/ctreber/aclib/sort/DefaultComparator.java (90%) rename src/{ext => zext}/plantuml/com/ctreber/aclib/sort/QuickSort.java (97%) rename src/{ext => zext}/plantuml/com/google/zxing/BarcodeFormat.java (98%) rename src/{ext => zext}/plantuml/com/google/zxing/ChecksumException.java (96%) rename src/{ext => zext}/plantuml/com/google/zxing/DecodeHintType.java (98%) rename src/{ext => zext}/plantuml/com/google/zxing/EncodeHintType.java (96%) rename src/{ext => zext}/plantuml/com/google/zxing/FormatException.java (96%) rename src/{ext => zext}/plantuml/com/google/zxing/NotFoundException.java (96%) rename src/{ext => zext}/plantuml/com/google/zxing/ReaderException.java (98%) rename src/{ext => zext}/plantuml/com/google/zxing/ResultPoint.java (98%) rename src/{ext => zext}/plantuml/com/google/zxing/Writer.java (94%) mode change 100755 => 100644 rename src/{ext => zext}/plantuml/com/google/zxing/WriterException.java (95%) rename src/{ext => zext}/plantuml/com/google/zxing/client/j2se/MatrixToImageWriter.java (95%) rename src/{ext => zext}/plantuml/com/google/zxing/common/BitArray.java (99%) rename src/{ext => zext}/plantuml/com/google/zxing/common/BitMatrix.java (99%) rename src/{ext => zext}/plantuml/com/google/zxing/common/BitSource.java (98%) rename src/{ext => zext}/plantuml/com/google/zxing/common/CharacterSetECI.java (98%) rename src/{ext => zext}/plantuml/com/google/zxing/common/DecoderResult.java (92%) rename src/{ext => zext}/plantuml/com/google/zxing/common/DetectorResult.java (92%) rename src/{ext => zext}/plantuml/com/google/zxing/common/ECI.java (96%) rename src/{ext => zext}/plantuml/com/google/zxing/common/StringUtils.java (98%) rename src/{ext => zext}/plantuml/com/google/zxing/common/reedsolomon/GF256.java (98%) rename src/{ext => zext}/plantuml/com/google/zxing/common/reedsolomon/GF256Poly.java (99%) rename src/{ext => zext}/plantuml/com/google/zxing/common/reedsolomon/ReedSolomonEncoder.java (97%) rename src/{ext => zext}/plantuml/com/google/zxing/common/reedsolomon/ReedSolomonException.java (93%) rename src/{ext => zext}/plantuml/com/google/zxing/datamatrix/decoder/BitMatrixParser.java (98%) rename src/{ext => zext}/plantuml/com/google/zxing/datamatrix/decoder/DataBlock.java (98%) rename src/{ext => zext}/plantuml/com/google/zxing/datamatrix/decoder/Version.java (98%) rename src/{ext => zext}/plantuml/com/google/zxing/package-info.java (90%) rename src/{ext => zext}/plantuml/com/google/zxing/qrcode/QRCodeWriter.java (85%) rename src/{ext => zext}/plantuml/com/google/zxing/qrcode/decoder/BitMatrixParser.java (97%) rename src/{ext => zext}/plantuml/com/google/zxing/qrcode/decoder/DataBlock.java (98%) rename src/{ext => zext}/plantuml/com/google/zxing/qrcode/decoder/DataMask.java (97%) rename src/{ext => zext}/plantuml/com/google/zxing/qrcode/decoder/ErrorCorrectionLevel.java (97%) rename src/{ext => zext}/plantuml/com/google/zxing/qrcode/decoder/FormatInformation.java (99%) rename src/{ext => zext}/plantuml/com/google/zxing/qrcode/decoder/Mode.java (98%) rename src/{ext => zext}/plantuml/com/google/zxing/qrcode/decoder/Version.java (99%) rename src/{ext => zext}/plantuml/com/google/zxing/qrcode/encoder/BlockPair.java (94%) rename src/{ext => zext}/plantuml/com/google/zxing/qrcode/encoder/ByteMatrix.java (97%) rename src/{ext => zext}/plantuml/com/google/zxing/qrcode/encoder/Encoder.java (96%) rename src/{ext => zext}/plantuml/com/google/zxing/qrcode/encoder/MaskUtil.java (99%) rename src/{ext => zext}/plantuml/com/google/zxing/qrcode/encoder/MatrixUtil.java (98%) rename src/{ext => zext}/plantuml/com/google/zxing/qrcode/encoder/QRCode.java (97%) diff --git a/src/net/sourceforge/plantuml/acearth/PSystemXearth.java b/src/net/sourceforge/plantuml/acearth/PSystemXearth.java index a809b3719..15df082ce 100644 --- a/src/net/sourceforge/plantuml/acearth/PSystemXearth.java +++ b/src/net/sourceforge/plantuml/acearth/PSystemXearth.java @@ -47,9 +47,9 @@ import java.util.Locale; import java.util.Map; import java.util.TimeZone; -import ext.plantuml.com.ctreber.acearth.ACearth; -import ext.plantuml.com.ctreber.acearth.ConfigurationACearth; -import ext.plantuml.com.ctreber.acearth.plugins.markers.Marker; +import zext.plantuml.com.ctreber.acearth.ACearth; +import zext.plantuml.com.ctreber.acearth.ConfigurationACearth; +import zext.plantuml.com.ctreber.acearth.plugins.markers.Marker; import net.sourceforge.plantuml.AbstractPSystem; import net.sourceforge.plantuml.FileFormatOption; import net.sourceforge.plantuml.api.ImageDataSimple; diff --git a/src/net/sourceforge/plantuml/acearth/PSystemXearthFactory.java b/src/net/sourceforge/plantuml/acearth/PSystemXearthFactory.java index aa19bba56..d7a8e9ad9 100644 --- a/src/net/sourceforge/plantuml/acearth/PSystemXearthFactory.java +++ b/src/net/sourceforge/plantuml/acearth/PSystemXearthFactory.java @@ -40,7 +40,7 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import ext.plantuml.com.ctreber.acearth.plugins.markers.Marker; +import zext.plantuml.com.ctreber.acearth.plugins.markers.Marker; import net.sourceforge.plantuml.command.PSystemBasicFactory; import net.sourceforge.plantuml.core.UmlSource; import net.sourceforge.plantuml.log.Logme; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandActivity3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandActivity3.java index 183d130ed..a78abd2eb 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandActivity3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandActivity3.java @@ -61,7 +61,7 @@ public class CommandActivity3 extends SingleLineCommand2 { public static final String endingGroup() { return "(" // - + ";(?:[%s]*(\\<\\<\\w+\\>\\>))?" // + + ";[%s]*(\\<\\<\\w+\\>\\>(?:[%s]*\\<\\<\\w+\\>\\>)*)?" // + "|" // + Matcher.quoteReplacement("\\\\") // that is simply \ character + "|" // @@ -77,7 +77,7 @@ public class CommandActivity3 extends SingleLineCommand2 { private static final String endingGroupShort() { return "(" // - + ";(?:[%s]*(\\<\\<\\w+\\>\\>))?" // + + ";[%s]*(\\<\\<\\w+\\>\\>(?:[%s]*\\<\\<\\w+\\>\\>)*)?" // + "|" // + Matcher.quoteReplacement("\\\\") // that is simply \ character + "|" // diff --git a/src/net/sourceforge/plantuml/flashcode/FlashCodeUtilsZxing.java b/src/net/sourceforge/plantuml/flashcode/FlashCodeUtilsZxing.java index f2058b5d2..902e27b8a 100644 --- a/src/net/sourceforge/plantuml/flashcode/FlashCodeUtilsZxing.java +++ b/src/net/sourceforge/plantuml/flashcode/FlashCodeUtilsZxing.java @@ -41,12 +41,12 @@ import java.util.Hashtable; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; -import ext.plantuml.com.google.zxing.BarcodeFormat; -import ext.plantuml.com.google.zxing.EncodeHintType; -import ext.plantuml.com.google.zxing.client.j2se.MatrixToImageWriter; -import ext.plantuml.com.google.zxing.common.BitMatrix; -import ext.plantuml.com.google.zxing.qrcode.QRCodeWriter; -import ext.plantuml.com.google.zxing.qrcode.decoder.ErrorCorrectionLevel; +import zext.plantuml.com.google.zxing.BarcodeFormat; +import zext.plantuml.com.google.zxing.EncodeHintType; +import zext.plantuml.com.google.zxing.client.j2se.MatrixToImageWriter; +import zext.plantuml.com.google.zxing.common.BitMatrix; +import zext.plantuml.com.google.zxing.qrcode.QRCodeWriter; +import zext.plantuml.com.google.zxing.qrcode.decoder.ErrorCorrectionLevel; import net.sourceforge.plantuml.utils.Log; public class FlashCodeUtilsZxing implements FlashCodeUtils { diff --git a/src/net/sourceforge/plantuml/skin/ActorAwesome.java b/src/net/sourceforge/plantuml/skin/ActorAwesome.java index 50869e283..d2926998c 100644 --- a/src/net/sourceforge/plantuml/skin/ActorAwesome.java +++ b/src/net/sourceforge/plantuml/skin/ActorAwesome.java @@ -55,10 +55,10 @@ public class ActorAwesome extends AbstractTextBlock implements TextBlock { private final double radius = 8; private final double bodyHeight = 28; - private final Fashion symbolContext; + private final Fashion fashion; - public ActorAwesome(Fashion symbolContext) { - this.symbolContext = symbolContext.withStroke(UStroke.withThickness(1.5)); + public ActorAwesome(Fashion fashion) { + this.fashion = fashion; } public void drawU(UGraphic ug) { @@ -81,18 +81,18 @@ public class ActorAwesome extends AbstractTextBlock implements TextBlock { path.cubicTo(-bodyWidth / 2 + shoulder + collar, collar, -collar, collar, 0, collar); path.closePath(); - if (symbolContext.getDeltaShadow() != 0) { - head.setDeltaShadow(symbolContext.getDeltaShadow()); - path.setDeltaShadow(symbolContext.getDeltaShadow()); + if (fashion.getDeltaShadow() != 0) { + head.setDeltaShadow(fashion.getDeltaShadow()); + path.setDeltaShadow(fashion.getDeltaShadow()); } - ug = symbolContext.apply(ug); + ug = fashion.apply(ug); ug.apply(new UTranslate(centerX - head.getWidth() / 2, thickness())).draw(head); ug.apply(new UTranslate(centerX, head.getHeight() + thickness())).draw(path); } private double thickness() { - return symbolContext.getStroke().getThickness(); + return fashion.getStroke().getThickness(); } public double getPreferredWidth() { diff --git a/src/net/sourceforge/plantuml/skin/ActorHollow.java b/src/net/sourceforge/plantuml/skin/ActorHollow.java index 91fc51ffc..0e8e79293 100644 --- a/src/net/sourceforge/plantuml/skin/ActorHollow.java +++ b/src/net/sourceforge/plantuml/skin/ActorHollow.java @@ -57,10 +57,10 @@ public class ActorHollow extends AbstractTextBlock implements TextBlock { private final double bodyThickness = 6; private final double legThickness = 6; - private final Fashion symbolContext; + private final Fashion fashion; - public ActorHollow(Fashion symbolContext) { - this.symbolContext = symbolContext; + public ActorHollow(Fashion fashion) { + this.fashion = fashion; } public void drawU(UGraphic ug) { @@ -87,17 +87,17 @@ public class ActorHollow extends AbstractTextBlock implements TextBlock { path.lineTo(-bodyWidth / 2, 0); path.closePath(); - if (symbolContext.getDeltaShadow() != 0) { - head.setDeltaShadow(symbolContext.getDeltaShadow()); - path.setDeltaShadow(symbolContext.getDeltaShadow()); + if (fashion.getDeltaShadow() != 0) { + head.setDeltaShadow(fashion.getDeltaShadow()); + path.setDeltaShadow(fashion.getDeltaShadow()); } - ug = symbolContext.apply(ug); + ug = fashion.apply(ug); ug.apply(new UTranslate(centerX - head.getWidth() / 2, thickness())).draw(head); ug.apply(new UTranslate(centerX, head.getHeight() + thickness() + neckHeight)).draw(path); } private double thickness() { - return symbolContext.getStroke().getThickness(); + return fashion.getStroke().getThickness(); } public double getPreferredWidth() { @@ -105,7 +105,7 @@ public class ActorHollow extends AbstractTextBlock implements TextBlock { } public double getPreferredHeight() { - return headDiam + neckHeight + bodyHeight + thickness() * 2 + symbolContext.getDeltaShadow(); + return headDiam + neckHeight + bodyHeight + thickness() * 2 + fashion.getDeltaShadow(); } public XDimension2D calculateDimension(StringBounder stringBounder) { diff --git a/src/net/sourceforge/plantuml/skin/ActorStickMan.java b/src/net/sourceforge/plantuml/skin/ActorStickMan.java index b92cb27eb..03e24ffdd 100644 --- a/src/net/sourceforge/plantuml/skin/ActorStickMan.java +++ b/src/net/sourceforge/plantuml/skin/ActorStickMan.java @@ -57,11 +57,11 @@ public class ActorStickMan extends AbstractTextBlock implements TextBlock { private final double legsY = 15; private final double headDiam = 16; - private final Fashion symbolContext; + private final Fashion fashion; private final boolean actorBusiness; - ActorStickMan(Fashion symbolContext, boolean actorBusiness) { - this.symbolContext = symbolContext; + ActorStickMan(Fashion fashion, boolean actorBusiness) { + this.fashion = fashion; this.actorBusiness = actorBusiness; } @@ -81,12 +81,12 @@ public class ActorStickMan extends AbstractTextBlock implements TextBlock { path.lineTo(-legsX, bodyLenght + legsY); path.moveTo(0, bodyLenght); path.lineTo(legsX, bodyLenght + legsY); - if (symbolContext.getDeltaShadow() != 0) { - head.setDeltaShadow(symbolContext.getDeltaShadow()); - path.setDeltaShadow(symbolContext.getDeltaShadow()); + if (fashion.getDeltaShadow() != 0) { + head.setDeltaShadow(fashion.getDeltaShadow()); + path.setDeltaShadow(fashion.getDeltaShadow()); } - ug = symbolContext.apply(ug); + ug = fashion.apply(ug); ug.apply(new UTranslate(startX, thickness())).draw(head); if (actorBusiness) { specialBusiness(ug.apply(new UTranslate(startX + headDiam / 2, thickness() + headDiam / 2))); @@ -109,7 +109,7 @@ public class ActorStickMan extends AbstractTextBlock implements TextBlock { } private double thickness() { - return symbolContext.getStroke().getThickness(); + return fashion.getStroke().getThickness(); } public double getPreferredWidth() { @@ -117,7 +117,7 @@ public class ActorStickMan extends AbstractTextBlock implements TextBlock { } public double getPreferredHeight() { - return headDiam + bodyLenght + legsY + 2 * thickness() + symbolContext.getDeltaShadow() + 1; + return headDiam + bodyLenght + legsY + 2 * thickness() + fashion.getDeltaShadow() + 1; } public XDimension2D calculateDimension(StringBounder stringBounder) { diff --git a/src/ext/plantuml/com/ctreber/acearth/ACearth.java b/src/zext/plantuml/com/ctreber/acearth/ACearth.java similarity index 85% rename from src/ext/plantuml/com/ctreber/acearth/ACearth.java rename to src/zext/plantuml/com/ctreber/acearth/ACearth.java index 7f04fc86d..532fb3fec 100644 --- a/src/ext/plantuml/com/ctreber/acearth/ACearth.java +++ b/src/zext/plantuml/com/ctreber/acearth/ACearth.java @@ -1,4 +1,4 @@ -package ext.plantuml.com.ctreber.acearth; +package zext.plantuml.com.ctreber.acearth; import java.io.IOException; import java.io.OutputStream; @@ -7,33 +7,33 @@ import java.util.Iterator; import java.util.List; import java.util.Random; -import ext.plantuml.com.ctreber.acearth.gui.CanvasACearth; -import ext.plantuml.com.ctreber.acearth.plugins.Plugin; -import ext.plantuml.com.ctreber.acearth.plugins.markers.Marker; -import ext.plantuml.com.ctreber.acearth.plugins.markers.PluginMarkers; -import ext.plantuml.com.ctreber.acearth.projection.Projection; -import ext.plantuml.com.ctreber.acearth.projection.ProjectionCyl; -import ext.plantuml.com.ctreber.acearth.projection.ProjectionMerc; -import ext.plantuml.com.ctreber.acearth.projection.ProjectionOrtho; -import ext.plantuml.com.ctreber.acearth.renderer.Renderer; -import ext.plantuml.com.ctreber.acearth.renderer.RowTypeRendererScanBit; -import ext.plantuml.com.ctreber.acearth.renderer.RowTypeRendererScanDot; -import ext.plantuml.com.ctreber.acearth.scanbit.BitGeneratorMap; -import ext.plantuml.com.ctreber.acearth.scanbit.BitGeneratorMapDefault; -import ext.plantuml.com.ctreber.acearth.scanbit.BitGeneratorMapOrtho; -import ext.plantuml.com.ctreber.acearth.scandot.DotGeneratorLines; -import ext.plantuml.com.ctreber.acearth.scandot.DotGeneratorStars; -import ext.plantuml.com.ctreber.acearth.scandot.ScanDot; -import ext.plantuml.com.ctreber.acearth.scandot.ScanDotGenerator; -import ext.plantuml.com.ctreber.acearth.shader.Shader; -import ext.plantuml.com.ctreber.acearth.shader.ShaderDefault; -import ext.plantuml.com.ctreber.acearth.shader.ShaderFlat; -import ext.plantuml.com.ctreber.acearth.shader.ShaderOrtho; -import ext.plantuml.com.ctreber.acearth.util.Coordinate; -import ext.plantuml.com.ctreber.acearth.util.SunPositionCalculator; -import ext.plantuml.com.ctreber.acearth.util.Toolkit; -import ext.plantuml.com.ctreber.aclib.sort.CTSort; -import ext.plantuml.com.ctreber.aclib.sort.QuickSort; +import zext.plantuml.com.ctreber.acearth.gui.CanvasACearth; +import zext.plantuml.com.ctreber.acearth.plugins.Plugin; +import zext.plantuml.com.ctreber.acearth.plugins.markers.Marker; +import zext.plantuml.com.ctreber.acearth.plugins.markers.PluginMarkers; +import zext.plantuml.com.ctreber.acearth.projection.Projection; +import zext.plantuml.com.ctreber.acearth.projection.ProjectionCyl; +import zext.plantuml.com.ctreber.acearth.projection.ProjectionMerc; +import zext.plantuml.com.ctreber.acearth.projection.ProjectionOrtho; +import zext.plantuml.com.ctreber.acearth.renderer.Renderer; +import zext.plantuml.com.ctreber.acearth.renderer.RowTypeRendererScanBit; +import zext.plantuml.com.ctreber.acearth.renderer.RowTypeRendererScanDot; +import zext.plantuml.com.ctreber.acearth.scanbit.BitGeneratorMap; +import zext.plantuml.com.ctreber.acearth.scanbit.BitGeneratorMapDefault; +import zext.plantuml.com.ctreber.acearth.scanbit.BitGeneratorMapOrtho; +import zext.plantuml.com.ctreber.acearth.scandot.DotGeneratorLines; +import zext.plantuml.com.ctreber.acearth.scandot.DotGeneratorStars; +import zext.plantuml.com.ctreber.acearth.scandot.ScanDot; +import zext.plantuml.com.ctreber.acearth.scandot.ScanDotGenerator; +import zext.plantuml.com.ctreber.acearth.shader.Shader; +import zext.plantuml.com.ctreber.acearth.shader.ShaderDefault; +import zext.plantuml.com.ctreber.acearth.shader.ShaderFlat; +import zext.plantuml.com.ctreber.acearth.shader.ShaderOrtho; +import zext.plantuml.com.ctreber.acearth.util.Coordinate; +import zext.plantuml.com.ctreber.acearth.util.SunPositionCalculator; +import zext.plantuml.com.ctreber.acearth.util.Toolkit; +import zext.plantuml.com.ctreber.aclib.sort.CTSort; +import zext.plantuml.com.ctreber.aclib.sort.QuickSort; /** *

AC.earth - XEarth for Java

diff --git a/src/ext/plantuml/com/ctreber/acearth/Configuration.java b/src/zext/plantuml/com/ctreber/acearth/Configuration.java similarity index 85% rename from src/ext/plantuml/com/ctreber/acearth/Configuration.java rename to src/zext/plantuml/com/ctreber/acearth/Configuration.java index 7c84ea5ef..01bc6b508 100644 --- a/src/ext/plantuml/com/ctreber/acearth/Configuration.java +++ b/src/zext/plantuml/com/ctreber/acearth/Configuration.java @@ -1,14 +1,14 @@ -package ext.plantuml.com.ctreber.acearth; +package zext.plantuml.com.ctreber.acearth; import java.util.HashMap; import java.util.Map; -import ext.plantuml.com.ctreber.aclib.gui.MOBoolean; -import ext.plantuml.com.ctreber.aclib.gui.MODouble; -import ext.plantuml.com.ctreber.aclib.gui.MOEnum; -import ext.plantuml.com.ctreber.aclib.gui.MOInteger; -import ext.plantuml.com.ctreber.aclib.gui.MOString; -import ext.plantuml.com.ctreber.aclib.gui.MonitoredObject; +import zext.plantuml.com.ctreber.aclib.gui.MOBoolean; +import zext.plantuml.com.ctreber.aclib.gui.MODouble; +import zext.plantuml.com.ctreber.aclib.gui.MOEnum; +import zext.plantuml.com.ctreber.aclib.gui.MOInteger; +import zext.plantuml.com.ctreber.aclib.gui.MOString; +import zext.plantuml.com.ctreber.aclib.gui.MonitoredObject; /** *

diff --git a/src/ext/plantuml/com/ctreber/acearth/ConfigurationACearth.java b/src/zext/plantuml/com/ctreber/acearth/ConfigurationACearth.java similarity index 92% rename from src/ext/plantuml/com/ctreber/acearth/ConfigurationACearth.java rename to src/zext/plantuml/com/ctreber/acearth/ConfigurationACearth.java index ae6529c4b..8bc3170f8 100644 --- a/src/ext/plantuml/com/ctreber/acearth/ConfigurationACearth.java +++ b/src/zext/plantuml/com/ctreber/acearth/ConfigurationACearth.java @@ -1,12 +1,12 @@ -package ext.plantuml.com.ctreber.acearth; +package zext.plantuml.com.ctreber.acearth; -import ext.plantuml.com.ctreber.acearth.util.Coordinate; -import ext.plantuml.com.ctreber.aclib.gui.MOBoolean; -import ext.plantuml.com.ctreber.aclib.gui.MODouble; -import ext.plantuml.com.ctreber.aclib.gui.MOEnum; -import ext.plantuml.com.ctreber.aclib.gui.MOInteger; -import ext.plantuml.com.ctreber.aclib.gui.MOString; -import ext.plantuml.com.ctreber.aclib.gui.MonitoredObject; +import zext.plantuml.com.ctreber.acearth.util.Coordinate; +import zext.plantuml.com.ctreber.aclib.gui.MOBoolean; +import zext.plantuml.com.ctreber.aclib.gui.MODouble; +import zext.plantuml.com.ctreber.aclib.gui.MOEnum; +import zext.plantuml.com.ctreber.aclib.gui.MOInteger; +import zext.plantuml.com.ctreber.aclib.gui.MOString; +import zext.plantuml.com.ctreber.aclib.gui.MonitoredObject; /** *

diff --git a/src/ext/plantuml/com/ctreber/acearth/MapData.java b/src/zext/plantuml/com/ctreber/acearth/MapData.java similarity index 99% rename from src/ext/plantuml/com/ctreber/acearth/MapData.java rename to src/zext/plantuml/com/ctreber/acearth/MapData.java index d73641c1f..f20437f9e 100644 --- a/src/ext/plantuml/com/ctreber/acearth/MapData.java +++ b/src/zext/plantuml/com/ctreber/acearth/MapData.java @@ -1,4 +1,4 @@ -package ext.plantuml.com.ctreber.acearth; +package zext.plantuml.com.ctreber.acearth; import java.util.ArrayList; import java.util.List; diff --git a/src/ext/plantuml/com/ctreber/acearth/MapDataReader.java b/src/zext/plantuml/com/ctreber/acearth/MapDataReader.java similarity index 95% rename from src/ext/plantuml/com/ctreber/acearth/MapDataReader.java rename to src/zext/plantuml/com/ctreber/acearth/MapDataReader.java index 3f70e6afe..f17780e5d 100644 --- a/src/ext/plantuml/com/ctreber/acearth/MapDataReader.java +++ b/src/zext/plantuml/com/ctreber/acearth/MapDataReader.java @@ -1,4 +1,4 @@ -package ext.plantuml.com.ctreber.acearth; +package zext.plantuml.com.ctreber.acearth; import java.io.IOException; import java.util.ArrayList; @@ -6,8 +6,8 @@ import java.util.Iterator; import java.util.List; import java.util.StringTokenizer; -import ext.plantuml.com.ctreber.acearth.util.Point3D; -import ext.plantuml.com.ctreber.acearth.util.Polygon; +import zext.plantuml.com.ctreber.acearth.util.Point3D; +import zext.plantuml.com.ctreber.acearth.util.Polygon; /** * The map data file is a big array of short (16-bit) ints, as follows: - it is diff --git a/src/ext/plantuml/com/ctreber/acearth/gui/CanvasACearth.java b/src/zext/plantuml/com/ctreber/acearth/gui/CanvasACearth.java similarity index 80% rename from src/ext/plantuml/com/ctreber/acearth/gui/CanvasACearth.java rename to src/zext/plantuml/com/ctreber/acearth/gui/CanvasACearth.java index f751a7030..37db1cdc3 100644 --- a/src/ext/plantuml/com/ctreber/acearth/gui/CanvasACearth.java +++ b/src/zext/plantuml/com/ctreber/acearth/gui/CanvasACearth.java @@ -1,6 +1,6 @@ -package ext.plantuml.com.ctreber.acearth.gui; +package zext.plantuml.com.ctreber.acearth.gui; -import ext.plantuml.com.ctreber.acearth.ACearth; +import zext.plantuml.com.ctreber.acearth.ACearth; /** *

diff --git a/src/ext/plantuml/com/ctreber/acearth/gui/PixelCanvas.java b/src/zext/plantuml/com/ctreber/acearth/gui/PixelCanvas.java similarity index 92% rename from src/ext/plantuml/com/ctreber/acearth/gui/PixelCanvas.java rename to src/zext/plantuml/com/ctreber/acearth/gui/PixelCanvas.java index ab4b3deaa..4b7f68969 100644 --- a/src/ext/plantuml/com/ctreber/acearth/gui/PixelCanvas.java +++ b/src/zext/plantuml/com/ctreber/acearth/gui/PixelCanvas.java @@ -1,4 +1,4 @@ -package ext.plantuml.com.ctreber.acearth.gui; +package zext.plantuml.com.ctreber.acearth.gui; import java.awt.Color; import java.awt.Graphics2D; @@ -6,7 +6,7 @@ import java.awt.image.BufferedImage; import java.io.IOException; import java.io.OutputStream; -import ext.plantuml.com.ctreber.acearth.renderer.RenderTarget; +import zext.plantuml.com.ctreber.acearth.renderer.RenderTarget; import net.sourceforge.plantuml.security.SImageIO; /** diff --git a/src/ext/plantuml/com/ctreber/acearth/package-info.java b/src/zext/plantuml/com/ctreber/acearth/package-info.java similarity index 90% rename from src/ext/plantuml/com/ctreber/acearth/package-info.java rename to src/zext/plantuml/com/ctreber/acearth/package-info.java index 8e69ae42d..b0da411ce 100644 --- a/src/ext/plantuml/com/ctreber/acearth/package-info.java +++ b/src/zext/plantuml/com/ctreber/acearth/package-info.java @@ -13,4 +13,4 @@ * @see net.sourceforge.plantuml.acearth * */ -package ext.plantuml.com.ctreber.acearth; +package zext.plantuml.com.ctreber.acearth; diff --git a/src/ext/plantuml/com/ctreber/acearth/plugins/Plugin.java b/src/zext/plantuml/com/ctreber/acearth/plugins/Plugin.java similarity index 78% rename from src/ext/plantuml/com/ctreber/acearth/plugins/Plugin.java rename to src/zext/plantuml/com/ctreber/acearth/plugins/Plugin.java index 85de4bb01..f15f31bb1 100644 --- a/src/ext/plantuml/com/ctreber/acearth/plugins/Plugin.java +++ b/src/zext/plantuml/com/ctreber/acearth/plugins/Plugin.java @@ -1,11 +1,11 @@ -package ext.plantuml.com.ctreber.acearth.plugins; +package zext.plantuml.com.ctreber.acearth.plugins; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import ext.plantuml.com.ctreber.acearth.ACearth; -import ext.plantuml.com.ctreber.acearth.gui.PixelCanvas; -import ext.plantuml.com.ctreber.acearth.projection.Projection; +import zext.plantuml.com.ctreber.acearth.ACearth; +import zext.plantuml.com.ctreber.acearth.gui.PixelCanvas; +import zext.plantuml.com.ctreber.acearth.projection.Projection; /** *

diff --git a/src/ext/plantuml/com/ctreber/acearth/plugins/markers/Marker.java b/src/zext/plantuml/com/ctreber/acearth/plugins/markers/Marker.java similarity index 90% rename from src/ext/plantuml/com/ctreber/acearth/plugins/markers/Marker.java rename to src/zext/plantuml/com/ctreber/acearth/plugins/markers/Marker.java index ccd8b1589..bae5c8a14 100644 --- a/src/ext/plantuml/com/ctreber/acearth/plugins/markers/Marker.java +++ b/src/zext/plantuml/com/ctreber/acearth/plugins/markers/Marker.java @@ -1,17 +1,17 @@ -package ext.plantuml.com.ctreber.acearth.plugins.markers; +package zext.plantuml.com.ctreber.acearth.plugins.markers; import java.awt.Color; import java.awt.Font; import java.awt.Graphics2D; import java.util.List; -import ext.plantuml.com.ctreber.acearth.gui.PixelCanvas; -import ext.plantuml.com.ctreber.acearth.projection.Projection; -import ext.plantuml.com.ctreber.acearth.projection.ProjectionOrtho; -import ext.plantuml.com.ctreber.acearth.util.Coordinate; -import ext.plantuml.com.ctreber.acearth.util.Point2D; -import ext.plantuml.com.ctreber.acearth.util.Point3D; -import ext.plantuml.com.ctreber.acearth.util.StringParser; +import zext.plantuml.com.ctreber.acearth.gui.PixelCanvas; +import zext.plantuml.com.ctreber.acearth.projection.Projection; +import zext.plantuml.com.ctreber.acearth.projection.ProjectionOrtho; +import zext.plantuml.com.ctreber.acearth.util.Coordinate; +import zext.plantuml.com.ctreber.acearth.util.Point2D; +import zext.plantuml.com.ctreber.acearth.util.Point3D; +import zext.plantuml.com.ctreber.acearth.util.StringParser; /** *

diff --git a/src/ext/plantuml/com/ctreber/acearth/plugins/markers/PluginMarkers.java b/src/zext/plantuml/com/ctreber/acearth/plugins/markers/PluginMarkers.java similarity index 92% rename from src/ext/plantuml/com/ctreber/acearth/plugins/markers/PluginMarkers.java rename to src/zext/plantuml/com/ctreber/acearth/plugins/markers/PluginMarkers.java index b5e08db2a..c4f3c5cbb 100644 --- a/src/ext/plantuml/com/ctreber/acearth/plugins/markers/PluginMarkers.java +++ b/src/zext/plantuml/com/ctreber/acearth/plugins/markers/PluginMarkers.java @@ -1,9 +1,9 @@ -package ext.plantuml.com.ctreber.acearth.plugins.markers; +package zext.plantuml.com.ctreber.acearth.plugins.markers; import java.util.Iterator; import java.util.List; -import ext.plantuml.com.ctreber.acearth.plugins.Plugin; +import zext.plantuml.com.ctreber.acearth.plugins.Plugin; /** *

diff --git a/src/ext/plantuml/com/ctreber/acearth/projection/Projection.java b/src/zext/plantuml/com/ctreber/acearth/projection/Projection.java similarity index 96% rename from src/ext/plantuml/com/ctreber/acearth/projection/Projection.java rename to src/zext/plantuml/com/ctreber/acearth/projection/Projection.java index cdb6a2316..2da4743ff 100644 --- a/src/ext/plantuml/com/ctreber/acearth/projection/Projection.java +++ b/src/zext/plantuml/com/ctreber/acearth/projection/Projection.java @@ -1,9 +1,9 @@ -package ext.plantuml.com.ctreber.acearth.projection; +package zext.plantuml.com.ctreber.acearth.projection; -import ext.plantuml.com.ctreber.acearth.util.Coordinate; -import ext.plantuml.com.ctreber.acearth.util.Point2D; -import ext.plantuml.com.ctreber.acearth.util.Point3D; -import ext.plantuml.com.ctreber.acearth.util.Toolkit; +import zext.plantuml.com.ctreber.acearth.util.Coordinate; +import zext.plantuml.com.ctreber.acearth.util.Point2D; +import zext.plantuml.com.ctreber.acearth.util.Point3D; +import zext.plantuml.com.ctreber.acearth.util.Toolkit; /** *

A projection for a globe on a flat surface (must be subclassed). diff --git a/src/ext/plantuml/com/ctreber/acearth/projection/ProjectionCyl.java b/src/zext/plantuml/com/ctreber/acearth/projection/ProjectionCyl.java similarity index 90% rename from src/ext/plantuml/com/ctreber/acearth/projection/ProjectionCyl.java rename to src/zext/plantuml/com/ctreber/acearth/projection/ProjectionCyl.java index e25071c9f..5822b52a1 100644 --- a/src/ext/plantuml/com/ctreber/acearth/projection/ProjectionCyl.java +++ b/src/zext/plantuml/com/ctreber/acearth/projection/ProjectionCyl.java @@ -1,7 +1,7 @@ -package ext.plantuml.com.ctreber.acearth.projection; +package zext.plantuml.com.ctreber.acearth.projection; -import ext.plantuml.com.ctreber.acearth.util.Coordinate; -import ext.plantuml.com.ctreber.acearth.util.Point3D; +import zext.plantuml.com.ctreber.acearth.util.Coordinate; +import zext.plantuml.com.ctreber.acearth.util.Point3D; /** *

Cylindrical projection. Show Earth flatly spread out on rectangle. diff --git a/src/ext/plantuml/com/ctreber/acearth/projection/ProjectionMerc.java b/src/zext/plantuml/com/ctreber/acearth/projection/ProjectionMerc.java similarity index 90% rename from src/ext/plantuml/com/ctreber/acearth/projection/ProjectionMerc.java rename to src/zext/plantuml/com/ctreber/acearth/projection/ProjectionMerc.java index 775e35ace..f28bd43e8 100644 --- a/src/ext/plantuml/com/ctreber/acearth/projection/ProjectionMerc.java +++ b/src/zext/plantuml/com/ctreber/acearth/projection/ProjectionMerc.java @@ -1,7 +1,7 @@ -package ext.plantuml.com.ctreber.acearth.projection; +package zext.plantuml.com.ctreber.acearth.projection; -import ext.plantuml.com.ctreber.acearth.util.Coordinate; -import ext.plantuml.com.ctreber.acearth.util.Point3D; +import zext.plantuml.com.ctreber.acearth.util.Coordinate; +import zext.plantuml.com.ctreber.acearth.util.Point3D; /** diff --git a/src/ext/plantuml/com/ctreber/acearth/projection/ProjectionOrtho.java b/src/zext/plantuml/com/ctreber/acearth/projection/ProjectionOrtho.java similarity index 88% rename from src/ext/plantuml/com/ctreber/acearth/projection/ProjectionOrtho.java rename to src/zext/plantuml/com/ctreber/acearth/projection/ProjectionOrtho.java index 6ff24a612..2b5013436 100644 --- a/src/ext/plantuml/com/ctreber/acearth/projection/ProjectionOrtho.java +++ b/src/zext/plantuml/com/ctreber/acearth/projection/ProjectionOrtho.java @@ -1,7 +1,7 @@ -package ext.plantuml.com.ctreber.acearth.projection; +package zext.plantuml.com.ctreber.acearth.projection; -import ext.plantuml.com.ctreber.acearth.util.Coordinate; -import ext.plantuml.com.ctreber.acearth.util.Point3D; +import zext.plantuml.com.ctreber.acearth.util.Coordinate; +import zext.plantuml.com.ctreber.acearth.util.Point3D; /** diff --git a/src/ext/plantuml/com/ctreber/acearth/renderer/RenderTarget.java b/src/zext/plantuml/com/ctreber/acearth/renderer/RenderTarget.java similarity index 88% rename from src/ext/plantuml/com/ctreber/acearth/renderer/RenderTarget.java rename to src/zext/plantuml/com/ctreber/acearth/renderer/RenderTarget.java index e155cf32e..57c6fd5b1 100644 --- a/src/ext/plantuml/com/ctreber/acearth/renderer/RenderTarget.java +++ b/src/zext/plantuml/com/ctreber/acearth/renderer/RenderTarget.java @@ -1,4 +1,4 @@ -package ext.plantuml.com.ctreber.acearth.renderer; +package zext.plantuml.com.ctreber.acearth.renderer; import java.awt.Color; diff --git a/src/ext/plantuml/com/ctreber/acearth/renderer/Renderer.java b/src/zext/plantuml/com/ctreber/acearth/renderer/Renderer.java similarity index 95% rename from src/ext/plantuml/com/ctreber/acearth/renderer/Renderer.java rename to src/zext/plantuml/com/ctreber/acearth/renderer/Renderer.java index ae9f389c4..a7d9e62fb 100644 --- a/src/ext/plantuml/com/ctreber/acearth/renderer/Renderer.java +++ b/src/zext/plantuml/com/ctreber/acearth/renderer/Renderer.java @@ -1,11 +1,11 @@ -package ext.plantuml.com.ctreber.acearth.renderer; +package zext.plantuml.com.ctreber.acearth.renderer; import java.awt.Color; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import ext.plantuml.com.ctreber.acearth.shader.Shader; +import zext.plantuml.com.ctreber.acearth.shader.Shader; /** *

diff --git a/src/ext/plantuml/com/ctreber/acearth/renderer/RowTypeRenderer.java b/src/zext/plantuml/com/ctreber/acearth/renderer/RowTypeRenderer.java similarity index 92% rename from src/ext/plantuml/com/ctreber/acearth/renderer/RowTypeRenderer.java rename to src/zext/plantuml/com/ctreber/acearth/renderer/RowTypeRenderer.java index 7ec815894..d290d37c4 100644 --- a/src/ext/plantuml/com/ctreber/acearth/renderer/RowTypeRenderer.java +++ b/src/zext/plantuml/com/ctreber/acearth/renderer/RowTypeRenderer.java @@ -1,4 +1,4 @@ -package ext.plantuml.com.ctreber.acearth.renderer; +package zext.plantuml.com.ctreber.acearth.renderer; /** *

Renders a row of pixel types.

diff --git a/src/ext/plantuml/com/ctreber/acearth/renderer/RowTypeRendererScanBit.java b/src/zext/plantuml/com/ctreber/acearth/renderer/RowTypeRendererScanBit.java similarity index 92% rename from src/ext/plantuml/com/ctreber/acearth/renderer/RowTypeRendererScanBit.java rename to src/zext/plantuml/com/ctreber/acearth/renderer/RowTypeRendererScanBit.java index 312ce543e..15ec2af81 100644 --- a/src/ext/plantuml/com/ctreber/acearth/renderer/RowTypeRendererScanBit.java +++ b/src/zext/plantuml/com/ctreber/acearth/renderer/RowTypeRendererScanBit.java @@ -1,7 +1,7 @@ -package ext.plantuml.com.ctreber.acearth.renderer; +package zext.plantuml.com.ctreber.acearth.renderer; -import ext.plantuml.com.ctreber.acearth.scanbit.BitGeneratorMap; -import ext.plantuml.com.ctreber.acearth.scanbit.ScanBit; +import zext.plantuml.com.ctreber.acearth.scanbit.BitGeneratorMap; +import zext.plantuml.com.ctreber.acearth.scanbit.ScanBit; /** *

Renders a row of ScanBits to pixel types.

diff --git a/src/ext/plantuml/com/ctreber/acearth/renderer/RowTypeRendererScanDot.java b/src/zext/plantuml/com/ctreber/acearth/renderer/RowTypeRendererScanDot.java similarity index 89% rename from src/ext/plantuml/com/ctreber/acearth/renderer/RowTypeRendererScanDot.java rename to src/zext/plantuml/com/ctreber/acearth/renderer/RowTypeRendererScanDot.java index 3223094df..ee8faf78d 100644 --- a/src/ext/plantuml/com/ctreber/acearth/renderer/RowTypeRendererScanDot.java +++ b/src/zext/plantuml/com/ctreber/acearth/renderer/RowTypeRendererScanDot.java @@ -1,7 +1,7 @@ -package ext.plantuml.com.ctreber.acearth.renderer; +package zext.plantuml.com.ctreber.acearth.renderer; -import ext.plantuml.com.ctreber.acearth.scanbit.BitGeneratorMap; -import ext.plantuml.com.ctreber.acearth.scandot.ScanDot; +import zext.plantuml.com.ctreber.acearth.scanbit.BitGeneratorMap; +import zext.plantuml.com.ctreber.acearth.scandot.ScanDot; /** *

Renders a row of ScanDots to pixel types.

diff --git a/src/ext/plantuml/com/ctreber/acearth/scanbit/BitGeneratorMap.java b/src/zext/plantuml/com/ctreber/acearth/scanbit/BitGeneratorMap.java similarity index 88% rename from src/ext/plantuml/com/ctreber/acearth/scanbit/BitGeneratorMap.java rename to src/zext/plantuml/com/ctreber/acearth/scanbit/BitGeneratorMap.java index f907a70b4..c2e36b152 100644 --- a/src/ext/plantuml/com/ctreber/acearth/scanbit/BitGeneratorMap.java +++ b/src/zext/plantuml/com/ctreber/acearth/scanbit/BitGeneratorMap.java @@ -1,16 +1,16 @@ -package ext.plantuml.com.ctreber.acearth.scanbit; +package zext.plantuml.com.ctreber.acearth.scanbit; import java.util.ArrayList; import java.util.Comparator; import java.util.List; -import ext.plantuml.com.ctreber.acearth.projection.Projection; -import ext.plantuml.com.ctreber.acearth.util.EdgeCrossing; -import ext.plantuml.com.ctreber.acearth.util.Point2D; -import ext.plantuml.com.ctreber.acearth.util.Point3D; -import ext.plantuml.com.ctreber.acearth.util.Polygon; -import ext.plantuml.com.ctreber.aclib.sort.CTSort; -import ext.plantuml.com.ctreber.aclib.sort.QuickSort; +import zext.plantuml.com.ctreber.acearth.projection.Projection; +import zext.plantuml.com.ctreber.acearth.util.EdgeCrossing; +import zext.plantuml.com.ctreber.acearth.util.Point2D; +import zext.plantuml.com.ctreber.acearth.util.Point3D; +import zext.plantuml.com.ctreber.acearth.util.Polygon; +import zext.plantuml.com.ctreber.aclib.sort.CTSort; +import zext.plantuml.com.ctreber.aclib.sort.QuickSort; /** *

diff --git a/src/ext/plantuml/com/ctreber/acearth/scanbit/BitGeneratorMapDefault.java b/src/zext/plantuml/com/ctreber/acearth/scanbit/BitGeneratorMapDefault.java similarity index 95% rename from src/ext/plantuml/com/ctreber/acearth/scanbit/BitGeneratorMapDefault.java rename to src/zext/plantuml/com/ctreber/acearth/scanbit/BitGeneratorMapDefault.java index 7a3e8619b..780644110 100644 --- a/src/ext/plantuml/com/ctreber/acearth/scanbit/BitGeneratorMapDefault.java +++ b/src/zext/plantuml/com/ctreber/acearth/scanbit/BitGeneratorMapDefault.java @@ -1,11 +1,11 @@ -package ext.plantuml.com.ctreber.acearth.scanbit; +package zext.plantuml.com.ctreber.acearth.scanbit; import java.util.Comparator; -import ext.plantuml.com.ctreber.acearth.projection.Projection; -import ext.plantuml.com.ctreber.acearth.util.EdgeCrossing; -import ext.plantuml.com.ctreber.acearth.util.Point2D; -import ext.plantuml.com.ctreber.acearth.util.Point3D; +import zext.plantuml.com.ctreber.acearth.projection.Projection; +import zext.plantuml.com.ctreber.acearth.util.EdgeCrossing; +import zext.plantuml.com.ctreber.acearth.util.Point2D; +import zext.plantuml.com.ctreber.acearth.util.Point3D; /** *

Map scanner for mercator and cylindrical projections. diff --git a/src/ext/plantuml/com/ctreber/acearth/scanbit/BitGeneratorMapOrtho.java b/src/zext/plantuml/com/ctreber/acearth/scanbit/BitGeneratorMapOrtho.java similarity index 94% rename from src/ext/plantuml/com/ctreber/acearth/scanbit/BitGeneratorMapOrtho.java rename to src/zext/plantuml/com/ctreber/acearth/scanbit/BitGeneratorMapOrtho.java index 980b4e5b6..59cc35c33 100644 --- a/src/ext/plantuml/com/ctreber/acearth/scanbit/BitGeneratorMapOrtho.java +++ b/src/zext/plantuml/com/ctreber/acearth/scanbit/BitGeneratorMapOrtho.java @@ -1,11 +1,11 @@ -package ext.plantuml.com.ctreber.acearth.scanbit; +package zext.plantuml.com.ctreber.acearth.scanbit; import java.util.Comparator; -import ext.plantuml.com.ctreber.acearth.projection.Projection; -import ext.plantuml.com.ctreber.acearth.util.EdgeCrossing; -import ext.plantuml.com.ctreber.acearth.util.Point2D; -import ext.plantuml.com.ctreber.acearth.util.Point3D; +import zext.plantuml.com.ctreber.acearth.projection.Projection; +import zext.plantuml.com.ctreber.acearth.util.EdgeCrossing; +import zext.plantuml.com.ctreber.acearth.util.Point2D; +import zext.plantuml.com.ctreber.acearth.util.Point3D; /** *

Map scanner for orthographic projection. diff --git a/src/ext/plantuml/com/ctreber/acearth/scanbit/ScanBit.java b/src/zext/plantuml/com/ctreber/acearth/scanbit/ScanBit.java similarity index 95% rename from src/ext/plantuml/com/ctreber/acearth/scanbit/ScanBit.java rename to src/zext/plantuml/com/ctreber/acearth/scanbit/ScanBit.java index d5f7624d5..13367fe0f 100644 --- a/src/ext/plantuml/com/ctreber/acearth/scanbit/ScanBit.java +++ b/src/zext/plantuml/com/ctreber/acearth/scanbit/ScanBit.java @@ -1,4 +1,4 @@ -package ext.plantuml.com.ctreber.acearth.scanbit; +package zext.plantuml.com.ctreber.acearth.scanbit; /** *

Instruction to paint points xFrom to xTo on line y. diff --git a/src/ext/plantuml/com/ctreber/acearth/scanbit/ScanBitGenerator.java b/src/zext/plantuml/com/ctreber/acearth/scanbit/ScanBitGenerator.java similarity index 92% rename from src/ext/plantuml/com/ctreber/acearth/scanbit/ScanBitGenerator.java rename to src/zext/plantuml/com/ctreber/acearth/scanbit/ScanBitGenerator.java index c3e0febe3..531c3673d 100644 --- a/src/ext/plantuml/com/ctreber/acearth/scanbit/ScanBitGenerator.java +++ b/src/zext/plantuml/com/ctreber/acearth/scanbit/ScanBitGenerator.java @@ -1,4 +1,4 @@ -package ext.plantuml.com.ctreber.acearth.scanbit; +package zext.plantuml.com.ctreber.acearth.scanbit; /** *

A ScanBitGenerator produces ScanBits.

diff --git a/src/ext/plantuml/com/ctreber/acearth/scanbit/ScanBuf.java b/src/zext/plantuml/com/ctreber/acearth/scanbit/ScanBuf.java similarity index 96% rename from src/ext/plantuml/com/ctreber/acearth/scanbit/ScanBuf.java rename to src/zext/plantuml/com/ctreber/acearth/scanbit/ScanBuf.java index 62c3ed347..88e9098c5 100644 --- a/src/ext/plantuml/com/ctreber/acearth/scanbit/ScanBuf.java +++ b/src/zext/plantuml/com/ctreber/acearth/scanbit/ScanBuf.java @@ -1,10 +1,10 @@ -package ext.plantuml.com.ctreber.acearth.scanbit; +package zext.plantuml.com.ctreber.acearth.scanbit; import java.util.ArrayList; import java.util.List; -import ext.plantuml.com.ctreber.aclib.sort.CTSort; -import ext.plantuml.com.ctreber.aclib.sort.QuickSort; +import zext.plantuml.com.ctreber.aclib.sort.CTSort; +import zext.plantuml.com.ctreber.aclib.sort.QuickSort; /** *

For each line, the scanbuffer (= a raster divice) records the points hit diff --git a/src/ext/plantuml/com/ctreber/acearth/scandot/DotGeneratorLines.java b/src/zext/plantuml/com/ctreber/acearth/scandot/DotGeneratorLines.java similarity index 86% rename from src/ext/plantuml/com/ctreber/acearth/scandot/DotGeneratorLines.java rename to src/zext/plantuml/com/ctreber/acearth/scandot/DotGeneratorLines.java index 5392a4ef9..7a382a3be 100644 --- a/src/ext/plantuml/com/ctreber/acearth/scandot/DotGeneratorLines.java +++ b/src/zext/plantuml/com/ctreber/acearth/scandot/DotGeneratorLines.java @@ -1,9 +1,9 @@ -package ext.plantuml.com.ctreber.acearth.scandot; +package zext.plantuml.com.ctreber.acearth.scandot; -import ext.plantuml.com.ctreber.acearth.projection.Projection; -import ext.plantuml.com.ctreber.acearth.util.Coordinate; -import ext.plantuml.com.ctreber.acearth.util.Point2D; -import ext.plantuml.com.ctreber.acearth.util.Point3D; +import zext.plantuml.com.ctreber.acearth.projection.Projection; +import zext.plantuml.com.ctreber.acearth.util.Coordinate; +import zext.plantuml.com.ctreber.acearth.util.Point2D; +import zext.plantuml.com.ctreber.acearth.util.Point3D; /** *

Generate latitude and longitude grid as dots. diff --git a/src/ext/plantuml/com/ctreber/acearth/scandot/DotGeneratorStars.java b/src/zext/plantuml/com/ctreber/acearth/scandot/DotGeneratorStars.java similarity index 96% rename from src/ext/plantuml/com/ctreber/acearth/scandot/DotGeneratorStars.java rename to src/zext/plantuml/com/ctreber/acearth/scandot/DotGeneratorStars.java index e598a27a2..789563753 100644 --- a/src/ext/plantuml/com/ctreber/acearth/scandot/DotGeneratorStars.java +++ b/src/zext/plantuml/com/ctreber/acearth/scandot/DotGeneratorStars.java @@ -1,4 +1,4 @@ -package ext.plantuml.com.ctreber.acearth.scandot; +package zext.plantuml.com.ctreber.acearth.scandot; import java.util.Random; diff --git a/src/ext/plantuml/com/ctreber/acearth/scandot/ScanDot.java b/src/zext/plantuml/com/ctreber/acearth/scandot/ScanDot.java similarity index 90% rename from src/ext/plantuml/com/ctreber/acearth/scandot/ScanDot.java rename to src/zext/plantuml/com/ctreber/acearth/scandot/ScanDot.java index ac0823a7f..c222ee475 100644 --- a/src/ext/plantuml/com/ctreber/acearth/scandot/ScanDot.java +++ b/src/zext/plantuml/com/ctreber/acearth/scandot/ScanDot.java @@ -1,6 +1,6 @@ -package ext.plantuml.com.ctreber.acearth.scandot; +package zext.plantuml.com.ctreber.acearth.scandot; -import ext.plantuml.com.ctreber.acearth.util.Point2D; +import zext.plantuml.com.ctreber.acearth.util.Point2D; /** *

A single scandot (opposed to a Polygon). diff --git a/src/ext/plantuml/com/ctreber/acearth/scandot/ScanDotGenerator.java b/src/zext/plantuml/com/ctreber/acearth/scandot/ScanDotGenerator.java similarity index 89% rename from src/ext/plantuml/com/ctreber/acearth/scandot/ScanDotGenerator.java rename to src/zext/plantuml/com/ctreber/acearth/scandot/ScanDotGenerator.java index 0013cf42c..3d7d7fe6f 100644 --- a/src/ext/plantuml/com/ctreber/acearth/scandot/ScanDotGenerator.java +++ b/src/zext/plantuml/com/ctreber/acearth/scandot/ScanDotGenerator.java @@ -1,4 +1,4 @@ -package ext.plantuml.com.ctreber.acearth.scandot; +package zext.plantuml.com.ctreber.acearth.scandot; import java.util.ArrayList; import java.util.List; diff --git a/src/ext/plantuml/com/ctreber/acearth/shader/Shader.java b/src/zext/plantuml/com/ctreber/acearth/shader/Shader.java similarity index 92% rename from src/ext/plantuml/com/ctreber/acearth/shader/Shader.java rename to src/zext/plantuml/com/ctreber/acearth/shader/Shader.java index e3ba21578..dcca30fe6 100644 --- a/src/ext/plantuml/com/ctreber/acearth/shader/Shader.java +++ b/src/zext/plantuml/com/ctreber/acearth/shader/Shader.java @@ -1,11 +1,11 @@ -package ext.plantuml.com.ctreber.acearth.shader; +package zext.plantuml.com.ctreber.acearth.shader; import java.awt.Color; -import ext.plantuml.com.ctreber.acearth.projection.Projection; -import ext.plantuml.com.ctreber.acearth.scanbit.BitGeneratorMap; -import ext.plantuml.com.ctreber.acearth.util.Coordinate; -import ext.plantuml.com.ctreber.acearth.util.Point3D; +import zext.plantuml.com.ctreber.acearth.projection.Projection; +import zext.plantuml.com.ctreber.acearth.scanbit.BitGeneratorMap; +import zext.plantuml.com.ctreber.acearth.util.Coordinate; +import zext.plantuml.com.ctreber.acearth.util.Point3D; /** *

A shader computes Colors for a row of pixel types, depending diff --git a/src/ext/plantuml/com/ctreber/acearth/shader/ShaderDefault.java b/src/zext/plantuml/com/ctreber/acearth/shader/ShaderDefault.java similarity index 97% rename from src/ext/plantuml/com/ctreber/acearth/shader/ShaderDefault.java rename to src/zext/plantuml/com/ctreber/acearth/shader/ShaderDefault.java index ffb01e469..2dc3a151b 100644 --- a/src/ext/plantuml/com/ctreber/acearth/shader/ShaderDefault.java +++ b/src/zext/plantuml/com/ctreber/acearth/shader/ShaderDefault.java @@ -1,4 +1,4 @@ -package ext.plantuml.com.ctreber.acearth.shader; +package zext.plantuml.com.ctreber.acearth.shader; import java.awt.Color; diff --git a/src/ext/plantuml/com/ctreber/acearth/shader/ShaderFlat.java b/src/zext/plantuml/com/ctreber/acearth/shader/ShaderFlat.java similarity index 91% rename from src/ext/plantuml/com/ctreber/acearth/shader/ShaderFlat.java rename to src/zext/plantuml/com/ctreber/acearth/shader/ShaderFlat.java index a5b983ade..ca7d1c53d 100644 --- a/src/ext/plantuml/com/ctreber/acearth/shader/ShaderFlat.java +++ b/src/zext/plantuml/com/ctreber/acearth/shader/ShaderFlat.java @@ -1,4 +1,4 @@ -package ext.plantuml.com.ctreber.acearth.shader; +package zext.plantuml.com.ctreber.acearth.shader; import java.awt.Color; diff --git a/src/ext/plantuml/com/ctreber/acearth/shader/ShaderOrtho.java b/src/zext/plantuml/com/ctreber/acearth/shader/ShaderOrtho.java similarity index 96% rename from src/ext/plantuml/com/ctreber/acearth/shader/ShaderOrtho.java rename to src/zext/plantuml/com/ctreber/acearth/shader/ShaderOrtho.java index 33c646b58..7313ae615 100644 --- a/src/ext/plantuml/com/ctreber/acearth/shader/ShaderOrtho.java +++ b/src/zext/plantuml/com/ctreber/acearth/shader/ShaderOrtho.java @@ -1,4 +1,4 @@ -package ext.plantuml.com.ctreber.acearth.shader; +package zext.plantuml.com.ctreber.acearth.shader; import java.awt.Color; diff --git a/src/ext/plantuml/com/ctreber/acearth/util/Coordinate.java b/src/zext/plantuml/com/ctreber/acearth/util/Coordinate.java similarity index 98% rename from src/ext/plantuml/com/ctreber/acearth/util/Coordinate.java rename to src/zext/plantuml/com/ctreber/acearth/util/Coordinate.java index 76d16ae6a..91665e47e 100644 --- a/src/ext/plantuml/com/ctreber/acearth/util/Coordinate.java +++ b/src/zext/plantuml/com/ctreber/acearth/util/Coordinate.java @@ -1,4 +1,4 @@ -package ext.plantuml.com.ctreber.acearth.util; +package zext.plantuml.com.ctreber.acearth.util; import java.io.IOException; import java.io.Writer; diff --git a/src/ext/plantuml/com/ctreber/acearth/util/EdgeCrossing.java b/src/zext/plantuml/com/ctreber/acearth/util/EdgeCrossing.java similarity index 95% rename from src/ext/plantuml/com/ctreber/acearth/util/EdgeCrossing.java rename to src/zext/plantuml/com/ctreber/acearth/util/EdgeCrossing.java index adc3e2342..d4b03f3fc 100644 --- a/src/ext/plantuml/com/ctreber/acearth/util/EdgeCrossing.java +++ b/src/zext/plantuml/com/ctreber/acearth/util/EdgeCrossing.java @@ -1,4 +1,4 @@ -package ext.plantuml.com.ctreber.acearth.util; +package zext.plantuml.com.ctreber.acearth.util; /** *

Holds information about a line crossing "the edge of Earth". diff --git a/src/ext/plantuml/com/ctreber/acearth/util/Point2D.java b/src/zext/plantuml/com/ctreber/acearth/util/Point2D.java similarity index 90% rename from src/ext/plantuml/com/ctreber/acearth/util/Point2D.java rename to src/zext/plantuml/com/ctreber/acearth/util/Point2D.java index 596f2b425..b71ea8c3b 100644 --- a/src/ext/plantuml/com/ctreber/acearth/util/Point2D.java +++ b/src/zext/plantuml/com/ctreber/acearth/util/Point2D.java @@ -1,4 +1,4 @@ -package ext.plantuml.com.ctreber.acearth.util; +package zext.plantuml.com.ctreber.acearth.util; /** *

A point in a 2 axis space. diff --git a/src/ext/plantuml/com/ctreber/acearth/util/Point3D.java b/src/zext/plantuml/com/ctreber/acearth/util/Point3D.java similarity index 93% rename from src/ext/plantuml/com/ctreber/acearth/util/Point3D.java rename to src/zext/plantuml/com/ctreber/acearth/util/Point3D.java index 8f0a06561..355d7bc05 100644 --- a/src/ext/plantuml/com/ctreber/acearth/util/Point3D.java +++ b/src/zext/plantuml/com/ctreber/acearth/util/Point3D.java @@ -1,4 +1,4 @@ -package ext.plantuml.com.ctreber.acearth.util; +package zext.plantuml.com.ctreber.acearth.util; /** *

A point in a 2 axis space. diff --git a/src/ext/plantuml/com/ctreber/acearth/util/Polygon.java b/src/zext/plantuml/com/ctreber/acearth/util/Polygon.java similarity index 93% rename from src/ext/plantuml/com/ctreber/acearth/util/Polygon.java rename to src/zext/plantuml/com/ctreber/acearth/util/Polygon.java index 9ea5f7141..5c43c3938 100644 --- a/src/ext/plantuml/com/ctreber/acearth/util/Polygon.java +++ b/src/zext/plantuml/com/ctreber/acearth/util/Polygon.java @@ -1,4 +1,4 @@ -package ext.plantuml.com.ctreber.acearth.util; +package zext.plantuml.com.ctreber.acearth.util; /** diff --git a/src/ext/plantuml/com/ctreber/acearth/util/StringParser.java b/src/zext/plantuml/com/ctreber/acearth/util/StringParser.java similarity index 98% rename from src/ext/plantuml/com/ctreber/acearth/util/StringParser.java rename to src/zext/plantuml/com/ctreber/acearth/util/StringParser.java index 3ba3b1cd8..7f268573c 100644 --- a/src/ext/plantuml/com/ctreber/acearth/util/StringParser.java +++ b/src/zext/plantuml/com/ctreber/acearth/util/StringParser.java @@ -1,4 +1,4 @@ -package ext.plantuml.com.ctreber.acearth.util; +package zext.plantuml.com.ctreber.acearth.util; import java.util.ArrayList; import java.util.List; diff --git a/src/ext/plantuml/com/ctreber/acearth/util/SunPositionCalculator.java b/src/zext/plantuml/com/ctreber/acearth/util/SunPositionCalculator.java similarity index 99% rename from src/ext/plantuml/com/ctreber/acearth/util/SunPositionCalculator.java rename to src/zext/plantuml/com/ctreber/acearth/util/SunPositionCalculator.java index 736a2c3f7..6cb9624ca 100644 --- a/src/ext/plantuml/com/ctreber/acearth/util/SunPositionCalculator.java +++ b/src/zext/plantuml/com/ctreber/acearth/util/SunPositionCalculator.java @@ -1,4 +1,4 @@ -package ext.plantuml.com.ctreber.acearth.util; +package zext.plantuml.com.ctreber.acearth.util; import java.util.Calendar; import java.util.Date; diff --git a/src/ext/plantuml/com/ctreber/acearth/util/Toolkit.java b/src/zext/plantuml/com/ctreber/acearth/util/Toolkit.java similarity index 98% rename from src/ext/plantuml/com/ctreber/acearth/util/Toolkit.java rename to src/zext/plantuml/com/ctreber/acearth/util/Toolkit.java index de5850a6d..21cb17adf 100644 --- a/src/ext/plantuml/com/ctreber/acearth/util/Toolkit.java +++ b/src/zext/plantuml/com/ctreber/acearth/util/Toolkit.java @@ -1,4 +1,4 @@ -package ext.plantuml.com.ctreber.acearth.util; +package zext.plantuml.com.ctreber.acearth.util; import java.util.HashSet; import java.util.StringTokenizer; diff --git a/src/ext/plantuml/com/ctreber/aclib/gui/MOBoolean.java b/src/zext/plantuml/com/ctreber/aclib/gui/MOBoolean.java similarity index 93% rename from src/ext/plantuml/com/ctreber/aclib/gui/MOBoolean.java rename to src/zext/plantuml/com/ctreber/aclib/gui/MOBoolean.java index 791eaeeab..e1eefd443 100644 --- a/src/ext/plantuml/com/ctreber/aclib/gui/MOBoolean.java +++ b/src/zext/plantuml/com/ctreber/aclib/gui/MOBoolean.java @@ -1,4 +1,4 @@ -package ext.plantuml.com.ctreber.aclib.gui; +package zext.plantuml.com.ctreber.aclib.gui; /** *

diff --git a/src/ext/plantuml/com/ctreber/aclib/gui/MOChangeListener.java b/src/zext/plantuml/com/ctreber/aclib/gui/MOChangeListener.java similarity index 86% rename from src/ext/plantuml/com/ctreber/aclib/gui/MOChangeListener.java rename to src/zext/plantuml/com/ctreber/aclib/gui/MOChangeListener.java index 29416373d..4b8388f25 100644 --- a/src/ext/plantuml/com/ctreber/aclib/gui/MOChangeListener.java +++ b/src/zext/plantuml/com/ctreber/aclib/gui/MOChangeListener.java @@ -1,4 +1,4 @@ -package ext.plantuml.com.ctreber.aclib.gui; +package zext.plantuml.com.ctreber.aclib.gui; /** *

Implemented by classes interetested in MonitoredObject values changes.

diff --git a/src/ext/plantuml/com/ctreber/aclib/gui/MODouble.java b/src/zext/plantuml/com/ctreber/aclib/gui/MODouble.java similarity index 96% rename from src/ext/plantuml/com/ctreber/aclib/gui/MODouble.java rename to src/zext/plantuml/com/ctreber/aclib/gui/MODouble.java index 722a5db95..c77bc966f 100644 --- a/src/ext/plantuml/com/ctreber/aclib/gui/MODouble.java +++ b/src/zext/plantuml/com/ctreber/aclib/gui/MODouble.java @@ -1,4 +1,4 @@ -package ext.plantuml.com.ctreber.aclib.gui; +package zext.plantuml.com.ctreber.aclib.gui; /** *

diff --git a/src/ext/plantuml/com/ctreber/aclib/gui/MOEnum.java b/src/zext/plantuml/com/ctreber/aclib/gui/MOEnum.java similarity index 96% rename from src/ext/plantuml/com/ctreber/aclib/gui/MOEnum.java rename to src/zext/plantuml/com/ctreber/aclib/gui/MOEnum.java index f2b3cbf68..98848119e 100644 --- a/src/ext/plantuml/com/ctreber/aclib/gui/MOEnum.java +++ b/src/zext/plantuml/com/ctreber/aclib/gui/MOEnum.java @@ -1,4 +1,4 @@ -package ext.plantuml.com.ctreber.aclib.gui; +package zext.plantuml.com.ctreber.aclib.gui; import java.util.HashSet; diff --git a/src/ext/plantuml/com/ctreber/aclib/gui/MOInteger.java b/src/zext/plantuml/com/ctreber/aclib/gui/MOInteger.java similarity index 96% rename from src/ext/plantuml/com/ctreber/aclib/gui/MOInteger.java rename to src/zext/plantuml/com/ctreber/aclib/gui/MOInteger.java index 081661562..290dd0783 100644 --- a/src/ext/plantuml/com/ctreber/aclib/gui/MOInteger.java +++ b/src/zext/plantuml/com/ctreber/aclib/gui/MOInteger.java @@ -1,4 +1,4 @@ -package ext.plantuml.com.ctreber.aclib.gui; +package zext.plantuml.com.ctreber.aclib.gui; /** *

diff --git a/src/ext/plantuml/com/ctreber/aclib/gui/MOString.java b/src/zext/plantuml/com/ctreber/aclib/gui/MOString.java similarity index 91% rename from src/ext/plantuml/com/ctreber/aclib/gui/MOString.java rename to src/zext/plantuml/com/ctreber/aclib/gui/MOString.java index 3f06fedb0..7a1537c83 100644 --- a/src/ext/plantuml/com/ctreber/aclib/gui/MOString.java +++ b/src/zext/plantuml/com/ctreber/aclib/gui/MOString.java @@ -1,4 +1,4 @@ -package ext.plantuml.com.ctreber.aclib.gui; +package zext.plantuml.com.ctreber.aclib.gui; diff --git a/src/ext/plantuml/com/ctreber/aclib/gui/MonitoredObject.java b/src/zext/plantuml/com/ctreber/aclib/gui/MonitoredObject.java similarity index 95% rename from src/ext/plantuml/com/ctreber/aclib/gui/MonitoredObject.java rename to src/zext/plantuml/com/ctreber/aclib/gui/MonitoredObject.java index 8bb482492..cfd2b57f4 100644 --- a/src/ext/plantuml/com/ctreber/aclib/gui/MonitoredObject.java +++ b/src/zext/plantuml/com/ctreber/aclib/gui/MonitoredObject.java @@ -1,4 +1,4 @@ -package ext.plantuml.com.ctreber.aclib.gui; +package zext.plantuml.com.ctreber.aclib.gui; import java.util.ArrayList; import java.util.Iterator; diff --git a/src/ext/plantuml/com/ctreber/aclib/sort/CTSort.java b/src/zext/plantuml/com/ctreber/aclib/sort/CTSort.java similarity index 91% rename from src/ext/plantuml/com/ctreber/aclib/sort/CTSort.java rename to src/zext/plantuml/com/ctreber/aclib/sort/CTSort.java index 9783f237e..afa16ab2c 100644 --- a/src/ext/plantuml/com/ctreber/aclib/sort/CTSort.java +++ b/src/zext/plantuml/com/ctreber/aclib/sort/CTSort.java @@ -1,4 +1,4 @@ -package ext.plantuml.com.ctreber.aclib.sort; +package zext.plantuml.com.ctreber.aclib.sort; import java.util.Comparator; diff --git a/src/ext/plantuml/com/ctreber/aclib/sort/DefaultComparator.java b/src/zext/plantuml/com/ctreber/aclib/sort/DefaultComparator.java similarity index 90% rename from src/ext/plantuml/com/ctreber/aclib/sort/DefaultComparator.java rename to src/zext/plantuml/com/ctreber/aclib/sort/DefaultComparator.java index b183e4122..ef22c7c31 100644 --- a/src/ext/plantuml/com/ctreber/aclib/sort/DefaultComparator.java +++ b/src/zext/plantuml/com/ctreber/aclib/sort/DefaultComparator.java @@ -1,4 +1,4 @@ -package ext.plantuml.com.ctreber.aclib.sort; +package zext.plantuml.com.ctreber.aclib.sort; import java.util.Comparator; diff --git a/src/ext/plantuml/com/ctreber/aclib/sort/QuickSort.java b/src/zext/plantuml/com/ctreber/aclib/sort/QuickSort.java similarity index 97% rename from src/ext/plantuml/com/ctreber/aclib/sort/QuickSort.java rename to src/zext/plantuml/com/ctreber/aclib/sort/QuickSort.java index a0922dbbe..d0f6cd165 100644 --- a/src/ext/plantuml/com/ctreber/aclib/sort/QuickSort.java +++ b/src/zext/plantuml/com/ctreber/aclib/sort/QuickSort.java @@ -1,4 +1,4 @@ -package ext.plantuml.com.ctreber.aclib.sort; +package zext.plantuml.com.ctreber.aclib.sort; import java.util.Comparator; diff --git a/src/ext/plantuml/com/google/zxing/BarcodeFormat.java b/src/zext/plantuml/com/google/zxing/BarcodeFormat.java similarity index 98% rename from src/ext/plantuml/com/google/zxing/BarcodeFormat.java rename to src/zext/plantuml/com/google/zxing/BarcodeFormat.java index da912f28f..37c444dc2 100644 --- a/src/ext/plantuml/com/google/zxing/BarcodeFormat.java +++ b/src/zext/plantuml/com/google/zxing/BarcodeFormat.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package ext.plantuml.com.google.zxing; +package zext.plantuml.com.google.zxing; import java.util.Hashtable; diff --git a/src/ext/plantuml/com/google/zxing/ChecksumException.java b/src/zext/plantuml/com/google/zxing/ChecksumException.java similarity index 96% rename from src/ext/plantuml/com/google/zxing/ChecksumException.java rename to src/zext/plantuml/com/google/zxing/ChecksumException.java index fa2a89030..11a232a37 100644 --- a/src/ext/plantuml/com/google/zxing/ChecksumException.java +++ b/src/zext/plantuml/com/google/zxing/ChecksumException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package ext.plantuml.com.google.zxing; +package zext.plantuml.com.google.zxing; /** * Thrown when a barcode was successfully detected and decoded, but diff --git a/src/ext/plantuml/com/google/zxing/DecodeHintType.java b/src/zext/plantuml/com/google/zxing/DecodeHintType.java similarity index 98% rename from src/ext/plantuml/com/google/zxing/DecodeHintType.java rename to src/zext/plantuml/com/google/zxing/DecodeHintType.java index 39d20f30c..6e0e687d4 100644 --- a/src/ext/plantuml/com/google/zxing/DecodeHintType.java +++ b/src/zext/plantuml/com/google/zxing/DecodeHintType.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package ext.plantuml.com.google.zxing; +package zext.plantuml.com.google.zxing; /** * Encapsulates a type of hint that a caller may pass to a barcode reader to help it diff --git a/src/ext/plantuml/com/google/zxing/EncodeHintType.java b/src/zext/plantuml/com/google/zxing/EncodeHintType.java similarity index 96% rename from src/ext/plantuml/com/google/zxing/EncodeHintType.java rename to src/zext/plantuml/com/google/zxing/EncodeHintType.java index 8fc30c190..ed7228f0b 100644 --- a/src/ext/plantuml/com/google/zxing/EncodeHintType.java +++ b/src/zext/plantuml/com/google/zxing/EncodeHintType.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package ext.plantuml.com.google.zxing; +package zext.plantuml.com.google.zxing; /** * These are a set of hints that you may pass to Writers to specify their behavior. diff --git a/src/ext/plantuml/com/google/zxing/FormatException.java b/src/zext/plantuml/com/google/zxing/FormatException.java similarity index 96% rename from src/ext/plantuml/com/google/zxing/FormatException.java rename to src/zext/plantuml/com/google/zxing/FormatException.java index b8282a6e1..461d09ee2 100644 --- a/src/ext/plantuml/com/google/zxing/FormatException.java +++ b/src/zext/plantuml/com/google/zxing/FormatException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package ext.plantuml.com.google.zxing; +package zext.plantuml.com.google.zxing; /** * Thrown when a barcode was successfully detected, but some aspect of diff --git a/src/ext/plantuml/com/google/zxing/NotFoundException.java b/src/zext/plantuml/com/google/zxing/NotFoundException.java similarity index 96% rename from src/ext/plantuml/com/google/zxing/NotFoundException.java rename to src/zext/plantuml/com/google/zxing/NotFoundException.java index 7d7624216..f45c7f71a 100644 --- a/src/ext/plantuml/com/google/zxing/NotFoundException.java +++ b/src/zext/plantuml/com/google/zxing/NotFoundException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package ext.plantuml.com.google.zxing; +package zext.plantuml.com.google.zxing; /** * Thrown when a barcode was not found in the image. It might have been diff --git a/src/ext/plantuml/com/google/zxing/ReaderException.java b/src/zext/plantuml/com/google/zxing/ReaderException.java similarity index 98% rename from src/ext/plantuml/com/google/zxing/ReaderException.java rename to src/zext/plantuml/com/google/zxing/ReaderException.java index 515d71776..8cd652ce1 100644 --- a/src/ext/plantuml/com/google/zxing/ReaderException.java +++ b/src/zext/plantuml/com/google/zxing/ReaderException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package ext.plantuml.com.google.zxing; +package zext.plantuml.com.google.zxing; /** * The general exception class throw when something goes wrong during decoding of a barcode. diff --git a/src/ext/plantuml/com/google/zxing/ResultPoint.java b/src/zext/plantuml/com/google/zxing/ResultPoint.java similarity index 98% rename from src/ext/plantuml/com/google/zxing/ResultPoint.java rename to src/zext/plantuml/com/google/zxing/ResultPoint.java index 30a7eac9c..e71240e01 100644 --- a/src/ext/plantuml/com/google/zxing/ResultPoint.java +++ b/src/zext/plantuml/com/google/zxing/ResultPoint.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package ext.plantuml.com.google.zxing; +package zext.plantuml.com.google.zxing; /** *

Encapsulates a point of interest in an image containing a barcode. Typically, this diff --git a/src/ext/plantuml/com/google/zxing/Writer.java b/src/zext/plantuml/com/google/zxing/Writer.java old mode 100755 new mode 100644 similarity index 94% rename from src/ext/plantuml/com/google/zxing/Writer.java rename to src/zext/plantuml/com/google/zxing/Writer.java index 90162a575..ae35c9629 --- a/src/ext/plantuml/com/google/zxing/Writer.java +++ b/src/zext/plantuml/com/google/zxing/Writer.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package ext.plantuml.com.google.zxing; +package zext.plantuml.com.google.zxing; import java.util.Hashtable; -import ext.plantuml.com.google.zxing.common.BitMatrix; +import zext.plantuml.com.google.zxing.common.BitMatrix; /** * The base class for all objects which encode/generate a barcode image. diff --git a/src/ext/plantuml/com/google/zxing/WriterException.java b/src/zext/plantuml/com/google/zxing/WriterException.java similarity index 95% rename from src/ext/plantuml/com/google/zxing/WriterException.java rename to src/zext/plantuml/com/google/zxing/WriterException.java index e605dd6af..fce6ac922 100644 --- a/src/ext/plantuml/com/google/zxing/WriterException.java +++ b/src/zext/plantuml/com/google/zxing/WriterException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package ext.plantuml.com.google.zxing; +package zext.plantuml.com.google.zxing; /** * A base class which covers the range of exceptions which may occur when encoding a barcode using diff --git a/src/ext/plantuml/com/google/zxing/client/j2se/MatrixToImageWriter.java b/src/zext/plantuml/com/google/zxing/client/j2se/MatrixToImageWriter.java similarity index 95% rename from src/ext/plantuml/com/google/zxing/client/j2se/MatrixToImageWriter.java rename to src/zext/plantuml/com/google/zxing/client/j2se/MatrixToImageWriter.java index b6668edad..0778a040a 100644 --- a/src/ext/plantuml/com/google/zxing/client/j2se/MatrixToImageWriter.java +++ b/src/zext/plantuml/com/google/zxing/client/j2se/MatrixToImageWriter.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package ext.plantuml.com.google.zxing.client.j2se; +package zext.plantuml.com.google.zxing.client.j2se; import java.awt.image.BufferedImage; -import ext.plantuml.com.google.zxing.common.BitMatrix; +import zext.plantuml.com.google.zxing.common.BitMatrix; /** * Writes a {@link BitMatrix} to {@link BufferedImage}, diff --git a/src/ext/plantuml/com/google/zxing/common/BitArray.java b/src/zext/plantuml/com/google/zxing/common/BitArray.java similarity index 99% rename from src/ext/plantuml/com/google/zxing/common/BitArray.java rename to src/zext/plantuml/com/google/zxing/common/BitArray.java index 4145f54c8..b8d795063 100644 --- a/src/ext/plantuml/com/google/zxing/common/BitArray.java +++ b/src/zext/plantuml/com/google/zxing/common/BitArray.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package ext.plantuml.com.google.zxing.common; +package zext.plantuml.com.google.zxing.common; /** *

A simple, fast array of bits, represented compactly by an array of ints internally.

diff --git a/src/ext/plantuml/com/google/zxing/common/BitMatrix.java b/src/zext/plantuml/com/google/zxing/common/BitMatrix.java similarity index 99% rename from src/ext/plantuml/com/google/zxing/common/BitMatrix.java rename to src/zext/plantuml/com/google/zxing/common/BitMatrix.java index 22712cb53..212d22f24 100644 --- a/src/ext/plantuml/com/google/zxing/common/BitMatrix.java +++ b/src/zext/plantuml/com/google/zxing/common/BitMatrix.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package ext.plantuml.com.google.zxing.common; +package zext.plantuml.com.google.zxing.common; /** *

Represents a 2D matrix of bits. In function arguments below, and throughout the common diff --git a/src/ext/plantuml/com/google/zxing/common/BitSource.java b/src/zext/plantuml/com/google/zxing/common/BitSource.java similarity index 98% rename from src/ext/plantuml/com/google/zxing/common/BitSource.java rename to src/zext/plantuml/com/google/zxing/common/BitSource.java index 50e39af77..c15f78afa 100644 --- a/src/ext/plantuml/com/google/zxing/common/BitSource.java +++ b/src/zext/plantuml/com/google/zxing/common/BitSource.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package ext.plantuml.com.google.zxing.common; +package zext.plantuml.com.google.zxing.common; /** *

This provides an easy abstraction to read bits at a time from a sequence of bytes, where the diff --git a/src/ext/plantuml/com/google/zxing/common/CharacterSetECI.java b/src/zext/plantuml/com/google/zxing/common/CharacterSetECI.java similarity index 98% rename from src/ext/plantuml/com/google/zxing/common/CharacterSetECI.java rename to src/zext/plantuml/com/google/zxing/common/CharacterSetECI.java index f8520734d..1b01e8ff0 100644 --- a/src/ext/plantuml/com/google/zxing/common/CharacterSetECI.java +++ b/src/zext/plantuml/com/google/zxing/common/CharacterSetECI.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package ext.plantuml.com.google.zxing.common; +package zext.plantuml.com.google.zxing.common; import java.util.Hashtable; diff --git a/src/ext/plantuml/com/google/zxing/common/DecoderResult.java b/src/zext/plantuml/com/google/zxing/common/DecoderResult.java similarity index 92% rename from src/ext/plantuml/com/google/zxing/common/DecoderResult.java rename to src/zext/plantuml/com/google/zxing/common/DecoderResult.java index 97884c86b..864509b9a 100644 --- a/src/ext/plantuml/com/google/zxing/common/DecoderResult.java +++ b/src/zext/plantuml/com/google/zxing/common/DecoderResult.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package ext.plantuml.com.google.zxing.common; +package zext.plantuml.com.google.zxing.common; import java.util.Vector; -import ext.plantuml.com.google.zxing.qrcode.decoder.ErrorCorrectionLevel; +import zext.plantuml.com.google.zxing.qrcode.decoder.ErrorCorrectionLevel; /** *

Encapsulates the result of decoding a matrix of bits. This typically diff --git a/src/ext/plantuml/com/google/zxing/common/DetectorResult.java b/src/zext/plantuml/com/google/zxing/common/DetectorResult.java similarity index 92% rename from src/ext/plantuml/com/google/zxing/common/DetectorResult.java rename to src/zext/plantuml/com/google/zxing/common/DetectorResult.java index d62d4b6dc..38ac8016f 100644 --- a/src/ext/plantuml/com/google/zxing/common/DetectorResult.java +++ b/src/zext/plantuml/com/google/zxing/common/DetectorResult.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package ext.plantuml.com.google.zxing.common; +package zext.plantuml.com.google.zxing.common; -import ext.plantuml.com.google.zxing.ResultPoint; +import zext.plantuml.com.google.zxing.ResultPoint; /** *

Encapsulates the result of detecting a barcode in an image. This includes the raw diff --git a/src/ext/plantuml/com/google/zxing/common/ECI.java b/src/zext/plantuml/com/google/zxing/common/ECI.java similarity index 96% rename from src/ext/plantuml/com/google/zxing/common/ECI.java rename to src/zext/plantuml/com/google/zxing/common/ECI.java index 5414732e1..8046cd179 100644 --- a/src/ext/plantuml/com/google/zxing/common/ECI.java +++ b/src/zext/plantuml/com/google/zxing/common/ECI.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package ext.plantuml.com.google.zxing.common; +package zext.plantuml.com.google.zxing.common; /** * Superclass of classes encapsulating types ECIs, according to "Extended Channel Interpretations" diff --git a/src/ext/plantuml/com/google/zxing/common/StringUtils.java b/src/zext/plantuml/com/google/zxing/common/StringUtils.java similarity index 98% rename from src/ext/plantuml/com/google/zxing/common/StringUtils.java rename to src/zext/plantuml/com/google/zxing/common/StringUtils.java index fbb516f61..d3d501ece 100644 --- a/src/ext/plantuml/com/google/zxing/common/StringUtils.java +++ b/src/zext/plantuml/com/google/zxing/common/StringUtils.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package ext.plantuml.com.google.zxing.common; +package zext.plantuml.com.google.zxing.common; import java.util.Hashtable; -import ext.plantuml.com.google.zxing.DecodeHintType; +import zext.plantuml.com.google.zxing.DecodeHintType; /** * Common string-related functions. diff --git a/src/ext/plantuml/com/google/zxing/common/reedsolomon/GF256.java b/src/zext/plantuml/com/google/zxing/common/reedsolomon/GF256.java similarity index 98% rename from src/ext/plantuml/com/google/zxing/common/reedsolomon/GF256.java rename to src/zext/plantuml/com/google/zxing/common/reedsolomon/GF256.java index 3a726ace1..2c3973b88 100644 --- a/src/ext/plantuml/com/google/zxing/common/reedsolomon/GF256.java +++ b/src/zext/plantuml/com/google/zxing/common/reedsolomon/GF256.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package ext.plantuml.com.google.zxing.common.reedsolomon; +package zext.plantuml.com.google.zxing.common.reedsolomon; /** *

This class contains utility methods for performing mathematical operations over diff --git a/src/ext/plantuml/com/google/zxing/common/reedsolomon/GF256Poly.java b/src/zext/plantuml/com/google/zxing/common/reedsolomon/GF256Poly.java similarity index 99% rename from src/ext/plantuml/com/google/zxing/common/reedsolomon/GF256Poly.java rename to src/zext/plantuml/com/google/zxing/common/reedsolomon/GF256Poly.java index 29992842f..f4be25bd8 100644 --- a/src/ext/plantuml/com/google/zxing/common/reedsolomon/GF256Poly.java +++ b/src/zext/plantuml/com/google/zxing/common/reedsolomon/GF256Poly.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package ext.plantuml.com.google.zxing.common.reedsolomon; +package zext.plantuml.com.google.zxing.common.reedsolomon; /** *

Represents a polynomial whose coefficients are elements of GF(256). diff --git a/src/ext/plantuml/com/google/zxing/common/reedsolomon/ReedSolomonEncoder.java b/src/zext/plantuml/com/google/zxing/common/reedsolomon/ReedSolomonEncoder.java similarity index 97% rename from src/ext/plantuml/com/google/zxing/common/reedsolomon/ReedSolomonEncoder.java rename to src/zext/plantuml/com/google/zxing/common/reedsolomon/ReedSolomonEncoder.java index bdc62c87e..f08a12ed1 100644 --- a/src/ext/plantuml/com/google/zxing/common/reedsolomon/ReedSolomonEncoder.java +++ b/src/zext/plantuml/com/google/zxing/common/reedsolomon/ReedSolomonEncoder.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package ext.plantuml.com.google.zxing.common.reedsolomon; +package zext.plantuml.com.google.zxing.common.reedsolomon; import java.util.Vector; diff --git a/src/ext/plantuml/com/google/zxing/common/reedsolomon/ReedSolomonException.java b/src/zext/plantuml/com/google/zxing/common/reedsolomon/ReedSolomonException.java similarity index 93% rename from src/ext/plantuml/com/google/zxing/common/reedsolomon/ReedSolomonException.java rename to src/zext/plantuml/com/google/zxing/common/reedsolomon/ReedSolomonException.java index 65301ef3f..de9eb5d55 100644 --- a/src/ext/plantuml/com/google/zxing/common/reedsolomon/ReedSolomonException.java +++ b/src/zext/plantuml/com/google/zxing/common/reedsolomon/ReedSolomonException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package ext.plantuml.com.google.zxing.common.reedsolomon; +package zext.plantuml.com.google.zxing.common.reedsolomon; /** *

Thrown when an exception occurs during Reed-Solomon decoding, such as when diff --git a/src/ext/plantuml/com/google/zxing/datamatrix/decoder/BitMatrixParser.java b/src/zext/plantuml/com/google/zxing/datamatrix/decoder/BitMatrixParser.java similarity index 98% rename from src/ext/plantuml/com/google/zxing/datamatrix/decoder/BitMatrixParser.java rename to src/zext/plantuml/com/google/zxing/datamatrix/decoder/BitMatrixParser.java index 545e6332a..1d3e82147 100644 --- a/src/ext/plantuml/com/google/zxing/datamatrix/decoder/BitMatrixParser.java +++ b/src/zext/plantuml/com/google/zxing/datamatrix/decoder/BitMatrixParser.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package ext.plantuml.com.google.zxing.datamatrix.decoder; +package zext.plantuml.com.google.zxing.datamatrix.decoder; -import ext.plantuml.com.google.zxing.FormatException; -import ext.plantuml.com.google.zxing.common.BitMatrix; +import zext.plantuml.com.google.zxing.FormatException; +import zext.plantuml.com.google.zxing.common.BitMatrix; /** * @author bbrown@google.com (Brian Brown) diff --git a/src/ext/plantuml/com/google/zxing/datamatrix/decoder/DataBlock.java b/src/zext/plantuml/com/google/zxing/datamatrix/decoder/DataBlock.java similarity index 98% rename from src/ext/plantuml/com/google/zxing/datamatrix/decoder/DataBlock.java rename to src/zext/plantuml/com/google/zxing/datamatrix/decoder/DataBlock.java index 21a8d203f..5555b0f6c 100644 --- a/src/ext/plantuml/com/google/zxing/datamatrix/decoder/DataBlock.java +++ b/src/zext/plantuml/com/google/zxing/datamatrix/decoder/DataBlock.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package ext.plantuml.com.google.zxing.datamatrix.decoder; +package zext.plantuml.com.google.zxing.datamatrix.decoder; /** *

Encapsulates a block of data within a Data Matrix Code. Data Matrix Codes may split their data into diff --git a/src/ext/plantuml/com/google/zxing/datamatrix/decoder/Version.java b/src/zext/plantuml/com/google/zxing/datamatrix/decoder/Version.java similarity index 98% rename from src/ext/plantuml/com/google/zxing/datamatrix/decoder/Version.java rename to src/zext/plantuml/com/google/zxing/datamatrix/decoder/Version.java index 94c9f1783..a2c2c6f45 100644 --- a/src/ext/plantuml/com/google/zxing/datamatrix/decoder/Version.java +++ b/src/zext/plantuml/com/google/zxing/datamatrix/decoder/Version.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package ext.plantuml.com.google.zxing.datamatrix.decoder; +package zext.plantuml.com.google.zxing.datamatrix.decoder; -import ext.plantuml.com.google.zxing.FormatException; +import zext.plantuml.com.google.zxing.FormatException; /** * The Version object encapsulates attributes about a particular diff --git a/src/ext/plantuml/com/google/zxing/package-info.java b/src/zext/plantuml/com/google/zxing/package-info.java similarity index 90% rename from src/ext/plantuml/com/google/zxing/package-info.java rename to src/zext/plantuml/com/google/zxing/package-info.java index a2d28d364..bd1914a8b 100644 --- a/src/ext/plantuml/com/google/zxing/package-info.java +++ b/src/zext/plantuml/com/google/zxing/package-info.java @@ -13,4 +13,4 @@ * @see net.sourceforge.plantuml.flashcode * */ -package ext.plantuml.com.google.zxing; +package zext.plantuml.com.google.zxing; diff --git a/src/ext/plantuml/com/google/zxing/qrcode/QRCodeWriter.java b/src/zext/plantuml/com/google/zxing/qrcode/QRCodeWriter.java similarity index 85% rename from src/ext/plantuml/com/google/zxing/qrcode/QRCodeWriter.java rename to src/zext/plantuml/com/google/zxing/qrcode/QRCodeWriter.java index be6e8e1f3..53b7f010c 100644 --- a/src/ext/plantuml/com/google/zxing/qrcode/QRCodeWriter.java +++ b/src/zext/plantuml/com/google/zxing/qrcode/QRCodeWriter.java @@ -14,19 +14,19 @@ * limitations under the License. */ -package ext.plantuml.com.google.zxing.qrcode; +package zext.plantuml.com.google.zxing.qrcode; import java.util.Hashtable; -import ext.plantuml.com.google.zxing.BarcodeFormat; -import ext.plantuml.com.google.zxing.EncodeHintType; -import ext.plantuml.com.google.zxing.Writer; -import ext.plantuml.com.google.zxing.WriterException; -import ext.plantuml.com.google.zxing.common.BitMatrix; -import ext.plantuml.com.google.zxing.qrcode.decoder.ErrorCorrectionLevel; -import ext.plantuml.com.google.zxing.qrcode.encoder.ByteMatrix; -import ext.plantuml.com.google.zxing.qrcode.encoder.Encoder; -import ext.plantuml.com.google.zxing.qrcode.encoder.QRCode; +import zext.plantuml.com.google.zxing.BarcodeFormat; +import zext.plantuml.com.google.zxing.EncodeHintType; +import zext.plantuml.com.google.zxing.Writer; +import zext.plantuml.com.google.zxing.WriterException; +import zext.plantuml.com.google.zxing.common.BitMatrix; +import zext.plantuml.com.google.zxing.qrcode.decoder.ErrorCorrectionLevel; +import zext.plantuml.com.google.zxing.qrcode.encoder.ByteMatrix; +import zext.plantuml.com.google.zxing.qrcode.encoder.Encoder; +import zext.plantuml.com.google.zxing.qrcode.encoder.QRCode; /** * This object renders a QR Code as a BitMatrix 2D array of greyscale values. diff --git a/src/ext/plantuml/com/google/zxing/qrcode/decoder/BitMatrixParser.java b/src/zext/plantuml/com/google/zxing/qrcode/decoder/BitMatrixParser.java similarity index 97% rename from src/ext/plantuml/com/google/zxing/qrcode/decoder/BitMatrixParser.java rename to src/zext/plantuml/com/google/zxing/qrcode/decoder/BitMatrixParser.java index 3fe58c24d..3426a5ca1 100644 --- a/src/ext/plantuml/com/google/zxing/qrcode/decoder/BitMatrixParser.java +++ b/src/zext/plantuml/com/google/zxing/qrcode/decoder/BitMatrixParser.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package ext.plantuml.com.google.zxing.qrcode.decoder; +package zext.plantuml.com.google.zxing.qrcode.decoder; -import ext.plantuml.com.google.zxing.FormatException; -import ext.plantuml.com.google.zxing.common.BitMatrix; +import zext.plantuml.com.google.zxing.FormatException; +import zext.plantuml.com.google.zxing.common.BitMatrix; /** * @author Sean Owen diff --git a/src/ext/plantuml/com/google/zxing/qrcode/decoder/DataBlock.java b/src/zext/plantuml/com/google/zxing/qrcode/decoder/DataBlock.java similarity index 98% rename from src/ext/plantuml/com/google/zxing/qrcode/decoder/DataBlock.java rename to src/zext/plantuml/com/google/zxing/qrcode/decoder/DataBlock.java index b6f673cd0..00c932f6d 100644 --- a/src/ext/plantuml/com/google/zxing/qrcode/decoder/DataBlock.java +++ b/src/zext/plantuml/com/google/zxing/qrcode/decoder/DataBlock.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package ext.plantuml.com.google.zxing.qrcode.decoder; +package zext.plantuml.com.google.zxing.qrcode.decoder; /** *

Encapsulates a block of data within a QR Code. QR Codes may split their data into diff --git a/src/ext/plantuml/com/google/zxing/qrcode/decoder/DataMask.java b/src/zext/plantuml/com/google/zxing/qrcode/decoder/DataMask.java similarity index 97% rename from src/ext/plantuml/com/google/zxing/qrcode/decoder/DataMask.java rename to src/zext/plantuml/com/google/zxing/qrcode/decoder/DataMask.java index 85e96e72c..475cd4326 100644 --- a/src/ext/plantuml/com/google/zxing/qrcode/decoder/DataMask.java +++ b/src/zext/plantuml/com/google/zxing/qrcode/decoder/DataMask.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package ext.plantuml.com.google.zxing.qrcode.decoder; +package zext.plantuml.com.google.zxing.qrcode.decoder; -import ext.plantuml.com.google.zxing.common.BitMatrix; +import zext.plantuml.com.google.zxing.common.BitMatrix; /** *

Encapsulates data masks for the data bits in a QR code, per ISO 18004:2006 6.8. Implementations diff --git a/src/ext/plantuml/com/google/zxing/qrcode/decoder/ErrorCorrectionLevel.java b/src/zext/plantuml/com/google/zxing/qrcode/decoder/ErrorCorrectionLevel.java similarity index 97% rename from src/ext/plantuml/com/google/zxing/qrcode/decoder/ErrorCorrectionLevel.java rename to src/zext/plantuml/com/google/zxing/qrcode/decoder/ErrorCorrectionLevel.java index 61760cc09..6eef3588e 100644 --- a/src/ext/plantuml/com/google/zxing/qrcode/decoder/ErrorCorrectionLevel.java +++ b/src/zext/plantuml/com/google/zxing/qrcode/decoder/ErrorCorrectionLevel.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package ext.plantuml.com.google.zxing.qrcode.decoder; +package zext.plantuml.com.google.zxing.qrcode.decoder; /** *

See ISO 18004:2006, 6.5.1. This enum encapsulates the four error correction levels diff --git a/src/ext/plantuml/com/google/zxing/qrcode/decoder/FormatInformation.java b/src/zext/plantuml/com/google/zxing/qrcode/decoder/FormatInformation.java similarity index 99% rename from src/ext/plantuml/com/google/zxing/qrcode/decoder/FormatInformation.java rename to src/zext/plantuml/com/google/zxing/qrcode/decoder/FormatInformation.java index 6ae6bb9bb..48f54308e 100644 --- a/src/ext/plantuml/com/google/zxing/qrcode/decoder/FormatInformation.java +++ b/src/zext/plantuml/com/google/zxing/qrcode/decoder/FormatInformation.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package ext.plantuml.com.google.zxing.qrcode.decoder; +package zext.plantuml.com.google.zxing.qrcode.decoder; /** *

Encapsulates a QR Code's format information, including the data mask used and diff --git a/src/ext/plantuml/com/google/zxing/qrcode/decoder/Mode.java b/src/zext/plantuml/com/google/zxing/qrcode/decoder/Mode.java similarity index 98% rename from src/ext/plantuml/com/google/zxing/qrcode/decoder/Mode.java rename to src/zext/plantuml/com/google/zxing/qrcode/decoder/Mode.java index 882a5c6ff..504e5da2f 100644 --- a/src/ext/plantuml/com/google/zxing/qrcode/decoder/Mode.java +++ b/src/zext/plantuml/com/google/zxing/qrcode/decoder/Mode.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package ext.plantuml.com.google.zxing.qrcode.decoder; +package zext.plantuml.com.google.zxing.qrcode.decoder; /** *

See ISO 18004:2006, 6.4.1, Tables 2 and 3. This enum encapsulates the various modes in which diff --git a/src/ext/plantuml/com/google/zxing/qrcode/decoder/Version.java b/src/zext/plantuml/com/google/zxing/qrcode/decoder/Version.java similarity index 99% rename from src/ext/plantuml/com/google/zxing/qrcode/decoder/Version.java rename to src/zext/plantuml/com/google/zxing/qrcode/decoder/Version.java index 93b073281..906233518 100644 --- a/src/ext/plantuml/com/google/zxing/qrcode/decoder/Version.java +++ b/src/zext/plantuml/com/google/zxing/qrcode/decoder/Version.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package ext.plantuml.com.google.zxing.qrcode.decoder; +package zext.plantuml.com.google.zxing.qrcode.decoder; -import ext.plantuml.com.google.zxing.FormatException; -import ext.plantuml.com.google.zxing.common.BitMatrix; +import zext.plantuml.com.google.zxing.FormatException; +import zext.plantuml.com.google.zxing.common.BitMatrix; /** * See ISO 18004:2006 Annex D diff --git a/src/ext/plantuml/com/google/zxing/qrcode/encoder/BlockPair.java b/src/zext/plantuml/com/google/zxing/qrcode/encoder/BlockPair.java similarity index 94% rename from src/ext/plantuml/com/google/zxing/qrcode/encoder/BlockPair.java rename to src/zext/plantuml/com/google/zxing/qrcode/encoder/BlockPair.java index b0e031213..1acf3a9b9 100644 --- a/src/ext/plantuml/com/google/zxing/qrcode/encoder/BlockPair.java +++ b/src/zext/plantuml/com/google/zxing/qrcode/encoder/BlockPair.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package ext.plantuml.com.google.zxing.qrcode.encoder; +package zext.plantuml.com.google.zxing.qrcode.encoder; final class BlockPair { diff --git a/src/ext/plantuml/com/google/zxing/qrcode/encoder/ByteMatrix.java b/src/zext/plantuml/com/google/zxing/qrcode/encoder/ByteMatrix.java similarity index 97% rename from src/ext/plantuml/com/google/zxing/qrcode/encoder/ByteMatrix.java rename to src/zext/plantuml/com/google/zxing/qrcode/encoder/ByteMatrix.java index e8c7e444e..e99b7e88b 100644 --- a/src/ext/plantuml/com/google/zxing/qrcode/encoder/ByteMatrix.java +++ b/src/zext/plantuml/com/google/zxing/qrcode/encoder/ByteMatrix.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package ext.plantuml.com.google.zxing.qrcode.encoder; +package zext.plantuml.com.google.zxing.qrcode.encoder; /** * A class which wraps a 2D array of bytes. The default usage is signed. If you want to use it as a diff --git a/src/ext/plantuml/com/google/zxing/qrcode/encoder/Encoder.java b/src/zext/plantuml/com/google/zxing/qrcode/encoder/Encoder.java similarity index 96% rename from src/ext/plantuml/com/google/zxing/qrcode/encoder/Encoder.java rename to src/zext/plantuml/com/google/zxing/qrcode/encoder/Encoder.java index 04ea0b667..c1fc1eb2b 100644 --- a/src/ext/plantuml/com/google/zxing/qrcode/encoder/Encoder.java +++ b/src/zext/plantuml/com/google/zxing/qrcode/encoder/Encoder.java @@ -14,22 +14,22 @@ * limitations under the License. */ -package ext.plantuml.com.google.zxing.qrcode.encoder; +package zext.plantuml.com.google.zxing.qrcode.encoder; import java.io.UnsupportedEncodingException; import java.util.Hashtable; import java.util.Vector; -import ext.plantuml.com.google.zxing.EncodeHintType; -import ext.plantuml.com.google.zxing.WriterException; -import ext.plantuml.com.google.zxing.common.BitArray; -import ext.plantuml.com.google.zxing.common.CharacterSetECI; -import ext.plantuml.com.google.zxing.common.ECI; -import ext.plantuml.com.google.zxing.common.reedsolomon.GF256; -import ext.plantuml.com.google.zxing.common.reedsolomon.ReedSolomonEncoder; -import ext.plantuml.com.google.zxing.qrcode.decoder.ErrorCorrectionLevel; -import ext.plantuml.com.google.zxing.qrcode.decoder.Mode; -import ext.plantuml.com.google.zxing.qrcode.decoder.Version; +import zext.plantuml.com.google.zxing.EncodeHintType; +import zext.plantuml.com.google.zxing.WriterException; +import zext.plantuml.com.google.zxing.common.BitArray; +import zext.plantuml.com.google.zxing.common.CharacterSetECI; +import zext.plantuml.com.google.zxing.common.ECI; +import zext.plantuml.com.google.zxing.common.reedsolomon.GF256; +import zext.plantuml.com.google.zxing.common.reedsolomon.ReedSolomonEncoder; +import zext.plantuml.com.google.zxing.qrcode.decoder.ErrorCorrectionLevel; +import zext.plantuml.com.google.zxing.qrcode.decoder.Mode; +import zext.plantuml.com.google.zxing.qrcode.decoder.Version; /** * @author satorux@google.com (Satoru Takabayashi) - creator diff --git a/src/ext/plantuml/com/google/zxing/qrcode/encoder/MaskUtil.java b/src/zext/plantuml/com/google/zxing/qrcode/encoder/MaskUtil.java similarity index 99% rename from src/ext/plantuml/com/google/zxing/qrcode/encoder/MaskUtil.java rename to src/zext/plantuml/com/google/zxing/qrcode/encoder/MaskUtil.java index 4ccd48b6f..cb3c5bb36 100644 --- a/src/ext/plantuml/com/google/zxing/qrcode/encoder/MaskUtil.java +++ b/src/zext/plantuml/com/google/zxing/qrcode/encoder/MaskUtil.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package ext.plantuml.com.google.zxing.qrcode.encoder; +package zext.plantuml.com.google.zxing.qrcode.encoder; /** * @author satorux@google.com (Satoru Takabayashi) - creator diff --git a/src/ext/plantuml/com/google/zxing/qrcode/encoder/MatrixUtil.java b/src/zext/plantuml/com/google/zxing/qrcode/encoder/MatrixUtil.java similarity index 98% rename from src/ext/plantuml/com/google/zxing/qrcode/encoder/MatrixUtil.java rename to src/zext/plantuml/com/google/zxing/qrcode/encoder/MatrixUtil.java index bbf1c2245..d755bddf5 100644 --- a/src/ext/plantuml/com/google/zxing/qrcode/encoder/MatrixUtil.java +++ b/src/zext/plantuml/com/google/zxing/qrcode/encoder/MatrixUtil.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package ext.plantuml.com.google.zxing.qrcode.encoder; +package zext.plantuml.com.google.zxing.qrcode.encoder; -import ext.plantuml.com.google.zxing.WriterException; -import ext.plantuml.com.google.zxing.common.BitArray; -import ext.plantuml.com.google.zxing.qrcode.decoder.ErrorCorrectionLevel; +import zext.plantuml.com.google.zxing.WriterException; +import zext.plantuml.com.google.zxing.common.BitArray; +import zext.plantuml.com.google.zxing.qrcode.decoder.ErrorCorrectionLevel; /** * @author satorux@google.com (Satoru Takabayashi) - creator diff --git a/src/ext/plantuml/com/google/zxing/qrcode/encoder/QRCode.java b/src/zext/plantuml/com/google/zxing/qrcode/encoder/QRCode.java similarity index 97% rename from src/ext/plantuml/com/google/zxing/qrcode/encoder/QRCode.java rename to src/zext/plantuml/com/google/zxing/qrcode/encoder/QRCode.java index dae3e1dc4..cc9baa239 100644 --- a/src/ext/plantuml/com/google/zxing/qrcode/encoder/QRCode.java +++ b/src/zext/plantuml/com/google/zxing/qrcode/encoder/QRCode.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package ext.plantuml.com.google.zxing.qrcode.encoder; +package zext.plantuml.com.google.zxing.qrcode.encoder; -import ext.plantuml.com.google.zxing.qrcode.decoder.ErrorCorrectionLevel; -import ext.plantuml.com.google.zxing.qrcode.decoder.Mode; +import zext.plantuml.com.google.zxing.qrcode.decoder.ErrorCorrectionLevel; +import zext.plantuml.com.google.zxing.qrcode.decoder.Mode; /** * @author satorux@google.com (Satoru Takabayashi) - creator From b74f9634fbaa040352e319e9bf0a3a11e95ef3b7 Mon Sep 17 00:00:00 2001 From: Arnaud Roques Date: Sun, 19 Nov 2023 11:34:16 +0100 Subject: [PATCH 08/95] chore: restore lost readme.md files --- src/zext/plantuml/com/ctreber/acearth/readme.md | 12 ++++++++++++ src/zext/plantuml/com/google/zxing/readme.md | 15 +++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 src/zext/plantuml/com/ctreber/acearth/readme.md create mode 100644 src/zext/plantuml/com/google/zxing/readme.md diff --git a/src/zext/plantuml/com/ctreber/acearth/readme.md b/src/zext/plantuml/com/ctreber/acearth/readme.md new file mode 100644 index 000000000..2fc76d570 --- /dev/null +++ b/src/zext/plantuml/com/ctreber/acearth/readme.md @@ -0,0 +1,12 @@ +> [!WARNING] +> **Disclaimer**: +> This file was not part of the original package. +> It was included only on the PlantUML package to provide source citation and documentation. + +# Directory Documentation for `acearth` + +## Description +Internal copy of `AC.earth` - `XEarth` for Java _(code of Christian Treber)_. + +## See more information on +- [readme of `plantuml/acearth`](../../../../../net/sourceforge/plantuml/acearth/readme.md) diff --git a/src/zext/plantuml/com/google/zxing/readme.md b/src/zext/plantuml/com/google/zxing/readme.md new file mode 100644 index 000000000..fb27815b3 --- /dev/null +++ b/src/zext/plantuml/com/google/zxing/readme.md @@ -0,0 +1,15 @@ +> [!WARNING] +> **Disclaimer**: +> This file was not part of the original package. +> It was included only on the PlantUML package to provide source citation and documentation. + +# Directory Documentation for `zxing` + +## Description +Internal copy of `ZXing` _(code of Google)_. + +## Credit +- :octocat: [zxing/zxing](https://github.com/zxing/zxing) + +## See more information on +- [readme of `plantuml/flashcode`](../../../../../net/sourceforge/plantuml/flashcode/readme.md) From aea7e540aceba0a9d244923ab54efceccb1ac1f3 Mon Sep 17 00:00:00 2001 From: Arnaud Roques Date: Sun, 19 Nov 2023 11:48:47 +0100 Subject: [PATCH 09/95] chore: delete last ext files --- src/ext/plantuml/com/ctreber/acearth/readme.md | 12 ------------ src/ext/plantuml/com/google/zxing/readme.md | 15 --------------- 2 files changed, 27 deletions(-) delete mode 100644 src/ext/plantuml/com/ctreber/acearth/readme.md delete mode 100644 src/ext/plantuml/com/google/zxing/readme.md diff --git a/src/ext/plantuml/com/ctreber/acearth/readme.md b/src/ext/plantuml/com/ctreber/acearth/readme.md deleted file mode 100644 index 2fc76d570..000000000 --- a/src/ext/plantuml/com/ctreber/acearth/readme.md +++ /dev/null @@ -1,12 +0,0 @@ -> [!WARNING] -> **Disclaimer**: -> This file was not part of the original package. -> It was included only on the PlantUML package to provide source citation and documentation. - -# Directory Documentation for `acearth` - -## Description -Internal copy of `AC.earth` - `XEarth` for Java _(code of Christian Treber)_. - -## See more information on -- [readme of `plantuml/acearth`](../../../../../net/sourceforge/plantuml/acearth/readme.md) diff --git a/src/ext/plantuml/com/google/zxing/readme.md b/src/ext/plantuml/com/google/zxing/readme.md deleted file mode 100644 index fb27815b3..000000000 --- a/src/ext/plantuml/com/google/zxing/readme.md +++ /dev/null @@ -1,15 +0,0 @@ -> [!WARNING] -> **Disclaimer**: -> This file was not part of the original package. -> It was included only on the PlantUML package to provide source citation and documentation. - -# Directory Documentation for `zxing` - -## Description -Internal copy of `ZXing` _(code of Google)_. - -## Credit -- :octocat: [zxing/zxing](https://github.com/zxing/zxing) - -## See more information on -- [readme of `plantuml/flashcode`](../../../../../net/sourceforge/plantuml/flashcode/readme.md) From d5e42c9d7ee11515b6e77c27b982cf0e79c884ee Mon Sep 17 00:00:00 2001 From: The-Lum <86879521+The-Lum@users.noreply.github.com> Date: Sun, 19 Nov 2023 14:38:44 +0000 Subject: [PATCH 10/95] fix: change `readme.md` to `zext` dir --- src/{ext => zext}/plantuml/com/ctreber/readme.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/{ext => zext}/plantuml/com/ctreber/readme.md (100%) diff --git a/src/ext/plantuml/com/ctreber/readme.md b/src/zext/plantuml/com/ctreber/readme.md similarity index 100% rename from src/ext/plantuml/com/ctreber/readme.md rename to src/zext/plantuml/com/ctreber/readme.md From 54117a5e8ba0fe9d322a16201b9fbb4138afdfa3 Mon Sep 17 00:00:00 2001 From: The-Lum <86879521+The-Lum@users.noreply.github.com> Date: Sun, 19 Nov 2023 15:10:09 +0000 Subject: [PATCH 11/95] fix: fix some links to `zext` instead of `ext`. --- src/net/sourceforge/plantuml/acearth/package-info.java | 2 +- src/net/sourceforge/plantuml/acearth/readme.md | 4 ++-- src/net/sourceforge/plantuml/flashcode/package-info.java | 2 +- src/net/sourceforge/plantuml/flashcode/readme.md | 2 +- src/zext/plantuml/com/ctreber/acearth/package-info.java | 2 +- src/zext/plantuml/com/ctreber/acearth/scanbit/ScanBit.java | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/net/sourceforge/plantuml/acearth/package-info.java b/src/net/sourceforge/plantuml/acearth/package-info.java index ff8536d87..26683cf61 100644 --- a/src/net/sourceforge/plantuml/acearth/package-info.java +++ b/src/net/sourceforge/plantuml/acearth/package-info.java @@ -3,6 +3,6 @@ * * XEarth Image. * - * @see ext.plantuml.com.ctreber.acearth + * @see zext.plantuml.com.ctreber.acearth */ package net.sourceforge.plantuml.acearth; diff --git a/src/net/sourceforge/plantuml/acearth/readme.md b/src/net/sourceforge/plantuml/acearth/readme.md index a369bb7a5..e5d8f1c1a 100644 --- a/src/net/sourceforge/plantuml/acearth/readme.md +++ b/src/net/sourceforge/plantuml/acearth/readme.md @@ -3,7 +3,7 @@ ## Description This package provides classes used to generate [XEarth Image](https://plantuml.com/xearth). -The Java port of `XEarth` used in `PlantUML` is the [`AC.earth` of Christian Treber](../../../../ext/plantuml/com/ctreber/acearth/). +The Java port of `XEarth` used in `PlantUML` is the [`AC.earth` of Christian Treber](../../../../zext/plantuml/com/ctreber/acearth/). ## Link - [XEarth Image _(on `PlantUML`)_](https://plantuml.com/xearth) @@ -13,7 +13,7 @@ The Java port of `XEarth` used in `PlantUML` is the [`AC.earth` of Christian Tre - [`xearth` for Windows of Greg Hewgill](https://hewgill.com/xearth/) ## Credit -- [`AC.earth` of Christian Treber](../../../../ext/plantuml/com/ctreber/acearth/) +- [`AC.earth` of Christian Treber](../../../../zext/plantuml/com/ctreber/acearth/) - [AC Earth _(on Web Archive)_](https://web.archive.org/web/20180428011447/http://www.acproductions.de/acearth) ## Misc. diff --git a/src/net/sourceforge/plantuml/flashcode/package-info.java b/src/net/sourceforge/plantuml/flashcode/package-info.java index e016dc1c9..1d995313b 100644 --- a/src/net/sourceforge/plantuml/flashcode/package-info.java +++ b/src/net/sourceforge/plantuml/flashcode/package-info.java @@ -2,7 +2,7 @@ * Provides classes used to manage * Flashcode especially QR Code (on PlantUML). * - * @see ext.plantuml.com.google.zxing + * @see zext.plantuml.com.google.zxing * @see net.sourceforge.plantuml.klimt.creole.atom.AtomImg#createQrcode */ package net.sourceforge.plantuml.flashcode; diff --git a/src/net/sourceforge/plantuml/flashcode/readme.md b/src/net/sourceforge/plantuml/flashcode/readme.md index 5d49c3123..eac30f0ae 100644 --- a/src/net/sourceforge/plantuml/flashcode/readme.md +++ b/src/net/sourceforge/plantuml/flashcode/readme.md @@ -8,7 +8,7 @@ This package provides classes used to manage Flashcode especially QR Code (on Pl - [QR code _(on Wikipedia)_](https://en.wikipedia.org/wiki/QR_code) ## Credit -- [`com.google.zxing`](../../../../ext/plantuml/com/google/zxing/) _(included in PlantUML)_ +- [`com.google.zxing`](../../../../zext/plantuml/com/google/zxing/) _(included in PlantUML)_ - :octocat: [zxing/zxing](https://github.com/zxing/zxing) ## Misc. diff --git a/src/zext/plantuml/com/ctreber/acearth/package-info.java b/src/zext/plantuml/com/ctreber/acearth/package-info.java index b0da411ce..89c59c62e 100644 --- a/src/zext/plantuml/com/ctreber/acearth/package-info.java +++ b/src/zext/plantuml/com/ctreber/acearth/package-info.java @@ -9,7 +9,7 @@ * Internal copy of AC.earth - XEarth * for Java (code of Christian Treber). * - * @see ext.plantuml.com.ctreber.acearth.ACearth + * @see zext.plantuml.com.ctreber.acearth.ACearth * @see net.sourceforge.plantuml.acearth * */ diff --git a/src/zext/plantuml/com/ctreber/acearth/scanbit/ScanBit.java b/src/zext/plantuml/com/ctreber/acearth/scanbit/ScanBit.java index 13367fe0f..e101629ec 100644 --- a/src/zext/plantuml/com/ctreber/acearth/scanbit/ScanBit.java +++ b/src/zext/plantuml/com/ctreber/acearth/scanbit/ScanBit.java @@ -53,7 +53,7 @@ public class ScanBit implements Comparable /** *

See values for - * @see ext.plantuml.com.ctreber.acearth.util.Polygon + * @see zext.plantuml.com.ctreber.acearth.util.Polygon */ public int getType() { From 37714ac1e20cd232200151193996895d4a11c328 Mon Sep 17 00:00:00 2001 From: The-Lum <86879521+The-Lum@users.noreply.github.com> Date: Sun, 19 Nov 2023 15:37:20 +0000 Subject: [PATCH 12/95] docs: add `package-info.java` and `readme.md` (for `klimt/sprite`) --- .../plantuml/klimt/sprite/package-info.java | 10 ++++++++++ .../sourceforge/plantuml/klimt/sprite/readme.md | 14 ++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 src/net/sourceforge/plantuml/klimt/sprite/package-info.java create mode 100644 src/net/sourceforge/plantuml/klimt/sprite/readme.md diff --git a/src/net/sourceforge/plantuml/klimt/sprite/package-info.java b/src/net/sourceforge/plantuml/klimt/sprite/package-info.java new file mode 100644 index 000000000..53dd54d25 --- /dev/null +++ b/src/net/sourceforge/plantuml/klimt/sprite/package-info.java @@ -0,0 +1,10 @@ +/** + * Provides classes used to manage + * + * Sprite. + * + * @see net.sourceforge.plantuml.klimt.sprite.CommandListSprite + * @see net.sourceforge.plantuml.klimt.sprite.CommandStdlib + * + */ +package net.sourceforge.plantuml.klimt.sprite; diff --git a/src/net/sourceforge/plantuml/klimt/sprite/readme.md b/src/net/sourceforge/plantuml/klimt/sprite/readme.md new file mode 100644 index 000000000..314f10af7 --- /dev/null +++ b/src/net/sourceforge/plantuml/klimt/sprite/readme.md @@ -0,0 +1,14 @@ +# Directory Documentation for `sprite` + +## Description +This package provides classes used to manage [PlantUML Sprite](https://plantuml.com/sprite). + +## Link +- [PlantUML Sprite](https://plantuml.com/sprite) + +## Reference + +## See also +- [PlantUML Standard Library](https://plantuml.com/stdlib) +- [`stdlib`](../../../../../../stdlib/) +- :octocat: [plantuml/plantuml-stdlib](https://github.com/plantuml/plantuml-stdlib) From 8b5a1521e713c1637385251849dda47cd9dea2b0 Mon Sep 17 00:00:00 2001 From: Arnaud Roques Date: Thu, 23 Nov 2023 17:50:00 +0100 Subject: [PATCH 13/95] fix: several Gantt improvement https://forum.plantuml.net/18397/gantt-how-handle-resource-starts-terminates-specific-date https://forum.plantuml.net/17571/is-it-possible-to-set-gantt-tasks-to-be-incomplete-by-default?show=17571#q17571 https://forum.plantuml.net/18128/gantt-diagram-vertical-separator-styling?show=18128#q18128 --- gradle.properties | 2 +- skin/plantuml.skin | 5 + src/net/sourceforge/plantuml/OptionPrint.java | 130 ++++++++--------- .../plantuml/project/ConstantPlan.java | 6 + .../plantuml/project/GanttDiagram.java | 48 +++++- .../plantuml/project/GanttDiagramFactory.java | 2 + .../plantuml/project/LoadPlanable.java | 2 + .../plantuml/project/OpenClose.java | 25 ++++ .../plantuml/project/PlanUtils.java | 18 +++ .../project/TimeHeaderParameters.java | 13 +- .../project/command/CommandPrintBetween.java | 2 +- .../command/CommandTaskCompleteDefault.java | 84 +++++++++++ .../plantuml/project/core/Resource.java | 13 ++ .../plantuml/project/core/Task.java | 2 + .../plantuml/project/core/TaskGroup.java | 20 +++ .../plantuml/project/core/TaskImpl.java | 45 +++++- .../plantuml/project/core/TaskSeparator.java | 19 +++ .../plantuml/project/draw/ResourceDraw.java | 91 +----------- .../project/draw/ResourceDrawBasicImpl.java | 132 +++++++++++++++++ .../project/draw/ResourceDrawVersion2.java | 138 ++++++++++++++++++ .../project/draw/TaskDrawRegular.java | 6 +- .../plantuml/project/draw/TimeHeader.java | 66 ++++----- .../project/draw/TimeHeaderCalendar.java | 14 +- .../project/draw/TimeHeaderDaily.java | 30 ++-- .../project/draw/TimeHeaderMonthly.java | 41 +++--- .../project/draw/TimeHeaderQuarterly.java | 41 +++--- .../project/draw/TimeHeaderSimple.java | 55 +++---- .../project/draw/TimeHeaderWeekly.java | 36 ++--- .../project/draw/TimeHeaderYearly.java | 25 ++-- .../plantuml/project/lang/ComplementDate.java | 48 ++++-- .../project/lang/SentenceHappensDate.java | 2 +- .../project/lang/SentencePausesDate.java | 2 +- .../lang/SentenceTaskEndsAbsolute.java | 2 +- .../lang/SentenceTaskStartsAbsolute.java | 4 +- .../lang/SentenceTaskStartsOnlyRelative.java | 58 ++++++++ .../plantuml/project/lang/SubjectProject.java | 2 +- .../project/lang/SubjectResource.java | 39 ++++- .../project/lang/SubjectSeparator.java | 4 +- .../plantuml/project/lang/SubjectTask.java | 10 +- .../plantuml/project/lang/SubjectToday.java | 2 +- .../plantuml/project/lang/Verbs.java | 16 ++ .../solver/ImpossibleSolvingException.java | 44 ++++++ .../plantuml/project/solver/SolverImpl.java | 11 +- src/net/sourceforge/plantuml/style/SName.java | 3 +- .../sourceforge/plantuml/version/Version.java | 2 +- 45 files changed, 984 insertions(+), 376 deletions(-) create mode 100644 src/net/sourceforge/plantuml/project/command/CommandTaskCompleteDefault.java create mode 100644 src/net/sourceforge/plantuml/project/draw/ResourceDrawBasicImpl.java create mode 100644 src/net/sourceforge/plantuml/project/draw/ResourceDrawVersion2.java create mode 100644 src/net/sourceforge/plantuml/project/lang/SentenceTaskStartsOnlyRelative.java create mode 100644 src/net/sourceforge/plantuml/project/solver/ImpossibleSolvingException.java diff --git a/gradle.properties b/gradle.properties index b1f62183a..2318ed74a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -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.13beta2 +version = 1.2023.13beta3 org.gradle.workers.max = 3 \ No newline at end of file diff --git a/skin/plantuml.skin b/skin/plantuml.skin index 9f7920474..ecba3aa67 100644 --- a/skin/plantuml.skin +++ b/skin/plantuml.skin @@ -367,6 +367,11 @@ ganttDiagram { Margin 5 Padding 5 } + verticalSeparator { + LineThickness 2 + LineStyle 2-2 + LineColor black + } timeline { BackgroundColor transparent LineColor #C0C0C0 diff --git a/src/net/sourceforge/plantuml/OptionPrint.java b/src/net/sourceforge/plantuml/OptionPrint.java index df6938de7..984b8db51 100644 --- a/src/net/sourceforge/plantuml/OptionPrint.java +++ b/src/net/sourceforge/plantuml/OptionPrint.java @@ -85,83 +85,77 @@ public class OptionPrint { System.out.println("\t?\tone and only one character but '" + SFile.separator + "'"); System.out.println("\t**\tmeans any characters (used to recurse through directories)"); System.out.println(); - System.out.println("where options include:"); - System.out.println(" -darkmode\t\tTo use dark mode for diagrams"); - System.out.println(" -gui\t\tTo run the graphical user interface"); - System.out.println(" -tpng\t\tTo generate images using PNG format (default)"); - System.out.println(" -tsvg\t\tTo generate images using SVG format"); - System.out.println(" -teps\t\tTo generate images using EPS format"); - System.out.println(" -tpdf\t\tTo generate images using PDF format"); - System.out.println(" -tvdx\t\tTo generate images using VDX format"); - System.out.println(" -txmi\t\tTo generate XMI file for class diagram"); - System.out.println(" -tscxml\t\tTo generate SCXML file for state diagram"); - System.out.println(" -thtml\t\tTo generate HTML file for class diagram"); - System.out.println(" -ttxt\t\tTo generate images with ASCII art"); - System.out.println(" -tutxt\t\tTo generate images with ASCII art using Unicode characters"); - System.out.println(" -tlatex\t\tTo generate images using LaTeX/Tikz format"); - System.out.println(" -tlatex:nopreamble\tTo generate images using LaTeX/Tikz format without preamble"); - System.out.println(" -o[utput] \"dir\"\tTo generate images in the specified directory"); - System.out.println(" -DVAR1=value\tTo set a preprocessing variable as if '!define VAR1 value' were used"); - System.out.println(" -Sparam1=value\tTo set a skin parameter as if 'skinparam param1 value' were used"); - System.out.println(" -Ppragma1=value\tTo set pragma as if '!pragma pragma1 value' were used"); - // System.out.println(" -config \"file\"\tTo read the provided config file - // before each diagram"); final char separator = SFile.separatorChar; - System.out.println(" -I" + separator + "path" + separator + "to" + separator - + "file\tTo include file as if '!include file' were used"); - System.out.println( - " -I" + separator + "path" + separator + "to" + separator + "*.puml\tTo include files with pattern"); - System.out.println(" -theme xxx\t\tTo use a specific theme"); - System.out.println(" -charset xxx\tTo use a specific charset (default is " + charset + ")"); - System.out.println(" -e[x]clude pattern\tTo exclude files that match the provided pattern"); - System.out.println(" -metadata\t\tTo retrieve PlantUML sources from PNG images"); - System.out.println(" -nometadata\t\tTo NOT export metadata in PNG/SVG generated files"); + System.out.println("where options include:"); + System.out.println(" -author[s]\t\tTo print information about PlantUML authors"); System.out.println(" -checkmetadata\t\tSkip PNG files that don't need to be regenerated"); - System.out.println(" -version\t\tTo display information about PlantUML and Java versions"); - System.out.println(" -v[erbose]\t\tTo have log information"); - System.out.println(" -quiet\t\tTo NOT print error message into the console"); - System.out.println(" -debugsvek\t\tTo generate intermediate svek files"); - System.out.println(" -h[elp]\t\tTo display this help message"); - System.out.println(" -testdot\t\tTo test the installation of graphviz"); - System.out.println(" -graphvizdot \"exe\"\tTo specify dot executable"); - System.out.println(" -p[ipe]\t\tTo use stdin for PlantUML source and stdout for PNG/SVG/EPS generation"); - System.out.println( - " -encodesprite 4|8|16[z] \"file\"\tTo encode a sprite at gray level (z for compression) from an image"); - System.out.println(" -computeurl|-encodeurl\tTo compute the encoded URL of a PlantUML source file"); - System.out.println(" -decodeurl\t\tTo retrieve the PlantUML source from an encoded URL"); - System.out.println(" -syntax\t\tTo report any syntax error from standard input without generating images"); - System.out.println(" -language\t\tTo print the list of PlantUML keywords"); - // System.out.println(" -nosuggestengine\tTo disable the suggest engine when - // errors in diagrams"); System.out.println(" -checkonly\t\tTo check the syntax of files without generating images"); + System.out.println(" -charset xxx\tTo use a specific charset (default is " + charset + ")"); + System.out.println(" -computeurl|-encodeurl\tTo compute the encoded URL of a PlantUML source file"); + // System.out.println(" -config \"file\"\tTo read the provided config file + System.out.println(" -cypher\t\tTo cypher texts of diagrams so that you can share them"); + System.out.println(" -DVAR1=value\tTo set a preprocessing variable as if '!define VAR1 value' were used"); + System.out.println(" -darkmode\t\tTo use dark mode for diagrams"); + System.out.println(" -debugsvek\t\tTo generate intermediate svek files"); + System.out.println(" -decodeurl\t\tTo retrieve the PlantUML source from an encoded URL"); + System.out.println(" -disablestats\tTo disable statistics computation (default)"); + System.out.println(" -duration\t\tTo print the duration of complete diagrams processing"); + System.out.println(" -e[x]clude pattern\tTo exclude files that match the provided pattern"); + System.out.println(" -enablestats\tTo enable statistics computation"); + System.out.println(" -encodesprite 4|8|16[z] \"file\"\tTo encode a sprite at gray level (z for compression) from an image"); + System.out.println(" -extractstdlib\tTo extract PlantUML Standard Library into stdlib folder"); System.out.println(" -failfast\t\tTo stop processing as soon as a syntax error in diagram occurs"); System.out.println(" -failfast2\t\tTo do a first syntax check before processing files, to fail even faster"); - System.out.println(" -noerror\t\tTo skip images when error in diagrams"); - System.out.println(" -duration\t\tTo print the duration of complete diagrams processing"); + System.out.println(" -filedir xxx\tTo behave as if the PlantUML source is in this dir (only affects '-pipe' and PicoWeb 'POST /render')"); + System.out.println(" -filename \"example.puml\"\tTo override %filename% variable"); + System.out.println(" -graphvizdot \"exe\"\tTo specify dot executable"); + System.out.println(" -gui\t\tTo run the graphical user interface"); + System.out.println(" -h[elp]\t\tTo display this help message"); + System.out.println(" -htmlstats\t\tTo output general statistics in file plantuml-stats.html"); + System.out.println(" -I" + separator + "path" + separator + "to" + separator + "file\tTo include file as if '!include file' were used"); + System.out.println(" -I" + separator + "path" + separator + "to" + separator + "*.puml\tTo include files with pattern"); + System.out.println(" -language\t\tTo print the list of PlantUML keywords"); + System.out.println(" -loopstats\t\tTo continuously print statistics about usage"); + System.out.println(" -metadata\t\tTo retrieve PlantUML sources from PNG images"); System.out.println(" -nbthread N\t\tTo use (N) threads for processing"); System.out.println(" -nbthread auto\tTo use " + Option.defaultNbThreads() + " threads for processing"); - System.out - .println(" -timeout N\t\tProcessing timeout in (N) seconds. Defaults to 15 minutes (900 seconds)."); - System.out.println(" -author[s]\t\tTo print information about PlantUML authors"); + System.out.println(" -noerror\t\tTo skip images when error in diagrams"); + System.out.println(" -nometadata\t\tTo NOT export metadata in PNG/SVG generated files"); + System.out.println(" -o[utput] \"dir\"\tTo generate images in the specified directory"); System.out.println(" -overwrite\t\tTo allow to overwrite read only files"); - System.out.println(" -printfonts\t\tTo print fonts available on your system"); - System.out.println(" -enablestats\tTo enable statistics computation"); - System.out.println(" -disablestats\tTo disable statistics computation (default)"); - System.out.println(" -htmlstats\t\tTo output general statistics in file plantuml-stats.html"); - System.out.println(" -xmlstats\t\tTo output general statistics in file plantuml-stats.xml"); - System.out.println(" -realtimestats\tTo generate statistics on the fly rather than at the end"); - System.out.println(" -loopstats\t\tTo continuously print statistics about usage"); - System.out.println(" -splash\t\tTo display a splash screen with some progress bar"); - System.out.println(" -progress\t\tTo display a textual progress bar in console"); - System.out.println(" -pipeimageindex N\tTo generate the Nth image with pipe option"); - System.out.println(" -stdlib\t\tTo print standard library info"); - System.out.println(" -extractstdlib\tTo extract PlantUML Standard Library into stdlib folder"); - System.out.println( - " -filedir xxx\tTo behave as if the PlantUML source is in this dir (only affects '-pipe' and PicoWeb 'POST /render')"); - System.out.println(" -filename \"example.puml\"\tTo override %filename% variable"); - System.out.println(" -preproc\t\tTo output preprocessor text of diagrams"); - System.out.println(" -cypher\t\tTo cypher texts of diagrams so that you can share them"); + System.out.println(" -Ppragma1=value\tTo set pragma as if '!pragma pragma1 value' were used"); + System.out.println(" -p[ipe]\t\tTo use stdin for PlantUML source and stdout for PNG/SVG/EPS generation"); System.out.println(" -picoweb\t\tTo start internal HTTP Server. See https://plantuml.com/picoweb"); + System.out.println(" -pipeimageindex N\tTo generate the Nth image with pipe option"); + System.out.println(" -preproc\t\tTo output preprocessor text of diagrams"); + System.out.println(" -printfonts\t\tTo print fonts available on your system"); + System.out.println(" -progress\t\tTo display a textual progress bar in console"); + System.out.println(" -quiet\t\tTo NOT print error message into the console"); + System.out.println(" -realtimestats\tTo generate statistics on the fly rather than at the end"); + System.out.println(" -Sparam1=value\tTo set a skin parameter as if 'skinparam param1 value' were used"); + System.out.println(" -splash\t\tTo display a splash screen with some progress bar"); + System.out.println(" -stdlib\t\tTo print standard library info"); + System.out.println(" -syntax\t\tTo report any syntax error from standard input without generating images"); + System.out.println(" -testdot\t\tTo test the installation of graphviz"); + System.out.println(" -theme xxx\t\tTo use a specific theme"); + System.out.println(" -timeout N\t\tProcessing timeout in (N) seconds. Defaults to 15 minutes (900 seconds)."); + System.out.println(" -teps\t\tTo generate images using EPS format"); + System.out.println(" -testdot\t\tTo test the installation of graphviz"); + System.out.println(" -theme xxx\t\tTo use a specific theme"); + System.out.println(" -thtml\t\tTo generate HTML file for class diagram"); + System.out.println(" -tlatex:nopreamble\tTo generate images using LaTeX/Tikz format without preamble"); + System.out.println(" -tlatex\t\tTo generate images using LaTeX/Tikz format"); + System.out.println(" -tpdf\t\tTo generate images using PDF format"); + System.out.println(" -tpng\t\tTo generate images using PNG format (default)"); + System.out.println(" -tscxml\t\tTo generate SCXML file for state diagram"); + System.out.println(" -tsvg\t\tTo generate images using SVG format"); + System.out.println(" -ttxt\t\tTo generate images with ASCII art"); + System.out.println(" -tutxt\t\tTo generate images with ASCII art using Unicode characters"); + System.out.println(" -tvdx\t\tTo generate images using VDX format"); + System.out.println(" -txmi\t\tTo generate XMI file for class diagram"); + System.out.println(" -v[erbose]\t\tTo have log information"); + System.out.println(" -version\t\tTo display information about PlantUML and Java versions"); + System.out.println(" -xmlstats\t\tTo output general statistics in file plantuml-stats.xml"); System.out.println(); System.out.println("If needed, you can setup the environment variable GRAPHVIZ_DOT."); exit(0); diff --git a/src/net/sourceforge/plantuml/project/ConstantPlan.java b/src/net/sourceforge/plantuml/project/ConstantPlan.java index 67ebf79eb..0d0b74b3c 100644 --- a/src/net/sourceforge/plantuml/project/ConstantPlan.java +++ b/src/net/sourceforge/plantuml/project/ConstantPlan.java @@ -53,8 +53,14 @@ public class ConstantPlan implements LoadPlanable { return new ConstantPlan(load); } + @Override public int getLoadAt(Day instant) { return loadPerInstant; } + + @Override + public Day getLastDayIfAny() { + return null; + } } diff --git a/src/net/sourceforge/plantuml/project/GanttDiagram.java b/src/net/sourceforge/plantuml/project/GanttDiagram.java index fdc8a18c0..b3207c3df 100644 --- a/src/net/sourceforge/plantuml/project/GanttDiagram.java +++ b/src/net/sourceforge/plantuml/project/GanttDiagram.java @@ -86,6 +86,7 @@ import net.sourceforge.plantuml.project.core.TaskInstant; import net.sourceforge.plantuml.project.core.TaskSeparator; import net.sourceforge.plantuml.project.draw.FingerPrint; import net.sourceforge.plantuml.project.draw.ResourceDraw; +import net.sourceforge.plantuml.project.draw.ResourceDrawVersion2; import net.sourceforge.plantuml.project.draw.TaskDraw; import net.sourceforge.plantuml.project.draw.TaskDrawDiamond; import net.sourceforge.plantuml.project.draw.TaskDrawGroup; @@ -99,6 +100,7 @@ import net.sourceforge.plantuml.project.draw.TimeHeaderSimple; import net.sourceforge.plantuml.project.draw.TimeHeaderWeekly; import net.sourceforge.plantuml.project.draw.TimeHeaderYearly; import net.sourceforge.plantuml.project.lang.CenterBorderColor; +import net.sourceforge.plantuml.project.solver.ImpossibleSolvingException; import net.sourceforge.plantuml.project.time.Day; import net.sourceforge.plantuml.project.time.DayOfWeek; import net.sourceforge.plantuml.project.time.WeekNumberStrategy; @@ -149,6 +151,8 @@ public class GanttDiagram extends TitledDiagram implements ToTaskDraw, WithSprit private final RealOrigin origin = RealUtils.createOrigin(); + private int defaultCompletion = 100; + public CommandExecutionResult changeLanguage(String lang) { this.locale = new Locale(lang); return CommandExecutionResult.ok(); @@ -202,6 +206,16 @@ public class GanttDiagram extends TitledDiagram implements ToTaskDraw, WithSprit return false; } + @Override + public String checkFinalError() { + try { + initMinMax(); + } catch (ImpossibleSolvingException ex) { + return ex.getMessage(); + } + return null; + } + @Override protected TextBlock getTextBlock() { final FileFormatOption fileFormatOption = new FileFormatOption(FileFormat.PNG); @@ -312,7 +326,8 @@ public class GanttDiagram extends TitledDiagram implements ToTaskDraw, WithSprit private TimeHeaderParameters thParam() { return new TimeHeaderParameters(colorDays(), getFactorScale(), min, max, getIHtmlColorSet(), getTimelineStyle(), - getClosedStyle(), locale, openClose, colorDaysOfWeek, verticalSeparatorBefore); + getClosedStyle(), locale, openClose, colorDaysOfWeek, verticalSeparatorBefore, + getVerticalSeparatorStyle()); } private Map colorDays() { @@ -330,6 +345,11 @@ public class GanttDiagram extends TitledDiagram implements ToTaskDraw, WithSprit .getMergedStyle(getCurrentStyleBuilder()); } + private Style getVerticalSeparatorStyle() { + return StyleSignatureBasic.of(SName.root, SName.element, SName.ganttDiagram, SName.verticalSeparator) + .getMergedStyle(getCurrentStyleBuilder()); + } + private double getTotalHeight(TimeHeader timeHeader) { if (showFootbox) return totalHeightWithoutFooter + timeHeader.getTimeFooterHeight(); @@ -457,14 +477,19 @@ public class GanttDiagram extends TitledDiagram implements ToTaskDraw, WithSprit yy = headerHeight; } else if (this.hideResourceFoobox == false) for (Resource res : resources.values()) { - final ResourceDraw draw = new ResourceDraw(this, res, timeScale, yy, min, max); + final ResourceDraw draw = buildResourceDraw(this, res, timeScale, yy, min, max); res.setTaskDraw(draw); - yy += draw.getHeight(); + yy += draw.getHeight(stringBounder); } this.totalHeightWithoutFooter = yy; } + private ResourceDraw buildResourceDraw(GanttDiagram gantt, Resource res, TimeScale timeScale, double y, Day min, + Day max) { + return new ResourceDrawVersion2(gantt, res, timeScale, y, min, max); + } + private Collection getConstraints(Task task) { final List result = new ArrayList<>(); for (GanttConstraint constraint : constraints) { @@ -603,7 +628,7 @@ public class GanttDiagram extends TitledDiagram implements ToTaskDraw, WithSprit final OpenClose except = this.openCloseForTask.get(codeOrShortName); result = new TaskImpl(getSkinParam().getCurrentStyleBuilder(), code, openClose.mutateMe(except), - openClose.getStartingDay()); + openClose.getStartingDay(), defaultCompletion); if (currentGroup != null) currentGroup.addTask(result); @@ -866,4 +891,19 @@ public class GanttDiagram extends TitledDiagram implements ToTaskDraw, WithSprit verticalSeparatorBefore.add(day); } + public void setTaskDefaultCompletion(int defaultCompletion) { + this.defaultCompletion = defaultCompletion; + } + + public List getAllTasksForResource(Resource res) { + final List result = new ArrayList(); + for (Task task : tasks.values()) + if (task.isAssignedTo(res)) { + final TaskDrawRegular draw = (TaskDrawRegular) draws.get(task); + result.add(draw); + } + + return Collections.unmodifiableList(result); + } + } diff --git a/src/net/sourceforge/plantuml/project/GanttDiagramFactory.java b/src/net/sourceforge/plantuml/project/GanttDiagramFactory.java index 392990439..eb7d662d3 100644 --- a/src/net/sourceforge/plantuml/project/GanttDiagramFactory.java +++ b/src/net/sourceforge/plantuml/project/GanttDiagramFactory.java @@ -59,6 +59,7 @@ import net.sourceforge.plantuml.project.command.CommandNoteBottom; import net.sourceforge.plantuml.project.command.CommandPrintBetween; import net.sourceforge.plantuml.project.command.CommandPrintScale; import net.sourceforge.plantuml.project.command.CommandSeparator; +import net.sourceforge.plantuml.project.command.CommandTaskCompleteDefault; import net.sourceforge.plantuml.project.command.CommandWeekNumberStrategy; import net.sourceforge.plantuml.project.command.NaturalCommand; import net.sourceforge.plantuml.project.lang.SentenceAnd; @@ -115,6 +116,7 @@ public class GanttDiagramFactory extends PSystemCommandFactory { cmds.add(new CommandLabelOnColumn()); cmds.add(new CommandHideResourceName()); cmds.add(new CommandHideResourceFootbox()); + cmds.add(new CommandTaskCompleteDefault()); } private void addLanguageCommands(List cmd) { diff --git a/src/net/sourceforge/plantuml/project/LoadPlanable.java b/src/net/sourceforge/plantuml/project/LoadPlanable.java index d8e71f71d..76ad4c539 100644 --- a/src/net/sourceforge/plantuml/project/LoadPlanable.java +++ b/src/net/sourceforge/plantuml/project/LoadPlanable.java @@ -40,4 +40,6 @@ import net.sourceforge.plantuml.project.time.Day; public interface LoadPlanable { public int getLoadAt(Day instant); + + public Day getLastDayIfAny(); } diff --git a/src/net/sourceforge/plantuml/project/OpenClose.java b/src/net/sourceforge/plantuml/project/OpenClose.java index 1e8afbf65..7d0256c6d 100644 --- a/src/net/sourceforge/plantuml/project/OpenClose.java +++ b/src/net/sourceforge/plantuml/project/OpenClose.java @@ -49,6 +49,8 @@ public class OpenClose implements Histogram, LoadPlanable { private final Map weekdayStatus = new EnumMap<>(DayOfWeek.class); private final Map dayStatus = new HashMap<>(); private Day startingDay; + private Day offBefore; + private Day offAfter; public int daysInWeek() { int result = 7; @@ -89,6 +91,11 @@ public class OpenClose implements Histogram, LoadPlanable { } private DayStatus getLocalStatus(Day day) { + if (offBefore != null && day.compareTo(offBefore) < 0) + return DayStatus.CLOSE; + if (offAfter != null && day.compareTo(offAfter) > 0) + return DayStatus.CLOSE; + final DayStatus status1 = dayStatus.get(day); if (status1 != null) return status1; @@ -174,6 +181,14 @@ public class OpenClose implements Histogram, LoadPlanable { return getLoatAtInternal(day); } + public void setOffBeforeDate(Day day) { + this.offBefore = day; + } + + public void setOffAfterDate(Day day) { + this.offAfter = day; + } + private int getLoatAtInternal(Day day) { if (isClosed(day)) return 0; @@ -193,8 +208,18 @@ public class OpenClose implements Histogram, LoadPlanable { return 100; return OpenClose.this.getLoadAt(instant); } + + @Override + public Day getLastDayIfAny() { + return offAfter; + } }; return this; } + @Override + public Day getLastDayIfAny() { + return offAfter; + } + } diff --git a/src/net/sourceforge/plantuml/project/PlanUtils.java b/src/net/sourceforge/plantuml/project/PlanUtils.java index b80f591b8..d75adfd5e 100644 --- a/src/net/sourceforge/plantuml/project/PlanUtils.java +++ b/src/net/sourceforge/plantuml/project/PlanUtils.java @@ -48,6 +48,10 @@ public class PlanUtils { public int getLoadAt(Day instant) { return Math.min(p1.getLoadAt(instant), p2.getLoadAt(instant)); } + + public Day getLastDayIfAny() { + return lastOf(p1.getLastDayIfAny(), p2.getLastDayIfAny()); + } }; } @@ -56,7 +60,21 @@ public class PlanUtils { public int getLoadAt(Day instant) { return p1.getLoadAt(instant) * p2.getLoadAt(instant) / 100; } + + public Day getLastDayIfAny() { + return lastOf(p1.getLastDayIfAny(), p2.getLastDayIfAny()); + } }; } + private static Day lastOf(Day day1, Day day2) { + if (day1 == null) + return day2; + if (day2 == null) + return day1; + if (day1.compareTo(day2) > 0) + return day1; + return day2; + } + } diff --git a/src/net/sourceforge/plantuml/project/TimeHeaderParameters.java b/src/net/sourceforge/plantuml/project/TimeHeaderParameters.java index 95bcdd4f4..d19da40ce 100644 --- a/src/net/sourceforge/plantuml/project/TimeHeaderParameters.java +++ b/src/net/sourceforge/plantuml/project/TimeHeaderParameters.java @@ -39,10 +39,13 @@ import java.util.Locale; import java.util.Map; import java.util.Set; +import net.sourceforge.plantuml.klimt.UStroke; import net.sourceforge.plantuml.klimt.color.HColor; import net.sourceforge.plantuml.klimt.color.HColorSet; +import net.sourceforge.plantuml.klimt.drawing.UGraphic; import net.sourceforge.plantuml.project.time.Day; import net.sourceforge.plantuml.project.time.DayOfWeek; +import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.Style; public class TimeHeaderParameters { @@ -54,6 +57,7 @@ public class TimeHeaderParameters { private final HColorSet colorSet; private final Style timelineStyle; private final Style closedStyle; + private final Style verticalSeparatorStyle; private final Locale locale; private final OpenClose openClose; private final Map colorDaysOfWeek; @@ -61,7 +65,7 @@ public class TimeHeaderParameters { public TimeHeaderParameters(Map colorDays, double scale, Day min, Day max, HColorSet colorSet, Style timelineStyle, Style closedStyle, Locale locale, OpenClose openClose, - Map colorDaysOfWeek, Set verticalSeparatorBefore) { + Map colorDaysOfWeek, Set verticalSeparatorBefore, Style verticalSeparatorStyle) { this.colorDays = colorDays; this.scale = scale; this.min = min; @@ -73,6 +77,7 @@ public class TimeHeaderParameters { this.openClose = openClose; this.colorDaysOfWeek = colorDaysOfWeek; this.verticalSeparatorBefore = verticalSeparatorBefore; + this.verticalSeparatorStyle = verticalSeparatorStyle; } public HColor getColor(Day wink) { @@ -123,4 +128,10 @@ public class TimeHeaderParameters { return verticalSeparatorBefore; } + public final UGraphic forVerticalSeparator(UGraphic ug) { + final HColor color = verticalSeparatorStyle.value(PName.LineColor).asColor(getColorSet()); + final UStroke stroke = verticalSeparatorStyle.getStroke(); + return ug.apply(color).apply(stroke); + } + } diff --git a/src/net/sourceforge/plantuml/project/command/CommandPrintBetween.java b/src/net/sourceforge/plantuml/project/command/CommandPrintBetween.java index cc0412fb2..f13460e09 100644 --- a/src/net/sourceforge/plantuml/project/command/CommandPrintBetween.java +++ b/src/net/sourceforge/plantuml/project/command/CommandPrintBetween.java @@ -48,7 +48,7 @@ import net.sourceforge.plantuml.utils.LineLocation; public class CommandPrintBetween extends SingleLineCommand2 { - private static final ComplementDate pattern = new ComplementDate(); + private static final ComplementDate pattern = ComplementDate.any(); public CommandPrintBetween() { super(getRegexConcat()); diff --git a/src/net/sourceforge/plantuml/project/command/CommandTaskCompleteDefault.java b/src/net/sourceforge/plantuml/project/command/CommandTaskCompleteDefault.java new file mode 100644 index 000000000..aeec499cd --- /dev/null +++ b/src/net/sourceforge/plantuml/project/command/CommandTaskCompleteDefault.java @@ -0,0 +1,84 @@ +/* ======================================================================== + * PlantUML : a free UML diagram generator + * ======================================================================== + * + * (C) Copyright 2009-2024, Arnaud Roques + * + * Project Info: https://plantuml.com + * + * If you like this project or if you find it useful, you can support us at: + * + * https://plantuml.com/patreon (only 1$ per month!) + * https://plantuml.com/paypal + * + * This file is part of PlantUML. + * + * PlantUML is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * PlantUML distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public + * License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. + * + * + * Original Author: Arnaud Roques + * + * + */ +package net.sourceforge.plantuml.project.command; + +import net.sourceforge.plantuml.command.CommandExecutionResult; +import net.sourceforge.plantuml.command.SingleLineCommand2; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.project.GanttDiagram; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOr; +import net.sourceforge.plantuml.regex.RegexResult; +import net.sourceforge.plantuml.utils.LineLocation; + +public class CommandTaskCompleteDefault extends SingleLineCommand2 { + + public CommandTaskCompleteDefault() { + super(getRegexConcat()); + } + + static IRegex getRegexConcat() { + return RegexConcat.build(CommandTaskCompleteDefault.class.getName(), RegexLeaf.start(), // + new RegexLeaf("task"), // + RegexLeaf.spaceOneOrMore(), // + new RegexOr(// + new RegexLeaf("default[%s]+completion"), // + new RegexLeaf("completion[%s]+default")), // + RegexLeaf.spaceOneOrMore(), // + new RegexLeaf("to"), // + RegexLeaf.spaceOneOrMore(), // + new RegexLeaf("VALUE", "(\\d+)"), // + new RegexLeaf(".*"), // + RegexLeaf.spaceZeroOrMore(), // + RegexLeaf.end()); + } + + @Override + protected CommandExecutionResult executeArg(GanttDiagram diagram, LineLocation location, RegexResult arg) + throws NoSuchColorException { + + final int value = Integer.parseInt(arg.get("VALUE", 0)); + if (value > 100) + return CommandExecutionResult.error("Completetion must between 0 and 100"); + + diagram.setTaskDefaultCompletion(value); + + return CommandExecutionResult.ok(); + } + +} diff --git a/src/net/sourceforge/plantuml/project/core/Resource.java b/src/net/sourceforge/plantuml/project/core/Resource.java index 687b479a2..594209158 100644 --- a/src/net/sourceforge/plantuml/project/core/Resource.java +++ b/src/net/sourceforge/plantuml/project/core/Resource.java @@ -94,4 +94,17 @@ public class Resource { public void addCloseDay(DayOfWeek day) { openClose.close(day); } + + public void setOffBeforeDate(Day day) { + openClose.setOffBeforeDate(day); + } + + public void setOffAfterDate(Day day) { + openClose.setOffAfterDate(day); + } + + public Day getLastDayIfAny() { + return openClose.getLastDayIfAny(); + } + } diff --git a/src/net/sourceforge/plantuml/project/core/Task.java b/src/net/sourceforge/plantuml/project/core/Task.java index 653cff0d2..178b6283e 100644 --- a/src/net/sourceforge/plantuml/project/core/Task.java +++ b/src/net/sourceforge/plantuml/project/core/Task.java @@ -79,4 +79,6 @@ public interface Task extends Moment { public StyleBuilder getStyleBuilder(); + public boolean isAssignedTo(Resource res); + } diff --git a/src/net/sourceforge/plantuml/project/core/TaskGroup.java b/src/net/sourceforge/plantuml/project/core/TaskGroup.java index 804e08bf1..b8d1e8c49 100644 --- a/src/net/sourceforge/plantuml/project/core/TaskGroup.java +++ b/src/net/sourceforge/plantuml/project/core/TaskGroup.java @@ -56,6 +56,7 @@ public class TaskGroup extends AbstractTask implements Task { this.parent = parent; } + @Override public Day getStart() { Day min = null; for (Task child : children) @@ -68,6 +69,7 @@ public class TaskGroup extends AbstractTask implements Task { throw new UnsupportedOperationException(); } + @Override public Day getEnd() { Day max = null; for (Task child : children) @@ -80,54 +82,67 @@ public class TaskGroup extends AbstractTask implements Task { throw new UnsupportedOperationException(); } + @Override public void setStart(Day start) { throw new UnsupportedOperationException(); } + @Override public void setEnd(Day end) { throw new UnsupportedOperationException(); } + @Override public void setColors(CenterBorderColor... colors) { throw new UnsupportedOperationException(); } + @Override public void addResource(Resource resource, int percentage) { throw new UnsupportedOperationException(); } + @Override public Load getLoad() { throw new UnsupportedOperationException(); } + @Override public void setLoad(Load load) { throw new UnsupportedOperationException(); } + @Override public void setDiamond(boolean diamond) { throw new UnsupportedOperationException(); } + @Override public boolean isDiamond() { throw new UnsupportedOperationException(); } + @Override public void setCompletion(int completion) { throw new UnsupportedOperationException(); } + @Override public void setUrl(Url url) { throw new UnsupportedOperationException(); } + @Override public void addPause(Day pause) { throw new UnsupportedOperationException(); } + @Override public void addPause(DayOfWeek pause) { throw new UnsupportedOperationException(); } + @Override public void setNote(Display note) { } @@ -139,4 +154,9 @@ public class TaskGroup extends AbstractTask implements Task { return parent; } + @Override + public boolean isAssignedTo(Resource res) { + return false; + } + } diff --git a/src/net/sourceforge/plantuml/project/core/TaskImpl.java b/src/net/sourceforge/plantuml/project/core/TaskImpl.java index 491a3dbc1..a3db7f866 100644 --- a/src/net/sourceforge/plantuml/project/core/TaskImpl.java +++ b/src/net/sourceforge/plantuml/project/core/TaskImpl.java @@ -66,7 +66,7 @@ public class TaskImpl extends AbstractTask implements Task, LoadPlanable { private final LoadPlanable defaultPlan; private boolean diamond; - private int completion = 100; + private int completion; private Display note; private Url url; @@ -76,8 +76,9 @@ public class TaskImpl extends AbstractTask implements Task, LoadPlanable { this.url = url; } - public TaskImpl(StyleBuilder styleBuilder, TaskCode code, LoadPlanable plan, Day startingDay) { + public TaskImpl(StyleBuilder styleBuilder, TaskCode code, LoadPlanable plan, Day startingDay, int completion) { super(styleBuilder, code); + this.completion = completion; this.defaultPlan = plan; this.solver = new SolverImpl(this); if (startingDay == null) @@ -88,6 +89,7 @@ public class TaskImpl extends AbstractTask implements Task, LoadPlanable { setLoad(Load.inWinks(1)); } + @Override public int getLoadAt(Day instant) { if (isPaused(instant)) return 0; @@ -131,10 +133,12 @@ public class TaskImpl extends AbstractTask implements Task, LoadPlanable { return 0; } + @Override public void addPause(Day pause) { this.pausedDay.add(pause); } + @Override public void addPause(DayOfWeek pause) { this.pausedDayOfWeek.add(pause); } @@ -156,9 +160,29 @@ public class TaskImpl extends AbstractTask implements Task, LoadPlanable { } return result; } + + @Override + public Day getLastDayIfAny() { + return TaskImpl.this.getLastDayIfAny(); + } }; } + @Override + public Day getLastDayIfAny() { + Day result = null; + + for (Resource res : resources.keySet()) { + if (res.getLastDayIfAny() == null) + return null; + + if (result == null || result.compareTo(res.getLastDayIfAny()) < 0) + result = res.getLastDayIfAny(); + } + + return result; + } + public String getPrettyDisplay() { if (resources.size() > 0) { final StringBuilder result = new StringBuilder(getCode().getSimpleDisplay()); @@ -190,6 +214,7 @@ public class TaskImpl extends AbstractTask implements Task, LoadPlanable { return "" + getStart() + " ---> " + getEnd() + " [" + getLoad() + "]"; } + @Override public Day getStart() { Day result = (Day) solver.getData(TaskAttribute.START); if (diamond == false) @@ -199,42 +224,52 @@ public class TaskImpl extends AbstractTask implements Task, LoadPlanable { return result; } + @Override public Day getEnd() { return (Day) solver.getData(TaskAttribute.END); } + @Override public Load getLoad() { return (Load) solver.getData(TaskAttribute.LOAD); } + @Override public void setLoad(Load load) { solver.setData(TaskAttribute.LOAD, load); } + @Override public void setStart(Day start) { solver.setData(TaskAttribute.START, start); } + @Override public void setEnd(Day end) { solver.setData(TaskAttribute.END, end); } + @Override public void setColors(CenterBorderColor... colors) { this.colors = colors; } + @Override public void addResource(Resource resource, int percentage) { this.resources.put(resource, percentage); } + @Override public void setDiamond(boolean diamond) { this.diamond = diamond; } + @Override public boolean isDiamond() { return this.diamond; } + @Override public void setCompletion(int completion) { this.completion = completion; } @@ -274,6 +309,7 @@ public class TaskImpl extends AbstractTask implements Task, LoadPlanable { } + @Override public void setNote(Display note) { this.note = note; } @@ -286,4 +322,9 @@ public class TaskImpl extends AbstractTask implements Task, LoadPlanable { return defaultPlan; } + @Override + public boolean isAssignedTo(Resource res) { + return resources.containsKey(res); + } + } diff --git a/src/net/sourceforge/plantuml/project/core/TaskSeparator.java b/src/net/sourceforge/plantuml/project/core/TaskSeparator.java index fcf21d64a..68b30a326 100644 --- a/src/net/sourceforge/plantuml/project/core/TaskSeparator.java +++ b/src/net/sourceforge/plantuml/project/core/TaskSeparator.java @@ -52,22 +52,27 @@ public class TaskSeparator extends AbstractTask implements Task { this.comment = comment; } + @Override public Day getStart() { throw new UnsupportedOperationException(); } + @Override public Day getEnd() { throw new UnsupportedOperationException(); } + @Override public void setStart(Day start) { throw new UnsupportedOperationException(); } + @Override public void setEnd(Day end) { throw new UnsupportedOperationException(); } + @Override public void setColors(CenterBorderColor... colors) { throw new UnsupportedOperationException(); } @@ -76,10 +81,12 @@ public class TaskSeparator extends AbstractTask implements Task { return comment; } + @Override public void addResource(Resource resource, int percentage) { throw new UnsupportedOperationException(); } + @Override public Load getLoad() { throw new UnsupportedOperationException(); } @@ -88,31 +95,43 @@ public class TaskSeparator extends AbstractTask implements Task { throw new UnsupportedOperationException(); } + @Override public void setDiamond(boolean diamond) { throw new UnsupportedOperationException(); } + @Override public boolean isDiamond() { throw new UnsupportedOperationException(); } + @Override public void setCompletion(int completion) { throw new UnsupportedOperationException(); } + @Override public void setUrl(Url url) { throw new UnsupportedOperationException(); } + @Override public void addPause(Day pause) { throw new UnsupportedOperationException(); } + @Override public void addPause(DayOfWeek pause) { throw new UnsupportedOperationException(); } + @Override public void setNote(Display note) { } + @Override + public boolean isAssignedTo(Resource res) { + return false; + } + } diff --git a/src/net/sourceforge/plantuml/project/draw/ResourceDraw.java b/src/net/sourceforge/plantuml/project/draw/ResourceDraw.java index fb4f72f99..0215bceae 100644 --- a/src/net/sourceforge/plantuml/project/draw/ResourceDraw.java +++ b/src/net/sourceforge/plantuml/project/draw/ResourceDraw.java @@ -35,96 +35,13 @@ */ package net.sourceforge.plantuml.project.draw; -import net.sourceforge.plantuml.klimt.UTranslate; -import net.sourceforge.plantuml.klimt.color.HColor; -import net.sourceforge.plantuml.klimt.color.HColors; -import net.sourceforge.plantuml.klimt.creole.Display; -import net.sourceforge.plantuml.klimt.drawing.UGraphic; -import net.sourceforge.plantuml.klimt.font.FontConfiguration; -import net.sourceforge.plantuml.klimt.font.UFont; -import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; -import net.sourceforge.plantuml.klimt.shape.TextBlock; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.klimt.shape.UDrawable; -import net.sourceforge.plantuml.klimt.shape.ULine; -import net.sourceforge.plantuml.klimt.sprite.SpriteContainerEmpty; -import net.sourceforge.plantuml.project.GanttDiagram; -import net.sourceforge.plantuml.project.core.Resource; -import net.sourceforge.plantuml.project.time.Day; -import net.sourceforge.plantuml.project.timescale.TimeScale; -public class ResourceDraw implements UDrawable { +public interface ResourceDraw extends UDrawable { - private final Resource res; - private final TimeScale timeScale; - private final double y; - private final Day min; - private final Day max; - private final GanttDiagram gantt; + public double getHeight(StringBounder stringBounder); - public ResourceDraw(GanttDiagram gantt, Resource res, TimeScale timeScale, double y, Day min, Day max) { - this.res = res; - this.timeScale = timeScale; - this.y = y; - this.min = min; - this.max = max; - this.gantt = gantt; - } - - public void drawU(UGraphic ug) { - final TextBlock title = Display.getWithNewlines(res.getName()).create(getFontConfiguration(13), - HorizontalAlignment.LEFT, new SpriteContainerEmpty()); - title.drawU(ug); - final ULine line = ULine.hline(timeScale.getEndingPosition(max) - timeScale.getStartingPosition(min)); - ug.apply(HColors.BLACK).apply(UTranslate.dy(title.calculateDimension(ug.getStringBounder()).getHeight())) - .draw(line); - - double startingPosition = -1; - int totalLoad = 0; - int totalLimit = 0; - for (Day i = min; i.compareTo(max) <= 0; i = i.increment()) { - final boolean isBreaking = timeScale.isBreaking(i); - totalLoad += gantt.getLoadForResource(res, i); - totalLimit += 100; - if (isBreaking) { - if (totalLoad > 0) { - final boolean over = totalLoad > totalLimit; - final FontConfiguration fontConfiguration = getFontConfiguration(9, - over ? HColors.RED : HColors.BLACK); - final TextBlock value = Display.getWithNewlines("" + totalLoad).create(fontConfiguration, - HorizontalAlignment.LEFT, new SpriteContainerEmpty()); - if (startingPosition == -1) - startingPosition = timeScale.getStartingPosition(i); - final double endingPosition = timeScale.getEndingPosition(i); - final double start = (startingPosition + endingPosition) / 2 - - value.calculateDimension(ug.getStringBounder()).getWidth() / 2; - value.drawU(ug.apply(new UTranslate(start, 16))); - } - startingPosition = -1; - totalLoad = 0; - totalLimit = 0; - } else { - if (startingPosition == -1) - startingPosition = timeScale.getStartingPosition(i); - } - } - - } - - private FontConfiguration getFontConfiguration(int size) { - return getFontConfiguration(size, HColors.BLACK); - } - - private FontConfiguration getFontConfiguration(int size, HColor color) { - final UFont font = UFont.serif(size); - return FontConfiguration.create(font, color, color, null); - } - - public double getHeight() { - return 16 * 2; - } - - public final double getY() { - return y; - } + public double getY(); } diff --git a/src/net/sourceforge/plantuml/project/draw/ResourceDrawBasicImpl.java b/src/net/sourceforge/plantuml/project/draw/ResourceDrawBasicImpl.java new file mode 100644 index 000000000..7be2906d0 --- /dev/null +++ b/src/net/sourceforge/plantuml/project/draw/ResourceDrawBasicImpl.java @@ -0,0 +1,132 @@ +/* ======================================================================== + * PlantUML : a free UML diagram generator + * ======================================================================== + * + * (C) Copyright 2009-2024, Arnaud Roques + * + * Project Info: https://plantuml.com + * + * If you like this project or if you find it useful, you can support us at: + * + * https://plantuml.com/patreon (only 1$ per month!) + * https://plantuml.com/paypal + * + * This file is part of PlantUML. + * + * PlantUML is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * PlantUML distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public + * License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. + * + * + * Original Author: Arnaud Roques + * + * + */ +package net.sourceforge.plantuml.project.draw; + +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.creole.Display; +import net.sourceforge.plantuml.klimt.drawing.UGraphic; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.font.UFont; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; +import net.sourceforge.plantuml.klimt.shape.TextBlock; +import net.sourceforge.plantuml.klimt.shape.ULine; +import net.sourceforge.plantuml.klimt.sprite.SpriteContainerEmpty; +import net.sourceforge.plantuml.project.GanttDiagram; +import net.sourceforge.plantuml.project.core.Resource; +import net.sourceforge.plantuml.project.time.Day; +import net.sourceforge.plantuml.project.timescale.TimeScale; + +public class ResourceDrawBasicImpl implements ResourceDraw { + + private final Resource res; + private final TimeScale timeScale; + private final double y; + private final Day min; + private final Day max; + private final GanttDiagram gantt; + + public ResourceDrawBasicImpl(GanttDiagram gantt, Resource res, TimeScale timeScale, double y, Day min, Day max) { + this.res = res; + this.timeScale = timeScale; + this.y = y; + this.min = min; + this.max = max; + this.gantt = gantt; + } + + public void drawU(UGraphic ug) { + final TextBlock title = Display.getWithNewlines(res.getName()).create(getFontConfiguration(13), + HorizontalAlignment.LEFT, new SpriteContainerEmpty()); + title.drawU(ug); + final ULine line = ULine.hline(timeScale.getEndingPosition(max) - timeScale.getStartingPosition(min)); + ug.apply(HColors.BLACK).apply(UTranslate.dy(title.calculateDimension(ug.getStringBounder()).getHeight())) + .draw(line); + + double startingPosition = -1; + int totalLoad = 0; + int totalLimit = 0; + for (Day i = min; i.compareTo(max) <= 0; i = i.increment()) { + final boolean isBreaking = timeScale.isBreaking(i); + totalLoad += gantt.getLoadForResource(res, i); + totalLimit += 100; + if (isBreaking) { + if (totalLoad > 0) { + final boolean over = totalLoad > totalLimit; + final FontConfiguration fontConfiguration = getFontConfiguration(9, + over ? HColors.RED : HColors.BLACK); + final TextBlock value = Display.getWithNewlines("" + totalLoad).create(fontConfiguration, + HorizontalAlignment.LEFT, new SpriteContainerEmpty()); + if (startingPosition == -1) + startingPosition = timeScale.getStartingPosition(i); + final double endingPosition = timeScale.getEndingPosition(i); + final double start = (startingPosition + endingPosition) / 2 + - value.calculateDimension(ug.getStringBounder()).getWidth() / 2; + value.drawU(ug.apply(new UTranslate(start, 16))); + } + startingPosition = -1; + totalLoad = 0; + totalLimit = 0; + } else { + if (startingPosition == -1) + startingPosition = timeScale.getStartingPosition(i); + } + } + + } + + private FontConfiguration getFontConfiguration(int size) { + return getFontConfiguration(size, HColors.BLACK); + } + + private FontConfiguration getFontConfiguration(int size, HColor color) { + final UFont font = UFont.serif(size); + return FontConfiguration.create(font, color, color, null); + } + + @Override + public double getHeight(StringBounder stringBounder) { + return 16 * 2; + } + + @Override + public final double getY() { + return y; + } + +} diff --git a/src/net/sourceforge/plantuml/project/draw/ResourceDrawVersion2.java b/src/net/sourceforge/plantuml/project/draw/ResourceDrawVersion2.java new file mode 100644 index 000000000..522fe9e91 --- /dev/null +++ b/src/net/sourceforge/plantuml/project/draw/ResourceDrawVersion2.java @@ -0,0 +1,138 @@ +/* ======================================================================== + * PlantUML : a free UML diagram generator + * ======================================================================== + * + * (C) Copyright 2009-2024, Arnaud Roques + * + * Project Info: https://plantuml.com + * + * If you like this project or if you find it useful, you can support us at: + * + * https://plantuml.com/patreon (only 1$ per month!) + * https://plantuml.com/paypal + * + * This file is part of PlantUML. + * + * PlantUML is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * PlantUML distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public + * License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. + * + * + * Original Author: Arnaud Roques + * + * + */ +package net.sourceforge.plantuml.project.draw; + +import net.sourceforge.plantuml.klimt.UShape; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.creole.Display; +import net.sourceforge.plantuml.klimt.drawing.UGraphic; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.font.UFont; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; +import net.sourceforge.plantuml.klimt.shape.TextBlock; +import net.sourceforge.plantuml.klimt.shape.ULine; +import net.sourceforge.plantuml.klimt.shape.URectangle; +import net.sourceforge.plantuml.klimt.sprite.SpriteContainerEmpty; +import net.sourceforge.plantuml.project.GanttDiagram; +import net.sourceforge.plantuml.project.LabelPosition; +import net.sourceforge.plantuml.project.LabelStrategy; +import net.sourceforge.plantuml.project.core.Resource; +import net.sourceforge.plantuml.project.time.Day; +import net.sourceforge.plantuml.project.timescale.TimeScale; + +public class ResourceDrawVersion2 implements ResourceDraw { + + private final Resource res; + private final TimeScale timeScale; + private final double y; + private final Day min; + private final Day max; + private final GanttDiagram gantt; + + public ResourceDrawVersion2(GanttDiagram gantt, Resource res, TimeScale timeScale, double y, Day min, Day max) { + this.res = res; + this.timeScale = timeScale; + this.y = y; + this.min = min; + this.max = max; + this.gantt = gantt; + } + + public void drawU(UGraphic ug) { + final StringBounder stringBounder = ug.getStringBounder(); + + double ypos = 16; + final double tmpHeight = getHeight(stringBounder) - ypos; + for (Day wink = gantt.getStartingDate(); wink.compareTo(gantt.getEndingDate()) <= 0; wink = wink.increment()) { + final double start = timeScale.getStartingPosition(wink); + final double end = timeScale.getEndingPosition(wink); + final UShape rect = URectangle.build(end - start, tmpHeight); + if (res.isClosedAt(wink)) + ug.apply(HColors.LIGHT_GRAY.bg()).apply(new UTranslate(start, ypos)).draw(rect); + + } + + final TextBlock title = Display.getWithNewlines(res.getName()).create(getFontConfiguration(13), + HorizontalAlignment.LEFT, new SpriteContainerEmpty()); + title.drawU(ug); + final ULine line = ULine.hline(timeScale.getEndingPosition(max) - timeScale.getStartingPosition(min)); + ug.apply(HColors.BLACK).apply(UTranslate.dy(title.calculateDimension(ug.getStringBounder()).getHeight())) + .draw(line); + + final LabelStrategy labelStrategy = new LabelStrategy(LabelPosition.LEGACY, HorizontalAlignment.LEFT); + + for (TaskDrawRegular draw : gantt.getAllTasksForResource(res)) { + draw.drawShape(ug.apply(UTranslate.dy(ypos + getTopMarginBetweenTask()))); + draw.drawTitle(ug.apply(UTranslate.dy(ypos + getTopMarginBetweenTask())), labelStrategy, 10, 100); + ypos += draw.getShapeHeight(stringBounder) + getMarginBetweenTask(); + } + } + + @Override + public double getHeight(StringBounder stringBounder) { + double ypos = 16; + for (TaskDrawRegular draw : gantt.getAllTasksForResource(res)) + ypos += draw.getShapeHeight(stringBounder) + getMarginBetweenTask(); + + return ypos + 8; + } + + private double getTopMarginBetweenTask() { + return 2; + } + + private double getMarginBetweenTask() { + return 4; + } + + private FontConfiguration getFontConfiguration(int size) { + return getFontConfiguration(size, HColors.BLACK); + } + + private FontConfiguration getFontConfiguration(int size, HColor color) { + final UFont font = UFont.serif(size); + return FontConfiguration.create(font, color, color, null); + } + + @Override + public final double getY() { + return y; + } + +} diff --git a/src/net/sourceforge/plantuml/project/draw/TaskDrawRegular.java b/src/net/sourceforge/plantuml/project/draw/TaskDrawRegular.java index ebe606c9a..cf3cb4cab 100644 --- a/src/net/sourceforge/plantuml/project/draw/TaskDrawRegular.java +++ b/src/net/sourceforge/plantuml/project/draw/TaskDrawRegular.java @@ -101,7 +101,7 @@ public class TaskDrawRegular extends AbstractTaskDraw { } @Override - protected double getShapeHeight(StringBounder stringBounder) { + public double getShapeHeight(StringBounder stringBounder) { final Style style = getStyle(); final ClockwiseTopRightBottomLeft padding = style.getPadding(); return padding.getTop() + getTitle().calculateDimension(stringBounder).getHeight() + padding.getBottom(); @@ -170,7 +170,6 @@ public class TaskDrawRegular extends AbstractTaskDraw { final double startPos = timeScale.getStartingPosition(start); drawNote(ug.apply((new UTranslate(startPos, getYNotePosition(ug.getStringBounder()))))); - ug = applyColors(ug); drawShape(ug); } @@ -256,7 +255,8 @@ public class TaskDrawRegular extends AbstractTaskDraw { return endPos; } - private void drawShape(UGraphic ug) { + public void drawShape(UGraphic ug) { + ug = applyColors(ug); final Style style = getStyleSignature().getMergedStyle(getStyleBuilder()); final ClockwiseTopRightBottomLeft margin = style.getMargin(); diff --git a/src/net/sourceforge/plantuml/project/draw/TimeHeader.java b/src/net/sourceforge/plantuml/project/draw/TimeHeader.java index ab995c7e4..b50138d03 100644 --- a/src/net/sourceforge/plantuml/project/draw/TimeHeader.java +++ b/src/net/sourceforge/plantuml/project/draw/TimeHeader.java @@ -35,12 +35,8 @@ */ package net.sourceforge.plantuml.project.draw; -import java.util.Objects; - -import net.sourceforge.plantuml.klimt.UStroke; import net.sourceforge.plantuml.klimt.UTranslate; import net.sourceforge.plantuml.klimt.color.HColor; -import net.sourceforge.plantuml.klimt.color.HColorSet; import net.sourceforge.plantuml.klimt.color.HColors; import net.sourceforge.plantuml.klimt.creole.Display; import net.sourceforge.plantuml.klimt.drawing.UGraphic; @@ -51,13 +47,13 @@ import net.sourceforge.plantuml.klimt.shape.TextBlock; import net.sourceforge.plantuml.klimt.shape.ULine; import net.sourceforge.plantuml.klimt.shape.URectangle; import net.sourceforge.plantuml.klimt.sprite.SpriteContainerEmpty; +import net.sourceforge.plantuml.project.TimeHeaderParameters; import net.sourceforge.plantuml.project.time.Day; import net.sourceforge.plantuml.project.timescale.TimeScale; import net.sourceforge.plantuml.style.PName; -import net.sourceforge.plantuml.style.Style; public abstract class TimeHeader { - // ::remove folder when __HAXE__ + // ::remove folder when __HAXE__ protected final double Y_POS_ROW16() { return 16; @@ -68,38 +64,40 @@ public abstract class TimeHeader { } private final TimeScale timeScale; - private final Style closedStyle; - private final Style timelineStyle; - private final HColorSet colorSet; + protected final TimeHeaderParameters thParam; - protected final Day min; - protected final Day max; - - public TimeHeader(Style timelineStyle, Style closedStyle, Day min, Day max, TimeScale timeScale, - HColorSet colorSet) { + public TimeHeader(TimeHeaderParameters thParam, TimeScale timeScale) { + this.thParam = thParam; this.timeScale = timeScale; - this.min = min; - this.max = max; - this.closedStyle = Objects.requireNonNull(closedStyle); - this.timelineStyle = Objects.requireNonNull(timelineStyle); - this.colorSet = colorSet; + } + + protected final boolean isBold2(Day wink) { + return thParam.getVerticalSeparatorBefore().contains(wink); + } + + protected final Day getMin() { + return thParam.getMin(); + } + + protected final Day getMax() { + return thParam.getMax(); } protected final HColor closedBackgroundColor() { - return closedStyle.value(PName.BackGroundColor).asColor(colorSet); + return thParam.getClosedStyle().value(PName.BackGroundColor).asColor(thParam.getColorSet()); } protected final HColor closedFontColor() { - return closedStyle.value(PName.FontColor).asColor(colorSet); + return thParam.getClosedStyle().value(PName.FontColor).asColor(thParam.getColorSet()); } protected final HColor openFontColor() { - return timelineStyle.value(PName.FontColor).asColor(colorSet); + return thParam.getTimelineStyle().value(PName.FontColor).asColor(thParam.getColorSet()); } - protected final HColor getBarColor() { - return timelineStyle.value(PName.LineColor).asColor(colorSet); + protected final HColor getLineColor() { + return thParam.getTimelineStyle().value(PName.LineColor).asColor(thParam.getColorSet()); } public abstract double getTimeHeaderHeight(); @@ -113,18 +111,14 @@ public abstract class TimeHeader { public abstract double getFullHeaderHeight(); protected final void drawHline(UGraphic ug, double y) { - final double xmin = getTimeScale().getStartingPosition(min); - final double xmax = getTimeScale().getEndingPosition(max); + final double xmin = getTimeScale().getStartingPosition(thParam.getMin()); + final double xmax = getTimeScale().getEndingPosition(thParam.getMax()); final ULine hline = ULine.hline(xmax - xmin); - ug.apply(getBarColor()).apply(UTranslate.dy(y)).draw(hline); + ug.apply(getLineColor()).apply(UTranslate.dy(y)).draw(hline); } - protected final void drawVbar(UGraphic ug, double x, double y1, double y2, boolean bold) { + protected final void drawVline(UGraphic ug, double x, double y1, double y2) { final ULine vbar = ULine.vline(y2 - y1); - if (bold) - ug = goBold(ug); - else - ug = ug.apply(getBarColor()); ug.apply(new UTranslate(x, y1)).draw(vbar); } @@ -175,8 +169,12 @@ public abstract class TimeHeader { ug.draw(URectangle.build(x2 - x1, height)); } - protected final UGraphic goBold(UGraphic ug) { - return ug.apply(HColors.BLACK).apply(UStroke.withThickness(2)); + protected void printVerticalSeparators(UGraphic ug, double totalHeightWithoutFooter) { + ug = thParam.forVerticalSeparator(ug); + for (Day wink = getMin(); wink.compareTo(getMax()) <= 0; wink = wink.increment()) + if (isBold2(wink)) + drawVline(ug, getTimeScale().getStartingPosition(wink), getFullHeaderHeight(), + totalHeightWithoutFooter); } } diff --git a/src/net/sourceforge/plantuml/project/draw/TimeHeaderCalendar.java b/src/net/sourceforge/plantuml/project/draw/TimeHeaderCalendar.java index 3d8274958..ff606e347 100644 --- a/src/net/sourceforge/plantuml/project/draw/TimeHeaderCalendar.java +++ b/src/net/sourceforge/plantuml/project/draw/TimeHeaderCalendar.java @@ -45,16 +45,8 @@ import net.sourceforge.plantuml.project.timescale.TimeScale; public abstract class TimeHeaderCalendar extends TimeHeader { - private final TimeHeaderParameters thParam; - public TimeHeaderCalendar(TimeHeaderParameters thParam, TimeScale timeScale) { - super(thParam.getTimelineStyle(), thParam.getClosedStyle(), thParam.getMin(), thParam.getMax(), timeScale, - thParam.getColorSet()); - this.thParam = thParam; - } - - protected final boolean isBold(Day wink) { - return thParam.getVerticalSeparatorBefore().contains(wink); + super(thParam, timeScale); } protected final Locale locale() { @@ -64,7 +56,7 @@ public abstract class TimeHeaderCalendar extends TimeHeader { protected final int getLoadAt(Day instant) { return thParam.getLoadPlanable().getLoadAt(instant); } - + // Duplicate in TimeHeaderSimple class Pending { final double x1; @@ -87,7 +79,7 @@ public abstract class TimeHeaderCalendar extends TimeHeader { final double height = totalHeightWithoutFooter - getFullHeaderHeight(); Pending pending = null; - for (Day wink = min; wink.compareTo(max) <= 0; wink = wink.increment()) { + for (Day wink = getMin(); wink.compareTo(getMax()) <= 0; wink = wink.increment()) { final double x1 = getTimeScale().getStartingPosition(wink); final double x2 = getTimeScale().getEndingPosition(wink); HColor back = thParam.getColor(wink); diff --git a/src/net/sourceforge/plantuml/project/draw/TimeHeaderDaily.java b/src/net/sourceforge/plantuml/project/draw/TimeHeaderDaily.java index 8fd5bf794..55f04437c 100644 --- a/src/net/sourceforge/plantuml/project/draw/TimeHeaderDaily.java +++ b/src/net/sourceforge/plantuml/project/draw/TimeHeaderDaily.java @@ -70,7 +70,7 @@ public class TimeHeaderDaily extends TimeHeaderCalendar { drawTextsDayOfWeek(ug.apply(UTranslate.dy(Y_POS_ROW16()))); drawTextDayOfMonth(ug.apply(UTranslate.dy(Y_POS_ROW28()))); drawMonths(ug); - printSmallVbars(ug, totalHeightWithoutFooter); + printVerticalSeparators(ug, totalHeightWithoutFooter); printNamedDays(ug); @@ -78,12 +78,20 @@ public class TimeHeaderDaily extends TimeHeaderCalendar { drawHline(ug, totalHeightWithoutFooter); } - private void printSmallVbars(final UGraphic ug, double totalHeightWithoutFooter) { - for (Day wink = min; wink.compareTo(max) <= 0; wink = wink.increment()) - drawVbar(ug, getTimeScale().getStartingPosition(wink), getFullHeaderHeight(), totalHeightWithoutFooter, - isBold(wink)); + @Override + protected void printVerticalSeparators(final UGraphic ug, double totalHeightWithoutFooter) { + final UGraphic ugVerticalSeparator = thParam.forVerticalSeparator(ug); + final UGraphic ugLineColor = ug.apply(getLineColor()); + for (Day wink = getMin(); wink.compareTo(getMax()) <= 0; wink = wink.increment()) + if (isBold2(wink)) + drawVline(ugVerticalSeparator, getTimeScale().getStartingPosition(wink), getFullHeaderHeight(), + totalHeightWithoutFooter); + else + drawVline(ugLineColor, getTimeScale().getStartingPosition(wink), getFullHeaderHeight(), + totalHeightWithoutFooter); - drawVbar(ug, getTimeScale().getEndingPosition(max), getFullHeaderHeight(), totalHeightWithoutFooter, false); + drawVline(ugLineColor, getTimeScale().getEndingPosition(getMax()), getFullHeaderHeight(), + totalHeightWithoutFooter); } @Override @@ -94,7 +102,7 @@ public class TimeHeaderDaily extends TimeHeaderCalendar { } private void drawTextsDayOfWeek(UGraphic ug) { - for (Day wink = min; wink.compareTo(max) <= 0; wink = wink.increment()) { + for (Day wink = getMin(); wink.compareTo(getMax()) <= 0; wink = wink.increment()) { final double x1 = getTimeScale().getStartingPosition(wink); final double x2 = getTimeScale().getEndingPosition(wink); final HColor textColor = getTextBackColor(wink); @@ -103,7 +111,7 @@ public class TimeHeaderDaily extends TimeHeaderCalendar { } private void drawTextDayOfMonth(UGraphic ug) { - for (Day wink = min; wink.compareTo(max) <= 0; wink = wink.increment()) { + for (Day wink = getMin(); wink.compareTo(getMax()) <= 0; wink = wink.increment()) { final double x1 = getTimeScale().getStartingPosition(wink); final double x2 = getTimeScale().getEndingPosition(wink); final HColor textColor = getTextBackColor(wink); @@ -121,7 +129,7 @@ public class TimeHeaderDaily extends TimeHeaderCalendar { private void drawMonths(final UGraphic ug) { MonthYear last = null; double lastChangeMonth = -1; - for (Day wink = min; wink.compareTo(max) <= 0; wink = wink.increment()) { + for (Day wink = getMin(); wink.compareTo(getMax()) <= 0; wink = wink.increment()) { final double x1 = getTimeScale().getStartingPosition(wink); if (wink.monthYear().equals(last) == false) { if (last != null) @@ -131,7 +139,7 @@ public class TimeHeaderDaily extends TimeHeaderCalendar { last = wink.monthYear(); } } - final double x1 = getTimeScale().getStartingPosition(max.increment()); + final double x1 = getTimeScale().getStartingPosition(getMax().increment()); if (x1 > lastChangeMonth) printMonth(ug, last, lastChangeMonth, x1); @@ -147,7 +155,7 @@ public class TimeHeaderDaily extends TimeHeaderCalendar { private void printNamedDays(final UGraphic ug) { if (nameDays.size() > 0) { String last = null; - for (Day wink = min; wink.compareTo(max.increment()) <= 0; wink = wink.increment()) { + for (Day wink = getMin(); wink.compareTo(getMax().increment()) <= 0; wink = wink.increment()) { final String name = nameDays.get(wink); if (name != null && name.equals(last) == false) { final double x1 = getTimeScale().getStartingPosition(wink); diff --git a/src/net/sourceforge/plantuml/project/draw/TimeHeaderMonthly.java b/src/net/sourceforge/plantuml/project/draw/TimeHeaderMonthly.java index d8d6e2d67..fc6c99771 100644 --- a/src/net/sourceforge/plantuml/project/draw/TimeHeaderMonthly.java +++ b/src/net/sourceforge/plantuml/project/draw/TimeHeaderMonthly.java @@ -62,19 +62,12 @@ public class TimeHeaderMonthly extends TimeHeaderCalendar { drawTextsBackground(ug, totalHeightWithoutFooter); drawYears(ug); drawMonths(ug.apply(UTranslate.dy(16))); - printSmallVbars(ug, totalHeightWithoutFooter); + printVerticalSeparators(ug, totalHeightWithoutFooter); drawHline(ug, 0); drawHline(ug, 16); drawHline(ug, getFullHeaderHeight()); } - private void printSmallVbars(final UGraphic ug, double totalHeightWithoutFooter) { - for (Day wink = min; wink.compareTo(max) <= 0; wink = wink.increment()) - if (isBold(wink)) - drawVbar(ug, getTimeScale().getStartingPosition(wink), getFullHeaderHeight(), totalHeightWithoutFooter, - isBold(wink)); - } - @Override public void drawTimeFooter(UGraphic ug) { ug = ug.apply(UTranslate.dy(3)); @@ -88,43 +81,43 @@ public class TimeHeaderMonthly extends TimeHeaderCalendar { private void drawYears(final UGraphic ug) { MonthYear last = null; double lastChange = -1; - for (Day wink = min; wink.compareTo(max) < 0; wink = wink.increment()) { + for (Day wink = getMin(); wink.compareTo(getMax()) < 0; wink = wink.increment()) { final double x1 = getTimeScale().getStartingPosition(wink); if (last == null || wink.monthYear().year() != last.year()) { - drawVbar(ug, x1, 0, 15, false); - if (last != null) { + drawVline(ug.apply(getLineColor()), x1, 0, 15); + if (last != null) printYear(ug, last, lastChange, x1); - } + lastChange = x1; last = wink.monthYear(); } } - final double x1 = getTimeScale().getStartingPosition(max.increment()); - if (x1 > lastChange) { + final double x1 = getTimeScale().getStartingPosition(getMax().increment()); + if (x1 > lastChange) printYear(ug, last, lastChange, x1); - } - drawVbar(ug, getTimeScale().getEndingPosition(max), 0, 15, false); + + drawVline(ug.apply(getLineColor()), getTimeScale().getEndingPosition(getMax()), (double) 0, (double) 15); } private void drawMonths(UGraphic ug) { MonthYear last = null; double lastChange = -1; - for (Day wink = min; wink.compareTo(max) < 0; wink = wink.increment()) { + for (Day wink = getMin(); wink.compareTo(getMax()) < 0; wink = wink.increment()) { final double x1 = getTimeScale().getStartingPosition(wink); if (wink.monthYear().equals(last) == false) { - drawVbar(ug, x1, 0, 12, false); - if (last != null) { + drawVline(ug.apply(getLineColor()), x1, (double) 0, (double) 12); + if (last != null) printMonth(ug, last, lastChange, x1); - } + lastChange = x1; last = wink.monthYear(); } } - final double x1 = getTimeScale().getStartingPosition(max.increment()); - if (x1 > lastChange) { + final double x1 = getTimeScale().getStartingPosition(getMax().increment()); + if (x1 > lastChange) printMonth(ug, last, lastChange, x1); - } - drawVbar(ug, getTimeScale().getEndingPosition(max), 0, 12, false); + + drawVline(ug.apply(getLineColor()), getTimeScale().getEndingPosition(getMax()), (double) 0, (double) 12); } private void printYear(UGraphic ug, MonthYear monthYear, double start, double end) { diff --git a/src/net/sourceforge/plantuml/project/draw/TimeHeaderQuarterly.java b/src/net/sourceforge/plantuml/project/draw/TimeHeaderQuarterly.java index dcf03c017..b19cdad98 100644 --- a/src/net/sourceforge/plantuml/project/draw/TimeHeaderQuarterly.java +++ b/src/net/sourceforge/plantuml/project/draw/TimeHeaderQuarterly.java @@ -62,19 +62,12 @@ public class TimeHeaderQuarterly extends TimeHeaderCalendar { drawTextsBackground(ug, totalHeightWithoutFooter); drawYears(ug); drawQuarters(ug.apply(UTranslate.dy(16))); - printSmallVbars(ug, totalHeightWithoutFooter); + printVerticalSeparators(ug, totalHeightWithoutFooter); drawHline(ug, 0); drawHline(ug, 16); drawHline(ug, getFullHeaderHeight()); } - private void printSmallVbars(final UGraphic ug, double totalHeightWithoutFooter) { - for (Day wink = min; wink.compareTo(max) <= 0; wink = wink.increment()) - if (isBold(wink)) - drawVbar(ug, getTimeScale().getStartingPosition(wink), getFullHeaderHeight(), totalHeightWithoutFooter, - isBold(wink)); - } - @Override public void drawTimeFooter(UGraphic ug) { ug = ug.apply(UTranslate.dy(3)); @@ -88,43 +81,43 @@ public class TimeHeaderQuarterly extends TimeHeaderCalendar { private void drawYears(final UGraphic ug) { MonthYear last = null; double lastChange = -1; - for (Day wink = min; wink.compareTo(max) < 0; wink = wink.increment()) { + for (Day wink = getMin(); wink.compareTo(getMax()) < 0; wink = wink.increment()) { final double x1 = getTimeScale().getStartingPosition(wink); if (last == null || wink.monthYear().year() != last.year()) { - drawVbar(ug, x1, 0, 15, false); - if (last != null) { + drawVline(ug.apply(getLineColor()), x1, (double) 0, (double) 15); + if (last != null) printYear(ug, last, lastChange, x1); - } + lastChange = x1; last = wink.monthYear(); } } - final double x1 = getTimeScale().getStartingPosition(max.increment()); - if (x1 > lastChange) { + final double x1 = getTimeScale().getStartingPosition(getMax().increment()); + if (x1 > lastChange) printYear(ug, last, lastChange, x1); - } - drawVbar(ug, getTimeScale().getEndingPosition(max), 0, 15, false); + + drawVline(ug.apply(getLineColor()), getTimeScale().getEndingPosition(getMax()), (double) 0, (double) 15); } private void drawQuarters(UGraphic ug) { String last = null; double lastChange = -1; - for (Day wink = min; wink.compareTo(max) < 0; wink = wink.increment()) { + for (Day wink = getMin(); wink.compareTo(getMax()) < 0; wink = wink.increment()) { final double x1 = getTimeScale().getStartingPosition(wink); if (quarter(wink).equals(last) == false) { - drawVbar(ug, x1, 0, 12, false); - if (last != null) { + drawVline(ug.apply(getLineColor()), x1, (double) 0, (double) 12); + if (last != null) printQuarter(ug, last, lastChange, x1); - } + lastChange = x1; last = quarter(wink); } } - final double x1 = getTimeScale().getStartingPosition(max.increment()); - if (x1 > lastChange) { + final double x1 = getTimeScale().getStartingPosition(getMax().increment()); + if (x1 > lastChange) printQuarter(ug, last, lastChange, x1); - } - drawVbar(ug, getTimeScale().getEndingPosition(max), 0, 12, false); + + drawVline(ug.apply(getLineColor()), getTimeScale().getEndingPosition(getMax()), (double) 0, (double) 12); } private String quarter(Day day) { diff --git a/src/net/sourceforge/plantuml/project/draw/TimeHeaderSimple.java b/src/net/sourceforge/plantuml/project/draw/TimeHeaderSimple.java index a4a68f26f..7d23798ea 100644 --- a/src/net/sourceforge/plantuml/project/draw/TimeHeaderSimple.java +++ b/src/net/sourceforge/plantuml/project/draw/TimeHeaderSimple.java @@ -35,8 +35,6 @@ */ package net.sourceforge.plantuml.project.draw; -import java.util.Set; - import net.sourceforge.plantuml.klimt.UTranslate; import net.sourceforge.plantuml.klimt.color.HColor; import net.sourceforge.plantuml.klimt.creole.Display; @@ -53,9 +51,7 @@ import net.sourceforge.plantuml.project.timescale.TimeScaleWink; public class TimeHeaderSimple extends TimeHeader { - private final TimeHeaderParameters colorDays; private final PrintScale printScale; - private final Set verticalSeparators; @Override public double getFullHeaderHeight() { @@ -75,37 +71,21 @@ public class TimeHeaderSimple extends TimeHeader { } public TimeHeaderSimple(TimeHeaderParameters thParam, PrintScale printScale) { - super(thParam.getTimelineStyle(), thParam.getClosedStyle(), thParam.getMin(), thParam.getMax(), - new TimeScaleWink(thParam.getScale(), printScale), thParam.getColorSet()); - this.colorDays = thParam; + super(thParam, new TimeScaleWink(thParam.getScale(), printScale)); this.printScale = printScale; - this.verticalSeparators = thParam.getVerticalSeparatorBefore(); - } - - private boolean isBold(Day wink) { - return verticalSeparators.contains(wink); - } - - private void drawSeparatorsDay(UGraphic ug, TimeScale timeScale, double totalHeightWithoutFooter) { - final ULine vbar = ULine.vline(totalHeightWithoutFooter - getFullHeaderHeight() + 2); - ug = goBold(ug).apply(UTranslate.dy(getFullHeaderHeight() - 1)); - for (Day i = min; i.compareTo(max.increment()) <= 0; i = i.increment(printScale)) - if (isBold(i)) { - final double x1 = timeScale.getStartingPosition(i); - ug.apply(UTranslate.dx(x1)).draw(vbar); - } } private void drawSmallVlinesDay(UGraphic ug, TimeScale timeScale, double totalHeightWithoutFooter) { + ug = ug.apply(getLineColor()); final ULine vbar = ULine.vline(totalHeightWithoutFooter); - for (Day i = min; i.compareTo(max.increment()) <= 0; i = i.increment(printScale)) { + for (Day i = getMin(); i.compareTo(getMax().increment()) <= 0; i = i.increment(printScale)) { final double x1 = timeScale.getStartingPosition(i); - ug.apply(getBarColor()).apply(UTranslate.dx(x1)).draw(vbar); + ug.apply(UTranslate.dx(x1)).draw(vbar); } } private void drawSimpleDayCounter(UGraphic ug, TimeScale timeScale) { - for (Day i = min; i.compareTo(max.increment()) <= 0; i = i.increment(printScale)) { + for (Day i = getMin(); i.compareTo(getMax().increment()) <= 0; i = i.increment(printScale)) { final int value; if (printScale == PrintScale.WEEKLY) value = i.getAbsoluteDayNum() / 7 + 1; @@ -122,33 +102,34 @@ public class TimeHeaderSimple extends TimeHeader { x2 = timeScale.getEndingPosition(i); final double width = num.calculateDimension(ug.getStringBounder()).getWidth(); final double delta = (x2 - x1) - width; - if (i.compareTo(max.increment()) < 0) + if (i.compareTo(getMax().increment()) < 0) num.drawU(ug.apply(UTranslate.dx(x1 + delta / 2))); } } @Override - public void drawTimeHeader(final UGraphic ug, double totalHeightWithoutFooter) { + public void drawTimeHeader(UGraphic ug, double totalHeightWithoutFooter) { drawTextsBackground(ug.apply(UTranslate.dy(-3)), totalHeightWithoutFooter + 6); - final double xmin = getTimeScale().getStartingPosition(min); - final double xmax = getTimeScale().getEndingPosition(max); + final double xmin = getTimeScale().getStartingPosition(getMin()); + final double xmax = getTimeScale().getEndingPosition(getMax()); drawSmallVlinesDay(ug, getTimeScale(), totalHeightWithoutFooter + 2); - drawSeparatorsDay(ug, getTimeScale(), totalHeightWithoutFooter); + printVerticalSeparators(ug, totalHeightWithoutFooter); drawSimpleDayCounter(ug, getTimeScale()); - ug.apply(getBarColor()).draw(ULine.hline(xmax - xmin)); - ug.apply(getBarColor()).apply(UTranslate.dy(getFullHeaderHeight() - 3)).draw(ULine.hline(xmax - xmin)); + ug = ug.apply(getLineColor()); + ug.draw(ULine.hline(xmax - xmin)); + ug.apply(UTranslate.dy(getFullHeaderHeight() - 3)).draw(ULine.hline(xmax - xmin)); } @Override public void drawTimeFooter(UGraphic ug) { - final double xmin = getTimeScale().getStartingPosition(min); - final double xmax = getTimeScale().getEndingPosition(max); + final double xmin = getTimeScale().getStartingPosition(getMin()); + final double xmax = getTimeScale().getEndingPosition(getMax()); ug = ug.apply(UTranslate.dy(3)); drawSmallVlinesDay(ug, getTimeScale(), getTimeFooterHeight() - 3); drawSimpleDayCounter(ug, getTimeScale()); - ug.apply(getBarColor()).draw(ULine.hline(xmax - xmin)); + ug.apply(getLineColor()).draw(ULine.hline(xmax - xmin)); } // Duplicate in TimeHeaderDaily @@ -173,10 +154,10 @@ public class TimeHeaderSimple extends TimeHeader { final double height = totalHeightWithoutFooter - getFullHeaderHeight(); Pending pending = null; - for (Day wink = min; wink.compareTo(max) <= 0; wink = wink.increment()) { + for (Day wink = getMin(); wink.compareTo(getMax()) <= 0; wink = wink.increment()) { final double x1 = getTimeScale().getStartingPosition(wink); final double x2 = getTimeScale().getEndingPosition(wink); - HColor back = colorDays.getColor(wink); + HColor back = thParam.getColor(wink); // // Day of week should be stronger than period of time (back color). // final HColor backDoW = colorDaysOfWeek.get(wink.getDayOfWeek()); // if (backDoW != null) { diff --git a/src/net/sourceforge/plantuml/project/draw/TimeHeaderWeekly.java b/src/net/sourceforge/plantuml/project/draw/TimeHeaderWeekly.java index aa8374632..53688b08c 100644 --- a/src/net/sourceforge/plantuml/project/draw/TimeHeaderWeekly.java +++ b/src/net/sourceforge/plantuml/project/draw/TimeHeaderWeekly.java @@ -82,47 +82,43 @@ public class TimeHeaderWeekly extends TimeHeaderCalendar { private void drawCalendar(final UGraphic ug, double totalHeightWithoutFooter) { printDaysOfMonth(ug); - printSmallVbars(ug, totalHeightWithoutFooter); + printVerticalSeparators(ug, totalHeightWithoutFooter); printMonths(ug); } private void printMonths(final UGraphic ug) { MonthYear last = null; double lastChangeMonth = -1; - for (Day wink = min; wink.compareTo(max) < 0; wink = wink.increment()) { + for (Day wink = getMin(); wink.compareTo(getMax()) < 0; wink = wink.increment()) { final double x1 = getTimeScale().getStartingPosition(wink); if (wink.monthYear().equals(last) == false) { - drawVbar(ug, x1, 0, Y_POS_ROW16(), false); - if (last != null) { + drawVline(ug.apply(getLineColor()), x1, (double) 0, Y_POS_ROW16()); + if (last != null) printMonth(ug, last, lastChangeMonth, x1); - } + lastChangeMonth = x1; last = wink.monthYear(); } } - drawVbar(ug, getTimeScale().getEndingPosition(max), 0, Y_POS_ROW16(), false); - final double x1 = getTimeScale().getStartingPosition(max.increment()); - if (x1 > lastChangeMonth) { + drawVline(ug.apply(getLineColor()), getTimeScale().getEndingPosition(getMax()), (double) 0, Y_POS_ROW16()); + final double x1 = getTimeScale().getStartingPosition(getMax().increment()); + if (x1 > lastChangeMonth) printMonth(ug, last, lastChangeMonth, x1); - } + } - private void printSmallVbars(final UGraphic ug, double totalHeightWithoutFooter) { - for (Day wink = min; wink.compareTo(max) <= 0; wink = wink.increment()) + @Override + protected void printVerticalSeparators(final UGraphic ug, double totalHeightWithoutFooter) { + for (Day wink = getMin(); wink.compareTo(getMax()) <= 0; wink = wink.increment()) if (wink.getDayOfWeek() == weekNumberStrategy.getFirstDayOfWeek()) - drawVbar(ug, getTimeScale().getStartingPosition(wink), Y_POS_ROW16(), totalHeightWithoutFooter, false); - - drawVbar(ug, getTimeScale().getEndingPosition(max), Y_POS_ROW16(), totalHeightWithoutFooter, false); - - for (Day wink = min; wink.compareTo(max) <= 0; wink = wink.increment()) - if (isBold(wink)) - drawVbar(ug, getTimeScale().getStartingPosition(wink), getFullHeaderHeight(), totalHeightWithoutFooter, - isBold(wink)); + drawVline(ug.apply(getLineColor()), getTimeScale().getStartingPosition(wink), Y_POS_ROW16(), totalHeightWithoutFooter); + drawVline(ug.apply(getLineColor()), getTimeScale().getEndingPosition(getMax()), Y_POS_ROW16(), totalHeightWithoutFooter); + super.printVerticalSeparators(ug, totalHeightWithoutFooter); } private void printDaysOfMonth(final UGraphic ug) { - for (Day wink = min; wink.compareTo(max) < 0; wink = wink.increment()) { + for (Day wink = getMin(); wink.compareTo(getMax()) < 0; wink = wink.increment()) { if (wink.getDayOfWeek() == weekNumberStrategy.getFirstDayOfWeek()) { final String num; if (withCalendarDate) diff --git a/src/net/sourceforge/plantuml/project/draw/TimeHeaderYearly.java b/src/net/sourceforge/plantuml/project/draw/TimeHeaderYearly.java index 9d537fd41..04b25e86c 100644 --- a/src/net/sourceforge/plantuml/project/draw/TimeHeaderYearly.java +++ b/src/net/sourceforge/plantuml/project/draw/TimeHeaderYearly.java @@ -61,18 +61,11 @@ public class TimeHeaderYearly extends TimeHeaderCalendar { public void drawTimeHeader(final UGraphic ug, double totalHeightWithoutFooter) { drawTextsBackground(ug, totalHeightWithoutFooter); drawYears(ug); - printSmallVbars(ug, totalHeightWithoutFooter); + printVerticalSeparators(ug, totalHeightWithoutFooter); drawHline(ug, 0); drawHline(ug, getFullHeaderHeight()); } - private void printSmallVbars(final UGraphic ug, double totalHeightWithoutFooter) { - for (Day wink = min; wink.compareTo(max) <= 0; wink = wink.increment()) - if (isBold(wink)) - drawVbar(ug, getTimeScale().getStartingPosition(wink), getFullHeaderHeight(), totalHeightWithoutFooter, - isBold(wink)); - } - @Override public void drawTimeFooter(UGraphic ug) { ug = ug.apply(UTranslate.dy(3)); @@ -84,22 +77,22 @@ public class TimeHeaderYearly extends TimeHeaderCalendar { private void drawYears(final UGraphic ug) { MonthYear last = null; double lastChange = -1; - for (Day wink = min; wink.compareTo(max) < 0; wink = wink.increment()) { + for (Day wink = getMin(); wink.compareTo(getMax()) < 0; wink = wink.increment()) { final double x1 = getTimeScale().getStartingPosition(wink); if (last == null || wink.monthYear().year() != last.year()) { - drawVbar(ug, x1, 0, 19, false); - if (last != null) { + drawVline(ug.apply(getLineColor()), x1, (double) 0, (double) 19); + if (last != null) printYear(ug, last, lastChange, x1); - } + lastChange = x1; last = wink.monthYear(); } } - final double x1 = getTimeScale().getStartingPosition(max.increment()); - if (x1 > lastChange) { + final double x1 = getTimeScale().getStartingPosition(getMax().increment()); + if (x1 > lastChange) printYear(ug, last, lastChange, x1); - } - drawVbar(ug, getTimeScale().getEndingPosition(max), 0, 19, false); + + drawVline(ug.apply(getLineColor()), getTimeScale().getEndingPosition(getMax()), (double) 0, (double) 19); } private void printYear(UGraphic ug, MonthYear monthYear, double start, double end) { diff --git a/src/net/sourceforge/plantuml/project/lang/ComplementDate.java b/src/net/sourceforge/plantuml/project/lang/ComplementDate.java index ae52dfdb0..701f15dfc 100644 --- a/src/net/sourceforge/plantuml/project/lang/ComplementDate.java +++ b/src/net/sourceforge/plantuml/project/lang/ComplementDate.java @@ -47,7 +47,35 @@ import net.sourceforge.plantuml.regex.RegexResult; public class ComplementDate implements Something { + private final Type type; + + static enum Type { + ANY, ONLY_RELATIVE, ONLY_ABSOLUTE; + } + + private ComplementDate(Type type) { + this.type = type; + } + + public static ComplementDate any() { + return new ComplementDate(Type.ANY); + } + + public static ComplementDate onlyRelative() { + return new ComplementDate(Type.ONLY_RELATIVE); + } + + public static ComplementDate onlyAbsolute() { + return new ComplementDate(Type.ONLY_ABSOLUTE); + } + public IRegex toRegex(String suffix) { + switch (type) { + case ONLY_ABSOLUTE: + return new RegexOr(toRegexA(suffix), toRegexB(suffix), toRegexC(suffix)); + case ONLY_RELATIVE: + return new RegexOr(toRegexD(suffix), toRegexE(suffix)); + } return new RegexOr(toRegexA(suffix), toRegexB(suffix), toRegexC(suffix), toRegexD(suffix), toRegexE(suffix)); } @@ -98,21 +126,21 @@ public class ComplementDate implements Something { } public Failable getMe(GanttDiagram system, RegexResult arg, String suffix) { - if (arg.get("ADAY" + suffix, 0) != null) { + if (arg.get("ADAY" + suffix, 0) != null) return Failable.ok(resultA(arg, suffix)); - } - if (arg.get("BDAY" + suffix, 0) != null) { + + if (arg.get("BDAY" + suffix, 0) != null) return Failable.ok(resultB(arg, suffix)); - } - if (arg.get("CDAY" + suffix, 0) != null) { + + if (arg.get("CDAY" + suffix, 0) != null) return Failable.ok(resultC(arg, suffix)); - } - if (arg.get("DCOUNT" + suffix, 0) != null) { + + if (arg.get("DCOUNT" + suffix, 0) != null) return Failable.ok(resultD(system, arg, suffix)); - } - if (arg.get("ECOUNT" + suffix, 0) != null) { + + if (arg.get("ECOUNT" + suffix, 0) != null) return Failable.ok(resultE(system, arg, suffix)); - } + throw new IllegalStateException(); } diff --git a/src/net/sourceforge/plantuml/project/lang/SentenceHappensDate.java b/src/net/sourceforge/plantuml/project/lang/SentenceHappensDate.java index 2d1b81ead..456935ae1 100644 --- a/src/net/sourceforge/plantuml/project/lang/SentenceHappensDate.java +++ b/src/net/sourceforge/plantuml/project/lang/SentenceHappensDate.java @@ -44,7 +44,7 @@ import net.sourceforge.plantuml.project.time.Day; public class SentenceHappensDate extends SentenceSimple { public SentenceHappensDate() { - super(SubjectTask.ME, Verbs.happens, new ComplementDate()); + super(SubjectTask.ME, Verbs.happens, ComplementDate.any()); } @Override diff --git a/src/net/sourceforge/plantuml/project/lang/SentencePausesDate.java b/src/net/sourceforge/plantuml/project/lang/SentencePausesDate.java index bc311db46..97ceea3a1 100644 --- a/src/net/sourceforge/plantuml/project/lang/SentencePausesDate.java +++ b/src/net/sourceforge/plantuml/project/lang/SentencePausesDate.java @@ -43,7 +43,7 @@ import net.sourceforge.plantuml.project.time.Day; public class SentencePausesDate extends SentenceSimple { public SentencePausesDate() { - super(SubjectTask.ME, Verbs.pauses, new ComplementDate()); + super(SubjectTask.ME, Verbs.pauses, ComplementDate.any()); } @Override diff --git a/src/net/sourceforge/plantuml/project/lang/SentenceTaskEndsAbsolute.java b/src/net/sourceforge/plantuml/project/lang/SentenceTaskEndsAbsolute.java index 484f7a41b..a01539449 100644 --- a/src/net/sourceforge/plantuml/project/lang/SentenceTaskEndsAbsolute.java +++ b/src/net/sourceforge/plantuml/project/lang/SentenceTaskEndsAbsolute.java @@ -43,7 +43,7 @@ import net.sourceforge.plantuml.project.time.Day; public class SentenceTaskEndsAbsolute extends SentenceSimple { public SentenceTaskEndsAbsolute() { - super(SubjectTask.ME, Verbs.ends2, new ComplementDate()); + super(SubjectTask.ME, Verbs.ends2, ComplementDate.any()); } @Override diff --git a/src/net/sourceforge/plantuml/project/lang/SentenceTaskStartsAbsolute.java b/src/net/sourceforge/plantuml/project/lang/SentenceTaskStartsAbsolute.java index e535412e0..492259ec7 100644 --- a/src/net/sourceforge/plantuml/project/lang/SentenceTaskStartsAbsolute.java +++ b/src/net/sourceforge/plantuml/project/lang/SentenceTaskStartsAbsolute.java @@ -43,7 +43,7 @@ import net.sourceforge.plantuml.project.time.Day; public class SentenceTaskStartsAbsolute extends SentenceSimple { public SentenceTaskStartsAbsolute() { - super(SubjectTask.ME, Verbs.starts3, new ComplementDate()); + super(SubjectTask.ME, Verbs.starts3, ComplementDate.any()); } @Override @@ -52,7 +52,7 @@ public class SentenceTaskStartsAbsolute extends SentenceSimple { final Day start = (Day) complement; final Day startingDate = project.getStartingDate(); if (startingDate.getAbsoluteDayNum() == 0) - project.setProjectStartingDate(start); + return CommandExecutionResult.error("No starting date for the project"); task.setStart(start); return CommandExecutionResult.ok(); diff --git a/src/net/sourceforge/plantuml/project/lang/SentenceTaskStartsOnlyRelative.java b/src/net/sourceforge/plantuml/project/lang/SentenceTaskStartsOnlyRelative.java new file mode 100644 index 000000000..bf9d07fae --- /dev/null +++ b/src/net/sourceforge/plantuml/project/lang/SentenceTaskStartsOnlyRelative.java @@ -0,0 +1,58 @@ +/* ======================================================================== + * PlantUML : a free UML diagram generator + * ======================================================================== + * + * (C) Copyright 2009-2024, Arnaud Roques + * + * Project Info: https://plantuml.com + * + * If you like this project or if you find it useful, you can support us at: + * + * https://plantuml.com/patreon (only 1$ per month!) + * https://plantuml.com/paypal + * + * This file is part of PlantUML. + * + * PlantUML is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * PlantUML distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public + * License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. + * + * + * Original Author: Arnaud Roques + * + * + */ +package net.sourceforge.plantuml.project.lang; + +import net.sourceforge.plantuml.command.CommandExecutionResult; +import net.sourceforge.plantuml.project.GanttDiagram; +import net.sourceforge.plantuml.project.core.Task; +import net.sourceforge.plantuml.project.time.Day; + +public class SentenceTaskStartsOnlyRelative extends SentenceSimple { + + public SentenceTaskStartsOnlyRelative() { + super(SubjectTask.ME, Verbs.starts3, ComplementDate.onlyRelative()); + } + + @Override + public CommandExecutionResult execute(GanttDiagram project, Object subject, Object complement) { + final Task task = (Task) subject; + final Day start = (Day) complement; + + task.setStart(start); + return CommandExecutionResult.ok(); + } + +} diff --git a/src/net/sourceforge/plantuml/project/lang/SubjectProject.java b/src/net/sourceforge/plantuml/project/lang/SubjectProject.java index 7b7a29c4d..50a42619f 100644 --- a/src/net/sourceforge/plantuml/project/lang/SubjectProject.java +++ b/src/net/sourceforge/plantuml/project/lang/SubjectProject.java @@ -68,7 +68,7 @@ public class SubjectProject implements Subject { class Starts extends SentenceSimple { public Starts() { - super(SubjectProject.this, Verbs.starts, new ComplementDate()); + super(SubjectProject.this, Verbs.starts, ComplementDate.onlyAbsolute()); } @Override diff --git a/src/net/sourceforge/plantuml/project/lang/SubjectResource.java b/src/net/sourceforge/plantuml/project/lang/SubjectResource.java index 95b813ce9..89e14f57b 100644 --- a/src/net/sourceforge/plantuml/project/lang/SubjectResource.java +++ b/src/net/sourceforge/plantuml/project/lang/SubjectResource.java @@ -63,7 +63,8 @@ public class SubjectResource implements Subject { } public Collection getSentences() { - return Arrays.asList(new IsOffDate(), new IsOffDates(), new IsOffDayOfWeek(), new IsOnDate(), new IsOnDates()); + return Arrays.asList(new IsOffDate(), new IsOffDates(), new IsOffDayOfWeek(), new IsOnDate(), new IsOnDates(), + new IsOffBeforeDate(), new IsOffAfterDate()); } public IRegex toRegex() { @@ -72,10 +73,42 @@ public class SubjectResource implements Subject { ); } + public class IsOffBeforeDate extends SentenceSimple { + + public IsOffBeforeDate() { + super(SubjectResource.this, Verbs.isOffBefore, ComplementDate.any()); + } + + @Override + public CommandExecutionResult execute(GanttDiagram project, Object subject, Object complement) { + final Resource resource = (Resource) subject; + final Day when = (Day) complement; + resource.setOffBeforeDate(when); + return CommandExecutionResult.ok(); + } + + } + + public class IsOffAfterDate extends SentenceSimple { + + public IsOffAfterDate() { + super(SubjectResource.this, Verbs.isOffAfter, ComplementDate.any()); + } + + @Override + public CommandExecutionResult execute(GanttDiagram project, Object subject, Object complement) { + final Resource resource = (Resource) subject; + final Day when = (Day) complement; + resource.setOffAfterDate(when); + return CommandExecutionResult.ok(); + } + + } + public class IsOffDate extends SentenceSimple { public IsOffDate() { - super(SubjectResource.this, Verbs.isOff, new ComplementDate()); + super(SubjectResource.this, Verbs.isOff, ComplementDate.any()); } @Override @@ -123,7 +156,7 @@ public class SubjectResource implements Subject { public class IsOnDate extends SentenceSimple { public IsOnDate() { - super(SubjectResource.this, Verbs.isOn, new ComplementDate()); + super(SubjectResource.this, Verbs.isOn, ComplementDate.any()); } @Override diff --git a/src/net/sourceforge/plantuml/project/lang/SubjectSeparator.java b/src/net/sourceforge/plantuml/project/lang/SubjectSeparator.java index 85344a55f..261e640d4 100644 --- a/src/net/sourceforge/plantuml/project/lang/SubjectSeparator.java +++ b/src/net/sourceforge/plantuml/project/lang/SubjectSeparator.java @@ -69,7 +69,7 @@ public class SubjectSeparator implements Subject { class JustBefore extends SentenceSimple { public JustBefore() { - super(SubjectSeparator.this, Verbs.justBefore, new ComplementDate()); + super(SubjectSeparator.this, Verbs.justBefore, ComplementDate.any()); } @Override @@ -85,7 +85,7 @@ public class SubjectSeparator implements Subject { class JustAfter extends SentenceSimple { public JustAfter() { - super(SubjectSeparator.this, Verbs.justAfter, new ComplementDate()); + super(SubjectSeparator.this, Verbs.justAfter, ComplementDate.any()); } @Override diff --git a/src/net/sourceforge/plantuml/project/lang/SubjectTask.java b/src/net/sourceforge/plantuml/project/lang/SubjectTask.java index b9386bb85..50cc79164 100644 --- a/src/net/sourceforge/plantuml/project/lang/SubjectTask.java +++ b/src/net/sourceforge/plantuml/project/lang/SubjectTask.java @@ -81,11 +81,11 @@ public class SubjectTask implements Subject { public Collection getSentences() { return Arrays.asList(new SentenceLasts(), new SentenceTaskStarts(), new SentenceTaskStartsWithColor(), - new SentenceTaskStartsAbsolute(), new SentenceHappens(), new SentenceHappensDate(), new SentenceEnds(), - new SentenceTaskEndsAbsolute(), new SentenceIsColored(), new SentenceIsColoredForCompletion(), - new SentenceIsDeleted(), new SentenceIsForTask(), new SentenceLinksTo(), new SentenceOccurs(), - new SentenceDisplayOnSameRowAs(), new SentencePausesDate(), new SentencePausesDates(), - new SentencePausesDayOfWeek()); + new SentenceTaskStartsOnlyRelative(), new SentenceTaskStartsAbsolute(), new SentenceHappens(), + new SentenceHappensDate(), new SentenceEnds(), new SentenceTaskEndsAbsolute(), new SentenceIsColored(), + new SentenceIsColoredForCompletion(), new SentenceIsDeleted(), new SentenceIsForTask(), + new SentenceLinksTo(), new SentenceOccurs(), new SentenceDisplayOnSameRowAs(), new SentencePausesDate(), + new SentencePausesDates(), new SentencePausesDayOfWeek()); } public IRegex toRegex() { diff --git a/src/net/sourceforge/plantuml/project/lang/SubjectToday.java b/src/net/sourceforge/plantuml/project/lang/SubjectToday.java index 05c58e6eb..3ee19a018 100644 --- a/src/net/sourceforge/plantuml/project/lang/SubjectToday.java +++ b/src/net/sourceforge/plantuml/project/lang/SubjectToday.java @@ -90,7 +90,7 @@ public class SubjectToday implements Subject { class IsDate extends SentenceSimple { public IsDate() { - super(SubjectToday.this, Verbs.is, new ComplementDate()); + super(SubjectToday.this, Verbs.is, ComplementDate.any()); } @Override diff --git a/src/net/sourceforge/plantuml/project/lang/Verbs.java b/src/net/sourceforge/plantuml/project/lang/Verbs.java index f80c3a88e..58f92eafb 100644 --- a/src/net/sourceforge/plantuml/project/lang/Verbs.java +++ b/src/net/sourceforge/plantuml/project/lang/Verbs.java @@ -70,17 +70,33 @@ public class Verbs { new RegexLeaf("off"), // RegexLeaf.spaceOneOrMore(), // new RegexOr(// + new RegexLeaf("from"), // new RegexLeaf("on"), // new RegexLeaf("for"), // new RegexLeaf("the"), // new RegexLeaf("at") // )); + public static IRegex isOffBefore = new RegexConcat(new RegexLeaf("is"), // + RegexLeaf.spaceOneOrMore(), // + new RegexLeaf("off"), // + RegexLeaf.spaceOneOrMore(), // + new RegexLeaf("before") // + ); + + public static IRegex isOffAfter = new RegexConcat(new RegexLeaf("is"), // + RegexLeaf.spaceOneOrMore(), // + new RegexLeaf("off"), // + RegexLeaf.spaceOneOrMore(), // + new RegexLeaf("after") // + ); + public static IRegex isOn = new RegexConcat(new RegexLeaf("is"), // RegexLeaf.spaceOneOrMore(), // new RegexLeaf("on"), // RegexLeaf.spaceOneOrMore(), // new RegexOr(// + new RegexLeaf("from"), // new RegexLeaf("on"), // new RegexLeaf("for"), // new RegexLeaf("the"), // diff --git a/src/net/sourceforge/plantuml/project/solver/ImpossibleSolvingException.java b/src/net/sourceforge/plantuml/project/solver/ImpossibleSolvingException.java new file mode 100644 index 000000000..c13085fde --- /dev/null +++ b/src/net/sourceforge/plantuml/project/solver/ImpossibleSolvingException.java @@ -0,0 +1,44 @@ +/* ======================================================================== + * PlantUML : a free UML diagram generator + * ======================================================================== + * + * (C) Copyright 2009-2024, Arnaud Roques + * + * Project Info: https://plantuml.com + * + * If you like this project or if you find it useful, you can support us at: + * + * https://plantuml.com/patreon (only 1$ per month!) + * https://plantuml.com/paypal + * + * This file is part of PlantUML. + * + * PlantUML is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * PlantUML distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public + * License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. + * + * + * Original Author: Arnaud Roques + * + * + */ +package net.sourceforge.plantuml.project.solver; + +public class ImpossibleSolvingException extends RuntimeException { + + public ImpossibleSolvingException(String message) { + super(message); + } + +} diff --git a/src/net/sourceforge/plantuml/project/solver/SolverImpl.java b/src/net/sourceforge/plantuml/project/solver/SolverImpl.java index b7898c72b..d20d0d851 100644 --- a/src/net/sourceforge/plantuml/project/solver/SolverImpl.java +++ b/src/net/sourceforge/plantuml/project/solver/SolverImpl.java @@ -41,7 +41,7 @@ import net.sourceforge.plantuml.project.core.TaskAttribute; import net.sourceforge.plantuml.project.time.Day; public class SolverImpl extends AbstractSolver implements Solver { - // ::remove folder when __HAXE__ + // ::remove folder when __HAXE__ private final LoadPlanable loadPlanable; @@ -54,12 +54,17 @@ public class SolverImpl extends AbstractSolver implements Solver { Day current = (Day) values.get(TaskAttribute.START); int fullLoad = ((Load) values.get(TaskAttribute.LOAD)).getFullLoad(); int cpt = 0; + final Day lastDayIfAny = loadPlanable.getLastDayIfAny(); while (fullLoad > 0) { fullLoad -= loadPlanable.getLoadAt(current); current = current.increment(); + if (lastDayIfAny != null && current.compareTo(lastDayIfAny) > 0) + throw new ImpossibleSolvingException( + "Because all resources will be off at some point, we cannot compute any end date for " + + loadPlanable); cpt++; if (cpt > 100000) - throw new IllegalStateException(); + throw new ImpossibleSolvingException("There is an issue in planning your tasks!"); } return current.decrement(); @@ -78,7 +83,7 @@ public class SolverImpl extends AbstractSolver implements Solver { cpt++; if (cpt > 100000) - throw new IllegalStateException(); + throw new ImpossibleSolvingException("There is an issue in planning your tasks!"); } return current.increment(); diff --git a/src/net/sourceforge/plantuml/style/SName.java b/src/net/sourceforge/plantuml/style/SName.java index aa74331bb..96644bffe 100644 --- a/src/net/sourceforge/plantuml/style/SName.java +++ b/src/net/sourceforge/plantuml/style/SName.java @@ -138,7 +138,8 @@ public enum SName { undone, // unstarted, // usecase, // - + verticalSeparator, // + visibilityIcon, // private_, // protected_, // diff --git a/src/net/sourceforge/plantuml/version/Version.java b/src/net/sourceforge/plantuml/version/Version.java index a8d2af927..942297437 100644 --- a/src/net/sourceforge/plantuml/version/Version.java +++ b/src/net/sourceforge/plantuml/version/Version.java @@ -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.13beta2"; + private static final String version = "1.2023.13beta3"; public static String versionString() { return version; From 422c74eba49abaad0fd5c601ee17a362775d965e Mon Sep 17 00:00:00 2001 From: Arnaud Roques Date: Thu, 23 Nov 2023 20:11:10 +0100 Subject: [PATCH 14/95] fix: minor issue about Gantt D+00 syntax --- ...entenceLasts.java => SentenceRequire.java} | 6 +- .../lang/SentenceTaskEndsOnlyRelative.java | 58 +++++++++++++++++++ .../plantuml/project/lang/SubjectTask.java | 11 ++-- .../plantuml/project/lang/Verbs.java | 2 +- 4 files changed, 68 insertions(+), 9 deletions(-) rename src/net/sourceforge/plantuml/project/lang/{SentenceLasts.java => SentenceRequire.java} (92%) create mode 100644 src/net/sourceforge/plantuml/project/lang/SentenceTaskEndsOnlyRelative.java diff --git a/src/net/sourceforge/plantuml/project/lang/SentenceLasts.java b/src/net/sourceforge/plantuml/project/lang/SentenceRequire.java similarity index 92% rename from src/net/sourceforge/plantuml/project/lang/SentenceLasts.java rename to src/net/sourceforge/plantuml/project/lang/SentenceRequire.java index 8927dc05b..d22d11f1b 100644 --- a/src/net/sourceforge/plantuml/project/lang/SentenceLasts.java +++ b/src/net/sourceforge/plantuml/project/lang/SentenceRequire.java @@ -40,10 +40,10 @@ import net.sourceforge.plantuml.project.GanttDiagram; import net.sourceforge.plantuml.project.Load; import net.sourceforge.plantuml.project.core.Task; -public class SentenceLasts extends SentenceSimple { +public class SentenceRequire extends SentenceSimple { - public SentenceLasts() { - super(SubjectTask.ME, Verbs.lasts, new ComplementSeveralDays()); + public SentenceRequire() { + super(SubjectTask.ME, Verbs.requires, new ComplementSeveralDays()); } @Override diff --git a/src/net/sourceforge/plantuml/project/lang/SentenceTaskEndsOnlyRelative.java b/src/net/sourceforge/plantuml/project/lang/SentenceTaskEndsOnlyRelative.java new file mode 100644 index 000000000..95ed3fe3b --- /dev/null +++ b/src/net/sourceforge/plantuml/project/lang/SentenceTaskEndsOnlyRelative.java @@ -0,0 +1,58 @@ +/* ======================================================================== + * PlantUML : a free UML diagram generator + * ======================================================================== + * + * (C) Copyright 2009-2024, Arnaud Roques + * + * Project Info: https://plantuml.com + * + * If you like this project or if you find it useful, you can support us at: + * + * https://plantuml.com/patreon (only 1$ per month!) + * https://plantuml.com/paypal + * + * This file is part of PlantUML. + * + * PlantUML is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * PlantUML distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public + * License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. + * + * + * Original Author: Arnaud Roques + * + * + */ +package net.sourceforge.plantuml.project.lang; + +import net.sourceforge.plantuml.command.CommandExecutionResult; +import net.sourceforge.plantuml.project.GanttDiagram; +import net.sourceforge.plantuml.project.core.Task; +import net.sourceforge.plantuml.project.time.Day; + +public class SentenceTaskEndsOnlyRelative extends SentenceSimple { + + public SentenceTaskEndsOnlyRelative() { + super(SubjectTask.ME, Verbs.ends2, ComplementDate.onlyRelative()); + } + + @Override + public CommandExecutionResult execute(GanttDiagram project, Object subject, Object complement) { + final Task task = (Task) subject; + final Day end = (Day) complement; + + task.setEnd(end); + return CommandExecutionResult.ok(); + } + +} diff --git a/src/net/sourceforge/plantuml/project/lang/SubjectTask.java b/src/net/sourceforge/plantuml/project/lang/SubjectTask.java index 50cc79164..c04d64b16 100644 --- a/src/net/sourceforge/plantuml/project/lang/SubjectTask.java +++ b/src/net/sourceforge/plantuml/project/lang/SubjectTask.java @@ -80,12 +80,13 @@ public class SubjectTask implements Subject { } public Collection getSentences() { - return Arrays.asList(new SentenceLasts(), new SentenceTaskStarts(), new SentenceTaskStartsWithColor(), + return Arrays.asList(new SentenceRequire(), new SentenceTaskStarts(), new SentenceTaskStartsWithColor(), new SentenceTaskStartsOnlyRelative(), new SentenceTaskStartsAbsolute(), new SentenceHappens(), - new SentenceHappensDate(), new SentenceEnds(), new SentenceTaskEndsAbsolute(), new SentenceIsColored(), - new SentenceIsColoredForCompletion(), new SentenceIsDeleted(), new SentenceIsForTask(), - new SentenceLinksTo(), new SentenceOccurs(), new SentenceDisplayOnSameRowAs(), new SentencePausesDate(), - new SentencePausesDates(), new SentencePausesDayOfWeek()); + new SentenceHappensDate(), new SentenceEnds(), new SentenceTaskEndsOnlyRelative(), + new SentenceTaskEndsAbsolute(), new SentenceIsColored(), new SentenceIsColoredForCompletion(), + new SentenceIsDeleted(), new SentenceIsForTask(), new SentenceLinksTo(), new SentenceOccurs(), + new SentenceDisplayOnSameRowAs(), new SentencePausesDate(), new SentencePausesDates(), + new SentencePausesDayOfWeek()); } public IRegex toRegex() { diff --git a/src/net/sourceforge/plantuml/project/lang/Verbs.java b/src/net/sourceforge/plantuml/project/lang/Verbs.java index 58f92eafb..b534124ad 100644 --- a/src/net/sourceforge/plantuml/project/lang/Verbs.java +++ b/src/net/sourceforge/plantuml/project/lang/Verbs.java @@ -108,7 +108,7 @@ public class Verbs { public static IRegex isOrAreNamed = new RegexLeaf("(is|are)[%s]+named"); - public static IRegex lasts = new RegexLeaf("(lasts|requires)"); + public static IRegex requires = new RegexLeaf("(lasts|requires?)"); public static IRegex linksTo = new RegexLeaf("links to"); From b48ea951124cc3c70f606880134677752116e39b Mon Sep 17 00:00:00 2001 From: Arnaud Roques Date: Thu, 23 Nov 2023 20:42:31 +0100 Subject: [PATCH 15/95] fix: fix bad note shape in sequence diagram https://github.com/plantuml/plantuml/issues/1609 --- .../plantuml/sequencediagram/NoteStyle.java | 15 ++++++++------- .../sequencediagram/graphic/Step1MessageExo.java | 4 ++-- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/net/sourceforge/plantuml/sequencediagram/NoteStyle.java b/src/net/sourceforge/plantuml/sequencediagram/NoteStyle.java index 8de7a1bc6..bb5ff3d5f 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/NoteStyle.java +++ b/src/net/sourceforge/plantuml/sequencediagram/NoteStyle.java @@ -44,21 +44,22 @@ public enum NoteStyle { NORMAL, HEXAGONAL, BOX; public static NoteStyle getNoteStyle(String s) { - if (s.equalsIgnoreCase("hnote")) { + if (s.equalsIgnoreCase("hnote")) return NoteStyle.HEXAGONAL; - } else if (s.equalsIgnoreCase("rnote")) { + + if (s.equalsIgnoreCase("rnote")) return NoteStyle.BOX; - } + return NoteStyle.NORMAL; } public ComponentType getNoteComponentType() { - if (this == NoteStyle.HEXAGONAL) { + if (this == NoteStyle.HEXAGONAL) return ComponentType.NOTE_HEXAGONAL; - } - if (this == NoteStyle.BOX) { + + if (this == NoteStyle.BOX) return ComponentType.NOTE_BOX; - } + return ComponentType.NOTE; } diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/Step1MessageExo.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/Step1MessageExo.java index 63ba0a34e..be9146eb4 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/Step1MessageExo.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/Step1MessageExo.java @@ -46,7 +46,6 @@ import net.sourceforge.plantuml.sequencediagram.Note; import net.sourceforge.plantuml.skin.ArrowComponent; import net.sourceforge.plantuml.skin.ArrowConfiguration; import net.sourceforge.plantuml.skin.Component; -import net.sourceforge.plantuml.skin.ComponentType; import net.sourceforge.plantuml.style.ISkinParam; class Step1MessageExo extends Step1Abstract { @@ -69,7 +68,8 @@ class Step1MessageExo extends Step1Abstract { for (Note noteOnMessage : noteOnMessages) { final ISkinParam skinParam = noteOnMessage.getSkinParamBackcolored(drawingSet.getSkinParam()); final Component note = drawingSet.getSkin().createComponentNote(noteOnMessage.getUsedStyles(), - ComponentType.NOTE, skinParam, noteOnMessage.getDisplay(), noteOnMessage.getColors()); + noteOnMessage.getNoteStyle().getNoteComponentType(), skinParam, noteOnMessage.getDisplay(), + noteOnMessage.getColors()); addNote(note); } From a98d8ccdd5db6976cf01a6467b52d013b497072a Mon Sep 17 00:00:00 2001 From: Arnaud Roques Date: Thu, 23 Nov 2023 21:04:56 +0100 Subject: [PATCH 16/95] fix: fix MaximumWidth style for legend https://github.com/plantuml/plantuml/issues/1608 --- .../sourceforge/plantuml/AnnotatedBuilder.java | 5 +++-- .../ftile/EntityImageLegend.java | 4 +++- .../plantuml/cucadiagram/DisplaySection.java | 4 +++- src/net/sourceforge/plantuml/png/PngTitler.java | 3 ++- .../graphic/SequenceDiagramFileMakerPuma2.java | 6 ++++-- .../teoz/SequenceDiagramFileMakerTeoz.java | 4 +++- src/net/sourceforge/plantuml/style/Style.java | 16 +++++++--------- 7 files changed, 25 insertions(+), 17 deletions(-) diff --git a/src/net/sourceforge/plantuml/AnnotatedBuilder.java b/src/net/sourceforge/plantuml/AnnotatedBuilder.java index 5b539e082..719d20fa4 100644 --- a/src/net/sourceforge/plantuml/AnnotatedBuilder.java +++ b/src/net/sourceforge/plantuml/AnnotatedBuilder.java @@ -40,6 +40,7 @@ import net.sourceforge.plantuml.abel.DisplayPositioned; import net.sourceforge.plantuml.activitydiagram3.ftile.EntityImageLegend; import net.sourceforge.plantuml.cucadiagram.DisplaySection; import net.sourceforge.plantuml.klimt.Fashion; +import net.sourceforge.plantuml.klimt.LineBreakStrategy; import net.sourceforge.plantuml.klimt.UTranslate; import net.sourceforge.plantuml.klimt.color.HColor; import net.sourceforge.plantuml.klimt.creole.Display; @@ -167,7 +168,7 @@ public class AnnotatedBuilder { final Style style = StyleSignatureBasic.of(SName.root, SName.document, SName.title) .getMergedStyle(skinParam.getCurrentStyleBuilder()); final TextBlock block = style.createTextBlockBordered(title.getDisplay(), skinParam.getIHtmlColorSet(), - skinParam, Style.ID_TITLE); + skinParam, Style.ID_TITLE, LineBreakStrategy.NONE); return block; } @@ -179,7 +180,7 @@ public class AnnotatedBuilder { final Style style = StyleSignatureBasic.of(SName.root, SName.document, SName.caption) .getMergedStyle(skinParam.getCurrentStyleBuilder()); return style.createTextBlockBordered(caption.getDisplay(), skinParam.getIHtmlColorSet(), skinParam, - Style.ID_CAPTION); + Style.ID_CAPTION, LineBreakStrategy.NONE); } diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/EntityImageLegend.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/EntityImageLegend.java index 75a603cd2..ba8ae42b9 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/EntityImageLegend.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/EntityImageLegend.java @@ -49,7 +49,9 @@ public class EntityImageLegend { final Style style = StyleSignatureBasic .of(SName.root, SName.root, SName.document, skinParam.getUmlDiagramType().getStyleName(), SName.legend) .getMergedStyle(skinParam.getCurrentStyleBuilder()); - return style.createTextBlockBordered(note, skinParam.getIHtmlColorSet(), skinParam, Style.ID_LEGEND); + + return style.createTextBlockBordered(note, skinParam.getIHtmlColorSet(), skinParam, Style.ID_LEGEND, + style.wrapWidth()); } } diff --git a/src/net/sourceforge/plantuml/cucadiagram/DisplaySection.java b/src/net/sourceforge/plantuml/cucadiagram/DisplaySection.java index 6f4328614..c3248e6b6 100644 --- a/src/net/sourceforge/plantuml/cucadiagram/DisplaySection.java +++ b/src/net/sourceforge/plantuml/cucadiagram/DisplaySection.java @@ -38,6 +38,7 @@ package net.sourceforge.plantuml.cucadiagram; import java.util.EnumMap; import java.util.Map; +import net.sourceforge.plantuml.klimt.LineBreakStrategy; import net.sourceforge.plantuml.klimt.creole.Display; import net.sourceforge.plantuml.klimt.font.FontConfiguration; import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; @@ -96,7 +97,8 @@ public class DisplaySection { return null; if (style != null) - return style.createTextBlockBordered(display, spriteContainer.getIHtmlColorSet(), spriteContainer, null); + return style.createTextBlockBordered(display, spriteContainer.getIHtmlColorSet(), spriteContainer, null, + LineBreakStrategy.NONE); return display.create(fontConfiguration, getHorizontalAlignment(), spriteContainer); } diff --git a/src/net/sourceforge/plantuml/png/PngTitler.java b/src/net/sourceforge/plantuml/png/PngTitler.java index 662710e6f..56a35e0d0 100644 --- a/src/net/sourceforge/plantuml/png/PngTitler.java +++ b/src/net/sourceforge/plantuml/png/PngTitler.java @@ -36,6 +36,7 @@ package net.sourceforge.plantuml.png; import net.sourceforge.plantuml.cucadiagram.DisplaySection; +import net.sourceforge.plantuml.klimt.LineBreakStrategy; import net.sourceforge.plantuml.klimt.color.HColorSet; import net.sourceforge.plantuml.klimt.creole.Display; import net.sourceforge.plantuml.klimt.font.StringBounder; @@ -73,6 +74,6 @@ public class PngTitler { if (display == null) return null; - return style.createTextBlockBordered(display, set, spriteContainer, Style.ID_TITLE); + return style.createTextBlockBordered(display, set, spriteContainer, Style.ID_TITLE, LineBreakStrategy.NONE); } } diff --git a/src/net/sourceforge/plantuml/sequencediagram/graphic/SequenceDiagramFileMakerPuma2.java b/src/net/sourceforge/plantuml/sequencediagram/graphic/SequenceDiagramFileMakerPuma2.java index 65600ca90..f6f35de5a 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/graphic/SequenceDiagramFileMakerPuma2.java +++ b/src/net/sourceforge/plantuml/sequencediagram/graphic/SequenceDiagramFileMakerPuma2.java @@ -46,6 +46,7 @@ import net.sourceforge.plantuml.AnnotatedBuilder; import net.sourceforge.plantuml.FileFormatOption; import net.sourceforge.plantuml.core.ImageData; import net.sourceforge.plantuml.cucadiagram.DisplaySection; +import net.sourceforge.plantuml.klimt.LineBreakStrategy; import net.sourceforge.plantuml.klimt.UTranslate; import net.sourceforge.plantuml.klimt.color.HColor; import net.sourceforge.plantuml.klimt.creole.Display; @@ -165,7 +166,7 @@ public class SequenceDiagramFileMakerPuma2 implements FileMaker { final Style style = StyleSignatureBasic.of(SName.root, SName.document, SName.title) .getMergedStyle(diagram.getSkinParam().getCurrentStyleBuilder()); compTitle = style.createTextBlockBordered(page.getTitle(), diagram.getSkinParam().getIHtmlColorSet(), - diagram.getSkinParam(), Style.ID_TITLE); + diagram.getSkinParam(), Style.ID_TITLE, LineBreakStrategy.NONE); final XDimension2D dimTitle = compTitle.calculateDimension(stringBounder); area.setTitleArea(dimTitle.getWidth(), dimTitle.getHeight()); } @@ -179,7 +180,8 @@ public class SequenceDiagramFileMakerPuma2 implements FileMaker { final Style style = StyleSignatureBasic.of(SName.root, SName.document, SName.legend) .getMergedStyle(diagram.getSkinParam().getCurrentStyleBuilder()); legendBlock = style.createTextBlockBordered(diagram.getLegend().getDisplay(), - diagram.getSkinParam().getIHtmlColorSet(), diagram.getSkinParam(), Style.ID_LEGEND); + diagram.getSkinParam().getIHtmlColorSet(), diagram.getSkinParam(), Style.ID_LEGEND, + LineBreakStrategy.NONE); } final XDimension2D dimLegend = legendBlock.calculateDimension(stringBounder); area.setLegend(dimLegend, isLegendTop(), diagram.getLegend().getHorizontalAlignment()); diff --git a/src/net/sourceforge/plantuml/sequencediagram/teoz/SequenceDiagramFileMakerTeoz.java b/src/net/sourceforge/plantuml/sequencediagram/teoz/SequenceDiagramFileMakerTeoz.java index 96d4a3fff..0128c06a9 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/teoz/SequenceDiagramFileMakerTeoz.java +++ b/src/net/sourceforge/plantuml/sequencediagram/teoz/SequenceDiagramFileMakerTeoz.java @@ -43,6 +43,7 @@ import net.sourceforge.plantuml.FileFormatOption; import net.sourceforge.plantuml.activitydiagram3.ftile.EntityImageLegend; import net.sourceforge.plantuml.core.ImageData; import net.sourceforge.plantuml.cucadiagram.DisplaySection; +import net.sourceforge.plantuml.klimt.LineBreakStrategy; import net.sourceforge.plantuml.klimt.UTranslate; import net.sourceforge.plantuml.klimt.creole.Display; import net.sourceforge.plantuml.klimt.drawing.UGraphic; @@ -213,7 +214,8 @@ public class SequenceDiagramFileMakerTeoz implements FileMaker { final Style style = StyleSignatureBasic.of(SName.root, SName.document, SName.title) .getMergedStyle(diagram.getSkinParam().getCurrentStyleBuilder()); final TextBlock compTitle = style.createTextBlockBordered(diagram.getTitle().getDisplay(), - diagram.getSkinParam().getIHtmlColorSet(), diagram.getSkinParam(), Style.ID_TITLE); + diagram.getSkinParam().getIHtmlColorSet(), diagram.getSkinParam(), Style.ID_TITLE, + LineBreakStrategy.NONE); return compTitle; } diff --git a/src/net/sourceforge/plantuml/style/Style.java b/src/net/sourceforge/plantuml/style/Style.java index 78e92f2de..c1c960ec6 100644 --- a/src/net/sourceforge/plantuml/style/Style.java +++ b/src/net/sourceforge/plantuml/style/Style.java @@ -40,7 +40,6 @@ import java.util.Map; import java.util.Map.Entry; import java.util.StringTokenizer; -import net.sourceforge.plantuml.StringUtils; import net.sourceforge.plantuml.klimt.Fashion; import net.sourceforge.plantuml.klimt.LineBreakStrategy; import net.sourceforge.plantuml.klimt.UStroke; @@ -49,6 +48,7 @@ import net.sourceforge.plantuml.klimt.color.Colors; import net.sourceforge.plantuml.klimt.color.HColor; import net.sourceforge.plantuml.klimt.color.HColorSet; import net.sourceforge.plantuml.klimt.color.HColors; +import net.sourceforge.plantuml.klimt.creole.CreoleMode; import net.sourceforge.plantuml.klimt.creole.Display; import net.sourceforge.plantuml.klimt.drawing.UGraphic; import net.sourceforge.plantuml.klimt.font.FontConfiguration; @@ -283,19 +283,17 @@ public class Style { return value(PName.HorizontalAlignment).asHorizontalAlignment(); } - private TextBlock createTextBlockInternal(Display display, HColorSet set, ISkinSimple spriteContainer, - HorizontalAlignment alignment) { - final FontConfiguration fc = getFontConfiguration(set); - return display.create(fc, alignment, spriteContainer); - } - public static final String ID_TITLE = "_title"; public static final String ID_CAPTION = "_caption"; public static final String ID_LEGEND = "_legend"; - public TextBlock createTextBlockBordered(Display note, HColorSet set, ISkinSimple spriteContainer, String id) { + public TextBlock createTextBlockBordered(Display note, HColorSet set, ISkinSimple spriteContainer, String id, + LineBreakStrategy lineBreak) { final HorizontalAlignment alignment = this.getHorizontalAlignment(); - final TextBlock textBlock = this.createTextBlockInternal(note, set, spriteContainer, alignment); + final FontConfiguration fc = this.getFontConfiguration(set); + + final TextBlock textBlock = note.create0(fc, alignment, spriteContainer, lineBreak, CreoleMode.FULL, null, + null); final HColor backgroundColor = this.value(PName.BackGroundColor).asColor(set); final HColor lineColor = this.value(PName.LineColor).asColor(set); From bcb3b92dbc28b911c258bd1067e33f319248a80d Mon Sep 17 00:00:00 2001 From: Arnaud Roques Date: Thu, 23 Nov 2023 21:16:49 +0100 Subject: [PATCH 17/95] fix: disable creole for file listing https://github.com/plantuml/plantuml/issues/1448#issuecomment-1820720969 --- src/net/sourceforge/plantuml/filesdiagram/FEntry.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/net/sourceforge/plantuml/filesdiagram/FEntry.java b/src/net/sourceforge/plantuml/filesdiagram/FEntry.java index eefc7d18e..8364e560d 100644 --- a/src/net/sourceforge/plantuml/filesdiagram/FEntry.java +++ b/src/net/sourceforge/plantuml/filesdiagram/FEntry.java @@ -135,7 +135,7 @@ public class FEntry implements Iterable { return createOpale(); final Display display = Display.getWithNewlines(getEmoticon() + getName()); - TextBlock result = display.create(fontConfiguration, HorizontalAlignment.LEFT, skinParam); + TextBlock result = display.create7(fontConfiguration, HorizontalAlignment.LEFT, skinParam, CreoleMode.NO_CREOLE); return result; } From f0b3e6900c3adc7b6c52d1482304815c28975b36 Mon Sep 17 00:00:00 2001 From: Arnaud Roques Date: Sun, 26 Nov 2023 18:57:11 +0100 Subject: [PATCH 18/95] feat: improve gantt language --- .../plantuml/project/GanttDiagram.java | 24 ++++- ...wBasicImpl.java => ResourceDrawBasic.java} | 4 +- .../plantuml/project/lang/Adverbial.java | 44 +++++++++ .../project/lang/ComplementDates.java | 8 +- .../plantuml/project/lang/ComplementTask.java | 58 +++++++++++ .../plantuml/project/lang/Sentence.java | 5 + .../plantuml/project/lang/SentenceAnd.java | 36 +++---- .../plantuml/project/lang/SentenceAndAnd.java | 53 +++++------ .../project/lang/SentenceHappens.java | 3 +- .../project/lang/SentenceHappensDate.java | 2 +- .../lang/SentenceIsColoredForCompletion.java | 3 +- .../project/lang/SentencePausesDate.java | 3 +- .../project/lang/SentencePausesDates.java | 11 +-- .../project/lang/SentencePausesDayOfWeek.java | 3 +- .../plantuml/project/lang/SentenceSimple.java | 58 +++++++---- .../lang/SentenceTaskEndsAbsolute.java | 3 +- .../lang/SentenceTaskEndsOnlyRelative.java | 3 +- .../project/lang/SentenceTaskStarts.java | 2 +- .../lang/SentenceTaskStartsAbsolute.java | 2 +- .../lang/SentenceTaskStartsOnlyRelative.java | 3 +- .../lang/SentenceTaskStartsWithColor.java | 2 +- .../plantuml/project/lang/SubjectProject.java | 3 +- .../project/lang/SubjectResource.java | 73 ++++++++++---- .../project/lang/SubjectSeparator.java | 4 +- .../plantuml/project/lang/SubjectTask.java | 54 ++++++----- .../plantuml/project/lang/Verbs.java | 95 ++----------------- .../plantuml/project/lang/Words.java | 77 +++++++++++++++ .../regex/RegexRepeatedZeroOrMore.java | 58 +++++++++++ 28 files changed, 475 insertions(+), 219 deletions(-) rename src/net/sourceforge/plantuml/project/draw/{ResourceDrawBasicImpl.java => ResourceDrawBasic.java} (96%) create mode 100644 src/net/sourceforge/plantuml/project/lang/Adverbial.java create mode 100644 src/net/sourceforge/plantuml/project/lang/ComplementTask.java create mode 100644 src/net/sourceforge/plantuml/project/lang/Words.java create mode 100644 src/net/sourceforge/plantuml/regex/RegexRepeatedZeroOrMore.java diff --git a/src/net/sourceforge/plantuml/project/GanttDiagram.java b/src/net/sourceforge/plantuml/project/GanttDiagram.java index b3207c3df..10a540edc 100644 --- a/src/net/sourceforge/plantuml/project/GanttDiagram.java +++ b/src/net/sourceforge/plantuml/project/GanttDiagram.java @@ -86,7 +86,7 @@ import net.sourceforge.plantuml.project.core.TaskInstant; import net.sourceforge.plantuml.project.core.TaskSeparator; import net.sourceforge.plantuml.project.draw.FingerPrint; import net.sourceforge.plantuml.project.draw.ResourceDraw; -import net.sourceforge.plantuml.project.draw.ResourceDrawVersion2; +import net.sourceforge.plantuml.project.draw.ResourceDrawBasic; import net.sourceforge.plantuml.project.draw.TaskDraw; import net.sourceforge.plantuml.project.draw.TaskDrawDiamond; import net.sourceforge.plantuml.project.draw.TaskDrawGroup; @@ -153,6 +153,9 @@ public class GanttDiagram extends TitledDiagram implements ToTaskDraw, WithSprit private int defaultCompletion = 100; + private Task it; + private Resource they; + public CommandExecutionResult changeLanguage(String lang) { this.locale = new Locale(lang); return CommandExecutionResult.ok(); @@ -487,7 +490,8 @@ public class GanttDiagram extends TitledDiagram implements ToTaskDraw, WithSprit private ResourceDraw buildResourceDraw(GanttDiagram gantt, Resource res, TimeScale timeScale, double y, Day min, Day max) { - return new ResourceDrawVersion2(gantt, res, timeScale, y, min, max); + return new ResourceDrawBasic(gantt, res, timeScale, y, min, max); + // return new ResourceDrawVersion2(gantt, res, timeScale, y, min, max); } private Collection getConstraints(Task task) { @@ -906,4 +910,20 @@ public class GanttDiagram extends TitledDiagram implements ToTaskDraw, WithSprit return Collections.unmodifiableList(result); } + public void setIt(Task result) { + this.it = result; + } + + public Task getIt() { + return it; + } + + public final Resource getThey() { + return they; + } + + public final void setThey(Resource they) { + this.they = they; + } + } diff --git a/src/net/sourceforge/plantuml/project/draw/ResourceDrawBasicImpl.java b/src/net/sourceforge/plantuml/project/draw/ResourceDrawBasic.java similarity index 96% rename from src/net/sourceforge/plantuml/project/draw/ResourceDrawBasicImpl.java rename to src/net/sourceforge/plantuml/project/draw/ResourceDrawBasic.java index 7be2906d0..5ba180cda 100644 --- a/src/net/sourceforge/plantuml/project/draw/ResourceDrawBasicImpl.java +++ b/src/net/sourceforge/plantuml/project/draw/ResourceDrawBasic.java @@ -52,7 +52,7 @@ import net.sourceforge.plantuml.project.core.Resource; import net.sourceforge.plantuml.project.time.Day; import net.sourceforge.plantuml.project.timescale.TimeScale; -public class ResourceDrawBasicImpl implements ResourceDraw { +public class ResourceDrawBasic implements ResourceDraw { private final Resource res; private final TimeScale timeScale; @@ -61,7 +61,7 @@ public class ResourceDrawBasicImpl implements ResourceDraw { private final Day max; private final GanttDiagram gantt; - public ResourceDrawBasicImpl(GanttDiagram gantt, Resource res, TimeScale timeScale, double y, Day min, Day max) { + public ResourceDrawBasic(GanttDiagram gantt, Resource res, TimeScale timeScale, double y, Day min, Day max) { this.res = res; this.timeScale = timeScale; this.y = y; diff --git a/src/net/sourceforge/plantuml/project/lang/Adverbial.java b/src/net/sourceforge/plantuml/project/lang/Adverbial.java new file mode 100644 index 000000000..2c8ad3a02 --- /dev/null +++ b/src/net/sourceforge/plantuml/project/lang/Adverbial.java @@ -0,0 +1,44 @@ +/* ======================================================================== + * PlantUML : a free UML diagram generator + * ======================================================================== + * + * (C) Copyright 2009-2024, Arnaud Roques + * + * Project Info: https://plantuml.com + * + * If you like this project or if you find it useful, you can support us at: + * + * https://plantuml.com/patreon (only 1$ per month!) + * https://plantuml.com/paypal + * + * This file is part of PlantUML. + * + * PlantUML is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * PlantUML distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public + * License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. + * + * + * Original Author: Arnaud Roques + * + * + */ +package net.sourceforge.plantuml.project.lang; + +import net.sourceforge.plantuml.regex.IRegex; + +public interface Adverbial { + + public IRegex toRegex(); + +} diff --git a/src/net/sourceforge/plantuml/project/lang/ComplementDates.java b/src/net/sourceforge/plantuml/project/lang/ComplementDates.java index 4bcbb31f1..eece3d85f 100644 --- a/src/net/sourceforge/plantuml/project/lang/ComplementDates.java +++ b/src/net/sourceforge/plantuml/project/lang/ComplementDates.java @@ -58,8 +58,8 @@ public class ComplementDates implements Something { new RegexLeaf("BMONTH1" + suffix, "([\\d]{1,2})"), // new RegexLeaf("\\D"), // new RegexLeaf("BDAY1" + suffix, "([\\d]{1,2})"), // - RegexLeaf.spaceOneOrMore(), // - new RegexLeaf("to"), // + Words.exactly(Words.TO), // + Words.zeroOrMore(Words.THE), // RegexLeaf.spaceOneOrMore(), // new RegexLeaf("BYEAR2" + suffix, "([\\d]{4})"), // new RegexLeaf("\\D"), // @@ -73,8 +73,8 @@ public class ComplementDates implements Something { return new RegexConcat( // new RegexLeaf("[dD]\\+"), // new RegexLeaf("ECOUNT1" + suffix, "([\\d]+)"), // - RegexLeaf.spaceOneOrMore(), // - new RegexLeaf("to"), // + Words.exactly(Words.TO), // + Words.zeroOrMore(Words.THE), // RegexLeaf.spaceOneOrMore(), // new RegexLeaf("[dD]\\+"), // new RegexLeaf("ECOUNT2" + suffix, "([\\d]+)") // diff --git a/src/net/sourceforge/plantuml/project/lang/ComplementTask.java b/src/net/sourceforge/plantuml/project/lang/ComplementTask.java new file mode 100644 index 000000000..aae8a1e63 --- /dev/null +++ b/src/net/sourceforge/plantuml/project/lang/ComplementTask.java @@ -0,0 +1,58 @@ +/* ======================================================================== + * PlantUML : a free UML diagram generator + * ======================================================================== + * + * (C) Copyright 2009-2024, Arnaud Roques + * + * Project Info: https://plantuml.com + * + * If you like this project or if you find it useful, you can support us at: + * + * https://plantuml.com/patreon (only 1$ per month!) + * https://plantuml.com/paypal + * + * This file is part of PlantUML. + * + * PlantUML is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * PlantUML distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public + * License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. + * + * + * Original Author: Arnaud Roques + * + * + */ +package net.sourceforge.plantuml.project.lang; + +import net.sourceforge.plantuml.project.Failable; +import net.sourceforge.plantuml.project.GanttDiagram; +import net.sourceforge.plantuml.project.core.Task; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; + +public class ComplementTask implements Something { + + public IRegex toRegex(String suffix) { + return new RegexLeaf("COMPLEMENT" + suffix, "\\[([^\\[\\]]+?)\\]"); + } + + public Failable getMe(GanttDiagram gantt, RegexResult arg, String suffix) { + final String code = arg.get("COMPLEMENT" + suffix, 0); + final Task task = gantt.getExistingTask(code); + if (task == null) + return Failable.error("No such task " + code); + return Failable.ok(task); + } +} diff --git a/src/net/sourceforge/plantuml/project/lang/Sentence.java b/src/net/sourceforge/plantuml/project/lang/Sentence.java index 3110735fd..eaed4f5a5 100644 --- a/src/net/sourceforge/plantuml/project/lang/Sentence.java +++ b/src/net/sourceforge/plantuml/project/lang/Sentence.java @@ -38,9 +38,14 @@ package net.sourceforge.plantuml.project.lang; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.project.GanttDiagram; import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexLeaf; import net.sourceforge.plantuml.regex.RegexResult; public interface Sentence { + + public final RegexLeaf OPTIONAL_FINAL_DOT = new RegexLeaf("\\s*[.]?\\s*$"); + + public final RegexLeaf SENTENCE_SEPARATOR = new RegexLeaf("\\s*(,|\\sand\\s)\\s*"); public IRegex toRegex(); diff --git a/src/net/sourceforge/plantuml/project/lang/SentenceAnd.java b/src/net/sourceforge/plantuml/project/lang/SentenceAnd.java index c2f9bd82b..3929c6a7a 100644 --- a/src/net/sourceforge/plantuml/project/lang/SentenceAnd.java +++ b/src/net/sourceforge/plantuml/project/lang/SentenceAnd.java @@ -56,37 +56,37 @@ public class SentenceAnd implements Sentence { public IRegex toRegex() { return new RegexConcat(// RegexLeaf.start(), // - sentence1.subjectii.toRegex(), // + sentence1.getSubject().toRegex(), // RegexLeaf.spaceOneOrMore(), // sentence1.getVerbRegex(), // + sentence1.getAdverbialOrPropositon(), // RegexLeaf.spaceOneOrMore(), // - sentence1.complementii.toRegex("1"), // - RegexLeaf.spaceOneOrMore(), // - new RegexLeaf("and"), // - RegexLeaf.spaceOneOrMore(), // + sentence1.getComplement().toRegex("1"), // + SENTENCE_SEPARATOR, // sentence2.getVerbRegex(), // + sentence2.getAdverbialOrPropositon(), // RegexLeaf.spaceOneOrMore(), // - sentence2.complementii.toRegex("2"), // - RegexLeaf.end()); + sentence2.getComplement().toRegex("2"), // + OPTIONAL_FINAL_DOT); } public final CommandExecutionResult execute(GanttDiagram project, RegexResult arg) { - final Failable subject = sentence1.subjectii.getMe(project, arg); - if (subject.isFail()) { + final Failable subject = sentence1.getSubject().getMe(project, arg); + if (subject.isFail()) return CommandExecutionResult.error(subject.getError()); - } - final Failable complement1 = sentence1.complementii.getMe(project, arg, "1"); - if (complement1.isFail()) { + + final Failable complement1 = sentence1.getComplement().getMe(project, arg, "1"); + if (complement1.isFail()) return CommandExecutionResult.error(complement1.getError()); - } + final CommandExecutionResult result1 = sentence1.execute(project, subject.get(), complement1.get()); - if (result1.isOk() == false) { + if (result1.isOk() == false) return result1; - } - final Failable complement2 = sentence2.complementii.getMe(project, arg, "2"); - if (complement2.isFail()) { + + final Failable complement2 = sentence2.getComplement().getMe(project, arg, "2"); + if (complement2.isFail()) return CommandExecutionResult.error(complement2.getError()); - } + return sentence2.execute(project, subject.get(), complement2.get()); } diff --git a/src/net/sourceforge/plantuml/project/lang/SentenceAndAnd.java b/src/net/sourceforge/plantuml/project/lang/SentenceAndAnd.java index 3385842fc..27a9d4ca7 100644 --- a/src/net/sourceforge/plantuml/project/lang/SentenceAndAnd.java +++ b/src/net/sourceforge/plantuml/project/lang/SentenceAndAnd.java @@ -58,51 +58,50 @@ public class SentenceAndAnd implements Sentence { public IRegex toRegex() { return new RegexConcat(// RegexLeaf.start(), // - sentence1.subjectii.toRegex(), // + sentence1.getSubject().toRegex(), // RegexLeaf.spaceOneOrMore(), // sentence1.getVerbRegex(), // + sentence1.getAdverbialOrPropositon(), // RegexLeaf.spaceOneOrMore(), // - sentence1.complementii.toRegex("1"), // - RegexLeaf.spaceOneOrMore(), // - new RegexLeaf("and"), // - RegexLeaf.spaceOneOrMore(), // + sentence1.getComplement().toRegex("1"), // + SENTENCE_SEPARATOR, // sentence2.getVerbRegex(), // + sentence2.getAdverbialOrPropositon(), // RegexLeaf.spaceOneOrMore(), // - sentence2.complementii.toRegex("2"), // - RegexLeaf.spaceOneOrMore(), // - new RegexLeaf("and"), // - RegexLeaf.spaceOneOrMore(), // + sentence2.getComplement().toRegex("2"), // + SENTENCE_SEPARATOR, // sentence3.getVerbRegex(), // + sentence3.getAdverbialOrPropositon(), // RegexLeaf.spaceOneOrMore(), // - sentence3.complementii.toRegex("3"), // - RegexLeaf.end()); + sentence3.getComplement().toRegex("3"), // + OPTIONAL_FINAL_DOT); } public final CommandExecutionResult execute(GanttDiagram project, RegexResult arg) { - final Failable subject = sentence1.subjectii.getMe(project, arg); - if (subject.isFail()) { + final Failable subject = sentence1.getSubject().getMe(project, arg); + if (subject.isFail()) return CommandExecutionResult.error(subject.getError()); - } - final Failable complement1 = sentence1.complementii.getMe(project, arg, "1"); - if (complement1.isFail()) { + + final Failable complement1 = sentence1.getComplement().getMe(project, arg, "1"); + if (complement1.isFail()) return CommandExecutionResult.error(complement1.getError()); - } + final CommandExecutionResult result1 = sentence1.execute(project, subject.get(), complement1.get()); - if (result1.isOk() == false) { + if (result1.isOk() == false) return result1; - } - final Failable complement2 = sentence2.complementii.getMe(project, arg, "2"); - if (complement2.isFail()) { + + final Failable complement2 = sentence2.getComplement().getMe(project, arg, "2"); + if (complement2.isFail()) return CommandExecutionResult.error(complement2.getError()); - } + final CommandExecutionResult result2 = sentence2.execute(project, subject.get(), complement2.get()); - if (result2.isOk() == false) { + if (result2.isOk() == false) return result2; - } - final Failable complement3 = sentence3.complementii.getMe(project, arg, "3"); - if (complement3.isFail()) { + + final Failable complement3 = sentence3.getComplement().getMe(project, arg, "3"); + if (complement3.isFail()) return CommandExecutionResult.error(complement3.getError()); - } + final CommandExecutionResult result3 = sentence3.execute(project, subject.get(), complement3.get()); return result3; diff --git a/src/net/sourceforge/plantuml/project/lang/SentenceHappens.java b/src/net/sourceforge/plantuml/project/lang/SentenceHappens.java index 4c41586f3..f046ef8e2 100644 --- a/src/net/sourceforge/plantuml/project/lang/SentenceHappens.java +++ b/src/net/sourceforge/plantuml/project/lang/SentenceHappens.java @@ -44,7 +44,8 @@ import net.sourceforge.plantuml.project.core.TaskInstant; public class SentenceHappens extends SentenceSimple { public SentenceHappens() { - super(SubjectTask.ME, Verbs.happens, new ComplementBeforeOrAfterOrAtTaskStartOrEnd()); + super(SubjectTask.ME, Verbs.happens, Words.zeroOrMore(Words.THE, Words.ON, Words.AT), + new ComplementBeforeOrAfterOrAtTaskStartOrEnd()); } @Override diff --git a/src/net/sourceforge/plantuml/project/lang/SentenceHappensDate.java b/src/net/sourceforge/plantuml/project/lang/SentenceHappensDate.java index 456935ae1..afb8d886f 100644 --- a/src/net/sourceforge/plantuml/project/lang/SentenceHappensDate.java +++ b/src/net/sourceforge/plantuml/project/lang/SentenceHappensDate.java @@ -44,7 +44,7 @@ import net.sourceforge.plantuml.project.time.Day; public class SentenceHappensDate extends SentenceSimple { public SentenceHappensDate() { - super(SubjectTask.ME, Verbs.happens, ComplementDate.any()); + super(SubjectTask.ME, Verbs.happens, Words.zeroOrMore(Words.THE, Words.ON, Words.AT), ComplementDate.any()); } @Override diff --git a/src/net/sourceforge/plantuml/project/lang/SentenceIsColoredForCompletion.java b/src/net/sourceforge/plantuml/project/lang/SentenceIsColoredForCompletion.java index 8aa022a2b..c07c2bd8a 100644 --- a/src/net/sourceforge/plantuml/project/lang/SentenceIsColoredForCompletion.java +++ b/src/net/sourceforge/plantuml/project/lang/SentenceIsColoredForCompletion.java @@ -42,7 +42,8 @@ import net.sourceforge.plantuml.project.core.Task; public class SentenceIsColoredForCompletion extends SentenceSimple { public SentenceIsColoredForCompletion() { - super(SubjectTask.ME, Verbs.isColoredForCompletion, new ComplementInColorsFromTo()); + super(SubjectTask.ME, Verbs.isColored, Words.exactly(Words.FOR, Words.COMPLETION), + new ComplementInColorsFromTo()); } @Override diff --git a/src/net/sourceforge/plantuml/project/lang/SentencePausesDate.java b/src/net/sourceforge/plantuml/project/lang/SentencePausesDate.java index 97ceea3a1..8cf020b38 100644 --- a/src/net/sourceforge/plantuml/project/lang/SentencePausesDate.java +++ b/src/net/sourceforge/plantuml/project/lang/SentencePausesDate.java @@ -43,7 +43,8 @@ import net.sourceforge.plantuml.project.time.Day; public class SentencePausesDate extends SentenceSimple { public SentencePausesDate() { - super(SubjectTask.ME, Verbs.pauses, ComplementDate.any()); + super(SubjectTask.ME, Verbs.pauses, Words.zeroOrMore(Words.THE, Words.ON, Words.AT, Words.FROM), + ComplementDate.any()); } @Override diff --git a/src/net/sourceforge/plantuml/project/lang/SentencePausesDates.java b/src/net/sourceforge/plantuml/project/lang/SentencePausesDates.java index 9fdf7dc5e..46d074559 100644 --- a/src/net/sourceforge/plantuml/project/lang/SentencePausesDates.java +++ b/src/net/sourceforge/plantuml/project/lang/SentencePausesDates.java @@ -44,20 +44,17 @@ import net.sourceforge.plantuml.project.time.Day; public class SentencePausesDates extends SentenceSimple { public SentencePausesDates() { - super(SubjectTask.ME, Verbs.pauses, new ComplementDates()); + super(SubjectTask.ME, Verbs.pauses, Words.zeroOrMore(Words.THE, Words.ON, Words.AT, Words.FROM), + new ComplementDates()); } @Override public CommandExecutionResult execute(GanttDiagram project, Object subject, Object complement) { final Task task = (Task) subject; final DaysAsDates pauses = (DaysAsDates) complement; -// final Day startingDate = project.getStartingDate(); -// if (startingDate == null) { -// return CommandExecutionResult.error("No starting date for the project"); -// } - for (Day day : pauses) { + for (Day day : pauses) task.addPause(day); - } + return CommandExecutionResult.ok(); } diff --git a/src/net/sourceforge/plantuml/project/lang/SentencePausesDayOfWeek.java b/src/net/sourceforge/plantuml/project/lang/SentencePausesDayOfWeek.java index 05526f414..8edc3d2b5 100644 --- a/src/net/sourceforge/plantuml/project/lang/SentencePausesDayOfWeek.java +++ b/src/net/sourceforge/plantuml/project/lang/SentencePausesDayOfWeek.java @@ -43,7 +43,8 @@ import net.sourceforge.plantuml.project.time.DayOfWeek; public class SentencePausesDayOfWeek extends SentenceSimple { public SentencePausesDayOfWeek() { - super(SubjectTask.ME, Verbs.pauses, new ComplementDayOfWeek()); + super(SubjectTask.ME, Verbs.pauses, Words.zeroOrMore(Words.THE, Words.ON, Words.AT, Words.FROM), + new ComplementDayOfWeek()); } @Override diff --git a/src/net/sourceforge/plantuml/project/lang/SentenceSimple.java b/src/net/sourceforge/plantuml/project/lang/SentenceSimple.java index 745dc4b39..d36769296 100644 --- a/src/net/sourceforge/plantuml/project/lang/SentenceSimple.java +++ b/src/net/sourceforge/plantuml/project/lang/SentenceSimple.java @@ -45,49 +45,57 @@ import net.sourceforge.plantuml.regex.RegexResult; public abstract class SentenceSimple implements Sentence { - protected final Subject subjectii; + private final Subject subject; private final IRegex verb; - protected final Something complementii; + private final IRegex adverbialOrPropositon; + private final Something complement; public SentenceSimple(Subject subject, IRegex verb, Something complement) { - this.subjectii = subject; + this(subject, verb, new RegexLeaf(""), complement); + } + + public SentenceSimple(Subject subject, IRegex verb, IRegex adverbialOrPropositon, Something complement) { + this.subject = subject; this.verb = verb; - this.complementii = complement; + this.adverbialOrPropositon = adverbialOrPropositon; + this.complement = complement; } public String getSignature() { - return subjectii.getClass() + "/" + verb.getPattern() + "/" + complementii.getClass(); + return subject.getClass() + "/" + verb.getPattern() + "/" + complement.getClass(); } public final IRegex toRegex() { - if (complementii instanceof ComplementEmpty) + if (complement instanceof ComplementEmpty) return new RegexConcat(// RegexLeaf.start(), // - subjectii.toRegex(), // + subject.toRegex(), // RegexLeaf.spaceOneOrMore(), // verb, // - RegexLeaf.end()); + adverbialOrPropositon, // + OPTIONAL_FINAL_DOT); return new RegexConcat(// RegexLeaf.start(), // - subjectii.toRegex(), // + subject.toRegex(), // RegexLeaf.spaceOneOrMore(), // verb, // + adverbialOrPropositon, // RegexLeaf.spaceOneOrMore(), // - complementii.toRegex("0"), // - RegexLeaf.end()); + complement.toRegex("0"), // + OPTIONAL_FINAL_DOT); } public final CommandExecutionResult execute(GanttDiagram project, RegexResult arg) { - final Failable subject = subjectii.getMe(project, arg); - if (subject.isFail()) - return CommandExecutionResult.error(subject.getError()); + final Failable currentSubject = subject.getMe(project, arg); + if (currentSubject.isFail()) + return CommandExecutionResult.error(currentSubject.getError()); - final Failable complement = complementii.getMe(project, arg, "0"); - if (complement.isFail()) - return CommandExecutionResult.error(complement.getError()); + final Failable currentComplement = complement.getMe(project, arg, "0"); + if (currentComplement.isFail()) + return CommandExecutionResult.error(currentComplement.getError()); - return execute(project, subject.get(), complement.get()); + return execute(project, currentSubject.get(), currentComplement.get()); } @@ -97,4 +105,18 @@ public abstract class SentenceSimple implements Sentence { return verb; } + protected final IRegex getAdverbialOrPropositon() { + return adverbialOrPropositon; + } + + protected final Subject getSubject() { + return subject; + } + + protected final Something getComplement() { + return complement; + } + + + } diff --git a/src/net/sourceforge/plantuml/project/lang/SentenceTaskEndsAbsolute.java b/src/net/sourceforge/plantuml/project/lang/SentenceTaskEndsAbsolute.java index a01539449..ea10010e9 100644 --- a/src/net/sourceforge/plantuml/project/lang/SentenceTaskEndsAbsolute.java +++ b/src/net/sourceforge/plantuml/project/lang/SentenceTaskEndsAbsolute.java @@ -43,9 +43,10 @@ import net.sourceforge.plantuml.project.time.Day; public class SentenceTaskEndsAbsolute extends SentenceSimple { public SentenceTaskEndsAbsolute() { - super(SubjectTask.ME, Verbs.ends2, ComplementDate.any()); + super(SubjectTask.ME, Verbs.ends, Words.zeroOrMore(Words.THE, Words.ON, Words.AT), ComplementDate.any()); } + @Override public CommandExecutionResult execute(GanttDiagram project, Object subject, Object complement) { final Task task = (Task) subject; diff --git a/src/net/sourceforge/plantuml/project/lang/SentenceTaskEndsOnlyRelative.java b/src/net/sourceforge/plantuml/project/lang/SentenceTaskEndsOnlyRelative.java index 95ed3fe3b..25524553f 100644 --- a/src/net/sourceforge/plantuml/project/lang/SentenceTaskEndsOnlyRelative.java +++ b/src/net/sourceforge/plantuml/project/lang/SentenceTaskEndsOnlyRelative.java @@ -43,7 +43,8 @@ import net.sourceforge.plantuml.project.time.Day; public class SentenceTaskEndsOnlyRelative extends SentenceSimple { public SentenceTaskEndsOnlyRelative() { - super(SubjectTask.ME, Verbs.ends2, ComplementDate.onlyRelative()); + super(SubjectTask.ME, Verbs.ends, Words.zeroOrMore(Words.THE, Words.ON, Words.AT), + ComplementDate.onlyRelative()); } @Override diff --git a/src/net/sourceforge/plantuml/project/lang/SentenceTaskStarts.java b/src/net/sourceforge/plantuml/project/lang/SentenceTaskStarts.java index 8737f4020..6ce0543d3 100644 --- a/src/net/sourceforge/plantuml/project/lang/SentenceTaskStarts.java +++ b/src/net/sourceforge/plantuml/project/lang/SentenceTaskStarts.java @@ -46,7 +46,7 @@ import net.sourceforge.plantuml.project.core.TaskInstant; public class SentenceTaskStarts extends SentenceSimple { public SentenceTaskStarts() { - super(SubjectTask.ME, Verbs.starts2, new ComplementBeforeOrAfterOrAtTaskStartOrEnd()); + super(SubjectTask.ME, Verbs.starts, new ComplementBeforeOrAfterOrAtTaskStartOrEnd()); } @Override diff --git a/src/net/sourceforge/plantuml/project/lang/SentenceTaskStartsAbsolute.java b/src/net/sourceforge/plantuml/project/lang/SentenceTaskStartsAbsolute.java index 492259ec7..3eb5b6616 100644 --- a/src/net/sourceforge/plantuml/project/lang/SentenceTaskStartsAbsolute.java +++ b/src/net/sourceforge/plantuml/project/lang/SentenceTaskStartsAbsolute.java @@ -43,7 +43,7 @@ import net.sourceforge.plantuml.project.time.Day; public class SentenceTaskStartsAbsolute extends SentenceSimple { public SentenceTaskStartsAbsolute() { - super(SubjectTask.ME, Verbs.starts3, ComplementDate.any()); + super(SubjectTask.ME, Verbs.starts, Words.zeroOrMore(Words.THE, Words.ON, Words.AT), ComplementDate.any()); } @Override diff --git a/src/net/sourceforge/plantuml/project/lang/SentenceTaskStartsOnlyRelative.java b/src/net/sourceforge/plantuml/project/lang/SentenceTaskStartsOnlyRelative.java index bf9d07fae..80b4ded71 100644 --- a/src/net/sourceforge/plantuml/project/lang/SentenceTaskStartsOnlyRelative.java +++ b/src/net/sourceforge/plantuml/project/lang/SentenceTaskStartsOnlyRelative.java @@ -43,7 +43,8 @@ import net.sourceforge.plantuml.project.time.Day; public class SentenceTaskStartsOnlyRelative extends SentenceSimple { public SentenceTaskStartsOnlyRelative() { - super(SubjectTask.ME, Verbs.starts3, ComplementDate.onlyRelative()); + super(SubjectTask.ME, Verbs.starts, Words.zeroOrMore(Words.THE, Words.ON, Words.AT), + ComplementDate.onlyRelative()); } @Override diff --git a/src/net/sourceforge/plantuml/project/lang/SentenceTaskStartsWithColor.java b/src/net/sourceforge/plantuml/project/lang/SentenceTaskStartsWithColor.java index 9029d0a8a..2e3acc159 100644 --- a/src/net/sourceforge/plantuml/project/lang/SentenceTaskStartsWithColor.java +++ b/src/net/sourceforge/plantuml/project/lang/SentenceTaskStartsWithColor.java @@ -46,7 +46,7 @@ import net.sourceforge.plantuml.project.core.TaskInstant; public class SentenceTaskStartsWithColor extends SentenceSimple { public SentenceTaskStartsWithColor() { - super(SubjectTask.ME, Verbs.starts2, + super(SubjectTask.ME, Verbs.starts, new PairOfSomething(new ComplementBeforeOrAfterOrAtTaskStartOrEnd(), new ComplementWithColorLink())); } diff --git a/src/net/sourceforge/plantuml/project/lang/SubjectProject.java b/src/net/sourceforge/plantuml/project/lang/SubjectProject.java index 50a42619f..4f72a2748 100644 --- a/src/net/sourceforge/plantuml/project/lang/SubjectProject.java +++ b/src/net/sourceforge/plantuml/project/lang/SubjectProject.java @@ -68,7 +68,8 @@ public class SubjectProject implements Subject { class Starts extends SentenceSimple { public Starts() { - super(SubjectProject.this, Verbs.starts, ComplementDate.onlyAbsolute()); + super(SubjectProject.this, Verbs.starts, Words.zeroOrMore(Words.ON, Words.FOR, Words.THE, Words.AT), + ComplementDate.onlyAbsolute()); } @Override diff --git a/src/net/sourceforge/plantuml/project/lang/SubjectResource.java b/src/net/sourceforge/plantuml/project/lang/SubjectResource.java index 89e14f57b..d9d311e2d 100644 --- a/src/net/sourceforge/plantuml/project/lang/SubjectResource.java +++ b/src/net/sourceforge/plantuml/project/lang/SubjectResource.java @@ -43,11 +43,12 @@ import net.sourceforge.plantuml.project.DaysAsDates; import net.sourceforge.plantuml.project.Failable; import net.sourceforge.plantuml.project.GanttDiagram; import net.sourceforge.plantuml.project.core.Resource; +import net.sourceforge.plantuml.project.core.Task; import net.sourceforge.plantuml.project.time.Day; import net.sourceforge.plantuml.project.time.DayOfWeek; import net.sourceforge.plantuml.regex.IRegex; -import net.sourceforge.plantuml.regex.RegexConcat; import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOr; import net.sourceforge.plantuml.regex.RegexResult; public class SubjectResource implements Subject { @@ -57,30 +58,56 @@ public class SubjectResource implements Subject { private SubjectResource() { } - public Failable getMe(GanttDiagram project, RegexResult arg) { - final String s = arg.get("RESOURCE", 0); - return Failable.ok(project.getResource(s)); + public Failable getMe(GanttDiagram gantt, RegexResult arg) { + if (arg.get("THEY", 0) != null) { + final Resource they = gantt.getThey(); + if (they == null) + return Failable.error("Not sure who are you refering to?"); + return Failable.ok(they); + } + final String resource = arg.get("RESOURCE", 0); + final Resource result = gantt.getResource(resource); + gantt.setThey(result); + return Failable.ok(result); } public Collection getSentences() { return Arrays.asList(new IsOffDate(), new IsOffDates(), new IsOffDayOfWeek(), new IsOnDate(), new IsOnDates(), - new IsOffBeforeDate(), new IsOffAfterDate()); + new IsOffBeforeDate(), new IsOffAfterDate(), new WorksOn()); } public IRegex toRegex() { - return new RegexConcat( // + return new RegexOr( // + new RegexLeaf("THEY", "(she|he|they)"), // new RegexLeaf("RESOURCE", "\\{([^{}]+)\\}") // ); } + public class WorksOn extends SentenceSimple { + + public WorksOn() { + super(SubjectResource.this, Verbs.worksOn, new ComplementTask()); + } + + @Override + public CommandExecutionResult execute(GanttDiagram gantt, Object subject, Object complement) { + final Resource resource = (Resource) subject; + final Task task = (Task) complement; + task.addResource(resource, 100); + return CommandExecutionResult.ok(); + } + + } + public class IsOffBeforeDate extends SentenceSimple { public IsOffBeforeDate() { - super(SubjectResource.this, Verbs.isOffBefore, ComplementDate.any()); + super(SubjectResource.this, Verbs.isOff, + Words.concat(Words.exactly(Words.BEFORE), Words.zeroOrMore(Words.THE)), ComplementDate.any()); } @Override - public CommandExecutionResult execute(GanttDiagram project, Object subject, Object complement) { + public CommandExecutionResult execute(GanttDiagram gantt, Object subject, Object complement) { final Resource resource = (Resource) subject; final Day when = (Day) complement; resource.setOffBeforeDate(when); @@ -92,11 +119,12 @@ public class SubjectResource implements Subject { public class IsOffAfterDate extends SentenceSimple { public IsOffAfterDate() { - super(SubjectResource.this, Verbs.isOffAfter, ComplementDate.any()); + super(SubjectResource.this, Verbs.isOff, + Words.concat(Words.exactly(Words.AFTER), Words.zeroOrMore(Words.THE)), ComplementDate.any()); } @Override - public CommandExecutionResult execute(GanttDiagram project, Object subject, Object complement) { + public CommandExecutionResult execute(GanttDiagram gantt, Object subject, Object complement) { final Resource resource = (Resource) subject; final Day when = (Day) complement; resource.setOffAfterDate(when); @@ -108,11 +136,12 @@ public class SubjectResource implements Subject { public class IsOffDate extends SentenceSimple { public IsOffDate() { - super(SubjectResource.this, Verbs.isOff, ComplementDate.any()); + super(SubjectResource.this, Verbs.isOff, + Words.zeroOrMore(Words.FROM, Words.ON, Words.FOR, Words.THE, Words.AT), ComplementDate.any()); } @Override - public CommandExecutionResult execute(GanttDiagram project, Object subject, Object complement) { + public CommandExecutionResult execute(GanttDiagram gantt, Object subject, Object complement) { final Resource resource = (Resource) subject; final Day when = (Day) complement; resource.addCloseDay(when); @@ -124,11 +153,12 @@ public class SubjectResource implements Subject { public class IsOffDates extends SentenceSimple { public IsOffDates() { - super(SubjectResource.this, Verbs.isOff, new ComplementDates()); + super(SubjectResource.this, Verbs.isOff, + Words.zeroOrMore(Words.FROM, Words.ON, Words.FOR, Words.THE, Words.AT), new ComplementDates()); } @Override - public CommandExecutionResult execute(GanttDiagram project, Object subject, Object complement) { + public CommandExecutionResult execute(GanttDiagram gantt, Object subject, Object complement) { final Resource resource = (Resource) subject; for (Day when : (DaysAsDates) complement) { resource.addCloseDay(when); @@ -141,11 +171,12 @@ public class SubjectResource implements Subject { public class IsOffDayOfWeek extends SentenceSimple { public IsOffDayOfWeek() { - super(SubjectResource.this, Verbs.isOff, new ComplementDayOfWeek()); + super(SubjectResource.this, Verbs.isOff, + Words.zeroOrMore(Words.FROM, Words.ON, Words.FOR, Words.THE, Words.AT), new ComplementDayOfWeek()); } @Override - public CommandExecutionResult execute(GanttDiagram project, Object subject, Object complement) { + public CommandExecutionResult execute(GanttDiagram gantt, Object subject, Object complement) { final Resource resource = (Resource) subject; resource.addCloseDay(((DayOfWeek) complement)); return CommandExecutionResult.ok(); @@ -156,11 +187,12 @@ public class SubjectResource implements Subject { public class IsOnDate extends SentenceSimple { public IsOnDate() { - super(SubjectResource.this, Verbs.isOn, ComplementDate.any()); + super(SubjectResource.this, Verbs.isOn, + Words.zeroOrMore(Words.FROM, Words.ON, Words.FOR, Words.THE, Words.AT), ComplementDate.any()); } @Override - public CommandExecutionResult execute(GanttDiagram project, Object subject, Object complement) { + public CommandExecutionResult execute(GanttDiagram gantt, Object subject, Object complement) { final Resource resource = (Resource) subject; final Day when = (Day) complement; resource.addForceOnDay(when); @@ -172,11 +204,12 @@ public class SubjectResource implements Subject { public class IsOnDates extends SentenceSimple { public IsOnDates() { - super(SubjectResource.this, Verbs.isOn, new ComplementDates()); + super(SubjectResource.this, Verbs.isOn, + Words.zeroOrMore(Words.FROM, Words.ON, Words.FOR, Words.THE, Words.AT), new ComplementDates()); } @Override - public CommandExecutionResult execute(GanttDiagram project, Object subject, Object complement) { + public CommandExecutionResult execute(GanttDiagram gantt, Object subject, Object complement) { final Resource resource = (Resource) subject; for (Day when : (DaysAsDates) complement) { resource.addForceOnDay(when); diff --git a/src/net/sourceforge/plantuml/project/lang/SubjectSeparator.java b/src/net/sourceforge/plantuml/project/lang/SubjectSeparator.java index 261e640d4..4ed3a05e8 100644 --- a/src/net/sourceforge/plantuml/project/lang/SubjectSeparator.java +++ b/src/net/sourceforge/plantuml/project/lang/SubjectSeparator.java @@ -69,7 +69,7 @@ public class SubjectSeparator implements Subject { class JustBefore extends SentenceSimple { public JustBefore() { - super(SubjectSeparator.this, Verbs.justBefore, ComplementDate.any()); + super(SubjectSeparator.this, Verbs.just, Words.exactly(Words.BEFORE), ComplementDate.any()); } @Override @@ -85,7 +85,7 @@ public class SubjectSeparator implements Subject { class JustAfter extends SentenceSimple { public JustAfter() { - super(SubjectSeparator.this, Verbs.justAfter, ComplementDate.any()); + super(SubjectSeparator.this, Verbs.just, Words.exactly(Words.AFTER), ComplementDate.any()); } @Override diff --git a/src/net/sourceforge/plantuml/project/lang/SubjectTask.java b/src/net/sourceforge/plantuml/project/lang/SubjectTask.java index c04d64b16..279f4ecf8 100644 --- a/src/net/sourceforge/plantuml/project/lang/SubjectTask.java +++ b/src/net/sourceforge/plantuml/project/lang/SubjectTask.java @@ -46,6 +46,7 @@ import net.sourceforge.plantuml.regex.IRegex; import net.sourceforge.plantuml.regex.RegexConcat; import net.sourceforge.plantuml.regex.RegexLeaf; import net.sourceforge.plantuml.regex.RegexOptional; +import net.sourceforge.plantuml.regex.RegexOr; import net.sourceforge.plantuml.regex.RegexResult; public class SubjectTask implements Subject { @@ -55,23 +56,32 @@ public class SubjectTask implements Subject { private SubjectTask() { } - public Failable getMe(GanttDiagram project, RegexResult arg) { - final String s = arg.get("SUBJECT", 0); - final String shortName = arg.get("SUBJECT", 1); - final String then = arg.get("THEN", 0); - final String resource = arg.get("RESOURCE", 0); - final Task result = project.getOrCreateTask(s, shortName, then != null); - if (result == null) { - throw new IllegalStateException(); + public Failable getMe(GanttDiagram gantt, RegexResult arg) { + final Task result; + if (arg.get("IT", 0) != null) { + result = gantt.getIt(); + if (result == null) + return Failable.error("Not sure what are you refering to?"); + } else { + final String subject = arg.get("SUBJECT", 0); + final String shortName = arg.get("SUBJECT", 1); + final String then = arg.get("THEN", 0); + result = gantt.getOrCreateTask(subject, shortName, then != null); + gantt.setIt(result); } + + if (result == null) + throw new IllegalStateException(); + + final String resource = arg.get("RESOURCE", 0); if (resource != null) { for (final StringTokenizer st = new StringTokenizer(resource, "{}"); st.hasMoreTokens();) { final String part = st.nextToken().trim(); if (part.length() > 0) { - final boolean ok = project.affectResource(result, part); - if (ok == false) { + final boolean ok = gantt.affectResource(result, part); + if (ok == false) return Failable.error("Bad argument for resource"); - } + } } @@ -90,17 +100,17 @@ public class SubjectTask implements Subject { } public IRegex toRegex() { - return new RegexConcat( // - new RegexLeaf("THEN", "(then[%s]+)?"), // - new RegexLeaf("SUBJECT", "\\[([^\\[\\]]+?)\\](?:[%s]+as[%s]+\\[([^\\[\\]]+?)\\])?"), // - new RegexOptional( // - new RegexConcat( // - RegexLeaf.spaceOneOrMore(), // - new RegexLeaf("on"), // - RegexLeaf.spaceOneOrMore(), // - new RegexLeaf("RESOURCE", "((?:\\{[^{}]+\\}[%s]*)+)") // - )) // - ); + return new RegexOr( // + new RegexLeaf("IT", "(it)"), // + new RegexConcat(new RegexLeaf("THEN", "(then[%s]+)?"), // + new RegexLeaf("SUBJECT", "\\[([^\\[\\]]+?)\\](?:[%s]+as[%s]+\\[([^\\[\\]]+?)\\])?"), // + new RegexOptional( // + new RegexConcat( // + RegexLeaf.spaceOneOrMore(), // + new RegexLeaf("on"), // + RegexLeaf.spaceOneOrMore(), // + new RegexLeaf("RESOURCE", "((?:\\{[^{}]+\\}[%s]*)+)") // + )))); } } diff --git a/src/net/sourceforge/plantuml/project/lang/Verbs.java b/src/net/sourceforge/plantuml/project/lang/Verbs.java index b534124ad..5b7ed01e5 100644 --- a/src/net/sourceforge/plantuml/project/lang/Verbs.java +++ b/src/net/sourceforge/plantuml/project/lang/Verbs.java @@ -36,103 +36,28 @@ package net.sourceforge.plantuml.project.lang; import net.sourceforge.plantuml.regex.IRegex; -import net.sourceforge.plantuml.regex.RegexConcat; import net.sourceforge.plantuml.regex.RegexLeaf; -import net.sourceforge.plantuml.regex.RegexOptional; -import net.sourceforge.plantuml.regex.RegexOr; public class Verbs { public static IRegex are = new RegexLeaf("are"); - public static IRegex areColored = new RegexLeaf("are[%s]+colou?red"); - public static IRegex displayOnSameRowAs = new RegexLeaf("displays?[%s]+on[%s]+same[%s]+row[%s]+as"); - public static IRegex ends = new RegexLeaf("ends"); - - public static IRegex ends2 = new RegexLeaf("ends[%s]*(the[%s]*|on[%s]*|at[%s]*)*"); - - public static IRegex happens = new RegexLeaf("happens?[%s]*(at[%s]*|the[%s]*|on[%s]*)*"); - - public static IRegex pauses = new RegexLeaf("pauses?[%s]*(at[%s]*|the[%s]*|on[%s]*|from[%s]*)*"); - - public static IRegex isDeleted = new RegexLeaf("is[%s]+deleted"); - + public static IRegex happens = new RegexLeaf("happens"); public static IRegex is = new RegexLeaf("is"); - public static IRegex isColored = new RegexLeaf("is[%s]+colou?red"); - - public static IRegex isColoredForCompletion = new RegexLeaf("is[%s]+colou?red[%s]+for[%s]+completion"); - - public static IRegex isOff = new RegexConcat(new RegexLeaf("is"), // - RegexLeaf.spaceOneOrMore(), // - new RegexLeaf("off"), // - RegexLeaf.spaceOneOrMore(), // - new RegexOr(// - new RegexLeaf("from"), // - new RegexLeaf("on"), // - new RegexLeaf("for"), // - new RegexLeaf("the"), // - new RegexLeaf("at") // - )); - - public static IRegex isOffBefore = new RegexConcat(new RegexLeaf("is"), // - RegexLeaf.spaceOneOrMore(), // - new RegexLeaf("off"), // - RegexLeaf.spaceOneOrMore(), // - new RegexLeaf("before") // - ); - - public static IRegex isOffAfter = new RegexConcat(new RegexLeaf("is"), // - RegexLeaf.spaceOneOrMore(), // - new RegexLeaf("off"), // - RegexLeaf.spaceOneOrMore(), // - new RegexLeaf("after") // - ); - - public static IRegex isOn = new RegexConcat(new RegexLeaf("is"), // - RegexLeaf.spaceOneOrMore(), // - new RegexLeaf("on"), // - RegexLeaf.spaceOneOrMore(), // - new RegexOr(// - new RegexLeaf("from"), // - new RegexLeaf("on"), // - new RegexLeaf("for"), // - new RegexLeaf("the"), // - new RegexLeaf("at") // - ) // - ); - + public static IRegex isDeleted = new RegexLeaf("is[%s]+deleted"); + public static IRegex isOff = new RegexLeaf("is[%s]+off"); + public static IRegex isOn = new RegexLeaf("is[%s]+on"); public static IRegex isOrAre = new RegexLeaf("(is|are)"); - public static IRegex isOrAreNamed = new RegexLeaf("(is|are)[%s]+named"); - - public static IRegex requires = new RegexLeaf("(lasts|requires?)"); - - public static IRegex linksTo = new RegexLeaf("links to"); - - public static IRegex occurs = new RegexLeaf("occurs?"); - - public static IRegex starts3 = new RegexLeaf("starts[%s]*(the[%s]*|on[%s]*|at[%s]*)*"); - - public static IRegex starts2 = new RegexLeaf("starts"); - - public static IRegex starts = new RegexConcat(new RegexLeaf("start"), // - new RegexOptional(new RegexLeaf("s")), // - RegexLeaf.spaceZeroOrMore(), // - new RegexOptional(new RegexOr(// - new RegexLeaf("on"), // - new RegexLeaf("for"), // - new RegexLeaf("the"), // - new RegexLeaf("at") // - )) // - ); - public static IRegex just = new RegexLeaf("just"); - - public static IRegex justBefore = new RegexLeaf("just[%s]*before"); - - public static IRegex justAfter = new RegexLeaf("just[%s]*after"); + public static IRegex linksTo = new RegexLeaf("links[%s]+to"); + public static IRegex occurs = new RegexLeaf("occurs"); + public static IRegex pauses = new RegexLeaf("pauses"); + public static IRegex requires = new RegexLeaf("(lasts|requires)"); + public static IRegex starts = new RegexLeaf("starts"); + public static IRegex worksOn = new RegexLeaf("works[%s]+on"); } diff --git a/src/net/sourceforge/plantuml/project/lang/Words.java b/src/net/sourceforge/plantuml/project/lang/Words.java new file mode 100644 index 000000000..9d30ddd85 --- /dev/null +++ b/src/net/sourceforge/plantuml/project/lang/Words.java @@ -0,0 +1,77 @@ +/* ======================================================================== + * PlantUML : a free UML diagram generator + * ======================================================================== + * + * (C) Copyright 2009-2024, Arnaud Roques + * + * Project Info: https://plantuml.com + * + * If you like this project or if you find it useful, you can support us at: + * + * https://plantuml.com/patreon (only 1$ per month!) + * https://plantuml.com/paypal + * + * This file is part of PlantUML. + * + * PlantUML is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * PlantUML distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public + * License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. + * + * + * Original Author: Arnaud Roques + * + * + */ +package net.sourceforge.plantuml.project.lang; + +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOr; +import net.sourceforge.plantuml.regex.RegexRepeatedZeroOrMore; + +public class Words { + + public final static String AFTER = "after"; + public final static String AT = "at"; + public final static String BEFORE = "before"; + public final static String COMPLETION = "completion"; + public final static String FOR = "for"; + public final static String FROM = "from"; + public final static String ON = "on"; + public final static String THE = "the"; + public final static String TO = "to"; + + public static IRegex zeroOrMore(String... words) { + final IRegex tmp[] = new IRegex[words.length]; + for (int i = 0; i < words.length; i++) + tmp[i] = new RegexLeaf(words[i]); + + final RegexOr or = new RegexOr(tmp); + return new RegexRepeatedZeroOrMore(new RegexConcat(RegexLeaf.spaceOneOrMore(), or)); + } + + public static IRegex exactly(String... words) { + final IRegex tmp[] = new IRegex[words.length]; + for (int i = 0; i < words.length; i++) + tmp[i] = new RegexConcat(RegexLeaf.spaceOneOrMore(), new RegexLeaf(words[i])); + + return new RegexConcat(tmp); + } + + public static IRegex concat(IRegex... expressions) { + return new RegexConcat(expressions); + } + +} diff --git a/src/net/sourceforge/plantuml/regex/RegexRepeatedZeroOrMore.java b/src/net/sourceforge/plantuml/regex/RegexRepeatedZeroOrMore.java new file mode 100644 index 000000000..ab0febc5e --- /dev/null +++ b/src/net/sourceforge/plantuml/regex/RegexRepeatedZeroOrMore.java @@ -0,0 +1,58 @@ +/* ======================================================================== + * PlantUML : a free UML diagram generator + * ======================================================================== + * + * (C) Copyright 2009-2024, Arnaud Roques + * + * Project Info: https://plantuml.com + * + * If you like this project or if you find it useful, you can support us at: + * + * https://plantuml.com/patreon (only 1$ per month!) + * https://plantuml.com/paypal + * + * This file is part of PlantUML. + * + * PlantUML is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * PlantUML distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public + * License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. + * + * + * Original Author: Arnaud Roques + * + * + */ +package net.sourceforge.plantuml.regex; + +import net.sourceforge.plantuml.text.StringLocated; + +public class RegexRepeatedZeroOrMore extends RegexComposed implements IRegex { + + public RegexRepeatedZeroOrMore(IRegex partial) { + super(partial); + } + + @Override + protected String getFullSlow() { + final StringBuilder sb = new StringBuilder("(?:"); + sb.append(partials().get(0).getPattern()); + sb.append(")*"); + return sb.toString(); + } + + public boolean match(StringLocated full) { + throw new UnsupportedOperationException(); + } + +} From e991c4699be76588535ef1f4ba2bd2d0908ae80f Mon Sep 17 00:00:00 2001 From: Arnaud Roques Date: Mon, 27 Nov 2023 18:41:15 +0100 Subject: [PATCH 19/95] feat: several gantt improvement --- skin/plantuml.skin | 7 + .../plantuml/project/GanttDiagram.java | 51 ++++--- .../{lang/Adverbial.java => GanttStyle.java} | 11 +- .../project/TimeHeaderParameters.java | 40 ++++-- .../plantuml/project/core/AbstractTask.java | 15 ++ .../plantuml/project/core/Task.java | 4 + .../project/draw/TaskDrawDiamond.java | 28 ++-- .../plantuml/project/draw/TimeHeader.java | 39 +++-- .../project/draw/TimeHeaderCalendar.java | 2 +- .../project/draw/TimeHeaderDaily.java | 106 +++++++++----- .../project/draw/TimeHeaderMonthly.java | 68 +++++---- .../project/draw/TimeHeaderQuarterly.java | 66 +++++---- .../project/draw/TimeHeaderSimple.java | 46 +++--- .../project/draw/TimeHeaderWeekly.java | 65 +++++---- .../project/draw/TimeHeaderYearly.java | 46 +++--- .../project/lang/ComplementAnything.java | 54 +++++++ .../plantuml/project/lang/ComplementDate.java | 65 +-------- .../project/lang/ComplementDates.java | 39 ++--- .../plantuml/project/lang/DayPattern.java | 136 ++++++++++++++++++ .../project/lang/SentenceIsDisplayedAs.java | 56 ++++++++ .../project/lang/SubjectDayAsDate.java | 7 +- .../project/lang/SubjectDaysAsDates.java | 27 +--- .../plantuml/project/lang/SubjectTask.java | 5 +- .../plantuml/project/lang/TimeResolution.java | 72 ++++++++++ .../plantuml/project/lang/Verbs.java | 1 + .../plantuml/project/lang/Words.java | 1 + .../timescale/TimeScaleCompressed.java | 4 +- .../project/timescale/TimeScaleDaily.java | 6 +- .../project/timescale/TimeScaleWink.java | 10 +- src/net/sourceforge/plantuml/style/SName.java | 3 + 30 files changed, 731 insertions(+), 349 deletions(-) rename src/net/sourceforge/plantuml/project/{lang/Adverbial.java => GanttStyle.java} (83%) create mode 100644 src/net/sourceforge/plantuml/project/lang/ComplementAnything.java create mode 100644 src/net/sourceforge/plantuml/project/lang/DayPattern.java create mode 100644 src/net/sourceforge/plantuml/project/lang/SentenceIsDisplayedAs.java create mode 100644 src/net/sourceforge/plantuml/project/lang/TimeResolution.java diff --git a/skin/plantuml.skin b/skin/plantuml.skin index ecba3aa67..e71b91a42 100644 --- a/skin/plantuml.skin +++ b/skin/plantuml.skin @@ -375,6 +375,13 @@ ganttDiagram { timeline { BackgroundColor transparent LineColor #C0C0C0 + FontSize 10 + month { + FontSize 12 + } + year { + FontSize 14 + } } closed { BackGroundColor #F1E5E5 diff --git a/src/net/sourceforge/plantuml/project/GanttDiagram.java b/src/net/sourceforge/plantuml/project/GanttDiagram.java index 10a540edc..6314bdc33 100644 --- a/src/net/sourceforge/plantuml/project/GanttDiagram.java +++ b/src/net/sourceforge/plantuml/project/GanttDiagram.java @@ -117,7 +117,7 @@ import net.sourceforge.plantuml.style.StyleSignatureBasic; import net.sourceforge.plantuml.svek.GraphvizCrash; import net.sourceforge.plantuml.text.BackSlash; -public class GanttDiagram extends TitledDiagram implements ToTaskDraw, WithSprite { +public class GanttDiagram extends TitledDiagram implements ToTaskDraw, WithSprite, GanttStyle { private final Map draws = new LinkedHashMap(); private final Map tasks = new LinkedHashMap(); @@ -233,8 +233,9 @@ public class GanttDiagram extends TitledDiagram implements ToTaskDraw, WithSprit this.min = printStart; this.max = printEnd; } - final TimeHeader timeHeader = getTimeHeader(); - initTaskAndResourceDraws(timeHeader.getTimeScale(), timeHeader.getFullHeaderHeight(), stringBounder); + final TimeHeader timeHeader = getTimeHeader(stringBounder); + initTaskAndResourceDraws(timeHeader.getTimeScale(), timeHeader.getFullHeaderHeight(stringBounder), + stringBounder); return new AbstractTextBlock() { public void drawU(UGraphic ug) { @@ -250,12 +251,12 @@ public class GanttDiagram extends TitledDiagram implements ToTaskDraw, WithSprit final HColor back = timelineStyle.value(PName.BackGroundColor).asColor(getIHtmlColorSet()); if (back.isTransparent() == false) { final URectangle rect1 = URectangle.build(calculateDimension(ug.getStringBounder()).getWidth(), - timeHeader.getTimeHeaderHeight()); + timeHeader.getTimeHeaderHeight(ug.getStringBounder())); ug.apply(back.bg()).draw(rect1); if (showFootbox) { final URectangle rect2 = URectangle.build( calculateDimension(ug.getStringBounder()).getWidth(), - timeHeader.getTimeFooterHeight()); + timeHeader.getTimeFooterHeight(ug.getStringBounder())); ug.apply(back.bg()).apply(UTranslate.dy(totalHeightWithoutFooter)).draw(rect2); } } @@ -297,7 +298,7 @@ public class GanttDiagram extends TitledDiagram implements ToTaskDraw, WithSprit public XDimension2D calculateDimension(StringBounder stringBounder) { return new XDimension2D(getTitlesColumnWidth(stringBounder) + getBarsColumnWidth(timeHeader), - getTotalHeight(timeHeader)); + getTotalHeight(stringBounder, timeHeader)); } private double getBarsColumnWidth(final TimeHeader timeHeader) { @@ -309,28 +310,27 @@ public class GanttDiagram extends TitledDiagram implements ToTaskDraw, WithSprit }; } - private TimeHeader getTimeHeader() { + private TimeHeader getTimeHeader(StringBounder stringBounder) { if (openClose.getStartingDay() == null) - return new TimeHeaderSimple(thParam(), printScale); + return new TimeHeaderSimple(stringBounder, thParam(), printScale); else if (printScale == PrintScale.DAILY) - return new TimeHeaderDaily(thParam(), nameDays, printStart, printEnd); + return new TimeHeaderDaily(stringBounder, thParam(), nameDays, printStart, printEnd); else if (printScale == PrintScale.WEEKLY) - return new TimeHeaderWeekly(thParam(), weekNumberStrategy, withCalendarDate); + return new TimeHeaderWeekly(stringBounder, thParam(), weekNumberStrategy, withCalendarDate); else if (printScale == PrintScale.MONTHLY) - return new TimeHeaderMonthly(thParam()); + return new TimeHeaderMonthly(stringBounder, thParam()); else if (printScale == PrintScale.QUARTERLY) - return new TimeHeaderQuarterly(thParam()); + return new TimeHeaderQuarterly(stringBounder, thParam()); else if (printScale == PrintScale.YEARLY) - return new TimeHeaderYearly(thParam()); + return new TimeHeaderYearly(stringBounder, thParam()); else throw new IllegalStateException(); } private TimeHeaderParameters thParam() { - return new TimeHeaderParameters(colorDays(), getFactorScale(), min, max, getIHtmlColorSet(), getTimelineStyle(), - getClosedStyle(), locale, openClose, colorDaysOfWeek, verticalSeparatorBefore, - getVerticalSeparatorStyle()); + return new TimeHeaderParameters(colorDays(), getFactorScale(), min, max, getIHtmlColorSet(), locale, openClose, + colorDaysOfWeek, verticalSeparatorBefore, this); } private Map colorDays() { @@ -338,24 +338,21 @@ public class GanttDiagram extends TitledDiagram implements ToTaskDraw, WithSprit return Collections.unmodifiableMap(colorDaysInternal); } - private Style getClosedStyle() { - return StyleSignatureBasic.of(SName.root, SName.element, SName.ganttDiagram, SName.closed) + @Override + public final Style getStyle(SName param) { + return StyleSignatureBasic.of(SName.root, SName.element, SName.ganttDiagram, param) .getMergedStyle(getCurrentStyleBuilder()); } - private Style getTimelineStyle() { - return StyleSignatureBasic.of(SName.root, SName.element, SName.ganttDiagram, SName.timeline) + @Override + public final Style getStyle(SName param1, SName param2) { + return StyleSignatureBasic.of(SName.root, SName.element, SName.ganttDiagram, param1, param2) .getMergedStyle(getCurrentStyleBuilder()); } - private Style getVerticalSeparatorStyle() { - return StyleSignatureBasic.of(SName.root, SName.element, SName.ganttDiagram, SName.verticalSeparator) - .getMergedStyle(getCurrentStyleBuilder()); - } - - private double getTotalHeight(TimeHeader timeHeader) { + private double getTotalHeight(StringBounder stringBounder, TimeHeader timeHeader) { if (showFootbox) - return totalHeightWithoutFooter + timeHeader.getTimeFooterHeight(); + return totalHeightWithoutFooter + timeHeader.getTimeFooterHeight(stringBounder); return totalHeightWithoutFooter; } diff --git a/src/net/sourceforge/plantuml/project/lang/Adverbial.java b/src/net/sourceforge/plantuml/project/GanttStyle.java similarity index 83% rename from src/net/sourceforge/plantuml/project/lang/Adverbial.java rename to src/net/sourceforge/plantuml/project/GanttStyle.java index 2c8ad3a02..44e15537d 100644 --- a/src/net/sourceforge/plantuml/project/lang/Adverbial.java +++ b/src/net/sourceforge/plantuml/project/GanttStyle.java @@ -33,12 +33,15 @@ * * */ -package net.sourceforge.plantuml.project.lang; +package net.sourceforge.plantuml.project; -import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.style.SName; +import net.sourceforge.plantuml.style.Style; -public interface Adverbial { +public interface GanttStyle { - public IRegex toRegex(); + public Style getStyle(SName param); + + public Style getStyle(SName param1, SName param2); } diff --git a/src/net/sourceforge/plantuml/project/TimeHeaderParameters.java b/src/net/sourceforge/plantuml/project/TimeHeaderParameters.java index d19da40ce..14cab9795 100644 --- a/src/net/sourceforge/plantuml/project/TimeHeaderParameters.java +++ b/src/net/sourceforge/plantuml/project/TimeHeaderParameters.java @@ -43,41 +43,39 @@ import net.sourceforge.plantuml.klimt.UStroke; import net.sourceforge.plantuml.klimt.color.HColor; import net.sourceforge.plantuml.klimt.color.HColorSet; import net.sourceforge.plantuml.klimt.drawing.UGraphic; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.project.time.Day; import net.sourceforge.plantuml.project.time.DayOfWeek; import net.sourceforge.plantuml.style.PName; +import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; -public class TimeHeaderParameters { +public class TimeHeaderParameters implements GanttStyle { private final Map colorDays; private final double scale; private final Day min; private final Day max; private final HColorSet colorSet; - private final Style timelineStyle; - private final Style closedStyle; - private final Style verticalSeparatorStyle; + private final GanttStyle ganttStyle; private final Locale locale; private final OpenClose openClose; private final Map colorDaysOfWeek; private final Set verticalSeparatorBefore; public TimeHeaderParameters(Map colorDays, double scale, Day min, Day max, HColorSet colorSet, - Style timelineStyle, Style closedStyle, Locale locale, OpenClose openClose, - Map colorDaysOfWeek, Set verticalSeparatorBefore, Style verticalSeparatorStyle) { + Locale locale, OpenClose openClose, Map colorDaysOfWeek, + Set verticalSeparatorBefore, GanttStyle ganttStyle) { this.colorDays = colorDays; this.scale = scale; this.min = min; this.max = max; this.colorSet = colorSet; - this.timelineStyle = timelineStyle; - this.closedStyle = closedStyle; + this.ganttStyle = ganttStyle; this.locale = locale; this.openClose = openClose; this.colorDaysOfWeek = colorDaysOfWeek; this.verticalSeparatorBefore = verticalSeparatorBefore; - this.verticalSeparatorStyle = verticalSeparatorStyle; } public HColor getColor(Day wink) { @@ -105,11 +103,11 @@ public class TimeHeaderParameters { } public final Style getTimelineStyle() { - return timelineStyle; + return getStyle(SName.timeline); } public final Style getClosedStyle() { - return closedStyle; + return getStyle(SName.closed); } public final Locale getLocale() { @@ -129,9 +127,25 @@ public class TimeHeaderParameters { } public final UGraphic forVerticalSeparator(UGraphic ug) { - final HColor color = verticalSeparatorStyle.value(PName.LineColor).asColor(getColorSet()); - final UStroke stroke = verticalSeparatorStyle.getStroke(); + final Style style = getStyle(SName.verticalSeparator); + final HColor color = style.value(PName.LineColor).asColor(getColorSet()); + final UStroke stroke = style.getStroke(); return ug.apply(color).apply(stroke); } + @Override + public final Style getStyle(SName param1, SName param2) { + return ganttStyle.getStyle(param1, param2); + } + + @Override + public Style getStyle(SName param) { + return ganttStyle.getStyle(param); + } + + public double getCellWidth(StringBounder stringBounder) { + final double w = getStyle(SName.timeline, SName.day).value(PName.FontSize).asDouble(); + return w * 1.6; + } + } diff --git a/src/net/sourceforge/plantuml/project/core/AbstractTask.java b/src/net/sourceforge/plantuml/project/core/AbstractTask.java index fe74f41cf..549e2c11f 100644 --- a/src/net/sourceforge/plantuml/project/core/AbstractTask.java +++ b/src/net/sourceforge/plantuml/project/core/AbstractTask.java @@ -43,27 +43,42 @@ public abstract class AbstractTask implements Task { private final StyleBuilder styleBuilder; private Task row; + private String displayString; protected AbstractTask(StyleBuilder styleBuilder, TaskCode code) { this.styleBuilder = styleBuilder; this.code = code; } + @Override final public void putInSameRowAs(Task row) { if (this != row) this.row = row; } + @Override public final Task getRow() { return row; } + @Override public final TaskCode getCode() { return code; } + @Override public final StyleBuilder getStyleBuilder() { return styleBuilder; } + @Override + public void setDisplay(String displayString) { + this.displayString = displayString; + } + + @Override + public String getDisplayString() { + return this.displayString; + } + } diff --git a/src/net/sourceforge/plantuml/project/core/Task.java b/src/net/sourceforge/plantuml/project/core/Task.java index 178b6283e..467274875 100644 --- a/src/net/sourceforge/plantuml/project/core/Task.java +++ b/src/net/sourceforge/plantuml/project/core/Task.java @@ -81,4 +81,8 @@ public interface Task extends Moment { public boolean isAssignedTo(Resource res); + public void setDisplay(String displayString); + + public String getDisplayString(); + } diff --git a/src/net/sourceforge/plantuml/project/draw/TaskDrawDiamond.java b/src/net/sourceforge/plantuml/project/draw/TaskDrawDiamond.java index 30e3d8031..df3a3854b 100644 --- a/src/net/sourceforge/plantuml/project/draw/TaskDrawDiamond.java +++ b/src/net/sourceforge/plantuml/project/draw/TaskDrawDiamond.java @@ -134,29 +134,39 @@ public class TaskDrawDiamond extends AbstractTaskDraw { @Override public void drawU(UGraphic ug) { + if (url != null) + ug.startUrl(url); + + final String displayString = getTask().getDisplayString(); + final Style style = getStyle(); final ClockwiseTopRightBottomLeft margin = style.getMargin(); ug = ug.apply(UTranslate.dy(margin.getTop())); final double x1 = timeScale.getStartingPosition(start); - final double x2 = timeScale.getEndingPosition(start); - final double width = getDiamondHeight(); - final double delta = x2 - x1 - width; - if (url != null) - ug.startUrl(url); - - drawShape(applyColors(ug).apply(UTranslate.dx(x1 + delta / 2))); + ug = ug.apply(UTranslate.dx(x1)); + if (displayString == null) { + final double x2 = timeScale.getEndingPosition(start); + final double width = getDiamondHeight(); + final double delta = x2 - x1 - width; + ug = ug.apply(UTranslate.dx(delta / 2)); + drawShape(applyColors(ug)); + } else { + final TextBlock draw = Display.getWithNewlines(displayString).create(getFontConfiguration(), + HorizontalAlignment.LEFT, new SpriteContainerEmpty()); + draw.drawU(ug); + } if (url != null) ug.closeUrl(); } private UGraphic applyColors(UGraphic ug) { final CenterBorderColor col = this.getColors(); - if (col != null && col.isOk()) { + if (col != null && col.isOk()) return col.apply(ug); - } + return ug.apply(getLineColor()).apply(getBackgroundColor().bg()); } diff --git a/src/net/sourceforge/plantuml/project/draw/TimeHeader.java b/src/net/sourceforge/plantuml/project/draw/TimeHeader.java index b50138d03..9d171188e 100644 --- a/src/net/sourceforge/plantuml/project/draw/TimeHeader.java +++ b/src/net/sourceforge/plantuml/project/draw/TimeHeader.java @@ -41,6 +41,7 @@ import net.sourceforge.plantuml.klimt.color.HColors; import net.sourceforge.plantuml.klimt.creole.Display; import net.sourceforge.plantuml.klimt.drawing.UGraphic; import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.klimt.font.UFont; import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.klimt.shape.TextBlock; @@ -51,18 +52,11 @@ import net.sourceforge.plantuml.project.TimeHeaderParameters; import net.sourceforge.plantuml.project.time.Day; import net.sourceforge.plantuml.project.timescale.TimeScale; import net.sourceforge.plantuml.style.PName; +import net.sourceforge.plantuml.style.SName; public abstract class TimeHeader { // ::remove folder when __HAXE__ - protected final double Y_POS_ROW16() { - return 16; - } - - protected final double Y_POS_ROW28() { - return 28; - } - private final TimeScale timeScale; protected final TimeHeaderParameters thParam; @@ -100,15 +94,19 @@ public abstract class TimeHeader { return thParam.getTimelineStyle().value(PName.LineColor).asColor(thParam.getColorSet()); } - public abstract double getTimeHeaderHeight(); + public abstract double getTimeHeaderHeight(StringBounder stringBounder); - public abstract double getTimeFooterHeight(); + public abstract double getTimeFooterHeight(StringBounder stringBounder); + + public abstract double getFullHeaderHeight(StringBounder stringBounder); public abstract void drawTimeHeader(UGraphic ug, double totalHeightWithoutFooter); public abstract void drawTimeFooter(UGraphic ug); - public abstract double getFullHeaderHeight(); + public final TimeScale getTimeScale() { + return timeScale; + } protected final void drawHline(UGraphic ug, double y) { final double xmin = getTimeScale().getStartingPosition(thParam.getMin()); @@ -122,20 +120,17 @@ public abstract class TimeHeader { ug.apply(new UTranslate(x, y1)).draw(vbar); } - final protected FontConfiguration getFontConfiguration(int size, boolean bold, HColor color) { - UFont font = UFont.serif(size); + final protected FontConfiguration getFontConfiguration(UFont font, boolean bold, HColor color) { if (bold) font = font.bold(); return FontConfiguration.create(font, color, color, null); } - public final TimeScale getTimeScale() { - return timeScale; - } - - protected final TextBlock getTextBlock(String text, int size, boolean bold, HColor color) { - return Display.getWithNewlines(text).create(getFontConfiguration(size, bold, color), HorizontalAlignment.LEFT, + protected final TextBlock getTextBlock(SName param, String text, boolean bold, HColor color) { + final UFont font = thParam.getStyle(SName.timeline, param).getUFont(); + final FontConfiguration fontConfiguration = getFontConfiguration(font, bold, color); + return Display.getWithNewlines(text).create(fontConfiguration, HorizontalAlignment.LEFT, new SpriteContainerEmpty()); } @@ -165,7 +160,7 @@ public abstract class TimeHeader { return; ug = ug.apply(HColors.none()); - ug = ug.apply(new UTranslate(x1, getFullHeaderHeight())); + ug = ug.apply(new UTranslate(x1, getFullHeaderHeight(ug.getStringBounder()))); ug.draw(URectangle.build(x2 - x1, height)); } @@ -173,8 +168,8 @@ public abstract class TimeHeader { ug = thParam.forVerticalSeparator(ug); for (Day wink = getMin(); wink.compareTo(getMax()) <= 0; wink = wink.increment()) if (isBold2(wink)) - drawVline(ug, getTimeScale().getStartingPosition(wink), getFullHeaderHeight(), - totalHeightWithoutFooter); + drawVline(ug, getTimeScale().getStartingPosition(wink), + getFullHeaderHeight(ug.getStringBounder()), totalHeightWithoutFooter); } } diff --git a/src/net/sourceforge/plantuml/project/draw/TimeHeaderCalendar.java b/src/net/sourceforge/plantuml/project/draw/TimeHeaderCalendar.java index ff606e347..fb85e6503 100644 --- a/src/net/sourceforge/plantuml/project/draw/TimeHeaderCalendar.java +++ b/src/net/sourceforge/plantuml/project/draw/TimeHeaderCalendar.java @@ -76,7 +76,7 @@ public abstract class TimeHeaderCalendar extends TimeHeader { protected final void drawTextsBackground(UGraphic ug, double totalHeightWithoutFooter) { - final double height = totalHeightWithoutFooter - getFullHeaderHeight(); + final double height = totalHeightWithoutFooter - getFullHeaderHeight(ug.getStringBounder()); Pending pending = null; for (Day wink = getMin(); wink.compareTo(getMax()) <= 0; wink = wink.increment()) { diff --git a/src/net/sourceforge/plantuml/project/draw/TimeHeaderDaily.java b/src/net/sourceforge/plantuml/project/draw/TimeHeaderDaily.java index 55f04437c..6d5a550bb 100644 --- a/src/net/sourceforge/plantuml/project/draw/TimeHeaderDaily.java +++ b/src/net/sourceforge/plantuml/project/draw/TimeHeaderDaily.java @@ -40,41 +40,79 @@ import java.util.Map; import net.sourceforge.plantuml.klimt.UTranslate; import net.sourceforge.plantuml.klimt.color.HColor; import net.sourceforge.plantuml.klimt.drawing.UGraphic; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.klimt.shape.TextBlock; import net.sourceforge.plantuml.project.TimeHeaderParameters; import net.sourceforge.plantuml.project.time.Day; import net.sourceforge.plantuml.project.time.MonthYear; import net.sourceforge.plantuml.project.timescale.TimeScaleDaily; +import net.sourceforge.plantuml.style.PName; +import net.sourceforge.plantuml.style.SName; public class TimeHeaderDaily extends TimeHeaderCalendar { - public double getTimeHeaderHeight() { - return Y_POS_ROW28() + 13; + private double getH1(StringBounder stringBounder) { + final double h = thParam.getStyle(SName.timeline, SName.month).value(PName.FontSize).asDouble() + 2; + return h; } - public double getTimeFooterHeight() { - // return 0; - return 24 + 14; + private double getH2(StringBounder stringBounder) { + final double h = thParam.getStyle(SName.timeline, SName.day).value(PName.FontSize).asDouble() + 2; + return getH1(stringBounder) + h; + } + + private double getH3(StringBounder stringBounder) { + final double h = thParam.getStyle(SName.timeline, SName.day).value(PName.FontSize).asDouble() + 3; + return getH2(stringBounder) + h; + } + + @Override + public double getTimeHeaderHeight(StringBounder stringBounder) { + return getH3(stringBounder); + } + + @Override + public double getTimeFooterHeight(StringBounder stringBounder) { + final double h1 = thParam.getStyle(SName.timeline, SName.day).value(PName.FontSize).asDouble(); + final double h2 = thParam.getStyle(SName.timeline, SName.day).value(PName.FontSize).asDouble(); + final double h3 = thParam.getStyle(SName.timeline, SName.month).value(PName.FontSize).asDouble(); + return h1 + h2 + h3 + 8; + } + + private double getHeaderNameDayHeight() { + if (nameDays.size() > 0) { + final double h = thParam.getStyle(SName.timeline, SName.day).value(PName.FontSize).asDouble() + 6; + return h; + } + + return 0; + } + + @Override + public double getFullHeaderHeight(StringBounder stringBounder) { + return getTimeHeaderHeight(stringBounder) + getHeaderNameDayHeight(); } private final Map nameDays; - public TimeHeaderDaily(TimeHeaderParameters thParam, Map nameDays, Day printStart, Day printEnd) { - super(thParam, new TimeScaleDaily(thParam.getStartingDay(), thParam.getScale(), printStart)); + public TimeHeaderDaily(StringBounder stringBounder, TimeHeaderParameters thParam, Map nameDays, + Day printStart, Day printEnd) { + super(thParam, new TimeScaleDaily(thParam.getCellWidth(stringBounder), thParam.getStartingDay(), + thParam.getScale(), printStart)); this.nameDays = nameDays; } @Override public void drawTimeHeader(final UGraphic ug, double totalHeightWithoutFooter) { drawTextsBackground(ug, totalHeightWithoutFooter); - drawTextsDayOfWeek(ug.apply(UTranslate.dy(Y_POS_ROW16()))); - drawTextDayOfMonth(ug.apply(UTranslate.dy(Y_POS_ROW28()))); + drawTextsDayOfWeek(ug.apply(UTranslate.dy(getH1(ug.getStringBounder())))); + drawTextDayOfMonth(ug.apply(UTranslate.dy(getH2(ug.getStringBounder())))); drawMonths(ug); printVerticalSeparators(ug, totalHeightWithoutFooter); printNamedDays(ug); - drawHline(ug, getFullHeaderHeight()); + drawHline(ug, getFullHeaderHeight(ug.getStringBounder())); drawHline(ug, totalHeightWithoutFooter); } @@ -84,21 +122,22 @@ public class TimeHeaderDaily extends TimeHeaderCalendar { final UGraphic ugLineColor = ug.apply(getLineColor()); for (Day wink = getMin(); wink.compareTo(getMax()) <= 0; wink = wink.increment()) if (isBold2(wink)) - drawVline(ugVerticalSeparator, getTimeScale().getStartingPosition(wink), getFullHeaderHeight(), - totalHeightWithoutFooter); + drawVline(ugVerticalSeparator, getTimeScale().getStartingPosition(wink), + getFullHeaderHeight(ug.getStringBounder()), totalHeightWithoutFooter); else - drawVline(ugLineColor, getTimeScale().getStartingPosition(wink), getFullHeaderHeight(), - totalHeightWithoutFooter); + drawVline(ugLineColor, getTimeScale().getStartingPosition(wink), + getFullHeaderHeight(ug.getStringBounder()), totalHeightWithoutFooter); - drawVline(ugLineColor, getTimeScale().getEndingPosition(getMax()), getFullHeaderHeight(), + drawVline(ugLineColor, getTimeScale().getEndingPosition(getMax()), getFullHeaderHeight(ug.getStringBounder()), totalHeightWithoutFooter); } @Override public void drawTimeFooter(UGraphic ug) { - drawTextDayOfMonth(ug.apply(UTranslate.dy(12))); + final double h = thParam.getStyle(SName.timeline, SName.day).value(PName.FontSize).asDouble() + 2; drawTextsDayOfWeek(ug); - drawMonths(ug.apply(UTranslate.dy(24))); + drawTextDayOfMonth(ug.apply(UTranslate.dy(h + 2))); + drawMonths(ug.apply(UTranslate.dy(2 * h + 3))); } private void drawTextsDayOfWeek(UGraphic ug) { @@ -106,7 +145,8 @@ public class TimeHeaderDaily extends TimeHeaderCalendar { final double x1 = getTimeScale().getStartingPosition(wink); final double x2 = getTimeScale().getEndingPosition(wink); final HColor textColor = getTextBackColor(wink); - printCentered(ug, getTextBlock(wink.getDayOfWeek().shortName(locale()), 10, false, textColor), x1, x2); + printCentered(ug, getTextBlock(SName.day, wink.getDayOfWeek().shortName(locale()), false, textColor), x1, + x2); } } @@ -115,7 +155,7 @@ public class TimeHeaderDaily extends TimeHeaderCalendar { final double x1 = getTimeScale().getStartingPosition(wink); final double x2 = getTimeScale().getEndingPosition(wink); final HColor textColor = getTextBackColor(wink); - printCentered(ug, getTextBlock("" + wink.getDayOfMonth(), 10, false, textColor), x1, x2); + printCentered(ug, getTextBlock(SName.day, "" + wink.getDayOfMonth(), false, textColor), x1, x2); } } @@ -146,9 +186,9 @@ public class TimeHeaderDaily extends TimeHeaderCalendar { } private void printMonth(UGraphic ug, MonthYear monthYear, double start, double end) { - final TextBlock tiny = getTextBlock(monthYear.shortName(locale()), 12, true, openFontColor()); - final TextBlock small = getTextBlock(monthYear.longName(locale()), 12, true, openFontColor()); - final TextBlock big = getTextBlock(monthYear.longNameYYYY(locale()), 12, true, openFontColor()); + final TextBlock tiny = getTextBlock(SName.month, monthYear.shortName(locale()), true, openFontColor()); + final TextBlock small = getTextBlock(SName.month, monthYear.longName(locale()), true, openFontColor()); + final TextBlock big = getTextBlock(SName.month, monthYear.longNameYYYY(locale()), true, openFontColor()); printCentered(ug, false, start, end, tiny, small, big); } @@ -160,27 +200,17 @@ public class TimeHeaderDaily extends TimeHeaderCalendar { if (name != null && name.equals(last) == false) { final double x1 = getTimeScale().getStartingPosition(wink); final double x2 = getTimeScale().getEndingPosition(wink); - final TextBlock label = getTextBlock(name, 12, false, openFontColor()); + final TextBlock label = getTextBlock(SName.month, name, false, openFontColor()); final double h = label.calculateDimension(ug.getStringBounder()).getHeight(); - double y1 = getTimeHeaderHeight(); - double y2 = getFullHeaderHeight(); - label.drawU(ug.apply(new UTranslate(x1, Y_POS_ROW28() + 11))); + double y1 = getTimeHeaderHeight(ug.getStringBounder()); + double y2 = getFullHeaderHeight(ug.getStringBounder()); + + final double position = getH3(ug.getStringBounder()); + label.drawU(ug.apply(new UTranslate(x1, position))); } last = name; } } } - @Override - public double getFullHeaderHeight() { - return getTimeHeaderHeight() + getHeaderNameDayHeight(); - } - - private double getHeaderNameDayHeight() { - if (nameDays.size() > 0) - return 16; - - return 0; - } - } diff --git a/src/net/sourceforge/plantuml/project/draw/TimeHeaderMonthly.java b/src/net/sourceforge/plantuml/project/draw/TimeHeaderMonthly.java index fc6c99771..81e619c86 100644 --- a/src/net/sourceforge/plantuml/project/draw/TimeHeaderMonthly.java +++ b/src/net/sourceforge/plantuml/project/draw/TimeHeaderMonthly.java @@ -37,54 +37,76 @@ package net.sourceforge.plantuml.project.draw; import net.sourceforge.plantuml.klimt.UTranslate; import net.sourceforge.plantuml.klimt.drawing.UGraphic; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.klimt.shape.TextBlock; import net.sourceforge.plantuml.project.TimeHeaderParameters; import net.sourceforge.plantuml.project.time.Day; import net.sourceforge.plantuml.project.time.MonthYear; import net.sourceforge.plantuml.project.timescale.TimeScaleCompressed; +import net.sourceforge.plantuml.style.PName; +import net.sourceforge.plantuml.style.SName; public class TimeHeaderMonthly extends TimeHeaderCalendar { - public double getTimeHeaderHeight() { - return 16 + 13; + @Override + public double getTimeHeaderHeight(StringBounder stringBounder) { + final double h1 = thParam.getStyle(SName.timeline, SName.year).value(PName.FontSize).asDouble(); + final double h2 = thParam.getStyle(SName.timeline, SName.month).value(PName.FontSize).asDouble(); + return h1 + h2 + 5; } - public double getTimeFooterHeight() { - return 16 + 13 - 1; + @Override + public double getTimeFooterHeight(StringBounder stringBounder) { + final double h1 = thParam.getStyle(SName.timeline, SName.year).value(PName.FontSize).asDouble(); + final double h2 = thParam.getStyle(SName.timeline, SName.month).value(PName.FontSize).asDouble(); + return h1 + h2 + 5; } - public TimeHeaderMonthly(TimeHeaderParameters thParam) { - super(thParam, new TimeScaleCompressed(thParam.getStartingDay(), thParam.getScale())); + @Override + public double getFullHeaderHeight(StringBounder stringBounder) { + return getTimeHeaderHeight(stringBounder); + } + + public TimeHeaderMonthly(StringBounder stringBounder, TimeHeaderParameters thParam) { + super(thParam, new TimeScaleCompressed(thParam.getCellWidth(stringBounder), thParam.getStartingDay(), + thParam.getScale())); } @Override public void drawTimeHeader(final UGraphic ug, double totalHeightWithoutFooter) { drawTextsBackground(ug, totalHeightWithoutFooter); drawYears(ug); - drawMonths(ug.apply(UTranslate.dy(16))); + final double h1 = thParam.getStyle(SName.timeline, SName.year).value(PName.FontSize).asDouble(); + final double h2 = thParam.getStyle(SName.timeline, SName.month).value(PName.FontSize).asDouble(); + drawMonths(ug.apply(UTranslate.dy(h1 + 2))); printVerticalSeparators(ug, totalHeightWithoutFooter); drawHline(ug, 0); - drawHline(ug, 16); - drawHline(ug, getFullHeaderHeight()); + drawHline(ug, h1 + 2); + drawHline(ug, h1 + 2 + h2 + 2); +// drawHline(ug, getFullHeaderHeight(ug.getStringBounder())); } @Override public void drawTimeFooter(UGraphic ug) { - ug = ug.apply(UTranslate.dy(3)); + final double h1 = thParam.getStyle(SName.timeline, SName.year).value(PName.FontSize).asDouble(); + final double h2 = thParam.getStyle(SName.timeline, SName.month).value(PName.FontSize).asDouble(); + // ug = ug.apply(UTranslate.dy(3)); drawMonths(ug); - drawYears(ug.apply(UTranslate.dy(13))); + drawYears(ug.apply(UTranslate.dy(h2 + 2))); drawHline(ug, 0); - drawHline(ug, 13); - drawHline(ug, getTimeFooterHeight()); + drawHline(ug, h2 + 2); + drawHline(ug, h1 + 2 + h2 + 2); +// drawHline(ug, getTimeFooterHeight(ug.getStringBounder())); } private void drawYears(final UGraphic ug) { + final double h1 = thParam.getStyle(SName.timeline, SName.year).value(PName.FontSize).asDouble(); MonthYear last = null; double lastChange = -1; for (Day wink = getMin(); wink.compareTo(getMax()) < 0; wink = wink.increment()) { final double x1 = getTimeScale().getStartingPosition(wink); if (last == null || wink.monthYear().year() != last.year()) { - drawVline(ug.apply(getLineColor()), x1, 0, 15); + drawVline(ug.apply(getLineColor()), x1, 0, h1 + 2); if (last != null) printYear(ug, last, lastChange, x1); @@ -96,16 +118,17 @@ public class TimeHeaderMonthly extends TimeHeaderCalendar { if (x1 > lastChange) printYear(ug, last, lastChange, x1); - drawVline(ug.apply(getLineColor()), getTimeScale().getEndingPosition(getMax()), (double) 0, (double) 15); + drawVline(ug.apply(getLineColor()), getTimeScale().getEndingPosition(getMax()), 0, h1 + 2); } private void drawMonths(UGraphic ug) { + final double h2 = thParam.getStyle(SName.timeline, SName.month).value(PName.FontSize).asDouble(); MonthYear last = null; double lastChange = -1; for (Day wink = getMin(); wink.compareTo(getMax()) < 0; wink = wink.increment()) { final double x1 = getTimeScale().getStartingPosition(wink); if (wink.monthYear().equals(last) == false) { - drawVline(ug.apply(getLineColor()), x1, (double) 0, (double) 12); + drawVline(ug.apply(getLineColor()), x1, 0, h2 + 2); if (last != null) printMonth(ug, last, lastChange, x1); @@ -117,17 +140,17 @@ public class TimeHeaderMonthly extends TimeHeaderCalendar { if (x1 > lastChange) printMonth(ug, last, lastChange, x1); - drawVline(ug.apply(getLineColor()), getTimeScale().getEndingPosition(getMax()), (double) 0, (double) 12); + drawVline(ug.apply(getLineColor()), getTimeScale().getEndingPosition(getMax()), 0, h2 + 2); } private void printYear(UGraphic ug, MonthYear monthYear, double start, double end) { - final TextBlock small = getTextBlock("" + monthYear.year(), 12, true, openFontColor()); + final TextBlock small = getTextBlock(SName.month, "" + monthYear.year(), true, openFontColor()); printCentered(ug, false, start, end, small); } private void printMonth(UGraphic ug, MonthYear monthYear, double start, double end) { - final TextBlock small = getTextBlock(monthYear.shortName(locale()), 10, false, openFontColor()); - final TextBlock big = getTextBlock(monthYear.longName(locale()), 10, false, openFontColor()); + final TextBlock small = getTextBlock(SName.day, monthYear.shortName(locale()), false, openFontColor()); + final TextBlock big = getTextBlock(SName.day, monthYear.longName(locale()), false, openFontColor()); printCentered(ug, false, start, end, small, big); } @@ -135,9 +158,4 @@ public class TimeHeaderMonthly extends TimeHeaderCalendar { text.drawU(ug.apply(UTranslate.dx(start))); } - @Override - public double getFullHeaderHeight() { - return getTimeHeaderHeight(); - } - } diff --git a/src/net/sourceforge/plantuml/project/draw/TimeHeaderQuarterly.java b/src/net/sourceforge/plantuml/project/draw/TimeHeaderQuarterly.java index b19cdad98..87e202be0 100644 --- a/src/net/sourceforge/plantuml/project/draw/TimeHeaderQuarterly.java +++ b/src/net/sourceforge/plantuml/project/draw/TimeHeaderQuarterly.java @@ -37,54 +37,76 @@ package net.sourceforge.plantuml.project.draw; import net.sourceforge.plantuml.klimt.UTranslate; import net.sourceforge.plantuml.klimt.drawing.UGraphic; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.klimt.shape.TextBlock; import net.sourceforge.plantuml.project.TimeHeaderParameters; import net.sourceforge.plantuml.project.time.Day; import net.sourceforge.plantuml.project.time.MonthYear; import net.sourceforge.plantuml.project.timescale.TimeScaleCompressed; +import net.sourceforge.plantuml.style.PName; +import net.sourceforge.plantuml.style.SName; public class TimeHeaderQuarterly extends TimeHeaderCalendar { - public double getTimeHeaderHeight() { - return 16 + 13; + @Override + public double getTimeHeaderHeight(StringBounder stringBounder) { + final double h1 = thParam.getStyle(SName.timeline, SName.year).value(PName.FontSize).asDouble(); + final double h2 = thParam.getStyle(SName.timeline, SName.month).value(PName.FontSize).asDouble(); + return h1 + h2 + 5; } - public double getTimeFooterHeight() { - return 16 + 13 - 1; + @Override + public double getTimeFooterHeight(StringBounder stringBounder) { + final double h1 = thParam.getStyle(SName.timeline, SName.year).value(PName.FontSize).asDouble(); + final double h2 = thParam.getStyle(SName.timeline, SName.month).value(PName.FontSize).asDouble(); + return h1 + h2 + 5; } - public TimeHeaderQuarterly(TimeHeaderParameters thParam) { - super(thParam, new TimeScaleCompressed(thParam.getStartingDay(), thParam.getScale())); + @Override + public double getFullHeaderHeight(StringBounder stringBounder) { + return getTimeHeaderHeight(stringBounder); + } + + public TimeHeaderQuarterly(StringBounder stringBounder, TimeHeaderParameters thParam) { + super(thParam, new TimeScaleCompressed(thParam.getCellWidth(stringBounder), thParam.getStartingDay(), + thParam.getScale())); } @Override public void drawTimeHeader(final UGraphic ug, double totalHeightWithoutFooter) { drawTextsBackground(ug, totalHeightWithoutFooter); drawYears(ug); - drawQuarters(ug.apply(UTranslate.dy(16))); + final double h1 = thParam.getStyle(SName.timeline, SName.year).value(PName.FontSize).asDouble(); + final double h2 = thParam.getStyle(SName.timeline, SName.month).value(PName.FontSize).asDouble(); + drawQuarters(ug.apply(UTranslate.dy(h1 + 2))); printVerticalSeparators(ug, totalHeightWithoutFooter); drawHline(ug, 0); - drawHline(ug, 16); - drawHline(ug, getFullHeaderHeight()); + drawHline(ug, h1 + 2); + drawHline(ug, h1 + 2 + h2 + 2); + // drawHline(ug, getFullHeaderHeight(ug.getStringBounder())); } @Override public void drawTimeFooter(UGraphic ug) { - ug = ug.apply(UTranslate.dy(3)); + final double h1 = thParam.getStyle(SName.timeline, SName.year).value(PName.FontSize).asDouble(); + final double h2 = thParam.getStyle(SName.timeline, SName.month).value(PName.FontSize).asDouble(); + // ug = ug.apply(UTranslate.dy(3)); drawQuarters(ug); - drawYears(ug.apply(UTranslate.dy(13))); + drawYears(ug.apply(UTranslate.dy(h2 + 2))); drawHline(ug, 0); - drawHline(ug, 13); - drawHline(ug, getTimeFooterHeight()); + drawHline(ug, h2 + 2); + drawHline(ug, h1 + 2 + h2 + 2); +// drawHline(ug, getTimeFooterHeight(ug.getStringBounder())); } private void drawYears(final UGraphic ug) { + final double h1 = thParam.getStyle(SName.timeline, SName.year).value(PName.FontSize).asDouble(); MonthYear last = null; double lastChange = -1; for (Day wink = getMin(); wink.compareTo(getMax()) < 0; wink = wink.increment()) { final double x1 = getTimeScale().getStartingPosition(wink); if (last == null || wink.monthYear().year() != last.year()) { - drawVline(ug.apply(getLineColor()), x1, (double) 0, (double) 15); + drawVline(ug.apply(getLineColor()), x1, 0, h1 + 2); if (last != null) printYear(ug, last, lastChange, x1); @@ -96,16 +118,17 @@ public class TimeHeaderQuarterly extends TimeHeaderCalendar { if (x1 > lastChange) printYear(ug, last, lastChange, x1); - drawVline(ug.apply(getLineColor()), getTimeScale().getEndingPosition(getMax()), (double) 0, (double) 15); + drawVline(ug.apply(getLineColor()), getTimeScale().getEndingPosition(getMax()), 0, h1 + 2); } private void drawQuarters(UGraphic ug) { + final double h2 = thParam.getStyle(SName.timeline, SName.month).value(PName.FontSize).asDouble(); String last = null; double lastChange = -1; for (Day wink = getMin(); wink.compareTo(getMax()) < 0; wink = wink.increment()) { final double x1 = getTimeScale().getStartingPosition(wink); if (quarter(wink).equals(last) == false) { - drawVline(ug.apply(getLineColor()), x1, (double) 0, (double) 12); + drawVline(ug.apply(getLineColor()), x1, 0, h2 + 2); if (last != null) printQuarter(ug, last, lastChange, x1); @@ -117,7 +140,7 @@ public class TimeHeaderQuarterly extends TimeHeaderCalendar { if (x1 > lastChange) printQuarter(ug, last, lastChange, x1); - drawVline(ug.apply(getLineColor()), getTimeScale().getEndingPosition(getMax()), (double) 0, (double) 12); + drawVline(ug.apply(getLineColor()), getTimeScale().getEndingPosition(getMax()), 0, h2 + 2); } private String quarter(Day day) { @@ -125,12 +148,12 @@ public class TimeHeaderQuarterly extends TimeHeaderCalendar { } private void printYear(UGraphic ug, MonthYear monthYear, double start, double end) { - final TextBlock small = getTextBlock("" + monthYear.year(), 12, true, openFontColor()); + final TextBlock small = getTextBlock(SName.month, "" + monthYear.year(), true, openFontColor()); printCentered(ug, false, start, end, small); } private void printQuarter(UGraphic ug, String quarter, double start, double end) { - final TextBlock small = getTextBlock(quarter, 10, false, openFontColor()); + final TextBlock small = getTextBlock(SName.day, quarter, false, openFontColor()); printCentered(ug, false, start, end, small); } @@ -138,9 +161,4 @@ public class TimeHeaderQuarterly extends TimeHeaderCalendar { text.drawU(ug.apply(UTranslate.dx(start))); } - @Override - public double getFullHeaderHeight() { - return getTimeHeaderHeight(); - } - } diff --git a/src/net/sourceforge/plantuml/project/draw/TimeHeaderSimple.java b/src/net/sourceforge/plantuml/project/draw/TimeHeaderSimple.java index 7d23798ea..65685fe36 100644 --- a/src/net/sourceforge/plantuml/project/draw/TimeHeaderSimple.java +++ b/src/net/sourceforge/plantuml/project/draw/TimeHeaderSimple.java @@ -39,6 +39,9 @@ import net.sourceforge.plantuml.klimt.UTranslate; import net.sourceforge.plantuml.klimt.color.HColor; import net.sourceforge.plantuml.klimt.creole.Display; import net.sourceforge.plantuml.klimt.drawing.UGraphic; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.font.UFont; import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; import net.sourceforge.plantuml.klimt.shape.TextBlock; import net.sourceforge.plantuml.klimt.shape.ULine; @@ -48,30 +51,36 @@ import net.sourceforge.plantuml.project.core.PrintScale; import net.sourceforge.plantuml.project.time.Day; import net.sourceforge.plantuml.project.timescale.TimeScale; import net.sourceforge.plantuml.project.timescale.TimeScaleWink; +import net.sourceforge.plantuml.style.PName; +import net.sourceforge.plantuml.style.SName; public class TimeHeaderSimple extends TimeHeader { private final PrintScale printScale; @Override - public double getFullHeaderHeight() { - return getTimeHeaderHeight() + getHeaderNameDayHeight(); + public double getFullHeaderHeight(StringBounder stringBounder) { + return getTimeHeaderHeight(stringBounder) + getHeaderNameDayHeight(); } - public double getTimeHeaderHeight() { - return 16; + @Override + public double getTimeHeaderHeight(StringBounder stringBounder) { + final double h = thParam.getStyle(SName.timeline, SName.day).value(PName.FontSize).asDouble(); + return h + 6; } - public double getTimeFooterHeight() { - return 16; + @Override + public double getTimeFooterHeight(StringBounder stringBounder) { + final double h = thParam.getStyle(SName.timeline, SName.day).value(PName.FontSize).asDouble(); + return h + 6; } private double getHeaderNameDayHeight() { return 0; } - public TimeHeaderSimple(TimeHeaderParameters thParam, PrintScale printScale) { - super(thParam, new TimeScaleWink(thParam.getScale(), printScale)); + public TimeHeaderSimple(StringBounder stringBounder, TimeHeaderParameters thParam, PrintScale printScale) { + super(thParam, new TimeScaleWink(thParam.getCellWidth(stringBounder), thParam.getScale(), printScale)); this.printScale = printScale; } @@ -91,9 +100,10 @@ public class TimeHeaderSimple extends TimeHeader { value = i.getAbsoluteDayNum() / 7 + 1; else value = i.getAbsoluteDayNum() + 1; - final TextBlock num = Display.getWithNewlines("" + value).create( - getFontConfiguration(10, false, openFontColor()), HorizontalAlignment.LEFT, - new SpriteContainerEmpty()); + final UFont font = thParam.getStyle(SName.timeline, SName.day).getUFont(); + final FontConfiguration fontConfiguration = getFontConfiguration(font, false, openFontColor()); + final TextBlock num = Display.getWithNewlines("" + value).create(fontConfiguration, + HorizontalAlignment.LEFT, new SpriteContainerEmpty()); final double x1 = timeScale.getStartingPosition(i); final double x2; if (printScale == PrintScale.WEEKLY) @@ -110,15 +120,15 @@ public class TimeHeaderSimple extends TimeHeader { @Override public void drawTimeHeader(UGraphic ug, double totalHeightWithoutFooter) { - drawTextsBackground(ug.apply(UTranslate.dy(-3)), totalHeightWithoutFooter + 6); + // drawTextsBackground(ug.apply(UTranslate.dy(-3)), totalHeightWithoutFooter + 6); final double xmin = getTimeScale().getStartingPosition(getMin()); final double xmax = getTimeScale().getEndingPosition(getMax()); drawSmallVlinesDay(ug, getTimeScale(), totalHeightWithoutFooter + 2); printVerticalSeparators(ug, totalHeightWithoutFooter); drawSimpleDayCounter(ug, getTimeScale()); - ug = ug.apply(getLineColor()); - ug.draw(ULine.hline(xmax - xmin)); - ug.apply(UTranslate.dy(getFullHeaderHeight() - 3)).draw(ULine.hline(xmax - xmin)); + // ug = ug.apply(getLineColor()); + // ug.draw(ULine.hline(xmax - xmin)); + // ug.apply(UTranslate.dy(getFullHeaderHeight(ug.getStringBounder()) - 3)).draw(ULine.hline(xmax - xmin)); } @@ -127,9 +137,9 @@ public class TimeHeaderSimple extends TimeHeader { final double xmin = getTimeScale().getStartingPosition(getMin()); final double xmax = getTimeScale().getEndingPosition(getMax()); ug = ug.apply(UTranslate.dy(3)); - drawSmallVlinesDay(ug, getTimeScale(), getTimeFooterHeight() - 3); + drawSmallVlinesDay(ug, getTimeScale(), getTimeFooterHeight(ug.getStringBounder()) - 3); drawSimpleDayCounter(ug, getTimeScale()); - ug.apply(getLineColor()).draw(ULine.hline(xmax - xmin)); + // ug.apply(getLineColor()).draw(ULine.hline(xmax - xmin)); } // Duplicate in TimeHeaderDaily @@ -151,7 +161,7 @@ public class TimeHeaderSimple extends TimeHeader { protected final void drawTextsBackground(UGraphic ug, double totalHeightWithoutFooter) { - final double height = totalHeightWithoutFooter - getFullHeaderHeight(); + final double height = totalHeightWithoutFooter - getFullHeaderHeight(ug.getStringBounder()); Pending pending = null; for (Day wink = getMin(); wink.compareTo(getMax()) <= 0; wink = wink.increment()) { diff --git a/src/net/sourceforge/plantuml/project/draw/TimeHeaderWeekly.java b/src/net/sourceforge/plantuml/project/draw/TimeHeaderWeekly.java index 53688b08c..c2cbc0d96 100644 --- a/src/net/sourceforge/plantuml/project/draw/TimeHeaderWeekly.java +++ b/src/net/sourceforge/plantuml/project/draw/TimeHeaderWeekly.java @@ -37,29 +37,48 @@ package net.sourceforge.plantuml.project.draw; import net.sourceforge.plantuml.klimt.UTranslate; import net.sourceforge.plantuml.klimt.drawing.UGraphic; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.klimt.shape.TextBlock; import net.sourceforge.plantuml.project.TimeHeaderParameters; import net.sourceforge.plantuml.project.time.Day; import net.sourceforge.plantuml.project.time.MonthYear; import net.sourceforge.plantuml.project.time.WeekNumberStrategy; import net.sourceforge.plantuml.project.timescale.TimeScaleCompressed; +import net.sourceforge.plantuml.style.PName; +import net.sourceforge.plantuml.style.SName; public class TimeHeaderWeekly extends TimeHeaderCalendar { private final WeekNumberStrategy weekNumberStrategy; private final boolean withCalendarDate; - public double getTimeHeaderHeight() { - return 16 + 13; + @Override + public double getTimeHeaderHeight(StringBounder stringBounder) { + final double h1 = thParam.getStyle(SName.timeline, SName.month).value(PName.FontSize).asDouble(); + final double h2 = thParam.getStyle(SName.timeline, SName.day).value(PName.FontSize).asDouble(); + return h1 + h2 + 5; } - public double getTimeFooterHeight() { - return 16; + @Override + public double getTimeFooterHeight(StringBounder stringBounder) { + final double h = thParam.getStyle(SName.timeline, SName.month).value(PName.FontSize).asDouble() + 4; + return h; } - public TimeHeaderWeekly(TimeHeaderParameters thParam, WeekNumberStrategy weekNumberStrategy, - boolean withCalendarDate) { - super(thParam, new TimeScaleCompressed(thParam.getStartingDay(), thParam.getScale())); + @Override + public double getFullHeaderHeight(StringBounder stringBounder) { + return getTimeHeaderHeight(stringBounder); + } + + private double getH1(StringBounder stringBounder) { + final double h = thParam.getStyle(SName.timeline, SName.month).value(PName.FontSize).asDouble() + 4; + return h; + } + + public TimeHeaderWeekly(StringBounder stringBounder, TimeHeaderParameters thParam, + WeekNumberStrategy weekNumberStrategy, boolean withCalendarDate) { + super(thParam, new TimeScaleCompressed(thParam.getCellWidth(stringBounder), thParam.getStartingDay(), + thParam.getScale())); this.weekNumberStrategy = weekNumberStrategy; this.withCalendarDate = withCalendarDate; } @@ -69,15 +88,15 @@ public class TimeHeaderWeekly extends TimeHeaderCalendar { drawTextsBackground(ug, totalHeightWithoutFooter); drawCalendar(ug, totalHeightWithoutFooter); drawHline(ug, 0); - drawHline(ug, Y_POS_ROW16()); - drawHline(ug, getFullHeaderHeight()); + drawHline(ug, getH1(ug.getStringBounder())); + drawHline(ug, getFullHeaderHeight(ug.getStringBounder())); } @Override public void drawTimeFooter(UGraphic ug) { drawHline(ug, 0); printMonths(ug); - drawHline(ug, getTimeFooterHeight()); + drawHline(ug, getTimeFooterHeight(ug.getStringBounder())); } private void drawCalendar(final UGraphic ug, double totalHeightWithoutFooter) { @@ -92,7 +111,7 @@ public class TimeHeaderWeekly extends TimeHeaderCalendar { for (Day wink = getMin(); wink.compareTo(getMax()) < 0; wink = wink.increment()) { final double x1 = getTimeScale().getStartingPosition(wink); if (wink.monthYear().equals(last) == false) { - drawVline(ug.apply(getLineColor()), x1, (double) 0, Y_POS_ROW16()); + drawVline(ug.apply(getLineColor()), x1, 0, getH1(ug.getStringBounder())); if (last != null) printMonth(ug, last, lastChangeMonth, x1); @@ -100,9 +119,10 @@ public class TimeHeaderWeekly extends TimeHeaderCalendar { last = wink.monthYear(); } } - drawVline(ug.apply(getLineColor()), getTimeScale().getEndingPosition(getMax()), (double) 0, Y_POS_ROW16()); + drawVline(ug.apply(getLineColor()), getTimeScale().getEndingPosition(getMax()), (double) 0, + getH1(ug.getStringBounder())); final double x1 = getTimeScale().getStartingPosition(getMax().increment()); - if (x1 > lastChangeMonth) + if (last != null && x1 > lastChangeMonth) printMonth(ug, last, lastChangeMonth, x1); } @@ -111,9 +131,11 @@ public class TimeHeaderWeekly extends TimeHeaderCalendar { protected void printVerticalSeparators(final UGraphic ug, double totalHeightWithoutFooter) { for (Day wink = getMin(); wink.compareTo(getMax()) <= 0; wink = wink.increment()) if (wink.getDayOfWeek() == weekNumberStrategy.getFirstDayOfWeek()) - drawVline(ug.apply(getLineColor()), getTimeScale().getStartingPosition(wink), Y_POS_ROW16(), totalHeightWithoutFooter); + drawVline(ug.apply(getLineColor()), getTimeScale().getStartingPosition(wink), + getH1(ug.getStringBounder()), totalHeightWithoutFooter); - drawVline(ug.apply(getLineColor()), getTimeScale().getEndingPosition(getMax()), Y_POS_ROW16(), totalHeightWithoutFooter); + drawVline(ug.apply(getLineColor()), getTimeScale().getEndingPosition(getMax()), getH1(ug.getStringBounder()), + totalHeightWithoutFooter); super.printVerticalSeparators(ug, totalHeightWithoutFooter); } @@ -125,16 +147,16 @@ public class TimeHeaderWeekly extends TimeHeaderCalendar { num = "" + wink.getDayOfMonth(); else num = "" + wink.getWeekOfYear(weekNumberStrategy); - final TextBlock textBlock = getTextBlock(num, 10, false, openFontColor()); - printLeft(ug.apply(UTranslate.dy(Y_POS_ROW16())), textBlock, + final TextBlock textBlock = getTextBlock(SName.day, num, false, openFontColor()); + printLeft(ug.apply(UTranslate.dy(getH1(ug.getStringBounder()))), textBlock, getTimeScale().getStartingPosition(wink) + 5); } } } private void printMonth(UGraphic ug, MonthYear monthYear, double start, double end) { - final TextBlock small = getTextBlock(monthYear.shortName(locale()), 12, true, openFontColor()); - final TextBlock big = getTextBlock(monthYear.shortNameYYYY(locale()), 12, true, openFontColor()); + final TextBlock small = getTextBlock(SName.month, monthYear.shortName(locale()), true, openFontColor()); + final TextBlock big = getTextBlock(SName.month, monthYear.shortNameYYYY(locale()), true, openFontColor()); printCentered(ug, false, start, end, small, big); } @@ -142,9 +164,4 @@ public class TimeHeaderWeekly extends TimeHeaderCalendar { text.drawU(ug.apply(UTranslate.dx(start))); } - @Override - public double getFullHeaderHeight() { - return getTimeHeaderHeight(); - } - } diff --git a/src/net/sourceforge/plantuml/project/draw/TimeHeaderYearly.java b/src/net/sourceforge/plantuml/project/draw/TimeHeaderYearly.java index 04b25e86c..47893ed51 100644 --- a/src/net/sourceforge/plantuml/project/draw/TimeHeaderYearly.java +++ b/src/net/sourceforge/plantuml/project/draw/TimeHeaderYearly.java @@ -37,24 +37,37 @@ package net.sourceforge.plantuml.project.draw; import net.sourceforge.plantuml.klimt.UTranslate; import net.sourceforge.plantuml.klimt.drawing.UGraphic; +import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.klimt.shape.TextBlock; import net.sourceforge.plantuml.project.TimeHeaderParameters; import net.sourceforge.plantuml.project.time.Day; import net.sourceforge.plantuml.project.time.MonthYear; import net.sourceforge.plantuml.project.timescale.TimeScaleCompressed; +import net.sourceforge.plantuml.style.PName; +import net.sourceforge.plantuml.style.SName; public class TimeHeaderYearly extends TimeHeaderCalendar { - public double getTimeHeaderHeight() { - return 20; + @Override + public double getTimeHeaderHeight(StringBounder stringBounder) { + final double h1 = thParam.getStyle(SName.timeline, SName.year).value(PName.FontSize).asDouble(); + return h1 + 3; } - public double getTimeFooterHeight() { - return 20 - 1; + @Override + public double getTimeFooterHeight(StringBounder stringBounder) { + final double h1 = thParam.getStyle(SName.timeline, SName.year).value(PName.FontSize).asDouble(); + return h1 + 3; } - public TimeHeaderYearly(TimeHeaderParameters thParam) { - super(thParam, new TimeScaleCompressed(thParam.getStartingDay(), thParam.getScale())); + @Override + public double getFullHeaderHeight(StringBounder stringBounder) { + return getTimeHeaderHeight(stringBounder); + } + + public TimeHeaderYearly(StringBounder stringBounder, TimeHeaderParameters thParam) { + super(thParam, new TimeScaleCompressed(thParam.getCellWidth(stringBounder), thParam.getStartingDay(), + thParam.getScale())); } @Override @@ -63,24 +76,26 @@ public class TimeHeaderYearly extends TimeHeaderCalendar { drawYears(ug); printVerticalSeparators(ug, totalHeightWithoutFooter); drawHline(ug, 0); - drawHline(ug, getFullHeaderHeight()); + drawHline(ug, getFullHeaderHeight(ug.getStringBounder())); } @Override public void drawTimeFooter(UGraphic ug) { - ug = ug.apply(UTranslate.dy(3)); + // ug = ug.apply(UTranslate.dy(3)); drawYears(ug); drawHline(ug, 0); - drawHline(ug, getTimeFooterHeight()); + drawHline(ug, getTimeFooterHeight(ug.getStringBounder())); } private void drawYears(final UGraphic ug) { + final double h1 = thParam.getStyle(SName.timeline, SName.year).value(PName.FontSize).asDouble(); + MonthYear last = null; double lastChange = -1; for (Day wink = getMin(); wink.compareTo(getMax()) < 0; wink = wink.increment()) { final double x1 = getTimeScale().getStartingPosition(wink); if (last == null || wink.monthYear().year() != last.year()) { - drawVline(ug.apply(getLineColor()), x1, (double) 0, (double) 19); + drawVline(ug.apply(getLineColor()), x1, 0, h1 + 2); if (last != null) printYear(ug, last, lastChange, x1); @@ -91,18 +106,13 @@ public class TimeHeaderYearly extends TimeHeaderCalendar { final double x1 = getTimeScale().getStartingPosition(getMax().increment()); if (x1 > lastChange) printYear(ug, last, lastChange, x1); - - drawVline(ug.apply(getLineColor()), getTimeScale().getEndingPosition(getMax()), (double) 0, (double) 19); + + drawVline(ug.apply(getLineColor()), getTimeScale().getEndingPosition(getMax()), 0, h1 + 2); } private void printYear(UGraphic ug, MonthYear monthYear, double start, double end) { - final TextBlock small = getTextBlock("" + monthYear.year(), 14, true, openFontColor()); + final TextBlock small = getTextBlock(SName.year, "" + monthYear.year(), true, openFontColor()); printCentered(ug, true, start, end, small); } - @Override - public double getFullHeaderHeight() { - return getTimeHeaderHeight(); - } - } diff --git a/src/net/sourceforge/plantuml/project/lang/ComplementAnything.java b/src/net/sourceforge/plantuml/project/lang/ComplementAnything.java new file mode 100644 index 000000000..787e7e55a --- /dev/null +++ b/src/net/sourceforge/plantuml/project/lang/ComplementAnything.java @@ -0,0 +1,54 @@ +/* ======================================================================== + * PlantUML : a free UML diagram generator + * ======================================================================== + * + * (C) Copyright 2009-2024, Arnaud Roques + * + * Project Info: https://plantuml.com + * + * If you like this project or if you find it useful, you can support us at: + * + * https://plantuml.com/patreon (only 1$ per month!) + * https://plantuml.com/paypal + * + * This file is part of PlantUML. + * + * PlantUML is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * PlantUML distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public + * License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. + * + * + * Original Author: Arnaud Roques + * + * + */ +package net.sourceforge.plantuml.project.lang; + +import net.sourceforge.plantuml.project.Failable; +import net.sourceforge.plantuml.project.GanttDiagram; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; + +public class ComplementAnything implements Something { + + public IRegex toRegex(String suffix) { + return new RegexLeaf("ANYTHING" + suffix, "(.*?)"); + } + + public Failable getMe(GanttDiagram system, RegexResult arg, String suffix) { + final String value = arg.get("ANYTHING" + suffix, 0); + return Failable.ok(value); + } +} diff --git a/src/net/sourceforge/plantuml/project/lang/ComplementDate.java b/src/net/sourceforge/plantuml/project/lang/ComplementDate.java index 701f15dfc..032af9d04 100644 --- a/src/net/sourceforge/plantuml/project/lang/ComplementDate.java +++ b/src/net/sourceforge/plantuml/project/lang/ComplementDate.java @@ -38,7 +38,6 @@ package net.sourceforge.plantuml.project.lang; import net.sourceforge.plantuml.project.Failable; import net.sourceforge.plantuml.project.GanttDiagram; import net.sourceforge.plantuml.project.time.Day; -import net.sourceforge.plantuml.project.time.Month; import net.sourceforge.plantuml.regex.IRegex; import net.sourceforge.plantuml.regex.RegexConcat; import net.sourceforge.plantuml.regex.RegexLeaf; @@ -70,40 +69,14 @@ public class ComplementDate implements Something { } public IRegex toRegex(String suffix) { + final DayPattern dayPattern = new DayPattern(suffix); switch (type) { case ONLY_ABSOLUTE: - return new RegexOr(toRegexA(suffix), toRegexB(suffix), toRegexC(suffix)); + return dayPattern.toRegex(); case ONLY_RELATIVE: return new RegexOr(toRegexD(suffix), toRegexE(suffix)); } - return new RegexOr(toRegexA(suffix), toRegexB(suffix), toRegexC(suffix), toRegexD(suffix), toRegexE(suffix)); - } - - private IRegex toRegexA(String suffix) { - return new RegexConcat( // - new RegexLeaf("ADAY" + suffix, "([\\d]+)"), // - new RegexLeaf("[\\w, ]*?"), // - new RegexLeaf("AMONTH" + suffix, "(" + Month.getRegexString() + ")"), // - new RegexLeaf("[\\w, ]*?"), // - new RegexLeaf("AYEAR" + suffix, "([\\d]{4})")); - } - - private IRegex toRegexB(String suffix) { - return new RegexConcat( // - new RegexLeaf("BYEAR" + suffix, "([\\d]{4})"), // - new RegexLeaf("\\D"), // - new RegexLeaf("BMONTH" + suffix, "([\\d]{1,2})"), // - new RegexLeaf("\\D"), // - new RegexLeaf("BDAY" + suffix, "([\\d]{1,2})")); - } - - private IRegex toRegexC(String suffix) { - return new RegexConcat( // - new RegexLeaf("CMONTH" + suffix, "(" + Month.getRegexString() + ")"), // - new RegexLeaf("[\\w, ]*?"), // - new RegexLeaf("CDAY" + suffix, "([\\d]+)"), // - new RegexLeaf("[\\w, ]*?"), // - new RegexLeaf("CYEAR" + suffix, "([\\d]{4})")); + return new RegexOr(dayPattern.toRegex(), toRegexD(suffix), toRegexE(suffix)); } private IRegex toRegexD(String suffix) { @@ -126,14 +99,11 @@ public class ComplementDate implements Something { } public Failable getMe(GanttDiagram system, RegexResult arg, String suffix) { - if (arg.get("ADAY" + suffix, 0) != null) - return Failable.ok(resultA(arg, suffix)); + final DayPattern dayPattern = new DayPattern(suffix); + final Day result = dayPattern.getDay(arg); - if (arg.get("BDAY" + suffix, 0) != null) - return Failable.ok(resultB(arg, suffix)); - - if (arg.get("CDAY" + suffix, 0) != null) - return Failable.ok(resultC(arg, suffix)); + if (result != null) + return Failable.ok(result); if (arg.get("DCOUNT" + suffix, 0) != null) return Failable.ok(resultD(system, arg, suffix)); @@ -144,27 +114,6 @@ public class ComplementDate implements Something { throw new IllegalStateException(); } - private Day resultA(RegexResult arg, String suffix) { - final int day = Integer.parseInt(arg.get("ADAY" + suffix, 0)); - final String month = arg.get("AMONTH" + suffix, 0); - final int year = Integer.parseInt(arg.get("AYEAR" + suffix, 0)); - return Day.create(year, month, day); - } - - private Day resultB(RegexResult arg, String suffix) { - final int day = Integer.parseInt(arg.get("BDAY" + suffix, 0)); - final int month = Integer.parseInt(arg.get("BMONTH" + suffix, 0)); - final int year = Integer.parseInt(arg.get("BYEAR" + suffix, 0)); - return Day.create(year, month, day); - } - - private Day resultC(RegexResult arg, String suffix) { - final int day = Integer.parseInt(arg.get("CDAY" + suffix, 0)); - final String month = arg.get("CMONTH" + suffix, 0); - final int year = Integer.parseInt(arg.get("CYEAR" + suffix, 0)); - return Day.create(year, month, day); - } - private Day resultD(GanttDiagram system, RegexResult arg, String suffix) { final int day = Integer.parseInt(arg.get("DCOUNT" + suffix, 0)); return system.getStartingDate().addDays(day); diff --git a/src/net/sourceforge/plantuml/project/lang/ComplementDates.java b/src/net/sourceforge/plantuml/project/lang/ComplementDates.java index eece3d85f..a48a91aed 100644 --- a/src/net/sourceforge/plantuml/project/lang/ComplementDates.java +++ b/src/net/sourceforge/plantuml/project/lang/ComplementDates.java @@ -52,20 +52,14 @@ public class ComplementDates implements Something { } private IRegex toRegexB(String suffix) { + final DayPattern dayPattern1 = new DayPattern("1"); + final DayPattern dayPattern2 = new DayPattern("2"); return new RegexConcat( // - new RegexLeaf("BYEAR1" + suffix, "([\\d]{4})"), // - new RegexLeaf("\\D"), // - new RegexLeaf("BMONTH1" + suffix, "([\\d]{1,2})"), // - new RegexLeaf("\\D"), // - new RegexLeaf("BDAY1" + suffix, "([\\d]{1,2})"), // + dayPattern1.toRegex(), // Words.exactly(Words.TO), // Words.zeroOrMore(Words.THE), // RegexLeaf.spaceOneOrMore(), // - new RegexLeaf("BYEAR2" + suffix, "([\\d]{4})"), // - new RegexLeaf("\\D"), // - new RegexLeaf("BMONTH2" + suffix, "([\\d]{1,2})"), // - new RegexLeaf("\\D"), // - new RegexLeaf("BDAY2" + suffix, "([\\d]{1,2})") // + dayPattern2.toRegex() // ); } @@ -82,30 +76,19 @@ public class ComplementDates implements Something { } public Failable getMe(GanttDiagram project, RegexResult arg, String suffix) { - if (arg.get("BDAY1" + suffix, 0) != null) { - return Failable.ok(resultB(arg, suffix)); + final Day d1 = new DayPattern("1").getDay(arg); + if (d1 != null) { + final Day d2 = new DayPattern("2").getDay(arg); + return Failable.ok(new DaysAsDates(d1, d2)); } - if (arg.get("ECOUNT1" + suffix, 0) != null) { + + if (arg.get("ECOUNT1" + suffix, 0) != null) return Failable.ok(resultE(project, arg, suffix)); - } + throw new IllegalStateException(); } - private DaysAsDates resultB(RegexResult arg, String suffix) { - final int day1 = Integer.parseInt(arg.get("BDAY1" + suffix, 0)); - final int month1 = Integer.parseInt(arg.get("BMONTH1" + suffix, 0)); - final int year1 = Integer.parseInt(arg.get("BYEAR1" + suffix, 0)); - final Day date1 = Day.create(year1, month1, day1); - - final int day2 = Integer.parseInt(arg.get("BDAY2" + suffix, 0)); - final int month2 = Integer.parseInt(arg.get("BMONTH2" + suffix, 0)); - final int year2 = Integer.parseInt(arg.get("BYEAR2" + suffix, 0)); - final Day date2 = Day.create(year2, month2, day2); - - return new DaysAsDates(date1, date2); - } - private DaysAsDates resultE(GanttDiagram project, RegexResult arg, String suffix) { final int day1 = Integer.parseInt(arg.get("ECOUNT1" + suffix, 0)); final Day date1 = project.getStartingDate().addDays(day1); diff --git a/src/net/sourceforge/plantuml/project/lang/DayPattern.java b/src/net/sourceforge/plantuml/project/lang/DayPattern.java new file mode 100644 index 000000000..647d204d4 --- /dev/null +++ b/src/net/sourceforge/plantuml/project/lang/DayPattern.java @@ -0,0 +1,136 @@ +/* ======================================================================== + * PlantUML : a free UML diagram generator + * ======================================================================== + * + * (C) Copyright 2009-2024, Arnaud Roques + * + * Project Info: https://plantuml.com + * + * If you like this project or if you find it useful, you can support us at: + * + * https://plantuml.com/patreon (only 1$ per month!) + * https://plantuml.com/paypal + * + * This file is part of PlantUML. + * + * PlantUML is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * PlantUML distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public + * License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. + * + * + * Original Author: Arnaud Roques + * + * + */ +package net.sourceforge.plantuml.project.lang; + +import net.sourceforge.plantuml.project.time.Day; +import net.sourceforge.plantuml.project.time.Month; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOr; +import net.sourceforge.plantuml.regex.RegexResult; + +public class DayPattern { + + private final String id; + private final String yearKeyA; + private final String yearKeyB; + private final String yearKeyC; + private final String monthKeyA; + private final String monthKeyB; + private final String monthKeyC; + private final String dayKeyA; + private final String dayKeyB; + private final String dayKeyC; + + public DayPattern(String id) { + this.id = id; + this.yearKeyA = "AYEAR" + id; + this.yearKeyB = "BYEAR" + id; + this.yearKeyC = "CYEAR" + id; + this.monthKeyA = "AMONTH" + id; + this.monthKeyB = "BMONTH" + id; + this.monthKeyC = "CMONTH" + id; + this.dayKeyA = "ADAY" + id; + this.dayKeyB = "BDAY" + id; + this.dayKeyC = "CDAY" + id; + } + + public IRegex toRegex() { + return new RegexOr(toRegexA_DD_MONTH_YYYY(), toRegexB_YYYY_MM_DD(), toRegexC_MONTH_DD_YYYY()); + } + + public Day getDay(RegexResult arg) { + if (arg.get(dayKeyA, 0) != null) + return resultA(arg); + + if (arg.get(dayKeyB, 0) != null) + return resultB(arg); + + if (arg.get(dayKeyC, 0) != null) + return resultC(arg); + return null; + } + + private IRegex toRegexA_DD_MONTH_YYYY() { + return new RegexConcat( // + new RegexLeaf(dayKeyA, "([\\d]{1,2})"), // + new RegexLeaf("[\\w, ]*?"), // + new RegexLeaf(monthKeyA, "(" + Month.getRegexString() + ")"), // + new RegexLeaf("[\\w, ]*?"), // + new RegexLeaf(yearKeyA, "([\\d]{1,4})")); + } + + private Day resultA(RegexResult arg) { + final int day = Integer.parseInt(arg.get(dayKeyA, 0)); + final String month = arg.get(monthKeyA, 0); + final int year = Integer.parseInt(arg.get(yearKeyA, 0)); + return Day.create(year, month, day); + } + + private IRegex toRegexB_YYYY_MM_DD() { + return new RegexConcat( // + new RegexLeaf(yearKeyB, "([\\d]{1,4})"), // + new RegexLeaf("\\D"), // + new RegexLeaf(monthKeyB, "([\\d]{1,2})"), // + new RegexLeaf("\\D"), // + new RegexLeaf(dayKeyB, "([\\d]{1,2})")); + } + + private Day resultB(RegexResult arg) { + final int day = Integer.parseInt(arg.get(dayKeyB, 0)); + final int month = Integer.parseInt(arg.get(monthKeyB, 0)); + final int year = Integer.parseInt(arg.get(yearKeyB, 0)); + return Day.create(year, month, day); + } + + private IRegex toRegexC_MONTH_DD_YYYY() { + return new RegexConcat( // + new RegexLeaf(monthKeyC, "(" + Month.getRegexString() + ")"), // + new RegexLeaf("[\\w, ]*?"), // + new RegexLeaf(dayKeyC, "([\\d]{1,2})"), // + new RegexLeaf("[\\w, ]*?"), // + new RegexLeaf(yearKeyC, "([\\d]{1,4})")); + } + + private Day resultC(RegexResult arg) { + final int day = Integer.parseInt(arg.get(dayKeyC, 0)); + final String month = arg.get(monthKeyC, 0); + final int year = Integer.parseInt(arg.get(yearKeyC, 0)); + return Day.create(year, month, day); + } + +} diff --git a/src/net/sourceforge/plantuml/project/lang/SentenceIsDisplayedAs.java b/src/net/sourceforge/plantuml/project/lang/SentenceIsDisplayedAs.java new file mode 100644 index 000000000..78de0f2b3 --- /dev/null +++ b/src/net/sourceforge/plantuml/project/lang/SentenceIsDisplayedAs.java @@ -0,0 +1,56 @@ +/* ======================================================================== + * PlantUML : a free UML diagram generator + * ======================================================================== + * + * (C) Copyright 2009-2024, Arnaud Roques + * + * Project Info: https://plantuml.com + * + * If you like this project or if you find it useful, you can support us at: + * + * https://plantuml.com/patreon (only 1$ per month!) + * https://plantuml.com/paypal + * + * This file is part of PlantUML. + * + * PlantUML is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * PlantUML distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public + * License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. + * + * + * Original Author: Arnaud Roques + * + * + */ +package net.sourceforge.plantuml.project.lang; + +import net.sourceforge.plantuml.command.CommandExecutionResult; +import net.sourceforge.plantuml.project.GanttDiagram; +import net.sourceforge.plantuml.project.core.Task; + +public class SentenceIsDisplayedAs extends SentenceSimple { + + public SentenceIsDisplayedAs() { + super(SubjectTask.ME, Verbs.isDisplayedAs, new ComplementAnything()); + } + + @Override + public CommandExecutionResult execute(GanttDiagram project, Object subject, Object complement) { + final Task task = (Task) subject; + final String displayString = (String) complement; + task.setDisplay(displayString); + return CommandExecutionResult.ok(); + } + +} diff --git a/src/net/sourceforge/plantuml/project/lang/SubjectDayAsDate.java b/src/net/sourceforge/plantuml/project/lang/SubjectDayAsDate.java index 9394b889e..473218921 100644 --- a/src/net/sourceforge/plantuml/project/lang/SubjectDayAsDate.java +++ b/src/net/sourceforge/plantuml/project/lang/SubjectDayAsDate.java @@ -138,12 +138,7 @@ public class SubjectDayAsDate implements Subject { } private IRegex toRegexB() { - return new RegexConcat( // - new RegexLeaf("BYEAR", "([\\d]{4})"), // - new RegexLeaf("\\D"), // - new RegexLeaf("BMONTH", "([\\d]{1,2})"), // - new RegexLeaf("\\D"), // - new RegexLeaf("BDAY", "([\\d]{1,2})")); + return TimeResolution.toRegexB_YYYY_MM_DD("BYEAR", "BMONTH", "BDAY"); } private IRegex toRegexE() { diff --git a/src/net/sourceforge/plantuml/project/lang/SubjectDaysAsDates.java b/src/net/sourceforge/plantuml/project/lang/SubjectDaysAsDates.java index e3f48196f..99680e27b 100644 --- a/src/net/sourceforge/plantuml/project/lang/SubjectDaysAsDates.java +++ b/src/net/sourceforge/plantuml/project/lang/SubjectDaysAsDates.java @@ -63,19 +63,10 @@ public class SubjectDaysAsDates implements Subject { private IRegex toRegexB() { return new RegexConcat( // - new RegexLeaf("BYEAR1", "([\\d]{4})"), // - new RegexLeaf("\\D"), // - new RegexLeaf("BMONTH1", "([\\d]{1,2})"), // - new RegexLeaf("\\D"), // - new RegexLeaf("BDAY1", "([\\d]{1,2})"), // + TimeResolution.toRegexB_YYYY_MM_DD("BYEAR1", "BMONTH1", "BDAY1"), // + Words.exactly(Words.TO), // RegexLeaf.spaceOneOrMore(), // - new RegexLeaf("to"), // - RegexLeaf.spaceOneOrMore(), // - new RegexLeaf("BYEAR2", "([\\d]{4})"), // - new RegexLeaf("\\D"), // - new RegexLeaf("BMONTH2", "([\\d]{1,2})"), // - new RegexLeaf("\\D"), // - new RegexLeaf("BDAY2", "([\\d]{1,2})") // + TimeResolution.toRegexB_YYYY_MM_DD("BYEAR2", "BMONTH2", "BDAY2") // ); } @@ -83,8 +74,7 @@ public class SubjectDaysAsDates implements Subject { return new RegexConcat( // new RegexLeaf("[dD]\\+"), // new RegexLeaf("ECOUNT1", "([\\d]+)"), // - RegexLeaf.spaceOneOrMore(), // - new RegexLeaf("to"), // + Words.exactly(Words.TO), // RegexLeaf.spaceOneOrMore(), // new RegexLeaf("[dD]\\+"), // new RegexLeaf("ECOUNT2", "([\\d]+)") // @@ -93,13 +83,8 @@ public class SubjectDaysAsDates implements Subject { private IRegex andRegex() { return new RegexConcat( // - new RegexLeaf("BYEAR3", "([\\d]{4})"), // - new RegexLeaf("\\D"), // - new RegexLeaf("BMONTH3", "([\\d]{1,2})"), // - new RegexLeaf("\\D"), // - new RegexLeaf("BDAY3", "([\\d]{1,2})"), // - RegexLeaf.spaceOneOrMore(), // - new RegexLeaf("and"), // + TimeResolution.toRegexB_YYYY_MM_DD("BYEAR3", "BMONTH3", "BDAY3"), // + Words.exactly(Words.AND), // RegexLeaf.spaceOneOrMore(), // new RegexLeaf("COUNT_AND", "([\\d]+)"), // RegexLeaf.spaceOneOrMore(), // diff --git a/src/net/sourceforge/plantuml/project/lang/SubjectTask.java b/src/net/sourceforge/plantuml/project/lang/SubjectTask.java index 279f4ecf8..da31a4542 100644 --- a/src/net/sourceforge/plantuml/project/lang/SubjectTask.java +++ b/src/net/sourceforge/plantuml/project/lang/SubjectTask.java @@ -96,7 +96,7 @@ public class SubjectTask implements Subject { new SentenceTaskEndsAbsolute(), new SentenceIsColored(), new SentenceIsColoredForCompletion(), new SentenceIsDeleted(), new SentenceIsForTask(), new SentenceLinksTo(), new SentenceOccurs(), new SentenceDisplayOnSameRowAs(), new SentencePausesDate(), new SentencePausesDates(), - new SentencePausesDayOfWeek()); + new SentencePausesDayOfWeek(), new SentenceIsDisplayedAs()); } public IRegex toRegex() { @@ -106,8 +106,7 @@ public class SubjectTask implements Subject { new RegexLeaf("SUBJECT", "\\[([^\\[\\]]+?)\\](?:[%s]+as[%s]+\\[([^\\[\\]]+?)\\])?"), // new RegexOptional( // new RegexConcat( // - RegexLeaf.spaceOneOrMore(), // - new RegexLeaf("on"), // + Words.exactly(Words.ON), // RegexLeaf.spaceOneOrMore(), // new RegexLeaf("RESOURCE", "((?:\\{[^{}]+\\}[%s]*)+)") // )))); diff --git a/src/net/sourceforge/plantuml/project/lang/TimeResolution.java b/src/net/sourceforge/plantuml/project/lang/TimeResolution.java new file mode 100644 index 000000000..8d9015823 --- /dev/null +++ b/src/net/sourceforge/plantuml/project/lang/TimeResolution.java @@ -0,0 +1,72 @@ +/* ======================================================================== + * PlantUML : a free UML diagram generator + * ======================================================================== + * + * (C) Copyright 2009-2024, Arnaud Roques + * + * Project Info: https://plantuml.com + * + * If you like this project or if you find it useful, you can support us at: + * + * https://plantuml.com/patreon (only 1$ per month!) + * https://plantuml.com/paypal + * + * This file is part of PlantUML. + * + * PlantUML is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * PlantUML distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public + * License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. + * + * + * Original Author: Arnaud Roques + * + * + */ +package net.sourceforge.plantuml.project.lang; + +import net.sourceforge.plantuml.project.time.Month; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; + +public abstract class TimeResolution { + + public static IRegex toRegexA_DD_MONTH_YYYY(String year, String month, String day) { + return new RegexConcat( // + new RegexLeaf(day, "([\\d]{1,2})"), // + new RegexLeaf("[\\w, ]*?"), // + new RegexLeaf(month, "(" + Month.getRegexString() + ")"), // + new RegexLeaf("[\\w, ]*?"), // + new RegexLeaf(year, "([\\d]{1,4})")); + } + + public static IRegex toRegexB_YYYY_MM_DD(String year, String month, String day) { + return new RegexConcat( // + new RegexLeaf(year, "([\\d]{1,4})"), // + new RegexLeaf("\\D"), // + new RegexLeaf(month, "([\\d]{1,2})"), // + new RegexLeaf("\\D"), // + new RegexLeaf(day, "([\\d]{1,2})")); + } + + public static IRegex toRegexC_MONTH_DD_YYYY(String year, String month, String day) { + return new RegexConcat( // + new RegexLeaf(month, "(" + Month.getRegexString() + ")"), // + new RegexLeaf("[\\w, ]*?"), // + new RegexLeaf(day, "([\\d]{1,2})"), // + new RegexLeaf("[\\w, ]*?"), // + new RegexLeaf(year, "([\\d]{1,4})")); + } + +} diff --git a/src/net/sourceforge/plantuml/project/lang/Verbs.java b/src/net/sourceforge/plantuml/project/lang/Verbs.java index 5b7ed01e5..107a16b3f 100644 --- a/src/net/sourceforge/plantuml/project/lang/Verbs.java +++ b/src/net/sourceforge/plantuml/project/lang/Verbs.java @@ -48,6 +48,7 @@ public class Verbs { public static IRegex is = new RegexLeaf("is"); public static IRegex isColored = new RegexLeaf("is[%s]+colou?red"); public static IRegex isDeleted = new RegexLeaf("is[%s]+deleted"); + public static IRegex isDisplayedAs = new RegexLeaf("is[%s]+displayed[%s]+as"); public static IRegex isOff = new RegexLeaf("is[%s]+off"); public static IRegex isOn = new RegexLeaf("is[%s]+on"); public static IRegex isOrAre = new RegexLeaf("(is|are)"); diff --git a/src/net/sourceforge/plantuml/project/lang/Words.java b/src/net/sourceforge/plantuml/project/lang/Words.java index 9d30ddd85..e3239c218 100644 --- a/src/net/sourceforge/plantuml/project/lang/Words.java +++ b/src/net/sourceforge/plantuml/project/lang/Words.java @@ -44,6 +44,7 @@ import net.sourceforge.plantuml.regex.RegexRepeatedZeroOrMore; public class Words { public final static String AFTER = "after"; + public final static String AND = "and"; public final static String AT = "at"; public final static String BEFORE = "before"; public final static String COMPLETION = "completion"; diff --git a/src/net/sourceforge/plantuml/project/timescale/TimeScaleCompressed.java b/src/net/sourceforge/plantuml/project/timescale/TimeScaleCompressed.java index 1f0ea9a3d..31cc3283a 100644 --- a/src/net/sourceforge/plantuml/project/timescale/TimeScaleCompressed.java +++ b/src/net/sourceforge/plantuml/project/timescale/TimeScaleCompressed.java @@ -42,8 +42,8 @@ public class TimeScaleCompressed implements TimeScale { private final TimeScale daily; - public TimeScaleCompressed(Day calendar, double scale) { - this.daily = new TimeScaleDaily(calendar, scale, null); + public TimeScaleCompressed(double size, Day calendar, double scale) { + this.daily = new TimeScaleDaily(size, calendar, scale, null); } public double getStartingPosition(Day instant) { diff --git a/src/net/sourceforge/plantuml/project/timescale/TimeScaleDaily.java b/src/net/sourceforge/plantuml/project/timescale/TimeScaleDaily.java index dafc2e93f..acf558340 100644 --- a/src/net/sourceforge/plantuml/project/timescale/TimeScaleDaily.java +++ b/src/net/sourceforge/plantuml/project/timescale/TimeScaleDaily.java @@ -39,13 +39,13 @@ import net.sourceforge.plantuml.project.core.PrintScale; import net.sourceforge.plantuml.project.time.Day; public final class TimeScaleDaily implements TimeScale { - // ::remove folder when __HAXE__ + // ::remove folder when __HAXE__ private final TimeScaleWink basic; private final double delta; - public TimeScaleDaily(Day startingDay, double scale, Day zeroDay) { - this.basic = new TimeScaleWink(scale, PrintScale.DAILY); + public TimeScaleDaily(double size, Day startingDay, double scale, Day zeroDay) { + this.basic = new TimeScaleWink(size, scale, PrintScale.DAILY); if (zeroDay == null) this.delta = basic.getStartingPosition(startingDay); else diff --git a/src/net/sourceforge/plantuml/project/timescale/TimeScaleWink.java b/src/net/sourceforge/plantuml/project/timescale/TimeScaleWink.java index 9324097e2..d4cc0a070 100644 --- a/src/net/sourceforge/plantuml/project/timescale/TimeScaleWink.java +++ b/src/net/sourceforge/plantuml/project/timescale/TimeScaleWink.java @@ -40,17 +40,17 @@ import net.sourceforge.plantuml.project.time.Day; public class TimeScaleWink implements TimeScale { - private final double scale; + private final double cellWidth; private final PrintScale printScale; - public TimeScaleWink(double scale, PrintScale printScale) { - this.scale = 16.0 * scale; + public TimeScaleWink(double size, double scale, PrintScale printScale) { + this.cellWidth = size * scale; this.printScale = printScale; } public double getStartingPosition(Day instant) { final long wink = instant.getMillis(); - return wink * scale / Day.MILLISECONDS_PER_DAY; + return wink * cellWidth / Day.MILLISECONDS_PER_DAY; } public double getEndingPosition(Day instant) { @@ -58,7 +58,7 @@ public class TimeScaleWink implements TimeScale { } public double getWidth(Day instant) { - return scale; + return cellWidth; } public boolean isBreaking(Day instant) { diff --git a/src/net/sourceforge/plantuml/style/SName.java b/src/net/sourceforge/plantuml/style/SName.java index 96644bffe..111c7863a 100644 --- a/src/net/sourceforge/plantuml/style/SName.java +++ b/src/net/sourceforge/plantuml/style/SName.java @@ -69,6 +69,7 @@ public enum SName { constraintArrow, // control, // database, // + day, // delay, // destroy, // diamond, // @@ -100,6 +101,7 @@ public enum SName { map, // milestone, // mindmapDiagram, // + month, // network, // node, // note, // @@ -139,6 +141,7 @@ public enum SName { unstarted, // usecase, // verticalSeparator, // + year, // visibilityIcon, // private_, // From ee7022f19ebbe9ff9bbba935840943da5761eaae Mon Sep 17 00:00:00 2001 From: Arnaud Roques Date: Mon, 27 Nov 2023 18:57:42 +0100 Subject: [PATCH 20/95] chore: fix test --- test/nonreg/simple/A0003_TestResult.java | 268 +++++++++++------------ 1 file changed, 134 insertions(+), 134 deletions(-) diff --git a/test/nonreg/simple/A0003_TestResult.java b/test/nonreg/simple/A0003_TestResult.java index 8bf3f0424..f37024c6e 100644 --- a/test/nonreg/simple/A0003_TestResult.java +++ b/test/nonreg/simple/A0003_TestResult.java @@ -5,7 +5,7 @@ public class A0003_TestResult { /* """ DPI: 96 -dimension: [ 367.7447 ; 76.0000 ] +dimension: [ 367.7447 ; 74.0000 ] scaleFactor: 2.0000 seed: 2061842952546013393 svgLinkTarget: _top @@ -13,8 +13,8 @@ hoverPathColorRGB: null preserveAspectRatio: none RECTANGLE: - pt1: [ 8.0000 ; 29.0000 ] - pt2: [ 16.0000 ; 59.0000 ] + pt1: [ 8.0000 ; 27.0000 ] + pt2: [ 16.0000 ; 57.0000 ] xCorner: 0 yCorner: 0 stroke: 0.0-0.0-1.0 @@ -23,8 +23,8 @@ RECTANGLE: backcolor: fff1e5e5 RECTANGLE: - pt1: [ 36.0000 ; 29.0000 ] - pt2: [ 44.0000 ; 59.0000 ] + pt1: [ 36.0000 ; 27.0000 ] + pt2: [ 44.0000 ; 57.0000 ] xCorner: 0 yCorner: 0 stroke: 0.0-0.0-1.0 @@ -33,8 +33,8 @@ RECTANGLE: backcolor: fff1e5e5 RECTANGLE: - pt1: [ 44.0000 ; 29.0000 ] - pt2: [ 72.0000 ; 59.0000 ] + pt1: [ 44.0000 ; 27.0000 ] + pt2: [ 72.0000 ; 57.0000 ] xCorner: 0 yCorner: 0 stroke: 0.0-0.0-1.0 @@ -43,8 +43,8 @@ RECTANGLE: backcolor: fffa8072 RECTANGLE: - pt1: [ 92.0000 ; 29.0000 ] - pt2: [ 100.0000 ; 59.0000 ] + pt1: [ 92.0000 ; 27.0000 ] + pt2: [ 100.0000 ; 57.0000 ] xCorner: 0 yCorner: 0 stroke: 0.0-0.0-1.0 @@ -53,8 +53,8 @@ RECTANGLE: backcolor: fff1e5e5 RECTANGLE: - pt1: [ 120.0000 ; 29.0000 ] - pt2: [ 128.0000 ; 59.0000 ] + pt1: [ 120.0000 ; 27.0000 ] + pt2: [ 128.0000 ; 57.0000 ] xCorner: 0 yCorner: 0 stroke: 0.0-0.0-1.0 @@ -63,8 +63,8 @@ RECTANGLE: backcolor: fff1e5e5 RECTANGLE: - pt1: [ 148.0000 ; 29.0000 ] - pt2: [ 156.0000 ; 59.0000 ] + pt1: [ 148.0000 ; 27.0000 ] + pt2: [ 156.0000 ; 57.0000 ] xCorner: 0 yCorner: 0 stroke: 0.0-0.0-1.0 @@ -76,7 +76,7 @@ TEXT: text: 43 position: [ 21.0000 ; 23.7778 ] orientation: 0 - font: Serif.plain/10 [] + font: SansSerif.plain/10 [] color: ff000000 extendedColor: NULL_COLOR @@ -84,7 +84,7 @@ TEXT: text: 44 position: [ 49.0000 ; 23.7778 ] orientation: 0 - font: Serif.plain/10 [] + font: SansSerif.plain/10 [] color: ff000000 extendedColor: NULL_COLOR @@ -92,7 +92,7 @@ TEXT: text: 45 position: [ 77.0000 ; 23.7778 ] orientation: 0 - font: Serif.plain/10 [] + font: SansSerif.plain/10 [] color: ff000000 extendedColor: NULL_COLOR @@ -100,7 +100,7 @@ TEXT: text: 46 position: [ 105.0000 ; 23.7778 ] orientation: 0 - font: Serif.plain/10 [] + font: SansSerif.plain/10 [] color: ff000000 extendedColor: NULL_COLOR @@ -108,7 +108,7 @@ TEXT: text: 47 position: [ 133.0000 ; 23.7778 ] orientation: 0 - font: Serif.plain/10 [] + font: SansSerif.plain/10 [] color: ff000000 extendedColor: NULL_COLOR @@ -116,55 +116,55 @@ TEXT: text: 48 position: [ 161.0000 ; 23.7778 ] orientation: 0 - font: Serif.plain/10 [] + font: SansSerif.plain/10 [] color: ff000000 extendedColor: NULL_COLOR LINE: pt1: [ 16.0000 ; 16.0000 ] - pt2: [ 16.0000 ; 59.0000 ] + pt2: [ 16.0000 ; 57.0000 ] stroke: 0.0-0.0-1.0 shadow: 0 color: ffc0c0c0 LINE: pt1: [ 44.0000 ; 16.0000 ] - pt2: [ 44.0000 ; 59.0000 ] + pt2: [ 44.0000 ; 57.0000 ] stroke: 0.0-0.0-1.0 shadow: 0 color: ffc0c0c0 LINE: pt1: [ 72.0000 ; 16.0000 ] - pt2: [ 72.0000 ; 59.0000 ] + pt2: [ 72.0000 ; 57.0000 ] stroke: 0.0-0.0-1.0 shadow: 0 color: ffc0c0c0 LINE: pt1: [ 100.0000 ; 16.0000 ] - pt2: [ 100.0000 ; 59.0000 ] + pt2: [ 100.0000 ; 57.0000 ] stroke: 0.0-0.0-1.0 shadow: 0 color: ffc0c0c0 LINE: pt1: [ 128.0000 ; 16.0000 ] - pt2: [ 128.0000 ; 59.0000 ] + pt2: [ 128.0000 ; 57.0000 ] stroke: 0.0-0.0-1.0 shadow: 0 color: ffc0c0c0 LINE: pt1: [ 156.0000 ; 16.0000 ] - pt2: [ 156.0000 ; 59.0000 ] + pt2: [ 156.0000 ; 57.0000 ] stroke: 0.0-0.0-1.0 shadow: 0 color: ffc0c0c0 LINE: pt1: [ 168.0000 ; 16.0000 ] - pt2: [ 168.0000 ; 59.0000 ] + pt2: [ 168.0000 ; 57.0000 ] stroke: 0.0-0.0-1.0 shadow: 0 color: ffc0c0c0 @@ -187,7 +187,7 @@ TEXT: text: Oct position: [ 17.4989 ; 9.3333 ] orientation: 0 - font: Serif.bold/12 [BOLD] + font: SansSerif.bold/12 [BOLD] color: ff000000 extendedColor: NULL_COLOR @@ -202,7 +202,7 @@ TEXT: text: Nov 2020 position: [ 72.7816 ; 9.3333 ] orientation: 0 - font: Serif.bold/12 [BOLD] + font: SansSerif.bold/12 [BOLD] color: ff000000 extendedColor: NULL_COLOR @@ -221,40 +221,40 @@ LINE: color: ffc0c0c0 LINE: - pt1: [ 0.0000 ; 29.0000 ] - pt2: [ 168.0000 ; 29.0000 ] + pt1: [ 0.0000 ; 27.0000 ] + pt2: [ 168.0000 ; 27.0000 ] stroke: 0.0-0.0-1.0 shadow: 0 color: ffc0c0c0 LINE: - pt1: [ 131.0000 ; 42.0000 ] - pt2: [ 131.0000 ; 51.5000 ] + pt1: [ 131.0000 ; 40.0000 ] + pt2: [ 131.0000 ; 49.5000 ] stroke: 0.0-0.0-1.5 shadow: 0 color: ff181818 LINE: - pt1: [ 131.0000 ; 51.5000 ] - pt2: [ 139.0000 ; 51.5000 ] + pt1: [ 131.0000 ; 49.5000 ] + pt2: [ 139.0000 ; 49.5000 ] stroke: 0.0-0.0-1.5 shadow: 0 color: ff181818 POLYGON: points: - - [ 135.0000 ; 47.5000 ] - - [ 135.0000 ; 51.5000 ] - - [ 135.0000 ; 55.5000 ] - - [ 139.0000 ; 51.5000 ] + - [ 135.0000 ; 45.5000 ] + - [ 135.0000 ; 49.5000 ] + - [ 135.0000 ; 53.5000 ] + - [ 139.0000 ; 49.5000 ] stroke: 0.0-0.0-1.5 shadow: 0 color: ff181818 backcolor: ff181818 RECTANGLE: - pt1: [ 2.0000 ; 31.0000 ] - pt2: [ 9.0000 ; 42.0000 ] + pt1: [ 2.0000 ; 29.0000 ] + pt2: [ 9.0000 ; 40.0000 ] xCorner: 0 yCorner: 0 stroke: 0.0-0.0-1.0 @@ -263,29 +263,29 @@ RECTANGLE: backcolor: ffe6e6fa LINE: - pt1: [ 2.0000 ; 31.0000 ] - pt2: [ 7.0000 ; 31.0000 ] + pt1: [ 2.0000 ; 29.0000 ] + pt2: [ 7.0000 ; 29.0000 ] stroke: 0.0-0.0-1.0 shadow: 0 color: ffadd8e6 LINE: - pt1: [ 2.0000 ; 42.0000 ] - pt2: [ 7.0000 ; 42.0000 ] + pt1: [ 2.0000 ; 40.0000 ] + pt2: [ 7.0000 ; 40.0000 ] stroke: 0.0-0.0-1.0 shadow: 0 color: ffadd8e6 LINE: - pt1: [ 2.0000 ; 31.0000 ] - pt2: [ 2.0000 ; 42.0000 ] + pt1: [ 2.0000 ; 29.0000 ] + pt2: [ 2.0000 ; 40.0000 ] stroke: 0.0-0.0-1.0 shadow: 0 color: ffadd8e6 RECTANGLE: - pt1: [ 16.0000 ; 31.0000 ] - pt2: [ 37.0000 ; 42.0000 ] + pt1: [ 16.0000 ; 29.0000 ] + pt2: [ 37.0000 ; 40.0000 ] xCorner: 0 yCorner: 0 stroke: 0.0-0.0-1.0 @@ -294,22 +294,22 @@ RECTANGLE: backcolor: ffe6e6fa LINE: - pt1: [ 17.0000 ; 31.0000 ] - pt2: [ 36.0000 ; 31.0000 ] + pt1: [ 17.0000 ; 29.0000 ] + pt2: [ 36.0000 ; 29.0000 ] stroke: 0.0-0.0-1.0 shadow: 0 color: ffadd8e6 LINE: - pt1: [ 17.0000 ; 42.0000 ] - pt2: [ 36.0000 ; 42.0000 ] + pt1: [ 17.0000 ; 40.0000 ] + pt2: [ 36.0000 ; 40.0000 ] stroke: 0.0-0.0-1.0 shadow: 0 color: ffadd8e6 RECTANGLE: - pt1: [ 44.0000 ; 31.0000 ] - pt2: [ 65.0000 ; 42.0000 ] + pt1: [ 44.0000 ; 29.0000 ] + pt2: [ 65.0000 ; 40.0000 ] xCorner: 0 yCorner: 0 stroke: 0.0-0.0-1.0 @@ -318,22 +318,22 @@ RECTANGLE: backcolor: ffe6e6fa LINE: - pt1: [ 45.0000 ; 31.0000 ] - pt2: [ 64.0000 ; 31.0000 ] + pt1: [ 45.0000 ; 29.0000 ] + pt2: [ 64.0000 ; 29.0000 ] stroke: 0.0-0.0-1.0 shadow: 0 color: ffadd8e6 LINE: - pt1: [ 45.0000 ; 42.0000 ] - pt2: [ 64.0000 ; 42.0000 ] + pt1: [ 45.0000 ; 40.0000 ] + pt2: [ 64.0000 ; 40.0000 ] stroke: 0.0-0.0-1.0 shadow: 0 color: ffadd8e6 RECTANGLE: - pt1: [ 72.0000 ; 31.0000 ] - pt2: [ 93.0000 ; 42.0000 ] + pt1: [ 72.0000 ; 29.0000 ] + pt2: [ 93.0000 ; 40.0000 ] xCorner: 0 yCorner: 0 stroke: 0.0-0.0-1.0 @@ -342,22 +342,22 @@ RECTANGLE: backcolor: ffe6e6fa LINE: - pt1: [ 73.0000 ; 31.0000 ] - pt2: [ 92.0000 ; 31.0000 ] + pt1: [ 73.0000 ; 29.0000 ] + pt2: [ 92.0000 ; 29.0000 ] stroke: 0.0-0.0-1.0 shadow: 0 color: ffadd8e6 LINE: - pt1: [ 73.0000 ; 42.0000 ] - pt2: [ 92.0000 ; 42.0000 ] + pt1: [ 73.0000 ; 40.0000 ] + pt2: [ 92.0000 ; 40.0000 ] stroke: 0.0-0.0-1.0 shadow: 0 color: ffadd8e6 RECTANGLE: - pt1: [ 100.0000 ; 31.0000 ] - pt2: [ 121.0000 ; 42.0000 ] + pt1: [ 100.0000 ; 29.0000 ] + pt2: [ 121.0000 ; 40.0000 ] xCorner: 0 yCorner: 0 stroke: 0.0-0.0-1.0 @@ -366,22 +366,22 @@ RECTANGLE: backcolor: ffe6e6fa LINE: - pt1: [ 101.0000 ; 31.0000 ] - pt2: [ 120.0000 ; 31.0000 ] + pt1: [ 101.0000 ; 29.0000 ] + pt2: [ 120.0000 ; 29.0000 ] stroke: 0.0-0.0-1.0 shadow: 0 color: ffadd8e6 LINE: - pt1: [ 101.0000 ; 42.0000 ] - pt2: [ 120.0000 ; 42.0000 ] + pt1: [ 101.0000 ; 40.0000 ] + pt2: [ 120.0000 ; 40.0000 ] stroke: 0.0-0.0-1.0 shadow: 0 color: ffadd8e6 RECTANGLE: - pt1: [ 128.0000 ; 31.0000 ] - pt2: [ 138.0000 ; 42.0000 ] + pt1: [ 128.0000 ; 29.0000 ] + pt2: [ 138.0000 ; 40.0000 ] xCorner: 0 yCorner: 0 stroke: 0.0-0.0-1.0 @@ -390,99 +390,99 @@ RECTANGLE: backcolor: ffe6e6fa LINE: - pt1: [ 129.0000 ; 31.0000 ] - pt2: [ 138.0000 ; 31.0000 ] + pt1: [ 129.0000 ; 29.0000 ] + pt2: [ 138.0000 ; 29.0000 ] stroke: 0.0-0.0-1.0 shadow: 0 color: ffadd8e6 LINE: - pt1: [ 129.0000 ; 42.0000 ] - pt2: [ 138.0000 ; 42.0000 ] + pt1: [ 129.0000 ; 40.0000 ] + pt2: [ 138.0000 ; 40.0000 ] stroke: 0.0-0.0-1.0 shadow: 0 color: ffadd8e6 LINE: - pt1: [ 138.0000 ; 31.0000 ] - pt2: [ 138.0000 ; 42.0000 ] + pt1: [ 138.0000 ; 29.0000 ] + pt2: [ 138.0000 ; 40.0000 ] stroke: 0.0-0.0-1.0 shadow: 0 color: ffadd8e6 LINE: - pt1: [ 11.0000 ; 31.0000 ] - pt2: [ 13.0000 ; 31.0000 ] + pt1: [ 11.0000 ; 29.0000 ] + pt2: [ 13.0000 ; 29.0000 ] stroke: 2.0-3.0-1.0 shadow: 0 color: ffadd8e6 LINE: - pt1: [ 11.0000 ; 42.0000 ] - pt2: [ 13.0000 ; 42.0000 ] + pt1: [ 11.0000 ; 40.0000 ] + pt2: [ 13.0000 ; 40.0000 ] stroke: 2.0-3.0-1.0 shadow: 0 color: ffadd8e6 LINE: - pt1: [ 39.0000 ; 31.0000 ] - pt2: [ 41.0000 ; 31.0000 ] + pt1: [ 39.0000 ; 29.0000 ] + pt2: [ 41.0000 ; 29.0000 ] stroke: 2.0-3.0-1.0 shadow: 0 color: ffadd8e6 LINE: - pt1: [ 39.0000 ; 42.0000 ] - pt2: [ 41.0000 ; 42.0000 ] + pt1: [ 39.0000 ; 40.0000 ] + pt2: [ 41.0000 ; 40.0000 ] stroke: 2.0-3.0-1.0 shadow: 0 color: ffadd8e6 LINE: - pt1: [ 67.0000 ; 31.0000 ] - pt2: [ 69.0000 ; 31.0000 ] + pt1: [ 67.0000 ; 29.0000 ] + pt2: [ 69.0000 ; 29.0000 ] stroke: 2.0-3.0-1.0 shadow: 0 color: ffadd8e6 LINE: - pt1: [ 67.0000 ; 42.0000 ] - pt2: [ 69.0000 ; 42.0000 ] + pt1: [ 67.0000 ; 40.0000 ] + pt2: [ 69.0000 ; 40.0000 ] stroke: 2.0-3.0-1.0 shadow: 0 color: ffadd8e6 LINE: - pt1: [ 95.0000 ; 31.0000 ] - pt2: [ 97.0000 ; 31.0000 ] + pt1: [ 95.0000 ; 29.0000 ] + pt2: [ 97.0000 ; 29.0000 ] stroke: 2.0-3.0-1.0 shadow: 0 color: ffadd8e6 LINE: - pt1: [ 95.0000 ; 42.0000 ] - pt2: [ 97.0000 ; 42.0000 ] + pt1: [ 95.0000 ; 40.0000 ] + pt2: [ 97.0000 ; 40.0000 ] stroke: 2.0-3.0-1.0 shadow: 0 color: ffadd8e6 LINE: - pt1: [ 123.0000 ; 31.0000 ] - pt2: [ 125.0000 ; 31.0000 ] + pt1: [ 123.0000 ; 29.0000 ] + pt2: [ 125.0000 ; 29.0000 ] stroke: 2.0-3.0-1.0 shadow: 0 color: ffadd8e6 LINE: - pt1: [ 123.0000 ; 42.0000 ] - pt2: [ 125.0000 ; 42.0000 ] + pt1: [ 123.0000 ; 40.0000 ] + pt2: [ 125.0000 ; 40.0000 ] stroke: 2.0-3.0-1.0 shadow: 0 color: ffadd8e6 RECTANGLE: - pt1: [ 142.0000 ; 46.0000 ] - pt2: [ 149.0000 ; 57.0000 ] + pt1: [ 142.0000 ; 44.0000 ] + pt2: [ 149.0000 ; 55.0000 ] xCorner: 0 yCorner: 0 stroke: 0.0-0.0-1.0 @@ -491,29 +491,29 @@ RECTANGLE: backcolor: ffe2e2f0 LINE: - pt1: [ 142.0000 ; 46.0000 ] - pt2: [ 147.0000 ; 46.0000 ] + pt1: [ 142.0000 ; 44.0000 ] + pt2: [ 147.0000 ; 44.0000 ] stroke: 0.0-0.0-1.0 shadow: 0 color: ff181818 LINE: - pt1: [ 142.0000 ; 57.0000 ] - pt2: [ 147.0000 ; 57.0000 ] + pt1: [ 142.0000 ; 55.0000 ] + pt2: [ 147.0000 ; 55.0000 ] stroke: 0.0-0.0-1.0 shadow: 0 color: ff181818 LINE: - pt1: [ 142.0000 ; 46.0000 ] - pt2: [ 142.0000 ; 57.0000 ] + pt1: [ 142.0000 ; 44.0000 ] + pt2: [ 142.0000 ; 55.0000 ] stroke: 0.0-0.0-1.0 shadow: 0 color: ff181818 RECTANGLE: - pt1: [ 156.0000 ; 46.0000 ] - pt2: [ 166.0000 ; 57.0000 ] + pt1: [ 156.0000 ; 44.0000 ] + pt2: [ 166.0000 ; 55.0000 ] xCorner: 0 yCorner: 0 stroke: 0.0-0.0-1.0 @@ -522,43 +522,43 @@ RECTANGLE: backcolor: ffe2e2f0 LINE: - pt1: [ 157.0000 ; 46.0000 ] - pt2: [ 166.0000 ; 46.0000 ] + pt1: [ 157.0000 ; 44.0000 ] + pt2: [ 166.0000 ; 44.0000 ] stroke: 0.0-0.0-1.0 shadow: 0 color: ff181818 LINE: - pt1: [ 157.0000 ; 57.0000 ] - pt2: [ 166.0000 ; 57.0000 ] + pt1: [ 157.0000 ; 55.0000 ] + pt2: [ 166.0000 ; 55.0000 ] stroke: 0.0-0.0-1.0 shadow: 0 color: ff181818 LINE: - pt1: [ 166.0000 ; 46.0000 ] - pt2: [ 166.0000 ; 57.0000 ] + pt1: [ 166.0000 ; 44.0000 ] + pt2: [ 166.0000 ; 55.0000 ] stroke: 0.0-0.0-1.0 shadow: 0 color: ff181818 LINE: - pt1: [ 151.0000 ; 46.0000 ] - pt2: [ 153.0000 ; 46.0000 ] + pt1: [ 151.0000 ; 44.0000 ] + pt2: [ 153.0000 ; 44.0000 ] stroke: 2.0-3.0-1.0 shadow: 0 color: ff181818 LINE: - pt1: [ 151.0000 ; 57.0000 ] - pt2: [ 153.0000 ; 57.0000 ] + pt1: [ 151.0000 ; 55.0000 ] + pt2: [ 153.0000 ; 55.0000 ] stroke: 2.0-3.0-1.0 shadow: 0 color: ff181818 TEXT: text: Prototype design - position: [ 142.0000 ; 39.5556 ] + position: [ 142.0000 ; 37.5556 ] orientation: 0 font: SansSerif.plain/11 [] color: ff000000 @@ -566,59 +566,59 @@ TEXT: TEXT: text: Testing - position: [ 170.0000 ; 54.5556 ] + position: [ 170.0000 ; 52.5556 ] orientation: 0 font: SansSerif.plain/11 [] color: ff000000 extendedColor: NULL_COLOR LINE: - pt1: [ 0.0000 ; 59.0000 ] - pt2: [ 168.0000 ; 59.0000 ] + pt1: [ 0.0000 ; 57.0000 ] + pt2: [ 168.0000 ; 57.0000 ] stroke: 0.0-0.0-1.0 shadow: 0 color: ffc0c0c0 LINE: - pt1: [ 0.0000 ; 59.0000 ] - pt2: [ 0.0000 ; 75.0000 ] + pt1: [ 0.0000 ; 57.0000 ] + pt2: [ 0.0000 ; 73.0000 ] stroke: 0.0-0.0-1.0 shadow: 0 color: ffc0c0c0 LINE: - pt1: [ 68.0000 ; 59.0000 ] - pt2: [ 68.0000 ; 75.0000 ] + pt1: [ 68.0000 ; 57.0000 ] + pt2: [ 68.0000 ; 73.0000 ] stroke: 0.0-0.0-1.0 shadow: 0 color: ffc0c0c0 TEXT: text: Oct - position: [ 17.4989 ; 68.3333 ] + position: [ 17.4989 ; 66.3333 ] orientation: 0 - font: Serif.bold/12 [BOLD] + font: SansSerif.bold/12 [BOLD] color: ff000000 extendedColor: NULL_COLOR LINE: - pt1: [ 168.0000 ; 59.0000 ] - pt2: [ 168.0000 ; 75.0000 ] + pt1: [ 168.0000 ; 57.0000 ] + pt2: [ 168.0000 ; 73.0000 ] stroke: 0.0-0.0-1.0 shadow: 0 color: ffc0c0c0 TEXT: text: Nov 2020 - position: [ 72.7816 ; 68.3333 ] + position: [ 72.7816 ; 66.3333 ] orientation: 0 - font: Serif.bold/12 [BOLD] + font: SansSerif.bold/12 [BOLD] color: ff000000 extendedColor: NULL_COLOR LINE: - pt1: [ 0.0000 ; 75.0000 ] - pt2: [ 168.0000 ; 75.0000 ] + pt1: [ 0.0000 ; 73.0000 ] + pt2: [ 168.0000 ; 73.0000 ] stroke: 0.0-0.0-1.0 shadow: 0 color: ffc0c0c0 From a570cea56f2bc6c2cec1764d2c4d9b025f4d5be8 Mon Sep 17 00:00:00 2001 From: The-Lum <86879521+The-Lum@users.noreply.github.com> Date: Mon, 27 Nov 2023 20:02:54 +0000 Subject: [PATCH 21/95] feat: Allow JSON Array on JSON preproc. (affectation on plantuml variable, on foreach, ...) --- src/net/sourceforge/plantuml/tim/Eater.java | 7 +- .../plantuml/tim/VariableManager.java | 3 +- .../sourceforge/plantuml/tim/EaterTest.java | 64 +++++++++++++++++++ 3 files changed, 70 insertions(+), 4 deletions(-) create mode 100644 test/net/sourceforge/plantuml/tim/EaterTest.java diff --git a/src/net/sourceforge/plantuml/tim/Eater.java b/src/net/sourceforge/plantuml/tim/Eater.java index 6e97e651f..9d1ca8ff7 100644 --- a/src/net/sourceforge/plantuml/tim/Eater.java +++ b/src/net/sourceforge/plantuml/tim/Eater.java @@ -79,11 +79,12 @@ public abstract class Eater { } final public TValue eatExpression(TContext context, TMemory memory) throws EaterException, EaterExceptionLocated { - if (peekChar() == '{') { + char ch = peekChar(); + if (ch == '{' || ch == '[') { final String data = eatAllToEnd(); - // System.err.println("data=" + data); + // System.err.println("data=" + data); final JsonValue json = Json.parse(data); - // System.err.println("json=" + json); + // System.err.println("json=" + json); return TValue.fromJson(json); } final TokenStack tokenStack = eatTokenStack(); diff --git a/src/net/sourceforge/plantuml/tim/VariableManager.java b/src/net/sourceforge/plantuml/tim/VariableManager.java index ae29bba05..8f3a7bd00 100644 --- a/src/net/sourceforge/plantuml/tim/VariableManager.java +++ b/src/net/sourceforge/plantuml/tim/VariableManager.java @@ -66,7 +66,8 @@ public class VariableManager { } else if (value.toJson().isNumber()) { result.append(value.toJson().toString()); } else { - JsonValue jsonValue = (JsonObject) value.toJson(); + JsonValue jsonValue = (value.toJson().isArray()) ? (JsonArray) value.toJson() + : (JsonObject) value.toJson(); i++; i = replaceJson(jsonValue, str, i, result) - 1; } diff --git a/test/net/sourceforge/plantuml/tim/EaterTest.java b/test/net/sourceforge/plantuml/tim/EaterTest.java new file mode 100644 index 000000000..3dbdbe57f --- /dev/null +++ b/test/net/sourceforge/plantuml/tim/EaterTest.java @@ -0,0 +1,64 @@ +package net.sourceforge.plantuml.tim; + +import static java.nio.charset.StandardCharsets.UTF_8; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.util.Lists.newArrayList; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.PrintStream; +import java.util.Collections; +import java.util.List; + +import org.junit.jupiter.api.DisplayNameGenerator.ReplaceUnderscores; +import org.junit.jupiter.api.IndicativeSentencesGeneration; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.CsvSource; + +import net.sourceforge.plantuml.ErrorStatus; +import net.sourceforge.plantuml.Option; +import net.sourceforge.plantuml.Pipe; + +@IndicativeSentencesGeneration(separator = ": ", generator = ReplaceUnderscores.class) +/** + * Tests the Eater (for JSON data). + */ +class EaterTest { + + @ParameterizedTest(name = "[{index}] {1}") + @CsvSource(nullValues = "null", value = { + "'@startuml\n!$a={\"k\": \"exampleValue\"}\ntitle $a.k\na -> b\n@enduml\n' , exampleValue", + "'@startuml\n!$a=[1, 2, 3]\ntitle xx $a[2] yy\na -> a\n' , xx 3 yy", + "'@startuml\ntitle\n!foreach $i in [1, 2, 3]\nxx $i yy\n!endfor\nendtitle\na -> a\n' , xx 2 yy", + "'@startuml\ntitle\n!foreach $i in [\"a\", \"b\", \"c\"]\nxx $i yy\n!endfor\nendtitle\na -> a\n' , xx b yy", + }) + void Test_EaterTest(String input, String expected) throws Exception { + assertRenderExpectedOutput(input, expected); + } + + // TODO: to Factorize on a specific test package... + private static final String[] COMMON_OPTIONS = {"-tutxt"}; + + private String[] optionArray(String... extraOptions) { + final List list = newArrayList(COMMON_OPTIONS); + Collections.addAll(list, extraOptions); + return list.toArray(new String[0]); + } + + private String render(String diagram, String... extraOptions) throws Exception { + final Option option = new Option(optionArray(extraOptions)); + final ByteArrayInputStream bais = new ByteArrayInputStream(diagram.getBytes(UTF_8)); + final ByteArrayOutputStream baos = new ByteArrayOutputStream(); + final Pipe pipe = new Pipe(option, new PrintStream(baos), bais, option.getCharset()); + pipe.managePipe(ErrorStatus.init()); + String rendered = new String(baos.toByteArray(), UTF_8); + // System.err.println(rendered); + return rendered; + } + + public void assertRenderExpectedOutput(String input, String expected) throws Exception { + String rendered = render(input); + assertThat(rendered).doesNotContain("syntax").contains(expected); + } +} From a7d434cff18ffc514376bb8f2c327faab930651d Mon Sep 17 00:00:00 2001 From: The-Lum <86879521+The-Lum@users.noreply.github.com> Date: Mon, 27 Nov 2023 20:06:09 +0000 Subject: [PATCH 22/95] fix: comment indent --- src/net/sourceforge/plantuml/tim/Eater.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/net/sourceforge/plantuml/tim/Eater.java b/src/net/sourceforge/plantuml/tim/Eater.java index 9d1ca8ff7..a4b74b118 100644 --- a/src/net/sourceforge/plantuml/tim/Eater.java +++ b/src/net/sourceforge/plantuml/tim/Eater.java @@ -82,9 +82,9 @@ public abstract class Eater { char ch = peekChar(); if (ch == '{' || ch == '[') { final String data = eatAllToEnd(); - // System.err.println("data=" + data); + // System.err.println("data=" + data); final JsonValue json = Json.parse(data); - // System.err.println("json=" + json); + // System.err.println("json=" + json); return TValue.fromJson(json); } final TokenStack tokenStack = eatTokenStack(); From b29df7758a3f50f687d86b6ab9ae908ff8a45efc Mon Sep 17 00:00:00 2001 From: "jef.overweg" Date: Wed, 29 Nov 2023 16:28:01 +0100 Subject: [PATCH 23/95] Feat: Adding SUPPORT.md file --- docs/SUPPORT.md | 58 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 docs/SUPPORT.md diff --git a/docs/SUPPORT.md b/docs/SUPPORT.md new file mode 100644 index 000000000..555a79f16 --- /dev/null +++ b/docs/SUPPORT.md @@ -0,0 +1,58 @@ +# 🌱 PlantUML Support + +Thank you for using PlantUML! If you need assistance or have questions, please refer to the following resources: + +## Where to Get Support + +### GitHub Issues + +- For reporting bugs or issues, open an [issue on GitHub](https://github.com/plantuml/plantuml/issues). + - When submitting an issue, provide clear steps to reproduce the problem and include your PlantUML version. +- Before creating a new issue, search the existing ones on [GitHub](https://github.com/plantuml/plantuml/issues) to see if your problem has already been addressed. + +### Community Forum + +- Visit our [Community Forum](https://forum.plantuml.net/) for discussions, FAQs, and community support. +- Check for existing threads to see if your question has already been answered. + +### Discord + +- Feel free to ask questions on our official [Discord](https://discord.com/invite/sXhzexAQGh) server. + +## Asking Questions + +If you have a question about using PlantUML: + +- Search through the [official documentation](https://plantuml.com/) and available resources before asking. +- Feel free to ask questions on the GitHub issues or the Community Forum after performing initial research. +- Provide as much detail as possible when asking questions to receive effective assistance. + +## Contributing + +We welcome contributions to PlantUML! If you're interested in contributing: + +### Reporting Bugs + +- Ensure you're using the latest version and search for existing issues on GitHub or the Community Forum before reporting a bug. +- Submit a bug report on [GitHub](https://github.com/plantuml/plantuml/issues) with clear steps to reproduce and your environment details. + +### Suggesting Enhancements + +- Search existing enhancement suggestions on GitHub or the Community Forum before submitting a new one. +- Submit your enhancement suggestion with a clear title and detailed description on [GitHub](https://github.com/plantuml/plantuml/issues). + +### Your First Code Contribution + +- Review our [contributing guide](CONTRIBUTING.md) to get started with code contributions. +- If you're new to contributing, consider tackling issues labeled as 'good first issue' or 'help wanted'. + +## Additional Resources + +- For comprehensive documentation, refer to the [official PlantUML Javadoc](https://plantuml.github.io/plantuml/). +- Explore the [GitHub issues](https://github.com/plantuml/plantuml/issues/) for discussions and known problems. + +## 🧑‍🤝‍🧑 Community Support + +Feel free to engage with the PlantUML community on GitHub and the Community Forum. + +Thank you for being a part of the PlantUML community! From 35505fd24cd891581d284309421cdc71114c5ddb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 30 Nov 2023 02:17:43 +0000 Subject: [PATCH 24/95] chore(deps): bump actions/setup-java from 3 to 4 Bumps [actions/setup-java](https://github.com/actions/setup-java) from 3 to 4. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](https://github.com/actions/setup-java/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/setup-java dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1bc3effb2..ec444f245 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -99,7 +99,7 @@ jobs: - name: Set up java if: needs.workflow_config.outputs.do_test_linux == 'true' - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: ${{ matrix.java_version }} distribution: temurin @@ -132,7 +132,7 @@ jobs: - name: Checkout the repository uses: actions/checkout@v4 - name: Set up java - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: 17 distribution: temurin @@ -195,7 +195,7 @@ jobs: uses: actions/checkout@v4 - name: Set up java - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: 17 distribution: temurin @@ -221,7 +221,7 @@ jobs: uses: actions/checkout@v4 - name: Set up java - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: 17 distribution: temurin From 1899280e21d6f7ea05e47d670b5789a8ec4b10d4 Mon Sep 17 00:00:00 2001 From: The-Lum <86879521+The-Lum@users.noreply.github.com> Date: Sun, 3 Dec 2023 10:48:30 +0100 Subject: [PATCH 25/95] fix: minor fix `final` variable definition --- src/net/sourceforge/plantuml/tim/Eater.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/net/sourceforge/plantuml/tim/Eater.java b/src/net/sourceforge/plantuml/tim/Eater.java index a4b74b118..c23fbf085 100644 --- a/src/net/sourceforge/plantuml/tim/Eater.java +++ b/src/net/sourceforge/plantuml/tim/Eater.java @@ -79,7 +79,7 @@ public abstract class Eater { } final public TValue eatExpression(TContext context, TMemory memory) throws EaterException, EaterExceptionLocated { - char ch = peekChar(); + final char ch = peekChar(); if (ch == '{' || ch == '[') { final String data = eatAllToEnd(); // System.err.println("data=" + data); From 7b1f67a57e0d6a7baa40fb1b080b821e0620442c Mon Sep 17 00:00:00 2001 From: "Daum Alexander (DCL ATV SC D RAD CSFW FW)" Date: Mon, 4 Dec 2023 10:53:01 +0100 Subject: [PATCH 26/95] test: Use XMLUnit to compare XMI The XMLUnit DiffBuilder used can ignore element order, but still checks for correct nesting, which the string sorting could not. --- build.gradle.kts | 1 + plantuml-asl/build.gradle.kts | 1 + plantuml-epl/build.gradle.kts | 1 + plantuml-gplv2/build.gradle.kts | 1 + plantuml-lgpl/build.gradle.kts | 1 + plantuml-mit/build.gradle.kts | 1 + test/nonreg/xmi/XmiTest.java | 50 +++++++++++++-------------------- 7 files changed, 26 insertions(+), 30 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 72fb2d760..6aa48b2dd 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -33,6 +33,7 @@ dependencies { testImplementation("io.github.glytching:junit-extensions:2.6.0") testImplementation("org.assertj:assertj-core:3.24.2") testImplementation("org.junit.jupiter:junit-jupiter:5.10.1") + testImplementation("org.xmlunit:xmlunit-core:2.9.+") if (JavaVersion.current().isJava8) { testImplementation("org.mockito:mockito-core:4.+") testImplementation("org.mockito:mockito-junit-jupiter:4.+") diff --git a/plantuml-asl/build.gradle.kts b/plantuml-asl/build.gradle.kts index 79ebca686..b27324b28 100644 --- a/plantuml-asl/build.gradle.kts +++ b/plantuml-asl/build.gradle.kts @@ -28,6 +28,7 @@ dependencies { testImplementation("org.assertj:assertj-core:3.24.2") testImplementation("org.junit.jupiter:junit-jupiter:5.10.1") testImplementation("org.scilab.forge:jlatexmath:1.0.7") + testImplementation("org.xmlunit:xmlunit-core:2.9.+") } repositories { diff --git a/plantuml-epl/build.gradle.kts b/plantuml-epl/build.gradle.kts index 0c94e1a85..5d0683378 100644 --- a/plantuml-epl/build.gradle.kts +++ b/plantuml-epl/build.gradle.kts @@ -28,6 +28,7 @@ dependencies { testImplementation("org.assertj:assertj-core:3.24.2") testImplementation("org.junit.jupiter:junit-jupiter:5.10.1") testImplementation("org.scilab.forge:jlatexmath:1.0.7") + testImplementation("org.xmlunit:xmlunit-core:2.9.+") } repositories { diff --git a/plantuml-gplv2/build.gradle.kts b/plantuml-gplv2/build.gradle.kts index 740d97e91..e5903f8ba 100644 --- a/plantuml-gplv2/build.gradle.kts +++ b/plantuml-gplv2/build.gradle.kts @@ -28,6 +28,7 @@ dependencies { testImplementation("org.assertj:assertj-core:3.24.2") testImplementation("org.junit.jupiter:junit-jupiter:5.10.1") testImplementation("org.scilab.forge:jlatexmath:1.0.7") + testImplementation("org.xmlunit:xmlunit-core:2.9.+") } repositories { diff --git a/plantuml-lgpl/build.gradle.kts b/plantuml-lgpl/build.gradle.kts index f110030e0..5f6ebfd67 100644 --- a/plantuml-lgpl/build.gradle.kts +++ b/plantuml-lgpl/build.gradle.kts @@ -28,6 +28,7 @@ dependencies { testImplementation("org.assertj:assertj-core:3.24.2") testImplementation("org.junit.jupiter:junit-jupiter:5.10.1") testImplementation("org.scilab.forge:jlatexmath:1.0.7") + testImplementation("org.xmlunit:xmlunit-core:2.9.+") } repositories { diff --git a/plantuml-mit/build.gradle.kts b/plantuml-mit/build.gradle.kts index 995be47c3..4d3655bfa 100644 --- a/plantuml-mit/build.gradle.kts +++ b/plantuml-mit/build.gradle.kts @@ -28,6 +28,7 @@ dependencies { testImplementation("org.assertj:assertj-core:3.24.2") testImplementation("org.junit.jupiter:junit-jupiter:5.10.1") testImplementation("org.scilab.forge:jlatexmath:1.0.7") + testImplementation("org.xmlunit:xmlunit-core:2.9.+") } repositories { diff --git a/test/nonreg/xmi/XmiTest.java b/test/nonreg/xmi/XmiTest.java index db85e694d..760a2ae6a 100644 --- a/test/nonreg/xmi/XmiTest.java +++ b/test/nonreg/xmi/XmiTest.java @@ -12,9 +12,12 @@ import java.nio.file.Path; import java.nio.file.Paths; import java.util.Collection; import java.util.List; -import java.util.Map; -import java.util.TreeMap; -import java.util.concurrent.atomic.AtomicInteger; + +import org.xmlunit.builder.DiffBuilder; +import org.xmlunit.builder.Input; +import org.xmlunit.diff.DefaultNodeMatcher; +import org.xmlunit.diff.Diff; +import org.xmlunit.diff.ElementSelectors; import net.sourceforge.plantuml.FileFormat; import net.sourceforge.plantuml.FileFormatOption; @@ -30,44 +33,31 @@ public class XmiTest { final String star = removeVersion(runPlantUML(expectedDescription, FileFormat.XMI_STAR)); final String starExpected = readStringFromSourceFile(getDiagramFile(), "{{{star", "}}}star"); - // This is really a hack. Since XML generation does not guarantee the order of - // attributes, we make an easy to do check by sorting characters. - // Of course, this is really incomplete: a faulty String may match the expected - // result if, for example, an attribute is moved from a node to another. - // However, we consider that it is a good start. - if (sortString(star).equals(sortString(starExpected)) == false) { - assertEquals(starExpected, star, "XmiStar: Generated GraphML is not ok"); - } + assertXMIEqual(star, starExpected); final String argo = removeVersion(runPlantUML(expectedDescription, FileFormat.XMI_ARGO)); final String argoExpected = readStringFromSourceFile(getDiagramFile(), "{{{argo", "}}}argo"); - if (sortString(argo).equals(sortString(argoExpected)) == false) { - assertEquals(argoExpected, argo, "XmiArgo: Generated GraphML is not ok"); - } + assertXMIEqual(argo, argoExpected); + } + private void assertXMIEqual(final String actual, final String expected) { + // XMI is XML, so we can just use the xmlunit diffbuilder + // Compare elements with the same xmi ID + // checkForSimilar required to ignore order + Diff diff = DiffBuilder.compare(Input.fromString(actual)).withTest(Input.fromString(expected)) + .ignoreWhitespace().ignoreComments().checkForSimilar() + .withNodeMatcher(new DefaultNodeMatcher(ElementSelectors.byNameAndAttributes("xmi.id"))).build(); + + if (diff.hasDifferences()) { + assertTrue(false, diff.fullDescription()); + } } private String removeVersion(String xmi) { return xmi.replaceFirst("\\.*\\", ""); } - private String sortString(String s) { - final Map map = new TreeMap<>(); - for (int i = 0; i < s.length(); i++) { - final char ch = s.charAt(i); - // We ignore non writable characters - if (ch <= ' ') - continue; - - AtomicInteger count = map.get(ch); - if (count == null) - map.put(ch, new AtomicInteger(1)); - else - count.addAndGet(1); - } - return map.toString(); - } private String getLocalFolder() { return "test/" + getPackageName().replace(".", "/"); From de5d791eb42563595065c9283d8b12f1da2dda08 Mon Sep 17 00:00:00 2001 From: The-Lum <86879521+The-Lum@users.noreply.github.com> Date: Mon, 4 Dec 2023 13:23:17 +0000 Subject: [PATCH 27/95] docs: improve `@deprecated` description --- src/net/sourceforge/plantuml/Option.java | 3 +++ .../sourceforge/plantuml/SourceStringReader.java | 15 +++++++++++++++ src/net/sourceforge/plantuml/core/UmlSource.java | 5 ++++- 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/src/net/sourceforge/plantuml/Option.java b/src/net/sourceforge/plantuml/Option.java index 2f1db45a0..31ad4bc7b 100644 --- a/src/net/sourceforge/plantuml/Option.java +++ b/src/net/sourceforge/plantuml/Option.java @@ -112,6 +112,9 @@ public class Option { private FileFormatOption fileFormatOption = new FileFormatOption(FileFormat.PNG); + /** + * @deprecated Use {@link #setFileFormatOption(FileFormatOption)} instead + */ @Deprecated @ApiWarning(willBeRemoved = "in next major release") final public void setFileFormat(FileFormat fileFormat) { diff --git a/src/net/sourceforge/plantuml/SourceStringReader.java b/src/net/sourceforge/plantuml/SourceStringReader.java index 32e7f5ace..e73c1f577 100644 --- a/src/net/sourceforge/plantuml/SourceStringReader.java +++ b/src/net/sourceforge/plantuml/SourceStringReader.java @@ -106,6 +106,9 @@ public class SourceStringReader { } } + /** + * @deprecated Use {@link #outputImage(OutputStream)} instead + */ @Deprecated public String generateImage(OutputStream os) throws IOException { return outputImage(os).getDescription(); @@ -116,6 +119,9 @@ public class SourceStringReader { } // ::comment when __CORE__ + /** + * @deprecated Use {@link #outputImage(SFile)} instead + */ @Deprecated public String generateImage(SFile f) throws IOException { return outputImage(f).getDescription(); @@ -128,6 +134,9 @@ public class SourceStringReader { } // ::done + /** + * @deprecated Use {@link #outputImage(OutputStream, FileFormatOption)} instead + */ @Deprecated public String generateImage(OutputStream os, FileFormatOption fileFormatOption) throws IOException { return outputImage(os, fileFormatOption).getDescription(); @@ -137,6 +146,9 @@ public class SourceStringReader { return outputImage(os, 0, fileFormatOption); } + /** + * @deprecated Use {@link #outputImage(OutputStream, int)} instead + */ @Deprecated public String generateImage(OutputStream os, int numImage) throws IOException { return outputImage(os, numImage).getDescription(); @@ -146,6 +158,9 @@ public class SourceStringReader { return outputImage(os, numImage, new FileFormatOption(FileFormat.PNG)); } + /** + * @deprecated Use {@link #outputImage(OutputStream, int, FileFormatOption)} instead + */ @Deprecated public String generateImage(OutputStream os, int numImage, FileFormatOption fileFormatOption) throws IOException { return outputImage(os, numImage, fileFormatOption).getDescription(); diff --git a/src/net/sourceforge/plantuml/core/UmlSource.java b/src/net/sourceforge/plantuml/core/UmlSource.java index 97b5ccc7b..0dacdc5ef 100755 --- a/src/net/sourceforge/plantuml/core/UmlSource.java +++ b/src/net/sourceforge/plantuml/core/UmlSource.java @@ -158,7 +158,10 @@ final public class UmlSource { // return Collections.unmodifiableCollection(rawSource).iterator(); // } - + /** + * @deprecated Use {@link #getPlainString(String)} instead, + * like getPlainString("\n") + */ @Deprecated() public String getPlainString() { return getPlainString("\n"); From cb5b881e46403237d8891c7939fd86a7c931ec26 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 5 Dec 2023 02:46:52 +0000 Subject: [PATCH 28/95] chore(deps): bump actions/labeler from 4 to 5 Bumps [actions/labeler](https://github.com/actions/labeler) from 4 to 5. - [Release notes](https://github.com/actions/labeler/releases) - [Commits](https://github.com/actions/labeler/compare/v4...v5) --- updated-dependencies: - dependency-name: actions/labeler dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/labeler.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml index 07b21837d..2a340279e 100644 --- a/.github/workflows/labeler.yml +++ b/.github/workflows/labeler.yml @@ -9,4 +9,4 @@ jobs: pull-requests: write runs-on: ubuntu-latest steps: - - uses: actions/labeler@v4 + - uses: actions/labeler@v5 From 1cb61d56099d3fddd5f0ea33812160fb939b576d Mon Sep 17 00:00:00 2001 From: The-Lum <86879521+The-Lum@users.noreply.github.com> Date: Fri, 8 Dec 2023 21:08:36 +0000 Subject: [PATCH 29/95] fix: allow different type inside array for `GetJsonKey` builtin fct --- src/net/sourceforge/plantuml/tim/stdlib/GetJsonKey.java | 8 +++++--- .../sourceforge/plantuml/tim/stdlib/GetJsonKeyTest.java | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/net/sourceforge/plantuml/tim/stdlib/GetJsonKey.java b/src/net/sourceforge/plantuml/tim/stdlib/GetJsonKey.java index 77824aabc..4df4bf5b5 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/GetJsonKey.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/GetJsonKey.java @@ -76,9 +76,11 @@ public class GetJsonKey extends SimpleReturnFunction { final JsonArray array = (JsonArray) json; final JsonArray result = new JsonArray(); for (JsonValue tmp : array) { - final JsonObject object = (JsonObject) tmp; - for (String key : object.names()) - result.add(key); + if (tmp.isObject()) { + final JsonObject object = (JsonObject) tmp; + for (String key : object.names()) + result.add(key); + } } return TValue.fromJson(result); } diff --git a/test/net/sourceforge/plantuml/tim/stdlib/GetJsonKeyTest.java b/test/net/sourceforge/plantuml/tim/stdlib/GetJsonKeyTest.java index c9985befd..c84f32bd8 100644 --- a/test/net/sourceforge/plantuml/tim/stdlib/GetJsonKeyTest.java +++ b/test/net/sourceforge/plantuml/tim/stdlib/GetJsonKeyTest.java @@ -61,11 +61,11 @@ class GetJsonKeyTest { " '{\"a\":\"abc\"}' , [\"a\"]", " '[{\"a\":[1, 2]}, {\"b\":[3, 4]}]' , '[\"a\",\"b\"]'", " '{\"a\":[1, 2], \"b\":\"abc\", \"b\":true}' , '[\"a\",\"b\",\"b\"]'", - // TODO: Manage Array with different type inside + // DONE: Manage Array with different type inside // Ref.: // - https://datatracker.ietf.org/doc/html/rfc8259#section-5 // - https://json-schema.org/understanding-json-schema/reference/array.html - //" '[3, \"different\", { \"types\" : \"of values\" }]', [\"types\"]", + " '[3, \"different\", { \"types\" : \"of values\" }]', [\"types\"]", }) void Test_with_Json(@ConvertWith(StringJsonConverter.class) JsonValue input, String expected) throws EaterException, EaterExceptionLocated { assertTimExpectedOutputFromInput(cut, input, expected); From 3f836a44ccc507713b4cfcc87149e5853e02185a Mon Sep 17 00:00:00 2001 From: The-Lum <86879521+The-Lum@users.noreply.github.com> Date: Fri, 8 Dec 2023 21:20:22 +0000 Subject: [PATCH 30/95] fix: allow (`int` corresponding of) unicode value for `Chr` builtin fct That fixes partialy #1571. --- src/net/sourceforge/plantuml/tim/stdlib/Chr.java | 4 ++-- test/net/sourceforge/plantuml/tim/stdlib/ChrTest.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Chr.java b/src/net/sourceforge/plantuml/tim/stdlib/Chr.java index 622230500..7fdc13f2b 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Chr.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/Chr.java @@ -59,8 +59,8 @@ public class Chr extends SimpleReturnFunction { public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, Map named) throws EaterException, EaterExceptionLocated { try { - final char value = (char) values.get(0).toInt(); - return TValue.fromString("" + value); + final String value = String.valueOf(Character.toChars(values.get(0).toInt())); + return TValue.fromString(value); } catch (Throwable t) { return TValue.fromString("\0"); } diff --git a/test/net/sourceforge/plantuml/tim/stdlib/ChrTest.java b/test/net/sourceforge/plantuml/tim/stdlib/ChrTest.java index cf3886aaa..97eb1ece3 100644 --- a/test/net/sourceforge/plantuml/tim/stdlib/ChrTest.java +++ b/test/net/sourceforge/plantuml/tim/stdlib/ChrTest.java @@ -32,9 +32,9 @@ class ChrTest { " 34 , '\"' ", " 224 , à ", " 233 , é ", -// TODO: fix `%chr` to allow Unicode chars, the corresponding tests are here: -// " 128512 , 😀 ", -// " 128512 , \uD83D\uDE00 ", +// DONE: fix `%chr` to allow Unicode chars, the corresponding tests are here: + " 128512 , 😀 ", + " 128512 , \uD83D\uDE00 ", }) void executeReturnFunctionChrTest(Integer input, String expected) throws EaterException, EaterExceptionLocated { Chr cut = new Chr(); From 5c7245623a1c8cd700b7aaa30bbc44399a2307d3 Mon Sep 17 00:00:00 2001 From: The-Lum <86879521+The-Lum@users.noreply.github.com> Date: Fri, 8 Dec 2023 21:44:05 +0000 Subject: [PATCH 31/95] test refactor: simplify test using `TimTestUtils` For: `Chr` and `Ord` --- .../plantuml/tim/stdlib/ChrTest.java | 24 +++++++++---------- .../plantuml/tim/stdlib/OrdTest.java | 24 +++++++++---------- 2 files changed, 22 insertions(+), 26 deletions(-) diff --git a/test/net/sourceforge/plantuml/tim/stdlib/ChrTest.java b/test/net/sourceforge/plantuml/tim/stdlib/ChrTest.java index 97eb1ece3..6659ecd95 100644 --- a/test/net/sourceforge/plantuml/tim/stdlib/ChrTest.java +++ b/test/net/sourceforge/plantuml/tim/stdlib/ChrTest.java @@ -1,29 +1,31 @@ package net.sourceforge.plantuml.tim.stdlib; -import static org.junit.jupiter.api.Assertions.assertEquals; - -import java.util.Collections; -import java.util.List; +import static net.sourceforge.plantuml.tim.TimTestUtils.assertTimExpectedOutputFromInput; +import org.junit.jupiter.api.DisplayNameGenerator.ReplaceUnderscores; +import org.junit.jupiter.api.IndicativeSentencesGeneration; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.CsvSource; import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; -import net.sourceforge.plantuml.tim.expression.TValue; +import net.sourceforge.plantuml.tim.TFunction; /** * Tests the builtin function %chr. */ -class ChrTest { +@IndicativeSentencesGeneration(separator = ": ", generator = ReplaceUnderscores.class) +class ChrTest { + TFunction cut = new Chr(); + final String cutName = "Chr"; /** * Tests chr according to a list of input / expected output * * @throws EaterException should not * @throws EaterExceptionLocated should not */ - @ParameterizedTest + @ParameterizedTest(name = "[{index}] " + cutName + "({0}) = ''{1}''") @CsvSource(nullValues = "null", value = { " 65 , A ", " 9 , '\t' ", @@ -36,11 +38,7 @@ class ChrTest { " 128512 , 😀 ", " 128512 , \uD83D\uDE00 ", }) - void executeReturnFunctionChrTest(Integer input, String expected) throws EaterException, EaterExceptionLocated { - Chr cut = new Chr(); - - List values = Collections.singletonList(TValue.fromInt(input)); - TValue tValue = cut.executeReturnFunction(null, null, null, values, null); - assertEquals(expected, tValue.toString()); + void Test_with_Integer(Integer input, String expected) throws EaterException, EaterExceptionLocated { + assertTimExpectedOutputFromInput(cut, input, expected); } } \ No newline at end of file diff --git a/test/net/sourceforge/plantuml/tim/stdlib/OrdTest.java b/test/net/sourceforge/plantuml/tim/stdlib/OrdTest.java index 3d4c2f203..4fd0411ab 100644 --- a/test/net/sourceforge/plantuml/tim/stdlib/OrdTest.java +++ b/test/net/sourceforge/plantuml/tim/stdlib/OrdTest.java @@ -1,29 +1,31 @@ package net.sourceforge.plantuml.tim.stdlib; -import static org.junit.jupiter.api.Assertions.assertEquals; - -import java.util.Collections; -import java.util.List; +import static net.sourceforge.plantuml.tim.TimTestUtils.assertTimExpectedOutputFromInput; +import org.junit.jupiter.api.DisplayNameGenerator.ReplaceUnderscores; +import org.junit.jupiter.api.IndicativeSentencesGeneration; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.CsvSource; import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; -import net.sourceforge.plantuml.tim.expression.TValue; +import net.sourceforge.plantuml.tim.TFunction; /** * Tests the builtin function %ord. */ -class OrdTest { +@IndicativeSentencesGeneration(separator = ": ", generator = ReplaceUnderscores.class) +class OrdTest { + TFunction cut = new Ord(); + final String cutName = "Ord"; /** * Tests ord according to a list of input / expected output * * @throws EaterException should not * @throws EaterExceptionLocated should not */ - @ParameterizedTest + @ParameterizedTest(name = "[{index}] " + cutName + "(''{0}'') = {1}") @CsvSource(nullValues = "null", value = { " A , 65 ", " ABC , 65 ", @@ -39,11 +41,7 @@ class OrdTest { " 😀 , 128512 ", " \uD83D\uDE00 , 128512 ", }) - void executeReturnFunctionOrdTest(String input, String expected) throws EaterException, EaterExceptionLocated { - Ord cut = new Ord(); - - List values = Collections.singletonList(TValue.fromString(input)); - TValue tValue = cut.executeReturnFunction(null, null, null, values, null); - assertEquals(expected, tValue.toString()); + void Test_with_String(String input, String expected) throws EaterException, EaterExceptionLocated { + assertTimExpectedOutputFromInput(cut, input, expected); } } \ No newline at end of file From c20b3d9642eb56600c6c22b09021b545b05f6174 Mon Sep 17 00:00:00 2001 From: Arnaud Roques Date: Mon, 11 Dec 2023 18:34:23 +0100 Subject: [PATCH 32/95] feat: work on chronology --- gradle.properties | 2 +- .../plantuml/api/cheerpj/v1/DirectDraw.java | 3 +- src/com/plantuml/api/cheerpj/v1/Raw.java | 5 +- src/net/atmp/CucaDiagram.java | 4 +- .../sourceforge/plantuml/AbstractPSystem.java | 18 +- src/net/sourceforge/plantuml/Option.java | 2 + .../sourceforge/plantuml/PSystemBuilder.java | 8 +- .../sourceforge/plantuml/PlainDiagram.java | 7 +- .../plantuml/SourceStringReader.java | 12 +- .../sourceforge/plantuml/TitledDiagram.java | 6 +- .../command/CommandLinkActivity.java | 9 +- .../command/CommandLinkLongActivity.java | 5 +- .../command/CommandPartition.java | 13 +- .../activitydiagram3/ActivityDiagram3.java | 11 +- .../plantuml/activitydiagram3/Branch.java | 5 +- .../activitydiagram3/InstructionIf.java | 20 +- .../activitydiagram3/InstructionSwitch.java | 4 +- .../command/CommandActivity3.java | 5 +- .../command/CommandArrow3.java | 3 +- .../activitydiagram3/command/CommandIf2.java | 10 +- .../activitydiagram3/command/CommandIf4.java | 6 +- .../command/CommandIfLegacy1.java | 2 +- .../command/CommandPartition3.java | 5 +- .../command/CommandRepeat3.java | 3 +- .../activitydiagram3/ftile/FtileFactory.java | 2 +- .../ftile/FtileFactoryDelegator.java | 4 +- .../vcompact/FtileFactoryDelegatorIf.java | 5 +- .../ftile/vcompact/FtileForkInner.java | 12 +- .../ftile/vcompact/ParallelBuilderFork.java | 2 +- .../ftile/vcompact/VCompactFactory.java | 2 +- .../plantuml/board/BoardDiagram.java | 4 +- .../sourceforge/plantuml/bpm/BpmDiagram.java | 2 +- .../chronology/ChronologyDiagram.java | 853 ++++++++++++++++++ .../chronology/ChronologyDiagramFactory.java | 126 +++ .../chronology/ComplementAnything.java | 54 ++ .../plantuml/chronology/ComplementHour.java | 84 ++ .../plantuml/chronology/HourPattern.java | 136 +++ .../chronology/SentenceHappensChronology.java | 60 ++ .../plantuml/chronology/SubjectTask.java | 92 ++ .../plantuml/chronology/TaskChronology.java | 372 ++++++++ .../chronology/TimeHeaderChronology.java | 197 ++++ .../chronology/TimeScaleChronology.java | 81 ++ .../command/CommandCreateClass.java | 5 +- .../command/CommandCreateClassMultilines.java | 5 +- .../command/CommandCreateElementFull2.java | 24 +- .../command/CommandStereotype.java | 4 +- .../plantuml/command/CommandNamespace.java | 5 +- .../plantuml/command/CommandNamespace2.java | 5 +- .../command/CommandNamespaceEmpty.java | 5 +- .../plantuml/command/CommandPackage.java | 5 +- .../command/note/CommandFactoryNote.java | 9 +- .../note/CommandFactoryNoteOnEntity.java | 13 +- .../note/CommandFactoryTipOnEntity.java | 9 +- .../FactorySequenceNoteAcrossCommand.java | 17 +- .../sequence/FactorySequenceNoteCommand.java | 19 +- .../FactorySequenceNoteOnArrowCommand.java | 17 +- ...FactorySequenceNoteOverSeveralCommand.java | 17 +- .../sourceforge/plantuml/core/Diagram.java | 2 +- .../plantuml/core/DiagramType.java | 12 +- .../descdiagram/CommandCreateDomain.java | 7 +- .../descdiagram/command/CommandArchimate.java | 32 +- .../command/CommandArchimateMultilines.java | 11 +- .../command/CommandCreateElementFull.java | 27 +- .../CommandCreateElementMultilines.java | 9 +- .../command/CommandLinkElement.java | 5 +- .../command/CommandPackageWithUSymbol.java | 5 +- .../plantuml/ebnf/PSystemEbnf.java | 4 +- .../plantuml/filesdiagram/FilesDiagram.java | 4 +- .../plantuml/flowdiagram/FlowDiagram.java | 2 +- .../plantuml/gitlog/GitDiagram.java | 4 +- src/net/sourceforge/plantuml/help/Help.java | 2 +- .../plantuml/jsondiagram/JsonDiagram.java | 6 +- .../klimt/sprite/ListSpriteDiagram.java | 4 +- .../plantuml/klimt/sprite/StdlibDiagram.java | 4 +- .../plantuml/mindmap/MindMapDiagram.java | 4 +- .../plantuml/nwdiag/NwDiagram.java | 4 +- .../command/CommandCreateEntityObject.java | 5 +- .../CommandCreateEntityObjectMultilines.java | 5 +- .../command/CommandCreateJson.java | 5 +- .../command/CommandCreateJsonSingleLine.java | 5 +- .../command/CommandCreateMap.java | 5 +- .../plantuml/project/GanttDiagram.java | 18 +- .../plantuml/project/GanttDiagramFactory.java | 22 +- .../project/TimeHeaderParameters.java | 3 +- .../project/command/CommandColorTask.java | 3 +- .../project/command/CommandFootbox.java | 5 +- .../project/command/CommandGanttArrow.java | 3 +- .../command/CommandHideResourceFootbox.java | 2 +- .../command/CommandHideResourceName.java | 2 +- .../project/command/CommandLabelOnColumn.java | 3 +- .../project/command/CommandLanguage.java | 2 +- .../project/command/CommandPrintBetween.java | 2 +- .../project/command/CommandPrintScale.java | 2 +- .../command/CommandTaskCompleteDefault.java | 1 - .../project/command/NaturalCommand.java | 14 +- .../plantuml/project/core/AbstractTask.java | 13 + .../plantuml/project/core/Task.java | 5 + .../project/draw/AbstractTaskDraw.java | 8 +- .../project/draw/TaskDrawDiamond.java | 10 +- .../plantuml/project/draw/TaskDrawGroup.java | 13 +- .../project/draw/TaskDrawRegular.java | 18 +- .../project/draw/TimeHeaderSimple.java | 14 +- .../project/draw/TimeHeaderYearly.java | 1 - .../project/lang/ComplementAnything.java | 2 +- ...lementBeforeOrAfterOrAtTaskStartOrEnd.java | 2 +- .../project/lang/ComplementClose.java | 2 +- .../project/lang/ComplementCompleted.java | 2 +- .../plantuml/project/lang/ComplementDate.java | 2 +- .../project/lang/ComplementDates.java | 2 +- .../project/lang/ComplementDayOfWeek.java | 2 +- .../project/lang/ComplementEmpty.java | 2 +- .../project/lang/ComplementFromTo.java | 2 +- .../project/lang/ComplementInColors.java | 2 +- .../project/lang/ComplementInColors2.java | 2 +- .../lang/ComplementInColorsFromTo.java | 2 +- .../project/lang/ComplementNamed.java | 2 +- .../plantuml/project/lang/ComplementOpen.java | 2 +- .../project/lang/ComplementSeveralDays.java | 2 +- .../plantuml/project/lang/ComplementTask.java | 2 +- .../plantuml/project/lang/ComplementUrl.java | 2 +- .../project/lang/ComplementWithColorLink.java | 2 +- .../project/lang/PairOfSomething.java | 16 +- .../plantuml/project/lang/Sentence.java | 10 +- .../plantuml/project/lang/SentenceAnd.java | 12 +- .../plantuml/project/lang/SentenceAndAnd.java | 14 +- .../lang/SentenceDisplayOnSameRowAs.java | 2 +- .../plantuml/project/lang/SentenceEnds.java | 2 +- .../project/lang/SentenceHappens.java | 2 +- .../project/lang/SentenceHappensDate.java | 2 +- .../project/lang/SentenceIsColored.java | 2 +- .../lang/SentenceIsColoredForCompletion.java | 2 +- .../project/lang/SentenceIsDeleted.java | 2 +- .../project/lang/SentenceIsDisplayedAs.java | 2 +- .../project/lang/SentenceIsForTask.java | 2 +- .../project/lang/SentenceLinksTo.java | 2 +- .../plantuml/project/lang/SentenceOccurs.java | 2 +- .../project/lang/SentencePausesDate.java | 2 +- .../project/lang/SentencePausesDates.java | 2 +- .../project/lang/SentencePausesDayOfWeek.java | 2 +- .../project/lang/SentenceRequire.java | 2 +- .../plantuml/project/lang/SentenceSimple.java | 24 +- .../lang/SentenceTaskEndsAbsolute.java | 2 +- .../lang/SentenceTaskEndsOnlyRelative.java | 2 +- .../project/lang/SentenceTaskStarts.java | 2 +- .../lang/SentenceTaskStartsAbsolute.java | 2 +- .../lang/SentenceTaskStartsOnlyRelative.java | 2 +- .../lang/SentenceTaskStartsWithColor.java | 4 +- .../plantuml/project/lang/Something.java | 6 +- .../plantuml/project/lang/Subject.java | 8 +- .../project/lang/SubjectDayAsDate.java | 12 +- .../project/lang/SubjectDayOfWeek.java | 12 +- .../project/lang/SubjectDaysAsDates.java | 14 +- .../plantuml/project/lang/SubjectLinks.java | 6 +- .../plantuml/project/lang/SubjectProject.java | 8 +- .../project/lang/SubjectResource.java | 22 +- .../project/lang/SubjectSeparator.java | 12 +- .../plantuml/project/lang/SubjectTask.java | 35 +- .../plantuml/project/lang/SubjectToday.java | 12 +- .../plantuml/project/lang/Words.java | 1 + .../plantuml/project/time/Day.java | 25 +- .../plantuml/regexdiagram/PSystemRegex.java | 11 +- .../regexdiagram/RegexExpression.java | 13 +- .../plantuml/salt/PSystemSalt.java | 3 +- .../sequencediagram/SequenceDiagram.java | 6 +- .../sequencediagram/command/CommandArrow.java | 5 +- .../command/CommandBoxStart.java | 4 +- .../command/CommandParticipantA.java | 6 +- .../command/CommandParticipantA2.java | 5 +- .../command/CommandParticipantA3.java | 5 +- .../command/CommandParticipantA4.java | 5 +- .../command/CommandParticipantMultilines.java | 5 +- .../plantuml/skin/UmlDiagramType.java | 5 +- .../command/CommandCreatePackage2.java | 5 +- .../command/CommandCreatePackageState.java | 5 +- .../command/CommandCreateState.java | 5 +- .../plantuml/stereo/Stereotype.java | 2 + .../plantuml/stereo/StereotypePattern.java | 71 ++ .../plantuml/sudoku/PSystemSudoku.java | 2 +- src/net/sourceforge/plantuml/tim/Eater.java | 2 +- .../plantuml/timingdiagram/TimingDiagram.java | 4 +- .../timingdiagram/command/CommandAnalog.java | 9 +- .../timingdiagram/command/CommandBinary.java | 9 +- .../command/CommandRobustConcise.java | 9 +- .../plantuml/version/PSystemLicense.java | 2 +- .../sourceforge/plantuml/version/Version.java | 2 +- .../plantuml/wbs/CommandWBSLink.java | 5 +- .../sourceforge/plantuml/wbs/WBSDiagram.java | 4 +- .../plantuml/wire/WireDiagram.java | 4 +- test/net/sourceforge/plantuml/PipeTest.java | 2 +- test/nonreg/RenderViaApiTest.java | 56 ++ test/nonreg/RenderViaPipeTest.java | 63 ++ test/nonreg/simple/A0003_Test.java | 2 +- 192 files changed, 2806 insertions(+), 611 deletions(-) create mode 100644 src/net/sourceforge/plantuml/chronology/ChronologyDiagram.java create mode 100644 src/net/sourceforge/plantuml/chronology/ChronologyDiagramFactory.java create mode 100644 src/net/sourceforge/plantuml/chronology/ComplementAnything.java create mode 100644 src/net/sourceforge/plantuml/chronology/ComplementHour.java create mode 100644 src/net/sourceforge/plantuml/chronology/HourPattern.java create mode 100644 src/net/sourceforge/plantuml/chronology/SentenceHappensChronology.java create mode 100644 src/net/sourceforge/plantuml/chronology/SubjectTask.java create mode 100644 src/net/sourceforge/plantuml/chronology/TaskChronology.java create mode 100644 src/net/sourceforge/plantuml/chronology/TimeHeaderChronology.java create mode 100644 src/net/sourceforge/plantuml/chronology/TimeScaleChronology.java create mode 100644 src/net/sourceforge/plantuml/stereo/StereotypePattern.java create mode 100644 test/nonreg/RenderViaApiTest.java create mode 100644 test/nonreg/RenderViaPipeTest.java diff --git a/gradle.properties b/gradle.properties index 2318ed74a..ee1cf3aff 100644 --- a/gradle.properties +++ b/gradle.properties @@ -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.13beta3 +version = 1.2023.13beta4 org.gradle.workers.max = 3 \ No newline at end of file diff --git a/src/com/plantuml/api/cheerpj/v1/DirectDraw.java b/src/com/plantuml/api/cheerpj/v1/DirectDraw.java index 295b0cc0b..88572fcf6 100644 --- a/src/com/plantuml/api/cheerpj/v1/DirectDraw.java +++ b/src/com/plantuml/api/cheerpj/v1/DirectDraw.java @@ -53,6 +53,7 @@ import net.sourceforge.plantuml.BlockUml; import net.sourceforge.plantuml.BlockUmlBuilder; import net.sourceforge.plantuml.ErrorUml; import net.sourceforge.plantuml.FileFormat; +import net.sourceforge.plantuml.FileFormatOption; import net.sourceforge.plantuml.core.Diagram; import net.sourceforge.plantuml.error.PSystemError; import net.sourceforge.plantuml.klimt.color.ColorMapper; @@ -122,7 +123,7 @@ public class DirectDraw { ug.apply(back).apply(back.bg()).draw(URectangle.build(frameWidth, frameHeight)); WasmLog.log("...drawing..."); - system.exportDiagramGraphic(ug); + system.exportDiagramGraphic(ug, new FileFormatOption(FileFormat.PNG)); WasmLog.log("done!"); diff --git a/src/com/plantuml/api/cheerpj/v1/Raw.java b/src/com/plantuml/api/cheerpj/v1/Raw.java index c8a12200e..e1ec34f5c 100644 --- a/src/com/plantuml/api/cheerpj/v1/Raw.java +++ b/src/com/plantuml/api/cheerpj/v1/Raw.java @@ -55,6 +55,7 @@ import net.sourceforge.plantuml.BlockUmlBuilder; import net.sourceforge.plantuml.EmptyImageBuilder; import net.sourceforge.plantuml.ErrorUml; import net.sourceforge.plantuml.FileFormat; +import net.sourceforge.plantuml.FileFormatOption; import net.sourceforge.plantuml.api.ImageDataSimple; import net.sourceforge.plantuml.core.Diagram; import net.sourceforge.plantuml.core.ImageData; @@ -124,7 +125,7 @@ public class Raw { ug.resetMax(); WasmLog.log("...drawing..."); - system.exportDiagramGraphic(ug); + system.exportDiagramGraphic(ug, new FileFormatOption(FileFormat.PNG)); final int width = (int) (2 + ug.getMaxX()); final int height = (int) (2 + ug.getMaxY()); @@ -208,7 +209,7 @@ public class Raw { ug.resetMax(); WasmLog.log("...drawing..."); - system.exportDiagramGraphic(ug); + system.exportDiagramGraphic(ug, new FileFormatOption(FileFormat.PNG)); final int width = (int) (2 + ug.getMaxX()); final int height = (int) (2 + ug.getMaxY()); diff --git a/src/net/atmp/CucaDiagram.java b/src/net/atmp/CucaDiagram.java index d13c5fda3..c91cc88d6 100644 --- a/src/net/atmp/CucaDiagram.java +++ b/src/net/atmp/CucaDiagram.java @@ -376,13 +376,13 @@ public abstract class CucaDiagram extends UmlDiagram implements GroupHierarchy, // ::done @Override - final public void exportDiagramGraphic(UGraphic ug) { + final public void exportDiagramGraphic(UGraphic ug, FileFormatOption fileFormatOption) { final CucaDiagramFileMaker maker = new CucaDiagramFileMakerSmetana(this, ug.getStringBounder()); maker.createOneGraphic(ug); } @Override - final protected TextBlock getTextBlock() { + final protected TextBlock getTextMainBlock(FileFormatOption fileFormatOption) { throw new UnsupportedOperationException(); } diff --git a/src/net/sourceforge/plantuml/AbstractPSystem.java b/src/net/sourceforge/plantuml/AbstractPSystem.java index abebc8b07..e45fe9f16 100644 --- a/src/net/sourceforge/plantuml/AbstractPSystem.java +++ b/src/net/sourceforge/plantuml/AbstractPSystem.java @@ -114,14 +114,14 @@ public abstract class AbstractPSystem implements Diagram { } final public String getMetadata() { - if (source == null) + if (source == null) return getVersion(); - + final String rawString = source.getRawString("\n"); final String plainString = source.getPlainString("\n"); - if (rawString != null && rawString.equals(plainString)) + if (rawString != null && rawString.equals(plainString)) return rawString + BackSlash.NEWLINE + getVersion(); - + return rawString + BackSlash.NEWLINE + plainString + BackSlash.NEWLINE + getVersion(); } @@ -130,9 +130,9 @@ public abstract class AbstractPSystem implements Diagram { } final public long seed() { - if (source == null) + if (source == null) return 42; - + return getSource().seed(); } @@ -159,9 +159,9 @@ public abstract class AbstractPSystem implements Diagram { } public DisplayPositionned getTitle() { - if (source == null) + if (source == null) return DisplayPositioned.single(Display.empty(), HorizontalAlignment.CENTER, VerticalAlignment.TOP); - + return DisplayPositioned.single(source.getTitle(), HorizontalAlignment.CENTER, VerticalAlignment.TOP); } @@ -247,7 +247,7 @@ public abstract class AbstractPSystem implements Diagram { } @Override - public void exportDiagramGraphic(UGraphic ug) { + public void exportDiagramGraphic(UGraphic ug, FileFormatOption fileFormatOption) { final UFont font = UFont.monospaced(14); final FontConfiguration fc = FontConfiguration.blackBlueTrue(font); final UText text = UText.build("Not implemented yet for " + getClass().getName(), fc); diff --git a/src/net/sourceforge/plantuml/Option.java b/src/net/sourceforge/plantuml/Option.java index 2f1db45a0..401ee8bcf 100644 --- a/src/net/sourceforge/plantuml/Option.java +++ b/src/net/sourceforge/plantuml/Option.java @@ -440,9 +440,11 @@ public class Option { } else if (s.equalsIgnoreCase("-preproc")) { preprocessorOutput = OptionPreprocOutputMode.NORMAL; + setFileFormatOption(new FileFormatOption(FileFormat.PREPROC)); } else if (s.equalsIgnoreCase("-cypher")) { preprocessorOutput = OptionPreprocOutputMode.CYPHER; + setFileFormatOption(new FileFormatOption(FileFormat.PREPROC)); } else if (s.equalsIgnoreCase("-checkmetadata")) { checkMetadata = true; diff --git a/src/net/sourceforge/plantuml/PSystemBuilder.java b/src/net/sourceforge/plantuml/PSystemBuilder.java index e1e2a3e7b..5d1fbca15 100644 --- a/src/net/sourceforge/plantuml/PSystemBuilder.java +++ b/src/net/sourceforge/plantuml/PSystemBuilder.java @@ -48,6 +48,7 @@ import net.sourceforge.plantuml.activitydiagram3.ActivityDiagramFactory3; import net.sourceforge.plantuml.api.PSystemFactory; import net.sourceforge.plantuml.board.BoardDiagramFactory; import net.sourceforge.plantuml.bpm.BpmDiagramFactory; +import net.sourceforge.plantuml.chronology.ChronologyDiagramFactory; import net.sourceforge.plantuml.classdiagram.ClassDiagramFactory; import net.sourceforge.plantuml.core.Diagram; import net.sourceforge.plantuml.core.DiagramType; @@ -223,7 +224,8 @@ public class PSystemBuilder { // factories.add(new PSystemSudokuFactory()); // ::done - // ::comment when __CORE__ or __MIT__ or __EPL__ or __BSD__ or __ASL__ or __LGPL__ + // ::comment when __CORE__ or __MIT__ or __EPL__ or __BSD__ or __ASL__ or + // __LGPL__ factories.add(new PSystemJcckitFactory()); factories.add(new PSystemSudokuFactory()); // ::done @@ -247,11 +249,13 @@ public class PSystemBuilder { // ::done factories.add(new PSystemCharlieFactory()); - // ::comment when __CORE__ or __MIT__ or __EPL__ or __BSD__ or __ASL__ or __LGPL__ + // ::comment when __CORE__ or __MIT__ or __EPL__ or __BSD__ or __ASL__ or + // __LGPL__ factories.add(new PSystemXearthFactory()); // ::done factories.add(new GanttDiagramFactory()); + factories.add(new ChronologyDiagramFactory()); factories.add(new FlowDiagramFactory()); // ::comment when __CORE__ diff --git a/src/net/sourceforge/plantuml/PlainDiagram.java b/src/net/sourceforge/plantuml/PlainDiagram.java index 7945b7feb..88385e9e5 100644 --- a/src/net/sourceforge/plantuml/PlainDiagram.java +++ b/src/net/sourceforge/plantuml/PlainDiagram.java @@ -66,14 +66,13 @@ public abstract class PlainDiagram extends AbstractPSystem { } @Override - public void exportDiagramGraphic(UGraphic ug) { - final FileFormatOption option = new FileFormatOption(FileFormat.PNG); + public void exportDiagramGraphic(UGraphic ug, FileFormatOption fileFormatOption) { try { - final UDrawable rootDrawable = getRootDrawable(option); + final UDrawable rootDrawable = getRootDrawable(fileFormatOption); rootDrawable.drawU(ug); } catch (IOException e) { e.printStackTrace(); - super.exportDiagramGraphic(ug); + super.exportDiagramGraphic(ug, fileFormatOption); } } diff --git a/src/net/sourceforge/plantuml/SourceStringReader.java b/src/net/sourceforge/plantuml/SourceStringReader.java index 32e7f5ace..a31dfe233 100644 --- a/src/net/sourceforge/plantuml/SourceStringReader.java +++ b/src/net/sourceforge/plantuml/SourceStringReader.java @@ -54,6 +54,7 @@ import net.sourceforge.plantuml.klimt.shape.GraphicStrings; import net.sourceforge.plantuml.klimt.shape.TextBlock; import net.sourceforge.plantuml.preproc.Defines; import net.sourceforge.plantuml.security.SFile; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.utils.Log; public class SourceStringReader { @@ -157,6 +158,14 @@ public class SourceStringReader { noValidStartFound(os, fileFormatOption); return null; } + if (fileFormatOption.getFileFormat() == FileFormat.PREPROC) { + final BlockUml first = blocks.get(0); + for (StringLocated s : first.getData()) { + os.write(s.getString().getBytes(UTF_8)); + os.write("\n".getBytes(UTF_8)); + } + return new DiagramDescription("PREPROC"); + } for (BlockUml b : blocks) { final Diagram system = b.getDiagram(); final int nbInSystem = system.getNbImages(); @@ -231,7 +240,8 @@ public class SourceStringReader { } public ImageData noValidStartFound(OutputStream os, FileFormatOption fileFormatOption) throws IOException { - final TextBlock error = GraphicStrings.createForError(Arrays.asList("No valid @start/@end found, please check the version"), + final TextBlock error = GraphicStrings.createForError( + Arrays.asList("No valid @start/@end found, please check the version"), fileFormatOption.isUseRedForError()); return plainImageBuilder(error, fileFormatOption).write(os); diff --git a/src/net/sourceforge/plantuml/TitledDiagram.java b/src/net/sourceforge/plantuml/TitledDiagram.java index f5faeba59..9f365f86c 100644 --- a/src/net/sourceforge/plantuml/TitledDiagram.java +++ b/src/net/sourceforge/plantuml/TitledDiagram.java @@ -253,11 +253,11 @@ public abstract class TitledDiagram extends AbstractPSystem implements Diagram, } - protected abstract TextBlock getTextBlock(); + protected abstract TextBlock getTextMainBlock(FileFormatOption fileFormatOption); @Override - public void exportDiagramGraphic(UGraphic ug) { - final TextBlock textBlock = getTextBlock(); + public void exportDiagramGraphic(UGraphic ug, FileFormatOption fileFormatOption) { + final TextBlock textBlock = getTextMainBlock(fileFormatOption); textBlock.drawU(ug); } diff --git a/src/net/sourceforge/plantuml/activitydiagram/command/CommandLinkActivity.java b/src/net/sourceforge/plantuml/activitydiagram/command/CommandLinkActivity.java index 6daa6844e..143b3225d 100644 --- a/src/net/sourceforge/plantuml/activitydiagram/command/CommandLinkActivity.java +++ b/src/net/sourceforge/plantuml/activitydiagram/command/CommandLinkActivity.java @@ -61,6 +61,7 @@ import net.sourceforge.plantuml.regex.RegexOr; import net.sourceforge.plantuml.regex.RegexPartialMatch; import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.stereo.Stereotype; +import net.sourceforge.plantuml.stereo.StereotypePattern; import net.sourceforge.plantuml.url.Url; import net.sourceforge.plantuml.url.UrlBuilder; import net.sourceforge.plantuml.url.UrlMode; @@ -81,9 +82,7 @@ public class CommandLinkActivity extends SingleLineCommand2 { new RegexLeaf("CODE", "([%pLN][%pLN_.]*)"), // new RegexLeaf("BAR", "(?:==+)[%s]*([%pLN_.]+)[%s]*(?:==+)"), // new RegexLeaf("QUOTED", "[%g]([^%g]+)[%g](?:[%s]+as[%s]+([%pLN_.]+))?"))), // - RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("STEREOTYPE", "(\\<\\<.*\\>\\>)?"), // - RegexLeaf.spaceZeroOrMore(), // + StereotypePattern.optional("STEREOTYPE"), // ColorParser.exp2(), // RegexLeaf.spaceZeroOrMore(), // UrlBuilder.OPTIONAL, // @@ -105,9 +104,7 @@ public class CommandLinkActivity extends SingleLineCommand2 { new RegexLeaf("BAR2", "(?:==+)[%s]*([%pLN_.]+)[%s]*(?:==+)"), // new RegexLeaf("QUOTED2", "[%g]([^%g]+)[%g](?:[%s]+as[%s]+([%pLN][%pLN_.]*))?"), // new RegexLeaf("QUOTED_INVISIBLE2", "(\\w.*?)")), // - RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("STEREOTYPE2", "(\\<\\<.*\\>\\>)?"), // - RegexLeaf.spaceZeroOrMore(), // + StereotypePattern.optional("STEREOTYPE2"), // new RegexOptional( // new RegexConcat( // new RegexLeaf("in"), // diff --git a/src/net/sourceforge/plantuml/activitydiagram/command/CommandLinkLongActivity.java b/src/net/sourceforge/plantuml/activitydiagram/command/CommandLinkLongActivity.java index 4e008bac8..75d2551e1 100644 --- a/src/net/sourceforge/plantuml/activitydiagram/command/CommandLinkLongActivity.java +++ b/src/net/sourceforge/plantuml/activitydiagram/command/CommandLinkLongActivity.java @@ -64,6 +64,7 @@ import net.sourceforge.plantuml.regex.RegexOptional; import net.sourceforge.plantuml.regex.RegexOr; import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.stereo.Stereotype; +import net.sourceforge.plantuml.stereo.StereotypePattern; import net.sourceforge.plantuml.text.BackSlash; import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.url.Url; @@ -91,9 +92,7 @@ public class CommandLinkLongActivity extends CommandMultilines2 new RegexLeaf("CODE", "([%pLN][%pLN_.]*)"), // new RegexLeaf("BAR", "(?:==+)[%s]*([%pLN_.]+)[%s]*(?:==+)"), // new RegexLeaf("QUOTED", "[%g]([^%g]+)[%g](?:[%s]+as[%s]+([%pLN_.]+))?"))), // - RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("STEREOTYPE", "(\\<\\<.*\\>\\>)?"), // - RegexLeaf.spaceZeroOrMore(), // + StereotypePattern.optional("STEREOTYPE"), // new RegexLeaf("BACKCOLOR", "(#\\w+)?"), // RegexLeaf.spaceZeroOrMore(), // UrlBuilder.OPTIONAL, // diff --git a/src/net/sourceforge/plantuml/activitydiagram/command/CommandPartition.java b/src/net/sourceforge/plantuml/activitydiagram/command/CommandPartition.java index 488cff81b..cef3f0753 100644 --- a/src/net/sourceforge/plantuml/activitydiagram/command/CommandPartition.java +++ b/src/net/sourceforge/plantuml/activitydiagram/command/CommandPartition.java @@ -52,6 +52,7 @@ import net.sourceforge.plantuml.regex.RegexLeaf; import net.sourceforge.plantuml.regex.RegexOr; import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.stereo.Stereotype; +import net.sourceforge.plantuml.stereo.StereotypePattern; import net.sourceforge.plantuml.utils.LineLocation; public class CommandPartition extends SingleLineCommand2 { @@ -69,9 +70,7 @@ public class CommandPartition extends SingleLineCommand2 { new RegexOr(// color().getRegex(), // new RegexLeaf("LEGACYCOLORIGNORED", "(#[0-9a-fA-F]{6}|#?\\w+)?")), // - RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("STEREOTYPE", "(\\<\\<.*\\>\\>)?"), // - RegexLeaf.spaceZeroOrMore(), // + StereotypePattern.optional("STEREOTYPE"), // new RegexLeaf("\\{?"), // RegexLeaf.end()); } @@ -89,12 +88,10 @@ public class CommandPartition extends SingleLineCommand2 { final Entity p = diagram.getCurrentGroup(); final Colors colors = color().getColor(arg, diagram.getSkinParam().getIHtmlColorSet()); - if (colors.isEmpty() == false) { + if (colors.isEmpty() == false) p.setColors(colors); - } - if (arg.get("STEREOTYPE", 0) != null) { - p.setStereotype(Stereotype.build(arg.get("STEREOTYPE", 0))); - } + + p.setStereotype(Stereotype.build(arg.get("STEREOTYPE", 0))); return CommandExecutionResult.ok(); } diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ActivityDiagram3.java b/src/net/sourceforge/plantuml/activitydiagram3/ActivityDiagram3.java index 009bed4dc..4378abb42 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ActivityDiagram3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ActivityDiagram3.java @@ -40,7 +40,6 @@ import java.io.OutputStream; import java.util.Map; import java.util.Objects; -import net.sourceforge.plantuml.FileFormat; import net.sourceforge.plantuml.FileFormatOption; import net.sourceforge.plantuml.UmlDiagram; import net.sourceforge.plantuml.activitydiagram3.ftile.BoxStyle; @@ -208,8 +207,7 @@ public class ActivityDiagram3 extends UmlDiagram { } @Override - protected TextBlock getTextBlock() { - final FileFormatOption fileFormatOption = new FileFormatOption(FileFormat.PNG); + protected TextBlock getTextMainBlock(FileFormatOption fileFormatOption) { final StringBounder stringBounder = fileFormatOption.getDefaultStringBounder(getSkinParam()); return getTextBlock(stringBounder); } @@ -318,10 +316,10 @@ public class ActivityDiagram3 extends UmlDiagram { return CommandExecutionResult.error("Cannot find switch"); } - public void startIf(Display test, Display whenThen, HColor color, Url url) { + public void startIf(Display test, Display whenThen, HColor color, Url url, Stereotype stereotype) { manageSwimlaneStrategy(); final InstructionIf instructionIf = new InstructionIf(swinlanes.getCurrentSwimlane(), current(), test, - LinkRendering.none().withDisplay(whenThen), nextLinkRenderer(), color, getSkinParam(), url); + LinkRendering.none().withDisplay(whenThen), nextLinkRenderer(), color, getSkinParam(), url, stereotype); current().add(instructionIf); setNextLinkRendererInternal(LinkRendering.none()); setCurrent(instructionIf); @@ -392,7 +390,8 @@ public class ActivityDiagram3 extends UmlDiagram { manageSwimlaneStrategy(); if (current() instanceof InstructionRepeat) { final InstructionRepeat instructionRepeat = (InstructionRepeat) current(); - instructionRepeat.setBackward(label, swinlanes.getCurrentSwimlane(), boxStyle, incoming1, incoming2, stereotype); + instructionRepeat.setBackward(label, swinlanes.getCurrentSwimlane(), boxStyle, incoming1, incoming2, + stereotype); return CommandExecutionResult.ok(); } if (current() instanceof InstructionWhile) { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/Branch.java b/src/net/sourceforge/plantuml/activitydiagram3/Branch.java index 0a25a1dc9..35270db4d 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/Branch.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/Branch.java @@ -57,6 +57,7 @@ import net.sourceforge.plantuml.klimt.shape.TextBlock; import net.sourceforge.plantuml.klimt.shape.TextBlockUtils; import net.sourceforge.plantuml.sequencediagram.NotePosition; import net.sourceforge.plantuml.sequencediagram.NoteType; +import net.sourceforge.plantuml.stereo.Stereotype; import net.sourceforge.plantuml.style.ISkinParam; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.SName; @@ -95,12 +96,12 @@ public class Branch { } public Branch(StyleBuilder styleBuilder, Swimlane swimlane, LinkRendering labelPositive, Display labelTest, - HColor color, LinkRendering inlabel) { + HColor color, LinkRendering inlabel, Stereotype stereotype) { this.inlabel = Objects.requireNonNull(inlabel); this.labelTest = Objects.requireNonNull(labelTest); this.labelPositive = Objects.requireNonNull(labelPositive); - final Style style = getDefaultStyleDefinitionDiamond().getMergedStyle(styleBuilder); + final Style style = getDefaultStyleDefinitionDiamond().withTOBECHANGED(stereotype).getMergedStyle(styleBuilder); this.color = color == null ? style.value(PName.BackGroundColor).asColor(styleBuilder.getSkinParam().getIHtmlColorSet()) : color; diff --git a/src/net/sourceforge/plantuml/activitydiagram3/InstructionIf.java b/src/net/sourceforge/plantuml/activitydiagram3/InstructionIf.java index 23ddbae23..ee2b423b8 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/InstructionIf.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/InstructionIf.java @@ -47,7 +47,6 @@ import net.sourceforge.plantuml.activitydiagram3.ftile.FtileDecorateWelding; import net.sourceforge.plantuml.activitydiagram3.ftile.FtileFactory; import net.sourceforge.plantuml.activitydiagram3.ftile.Swimlane; import net.sourceforge.plantuml.activitydiagram3.ftile.WeldingPoint; -import net.sourceforge.plantuml.activitydiagram3.ftile.vcompact.FtileWithNoteOpale; import net.sourceforge.plantuml.activitydiagram3.gtile.Gtile; import net.sourceforge.plantuml.activitydiagram3.gtile.GtileIfAlone; import net.sourceforge.plantuml.activitydiagram3.gtile.GtileIfHexagon; @@ -56,9 +55,9 @@ import net.sourceforge.plantuml.klimt.color.Colors; import net.sourceforge.plantuml.klimt.color.HColor; import net.sourceforge.plantuml.klimt.creole.Display; import net.sourceforge.plantuml.klimt.font.StringBounder; -import net.sourceforge.plantuml.klimt.geom.VerticalAlignment; import net.sourceforge.plantuml.sequencediagram.NotePosition; import net.sourceforge.plantuml.sequencediagram.NoteType; +import net.sourceforge.plantuml.stereo.Stereotype; import net.sourceforge.plantuml.style.ISkinParam; import net.sourceforge.plantuml.url.Url; @@ -75,6 +74,7 @@ public class InstructionIf extends WithNote implements Instruction, InstructionC private Branch current; private final LinkRendering topInlinkRendering; private LinkRendering outColor = LinkRendering.none(); + private final Stereotype stereotype; private final Swimlane swimlane; @@ -91,14 +91,15 @@ public class InstructionIf extends WithNote implements Instruction, InstructionC } public InstructionIf(Swimlane swimlane, Instruction parent, Display labelTest, LinkRendering whenThen, - LinkRendering inlinkRendering, HColor color, ISkinParam skinParam, Url url) { + LinkRendering inlinkRendering, HColor color, ISkinParam skinParam, Url url, Stereotype stereotype) { this.url = url; + this.stereotype = stereotype; this.parent = parent; this.skinParam = skinParam; this.topInlinkRendering = Objects.requireNonNull(inlinkRendering); this.swimlane = swimlane; this.thens.add(new Branch(skinParam.getCurrentStyleBuilder(), swimlane, whenThen, labelTest, color, - LinkRendering.none())); + LinkRendering.none(), stereotype)); this.current = this.thens.get(0); } @@ -138,11 +139,11 @@ public class InstructionIf extends WithNote implements Instruction, InstructionC if (elseBranch == null) this.elseBranch = new Branch(skinParam.getCurrentStyleBuilder(), swimlane, LinkRendering.none(), - Display.NULL, null, LinkRendering.none()); + Display.NULL, null, LinkRendering.none(), stereotype); elseBranch.updateFtile(factory); Ftile result = factory.createIf(swimlane, thens, elseBranch, outColor, topInlinkRendering, url, - getPositionedNotes()); + getPositionedNotes(), stereotype); // if (getPositionedNotes().size() > 0) // result = FtileWithNoteOpale.create(result, getPositionedNotes(), false, VerticalAlignment.CENTER); @@ -169,7 +170,7 @@ public class InstructionIf extends WithNote implements Instruction, InstructionC this.current.setInlinkRendering(nextLinkRenderer); this.elseBranch = new Branch(skinParam.getCurrentStyleBuilder(), swimlane, whenElse, Display.NULL, null, - LinkRendering.none()); + LinkRendering.none(), stereotype); this.current = elseBranch; return true; } @@ -180,7 +181,8 @@ public class InstructionIf extends WithNote implements Instruction, InstructionC return false; this.current.setSpecial(nextLinkRenderer); - this.current = new Branch(skinParam.getCurrentStyleBuilder(), swimlane, whenThen, test, color, inlabel); + this.current = new Branch(skinParam.getCurrentStyleBuilder(), swimlane, whenThen, test, color, inlabel, + stereotype); this.thens.add(current); return true; @@ -190,7 +192,7 @@ public class InstructionIf extends WithNote implements Instruction, InstructionC endifCalled = true; if (elseBranch == null) this.elseBranch = new Branch(skinParam.getCurrentStyleBuilder(), swimlane, LinkRendering.none(), - Display.NULL, null, LinkRendering.none()); + Display.NULL, null, LinkRendering.none(), stereotype); this.elseBranch.setSpecial(nextLinkRenderer); this.current.setInlinkRendering(nextLinkRenderer); diff --git a/src/net/sourceforge/plantuml/activitydiagram3/InstructionSwitch.java b/src/net/sourceforge/plantuml/activitydiagram3/InstructionSwitch.java index 9ed4ddb98..dc9efedc6 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/InstructionSwitch.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/InstructionSwitch.java @@ -58,7 +58,7 @@ import net.sourceforge.plantuml.sequencediagram.NoteType; import net.sourceforge.plantuml.style.ISkinParam; public class InstructionSwitch extends WithNote implements Instruction, InstructionCollection { - // ::remove folder when __HAXE__ + // ::remove folder when __HAXE__ private final List switches = new ArrayList<>(); private final ISkinParam skinParam; @@ -166,7 +166,7 @@ public class InstructionSwitch extends WithNote implements Instruction, Instruct this.current.setSpecial(nextLinkRenderer); this.current = new Branch(skinParam.getCurrentStyleBuilder(), swimlane, LinkRendering.none().withDisplay(labelCase), labelCase, null, - LinkRendering.none().withDisplay(labelCase)); + LinkRendering.none().withDisplay(labelCase), null); this.switches.add(this.current); return true; } diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandActivity3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandActivity3.java index a78abd2eb..4a38e0c61 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandActivity3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandActivity3.java @@ -52,6 +52,7 @@ import net.sourceforge.plantuml.regex.RegexLeaf; import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.skin.ColorParam; import net.sourceforge.plantuml.stereo.Stereotype; +import net.sourceforge.plantuml.stereo.StereotypePattern; import net.sourceforge.plantuml.url.Url; import net.sourceforge.plantuml.url.UrlBuilder; import net.sourceforge.plantuml.url.UrlMode; @@ -104,9 +105,7 @@ public class CommandActivity3 extends SingleLineCommand2 { return RegexConcat.build(CommandActivity3.class.getName(), RegexLeaf.start(), // UrlBuilder.OPTIONAL, // color().getRegex(), // - RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("STEREO", "(\\<\\<.*\\>\\>)?"), // - RegexLeaf.spaceZeroOrMore(), // + StereotypePattern.optional("STEREO"), // new RegexLeaf(":"), // new RegexLeaf("LABEL", "(.*?)"), // new RegexLeaf("STYLE", endingGroupShort()), // diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandArrow3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandArrow3.java index 6f7f93d18..643717928 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandArrow3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandArrow3.java @@ -78,9 +78,8 @@ public class CommandArrow3 extends SingleLineCommand2 { diagram.setColorNextArrow(rainbow); } final String label = arg.get("LABEL", 0); - if (label != null && label.length() > 0) { + if (label != null && label.length() > 0) diagram.setLabelNextArrow(Display.getWithNewlines(label)); - } return CommandExecutionResult.ok(); } diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandIf2.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandIf2.java index efd28fb28..fca210ab9 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandIf2.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandIf2.java @@ -47,6 +47,8 @@ import net.sourceforge.plantuml.regex.RegexConcat; import net.sourceforge.plantuml.regex.RegexLeaf; import net.sourceforge.plantuml.regex.RegexOptional; import net.sourceforge.plantuml.regex.RegexResult; +import net.sourceforge.plantuml.stereo.Stereotype; +import net.sourceforge.plantuml.stereo.StereotypePattern; import net.sourceforge.plantuml.url.Url; import net.sourceforge.plantuml.url.UrlBuilder; import net.sourceforge.plantuml.url.UrlMode; @@ -63,7 +65,7 @@ public class CommandIf2 extends SingleLineCommand2 { UrlBuilder.OPTIONAL, // ColorParser.exp4(), // new RegexLeaf("if"), // - RegexLeaf.spaceZeroOrMore(), // + StereotypePattern.optional("STEREO"), // new RegexLeaf("\\("), // new RegexLeaf("TEST", "(.*?)"), // new RegexLeaf("\\)"), // @@ -85,9 +87,8 @@ public class CommandIf2 extends SingleLineCommand2 { final HColor color = s == null ? null : diagram.getSkinParam().getIHtmlColorSet().getColor(s); String test = arg.get("TEST", 0); - if (test.length() == 0) { + if (test.length() == 0) test = null; - } final Url url; if (arg.get("URL", 0) == null) { @@ -96,8 +97,9 @@ public class CommandIf2 extends SingleLineCommand2 { final UrlBuilder urlBuilder = new UrlBuilder(diagram.getSkinParam().getValue("topurl"), UrlMode.STRICT); url = urlBuilder.getUrl(arg.get("URL", 0)); } + final Stereotype stereotype = Stereotype.build(arg.get("STEREO", 0)); - diagram.startIf(Display.getWithNewlines(test), Display.getWithNewlines(arg.get("WHEN", 0)), color, url); + diagram.startIf(Display.getWithNewlines(test), Display.getWithNewlines(arg.get("WHEN", 0)), color, url, stereotype); return CommandExecutionResult.ok(); } diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandIf4.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandIf4.java index 926746f8e..331389707 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandIf4.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandIf4.java @@ -82,10 +82,10 @@ public class CommandIf4 extends SingleLineCommand2 { final HColor color = s == null ? null : diagram.getSkinParam().getIHtmlColorSet().getColor(s); String test = arg.get("TEST", 0); - if (test.length() == 0) { + if (test.length() == 0) test = null; - } - diagram.startIf(Display.getWithNewlines(test), Display.getWithNewlines(arg.get("WHEN", 0)), color, null); + + diagram.startIf(Display.getWithNewlines(test), Display.getWithNewlines(arg.get("WHEN", 0)), color, null, null); return CommandExecutionResult.ok(); } diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandIfLegacy1.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandIfLegacy1.java index 7f1b9a30d..78f120eaa 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandIfLegacy1.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandIfLegacy1.java @@ -72,7 +72,7 @@ public class CommandIfLegacy1 extends SingleLineCommand2 { protected CommandExecutionResult executeArg(ActivityDiagram3 diagram, LineLocation location, RegexResult arg) { diagram.startIf(Display.getWithNewlines(arg.get("TEST", 0)), Display.getWithNewlines(arg.get("WHEN", 0)), null, - null); + null, null); return CommandExecutionResult.ok(); } diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandPartition3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandPartition3.java index 63132a782..3e7dcc420 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandPartition3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandPartition3.java @@ -54,6 +54,7 @@ import net.sourceforge.plantuml.regex.RegexLeaf; import net.sourceforge.plantuml.regex.RegexOptional; import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.stereo.Stereotype; +import net.sourceforge.plantuml.stereo.StereotypePattern; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.utils.LineLocation; @@ -77,9 +78,7 @@ public class CommandPartition3 extends SingleLineCommand2 { new RegexConcat( // RegexLeaf.spaceOneOrMore(), // color("BACK2").getRegex())), // - RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("STEREO", "(\\<\\<.*\\>\\>)?"), // - RegexLeaf.spaceZeroOrMore(), // + StereotypePattern.optional("STEREO"), // new RegexLeaf("\\{?"), // RegexLeaf.end()); } diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandRepeat3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandRepeat3.java index 6289d2b60..82170a3e8 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandRepeat3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandRepeat3.java @@ -52,6 +52,7 @@ import net.sourceforge.plantuml.regex.RegexOptional; import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.skin.ColorParam; import net.sourceforge.plantuml.stereo.Stereotype; +import net.sourceforge.plantuml.stereo.StereotypePattern; import net.sourceforge.plantuml.utils.LineLocation; public class CommandRepeat3 extends SingleLineCommand2 { @@ -62,7 +63,7 @@ public class CommandRepeat3 extends SingleLineCommand2 { static IRegex getRegexConcat() { return RegexConcat.build(CommandRepeat3.class.getName(), RegexLeaf.start(), // - new RegexLeaf("STEREO", "(\\<\\<.*\\>\\>)?"), // + StereotypePattern.optional("STEREO"), // ColorParser.exp4(), // new RegexLeaf("repeat"), // RegexLeaf.spaceZeroOrMore(), // diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileFactory.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileFactory.java index 897491f1b..ada34034c 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileFactory.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileFactory.java @@ -89,7 +89,7 @@ public interface FtileFactory { HColor color, Instruction specialOut, Ftile backward, LinkRendering incoming1, LinkRendering incoming2); public Ftile createIf(Swimlane swimlane, List thens, Branch elseBranch, LinkRendering outColor, - LinkRendering topInlinkRendering, Url url, Collection notes); + LinkRendering topInlinkRendering, Url url, Collection notes, Stereotype stereotype); public Ftile createSwitch(Swimlane swimlane, List branches, LinkRendering afterEndwhile, LinkRendering topInlinkRendering, Display labelTest); diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileFactoryDelegator.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileFactoryDelegator.java index 5969966ce..c95352ecb 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileFactoryDelegator.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileFactoryDelegator.java @@ -188,8 +188,8 @@ public class FtileFactoryDelegator implements FtileFactory { @Override public Ftile createIf(Swimlane swimlane, List thens, Branch elseBranch, LinkRendering afterEndwhile, - LinkRendering topInlinkRendering, Url url, Collection notes) { - return factory.createIf(swimlane, thens, elseBranch, afterEndwhile, topInlinkRendering, url, notes); + LinkRendering topInlinkRendering, Url url, Collection notes, Stereotype stereotype) { + return factory.createIf(swimlane, thens, elseBranch, afterEndwhile, topInlinkRendering, url, notes, stereotype); } @Override diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorIf.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorIf.java index 4330e476b..bd116dc3f 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorIf.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorIf.java @@ -48,6 +48,7 @@ import net.sourceforge.plantuml.activitydiagram3.ftile.Swimlane; import net.sourceforge.plantuml.activitydiagram3.ftile.vcompact.cond.ConditionalBuilder; import net.sourceforge.plantuml.klimt.color.HColor; import net.sourceforge.plantuml.skin.Pragma; +import net.sourceforge.plantuml.stereo.Stereotype; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.svek.ConditionEndStyle; @@ -65,14 +66,14 @@ public class FtileFactoryDelegatorIf extends FtileFactoryDelegator { @Override public Ftile createIf(Swimlane swimlane, List thens, Branch elseBranch, LinkRendering afterEndwhile, - LinkRendering topInlinkRendering, Url url, Collection notes) { + LinkRendering topInlinkRendering, Url url, Collection notes, Stereotype stereotype) { final ConditionStyle conditionStyle = skinParam().getConditionStyle(); final ConditionEndStyle conditionEndStyle = skinParam().getConditionEndStyle(); final Branch branch0 = thens.get(0); final Style styleArrow = getDefaultStyleDefinitionArrow().getMergedStyle(skinParam().getCurrentStyleBuilder()); - final Style styleDiamond = getDefaultStyleDefinitionDiamond() + final Style styleDiamond = getDefaultStyleDefinitionDiamond().withTOBECHANGED(stereotype) .getMergedStyle(skinParam().getCurrentStyleBuilder()); final HColor backColor = branch0.getColor() == null ? styleDiamond.value(PName.BackGroundColor).asColor(skinParam().getIHtmlColorSet()) diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileForkInner.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileForkInner.java index fd6a1a7cb..924829dd3 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileForkInner.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileForkInner.java @@ -81,9 +81,9 @@ class FtileForkInner extends AbstractFtile { public static Set mergeSwimlanes(List tiles) { final Set result = new HashSet<>(); - for (Ftile tile : tiles) { + for (Ftile tile : tiles) result.addAll(tile.getSwimlanes()); - } + return Collections.unmodifiableSet(result); } @@ -105,9 +105,9 @@ class FtileForkInner extends AbstractFtile { for (Ftile ftile : forks) { final XDimension2D dim = ftile.calculateDimension(stringBounder); width += dim.getWidth(); - if (dim.getHeight() > height) { + if (dim.getHeight() > height) height = dim.getHeight(); - } + } final XDimension2D dimTotal = new XDimension2D(width, height); return new FtileGeometry(dimTotal, dimTotal.getWidth() / 2, 0, dimTotal.getHeight()); @@ -116,9 +116,9 @@ class FtileForkInner extends AbstractFtile { public UTranslate getTranslateFor(Ftile searched, StringBounder stringBounder) { double xpos = 0; for (Ftile ftile : forks) { - if (ftile == searched) { + if (ftile == searched) return UTranslate.dx(xpos); - } + final XDimension2D dim = ftile.calculateDimension(stringBounder); xpos += dim.getWidth(); } diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/ParallelBuilderFork.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/ParallelBuilderFork.java index 053470efe..90ce41f44 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/ParallelBuilderFork.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/ParallelBuilderFork.java @@ -85,7 +85,7 @@ public class ParallelBuilderFork extends AbstractParallelFtilesBuilder { Ftile result = middle; final List conns = new ArrayList<>(); final Swimlane swimlaneBlack = in; - final Style style = getStyleSignature().getMergedStyle(skinParam().getCurrentStyleBuilder()); + final Style style = getStyleSignatureArrow().getMergedStyle(skinParam().getCurrentStyleBuilder()); final Ftile black = new FtileBlackBlock(skinParam(), swimlaneBlack); double x = 0; for (Ftile tmp : list99) { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/VCompactFactory.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/VCompactFactory.java index 267511711..e2ee4eaa6 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/VCompactFactory.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/VCompactFactory.java @@ -169,7 +169,7 @@ public class VCompactFactory implements FtileFactory { @Override public Ftile createIf(Swimlane swimlane, List thens, Branch elseBranch, LinkRendering afterEndwhile, - LinkRendering topInlinkRendering, Url url, Collection notes) { + LinkRendering topInlinkRendering, Url url, Collection notes, Stereotype stereotype) { final List ftiles = new ArrayList<>(); for (Branch branch : thens) ftiles.add(branch.getFtile()); diff --git a/src/net/sourceforge/plantuml/board/BoardDiagram.java b/src/net/sourceforge/plantuml/board/BoardDiagram.java index 266c7cb8f..f7fc67e1b 100644 --- a/src/net/sourceforge/plantuml/board/BoardDiagram.java +++ b/src/net/sourceforge/plantuml/board/BoardDiagram.java @@ -73,11 +73,11 @@ public class BoardDiagram extends UmlDiagram { protected ImageData exportDiagramInternal(OutputStream os, int index, FileFormatOption fileFormatOption) throws IOException { - return createImageBuilder(fileFormatOption).drawable(getTextBlock()).write(os); + return createImageBuilder(fileFormatOption).drawable(getTextMainBlock(fileFormatOption)).write(os); } @Override - protected TextBlock getTextBlock() { + protected TextBlock getTextMainBlock(FileFormatOption fileFormatOption) { return new AbstractTextBlock() { public void drawU(UGraphic ug) { diff --git a/src/net/sourceforge/plantuml/bpm/BpmDiagram.java b/src/net/sourceforge/plantuml/bpm/BpmDiagram.java index 2cbc3663e..c568879e4 100644 --- a/src/net/sourceforge/plantuml/bpm/BpmDiagram.java +++ b/src/net/sourceforge/plantuml/bpm/BpmDiagram.java @@ -194,7 +194,7 @@ public class BpmDiagram extends UmlDiagram { } @Override - protected TextBlock getTextBlock() { + protected TextBlock getTextMainBlock(FileFormatOption fileFormatOption) { throw new UnsupportedOperationException(); } } diff --git a/src/net/sourceforge/plantuml/chronology/ChronologyDiagram.java b/src/net/sourceforge/plantuml/chronology/ChronologyDiagram.java new file mode 100644 index 000000000..9731c3506 --- /dev/null +++ b/src/net/sourceforge/plantuml/chronology/ChronologyDiagram.java @@ -0,0 +1,853 @@ +/* ======================================================================== + * PlantUML : a free UML diagram generator + * ======================================================================== + * + * (C) Copyright 2009-2024, Arnaud Roques + * + * Project Info: https://plantuml.com + * + * If you like this project or if you find it useful, you can support us at: + * + * https://plantuml.com/patreon (only 1$ per month!) + * https://plantuml.com/paypal + * + * This file is part of PlantUML. + * + * PlantUML is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * PlantUML distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public + * License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. + * + * + * Original Author: Arnaud Roques + * + * + */ +package net.sourceforge.plantuml.chronology; + +import java.io.IOException; +import java.io.OutputStream; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.Locale; +import java.util.Map; +import java.util.Objects; + +import net.sourceforge.plantuml.FileFormatOption; +import net.sourceforge.plantuml.TitledDiagram; +import net.sourceforge.plantuml.WithSprite; +import net.sourceforge.plantuml.command.CommandExecutionResult; +import net.sourceforge.plantuml.core.DiagramDescription; +import net.sourceforge.plantuml.core.ImageData; +import net.sourceforge.plantuml.core.UmlSource; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColorSet; +import net.sourceforge.plantuml.klimt.drawing.UGraphic; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; +import net.sourceforge.plantuml.klimt.geom.XDimension2D; +import net.sourceforge.plantuml.klimt.shape.AbstractTextBlock; +import net.sourceforge.plantuml.klimt.shape.TextBlock; +import net.sourceforge.plantuml.project.GanttStyle; +import net.sourceforge.plantuml.project.LabelPosition; +import net.sourceforge.plantuml.project.LabelStrategy; +import net.sourceforge.plantuml.project.LoadPlanable; +import net.sourceforge.plantuml.project.TimeHeaderParameters; +import net.sourceforge.plantuml.project.ToTaskDraw; +import net.sourceforge.plantuml.project.core.PrintScale; +import net.sourceforge.plantuml.project.core.Task; +import net.sourceforge.plantuml.project.core.TaskCode; +import net.sourceforge.plantuml.project.core.TaskGroup; +import net.sourceforge.plantuml.project.draw.TaskDraw; +import net.sourceforge.plantuml.project.draw.TaskDrawDiamond; +import net.sourceforge.plantuml.project.draw.TimeHeader; +import net.sourceforge.plantuml.project.time.Day; +import net.sourceforge.plantuml.project.timescale.TimeScale; +import net.sourceforge.plantuml.real.Real; +import net.sourceforge.plantuml.real.RealOrigin; +import net.sourceforge.plantuml.real.RealUtils; +import net.sourceforge.plantuml.skin.UmlDiagramType; +import net.sourceforge.plantuml.style.SName; +import net.sourceforge.plantuml.style.Style; +import net.sourceforge.plantuml.style.StyleSignatureBasic; + +public class ChronologyDiagram extends TitledDiagram implements ToTaskDraw, WithSprite, GanttStyle { + + private final Map draws = new LinkedHashMap(); + private final Map tasks = new LinkedHashMap(); + private final Map byShortName = new HashMap(); +// private final List constraints = new ArrayList<>(); + private final HColorSet colorSet = HColorSet.instance(); +// +// private final OpenClose openClose = new OpenClose(); +// +// private final Map resources = new LinkedHashMap(); +// private final Map colorDaysToday = new HashMap(); +// private final Map colorDaysInternal = new HashMap(); +// private final Map colorDaysOfWeek = new HashMap(); +// private final Map nameDays = new HashMap(); + private LabelStrategy labelStrategy = new LabelStrategy(LabelPosition.LEGACY, HorizontalAlignment.LEFT); +// +// // Let's follow ISO-8601 rules +// private WeekNumberStrategy weekNumberStrategy = new WeekNumberStrategy(DayOfWeek.MONDAY, 4); +// +// private PrintScale printScale = PrintScale.DAILY; +// private double factorScale = 1.0; + private Locale locale = Locale.ENGLISH; +// +// private Day today; +// private double totalHeightWithoutFooter; + private Day min; + private Day max; + private TimeScaleChronology timeScale; +// +// private Day printStart; +// private Day printEnd; +// + private final RealOrigin origin = RealUtils.createOrigin(); +// +// private int defaultCompletion = 100; +// +// private Task it; +// private Resource they; + + public CommandExecutionResult changeLanguage(String lang) { + this.locale = new Locale(lang); + return CommandExecutionResult.ok(); + } + + public DiagramDescription getDescription() { + return new DiagramDescription("(Chronology)"); + } + +// public void setWeekNumberStrategy(DayOfWeek firstDayOfWeek, int minimalDaysInFirstWeek) { +// this.weekNumberStrategy = new WeekNumberStrategy(firstDayOfWeek, minimalDaysInFirstWeek); +// } + + public ChronologyDiagram(UmlSource source) { + super(source, UmlDiagramType.CHRONOLOGY, null); + } + +// public final int getDpi(FileFormatOption fileFormatOption) { +// return 96; +// } + + @Override + protected ImageData exportDiagramNow(OutputStream os, int index, FileFormatOption fileFormatOption) + throws IOException { + return createImageBuilder(fileFormatOption).drawable(getTextMainBlock(fileFormatOption)).write(os); + } + +// public void setPrintScale(PrintScale printScale) { +// this.printScale = printScale; +// } +// +// public void setFactorScale(double factorScale) { +// this.factorScale = factorScale; +// } +// +// private double getFactorScale() { +// return this.printScale.getDefaultScale() * this.factorScale; +// } +// +// private boolean isHidden(Task task) { +// if (printStart == null || task instanceof TaskSeparator) +// return false; +// +// if (task.getEnd().compareTo(min) < 0) +// return true; +// +// if (task.getStart().compareTo(max) > 0) +// return true; +// +// return false; +// } +// +// @Override +// public String checkFinalError() { +// try { +// initMinMax(); +// } catch (ImpossibleSolvingException ex) { +// return ex.getMessage(); +// } +// return null; +// } + + @Override + protected TextBlock getTextMainBlock(FileFormatOption fileFormatOption) { + final StringBounder stringBounder = fileFormatOption.getDefaultStringBounder(getSkinParam()); + initMinMax(); + + final TimeHeader timeHeader = new TimeHeaderChronology(stringBounder, thParam(), PrintScale.DAILY, + this.timeScale); + initTaskAndResourceDraws(timeHeader.getTimeScale(), timeHeader.getFullHeaderHeight(stringBounder), + stringBounder); + + return new AbstractTextBlock() { + public XDimension2D calculateDimension(StringBounder stringBounder) { + return new XDimension2D(1000, 1000); + } + + @Override + public void drawU(UGraphic ug) { + timeHeader.drawTimeHeader(ug, 200); + drawTasksRect(ug); + drawTasksTitle(ug, 0, 0); + } + }; + + } + +// +// private double getTitlesColumnWidth(StringBounder stringBounder) { +// if (labelStrategy.titleInside()) +// return 0; +// +// double width = 0; +// for (Task task : tasks.values()) { +// if (isHidden(task)) +// continue; +// +// width = Math.max(width, draws.get(task).getTitleWidth(stringBounder)); +// } +// return width; +// } +// +// public XDimension2D calculateDimension(StringBounder stringBounder) { +// return new XDimension2D(getTitlesColumnWidth(stringBounder) + getBarsColumnWidth(timeHeader), +// getTotalHeight(stringBounder, timeHeader)); +// } +// +// private double getBarsColumnWidth(final TimeHeader timeHeader) { +// final double xmin = timeHeader.getTimeScale().getStartingPosition(min); +// final double xmax = timeHeader.getTimeScale().getEndingPosition(max); +// return xmax - xmin; +// } +// +// }; +// } +// +// private TimeHeader getTimeHeader(StringBounder stringBounder) { +// if (openClose.getStartingDay() == null) +// return new TimeHeaderSimple(stringBounder, thParam(), printScale); +// else if (printScale == PrintScale.DAILY) +// return new TimeHeaderDaily(stringBounder, thParam(), nameDays, printStart, printEnd); +// else if (printScale == PrintScale.WEEKLY) +// return new TimeHeaderWeekly(stringBounder, thParam(), weekNumberStrategy, withCalendarDate); +// else if (printScale == PrintScale.MONTHLY) +// return new TimeHeaderMonthly(stringBounder, thParam()); +// else if (printScale == PrintScale.QUARTERLY) +// return new TimeHeaderQuarterly(stringBounder, thParam()); +// else if (printScale == PrintScale.YEARLY) +// return new TimeHeaderYearly(stringBounder, thParam()); +// else +// throw new IllegalStateException(); +// +// } + + private TimeHeaderParameters thParam() { + return new TimeHeaderParameters(null, 1, min, max, getIHtmlColorSet(), locale, null, null, null, this); + } + +// private Map colorDays() { +// colorDaysInternal.putAll(colorDaysToday); +// return Collections.unmodifiableMap(colorDaysInternal); +// } + + @Override + public final Style getStyle(SName param) { + return StyleSignatureBasic.of(SName.root, SName.element, SName.ganttDiagram, param) + .getMergedStyle(getCurrentStyleBuilder()); + } + + @Override + public final Style getStyle(SName param1, SName param2) { + return StyleSignatureBasic.of(SName.root, SName.element, SName.ganttDiagram, param1, param2) + .getMergedStyle(getCurrentStyleBuilder()); + } + +// private double getTotalHeight(StringBounder stringBounder, TimeHeader timeHeader) { +// if (showFootbox) +// return totalHeightWithoutFooter + timeHeader.getTimeFooterHeight(stringBounder); +// +// return totalHeightWithoutFooter; +// } + + private void drawTasksRect(UGraphic ug) { + for (Task task : tasks.values()) { +// if (isHidden(task)) +// continue; + + final TaskDraw draw = draws.get(task); + final UTranslate move = UTranslate.dy(draw.getY(ug.getStringBounder()).getCurrentValue()); + draw.drawU(ug.apply(move)); + } + } + +// private void drawConstraints(final UGraphic ug, TimeScale timeScale) { +// for (GanttConstraint constraint : constraints) { +// if (printStart != null && constraint.isHidden(min, max)) +// continue; +// +// constraint.getUDrawable(timeScale, this).drawU(ug); +// } +// +// } +// +// public StyleSignatureBasic getDefaultStyleDefinitionArrow() { +// return StyleSignatureBasic.of(SName.root, SName.element, SName.ganttDiagram, SName.arrow); +// } + + private void drawTasksTitle(UGraphic ug, double colTitles, double colBars) { + for (Task task : tasks.values()) { +// if (isHidden(task)) +// continue; + + final TaskDraw draw = draws.get(task); + final UTranslate move = UTranslate.dy(draw.getY(ug.getStringBounder()).getCurrentValue()); + draw.drawTitle(ug.apply(move), labelStrategy, colTitles, colBars); + } + } + +// private void drawResources(UGraphic ug) { +// for (Resource res : resources.values()) { +// final ResourceDraw draw = res.getResourceDraw(); +// final UTranslate move = UTranslate.dy(draw.getY()); +// draw.drawU(ug.apply(move)); +// } +// } +// +// public void closeDayOfWeek(DayOfWeek day, String task) { +// openClose.close(day); +// } +// +// public void openDayOfWeek(DayOfWeek day, String task) { +// if (task.length() == 0) +// openClose.open(day); +// else +// getOpenCloseForTask(task).open(day); +// } +// +// public void closeDayAsDate(Day day, String task) { +// if (task.length() == 0) +// openClose.close(day); +// else +// getOpenCloseForTask(task).close(day); +// +// } +// +// public void openDayAsDate(Day day, String task) { +// if (task.length() == 0) +// openClose.open(day); +// else +// getOpenCloseForTask(task).open(day); +// +// } +// +// private OpenClose getOpenCloseForTask(String task) { +// OpenClose except = openCloseForTask.get(task); +// if (except == null) { +// except = new OpenClose(); +// openCloseForTask.put(task, except); +// } +// return except; +// } +// +// private final Map openCloseForTask = new HashMap<>(); +// + private void initTaskAndResourceDraws(TimeScale timeScale, double headerHeight, StringBounder stringBounder) { + Real y = origin; + y = y.addFixed(headerHeight); + for (Task task : tasks.values()) { + final TaskDraw draw; + final String disp = task.getCode().getSimpleDisplay(); + draw = new TaskDrawDiamond(timeScale, y, disp, task.getStart(), task, this, task.getStyleBuilder()); + final double height = draw.getFullHeightTask(stringBounder); + y = y.addAtLeast(height); +// if (task instanceof TaskSeparator) { +// final TaskSeparator taskSeparator = (TaskSeparator) task; +// draw = new TaskDrawSeparator(taskSeparator.getName(), timeScale, y, min, max, task.getStyleBuilder(), +// getSkinParam().getIHtmlColorSet()); +// } else if (task instanceof TaskGroup) { +// final TaskGroup taskGroup = (TaskGroup) task; +// draw = new TaskDrawGroup(timeScale, y, taskGroup.getCode().getSimpleDisplay(), getStart(taskGroup), +// getEnd(taskGroup), task, this, task.getStyleBuilder()); +// } else { +// final TaskImpl tmp = (TaskImpl) task; +// final String disp = hideResourceName ? tmp.getCode().getSimpleDisplay() : tmp.getPrettyDisplay(); +// if (tmp.isDiamond()) { +// draw = new TaskDrawDiamond(timeScale, y, disp, getStart(tmp), task, this, task.getStyleBuilder()); +// } else { +// final boolean oddStart = printStart != null && min.compareTo(getStart(tmp)) == 0; +// final boolean oddEnd = printStart != null && max.compareTo(getEnd(tmp)) == 0; +// draw = new TaskDrawRegular(timeScale, y, disp, getStart(tmp), getEnd(tmp), oddStart, oddEnd, +// getSkinParam(), task, this, getConstraints(task), task.getStyleBuilder()); +// } +// draw.setColorsAndCompletion(tmp.getColors(), tmp.getCompletion(), tmp.getUrl(), tmp.getNote()); +// } +// if (task.getRow() == null) +// y = y.addAtLeast(draw.getFullHeightTask(stringBounder)); +// + draws.put(task, draw); + } +// origin.compileNow(); +// magicPush(stringBounder); +// double yy = lastY(stringBounder); +// if (yy == 0) { +// yy = headerHeight; +// } else if (this.hideResourceFoobox == false) +// for (Resource res : resources.values()) { +// final ResourceDraw draw = buildResourceDraw(this, res, timeScale, yy, min, max); +// res.setTaskDraw(draw); +// yy += draw.getHeight(stringBounder); +// } +// +// this.totalHeightWithoutFooter = yy; + } + +// +// private ResourceDraw buildResourceDraw(ChronologyDiagram gantt, Resource res, TimeScale timeScale, double y, Day min, +// Day max) { +// return new ResourceDrawBasic(gantt, res, timeScale, y, min, max); +// // return new ResourceDrawVersion2(gantt, res, timeScale, y, min, max); +// } +// +// private Collection getConstraints(Task task) { +// final List result = new ArrayList<>(); +// for (GanttConstraint constraint : constraints) { +// if (constraint.isOn(task)) +// result.add(constraint); +// +// } +// return Collections.unmodifiableCollection(result); +// } +// +// private double lastY(StringBounder stringBounder) { +// double result = 0; +// for (TaskDraw td : draws.values()) +// result = Math.max(result, td.getY(stringBounder).getCurrentValue() + td.getHeightMax(stringBounder)); +// +// return result; +// } +// +// private void magicPush(StringBounder stringBounder) { +// final List notes = new ArrayList<>(); +// for (TaskDraw td : draws.values()) { +// final FingerPrint taskPrint = td.getFingerPrint(stringBounder); +// final FingerPrint fingerPrintNote = td.getFingerPrintNote(stringBounder); +// +// if (td.getTrueRow() == null) +// for (TaskDraw note : notes) { +// final FingerPrint otherNote = note.getFingerPrintNote(stringBounder); +// final double deltaY = otherNote.overlap(taskPrint); +// if (deltaY > 0) { +// final Real bottom = note.getY(stringBounder).addAtLeast(note.getHeightMax(stringBounder)); +// td.getY(stringBounder).ensureBiggerThan(bottom); +// origin.compileNow(); +// } +// +// } +// +// if (fingerPrintNote != null) +// notes.add(td); +// +// } +// } +// +// private Day getStart(final Task tmp) { +// if (printStart == null) +// return tmp.getStart(); +// +// return Day.max(min, tmp.getStart()); +// } +// +// private Day getEnd(final Task tmp) { +// if (printStart == null) +// return tmp.getEnd(); +// +// return Day.min(max, tmp.getEnd()); +// } +// + private void initMinMax() { + if (tasks.size() == 0) { + throw new IllegalStateException(); + } + for (Task task : tasks.values()) { + if (this.min == null || this.max == null) { + this.min = task.getStart(); + this.max = task.getEnd(); + continue; + + } + if (this.min.compareTo(task.getStart()) > 0) + this.min = task.getStart(); + if (this.max.compareTo(task.getEnd()) < 0) + this.max = task.getEnd(); + } + + this.min = this.min.roundDayDown(); + this.max = this.max.roundDayUp(); + + this.timeScale = new TimeScaleChronology(1000); + this.timeScale.setMin(this.min.getMillis()); + this.timeScale.setMax(this.max.getMillis()); + } + +// public Day getThenDate() { +// Day result = getStartingDate(); +// for (Day d : colorDays().keySet()) +// if (d.compareTo(result) > 0) +// result = d; +// +// for (Day d : nameDays.keySet()) +// if (d.compareTo(result) > 0) +// result = d; +// +// return result; +// } +// +// public Task getExistingTask(String id) { +// final Task result = byShortName.get(Objects.requireNonNull(id)); +// if (result != null) +// return result; +// +// final TaskCode code = new TaskCode(id); +// return tasks.get(code); +// } +// +// public GanttConstraint forceTaskOrder(Task task1, Task task2) { +// final TaskInstant end1 = new TaskInstant(task1, TaskAttribute.END); +// task2.setStart(end1.getInstantPrecise()); +// final GanttConstraint result = new GanttConstraint(this.getIHtmlColorSet(), +// getSkinParam().getCurrentStyleBuilder(), end1, new TaskInstant(task2, TaskAttribute.START)); +// addContraint(result); +// return result; +// } + + public Task getOrCreateTask(String codeOrShortName, String shortName, boolean linkedToPrevious) { + Objects.requireNonNull(codeOrShortName); + Task result = shortName == null ? null : byShortName.get(shortName); + if (result != null) + return result; + + result = byShortName.get(codeOrShortName); + if (result != null) + return result; + + final TaskCode code = new TaskCode(codeOrShortName); + result = tasks.get(code); + if (result == null) { + + result = new TaskChronology(getSkinParam().getCurrentStyleBuilder(), code); + if (currentGroup != null) + currentGroup.addTask(result); + + tasks.put(code, result); + if (byShortName != null) + byShortName.put(shortName, result); + + } + return result; + } + +// private Task getLastCreatedTask() { +// final List all = new ArrayList<>(tasks.values()); +// for (int i = all.size() - 1; i >= 0; i--) +// if (all.get(i) instanceof TaskImpl) +// return all.get(i); +// +// return null; +// } +// +// public void addSeparator(String comment) { +// TaskSeparator separator = new TaskSeparator(getSkinParam().getCurrentStyleBuilder(), comment, tasks.size()); +// tasks.put(separator.getCode(), separator); +// } +// + private TaskGroup currentGroup = null; +// +// public CommandExecutionResult addGroup(String name) { +// TaskGroup group = new TaskGroup(this.currentGroup, getSkinParam().getCurrentStyleBuilder(), name); +// +// if (this.currentGroup != null) +// this.currentGroup.addTask(group); +// +// this.currentGroup = group; +// tasks.put(group.getCode(), group); +// return CommandExecutionResult.ok(); +// } +// +// public CommandExecutionResult endGroup() { +// if (this.currentGroup == null) +// return CommandExecutionResult.error("No group to be closed"); +// +// this.currentGroup = this.currentGroup.getParent(); +// +// return CommandExecutionResult.ok(); +// } +// +// public void addContraint(GanttConstraint constraint) { +// constraints.add(constraint); +// } +// +// public HColorSet getIHtmlColorSet() { +// return colorSet; +// } +// +// public void setProjectStartingDate(Day start) { +// openClose.setStartingDay(start); +// this.min = start; +// } +// +// public Day getStartingDate() { +// if (openClose.getStartingDay() == null) +// return min; +// +// return openClose.getStartingDay(); +// } +// +// public Day getEndingDate() { +// initMinMax(); +// return max; +// } +// +// public int daysInWeek() { +// return openClose.daysInWeek(); +// } +// +// public boolean isOpen(Day day) { +// return openClose.getLoadAt(day) > 0; +// } +// +// public boolean affectResource(Task result, String description) { +// final Pattern p = Pattern.compile("([^:]+)(:(\\d+))?"); +// final Matcher m = p.matcher(description); +// if (m.find() == false) +// throw new IllegalArgumentException(); +// +// final Resource resource = getResource(m.group(1)); +// int percentage = 100; +// if (m.group(3) != null) +// percentage = Integer.parseInt(m.group(3)); +// +// if (percentage == 0) +// return false; +// +// result.addResource(resource, percentage); +// return true; +// } +// +// public Resource getResource(String resourceName) { +// Resource resource = resources.get(resourceName); +// if (resource == null) +// resource = new Resource(resourceName); +// +// resources.put(resourceName, resource); +// return resource; +// } +// +// public int getLoadForResource(Resource res, Day i) { +// int result = 0; +// for (Task task : tasks.values()) { +// if (task instanceof TaskSeparator) +// continue; +// +// final TaskImpl task2 = (TaskImpl) task; +// result += task2.loadForResource(res, i); +// } +// return result; +// } +// +// public Moment getExistingMoment(String id) { +// Moment result = getExistingTask(id); +// if (result == null) { +// Day start = null; +// Day end = null; +// for (Map.Entry ent : nameDays.entrySet()) { +// if (ent.getValue().equalsIgnoreCase(id) == false) +// continue; +// +// start = min(start, ent.getKey()); +// end = max(end, ent.getKey()); +// } +// if (start != null) +// result = new MomentImpl(start, end); +// +// } +// return result; +// } +// +// private Day min(Day d1, Day d2) { +// if (d1 == null) +// return d2; +// +// if (d1.compareTo(d2) > 0) +// return d2; +// +// return d1; +// } +// +// private Day max(Day d1, Day d2) { +// if (d1 == null) +// return d2; +// +// if (d1.compareTo(d2) < 0) +// return d2; +// +// return d1; +// } +// +// public void colorDay(Day day, HColor color) { +// colorDaysInternal.put(day, color); +// } +// +// public void colorDay(DayOfWeek day, HColor color) { +// colorDaysOfWeek.put(day, color); +// } +// +// public void nameDay(Day day, String name) { +// nameDays.put(day, name); +// } +// +// public Day getToday() { +// if (today == null) +// this.today = Day.today(); +// +// return today; +// } +// +// public void setTodayColors(CenterBorderColor colors) { +// if (today == null) +// this.today = Day.today(); +// +// colorDaysToday.put(today, colors.getCenter()); +// } +// +// public CommandExecutionResult setToday(Day date) { +// this.today = date; +// return CommandExecutionResult.ok(); +// } +// +// public CommandExecutionResult deleteTask(Task task) { +// task.setColors(new CenterBorderColor(HColors.WHITE, HColors.BLACK)); +// return CommandExecutionResult.ok(); +// } +// +// public void setPrintInterval(Day start, Day end) { +// this.printStart = start; +// this.printEnd = end; +// } +// +// public TaskDraw getTaskDraw(Task task) { +// return draws.get(task); +// } +// +// public CommandExecutionResult addNote(Display note) { +// Task last = null; +// for (Task current : tasks.values()) +// last = current; +// if (last == null) +// return CommandExecutionResult.error("No task defined"); +// +// last.setNote(note); +// return CommandExecutionResult.ok(); +// } + + public LoadPlanable getDefaultPlan() { + throw new UnsupportedOperationException(); + } + + @Override + public TaskDraw getTaskDraw(Task task) { + // TODO Auto-generated method stub + return null; + } + + @Override + public HColorSet getIHtmlColorSet() { + return colorSet; + } + +// private boolean showFootbox = true; +// +// public void setShowFootbox(boolean footbox) { +// this.showFootbox = footbox; +// +// } +// +// @Override +// public ClockwiseTopRightBottomLeft getDefaultMargins() { +// return ClockwiseTopRightBottomLeft.none(); +// } +// +// public void setLabelStrategy(LabelStrategy strategy) { +// this.labelStrategy = strategy; +// } +// +// private boolean withCalendarDate; +// +// public void setWithCalendarDate(boolean withCalendarDate) { +// this.withCalendarDate = withCalendarDate; +// } +// +// private boolean hideResourceName; +// private boolean hideResourceFoobox; +// +// public CommandExecutionResult hideResourceName() { +// this.hideResourceName = true; +// return CommandExecutionResult.ok(); +// } +// +// public CommandExecutionResult hideResourceFootbox() { +// this.hideResourceFoobox = true; +// return CommandExecutionResult.ok(); +// } +// +// private final Set verticalSeparatorBefore = new HashSet<>(); +// +// public void addVerticalSeparatorBefore(Day day) { +// verticalSeparatorBefore.add(day); +// } +// +// public void setTaskDefaultCompletion(int defaultCompletion) { +// this.defaultCompletion = defaultCompletion; +// } +// +// public List getAllTasksForResource(Resource res) { +// final List result = new ArrayList(); +// for (Task task : tasks.values()) +// if (task.isAssignedTo(res)) { +// final TaskDrawRegular draw = (TaskDrawRegular) draws.get(task); +// result.add(draw); +// } +// +// return Collections.unmodifiableList(result); +// } +// +// public void setIt(Task result) { +// this.it = result; +// } +// +// public Task getIt() { +// return it; +// } +// +// public final Resource getThey() { +// return they; +// } +// +// public final void setThey(Resource they) { +// this.they = they; +// } + +} diff --git a/src/net/sourceforge/plantuml/chronology/ChronologyDiagramFactory.java b/src/net/sourceforge/plantuml/chronology/ChronologyDiagramFactory.java new file mode 100644 index 000000000..063b908f9 --- /dev/null +++ b/src/net/sourceforge/plantuml/chronology/ChronologyDiagramFactory.java @@ -0,0 +1,126 @@ +/* ======================================================================== + * PlantUML : a free UML diagram generator + * ======================================================================== + * + * (C) Copyright 2009-2024, Arnaud Roques + * + * Project Info: https://plantuml.com + * + * If you like this project or if you find it useful, you can support us at: + * + * https://plantuml.com/patreon (only 1$ per month!) + * https://plantuml.com/paypal + * + * This file is part of PlantUML. + * + * PlantUML is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * PlantUML distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public + * License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. + * + * + * Original Author: Arnaud Roques + * + * + */ +package net.sourceforge.plantuml.chronology; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +import net.sourceforge.plantuml.command.Command; +import net.sourceforge.plantuml.command.CommonCommands; +import net.sourceforge.plantuml.command.PSystemCommandFactory; +import net.sourceforge.plantuml.core.DiagramType; +import net.sourceforge.plantuml.core.UmlSource; +import net.sourceforge.plantuml.project.command.NaturalCommand; +import net.sourceforge.plantuml.project.lang.SentenceAnd; +import net.sourceforge.plantuml.project.lang.SentenceAndAnd; +import net.sourceforge.plantuml.project.lang.SentenceSimple; +import net.sourceforge.plantuml.project.lang.Subject; + +public class ChronologyDiagramFactory extends PSystemCommandFactory { + + static private final List> subjects() { + return Arrays.asList(SubjectTask.ME); + } + + public ChronologyDiagramFactory() { + super(DiagramType.CHRONOLOGY); + } + + @Override + protected void initCommandsList(List cmds) { + CommonCommands.addTitleCommands(cmds); + CommonCommands.addCommonCommands2(cmds); + +// cmds.add(CommandStyleMultilinesCSS.ME); +// cmds.add(CommandStyleImport.ME); +// +// cmds.add(CommandNope.ME); + + addLanguageCommands(cmds); + +// cmds.add(new CommandGanttArrow()); +// cmds.add(new CommandGanttArrow2()); +// cmds.add(new CommandColorTask()); +// cmds.add(new CommandSeparator()); +// cmds.add(new CommandWeekNumberStrategy()); +// cmds.add(new CommandGroupStart()); +// cmds.add(new CommandGroupEnd()); +// +// cmds.add(new CommandLanguage()); +// cmds.add(new CommandPrintScale()); +// cmds.add(new CommandPrintBetween()); +// cmds.add(new CommandNoteBottom()); +// cmds.add(new CommandFootbox()); +// cmds.add(new CommandLabelOnColumn()); +// cmds.add(new CommandHideResourceName()); +// cmds.add(new CommandHideResourceFootbox()); +// cmds.add(new CommandTaskCompleteDefault()); + } + + private void addLanguageCommands(List cmd) { + for (Subject subject : subjects()) + for (SentenceSimple sentenceA : subject.getSentences()) { + cmd.add(NaturalCommand.create(sentenceA)); + for (SentenceSimple sentenceB : subject.getSentences()) { + final String signatureA = sentenceA.getSignature(); + final String signatureB = sentenceB.getSignature(); + if (signatureA.equals(signatureB) == false) + cmd.add(NaturalCommand.create(new SentenceAnd(sentenceA, sentenceB))); + + } + } + + for (Subject subject : subjects()) + for (SentenceSimple sentenceA : subject.getSentences()) + for (SentenceSimple sentenceB : subject.getSentences()) + for (SentenceSimple sentenceC : subject.getSentences()) { + final String signatureA = sentenceA.getSignature(); + final String signatureB = sentenceB.getSignature(); + final String signatureC = sentenceC.getSignature(); + if (signatureA.equals(signatureB) == false && signatureA.equals(signatureC) == false + && signatureC.equals(signatureB) == false) + cmd.add(NaturalCommand + .create(new SentenceAndAnd(sentenceA, sentenceB, sentenceC))); + } + } + + @Override + public ChronologyDiagram createEmptyDiagram(UmlSource source, Map skinParam) { + return new ChronologyDiagram(source); + } + +} diff --git a/src/net/sourceforge/plantuml/chronology/ComplementAnything.java b/src/net/sourceforge/plantuml/chronology/ComplementAnything.java new file mode 100644 index 000000000..436232f47 --- /dev/null +++ b/src/net/sourceforge/plantuml/chronology/ComplementAnything.java @@ -0,0 +1,54 @@ +/* ======================================================================== + * PlantUML : a free UML diagram generator + * ======================================================================== + * + * (C) Copyright 2009-2024, Arnaud Roques + * + * Project Info: https://plantuml.com + * + * If you like this project or if you find it useful, you can support us at: + * + * https://plantuml.com/patreon (only 1$ per month!) + * https://plantuml.com/paypal + * + * This file is part of PlantUML. + * + * PlantUML is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * PlantUML distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public + * License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. + * + * + * Original Author: Arnaud Roques + * + * + */ +package net.sourceforge.plantuml.chronology; + +import net.sourceforge.plantuml.project.Failable; +import net.sourceforge.plantuml.project.lang.Something; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexResult; + +public class ComplementAnything implements Something { + + public IRegex toRegex(String suffix) { + return new RegexLeaf("ANYTHING" + suffix, "(.*?)"); + } + + public Failable getMe(ChronologyDiagram system, RegexResult arg, String suffix) { + final String value = arg.get("ANYTHING" + suffix, 0); + return Failable.ok(value); + } +} diff --git a/src/net/sourceforge/plantuml/chronology/ComplementHour.java b/src/net/sourceforge/plantuml/chronology/ComplementHour.java new file mode 100644 index 000000000..d45338571 --- /dev/null +++ b/src/net/sourceforge/plantuml/chronology/ComplementHour.java @@ -0,0 +1,84 @@ +/* ======================================================================== + * PlantUML : a free UML diagram generator + * ======================================================================== + * + * (C) Copyright 2009-2024, Arnaud Roques + * + * Project Info: https://plantuml.com + * + * If you like this project or if you find it useful, you can support us at: + * + * https://plantuml.com/patreon (only 1$ per month!) + * https://plantuml.com/paypal + * + * This file is part of PlantUML. + * + * PlantUML is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * PlantUML distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public + * License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. + * + * + * Original Author: Arnaud Roques + * + * + */ +package net.sourceforge.plantuml.chronology; + +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.TimeZone; + +import net.sourceforge.plantuml.project.Failable; +import net.sourceforge.plantuml.project.lang.Something; +import net.sourceforge.plantuml.project.time.Day; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; +import net.sourceforge.plantuml.regex.RegexResult; + +public class ComplementHour implements Something { + + // [Task1] starts at 2023-11-28 15:41:21, ends at 2023-11-28 19:40:00 + + static private final SimpleDateFormat inputFormat; + static private final SimpleDateFormat inputFormat2 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS"); + + static { + inputFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + inputFormat.setTimeZone(TimeZone.getTimeZone("GMT")); + + } + + public IRegex toRegex(String suffix) { + return new RegexConcat( // + new RegexLeaf("TIME", "(\\d+-\\d+-\\d+ \\d+:\\d+:\\d+)"), // + new RegexOptional(new RegexLeaf("MS", "\\.(\\d+)")) // + ); // + } + + public Failable getMe(ChronologyDiagram system, RegexResult arg, String suffix) { + final String value = arg.get("TIME", 0); + System.err.println("value=" + value); + try { + final Date date = inputFormat.parse(value); + return Failable.ok(Day.create(date.getTime())); + } catch (ParseException e) { + e.printStackTrace(); + } + throw new IllegalStateException(); + } + +} diff --git a/src/net/sourceforge/plantuml/chronology/HourPattern.java b/src/net/sourceforge/plantuml/chronology/HourPattern.java new file mode 100644 index 000000000..f34c49290 --- /dev/null +++ b/src/net/sourceforge/plantuml/chronology/HourPattern.java @@ -0,0 +1,136 @@ +/* ======================================================================== + * PlantUML : a free UML diagram generator + * ======================================================================== + * + * (C) Copyright 2009-2024, Arnaud Roques + * + * Project Info: https://plantuml.com + * + * If you like this project or if you find it useful, you can support us at: + * + * https://plantuml.com/patreon (only 1$ per month!) + * https://plantuml.com/paypal + * + * This file is part of PlantUML. + * + * PlantUML is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * PlantUML distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public + * License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. + * + * + * Original Author: Arnaud Roques + * + * + */ +package net.sourceforge.plantuml.chronology; + +import net.sourceforge.plantuml.project.time.Day; +import net.sourceforge.plantuml.project.time.Month; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOr; +import net.sourceforge.plantuml.regex.RegexResult; + +public class HourPattern { + + private final String id; + private final String yearKeyA; + private final String yearKeyB; + private final String yearKeyC; + private final String monthKeyA; + private final String monthKeyB; + private final String monthKeyC; + private final String dayKeyA; + private final String dayKeyB; + private final String dayKeyC; + + public HourPattern(String id) { + this.id = id; + this.yearKeyA = "AYEAR" + id; + this.yearKeyB = "BYEAR" + id; + this.yearKeyC = "CYEAR" + id; + this.monthKeyA = "AMONTH" + id; + this.monthKeyB = "BMONTH" + id; + this.monthKeyC = "CMONTH" + id; + this.dayKeyA = "ADAY" + id; + this.dayKeyB = "BDAY" + id; + this.dayKeyC = "CDAY" + id; + } + + public IRegex toRegex() { + return new RegexOr(toRegexA_DD_MONTH_YYYY(), toRegexB_YYYY_MM_DD(), toRegexC_MONTH_DD_YYYY()); + } + + public Day getDay(RegexResult arg) { + if (arg.get(dayKeyA, 0) != null) + return resultA(arg); + + if (arg.get(dayKeyB, 0) != null) + return resultB(arg); + + if (arg.get(dayKeyC, 0) != null) + return resultC(arg); + return null; + } + + private IRegex toRegexA_DD_MONTH_YYYY() { + return new RegexConcat( // + new RegexLeaf(dayKeyA, "([\\d]{1,2})"), // + new RegexLeaf("[\\w, ]*?"), // + new RegexLeaf(monthKeyA, "(" + Month.getRegexString() + ")"), // + new RegexLeaf("[\\w, ]*?"), // + new RegexLeaf(yearKeyA, "([\\d]{1,4})")); + } + + private Day resultA(RegexResult arg) { + final int day = Integer.parseInt(arg.get(dayKeyA, 0)); + final String month = arg.get(monthKeyA, 0); + final int year = Integer.parseInt(arg.get(yearKeyA, 0)); + return Day.create(year, month, day); + } + + private IRegex toRegexB_YYYY_MM_DD() { + return new RegexConcat( // + new RegexLeaf(yearKeyB, "([\\d]{1,4})"), // + new RegexLeaf("\\D"), // + new RegexLeaf(monthKeyB, "([\\d]{1,2})"), // + new RegexLeaf("\\D"), // + new RegexLeaf(dayKeyB, "([\\d]{1,2})")); + } + + private Day resultB(RegexResult arg) { + final int day = Integer.parseInt(arg.get(dayKeyB, 0)); + final int month = Integer.parseInt(arg.get(monthKeyB, 0)); + final int year = Integer.parseInt(arg.get(yearKeyB, 0)); + return Day.create(year, month, day); + } + + private IRegex toRegexC_MONTH_DD_YYYY() { + return new RegexConcat( // + new RegexLeaf(monthKeyC, "(" + Month.getRegexString() + ")"), // + new RegexLeaf("[\\w, ]*?"), // + new RegexLeaf(dayKeyC, "([\\d]{1,2})"), // + new RegexLeaf("[\\w, ]*?"), // + new RegexLeaf(yearKeyC, "([\\d]{1,4})")); + } + + private Day resultC(RegexResult arg) { + final int day = Integer.parseInt(arg.get(dayKeyC, 0)); + final String month = arg.get(monthKeyC, 0); + final int year = Integer.parseInt(arg.get(yearKeyC, 0)); + return Day.create(year, month, day); + } + +} diff --git a/src/net/sourceforge/plantuml/chronology/SentenceHappensChronology.java b/src/net/sourceforge/plantuml/chronology/SentenceHappensChronology.java new file mode 100644 index 000000000..2cfb488db --- /dev/null +++ b/src/net/sourceforge/plantuml/chronology/SentenceHappensChronology.java @@ -0,0 +1,60 @@ +/* ======================================================================== + * PlantUML : a free UML diagram generator + * ======================================================================== + * + * (C) Copyright 2009-2024, Arnaud Roques + * + * Project Info: https://plantuml.com + * + * If you like this project or if you find it useful, you can support us at: + * + * https://plantuml.com/patreon (only 1$ per month!) + * https://plantuml.com/paypal + * + * This file is part of PlantUML. + * + * PlantUML is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * PlantUML distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public + * License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. + * + * + * Original Author: Arnaud Roques + * + * + */ +package net.sourceforge.plantuml.chronology; + +import net.sourceforge.plantuml.command.CommandExecutionResult; +import net.sourceforge.plantuml.project.core.Task; +import net.sourceforge.plantuml.project.lang.SentenceSimple; +import net.sourceforge.plantuml.project.lang.Verbs; +import net.sourceforge.plantuml.project.lang.Words; +import net.sourceforge.plantuml.project.time.Day; + +public class SentenceHappensChronology extends SentenceSimple { + + public SentenceHappensChronology() { + super(SubjectTask.ME, Verbs.happens, Words.zeroOrMore(Words.THE, Words.ON, Words.AT), new ComplementHour()); + } + + @Override + public CommandExecutionResult execute(ChronologyDiagram project, Object subject, Object complement) { + final Task task = (Task) subject; + final Day start = (Day) complement; + task.setStart(start); + task.setEnd(start); + return CommandExecutionResult.ok(); + } + +} diff --git a/src/net/sourceforge/plantuml/chronology/SubjectTask.java b/src/net/sourceforge/plantuml/chronology/SubjectTask.java new file mode 100644 index 000000000..cd5eeb396 --- /dev/null +++ b/src/net/sourceforge/plantuml/chronology/SubjectTask.java @@ -0,0 +1,92 @@ +/* ======================================================================== + * PlantUML : a free UML diagram generator + * ======================================================================== + * + * (C) Copyright 2009-2024, Arnaud Roques + * + * Project Info: https://plantuml.com + * + * If you like this project or if you find it useful, you can support us at: + * + * https://plantuml.com/patreon (only 1$ per month!) + * https://plantuml.com/paypal + * + * This file is part of PlantUML. + * + * PlantUML is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * PlantUML distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public + * License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. + * + * + * Original Author: Arnaud Roques + * + * + */ +package net.sourceforge.plantuml.chronology; + +import java.util.Arrays; +import java.util.Collection; + +import net.sourceforge.plantuml.project.Failable; +import net.sourceforge.plantuml.project.core.Task; +import net.sourceforge.plantuml.project.lang.SentenceSimple; +import net.sourceforge.plantuml.project.lang.Subject; +import net.sourceforge.plantuml.project.lang.Words; +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; +import net.sourceforge.plantuml.regex.RegexOr; +import net.sourceforge.plantuml.regex.RegexResult; +import net.sourceforge.plantuml.stereo.Stereotype; +import net.sourceforge.plantuml.stereo.StereotypePattern; + +public class SubjectTask implements Subject { + + public static final Subject ME = new SubjectTask(); + + private SubjectTask() { + } + + public Failable getMe(ChronologyDiagram chronology, RegexResult arg) { + final Task result; + + final String subject = arg.get("SUBJECT", 0); + final String shortName = arg.get("SHORTNAME", 0); + final String stereotype = arg.get("STEREOTYPE", 0); + + result = chronology.getOrCreateTask(subject, shortName, false); + + if (stereotype != null) + result.setStereotype(Stereotype.build(arg.get("STEREOTYPE", 0))); + + return Failable.ok(result); + } + + public Collection> getSentences() { + return Arrays.asList(new SentenceHappensChronology()); + } + + public IRegex toRegex() { + return new RegexOr( // + new RegexLeaf("SUBJECT", "\\[([^\\[\\]]+?)\\]"), // + StereotypePattern.optional("STEREOTYPE"), // + new RegexOptional(new RegexConcat(// + Words.exactly(Words.AS), // + RegexLeaf.spaceOneOrMore(), // + new RegexLeaf("SHORTNAME", "\\[([^\\[\\]]+?)\\]"))) // + ); + } + +} diff --git a/src/net/sourceforge/plantuml/chronology/TaskChronology.java b/src/net/sourceforge/plantuml/chronology/TaskChronology.java new file mode 100644 index 000000000..20d877c1e --- /dev/null +++ b/src/net/sourceforge/plantuml/chronology/TaskChronology.java @@ -0,0 +1,372 @@ +/* ======================================================================== + * PlantUML : a free UML diagram generator + * ======================================================================== + * + * (C) Copyright 2009-2024, Arnaud Roques + * + * Project Info: https://plantuml.com + * + * If you like this project or if you find it useful, you can support us at: + * + * https://plantuml.com/patreon (only 1$ per month!) + * https://plantuml.com/paypal + * + * This file is part of PlantUML. + * + * PlantUML is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * PlantUML distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public + * License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. + * + * + * Original Author: Arnaud Roques + * + * + */ +package net.sourceforge.plantuml.chronology; + +import net.sourceforge.plantuml.klimt.creole.Display; +import net.sourceforge.plantuml.project.Load; +import net.sourceforge.plantuml.project.core.AbstractTask; +import net.sourceforge.plantuml.project.core.Resource; +import net.sourceforge.plantuml.project.core.Task; +import net.sourceforge.plantuml.project.core.TaskCode; +import net.sourceforge.plantuml.project.lang.CenterBorderColor; +import net.sourceforge.plantuml.project.time.Day; +import net.sourceforge.plantuml.project.time.DayOfWeek; +import net.sourceforge.plantuml.style.StyleBuilder; +import net.sourceforge.plantuml.url.Url; + +public class TaskChronology extends AbstractTask implements Task { + + private Display note; + + private Url url; + private CenterBorderColor[] colors; + + private Day start; + private Day end; + + public void setUrl(Url url) { + this.url = url; + } + + public TaskChronology(StyleBuilder styleBuilder, TaskCode code) { + super(styleBuilder, code); + } + + @Override + public void setStart(Day start) { + this.start = start; + + } + + @Override + public Day getStart() { + return this.start; + } + + @Override + public void setEnd(Day end) { + this.end = end; + } + + @Override + public Day getEnd() { + return this.end; + } + + @Override + public Load getLoad() { + throw new UnsupportedOperationException(); + } + + @Override + public void setLoad(Load load) { + throw new UnsupportedOperationException(); + } + + @Override + public void addResource(Resource resource, int percentage) { + throw new UnsupportedOperationException(); + } + + @Override + public void setDiamond(boolean diamond) { + throw new UnsupportedOperationException(); + } + + @Override + public boolean isDiamond() { + return false; + } + + @Override + public void setCompletion(int completion) { + throw new UnsupportedOperationException(); + } + + @Override + public void addPause(Day pause) { + throw new UnsupportedOperationException(); + } + + @Override + public void addPause(DayOfWeek pause) { + throw new UnsupportedOperationException(); + } + + @Override + public boolean isAssignedTo(Resource res) { + throw new UnsupportedOperationException(); + } + +// @Override +// public int getLoadAt(Day instant) { +// if (isPaused(instant)) +// return 0; +// +// LoadPlanable result = defaultPlan; +// if (resources.size() > 0) +// result = PlanUtils.multiply(defaultPlan, getResourcePlan()); +// +// return result.getLoadAt(instant); +// } +// +// private boolean isPaused(Day instant) { +// if (pausedDay.contains(instant)) +// return true; +// +// if (pausedDayOfWeek(instant)) +// return true; +// +// return false; +// } +// +// private boolean pausedDayOfWeek(Day instant) { +// for (DayOfWeek dayOfWeek : pausedDayOfWeek) +// if (instant.getDayOfWeek() == dayOfWeek) +// return true; +// +// return false; +// } +// +// public int loadForResource(Resource res, Day instant) { +// if (resources.keySet().contains(res) && instant.compareTo(getStart()) >= 0 +// && instant.compareTo(getEnd()) <= 0) { +// if (isPaused(instant)) +// return 0; +// +// if (res.isClosedAt(instant)) +// return 0; +// +// return resources.get(res); +// } +// return 0; +// } +// +// @Override +// public void addPause(Day pause) { +// this.pausedDay.add(pause); +// } +// +// @Override +// public void addPause(DayOfWeek pause) { +// this.pausedDayOfWeek.add(pause); +// } +// +// private LoadPlanable getResourcePlan() { +// if (resources.size() == 0) +// throw new IllegalStateException(); +// +// return new LoadPlanable() { +// public int getLoadAt(Day instant) { +// int result = 0; +// for (Map.Entry ent : resources.entrySet()) { +// final Resource res = ent.getKey(); +// if (res.isClosedAt(instant)) +// continue; +// +// final int percentage = ent.getValue(); +// result += percentage; +// } +// return result; +// } +// +// @Override +// public Day getLastDayIfAny() { +// return TaskChronology.this.getLastDayIfAny(); +// } +// }; +// } +// +// @Override +// public Day getLastDayIfAny() { +// Day result = null; +// +// for (Resource res : resources.keySet()) { +// if (res.getLastDayIfAny() == null) +// return null; +// +// if (result == null || result.compareTo(res.getLastDayIfAny()) < 0) +// result = res.getLastDayIfAny(); +// } +// +// return result; +// } +// +// public String getPrettyDisplay() { +// if (resources.size() > 0) { +// final StringBuilder result = new StringBuilder(getCode().getSimpleDisplay()); +// result.append(" "); +// for (Iterator> it = resources.entrySet().iterator(); it.hasNext();) { +// final Map.Entry ent = it.next(); +// result.append("{"); +// result.append(ent.getKey().getName()); +// final int percentage = ent.getValue(); +// if (percentage != 100) +// result.append(":" + percentage + "%"); +// +// result.append("}"); +// if (it.hasNext()) +// result.append(" "); +// +// } +// return result.toString(); +// } +// return getCode().getSimpleDisplay(); +// } +// +// @Override +// public String toString() { +// return getCode().toString(); +// } +// +// public String debug() { +// return "" + getStart() + " ---> " + getEnd() + " [" + getLoad() + "]"; +// } +// +// @Override +// public Day getStart() { +// Day result = (Day) solver.getData(TaskAttribute.START); +// if (diamond == false) +// while (getLoadAt(result) == 0) +// result = result.increment(); +// +// return result; +// } +// +// @Override +// public Day getEnd() { +// return (Day) solver.getData(TaskAttribute.END); +// } +// +// @Override +// public Load getLoad() { +// return (Load) solver.getData(TaskAttribute.LOAD); +// } +// +// @Override +// public void setLoad(Load load) { +// solver.setData(TaskAttribute.LOAD, load); +// } +// +// @Override +// public void setStart(Day start) { +// solver.setData(TaskAttribute.START, start); +// } +// +// @Override +// public void setEnd(Day end) { +// solver.setData(TaskAttribute.END, end); +// } + + @Override + public void setColors(CenterBorderColor... colors) { + this.colors = colors; + } + +// @Override +// public void addResource(Resource resource, int percentage) { +// this.resources.put(resource, percentage); +// } +// +// @Override +// public void setDiamond(boolean diamond) { +// this.diamond = diamond; +// } +// +// @Override +// public boolean isDiamond() { +// return this.diamond; +// } +// +// @Override +// public void setCompletion(int completion) { +// this.completion = completion; +// } +// +// public final Url getUrl() { +// return url; +// } +// +// public final CenterBorderColor getColors() { +// if (colors == null) +// return null; +// +// if (colors.length == 1) +// return colors[0]; +// +// return colors[0].unlinearTo(colors[1], completion); +// } +// +// public final int getCompletion() { +// return completion; +// } +// +// public final Collection getAllPaused() { +// final SortedSet result = new TreeSet<>(pausedDay); +// for (DayOfWeek dayOfWeek : pausedDayOfWeek) +// addAll(result, dayOfWeek); +// +// return Collections.unmodifiableCollection(result); +// } +// +// private void addAll(SortedSet result, DayOfWeek dayOfWeek) { +// final Day start = getStart(); +// final Day end = getEnd(); +// for (Day current = start; current.compareTo(end) <= 0; current = current.increment()) +// if (current.getDayOfWeek() == dayOfWeek) +// result.add(current); +// +// } + + @Override + public void setNote(Display note) { + this.note = note; + } + + public Display getNote() { + return note; + } + +// public LoadPlanable getDefaultPlan() { +// return defaultPlan; +// } +// +// @Override +// public boolean isAssignedTo(Resource res) { +// return resources.containsKey(res); +// } + +} diff --git a/src/net/sourceforge/plantuml/chronology/TimeHeaderChronology.java b/src/net/sourceforge/plantuml/chronology/TimeHeaderChronology.java new file mode 100644 index 000000000..fca77fb27 --- /dev/null +++ b/src/net/sourceforge/plantuml/chronology/TimeHeaderChronology.java @@ -0,0 +1,197 @@ +/* ======================================================================== + * PlantUML : a free UML diagram generator + * ======================================================================== + * + * (C) Copyright 2009-2024, Arnaud Roques + * + * Project Info: https://plantuml.com + * + * If you like this project or if you find it useful, you can support us at: + * + * https://plantuml.com/patreon (only 1$ per month!) + * https://plantuml.com/paypal + * + * This file is part of PlantUML. + * + * PlantUML is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * PlantUML distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public + * License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. + * + * + * Original Author: Arnaud Roques + * + * + */ +package net.sourceforge.plantuml.chronology; + +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.creole.Display; +import net.sourceforge.plantuml.klimt.drawing.UGraphic; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.font.UFont; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; +import net.sourceforge.plantuml.klimt.shape.TextBlock; +import net.sourceforge.plantuml.klimt.shape.ULine; +import net.sourceforge.plantuml.klimt.sprite.SpriteContainerEmpty; +import net.sourceforge.plantuml.project.TimeHeaderParameters; +import net.sourceforge.plantuml.project.core.PrintScale; +import net.sourceforge.plantuml.project.draw.TimeHeader; +import net.sourceforge.plantuml.project.time.Day; +import net.sourceforge.plantuml.project.timescale.TimeScale; +import net.sourceforge.plantuml.style.PName; +import net.sourceforge.plantuml.style.SName; + +public class TimeHeaderChronology extends TimeHeader { + + private final PrintScale printScale; + + @Override + public double getFullHeaderHeight(StringBounder stringBounder) { + return getTimeHeaderHeight(stringBounder) + getHeaderNameDayHeight(); + } + + @Override + public double getTimeHeaderHeight(StringBounder stringBounder) { + final double h = thParam.getStyle(SName.timeline, SName.day).value(PName.FontSize).asDouble(); + return h + 6; + } + + @Override + public double getTimeFooterHeight(StringBounder stringBounder) { + final double h = thParam.getStyle(SName.timeline, SName.day).value(PName.FontSize).asDouble(); + return h + 6; + } + + private double getHeaderNameDayHeight() { + return 0; + } + + public TimeHeaderChronology(StringBounder stringBounder, TimeHeaderParameters thParam, PrintScale printScale, + TimeScaleChronology timeScale) { + super(thParam, timeScale); + this.printScale = printScale; + } + + private void drawSmallVlinesDay(UGraphic ug, TimeScale timeScale, double totalHeightWithoutFooter) { + ug = ug.apply(getLineColor()); + ug = ug.apply(UTranslate.dy(6)); + final ULine vbar = ULine.vline(totalHeightWithoutFooter + 2); + for (Day i = getMin(); i.compareTo(getMax().increment()) < 0; i = i.increment(printScale)) { + final double x1 = timeScale.getStartingPosition(i); + ug.apply(UTranslate.dx(x1)).draw(vbar); + } + } + + private void drawSimpleDayCounter(UGraphic ug, TimeScale timeScale) { + for (Day i = getMin(); i.compareTo(getMax().increment()) < 0; i = i.increment(printScale)) { + final UFont font = thParam.getStyle(SName.timeline, SName.day).getUFont(); + final FontConfiguration fontConfiguration = getFontConfiguration(font, false, openFontColor()); + final TextBlock num = Display.getWithNewlines(i.toStringShort(thParam.getLocale())) + .create(fontConfiguration, HorizontalAlignment.LEFT, new SpriteContainerEmpty()); + final double x1 = timeScale.getStartingPosition(i); + final double x2; + if (printScale == PrintScale.WEEKLY) + x2 = timeScale.getEndingPosition(i.addDays(6)); + else + x2 = timeScale.getEndingPosition(i); + final double width = num.calculateDimension(ug.getStringBounder()).getWidth(); + final double delta = (x2 - x1) - width; + if (i.compareTo(getMax().increment()) < 0) + num.drawU(ug.apply(UTranslate.dx(x1 + delta / 2))); + + } + } + + @Override + public void drawTimeHeader(UGraphic ug, double totalHeightWithoutFooter) { + // drawTextsBackground(ug.apply(UTranslate.dy(-3)), totalHeightWithoutFooter + + // 6); + final double xmin = getTimeScale().getStartingPosition(getMin()); + final double xmax = getTimeScale().getEndingPosition(getMax()); + drawSmallVlinesDay(ug, getTimeScale(), totalHeightWithoutFooter); + // printVerticalSeparators(ug, totalHeightWithoutFooter); + drawSimpleDayCounter(ug, getTimeScale()); + // ug = ug.apply(getLineColor()); + // ug.draw(ULine.hline(xmax - xmin)); + // ug.apply(UTranslate.dy(getFullHeaderHeight(ug.getStringBounder()) - + // 3)).draw(ULine.hline(xmax - xmin)); + + } + + @Override + public void drawTimeFooter(UGraphic ug) { + final double xmin = getTimeScale().getStartingPosition(getMin()); + final double xmax = getTimeScale().getEndingPosition(getMax()); + ug = ug.apply(UTranslate.dy(3)); + // drawSmallVlinesDay(ug, getTimeScale(), + // getTimeFooterHeight(ug.getStringBounder()) - 3); + drawSimpleDayCounter(ug, getTimeScale()); + // ug.apply(getLineColor()).draw(ULine.hline(xmax - xmin)); + } + + // Duplicate in TimeHeaderDaily + class Pending { + final double x1; + double x2; + final HColor color; + + Pending(HColor color, double x1, double x2) { + this.x1 = x1; + this.x2 = x2; + this.color = color; + } + + public void draw(UGraphic ug, double height) { + drawRectangle(ug.apply(color.bg()), height, x1, x2); + } + } + + protected final void drawTextsBackground(UGraphic ug, double totalHeightWithoutFooter) { + + final double height = totalHeightWithoutFooter - getFullHeaderHeight(ug.getStringBounder()); + Pending pending = null; + + for (Day wink = getMin(); wink.compareTo(getMax()) <= 0; wink = wink.increment()) { + final double x1 = getTimeScale().getStartingPosition(wink); + final double x2 = getTimeScale().getEndingPosition(wink); + HColor back = thParam.getColor(wink); +// // Day of week should be stronger than period of time (back color). +// final HColor backDoW = colorDaysOfWeek.get(wink.getDayOfWeek()); +// if (backDoW != null) { +// back = backDoW; +// } +// if (back == null && defaultPlan.getLoadAt(wink) == 0) { +// back = closedBackgroundColor(); +// } + if (back == null) { + if (pending != null) + pending.draw(ug, height); + pending = null; + } else { + if (pending != null && pending.color.equals(back) == false) { + pending.draw(ug, height); + pending = null; + } + if (pending == null) + pending = new Pending(back, x1, x2); + else + pending.x2 = x2; + + } + } + } + +} diff --git a/src/net/sourceforge/plantuml/chronology/TimeScaleChronology.java b/src/net/sourceforge/plantuml/chronology/TimeScaleChronology.java new file mode 100644 index 000000000..b77f714cd --- /dev/null +++ b/src/net/sourceforge/plantuml/chronology/TimeScaleChronology.java @@ -0,0 +1,81 @@ +/* ======================================================================== + * PlantUML : a free UML diagram generator + * ======================================================================== + * + * (C) Copyright 2009-2024, Arnaud Roques + * + * Project Info: https://plantuml.com + * + * If you like this project or if you find it useful, you can support us at: + * + * https://plantuml.com/patreon (only 1$ per month!) + * https://plantuml.com/paypal + * + * This file is part of PlantUML. + * + * PlantUML is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * PlantUML distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public + * License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. + * + * + * Original Author: Arnaud Roques + * + * + */ +package net.sourceforge.plantuml.chronology; + +import net.sourceforge.plantuml.project.time.Day; +import net.sourceforge.plantuml.project.timescale.TimeScale; + +public class TimeScaleChronology implements TimeScale { + + private final double fullWidth; + private long min; + private long max; + + public TimeScaleChronology(double fullWidth) { + this.fullWidth = fullWidth; + } + + public double getStartingPosition(Day instant) { + final long wink = instant.getMillis(); + if (wink < min) + throw new IllegalArgumentException(); + if (wink > max) + throw new IllegalArgumentException(); + + return fullWidth * (wink - min) / (max - min); + } + + public double getEndingPosition(Day instant) { + return getStartingPosition(instant); + } + + public double getWidth(Day instant) { + throw new UnsupportedOperationException(); + } + + public boolean isBreaking(Day instant) { + throw new UnsupportedOperationException(); + } + + public final void setMin(long min) { + this.min = min; + } + + public final void setMax(long max) { + this.max = max; + } + +} diff --git a/src/net/sourceforge/plantuml/classdiagram/command/CommandCreateClass.java b/src/net/sourceforge/plantuml/classdiagram/command/CommandCreateClass.java index 7f42d13f0..0b5c8cd73 100644 --- a/src/net/sourceforge/plantuml/classdiagram/command/CommandCreateClass.java +++ b/src/net/sourceforge/plantuml/classdiagram/command/CommandCreateClass.java @@ -58,6 +58,7 @@ import net.sourceforge.plantuml.regex.RegexOr; import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.stereo.Stereotag; import net.sourceforge.plantuml.stereo.Stereotype; +import net.sourceforge.plantuml.stereo.StereotypePattern; import net.sourceforge.plantuml.url.Url; import net.sourceforge.plantuml.url.UrlBuilder; import net.sourceforge.plantuml.url.UrlMode; @@ -101,9 +102,7 @@ public class CommandCreateClass extends SingleLineCommand2 { new RegexLeaf("GENERIC", "\\<(" + GenericRegexProducer.PATTERN + ")\\>"))), // RegexLeaf.spaceZeroOrMore(), // new RegexLeaf("TAGS1", Stereotag.pattern() + "?"), // - RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("STEREO", "(\\<\\<.*\\>\\>)?"), // - RegexLeaf.spaceZeroOrMore(), // + StereotypePattern.optional("STEREO"), // new RegexLeaf("TAGS2", Stereotag.pattern() + "?"), // RegexLeaf.spaceZeroOrMore(), // UrlBuilder.OPTIONAL, // diff --git a/src/net/sourceforge/plantuml/classdiagram/command/CommandCreateClassMultilines.java b/src/net/sourceforge/plantuml/classdiagram/command/CommandCreateClassMultilines.java index 2ddf84b86..dc1719990 100644 --- a/src/net/sourceforge/plantuml/classdiagram/command/CommandCreateClassMultilines.java +++ b/src/net/sourceforge/plantuml/classdiagram/command/CommandCreateClassMultilines.java @@ -65,6 +65,7 @@ import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.skin.VisibilityModifier; import net.sourceforge.plantuml.stereo.Stereotag; import net.sourceforge.plantuml.stereo.Stereotype; +import net.sourceforge.plantuml.stereo.StereotypePattern; import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.url.Url; import net.sourceforge.plantuml.url.UrlBuilder; @@ -115,9 +116,7 @@ public class CommandCreateClassMultilines extends CommandMultilines2"))), // RegexLeaf.spaceZeroOrMore(), // new RegexLeaf("TAGS1", Stereotag.pattern() + "?"), // - RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("STEREO", "(\\<\\<.+\\>\\>)?"), // - RegexLeaf.spaceZeroOrMore(), // + StereotypePattern.optional("STEREO"), // new RegexLeaf("TAGS2", Stereotag.pattern() + "?"), // RegexLeaf.spaceZeroOrMore(), // UrlBuilder.OPTIONAL, // diff --git a/src/net/sourceforge/plantuml/classdiagram/command/CommandCreateElementFull2.java b/src/net/sourceforge/plantuml/classdiagram/command/CommandCreateElementFull2.java index 906f0d877..cb1a677e8 100644 --- a/src/net/sourceforge/plantuml/classdiagram/command/CommandCreateElementFull2.java +++ b/src/net/sourceforge/plantuml/classdiagram/command/CommandCreateElementFull2.java @@ -53,11 +53,11 @@ import net.sourceforge.plantuml.klimt.font.FontParam; import net.sourceforge.plantuml.plasma.Quark; import net.sourceforge.plantuml.regex.RegexConcat; import net.sourceforge.plantuml.regex.RegexLeaf; -import net.sourceforge.plantuml.regex.RegexOptional; import net.sourceforge.plantuml.regex.RegexOr; import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.stereo.Stereotag; import net.sourceforge.plantuml.stereo.Stereotype; +import net.sourceforge.plantuml.stereo.StereotypePattern; import net.sourceforge.plantuml.url.Url; import net.sourceforge.plantuml.url.UrlBuilder; import net.sourceforge.plantuml.url.UrlMode; @@ -88,21 +88,14 @@ public class CommandCreateElementFull2 extends SingleLineCommand2 new RegexLeaf("CODE1", CommandCreateElementFull.CODE_WITH_QUOTE), // new RegexConcat(// new RegexLeaf("DISPLAY2", CommandCreateElementFull.DISPLAY), // - new RegexOptional( // - new RegexConcat( // - RegexLeaf.spaceOneOrMore(), // - new RegexLeaf("STEREOTYPE2", "(\\<\\<.+\\>\\>)") // - )), // - RegexLeaf.spaceZeroOrMore(), // + StereotypePattern.optional("STEREOTYPE2"), // new RegexLeaf("as"), // RegexLeaf.spaceOneOrMore(), // new RegexLeaf("CODE2", CommandCreateElementFull.CODE)) // ), // RegexLeaf.spaceZeroOrMore(), // new RegexLeaf("TAGS1", Stereotag.pattern() + "?"), // - RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("STEREOTYPE", "(\\<\\<.+\\>\\>)?"), // - RegexLeaf.spaceZeroOrMore(), // + StereotypePattern.optional("STEREOTYPE"), // new RegexLeaf("TAGS2", Stereotag.pattern() + "?"), // RegexLeaf.spaceZeroOrMore(), // UrlBuilder.OPTIONAL, // @@ -118,21 +111,14 @@ public class CommandCreateElementFull2 extends SingleLineCommand2 new RegexLeaf("CODE1", CommandCreateElementFull.CODE_WITH_QUOTE), // new RegexConcat(// new RegexLeaf("DISPLAY2", CommandCreateElementFull.DISPLAY), // - new RegexOptional( // - new RegexConcat( // - RegexLeaf.spaceOneOrMore(), // - new RegexLeaf("STEREOTYPE2", "(\\<\\<.+\\>\\>)") // - )), // - RegexLeaf.spaceZeroOrMore(), // + StereotypePattern.optional("STEREOTYPE2"), // new RegexLeaf("as"), // RegexLeaf.spaceOneOrMore(), // new RegexLeaf("CODE2", CommandCreateElementFull.CODE)) // ), // RegexLeaf.spaceZeroOrMore(), // new RegexLeaf("TAGS1", Stereotag.pattern() + "?"), // - RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("STEREOTYPE", "(\\<\\<.+\\>\\>)?"), // - RegexLeaf.spaceZeroOrMore(), // + StereotypePattern.optional("STEREOTYPE"), // new RegexLeaf("TAGS2", Stereotag.pattern() + "?"), // RegexLeaf.spaceZeroOrMore(), // UrlBuilder.OPTIONAL, // diff --git a/src/net/sourceforge/plantuml/classdiagram/command/CommandStereotype.java b/src/net/sourceforge/plantuml/classdiagram/command/CommandStereotype.java index d4b8686b5..4d762c4f8 100644 --- a/src/net/sourceforge/plantuml/classdiagram/command/CommandStereotype.java +++ b/src/net/sourceforge/plantuml/classdiagram/command/CommandStereotype.java @@ -47,6 +47,7 @@ import net.sourceforge.plantuml.regex.RegexConcat; import net.sourceforge.plantuml.regex.RegexLeaf; import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.stereo.Stereotype; +import net.sourceforge.plantuml.stereo.StereotypePattern; import net.sourceforge.plantuml.utils.LineLocation; public class CommandStereotype extends SingleLineCommand2 { @@ -60,7 +61,8 @@ public class CommandStereotype extends SingleLineCommand2 { RegexLeaf.start(), // new RegexLeaf("NAME", "([%pLN_.]+|[%g][^%g]+[%g])"), // RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("STEREO", "(\\<\\<.*\\>\\>)"), RegexLeaf.end()); // + StereotypePattern.mandatory("STEREO"), // + RegexLeaf.end()); // } @Override diff --git a/src/net/sourceforge/plantuml/command/CommandNamespace.java b/src/net/sourceforge/plantuml/command/CommandNamespace.java index 67cf02b22..9404cd513 100644 --- a/src/net/sourceforge/plantuml/command/CommandNamespace.java +++ b/src/net/sourceforge/plantuml/command/CommandNamespace.java @@ -50,6 +50,7 @@ import net.sourceforge.plantuml.regex.RegexConcat; import net.sourceforge.plantuml.regex.RegexLeaf; import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.stereo.Stereotype; +import net.sourceforge.plantuml.stereo.StereotypePattern; import net.sourceforge.plantuml.url.Url; import net.sourceforge.plantuml.url.UrlBuilder; import net.sourceforge.plantuml.url.UrlMode; @@ -68,9 +69,7 @@ public class CommandNamespace extends SingleLineCommand2 { new RegexLeaf("namespace"), // RegexLeaf.spaceOneOrMore(), // new RegexLeaf("NAME", NAMESPACE_REGEX), // - RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("STEREOTYPE", "(\\<\\<.*\\>\\>)?"), // - RegexLeaf.spaceZeroOrMore(), // + StereotypePattern.optional("STEREOTYPE"), // UrlBuilder.OPTIONAL, // RegexLeaf.spaceZeroOrMore(), // ColorParser.exp1(), // diff --git a/src/net/sourceforge/plantuml/command/CommandNamespace2.java b/src/net/sourceforge/plantuml/command/CommandNamespace2.java index 768b1a181..f32845c77 100644 --- a/src/net/sourceforge/plantuml/command/CommandNamespace2.java +++ b/src/net/sourceforge/plantuml/command/CommandNamespace2.java @@ -48,6 +48,7 @@ import net.sourceforge.plantuml.regex.RegexConcat; import net.sourceforge.plantuml.regex.RegexLeaf; import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.stereo.Stereotype; +import net.sourceforge.plantuml.stereo.StereotypePattern; import net.sourceforge.plantuml.url.Url; import net.sourceforge.plantuml.url.UrlBuilder; import net.sourceforge.plantuml.url.UrlMode; @@ -72,9 +73,7 @@ public class CommandNamespace2 extends SingleLineCommand2 { RegexLeaf.spaceOneOrMore(), // new RegexLeaf("NAME", CommandNamespace.NAMESPACE_REGEX), // - RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("STEREOTYPE", "(\\<\\<.*\\>\\>)?"), // - RegexLeaf.spaceZeroOrMore(), // + StereotypePattern.optional("STEREOTYPE"), // UrlBuilder.OPTIONAL, // RegexLeaf.spaceZeroOrMore(), // ColorParser.exp1(), // diff --git a/src/net/sourceforge/plantuml/command/CommandNamespaceEmpty.java b/src/net/sourceforge/plantuml/command/CommandNamespaceEmpty.java index 6e9e9c81b..00a0ab641 100644 --- a/src/net/sourceforge/plantuml/command/CommandNamespaceEmpty.java +++ b/src/net/sourceforge/plantuml/command/CommandNamespaceEmpty.java @@ -48,6 +48,7 @@ import net.sourceforge.plantuml.regex.RegexConcat; import net.sourceforge.plantuml.regex.RegexLeaf; import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.stereo.Stereotype; +import net.sourceforge.plantuml.stereo.StereotypePattern; import net.sourceforge.plantuml.url.Url; import net.sourceforge.plantuml.url.UrlBuilder; import net.sourceforge.plantuml.url.UrlMode; @@ -64,9 +65,7 @@ public class CommandNamespaceEmpty extends SingleLineCommand2 { new RegexLeaf("namespace"), // RegexLeaf.spaceOneOrMore(), // new RegexLeaf("NAME", CommandNamespace.NAMESPACE_REGEX), // - RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("STEREOTYPE", "(\\<\\<.*\\>\\>)?"), // - RegexLeaf.spaceZeroOrMore(), // + StereotypePattern.optional("STEREOTYPE"), // UrlBuilder.OPTIONAL, // RegexLeaf.spaceZeroOrMore(), // ColorParser.exp1(), // diff --git a/src/net/sourceforge/plantuml/command/CommandPackage.java b/src/net/sourceforge/plantuml/command/CommandPackage.java index d0d64c477..934bd4020 100644 --- a/src/net/sourceforge/plantuml/command/CommandPackage.java +++ b/src/net/sourceforge/plantuml/command/CommandPackage.java @@ -55,6 +55,7 @@ import net.sourceforge.plantuml.regex.RegexOptional; import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.stereo.Stereotag; import net.sourceforge.plantuml.stereo.Stereotype; +import net.sourceforge.plantuml.stereo.StereotypePattern; import net.sourceforge.plantuml.url.Url; import net.sourceforge.plantuml.url.UrlBuilder; import net.sourceforge.plantuml.url.UrlMode; @@ -80,9 +81,7 @@ public class CommandPackage extends SingleLineCommand2 { )), // RegexLeaf.spaceZeroOrMore(), // new RegexLeaf("TAGS1", Stereotag.pattern() + "?"), // - RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("STEREOTYPE", "(\\<\\<.*\\>\\>)?"), // - RegexLeaf.spaceZeroOrMore(), // + StereotypePattern.optional("STEREOTYPE"), // new RegexLeaf("TAGS2", Stereotag.pattern() + "?"), // RegexLeaf.spaceZeroOrMore(), // UrlBuilder.OPTIONAL, // diff --git a/src/net/sourceforge/plantuml/command/note/CommandFactoryNote.java b/src/net/sourceforge/plantuml/command/note/CommandFactoryNote.java index 65a763e9b..bc89bf64a 100644 --- a/src/net/sourceforge/plantuml/command/note/CommandFactoryNote.java +++ b/src/net/sourceforge/plantuml/command/note/CommandFactoryNote.java @@ -55,6 +55,7 @@ import net.sourceforge.plantuml.regex.RegexLeaf; import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.stereo.Stereotag; import net.sourceforge.plantuml.stereo.Stereotype; +import net.sourceforge.plantuml.stereo.StereotypePattern; import net.sourceforge.plantuml.utils.BlocLines; import net.sourceforge.plantuml.utils.LineLocation; @@ -70,9 +71,7 @@ public final class CommandFactoryNote implements SingleMultiFactoryCommand\\>)?"), // - RegexLeaf.spaceZeroOrMore(), // + StereotypePattern.optional("STEREO"), // ColorParser.exp1(), // RegexLeaf.end() // ); @@ -91,9 +90,7 @@ public final class CommandFactoryNote implements SingleMultiFactoryCommand\\>)?"), // - RegexLeaf.spaceZeroOrMore(), // + StereotypePattern.optional("STEREO"), // ColorParser.exp1(), // RegexLeaf.end() // ); diff --git a/src/net/sourceforge/plantuml/command/note/CommandFactoryNoteOnEntity.java b/src/net/sourceforge/plantuml/command/note/CommandFactoryNoteOnEntity.java index 363f8809e..f3d7f37ea 100644 --- a/src/net/sourceforge/plantuml/command/note/CommandFactoryNoteOnEntity.java +++ b/src/net/sourceforge/plantuml/command/note/CommandFactoryNoteOnEntity.java @@ -63,6 +63,7 @@ import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.skin.ColorParam; import net.sourceforge.plantuml.stereo.Stereotag; import net.sourceforge.plantuml.stereo.Stereotype; +import net.sourceforge.plantuml.stereo.StereotypePattern; import net.sourceforge.plantuml.url.Url; import net.sourceforge.plantuml.url.UrlBuilder; import net.sourceforge.plantuml.url.UrlMode; @@ -92,9 +93,7 @@ public final class CommandFactoryNoteOnEntity implements SingleMultiFactoryComma new RegexLeaf("")), // RegexLeaf.spaceZeroOrMore(), // new RegexLeaf("TAGS1", Stereotag.pattern() + "?"), // - RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("STEREO", "(\\<\\<.*\\>\\>)?"), // - RegexLeaf.spaceZeroOrMore(), // + StereotypePattern.optional("STEREO"), // new RegexLeaf("TAGS2", Stereotag.pattern() + "?"), // RegexLeaf.spaceZeroOrMore(), // color().getRegex(), // @@ -127,9 +126,7 @@ public final class CommandFactoryNoteOnEntity implements SingleMultiFactoryComma new RegexLeaf("")), // RegexLeaf.spaceZeroOrMore(), // new RegexLeaf("TAGS1", Stereotag.pattern() + "?"), // - RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("STEREO", "(\\<\\<.*\\>\\>)?"), // - RegexLeaf.spaceZeroOrMore(), // + StereotypePattern.optional("STEREO"), // new RegexLeaf("TAGS2", Stereotag.pattern() + "?"), // RegexLeaf.spaceZeroOrMore(), // color().getRegex(), // @@ -153,9 +150,7 @@ public final class CommandFactoryNoteOnEntity implements SingleMultiFactoryComma new RegexLeaf("")), // RegexLeaf.spaceZeroOrMore(), // new RegexLeaf("TAGS1", Stereotag.pattern() + "?"), // - RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("STEREO", "(\\<\\<.*\\>\\>)?"), // - RegexLeaf.spaceZeroOrMore(), // + StereotypePattern.optional("STEREO"), // new RegexLeaf("TAGS2", Stereotag.pattern() + "?"), // RegexLeaf.spaceZeroOrMore(), // color().getRegex(), // diff --git a/src/net/sourceforge/plantuml/command/note/CommandFactoryTipOnEntity.java b/src/net/sourceforge/plantuml/command/note/CommandFactoryTipOnEntity.java index bdfac6571..edfb84034 100644 --- a/src/net/sourceforge/plantuml/command/note/CommandFactoryTipOnEntity.java +++ b/src/net/sourceforge/plantuml/command/note/CommandFactoryTipOnEntity.java @@ -61,6 +61,7 @@ import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.skin.ColorParam; import net.sourceforge.plantuml.stereo.Stereotag; import net.sourceforge.plantuml.stereo.Stereotype; +import net.sourceforge.plantuml.stereo.StereotypePattern; import net.sourceforge.plantuml.url.Url; import net.sourceforge.plantuml.url.UrlBuilder; import net.sourceforge.plantuml.url.UrlMode; @@ -89,9 +90,7 @@ public final class CommandFactoryTipOnEntity implements SingleMultiFactoryComman partialPattern, // RegexLeaf.spaceZeroOrMore(), // new RegexLeaf("TAGS1", Stereotag.pattern() + "?"), // - RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("STEREO", "(\\<\\<.*\\>\\>)?"), // - RegexLeaf.spaceZeroOrMore(), // + StereotypePattern.optional("STEREO"), // new RegexLeaf("TAGS2", Stereotag.pattern() + "?"), // RegexLeaf.spaceZeroOrMore(), // ColorParser.exp1(), // @@ -112,9 +111,7 @@ public final class CommandFactoryTipOnEntity implements SingleMultiFactoryComman partialPattern, // RegexLeaf.spaceZeroOrMore(), // new RegexLeaf("TAGS1", Stereotag.pattern() + "?"), // - RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("STEREO", "(\\<\\<.*\\>\\>)?"), // - RegexLeaf.spaceZeroOrMore(), // + StereotypePattern.optional("STEREO"), // new RegexLeaf("TAGS2", Stereotag.pattern() + "?"), // RegexLeaf.spaceZeroOrMore(), // ColorParser.exp1(), // diff --git a/src/net/sourceforge/plantuml/command/note/sequence/FactorySequenceNoteAcrossCommand.java b/src/net/sourceforge/plantuml/command/note/sequence/FactorySequenceNoteAcrossCommand.java index ccbbfb5ad..a93e0bafe 100644 --- a/src/net/sourceforge/plantuml/command/note/sequence/FactorySequenceNoteAcrossCommand.java +++ b/src/net/sourceforge/plantuml/command/note/sequence/FactorySequenceNoteAcrossCommand.java @@ -57,6 +57,7 @@ import net.sourceforge.plantuml.sequencediagram.Participant; import net.sourceforge.plantuml.sequencediagram.SequenceDiagram; import net.sourceforge.plantuml.skin.ColorParam; import net.sourceforge.plantuml.stereo.Stereotype; +import net.sourceforge.plantuml.stereo.StereotypePattern; import net.sourceforge.plantuml.url.Url; import net.sourceforge.plantuml.url.UrlBuilder; import net.sourceforge.plantuml.url.UrlMode; @@ -70,13 +71,9 @@ public final class FactorySequenceNoteAcrossCommand implements SingleMultiFactor new RegexLeaf("VMERGE", "(/)?"), // RegexLeaf.spaceZeroOrMore(), // new RegexLeaf("STYLE", "(note|hnote|rnote)"), // - RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("STEREO1", "(\\<\\<.*\\>\\>)?"), // - RegexLeaf.spaceZeroOrMore(), // + StereotypePattern.optional("STEREO1"), // new RegexLeaf("ACROSS", "(accross|across)"), // - RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("STEREO2", "(\\<\\<.*\\>\\>)?"), // - RegexLeaf.spaceZeroOrMore(), // + StereotypePattern.optional("STEREO2"), // color().getRegex(), // RegexLeaf.spaceZeroOrMore(), // UrlBuilder.OPTIONAL, // @@ -89,13 +86,9 @@ public final class FactorySequenceNoteAcrossCommand implements SingleMultiFactor new RegexLeaf("VMERGE", "(/)?"), // RegexLeaf.spaceZeroOrMore(), // new RegexLeaf("STYLE", "(note|hnote|rnote)"), // - RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("STEREO1", "(\\<\\<.*\\>\\>)?"), // - RegexLeaf.spaceZeroOrMore(), // + StereotypePattern.optional("STEREO1"), // new RegexLeaf("ACROSS", "(accross|across)"), // - RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("STEREO2", "(\\<\\<.*\\>\\>)?"), // - RegexLeaf.spaceZeroOrMore(), // + StereotypePattern.optional("STEREO2"), // color().getRegex(), // RegexLeaf.spaceZeroOrMore(), // UrlBuilder.OPTIONAL, // diff --git a/src/net/sourceforge/plantuml/command/note/sequence/FactorySequenceNoteCommand.java b/src/net/sourceforge/plantuml/command/note/sequence/FactorySequenceNoteCommand.java index fb6a746fb..c5a0d4596 100644 --- a/src/net/sourceforge/plantuml/command/note/sequence/FactorySequenceNoteCommand.java +++ b/src/net/sourceforge/plantuml/command/note/sequence/FactorySequenceNoteCommand.java @@ -59,6 +59,7 @@ import net.sourceforge.plantuml.sequencediagram.Participant; import net.sourceforge.plantuml.sequencediagram.SequenceDiagram; import net.sourceforge.plantuml.skin.ColorParam; import net.sourceforge.plantuml.stereo.Stereotype; +import net.sourceforge.plantuml.stereo.StereotypePattern; import net.sourceforge.plantuml.url.Url; import net.sourceforge.plantuml.url.UrlBuilder; import net.sourceforge.plantuml.url.UrlMode; @@ -66,7 +67,7 @@ import net.sourceforge.plantuml.utils.BlocLines; import net.sourceforge.plantuml.utils.LineLocation; public final class FactorySequenceNoteCommand implements SingleMultiFactoryCommand { - // ::remove folder when __HAXE__ + // ::remove folder when __HAXE__ private IRegex getRegexConcatMultiLine() { return RegexConcat.build(FactorySequenceNoteCommand.class.getName() + "multi", RegexLeaf.start(), // @@ -74,15 +75,11 @@ public final class FactorySequenceNoteCommand implements SingleMultiFactoryComma new RegexLeaf("VMERGE", "(/)?"), // RegexLeaf.spaceZeroOrMore(), // new RegexLeaf("STYLE", "(note|hnote|rnote)"), // - RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("STEREO1", "(\\<\\<.*\\>\\>)?"), // - RegexLeaf.spaceZeroOrMore(), // + StereotypePattern.optional("STEREO1"), // new RegexLeaf("POSITION", "(right|left|over)"), // RegexLeaf.spaceOneOrMore(), // new RegexLeaf("PARTICIPANT", "(?:of[%s]+)?([%pLN_.@]+|[%g][^%g]+[%g])"), // - RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("STEREO2", "(\\<\\<.*\\>\\>)?"), // - RegexLeaf.spaceZeroOrMore(), // + StereotypePattern.optional("STEREO2"), // color().getRegex(), // RegexLeaf.spaceZeroOrMore(), // UrlBuilder.OPTIONAL, // @@ -95,15 +92,11 @@ public final class FactorySequenceNoteCommand implements SingleMultiFactoryComma new RegexLeaf("VMERGE", "(/)?"), // RegexLeaf.spaceZeroOrMore(), // new RegexLeaf("STYLE", "(note|hnote|rnote)"), // - RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("STEREO1", "(\\<\\<.*\\>\\>)?"), // - RegexLeaf.spaceZeroOrMore(), // + StereotypePattern.optional("STEREO1"), // new RegexLeaf("POSITION", "(right|left|over)"), // RegexLeaf.spaceOneOrMore(), // new RegexLeaf("PARTICIPANT", "(?:of[%s])?([%pLN_.@]+|[%g][^%g]+[%g])"), // - RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("STEREO2", "(\\<\\<.*\\>\\>)?"), // - RegexLeaf.spaceZeroOrMore(), // + StereotypePattern.optional("STEREO2"), // color().getRegex(), // RegexLeaf.spaceZeroOrMore(), // UrlBuilder.OPTIONAL, // diff --git a/src/net/sourceforge/plantuml/command/note/sequence/FactorySequenceNoteOnArrowCommand.java b/src/net/sourceforge/plantuml/command/note/sequence/FactorySequenceNoteOnArrowCommand.java index f886d749f..556b146da 100644 --- a/src/net/sourceforge/plantuml/command/note/sequence/FactorySequenceNoteOnArrowCommand.java +++ b/src/net/sourceforge/plantuml/command/note/sequence/FactorySequenceNoteOnArrowCommand.java @@ -60,6 +60,7 @@ import net.sourceforge.plantuml.sequencediagram.NoteStyle; import net.sourceforge.plantuml.sequencediagram.SequenceDiagram; import net.sourceforge.plantuml.skin.ColorParam; import net.sourceforge.plantuml.stereo.Stereotype; +import net.sourceforge.plantuml.stereo.StereotypePattern; import net.sourceforge.plantuml.url.Url; import net.sourceforge.plantuml.url.UrlBuilder; import net.sourceforge.plantuml.url.UrlMode; @@ -72,13 +73,9 @@ public final class FactorySequenceNoteOnArrowCommand implements SingleMultiFacto return RegexConcat.build(FactorySequenceNoteOnArrowCommand.class.getName() + "multi", RegexLeaf.start(), // RegexLeaf.spaceZeroOrMore(), // new RegexLeaf("STYLE", "(note|hnote|rnote)"), // - RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("STEREO1", "(\\<\\<.*\\>\\>)?"), // - RegexLeaf.spaceOneOrMore(), // + StereotypePattern.optional("STEREO1"), // new RegexLeaf("POSITION", "(right|left|bottom|top)"), // - RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("STEREO2", "(\\<\\<.*\\>\\>)?"), // - RegexLeaf.spaceZeroOrMore(), // + StereotypePattern.optional("STEREO2"), // ColorParser.exp1(), // RegexLeaf.spaceZeroOrMore(), // UrlBuilder.OPTIONAL, // @@ -89,13 +86,9 @@ public final class FactorySequenceNoteOnArrowCommand implements SingleMultiFacto return RegexConcat.build(FactorySequenceNoteOnArrowCommand.class.getName() + "single", RegexLeaf.start(), // RegexLeaf.spaceZeroOrMore(), // new RegexLeaf("STYLE", "(note|hnote|rnote)"), // - RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("STEREO1", "(\\<\\<.*\\>\\>)?"), // - RegexLeaf.spaceOneOrMore(), // + StereotypePattern.optional("STEREO1"), // new RegexLeaf("POSITION", "(right|left|bottom|top)"), // - RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("STEREO2", "(\\<\\<.*\\>\\>)?"), // - RegexLeaf.spaceZeroOrMore(), // + StereotypePattern.optional("STEREO2"), // ColorParser.exp1(), // RegexLeaf.spaceZeroOrMore(), // UrlBuilder.OPTIONAL, // diff --git a/src/net/sourceforge/plantuml/command/note/sequence/FactorySequenceNoteOverSeveralCommand.java b/src/net/sourceforge/plantuml/command/note/sequence/FactorySequenceNoteOverSeveralCommand.java index 52154e96e..a2ceee953 100644 --- a/src/net/sourceforge/plantuml/command/note/sequence/FactorySequenceNoteOverSeveralCommand.java +++ b/src/net/sourceforge/plantuml/command/note/sequence/FactorySequenceNoteOverSeveralCommand.java @@ -58,6 +58,7 @@ import net.sourceforge.plantuml.sequencediagram.Participant; import net.sourceforge.plantuml.sequencediagram.SequenceDiagram; import net.sourceforge.plantuml.skin.ColorParam; import net.sourceforge.plantuml.stereo.Stereotype; +import net.sourceforge.plantuml.stereo.StereotypePattern; import net.sourceforge.plantuml.url.Url; import net.sourceforge.plantuml.url.UrlBuilder; import net.sourceforge.plantuml.url.UrlMode; @@ -72,9 +73,7 @@ public final class FactorySequenceNoteOverSeveralCommand implements SingleMultiF new RegexLeaf("VMERGE", "(/)?"), // RegexLeaf.spaceZeroOrMore(), // new RegexLeaf("STYLE", "(note|hnote|rnote)"), // - RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("STEREO1", "(\\<\\<.*\\>\\>)?"), // - RegexLeaf.spaceZeroOrMore(), // + StereotypePattern.optional("STEREO1"), // new RegexLeaf("over"), // RegexLeaf.spaceOneOrMore(), // new RegexLeaf("P1", "([%pLN_.@]+|[%g][^%g]+[%g])"), // @@ -82,9 +81,7 @@ public final class FactorySequenceNoteOverSeveralCommand implements SingleMultiF new RegexLeaf(","), // RegexLeaf.spaceZeroOrMore(), // new RegexLeaf("P2", "([%pLN_.@]+|[%g][^%g]+[%g])"), // - RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("STEREO2", "(\\<\\<.*\\>\\>)?"), // - RegexLeaf.spaceZeroOrMore(), // + StereotypePattern.optional("STEREO2"), // color().getRegex(), // RegexLeaf.spaceZeroOrMore(), // UrlBuilder.OPTIONAL, // @@ -98,9 +95,7 @@ public final class FactorySequenceNoteOverSeveralCommand implements SingleMultiF new RegexLeaf("VMERGE", "(/)?"), // RegexLeaf.spaceZeroOrMore(), // new RegexLeaf("STYLE", "(note|hnote|rnote)"), // - RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("STEREO1", "(\\<\\<.*\\>\\>)?"), // - RegexLeaf.spaceZeroOrMore(), // + StereotypePattern.optional("STEREO1"), // new RegexLeaf("over"), // RegexLeaf.spaceOneOrMore(), // new RegexLeaf("P1", "([%pLN_.@]+|[%g][^%g]+[%g])"), // @@ -108,9 +103,7 @@ public final class FactorySequenceNoteOverSeveralCommand implements SingleMultiF new RegexLeaf(","), // RegexLeaf.spaceZeroOrMore(), // new RegexLeaf("P2", "([%pLN_.@]+|[%g][^%g]+[%g])"), // - RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("STEREO2", "(\\<\\<.*\\>\\>)?"), // - RegexLeaf.spaceZeroOrMore(), // + StereotypePattern.optional("STEREO2"), // color().getRegex(), // RegexLeaf.spaceZeroOrMore(), // UrlBuilder.OPTIONAL, // diff --git a/src/net/sourceforge/plantuml/core/Diagram.java b/src/net/sourceforge/plantuml/core/Diagram.java index 368d0b926..18ce748ff 100644 --- a/src/net/sourceforge/plantuml/core/Diagram.java +++ b/src/net/sourceforge/plantuml/core/Diagram.java @@ -68,7 +68,7 @@ public interface Diagram { */ ImageData exportDiagram(OutputStream os, int num, FileFormatOption fileFormat) throws IOException; - void exportDiagramGraphic(UGraphic ug); + void exportDiagramGraphic(UGraphic ug, FileFormatOption fileFormat); /** * Number of images in this diagram (usually, 1) diff --git a/src/net/sourceforge/plantuml/core/DiagramType.java b/src/net/sourceforge/plantuml/core/DiagramType.java index 7a045e588..1f1e7f9ae 100644 --- a/src/net/sourceforge/plantuml/core/DiagramType.java +++ b/src/net/sourceforge/plantuml/core/DiagramType.java @@ -38,9 +38,9 @@ package net.sourceforge.plantuml.core; import net.sourceforge.plantuml.utils.StartUtils; public enum DiagramType { - // ::remove folder when __HAXE__ - UML, BPM, DITAA, DOT, PROJECT, JCCKIT, SALT, FLOW, CREOLE, MATH, LATEX, DEFINITION, GANTT, NW, - MINDMAP, WBS, WIRE, JSON, GIT, BOARD, YAML, HCL, EBNF, REGEX, FILES, UNKNOWN; + // ::remove folder when __HAXE__ + UML, BPM, DITAA, DOT, PROJECT, JCCKIT, SALT, FLOW, CREOLE, MATH, LATEX, DEFINITION, GANTT, CHRONOLOGY, NW, MINDMAP, + WBS, WIRE, JSON, GIT, BOARD, YAML, HCL, EBNF, REGEX, FILES, UNKNOWN; static public DiagramType getTypeFromArobaseStart(String s) { s = s.toLowerCase(); @@ -59,7 +59,8 @@ public enum DiagramType { if (StartUtils.startsWithSymbolAnd("startdot", s)) return DOT; - // ::comment when __CORE__ or __MIT__ or __EPL__ or __BSD__ or __ASL__ or __LGPL__ + // ::comment when __CORE__ or __MIT__ or __EPL__ or __BSD__ or __ASL__ or + // __LGPL__ if (StartUtils.startsWithSymbolAnd("startjcckit", s)) return JCCKIT; // ::done @@ -126,6 +127,9 @@ public enum DiagramType { if (StartUtils.startsWithSymbolAnd("startfiles", s)) return FILES; + if (StartUtils.startsWithSymbolAnd("startchronology", s)) + return CHRONOLOGY; + return UNKNOWN; } } diff --git a/src/net/sourceforge/plantuml/descdiagram/CommandCreateDomain.java b/src/net/sourceforge/plantuml/descdiagram/CommandCreateDomain.java index 10e4f354c..43864b44d 100644 --- a/src/net/sourceforge/plantuml/descdiagram/CommandCreateDomain.java +++ b/src/net/sourceforge/plantuml/descdiagram/CommandCreateDomain.java @@ -53,6 +53,7 @@ import net.sourceforge.plantuml.regex.RegexConcat; import net.sourceforge.plantuml.regex.RegexLeaf; import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.stereo.Stereotype; +import net.sourceforge.plantuml.stereo.StereotypePattern; import net.sourceforge.plantuml.url.Url; import net.sourceforge.plantuml.url.UrlBuilder; import net.sourceforge.plantuml.url.UrlMode; @@ -73,11 +74,11 @@ public class CommandCreateDomain extends SingleLineCommand2 new RegexLeaf("DISPLAY", DISPLAY_WITH_GENERIC), // RegexLeaf.spaceOneOrMore(), // new RegexLeaf("as"), // - RegexLeaf.spaceOneOrMore(), new RegexLeaf("CODE", "([a-zA-Z0-9]+)"), RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("STEREO", "(\\<\\<.+\\>\\>)?"), // + RegexLeaf.spaceOneOrMore(), // + new RegexLeaf("CODE", "([a-zA-Z0-9]+)"), // + StereotypePattern.optional("STEREO"), // // domain: lexical, causal, biddable // requirement: FR, NFR, quality - RegexLeaf.spaceZeroOrMore(), // new RegexLeaf("GROUP", "(\\{)?"), RegexLeaf.end()); } diff --git a/src/net/sourceforge/plantuml/descdiagram/command/CommandArchimate.java b/src/net/sourceforge/plantuml/descdiagram/command/CommandArchimate.java index 7bc02b008..cfa09179c 100644 --- a/src/net/sourceforge/plantuml/descdiagram/command/CommandArchimate.java +++ b/src/net/sourceforge/plantuml/descdiagram/command/CommandArchimate.java @@ -56,6 +56,7 @@ import net.sourceforge.plantuml.regex.RegexOptional; import net.sourceforge.plantuml.regex.RegexOr; import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.stereo.Stereotype; +import net.sourceforge.plantuml.stereo.StereotypePattern; import net.sourceforge.plantuml.utils.LineLocation; public class CommandArchimate extends SingleLineCommand2 { @@ -74,44 +75,25 @@ public class CommandArchimate extends SingleLineCommand2 { new RegexLeaf("CODE1", CommandCreateElementFull.CODE_WITH_QUOTE), // new RegexConcat(// new RegexLeaf("DISPLAY2", CommandCreateElementFull.DISPLAY), // - new RegexOptional( // - new RegexConcat( // - RegexLeaf.spaceOneOrMore(), // - new RegexLeaf("STEREOTYPE2", "(?:\\<\\<([-\\w]+)\\>\\>)") // - )), // - RegexLeaf.spaceZeroOrMore(), // + StereotypePattern.optionalArchimate("STEREOTYPE2"), // new RegexLeaf("as"), // RegexLeaf.spaceOneOrMore(), // new RegexLeaf("CODE2", CommandCreateElementFull.CODE)), // new RegexConcat(// new RegexLeaf("CODE3", CommandCreateElementFull.CODE), // - new RegexOptional( // - new RegexConcat( // - RegexLeaf.spaceOneOrMore(), // - new RegexLeaf("STEREOTYPE3", "(?:\\<\\<([-\\w]+)\\>\\>)") // - )), // - RegexLeaf.spaceOneOrMore(), // + StereotypePattern.optionalArchimate("STEREOTYPE3"), // new RegexLeaf("as"), // RegexLeaf.spaceZeroOrMore(), // new RegexLeaf("DISPLAY3", CommandCreateElementFull.DISPLAY)), // new RegexConcat(// new RegexLeaf("DISPLAY4", CommandCreateElementFull.DISPLAY_WITHOUT_QUOTE), // - new RegexOptional( // - new RegexConcat( // - RegexLeaf.spaceOneOrMore(), // - new RegexLeaf("STEREOTYPE4", "(?:\\<\\<([-\\w]+)\\>\\>)") // - )), // - RegexLeaf.spaceZeroOrMore(), // + StereotypePattern.optionalArchimate("STEREOTYPE4"), // new RegexLeaf("as"), // RegexLeaf.spaceOneOrMore(), // new RegexLeaf("CODE4", CommandCreateElementFull.CODE)) // ), // - RegexLeaf.spaceZeroOrMore(), // - new RegexOptional( // - new RegexConcat( // - RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("STEREOTYPE", "(?:\\<\\<([-\\w]+)\\>\\>)") // - )), RegexLeaf.end()); + StereotypePattern.optionalArchimate("STEREOTYPE"), // + RegexLeaf.end()); } private static ColorParser color() { @@ -134,7 +116,7 @@ public class CommandArchimate extends SingleLineCommand2 { entity = diagram.reallyCreateLeaf(quark, Display.getWithNewlines(display), LeafType.DESCRIPTION, USymbols.ARCHIMATE); - final String icon = arg.getLazzy("STEREOTYPE", 0); + final String icon = StereotypePattern.removeChevronBrackets(arg.getLazzy("STEREOTYPE", 0)); entity.setDisplay(Display.getWithNewlines(display)); entity.setUSymbol(USymbols.ARCHIMATE); diff --git a/src/net/sourceforge/plantuml/descdiagram/command/CommandArchimateMultilines.java b/src/net/sourceforge/plantuml/descdiagram/command/CommandArchimateMultilines.java index 11cccd9bc..5aa5f5012 100644 --- a/src/net/sourceforge/plantuml/descdiagram/command/CommandArchimateMultilines.java +++ b/src/net/sourceforge/plantuml/descdiagram/command/CommandArchimateMultilines.java @@ -56,6 +56,7 @@ import net.sourceforge.plantuml.regex.RegexLeaf; import net.sourceforge.plantuml.regex.RegexOptional; import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.stereo.Stereotype; +import net.sourceforge.plantuml.stereo.StereotypePattern; import net.sourceforge.plantuml.url.UrlBuilder; import net.sourceforge.plantuml.utils.BlocLines; @@ -77,13 +78,7 @@ public class CommandArchimateMultilines extends CommandMultilines2\\>)") // - )), // - RegexLeaf.spaceZeroOrMore(), // + StereotypePattern.optionalArchimate("STEREOTYPE"), // UrlBuilder.OPTIONAL, // RegexLeaf.spaceZeroOrMore(), // ColorParser.exp1(), // @@ -108,7 +103,7 @@ public class CommandArchimateMultilines extends CommandMultilines2\\>)")// - )), // - RegexLeaf.spaceZeroOrMore(), // + StereotypePattern.optional("STEREOTYPE2"), // new RegexLeaf("as"), // RegexLeaf.spaceOneOrMore(), // new RegexLeaf("CODE2", CODE)), // new RegexConcat(// new RegexLeaf("CODE3", CODE), // - new RegexOptional( // - new RegexConcat( // - RegexLeaf.spaceOneOrMore(), // - new RegexLeaf("STEREOTYPE3", "(\\<\\<.+\\>\\>)") // - )), // - RegexLeaf.spaceOneOrMore(), // + StereotypePattern.optional("STEREOTYPE3"), // new RegexLeaf("as"), // RegexLeaf.spaceZeroOrMore(), // new RegexLeaf("DISPLAY3", DISPLAY)), // new RegexConcat(// new RegexLeaf("DISPLAY4", DISPLAY_WITHOUT_QUOTE), // - new RegexOptional( // - new RegexConcat( // - RegexLeaf.spaceOneOrMore(), // - new RegexLeaf("STEREOTYPE4", "(\\<\\<.+\\>\\>)") // - )), // - RegexLeaf.spaceZeroOrMore(), // + StereotypePattern.optional("STEREOTYPE4"), // new RegexLeaf("as"), // RegexLeaf.spaceOneOrMore(), // new RegexLeaf("CODE4", CODE)) // ), // RegexLeaf.spaceZeroOrMore(), // new RegexLeaf("TAGS1", Stereotag.pattern() + "?"), // - RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("STEREOTYPE", "(\\<\\<.+\\>\\>)?"), // - RegexLeaf.spaceZeroOrMore(), // + StereotypePattern.optional("STEREOTYPE"), // new RegexLeaf("TAGS2", Stereotag.pattern() + "?"), // RegexLeaf.spaceZeroOrMore(), // UrlBuilder.OPTIONAL, // diff --git a/src/net/sourceforge/plantuml/descdiagram/command/CommandCreateElementMultilines.java b/src/net/sourceforge/plantuml/descdiagram/command/CommandCreateElementMultilines.java index 3dc3a4665..eeba727d1 100644 --- a/src/net/sourceforge/plantuml/descdiagram/command/CommandCreateElementMultilines.java +++ b/src/net/sourceforge/plantuml/descdiagram/command/CommandCreateElementMultilines.java @@ -59,6 +59,7 @@ import net.sourceforge.plantuml.regex.RegexConcat; import net.sourceforge.plantuml.regex.RegexLeaf; import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.stereo.Stereotype; +import net.sourceforge.plantuml.stereo.StereotypePattern; import net.sourceforge.plantuml.url.Url; import net.sourceforge.plantuml.url.UrlBuilder; import net.sourceforge.plantuml.url.UrlMode; @@ -93,9 +94,7 @@ public class CommandCreateElementMultilines extends CommandMultilines2\\>)?"), // - RegexLeaf.spaceZeroOrMore(), // + StereotypePattern.optional("STEREO"), // UrlBuilder.OPTIONAL, // RegexLeaf.spaceZeroOrMore(), // ColorParser.exp1(), // @@ -110,9 +109,7 @@ public class CommandCreateElementMultilines extends CommandMultilines2\\>)?"), // - RegexLeaf.spaceZeroOrMore(), // + StereotypePattern.optional("STEREO"), // UrlBuilder.OPTIONAL, // RegexLeaf.spaceZeroOrMore(), // ColorParser.exp1(), // diff --git a/src/net/sourceforge/plantuml/descdiagram/command/CommandLinkElement.java b/src/net/sourceforge/plantuml/descdiagram/command/CommandLinkElement.java index b607964eb..bbc59b124 100644 --- a/src/net/sourceforge/plantuml/descdiagram/command/CommandLinkElement.java +++ b/src/net/sourceforge/plantuml/descdiagram/command/CommandLinkElement.java @@ -59,6 +59,7 @@ import net.sourceforge.plantuml.regex.RegexOptional; import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.skin.ActorStyle; import net.sourceforge.plantuml.stereo.Stereotype; +import net.sourceforge.plantuml.stereo.StereotypePattern; import net.sourceforge.plantuml.utils.Direction; import net.sourceforge.plantuml.utils.LineLocation; @@ -104,9 +105,7 @@ public class CommandLinkElement extends SingleLineCommand2 { // RegexLeaf.spaceZeroOrMore(), // color().getRegex(), // - RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("STEREOTYPE", "(\\<\\<.*\\>\\>)?"), // - RegexLeaf.spaceZeroOrMore(), // + StereotypePattern.optional("STEREOTYPE"), // new RegexLeaf("LABEL_LINK", "(?::[%s]*(.+))?"), // RegexLeaf.end()); } diff --git a/src/net/sourceforge/plantuml/descdiagram/command/CommandPackageWithUSymbol.java b/src/net/sourceforge/plantuml/descdiagram/command/CommandPackageWithUSymbol.java index 92a2e931a..fbbfa15a9 100644 --- a/src/net/sourceforge/plantuml/descdiagram/command/CommandPackageWithUSymbol.java +++ b/src/net/sourceforge/plantuml/descdiagram/command/CommandPackageWithUSymbol.java @@ -57,6 +57,7 @@ import net.sourceforge.plantuml.regex.RegexOr; import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.stereo.Stereotag; import net.sourceforge.plantuml.stereo.Stereotype; +import net.sourceforge.plantuml.stereo.StereotypePattern; import net.sourceforge.plantuml.url.Url; import net.sourceforge.plantuml.url.UrlBuilder; import net.sourceforge.plantuml.url.UrlMode; @@ -115,9 +116,7 @@ public class CommandPackageWithUSymbol extends SingleLineCommand2\\>)?"), // - RegexLeaf.spaceZeroOrMore(), // + StereotypePattern.optional("STEREOTYPE"), // new RegexLeaf("TAGS2", Stereotag.pattern() + "?"), // RegexLeaf.spaceZeroOrMore(), // UrlBuilder.OPTIONAL, // diff --git a/src/net/sourceforge/plantuml/ebnf/PSystemEbnf.java b/src/net/sourceforge/plantuml/ebnf/PSystemEbnf.java index 9604c7f74..ccf0e1649 100644 --- a/src/net/sourceforge/plantuml/ebnf/PSystemEbnf.java +++ b/src/net/sourceforge/plantuml/ebnf/PSystemEbnf.java @@ -97,11 +97,11 @@ public class PSystemEbnf extends TitledDiagram { @Override protected ImageData exportDiagramNow(OutputStream os, int index, FileFormatOption fileFormatOption) throws IOException { - return createImageBuilder(fileFormatOption).drawable(getTextBlock()).write(os); + return createImageBuilder(fileFormatOption).drawable(getTextMainBlock(fileFormatOption)).write(os); } @Override - protected TextBlock getTextBlock() { + protected TextBlock getTextMainBlock(FileFormatOption fileFormatOption) { if (expressions.size() == 0) { final Style style = ETile.getStyleSignature().getMergedStyle(getSkinParam().getCurrentStyleBuilder()); final FontConfiguration fc = style.getFontConfiguration(getSkinParam().getIHtmlColorSet()); diff --git a/src/net/sourceforge/plantuml/filesdiagram/FilesDiagram.java b/src/net/sourceforge/plantuml/filesdiagram/FilesDiagram.java index b5142b7c0..891ad8940 100644 --- a/src/net/sourceforge/plantuml/filesdiagram/FilesDiagram.java +++ b/src/net/sourceforge/plantuml/filesdiagram/FilesDiagram.java @@ -89,11 +89,11 @@ public class FilesDiagram extends UmlDiagram { protected ImageData exportDiagramInternal(OutputStream os, int index, FileFormatOption fileFormatOption) throws IOException { - return createImageBuilder(fileFormatOption).drawable(getTextBlock()).write(os); + return createImageBuilder(fileFormatOption).drawable(getTextMainBlock(fileFormatOption)).write(os); } @Override - protected TextBlock getTextBlock() { + protected TextBlock getTextMainBlock(FileFormatOption fileFormatOption) { return list; } diff --git a/src/net/sourceforge/plantuml/flowdiagram/FlowDiagram.java b/src/net/sourceforge/plantuml/flowdiagram/FlowDiagram.java index 7d4b21638..5b4b4b125 100644 --- a/src/net/sourceforge/plantuml/flowdiagram/FlowDiagram.java +++ b/src/net/sourceforge/plantuml/flowdiagram/FlowDiagram.java @@ -230,7 +230,7 @@ public class FlowDiagram extends UmlDiagram implements TextBlock { } @Override - protected TextBlock getTextBlock() { + protected TextBlock getTextMainBlock(FileFormatOption fileFormatOption) { return this; } diff --git a/src/net/sourceforge/plantuml/gitlog/GitDiagram.java b/src/net/sourceforge/plantuml/gitlog/GitDiagram.java index b355612cf..f1ad5fd1e 100644 --- a/src/net/sourceforge/plantuml/gitlog/GitDiagram.java +++ b/src/net/sourceforge/plantuml/gitlog/GitDiagram.java @@ -68,7 +68,7 @@ public class GitDiagram extends UmlDiagram { protected ImageData exportDiagramInternal(OutputStream os, int index, FileFormatOption fileFormatOption) throws IOException { - return createImageBuilder(fileFormatOption).drawable(getTextBlock()).write(os); + return createImageBuilder(fileFormatOption).drawable(getTextMainBlock(fileFormatOption)).write(os); } private void drawInternal(UGraphic ug) { @@ -84,7 +84,7 @@ public class GitDiagram extends UmlDiagram { } @Override - protected TextBlock getTextBlock() { + protected TextBlock getTextMainBlock(FileFormatOption fileFormatOption) { return new AbstractTextBlock() { public void drawU(UGraphic ug) { diff --git a/src/net/sourceforge/plantuml/help/Help.java b/src/net/sourceforge/plantuml/help/Help.java index 36962e0a5..cc7322dbb 100644 --- a/src/net/sourceforge/plantuml/help/Help.java +++ b/src/net/sourceforge/plantuml/help/Help.java @@ -96,7 +96,7 @@ public class Help extends UmlDiagram { } @Override - protected TextBlock getTextBlock() { + protected TextBlock getTextMainBlock(FileFormatOption fileFormatOption) { throw new UnsupportedOperationException(); } diff --git a/src/net/sourceforge/plantuml/jsondiagram/JsonDiagram.java b/src/net/sourceforge/plantuml/jsondiagram/JsonDiagram.java index 7aabbed27..cdc6eb494 100644 --- a/src/net/sourceforge/plantuml/jsondiagram/JsonDiagram.java +++ b/src/net/sourceforge/plantuml/jsondiagram/JsonDiagram.java @@ -94,7 +94,7 @@ public class JsonDiagram extends TitledDiagram { protected ImageData exportDiagramNow(OutputStream os, int index, FileFormatOption fileFormatOption) throws IOException { - return createImageBuilder(fileFormatOption).drawable(getTextBlock()).write(os); + return createImageBuilder(fileFormatOption).drawable(getTextMainBlock(fileFormatOption)).write(os); } private void drawInternal(UGraphic ug) { @@ -113,7 +113,7 @@ public class JsonDiagram extends TitledDiagram { } @Override - protected TextBlock getTextBlock() { + protected TextBlock getTextMainBlock(final FileFormatOption fileFormatOption) { return new AbstractTextBlock() { public void drawU(UGraphic ug) { @@ -121,7 +121,7 @@ public class JsonDiagram extends TitledDiagram { } public XDimension2D calculateDimension(StringBounder stringBounder) { - return TextBlockUtils.getMinMax(getTextBlock(), stringBounder, true).getDimension(); + return TextBlockUtils.getMinMax(getTextMainBlock(fileFormatOption), stringBounder, true).getDimension(); } }; } diff --git a/src/net/sourceforge/plantuml/klimt/sprite/ListSpriteDiagram.java b/src/net/sourceforge/plantuml/klimt/sprite/ListSpriteDiagram.java index b23c5610d..ec49bdf7d 100644 --- a/src/net/sourceforge/plantuml/klimt/sprite/ListSpriteDiagram.java +++ b/src/net/sourceforge/plantuml/klimt/sprite/ListSpriteDiagram.java @@ -79,11 +79,11 @@ public class ListSpriteDiagram extends UmlDiagram { protected ImageData exportDiagramInternal(OutputStream os, int index, FileFormatOption fileFormatOption) throws IOException { - return createImageBuilder(fileFormatOption).drawable(getTextBlock()).write(os); + return createImageBuilder(fileFormatOption).drawable(getTextMainBlock(fileFormatOption)).write(os); } @Override - protected TextBlock getTextBlock() { + protected TextBlock getTextMainBlock(FileFormatOption fileFormatOption) { return new AbstractTextBlock() { public void drawU(UGraphic ug) { diff --git a/src/net/sourceforge/plantuml/klimt/sprite/StdlibDiagram.java b/src/net/sourceforge/plantuml/klimt/sprite/StdlibDiagram.java index f637002ea..74c0f7ec5 100644 --- a/src/net/sourceforge/plantuml/klimt/sprite/StdlibDiagram.java +++ b/src/net/sourceforge/plantuml/klimt/sprite/StdlibDiagram.java @@ -91,11 +91,11 @@ public class StdlibDiagram extends UmlDiagram { protected ImageData exportDiagramInternal(OutputStream os, int index, FileFormatOption fileFormatOption) throws IOException { - return createImageBuilder(fileFormatOption).drawable(getTextBlock()).write(os); + return createImageBuilder(fileFormatOption).drawable(getTextMainBlock(fileFormatOption)).write(os); } @Override - protected TextBlock getTextBlock() { + protected TextBlock getTextMainBlock(FileFormatOption fileFormatOption) { return new AbstractTextBlock() { public void drawU(UGraphic ug) { diff --git a/src/net/sourceforge/plantuml/mindmap/MindMapDiagram.java b/src/net/sourceforge/plantuml/mindmap/MindMapDiagram.java index d1981b833..975e3d791 100644 --- a/src/net/sourceforge/plantuml/mindmap/MindMapDiagram.java +++ b/src/net/sourceforge/plantuml/mindmap/MindMapDiagram.java @@ -83,11 +83,11 @@ public class MindMapDiagram extends UmlDiagram { protected ImageData exportDiagramInternal(OutputStream os, int index, FileFormatOption fileFormatOption) throws IOException { - return createImageBuilder(fileFormatOption).drawable(getTextBlock()).write(os); + return createImageBuilder(fileFormatOption).drawable(getTextMainBlock(fileFormatOption)).write(os); } @Override - protected TextBlock getTextBlock() { + protected TextBlock getTextMainBlock(FileFormatOption fileFormatOption) { return new AbstractTextBlock() { public void drawU(UGraphic ug) { diff --git a/src/net/sourceforge/plantuml/nwdiag/NwDiagram.java b/src/net/sourceforge/plantuml/nwdiag/NwDiagram.java index 6bc30d64e..6f9074546 100644 --- a/src/net/sourceforge/plantuml/nwdiag/NwDiagram.java +++ b/src/net/sourceforge/plantuml/nwdiag/NwDiagram.java @@ -331,11 +331,11 @@ public class NwDiagram extends UmlDiagram { protected ImageData exportDiagramInternal(OutputStream os, int index, FileFormatOption fileFormatOption) throws IOException { - return createImageBuilder(fileFormatOption).drawable(getTextBlock()).write(os); + return createImageBuilder(fileFormatOption).drawable(getTextMainBlock(fileFormatOption)).write(os); } @Override - protected TextBlock getTextBlock() { + protected TextBlock getTextMainBlock(FileFormatOption fileFormatOption) { return new AbstractTextBlock() { public void drawU(UGraphic ug) { drawMe(ug); diff --git a/src/net/sourceforge/plantuml/objectdiagram/command/CommandCreateEntityObject.java b/src/net/sourceforge/plantuml/objectdiagram/command/CommandCreateEntityObject.java index 403e67b21..3c5d4ded5 100644 --- a/src/net/sourceforge/plantuml/objectdiagram/command/CommandCreateEntityObject.java +++ b/src/net/sourceforge/plantuml/objectdiagram/command/CommandCreateEntityObject.java @@ -52,6 +52,7 @@ import net.sourceforge.plantuml.regex.RegexConcat; import net.sourceforge.plantuml.regex.RegexLeaf; import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.stereo.Stereotype; +import net.sourceforge.plantuml.stereo.StereotypePattern; import net.sourceforge.plantuml.url.Url; import net.sourceforge.plantuml.url.UrlBuilder; import net.sourceforge.plantuml.url.UrlMode; @@ -68,9 +69,7 @@ public class CommandCreateEntityObject extends SingleLineCommand2\\>)?"), // - RegexLeaf.spaceZeroOrMore(), // + StereotypePattern.optional("STEREO"), // UrlBuilder.OPTIONAL, // RegexLeaf.spaceZeroOrMore(), // ColorParser.exp1(), RegexLeaf.end()); diff --git a/src/net/sourceforge/plantuml/objectdiagram/command/CommandCreateEntityObjectMultilines.java b/src/net/sourceforge/plantuml/objectdiagram/command/CommandCreateEntityObjectMultilines.java index ec7457a56..de7209791 100644 --- a/src/net/sourceforge/plantuml/objectdiagram/command/CommandCreateEntityObjectMultilines.java +++ b/src/net/sourceforge/plantuml/objectdiagram/command/CommandCreateEntityObjectMultilines.java @@ -55,6 +55,7 @@ import net.sourceforge.plantuml.regex.RegexLeaf; import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.skin.VisibilityModifier; import net.sourceforge.plantuml.stereo.Stereotype; +import net.sourceforge.plantuml.stereo.StereotypePattern; import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.url.UrlBuilder; import net.sourceforge.plantuml.utils.BlocLines; @@ -70,9 +71,7 @@ public class CommandCreateEntityObjectMultilines extends CommandMultilines2\\>)?"), // - RegexLeaf.spaceZeroOrMore(), // + StereotypePattern.optional("STEREO"), // UrlBuilder.OPTIONAL, // RegexLeaf.spaceZeroOrMore(), // ColorParser.exp1(), // diff --git a/src/net/sourceforge/plantuml/objectdiagram/command/CommandCreateJson.java b/src/net/sourceforge/plantuml/objectdiagram/command/CommandCreateJson.java index 94f3c4c13..ad217dd09 100644 --- a/src/net/sourceforge/plantuml/objectdiagram/command/CommandCreateJson.java +++ b/src/net/sourceforge/plantuml/objectdiagram/command/CommandCreateJson.java @@ -59,6 +59,7 @@ import net.sourceforge.plantuml.regex.RegexConcat; import net.sourceforge.plantuml.regex.RegexLeaf; import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.stereo.Stereotype; +import net.sourceforge.plantuml.stereo.StereotypePattern; import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.url.UrlBuilder; import net.sourceforge.plantuml.utils.BlocLines; @@ -74,9 +75,7 @@ public class CommandCreateJson extends CommandMultilines2 new RegexLeaf("TYPE", "json"), // RegexLeaf.spaceOneOrMore(), // new RegexLeaf("NAME", "(?:[%g]([^%g]+)[%g][%s]+as[%s]+)?([%pLN_.]+)"), // - RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("STEREO", "(\\<\\<.+\\>\\>)?"), // - RegexLeaf.spaceZeroOrMore(), // + StereotypePattern.optional("STEREO"), // UrlBuilder.OPTIONAL, // RegexLeaf.spaceZeroOrMore(), // ColorParser.exp1(), // diff --git a/src/net/sourceforge/plantuml/objectdiagram/command/CommandCreateJsonSingleLine.java b/src/net/sourceforge/plantuml/objectdiagram/command/CommandCreateJsonSingleLine.java index fbdc4aa76..b185f30aa 100644 --- a/src/net/sourceforge/plantuml/objectdiagram/command/CommandCreateJsonSingleLine.java +++ b/src/net/sourceforge/plantuml/objectdiagram/command/CommandCreateJsonSingleLine.java @@ -56,6 +56,7 @@ import net.sourceforge.plantuml.regex.RegexConcat; import net.sourceforge.plantuml.regex.RegexLeaf; import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.stereo.Stereotype; +import net.sourceforge.plantuml.stereo.StereotypePattern; import net.sourceforge.plantuml.url.UrlBuilder; import net.sourceforge.plantuml.utils.LineLocation; @@ -70,9 +71,7 @@ public class CommandCreateJsonSingleLine extends SingleLineCommand2\\>)?"), // - RegexLeaf.spaceZeroOrMore(), // + StereotypePattern.optional("STEREO"), // UrlBuilder.OPTIONAL, // RegexLeaf.spaceZeroOrMore(), // ColorParser.exp1(), // diff --git a/src/net/sourceforge/plantuml/objectdiagram/command/CommandCreateMap.java b/src/net/sourceforge/plantuml/objectdiagram/command/CommandCreateMap.java index 8e2cbe564..939c14edf 100644 --- a/src/net/sourceforge/plantuml/objectdiagram/command/CommandCreateMap.java +++ b/src/net/sourceforge/plantuml/objectdiagram/command/CommandCreateMap.java @@ -62,6 +62,7 @@ import net.sourceforge.plantuml.regex.RegexLeaf; import net.sourceforge.plantuml.regex.RegexOptional; import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.stereo.Stereotype; +import net.sourceforge.plantuml.stereo.StereotypePattern; import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.url.UrlBuilder; import net.sourceforge.plantuml.utils.BlocLines; @@ -77,9 +78,7 @@ public class CommandCreateMap extends CommandMultilines2 new RegexLeaf("TYPE", "map"), // RegexLeaf.spaceOneOrMore(), // new RegexLeaf("NAME", "(?:[%g]([^%g]+)[%g][%s]+as[%s]+)?([%pLN_.]+)"), // - RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("STEREO", "(\\<\\<.+\\>\\>)?"), // - RegexLeaf.spaceZeroOrMore(), // + StereotypePattern.optional("STEREO"), // UrlBuilder.OPTIONAL, // RegexLeaf.spaceZeroOrMore(), // color().getRegex(), // diff --git a/src/net/sourceforge/plantuml/project/GanttDiagram.java b/src/net/sourceforge/plantuml/project/GanttDiagram.java index 6314bdc33..529e21ae8 100644 --- a/src/net/sourceforge/plantuml/project/GanttDiagram.java +++ b/src/net/sourceforge/plantuml/project/GanttDiagram.java @@ -51,7 +51,6 @@ import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; -import net.sourceforge.plantuml.FileFormat; import net.sourceforge.plantuml.FileFormatOption; import net.sourceforge.plantuml.TitledDiagram; import net.sourceforge.plantuml.WithSprite; @@ -162,7 +161,7 @@ public class GanttDiagram extends TitledDiagram implements ToTaskDraw, WithSprit } public DiagramDescription getDescription() { - return new DiagramDescription("(Project)"); + return new DiagramDescription("(Gantt)"); } public void setWeekNumberStrategy(DayOfWeek firstDayOfWeek, int minimalDaysInFirstWeek) { @@ -180,8 +179,7 @@ public class GanttDiagram extends TitledDiagram implements ToTaskDraw, WithSprit @Override protected ImageData exportDiagramNow(OutputStream os, int index, FileFormatOption fileFormatOption) throws IOException { - final StringBounder stringBounder = fileFormatOption.getDefaultStringBounder(getSkinParam()); - return createImageBuilder(fileFormatOption).drawable(getTextBlock(stringBounder)).write(os); + return createImageBuilder(fileFormatOption).drawable(getTextMainBlock(fileFormatOption)).write(os); } public void setPrintScale(PrintScale printScale) { @@ -220,13 +218,8 @@ public class GanttDiagram extends TitledDiagram implements ToTaskDraw, WithSprit } @Override - protected TextBlock getTextBlock() { - final FileFormatOption fileFormatOption = new FileFormatOption(FileFormat.PNG); + protected TextBlock getTextMainBlock(FileFormatOption fileFormatOption) { final StringBounder stringBounder = fileFormatOption.getDefaultStringBounder(getSkinParam()); - return getTextBlock(stringBounder); - } - - private TextBlock getTextBlock(StringBounder stringBounder) { if (printStart == null) { initMinMax(); } else { @@ -450,13 +443,12 @@ public class GanttDiagram extends TitledDiagram implements ToTaskDraw, WithSprit } else if (task instanceof TaskGroup) { final TaskGroup taskGroup = (TaskGroup) task; draw = new TaskDrawGroup(timeScale, y, taskGroup.getCode().getSimpleDisplay(), getStart(taskGroup), - getEnd(taskGroup), getSkinParam(), task, this, task.getStyleBuilder()); + getEnd(taskGroup), task, this, task.getStyleBuilder()); } else { final TaskImpl tmp = (TaskImpl) task; final String disp = hideResourceName ? tmp.getCode().getSimpleDisplay() : tmp.getPrettyDisplay(); if (tmp.isDiamond()) { - draw = new TaskDrawDiamond(timeScale, y, disp, getStart(tmp), getSkinParam(), task, this, - task.getStyleBuilder()); + draw = new TaskDrawDiamond(timeScale, y, disp, getStart(tmp), task, this, task.getStyleBuilder()); } else { final boolean oddStart = printStart != null && min.compareTo(getStart(tmp)) == 0; final boolean oddEnd = printStart != null && max.compareTo(getEnd(tmp)) == 0; diff --git a/src/net/sourceforge/plantuml/project/GanttDiagramFactory.java b/src/net/sourceforge/plantuml/project/GanttDiagramFactory.java index eb7d662d3..ceb183bcb 100644 --- a/src/net/sourceforge/plantuml/project/GanttDiagramFactory.java +++ b/src/net/sourceforge/plantuml/project/GanttDiagramFactory.java @@ -79,8 +79,8 @@ import net.sourceforge.plantuml.style.CommandStyleMultilinesCSS; public class GanttDiagramFactory extends PSystemCommandFactory { - static private final List subjects() { - return Arrays.asList(SubjectTask.ME, SubjectProject.ME, SubjectDayOfWeek.ME, SubjectDayAsDate.ME, + static private final List> subjects() { + return Arrays.asList(SubjectTask.ME, SubjectProject.ME, SubjectDayOfWeek.ME, SubjectDayAsDate.ME, SubjectDaysAsDates.ME, SubjectResource.ME, SubjectToday.ME, SubjectSeparator.ME); } @@ -120,28 +120,28 @@ public class GanttDiagramFactory extends PSystemCommandFactory { } private void addLanguageCommands(List cmd) { - for (Subject subject : subjects()) - for (SentenceSimple sentenceA : subject.getSentences()) { + for (Subject subject : subjects()) + for (SentenceSimple sentenceA : subject.getSentences()) { cmd.add(NaturalCommand.create(sentenceA)); - for (SentenceSimple sentenceB : subject.getSentences()) { + for (SentenceSimple sentenceB : subject.getSentences()) { final String signatureA = sentenceA.getSignature(); final String signatureB = sentenceB.getSignature(); if (signatureA.equals(signatureB) == false) - cmd.add(NaturalCommand.create(new SentenceAnd(sentenceA, sentenceB))); + cmd.add(NaturalCommand.create(new SentenceAnd(sentenceA, sentenceB))); } } - for (Subject subject : subjects()) - for (SentenceSimple sentenceA : subject.getSentences()) - for (SentenceSimple sentenceB : subject.getSentences()) - for (SentenceSimple sentenceC : subject.getSentences()) { + for (Subject subject : subjects()) + for (SentenceSimple sentenceA : subject.getSentences()) + for (SentenceSimple sentenceB : subject.getSentences()) + for (SentenceSimple sentenceC : subject.getSentences()) { final String signatureA = sentenceA.getSignature(); final String signatureB = sentenceB.getSignature(); final String signatureC = sentenceC.getSignature(); if (signatureA.equals(signatureB) == false && signatureA.equals(signatureC) == false && signatureC.equals(signatureB) == false) - cmd.add(NaturalCommand.create(new SentenceAndAnd(sentenceA, sentenceB, sentenceC))); + cmd.add(NaturalCommand.create(new SentenceAndAnd(sentenceA, sentenceB, sentenceC))); } } diff --git a/src/net/sourceforge/plantuml/project/TimeHeaderParameters.java b/src/net/sourceforge/plantuml/project/TimeHeaderParameters.java index 14cab9795..c140797ac 100644 --- a/src/net/sourceforge/plantuml/project/TimeHeaderParameters.java +++ b/src/net/sourceforge/plantuml/project/TimeHeaderParameters.java @@ -37,6 +37,7 @@ package net.sourceforge.plantuml.project; import java.util.Locale; import java.util.Map; +import java.util.Objects; import java.util.Set; import net.sourceforge.plantuml.klimt.UStroke; @@ -70,7 +71,7 @@ public class TimeHeaderParameters implements GanttStyle { this.scale = scale; this.min = min; this.max = max; - this.colorSet = colorSet; + this.colorSet = Objects.requireNonNull(colorSet); this.ganttStyle = ganttStyle; this.locale = locale; this.openClose = openClose; diff --git a/src/net/sourceforge/plantuml/project/command/CommandColorTask.java b/src/net/sourceforge/plantuml/project/command/CommandColorTask.java index 57f5e58c0..6c5583384 100644 --- a/src/net/sourceforge/plantuml/project/command/CommandColorTask.java +++ b/src/net/sourceforge/plantuml/project/command/CommandColorTask.java @@ -59,7 +59,8 @@ public class CommandColorTask extends SingleLineCommand2 { new RegexLeaf("CODE", "\\[([%pLN_.]+)\\]"), // RegexLeaf.spaceOneOrMore(), // new RegexLeaf("COLORS", "#(\\w+)(?:/(#?\\w+))?"), // - RegexLeaf.spaceZeroOrMore(), RegexLeaf.end()); + RegexLeaf.spaceZeroOrMore(), // + RegexLeaf.end()); } @Override diff --git a/src/net/sourceforge/plantuml/project/command/CommandFootbox.java b/src/net/sourceforge/plantuml/project/command/CommandFootbox.java index 43697e905..36ce4504c 100644 --- a/src/net/sourceforge/plantuml/project/command/CommandFootbox.java +++ b/src/net/sourceforge/plantuml/project/command/CommandFootbox.java @@ -45,7 +45,7 @@ import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; public class CommandFootbox extends SingleLineCommand2 { - // ::remove folder when __HAXE__ + // ::remove folder when __HAXE__ public CommandFootbox() { super(getRegexConcat()); @@ -55,7 +55,8 @@ public class CommandFootbox extends SingleLineCommand2 { return RegexConcat.build(CommandFootbox.class.getName(), RegexLeaf.start(), // new RegexLeaf("TYPE", "(hide|show)?"), // RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("footbox"), RegexLeaf.end()); // + new RegexLeaf("footbox"), // + RegexLeaf.end()); } @Override diff --git a/src/net/sourceforge/plantuml/project/command/CommandGanttArrow.java b/src/net/sourceforge/plantuml/project/command/CommandGanttArrow.java index 1c1c55a30..0929fd2a8 100644 --- a/src/net/sourceforge/plantuml/project/command/CommandGanttArrow.java +++ b/src/net/sourceforge/plantuml/project/command/CommandGanttArrow.java @@ -63,7 +63,8 @@ public class CommandGanttArrow extends SingleLineCommand2 { new RegexLeaf("\\>"), // RegexLeaf.spaceZeroOrMore(), // new RegexLeaf("CODE2", "([%pLN_.]+)"), // - RegexLeaf.spaceZeroOrMore(), RegexLeaf.end()); + RegexLeaf.spaceZeroOrMore(), // + RegexLeaf.end()); } @Override diff --git a/src/net/sourceforge/plantuml/project/command/CommandHideResourceFootbox.java b/src/net/sourceforge/plantuml/project/command/CommandHideResourceFootbox.java index acfa84310..08e48fa3c 100644 --- a/src/net/sourceforge/plantuml/project/command/CommandHideResourceFootbox.java +++ b/src/net/sourceforge/plantuml/project/command/CommandHideResourceFootbox.java @@ -57,7 +57,7 @@ public class CommandHideResourceFootbox extends SingleLineCommand2 new RegexLeaf("ress?ources?"), // RegexLeaf.spaceOneOrMore(), // new RegexLeaf("footbox"), // - RegexLeaf.end()); // + RegexLeaf.end()); } @Override diff --git a/src/net/sourceforge/plantuml/project/command/CommandHideResourceName.java b/src/net/sourceforge/plantuml/project/command/CommandHideResourceName.java index e343e3461..e386dee8c 100644 --- a/src/net/sourceforge/plantuml/project/command/CommandHideResourceName.java +++ b/src/net/sourceforge/plantuml/project/command/CommandHideResourceName.java @@ -57,7 +57,7 @@ public class CommandHideResourceName extends SingleLineCommand2 { new RegexLeaf("ress?ources?"), // RegexLeaf.spaceOneOrMore(), // new RegexLeaf("names?"), // - RegexLeaf.end()); // + RegexLeaf.end()); } @Override diff --git a/src/net/sourceforge/plantuml/project/command/CommandLabelOnColumn.java b/src/net/sourceforge/plantuml/project/command/CommandLabelOnColumn.java index ff2d12789..949f12e64 100644 --- a/src/net/sourceforge/plantuml/project/command/CommandLabelOnColumn.java +++ b/src/net/sourceforge/plantuml/project/command/CommandLabelOnColumn.java @@ -70,7 +70,8 @@ public class CommandLabelOnColumn extends SingleLineCommand2 { new RegexLeaf("ALIGNED", "(left|right)"), // RegexLeaf.spaceZeroOrMore(), // new RegexLeaf("aligned") // - )), RegexLeaf.end()); // + )), // + RegexLeaf.end()); } @Override diff --git a/src/net/sourceforge/plantuml/project/command/CommandLanguage.java b/src/net/sourceforge/plantuml/project/command/CommandLanguage.java index cae28078d..a8532b63d 100644 --- a/src/net/sourceforge/plantuml/project/command/CommandLanguage.java +++ b/src/net/sourceforge/plantuml/project/command/CommandLanguage.java @@ -55,7 +55,7 @@ public class CommandLanguage extends SingleLineCommand2 { new RegexLeaf("language"), // RegexLeaf.spaceOneOrMore(), // new RegexLeaf("LANG", "(\\w+)"), // - RegexLeaf.end()); // + RegexLeaf.end()); } @Override diff --git a/src/net/sourceforge/plantuml/project/command/CommandPrintBetween.java b/src/net/sourceforge/plantuml/project/command/CommandPrintBetween.java index f13460e09..5c0d1a8a5 100644 --- a/src/net/sourceforge/plantuml/project/command/CommandPrintBetween.java +++ b/src/net/sourceforge/plantuml/project/command/CommandPrintBetween.java @@ -66,7 +66,7 @@ public class CommandPrintBetween extends SingleLineCommand2 { new RegexLeaf("and"), // RegexLeaf.spaceOneOrMore(), // pattern.toRegex("END"), // - RegexLeaf.end()); // + RegexLeaf.end()); } @Override diff --git a/src/net/sourceforge/plantuml/project/command/CommandPrintScale.java b/src/net/sourceforge/plantuml/project/command/CommandPrintScale.java index c82a9c027..84b1a6edb 100644 --- a/src/net/sourceforge/plantuml/project/command/CommandPrintScale.java +++ b/src/net/sourceforge/plantuml/project/command/CommandPrintScale.java @@ -77,7 +77,7 @@ public class CommandPrintScale extends SingleLineCommand2 { new RegexLeaf("zoom"), // RegexLeaf.spaceOneOrMore(), // new RegexLeaf("ZOOM", "([.\\d]+)"))), // - RegexLeaf.end()); // + RegexLeaf.end()); } @Override diff --git a/src/net/sourceforge/plantuml/project/command/CommandTaskCompleteDefault.java b/src/net/sourceforge/plantuml/project/command/CommandTaskCompleteDefault.java index aeec499cd..794c91455 100644 --- a/src/net/sourceforge/plantuml/project/command/CommandTaskCompleteDefault.java +++ b/src/net/sourceforge/plantuml/project/command/CommandTaskCompleteDefault.java @@ -64,7 +64,6 @@ public class CommandTaskCompleteDefault extends SingleLineCommand2 RegexLeaf.spaceOneOrMore(), // new RegexLeaf("VALUE", "(\\d+)"), // new RegexLeaf(".*"), // - RegexLeaf.spaceZeroOrMore(), // RegexLeaf.end()); } diff --git a/src/net/sourceforge/plantuml/project/command/NaturalCommand.java b/src/net/sourceforge/plantuml/project/command/NaturalCommand.java index 2da5d3792..88511e131 100644 --- a/src/net/sourceforge/plantuml/project/command/NaturalCommand.java +++ b/src/net/sourceforge/plantuml/project/command/NaturalCommand.java @@ -37,27 +37,27 @@ package net.sourceforge.plantuml.project.command; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; -import net.sourceforge.plantuml.project.GanttDiagram; +import net.sourceforge.plantuml.core.Diagram; import net.sourceforge.plantuml.project.lang.Sentence; import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.utils.LineLocation; -public class NaturalCommand extends SingleLineCommand2 { +public class NaturalCommand extends SingleLineCommand2 { - private final Sentence sentence; + private final Sentence sentence; - public NaturalCommand(Sentence sentence) { + public NaturalCommand(Sentence sentence) { super(sentence.toRegex()); this.sentence = sentence; } @Override - final protected CommandExecutionResult executeArg(GanttDiagram system, LineLocation location, RegexResult arg) { + final protected CommandExecutionResult executeArg(D system, LineLocation location, RegexResult arg) { return sentence.execute(system, arg); } - public static NaturalCommand create(Sentence sentence) { - return new NaturalCommand(sentence); + public static NaturalCommand create(Sentence sentence) { + return new NaturalCommand(sentence); } diff --git a/src/net/sourceforge/plantuml/project/core/AbstractTask.java b/src/net/sourceforge/plantuml/project/core/AbstractTask.java index 549e2c11f..69d385016 100644 --- a/src/net/sourceforge/plantuml/project/core/AbstractTask.java +++ b/src/net/sourceforge/plantuml/project/core/AbstractTask.java @@ -35,6 +35,7 @@ */ package net.sourceforge.plantuml.project.core; +import net.sourceforge.plantuml.stereo.Stereotype; import net.sourceforge.plantuml.style.StyleBuilder; public abstract class AbstractTask implements Task { @@ -44,6 +45,7 @@ public abstract class AbstractTask implements Task { private Task row; private String displayString; + private Stereotype stereotype; protected AbstractTask(StyleBuilder styleBuilder, TaskCode code) { this.styleBuilder = styleBuilder; @@ -80,5 +82,16 @@ public abstract class AbstractTask implements Task { public String getDisplayString() { return this.displayString; } + + @Override + public Stereotype getStereotype() { + return stereotype; + } + + @Override + public final void setStereotype(Stereotype stereotype) { + this.stereotype = stereotype; + } + } diff --git a/src/net/sourceforge/plantuml/project/core/Task.java b/src/net/sourceforge/plantuml/project/core/Task.java index 467274875..b6b2bc351 100644 --- a/src/net/sourceforge/plantuml/project/core/Task.java +++ b/src/net/sourceforge/plantuml/project/core/Task.java @@ -40,6 +40,7 @@ import net.sourceforge.plantuml.project.Load; import net.sourceforge.plantuml.project.lang.CenterBorderColor; import net.sourceforge.plantuml.project.time.Day; import net.sourceforge.plantuml.project.time.DayOfWeek; +import net.sourceforge.plantuml.stereo.Stereotype; import net.sourceforge.plantuml.style.StyleBuilder; import net.sourceforge.plantuml.url.Url; @@ -85,4 +86,8 @@ public interface Task extends Moment { public String getDisplayString(); + public Stereotype getStereotype(); + + public void setStereotype(Stereotype stereotype); + } diff --git a/src/net/sourceforge/plantuml/project/draw/AbstractTaskDraw.java b/src/net/sourceforge/plantuml/project/draw/AbstractTaskDraw.java index 70c21a718..7d501e98e 100644 --- a/src/net/sourceforge/plantuml/project/draw/AbstractTaskDraw.java +++ b/src/net/sourceforge/plantuml/project/draw/AbstractTaskDraw.java @@ -49,11 +49,11 @@ import net.sourceforge.plantuml.project.time.Day; import net.sourceforge.plantuml.project.timescale.TimeScale; import net.sourceforge.plantuml.real.Real; import net.sourceforge.plantuml.style.ClockwiseTopRightBottomLeft; -import net.sourceforge.plantuml.style.ISkinParam; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.style.StyleBuilder; +import net.sourceforge.plantuml.style.StyleSignature; import net.sourceforge.plantuml.style.StyleSignatureBasic; import net.sourceforge.plantuml.url.Url; import net.sourceforge.plantuml.utils.Direction; @@ -85,8 +85,8 @@ public abstract class AbstractTaskDraw implements TaskDraw { this.note = note; } - public AbstractTaskDraw(TimeScale timeScale, Real y, String prettyDisplay, Day start, ISkinParam skinParam, - Task task, ToTaskDraw toTaskDraw, StyleBuilder styleBuilder) { + public AbstractTaskDraw(TimeScale timeScale, Real y, String prettyDisplay, Day start, Task task, + ToTaskDraw toTaskDraw, StyleBuilder styleBuilder) { this.y = y; this.styleBuilder = styleBuilder; this.toTaskDraw = toTaskDraw; @@ -96,7 +96,7 @@ public abstract class AbstractTaskDraw implements TaskDraw { this.task = task; } - abstract StyleSignatureBasic getStyleSignature(); + abstract StyleSignature getStyleSignature(); private StyleSignatureBasic getStyleSignatureUnstarted() { return StyleSignatureBasic.of(SName.root, SName.element, SName.ganttDiagram, SName.task, SName.unstarted); diff --git a/src/net/sourceforge/plantuml/project/draw/TaskDrawDiamond.java b/src/net/sourceforge/plantuml/project/draw/TaskDrawDiamond.java index df3a3854b..260579d10 100644 --- a/src/net/sourceforge/plantuml/project/draw/TaskDrawDiamond.java +++ b/src/net/sourceforge/plantuml/project/draw/TaskDrawDiamond.java @@ -54,21 +54,21 @@ import net.sourceforge.plantuml.project.time.Day; import net.sourceforge.plantuml.project.timescale.TimeScale; import net.sourceforge.plantuml.real.Real; import net.sourceforge.plantuml.style.ClockwiseTopRightBottomLeft; -import net.sourceforge.plantuml.style.ISkinParam; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.style.StyleBuilder; +import net.sourceforge.plantuml.style.StyleSignature; import net.sourceforge.plantuml.style.StyleSignatureBasic; public class TaskDrawDiamond extends AbstractTaskDraw { - public TaskDrawDiamond(TimeScale timeScale, Real y, String prettyDisplay, Day start, ISkinParam skinParam, - Task task, ToTaskDraw toTaskDraw, StyleBuilder styleBuilder) { - super(timeScale, y, prettyDisplay, start, skinParam, task, toTaskDraw, styleBuilder); + public TaskDrawDiamond(TimeScale timeScale, Real y, String prettyDisplay, Day start, Task task, + ToTaskDraw toTaskDraw, StyleBuilder styleBuilder) { + super(timeScale, y, prettyDisplay, start, task, toTaskDraw, styleBuilder); } @Override - StyleSignatureBasic getStyleSignature() { + StyleSignature getStyleSignature() { return StyleSignatureBasic.of(SName.root, SName.element, SName.ganttDiagram, SName.milestone); } diff --git a/src/net/sourceforge/plantuml/project/draw/TaskDrawGroup.java b/src/net/sourceforge/plantuml/project/draw/TaskDrawGroup.java index 88ff50d60..346182887 100644 --- a/src/net/sourceforge/plantuml/project/draw/TaskDrawGroup.java +++ b/src/net/sourceforge/plantuml/project/draw/TaskDrawGroup.java @@ -54,22 +54,19 @@ import net.sourceforge.plantuml.project.time.Day; import net.sourceforge.plantuml.project.timescale.TimeScale; import net.sourceforge.plantuml.real.Real; import net.sourceforge.plantuml.style.ClockwiseTopRightBottomLeft; -import net.sourceforge.plantuml.style.ISkinParam; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.style.StyleBuilder; +import net.sourceforge.plantuml.style.StyleSignature; import net.sourceforge.plantuml.style.StyleSignatureBasic; public class TaskDrawGroup extends AbstractTaskDraw { private final Day end; - private final ISkinParam skinParam; - - public TaskDrawGroup(TimeScale timeScale, Real y, String prettyDisplay, Day start, Day end, ISkinParam skinParam, - Task task, ToTaskDraw toTaskDraw, StyleBuilder styleBuilder) { - super(timeScale, y, prettyDisplay, start, skinParam, task, toTaskDraw, styleBuilder); - this.skinParam = skinParam; + public TaskDrawGroup(TimeScale timeScale, Real y, String prettyDisplay, Day start, Day end, Task task, + ToTaskDraw toTaskDraw, StyleBuilder styleBuilder) { + super(timeScale, y, prettyDisplay, start, task, toTaskDraw, styleBuilder); this.end = end; } @@ -122,7 +119,7 @@ public class TaskDrawGroup extends AbstractTaskDraw { } @Override - StyleSignatureBasic getStyleSignature() { + StyleSignature getStyleSignature() { return StyleSignatureBasic.of(SName.root, SName.element, SName.ganttDiagram, SName.task); } diff --git a/src/net/sourceforge/plantuml/project/draw/TaskDrawRegular.java b/src/net/sourceforge/plantuml/project/draw/TaskDrawRegular.java index cf3cb4cab..7d8d9a1ae 100644 --- a/src/net/sourceforge/plantuml/project/draw/TaskDrawRegular.java +++ b/src/net/sourceforge/plantuml/project/draw/TaskDrawRegular.java @@ -65,11 +65,12 @@ import net.sourceforge.plantuml.project.timescale.TimeScale; import net.sourceforge.plantuml.real.Real; import net.sourceforge.plantuml.sequencediagram.graphic.Segment; import net.sourceforge.plantuml.style.ClockwiseTopRightBottomLeft; -import net.sourceforge.plantuml.style.ISkinParam; +import net.sourceforge.plantuml.style.ISkinSimple; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; import net.sourceforge.plantuml.style.StyleBuilder; +import net.sourceforge.plantuml.style.StyleSignature; import net.sourceforge.plantuml.style.StyleSignatureBasic; import net.sourceforge.plantuml.svek.image.Opale; @@ -80,13 +81,13 @@ public class TaskDrawRegular extends AbstractTaskDraw { private final boolean oddEnd; private final Collection paused; private final Collection constraints; - private final ISkinParam skinParam; + private final ISkinSimple skinSimple; public TaskDrawRegular(TimeScale timeScale, Real y, String prettyDisplay, Day start, Day end, boolean oddStart, - boolean oddEnd, ISkinParam skinParam, Task task, ToTaskDraw toTaskDraw, + boolean oddEnd, ISkinSimple skinSimple, Task task, ToTaskDraw toTaskDraw, Collection constraints, StyleBuilder styleBuilder) { - super(timeScale, y, prettyDisplay, start, skinParam, task, toTaskDraw, styleBuilder); - this.skinParam = skinParam; + super(timeScale, y, prettyDisplay, start, task, toTaskDraw, styleBuilder); + this.skinSimple = skinSimple; this.constraints = constraints; this.end = end; this.oddStart = oddStart; @@ -162,8 +163,9 @@ public class TaskDrawRegular extends AbstractTaskDraw { } @Override - StyleSignatureBasic getStyleSignature() { - return StyleSignatureBasic.of(SName.root, SName.element, SName.ganttDiagram, SName.task); + StyleSignature getStyleSignature() { + return StyleSignatureBasic.of(SName.root, SName.element, SName.ganttDiagram, SName.task) + .withTOBECHANGED(getTask().getStereotype()); } public void drawU(UGraphic ug) { @@ -202,7 +204,7 @@ public class TaskDrawRegular extends AbstractTaskDraw { final FontConfiguration fc = style.getFontConfiguration(getColorSet()); final HorizontalAlignment horizontalAlignment = style.value(PName.HorizontalAlignment).asHorizontalAlignment(); - final Sheet sheet = skinParam.sheet(fc, horizontalAlignment, CreoleMode.FULL).createSheet(note); + final Sheet sheet = skinSimple.sheet(fc, horizontalAlignment, CreoleMode.FULL).createSheet(note); final double padding = style.value(PName.Padding).asDouble(); final SheetBlock1 sheet1 = new SheetBlock1(sheet, LineBreakStrategy.NONE, padding); diff --git a/src/net/sourceforge/plantuml/project/draw/TimeHeaderSimple.java b/src/net/sourceforge/plantuml/project/draw/TimeHeaderSimple.java index 65685fe36..a837c08f1 100644 --- a/src/net/sourceforge/plantuml/project/draw/TimeHeaderSimple.java +++ b/src/net/sourceforge/plantuml/project/draw/TimeHeaderSimple.java @@ -86,7 +86,8 @@ public class TimeHeaderSimple extends TimeHeader { private void drawSmallVlinesDay(UGraphic ug, TimeScale timeScale, double totalHeightWithoutFooter) { ug = ug.apply(getLineColor()); - final ULine vbar = ULine.vline(totalHeightWithoutFooter); + ug = ug.apply(UTranslate.dy(6)); + final ULine vbar = ULine.vline(totalHeightWithoutFooter + 2); for (Day i = getMin(); i.compareTo(getMax().increment()) <= 0; i = i.increment(printScale)) { final double x1 = timeScale.getStartingPosition(i); ug.apply(UTranslate.dx(x1)).draw(vbar); @@ -120,15 +121,17 @@ public class TimeHeaderSimple extends TimeHeader { @Override public void drawTimeHeader(UGraphic ug, double totalHeightWithoutFooter) { - // drawTextsBackground(ug.apply(UTranslate.dy(-3)), totalHeightWithoutFooter + 6); + // drawTextsBackground(ug.apply(UTranslate.dy(-3)), totalHeightWithoutFooter + + // 6); final double xmin = getTimeScale().getStartingPosition(getMin()); final double xmax = getTimeScale().getEndingPosition(getMax()); - drawSmallVlinesDay(ug, getTimeScale(), totalHeightWithoutFooter + 2); + drawSmallVlinesDay(ug, getTimeScale(), totalHeightWithoutFooter); printVerticalSeparators(ug, totalHeightWithoutFooter); drawSimpleDayCounter(ug, getTimeScale()); // ug = ug.apply(getLineColor()); // ug.draw(ULine.hline(xmax - xmin)); - // ug.apply(UTranslate.dy(getFullHeaderHeight(ug.getStringBounder()) - 3)).draw(ULine.hline(xmax - xmin)); + // ug.apply(UTranslate.dy(getFullHeaderHeight(ug.getStringBounder()) - + // 3)).draw(ULine.hline(xmax - xmin)); } @@ -137,7 +140,8 @@ public class TimeHeaderSimple extends TimeHeader { final double xmin = getTimeScale().getStartingPosition(getMin()); final double xmax = getTimeScale().getEndingPosition(getMax()); ug = ug.apply(UTranslate.dy(3)); - drawSmallVlinesDay(ug, getTimeScale(), getTimeFooterHeight(ug.getStringBounder()) - 3); + // drawSmallVlinesDay(ug, getTimeScale(), + // getTimeFooterHeight(ug.getStringBounder()) - 3); drawSimpleDayCounter(ug, getTimeScale()); // ug.apply(getLineColor()).draw(ULine.hline(xmax - xmin)); } diff --git a/src/net/sourceforge/plantuml/project/draw/TimeHeaderYearly.java b/src/net/sourceforge/plantuml/project/draw/TimeHeaderYearly.java index 47893ed51..1c569b4ff 100644 --- a/src/net/sourceforge/plantuml/project/draw/TimeHeaderYearly.java +++ b/src/net/sourceforge/plantuml/project/draw/TimeHeaderYearly.java @@ -35,7 +35,6 @@ */ package net.sourceforge.plantuml.project.draw; -import net.sourceforge.plantuml.klimt.UTranslate; import net.sourceforge.plantuml.klimt.drawing.UGraphic; import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.klimt.shape.TextBlock; diff --git a/src/net/sourceforge/plantuml/project/lang/ComplementAnything.java b/src/net/sourceforge/plantuml/project/lang/ComplementAnything.java index 787e7e55a..5a9bc3c45 100644 --- a/src/net/sourceforge/plantuml/project/lang/ComplementAnything.java +++ b/src/net/sourceforge/plantuml/project/lang/ComplementAnything.java @@ -41,7 +41,7 @@ import net.sourceforge.plantuml.regex.IRegex; import net.sourceforge.plantuml.regex.RegexLeaf; import net.sourceforge.plantuml.regex.RegexResult; -public class ComplementAnything implements Something { +public class ComplementAnything implements Something { public IRegex toRegex(String suffix) { return new RegexLeaf("ANYTHING" + suffix, "(.*?)"); diff --git a/src/net/sourceforge/plantuml/project/lang/ComplementBeforeOrAfterOrAtTaskStartOrEnd.java b/src/net/sourceforge/plantuml/project/lang/ComplementBeforeOrAfterOrAtTaskStartOrEnd.java index fc61a7aad..cd8a2b411 100644 --- a/src/net/sourceforge/plantuml/project/lang/ComplementBeforeOrAfterOrAtTaskStartOrEnd.java +++ b/src/net/sourceforge/plantuml/project/lang/ComplementBeforeOrAfterOrAtTaskStartOrEnd.java @@ -45,7 +45,7 @@ import net.sourceforge.plantuml.regex.IRegex; import net.sourceforge.plantuml.regex.RegexLeaf; import net.sourceforge.plantuml.regex.RegexResult; -public class ComplementBeforeOrAfterOrAtTaskStartOrEnd implements Something { +public class ComplementBeforeOrAfterOrAtTaskStartOrEnd implements Something { private static final int POS_NB1 = 0; private static final int POS_WORKING1 = 1; diff --git a/src/net/sourceforge/plantuml/project/lang/ComplementClose.java b/src/net/sourceforge/plantuml/project/lang/ComplementClose.java index a3ef45a6e..c2c2e449d 100644 --- a/src/net/sourceforge/plantuml/project/lang/ComplementClose.java +++ b/src/net/sourceforge/plantuml/project/lang/ComplementClose.java @@ -41,7 +41,7 @@ import net.sourceforge.plantuml.regex.IRegex; import net.sourceforge.plantuml.regex.RegexLeaf; import net.sourceforge.plantuml.regex.RegexResult; -public class ComplementClose implements Something { +public class ComplementClose implements Something { public IRegex toRegex(String suffix) { return new RegexLeaf("CLOSED" + suffix, "(closed?(?: for \\[([^\\[\\]]+?)\\])?)"); diff --git a/src/net/sourceforge/plantuml/project/lang/ComplementCompleted.java b/src/net/sourceforge/plantuml/project/lang/ComplementCompleted.java index 5931f8e37..0ffcf0b1e 100644 --- a/src/net/sourceforge/plantuml/project/lang/ComplementCompleted.java +++ b/src/net/sourceforge/plantuml/project/lang/ComplementCompleted.java @@ -42,7 +42,7 @@ import net.sourceforge.plantuml.regex.IRegex; import net.sourceforge.plantuml.regex.RegexLeaf; import net.sourceforge.plantuml.regex.RegexResult; -public class ComplementCompleted implements Something { +public class ComplementCompleted implements Something { public IRegex toRegex(String suffix) { return new RegexLeaf("COMPLEMENT" + suffix, "(\\d+).*completed?"); diff --git a/src/net/sourceforge/plantuml/project/lang/ComplementDate.java b/src/net/sourceforge/plantuml/project/lang/ComplementDate.java index 032af9d04..2b70fd246 100644 --- a/src/net/sourceforge/plantuml/project/lang/ComplementDate.java +++ b/src/net/sourceforge/plantuml/project/lang/ComplementDate.java @@ -44,7 +44,7 @@ import net.sourceforge.plantuml.regex.RegexLeaf; import net.sourceforge.plantuml.regex.RegexOr; import net.sourceforge.plantuml.regex.RegexResult; -public class ComplementDate implements Something { +public class ComplementDate implements Something { private final Type type; diff --git a/src/net/sourceforge/plantuml/project/lang/ComplementDates.java b/src/net/sourceforge/plantuml/project/lang/ComplementDates.java index a48a91aed..253f3e0cf 100644 --- a/src/net/sourceforge/plantuml/project/lang/ComplementDates.java +++ b/src/net/sourceforge/plantuml/project/lang/ComplementDates.java @@ -45,7 +45,7 @@ import net.sourceforge.plantuml.regex.RegexLeaf; import net.sourceforge.plantuml.regex.RegexOr; import net.sourceforge.plantuml.regex.RegexResult; -public class ComplementDates implements Something { +public class ComplementDates implements Something { public IRegex toRegex(String suffix) { return new RegexOr(toRegexB(suffix), toRegexE(suffix)); diff --git a/src/net/sourceforge/plantuml/project/lang/ComplementDayOfWeek.java b/src/net/sourceforge/plantuml/project/lang/ComplementDayOfWeek.java index 0bf87b3fe..e0cb00362 100644 --- a/src/net/sourceforge/plantuml/project/lang/ComplementDayOfWeek.java +++ b/src/net/sourceforge/plantuml/project/lang/ComplementDayOfWeek.java @@ -43,7 +43,7 @@ import net.sourceforge.plantuml.regex.RegexConcat; import net.sourceforge.plantuml.regex.RegexLeaf; import net.sourceforge.plantuml.regex.RegexResult; -public class ComplementDayOfWeek implements Something { +public class ComplementDayOfWeek implements Something { public IRegex toRegex(String suffix) { return new RegexConcat( // diff --git a/src/net/sourceforge/plantuml/project/lang/ComplementEmpty.java b/src/net/sourceforge/plantuml/project/lang/ComplementEmpty.java index 52b5a3c96..d8ea753fe 100644 --- a/src/net/sourceforge/plantuml/project/lang/ComplementEmpty.java +++ b/src/net/sourceforge/plantuml/project/lang/ComplementEmpty.java @@ -41,7 +41,7 @@ import net.sourceforge.plantuml.regex.IRegex; import net.sourceforge.plantuml.regex.RegexLeaf; import net.sourceforge.plantuml.regex.RegexResult; -public class ComplementEmpty implements Something { +public class ComplementEmpty implements Something { public IRegex toRegex(String suffix) { return new RegexLeaf(""); diff --git a/src/net/sourceforge/plantuml/project/lang/ComplementFromTo.java b/src/net/sourceforge/plantuml/project/lang/ComplementFromTo.java index e20149962..ac0eec32b 100644 --- a/src/net/sourceforge/plantuml/project/lang/ComplementFromTo.java +++ b/src/net/sourceforge/plantuml/project/lang/ComplementFromTo.java @@ -41,7 +41,7 @@ import net.sourceforge.plantuml.regex.IRegex; import net.sourceforge.plantuml.regex.RegexLeaf; import net.sourceforge.plantuml.regex.RegexResult; -public class ComplementFromTo implements Something { +public class ComplementFromTo implements Something { public IRegex toRegex(String suffix) { return new RegexLeaf("COMPLEMENT" + suffix, "from[%s]+\\[([^\\[\\]]+)\\][%s]+to[%s]+\\[([^\\[\\]]+)\\]"); diff --git a/src/net/sourceforge/plantuml/project/lang/ComplementInColors.java b/src/net/sourceforge/plantuml/project/lang/ComplementInColors.java index 05fa7851e..a5e6cc3aa 100644 --- a/src/net/sourceforge/plantuml/project/lang/ComplementInColors.java +++ b/src/net/sourceforge/plantuml/project/lang/ComplementInColors.java @@ -42,7 +42,7 @@ import net.sourceforge.plantuml.regex.IRegex; import net.sourceforge.plantuml.regex.RegexLeaf; import net.sourceforge.plantuml.regex.RegexResult; -public class ComplementInColors implements Something { +public class ComplementInColors implements Something { public IRegex toRegex(String suffix) { return new RegexLeaf("COMPLEMENT" + suffix, "in[%s]+(#?\\w+)(?:/(#?\\w+))?"); diff --git a/src/net/sourceforge/plantuml/project/lang/ComplementInColors2.java b/src/net/sourceforge/plantuml/project/lang/ComplementInColors2.java index 1a31c1c37..d68fefc74 100644 --- a/src/net/sourceforge/plantuml/project/lang/ComplementInColors2.java +++ b/src/net/sourceforge/plantuml/project/lang/ComplementInColors2.java @@ -42,7 +42,7 @@ import net.sourceforge.plantuml.regex.IRegex; import net.sourceforge.plantuml.regex.RegexLeaf; import net.sourceforge.plantuml.regex.RegexResult; -public class ComplementInColors2 implements Something { +public class ComplementInColors2 implements Something { public IRegex toRegex(String suffix) { return new RegexLeaf("COMPLEMENT" + suffix, "colou?red[%s]+(?:in[%s]+)?(#?\\w+)(?:/(#?\\w+))?"); diff --git a/src/net/sourceforge/plantuml/project/lang/ComplementInColorsFromTo.java b/src/net/sourceforge/plantuml/project/lang/ComplementInColorsFromTo.java index 05d964cd6..ae9d67cdd 100644 --- a/src/net/sourceforge/plantuml/project/lang/ComplementInColorsFromTo.java +++ b/src/net/sourceforge/plantuml/project/lang/ComplementInColorsFromTo.java @@ -42,7 +42,7 @@ import net.sourceforge.plantuml.regex.IRegex; import net.sourceforge.plantuml.regex.RegexLeaf; import net.sourceforge.plantuml.regex.RegexResult; -public class ComplementInColorsFromTo implements Something { +public class ComplementInColorsFromTo implements Something { public IRegex toRegex(String suffix) { return new RegexLeaf("COMPLEMENT" + suffix, diff --git a/src/net/sourceforge/plantuml/project/lang/ComplementNamed.java b/src/net/sourceforge/plantuml/project/lang/ComplementNamed.java index 901aef1ba..d8f05d7aa 100644 --- a/src/net/sourceforge/plantuml/project/lang/ComplementNamed.java +++ b/src/net/sourceforge/plantuml/project/lang/ComplementNamed.java @@ -41,7 +41,7 @@ import net.sourceforge.plantuml.regex.IRegex; import net.sourceforge.plantuml.regex.RegexLeaf; import net.sourceforge.plantuml.regex.RegexResult; -public class ComplementNamed implements Something { +public class ComplementNamed implements Something { public IRegex toRegex(String suffix) { return new RegexLeaf("COMPLEMENT" + suffix, "\\[([^\\[\\]]+)\\]"); diff --git a/src/net/sourceforge/plantuml/project/lang/ComplementOpen.java b/src/net/sourceforge/plantuml/project/lang/ComplementOpen.java index c2090468d..a72a48027 100644 --- a/src/net/sourceforge/plantuml/project/lang/ComplementOpen.java +++ b/src/net/sourceforge/plantuml/project/lang/ComplementOpen.java @@ -41,7 +41,7 @@ import net.sourceforge.plantuml.regex.IRegex; import net.sourceforge.plantuml.regex.RegexLeaf; import net.sourceforge.plantuml.regex.RegexResult; -public class ComplementOpen implements Something { +public class ComplementOpen implements Something { public IRegex toRegex(String suffix) { return new RegexLeaf("OPEN" + suffix, "(opene?d?(?: for \\[([^\\[\\]]+?)\\])?)"); diff --git a/src/net/sourceforge/plantuml/project/lang/ComplementSeveralDays.java b/src/net/sourceforge/plantuml/project/lang/ComplementSeveralDays.java index 03f1ebad2..b59548795 100644 --- a/src/net/sourceforge/plantuml/project/lang/ComplementSeveralDays.java +++ b/src/net/sourceforge/plantuml/project/lang/ComplementSeveralDays.java @@ -43,7 +43,7 @@ import net.sourceforge.plantuml.regex.RegexConcat; import net.sourceforge.plantuml.regex.RegexLeaf; import net.sourceforge.plantuml.regex.RegexResult; -public class ComplementSeveralDays implements Something { +public class ComplementSeveralDays implements Something { public IRegex toRegex(String suffix) { return new RegexConcat( // diff --git a/src/net/sourceforge/plantuml/project/lang/ComplementTask.java b/src/net/sourceforge/plantuml/project/lang/ComplementTask.java index aae8a1e63..79759fcb9 100644 --- a/src/net/sourceforge/plantuml/project/lang/ComplementTask.java +++ b/src/net/sourceforge/plantuml/project/lang/ComplementTask.java @@ -42,7 +42,7 @@ import net.sourceforge.plantuml.regex.IRegex; import net.sourceforge.plantuml.regex.RegexLeaf; import net.sourceforge.plantuml.regex.RegexResult; -public class ComplementTask implements Something { +public class ComplementTask implements Something { public IRegex toRegex(String suffix) { return new RegexLeaf("COMPLEMENT" + suffix, "\\[([^\\[\\]]+?)\\]"); diff --git a/src/net/sourceforge/plantuml/project/lang/ComplementUrl.java b/src/net/sourceforge/plantuml/project/lang/ComplementUrl.java index c7499f38a..5d2c44c9d 100644 --- a/src/net/sourceforge/plantuml/project/lang/ComplementUrl.java +++ b/src/net/sourceforge/plantuml/project/lang/ComplementUrl.java @@ -45,7 +45,7 @@ import net.sourceforge.plantuml.url.Url; import net.sourceforge.plantuml.url.UrlBuilder; import net.sourceforge.plantuml.url.UrlMode; -public class ComplementUrl implements Something { +public class ComplementUrl implements Something { public IRegex toRegex(String suffix) { return new RegexConcat( // diff --git a/src/net/sourceforge/plantuml/project/lang/ComplementWithColorLink.java b/src/net/sourceforge/plantuml/project/lang/ComplementWithColorLink.java index 688e44b44..b03645955 100644 --- a/src/net/sourceforge/plantuml/project/lang/ComplementWithColorLink.java +++ b/src/net/sourceforge/plantuml/project/lang/ComplementWithColorLink.java @@ -42,7 +42,7 @@ import net.sourceforge.plantuml.regex.IRegex; import net.sourceforge.plantuml.regex.RegexLeaf; import net.sourceforge.plantuml.regex.RegexResult; -public class ComplementWithColorLink implements Something { +public class ComplementWithColorLink implements Something { public IRegex toRegex(String suffix) { final String optionalStyle = "(?:(dotted|bold|dashed)[%s]+)?"; diff --git a/src/net/sourceforge/plantuml/project/lang/PairOfSomething.java b/src/net/sourceforge/plantuml/project/lang/PairOfSomething.java index ceb3e679b..9c2a02364 100644 --- a/src/net/sourceforge/plantuml/project/lang/PairOfSomething.java +++ b/src/net/sourceforge/plantuml/project/lang/PairOfSomething.java @@ -35,26 +35,26 @@ */ package net.sourceforge.plantuml.project.lang; +import net.sourceforge.plantuml.core.Diagram; import net.sourceforge.plantuml.project.Failable; -import net.sourceforge.plantuml.project.GanttDiagram; import net.sourceforge.plantuml.regex.IRegex; import net.sourceforge.plantuml.regex.RegexConcat; import net.sourceforge.plantuml.regex.RegexLeaf; import net.sourceforge.plantuml.regex.RegexResult; -public class PairOfSomething implements Something { +public class PairOfSomething implements Something { - private final Something complement1; - private final Something complement2; + private final Something complement1; + private final Something complement2; - public PairOfSomething(Something complement1, Something complement2) { + public PairOfSomething(Something complement1, Something complement2) { this.complement1 = complement1; this.complement2 = complement2; } - public Failable getMe(GanttDiagram system, RegexResult arg, String suffix) { - final Failable r1 = complement1.getMe(system, arg, "A" + suffix); - final Failable r2 = complement2.getMe(system, arg, "B" + suffix); + public Failable getMe(D diagram, RegexResult arg, String suffix) { + final Failable r1 = complement1.getMe(diagram, arg, "A" + suffix); + final Failable r2 = complement2.getMe(diagram, arg, "B" + suffix); if (r1.isFail()) { return r1; } diff --git a/src/net/sourceforge/plantuml/project/lang/Sentence.java b/src/net/sourceforge/plantuml/project/lang/Sentence.java index eaed4f5a5..769157d28 100644 --- a/src/net/sourceforge/plantuml/project/lang/Sentence.java +++ b/src/net/sourceforge/plantuml/project/lang/Sentence.java @@ -36,19 +36,19 @@ package net.sourceforge.plantuml.project.lang; import net.sourceforge.plantuml.command.CommandExecutionResult; -import net.sourceforge.plantuml.project.GanttDiagram; +import net.sourceforge.plantuml.core.Diagram; import net.sourceforge.plantuml.regex.IRegex; import net.sourceforge.plantuml.regex.RegexLeaf; import net.sourceforge.plantuml.regex.RegexResult; -public interface Sentence { - +public interface Sentence { + public final RegexLeaf OPTIONAL_FINAL_DOT = new RegexLeaf("\\s*[.]?\\s*$"); - + public final RegexLeaf SENTENCE_SEPARATOR = new RegexLeaf("\\s*(,|\\sand\\s)\\s*"); public IRegex toRegex(); - public CommandExecutionResult execute(GanttDiagram project, RegexResult arg); + public CommandExecutionResult execute(D project, RegexResult arg); } diff --git a/src/net/sourceforge/plantuml/project/lang/SentenceAnd.java b/src/net/sourceforge/plantuml/project/lang/SentenceAnd.java index 3929c6a7a..898a476fc 100644 --- a/src/net/sourceforge/plantuml/project/lang/SentenceAnd.java +++ b/src/net/sourceforge/plantuml/project/lang/SentenceAnd.java @@ -36,19 +36,19 @@ package net.sourceforge.plantuml.project.lang; import net.sourceforge.plantuml.command.CommandExecutionResult; +import net.sourceforge.plantuml.core.Diagram; import net.sourceforge.plantuml.project.Failable; -import net.sourceforge.plantuml.project.GanttDiagram; import net.sourceforge.plantuml.regex.IRegex; import net.sourceforge.plantuml.regex.RegexConcat; import net.sourceforge.plantuml.regex.RegexLeaf; import net.sourceforge.plantuml.regex.RegexResult; -public class SentenceAnd implements Sentence { +public class SentenceAnd implements Sentence { - private final SentenceSimple sentence1; - private final SentenceSimple sentence2; + private final SentenceSimple sentence1; + private final SentenceSimple sentence2; - public SentenceAnd(SentenceSimple sentence1, SentenceSimple sentence2) { + public SentenceAnd(SentenceSimple sentence1, SentenceSimple sentence2) { this.sentence1 = sentence1; this.sentence2 = sentence2; } @@ -70,7 +70,7 @@ public class SentenceAnd implements Sentence { OPTIONAL_FINAL_DOT); } - public final CommandExecutionResult execute(GanttDiagram project, RegexResult arg) { + public final CommandExecutionResult execute(D project, RegexResult arg) { final Failable subject = sentence1.getSubject().getMe(project, arg); if (subject.isFail()) return CommandExecutionResult.error(subject.getError()); diff --git a/src/net/sourceforge/plantuml/project/lang/SentenceAndAnd.java b/src/net/sourceforge/plantuml/project/lang/SentenceAndAnd.java index 27a9d4ca7..5e8ba2406 100644 --- a/src/net/sourceforge/plantuml/project/lang/SentenceAndAnd.java +++ b/src/net/sourceforge/plantuml/project/lang/SentenceAndAnd.java @@ -36,20 +36,20 @@ package net.sourceforge.plantuml.project.lang; import net.sourceforge.plantuml.command.CommandExecutionResult; +import net.sourceforge.plantuml.core.Diagram; import net.sourceforge.plantuml.project.Failable; -import net.sourceforge.plantuml.project.GanttDiagram; import net.sourceforge.plantuml.regex.IRegex; import net.sourceforge.plantuml.regex.RegexConcat; import net.sourceforge.plantuml.regex.RegexLeaf; import net.sourceforge.plantuml.regex.RegexResult; -public class SentenceAndAnd implements Sentence { +public class SentenceAndAnd implements Sentence { - private final SentenceSimple sentence1; - private final SentenceSimple sentence2; - private final SentenceSimple sentence3; + private final SentenceSimple sentence1; + private final SentenceSimple sentence2; + private final SentenceSimple sentence3; - public SentenceAndAnd(SentenceSimple sentence1, SentenceSimple sentence2, SentenceSimple sentence3) { + public SentenceAndAnd(SentenceSimple sentence1, SentenceSimple sentence2, SentenceSimple sentence3) { this.sentence1 = sentence1; this.sentence2 = sentence2; this.sentence3 = sentence3; @@ -77,7 +77,7 @@ public class SentenceAndAnd implements Sentence { OPTIONAL_FINAL_DOT); } - public final CommandExecutionResult execute(GanttDiagram project, RegexResult arg) { + public final CommandExecutionResult execute(D project, RegexResult arg) { final Failable subject = sentence1.getSubject().getMe(project, arg); if (subject.isFail()) return CommandExecutionResult.error(subject.getError()); diff --git a/src/net/sourceforge/plantuml/project/lang/SentenceDisplayOnSameRowAs.java b/src/net/sourceforge/plantuml/project/lang/SentenceDisplayOnSameRowAs.java index 4e4c955cb..9881a9a6b 100644 --- a/src/net/sourceforge/plantuml/project/lang/SentenceDisplayOnSameRowAs.java +++ b/src/net/sourceforge/plantuml/project/lang/SentenceDisplayOnSameRowAs.java @@ -39,7 +39,7 @@ import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.project.GanttDiagram; import net.sourceforge.plantuml.project.core.Task; -public class SentenceDisplayOnSameRowAs extends SentenceSimple { +public class SentenceDisplayOnSameRowAs extends SentenceSimple { public SentenceDisplayOnSameRowAs() { super(SubjectTask.ME, Verbs.displayOnSameRowAs, new ComplementNamed()); diff --git a/src/net/sourceforge/plantuml/project/lang/SentenceEnds.java b/src/net/sourceforge/plantuml/project/lang/SentenceEnds.java index 1fad6f20e..8cccba70f 100644 --- a/src/net/sourceforge/plantuml/project/lang/SentenceEnds.java +++ b/src/net/sourceforge/plantuml/project/lang/SentenceEnds.java @@ -42,7 +42,7 @@ import net.sourceforge.plantuml.project.core.Task; import net.sourceforge.plantuml.project.core.TaskAttribute; import net.sourceforge.plantuml.project.core.TaskInstant; -public class SentenceEnds extends SentenceSimple { +public class SentenceEnds extends SentenceSimple { public SentenceEnds() { super(SubjectTask.ME, Verbs.ends, new ComplementBeforeOrAfterOrAtTaskStartOrEnd()); diff --git a/src/net/sourceforge/plantuml/project/lang/SentenceHappens.java b/src/net/sourceforge/plantuml/project/lang/SentenceHappens.java index f046ef8e2..7d408b59c 100644 --- a/src/net/sourceforge/plantuml/project/lang/SentenceHappens.java +++ b/src/net/sourceforge/plantuml/project/lang/SentenceHappens.java @@ -41,7 +41,7 @@ import net.sourceforge.plantuml.project.Load; import net.sourceforge.plantuml.project.core.Task; import net.sourceforge.plantuml.project.core.TaskInstant; -public class SentenceHappens extends SentenceSimple { +public class SentenceHappens extends SentenceSimple { public SentenceHappens() { super(SubjectTask.ME, Verbs.happens, Words.zeroOrMore(Words.THE, Words.ON, Words.AT), diff --git a/src/net/sourceforge/plantuml/project/lang/SentenceHappensDate.java b/src/net/sourceforge/plantuml/project/lang/SentenceHappensDate.java index afb8d886f..8dd8ceac8 100644 --- a/src/net/sourceforge/plantuml/project/lang/SentenceHappensDate.java +++ b/src/net/sourceforge/plantuml/project/lang/SentenceHappensDate.java @@ -41,7 +41,7 @@ import net.sourceforge.plantuml.project.Load; import net.sourceforge.plantuml.project.core.Task; import net.sourceforge.plantuml.project.time.Day; -public class SentenceHappensDate extends SentenceSimple { +public class SentenceHappensDate extends SentenceSimple { public SentenceHappensDate() { super(SubjectTask.ME, Verbs.happens, Words.zeroOrMore(Words.THE, Words.ON, Words.AT), ComplementDate.any()); diff --git a/src/net/sourceforge/plantuml/project/lang/SentenceIsColored.java b/src/net/sourceforge/plantuml/project/lang/SentenceIsColored.java index 67b576d84..8787d7472 100644 --- a/src/net/sourceforge/plantuml/project/lang/SentenceIsColored.java +++ b/src/net/sourceforge/plantuml/project/lang/SentenceIsColored.java @@ -39,7 +39,7 @@ import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.project.GanttDiagram; import net.sourceforge.plantuml.project.core.Task; -public class SentenceIsColored extends SentenceSimple { +public class SentenceIsColored extends SentenceSimple { public SentenceIsColored() { super(SubjectTask.ME, Verbs.isColored, new ComplementInColors()); diff --git a/src/net/sourceforge/plantuml/project/lang/SentenceIsColoredForCompletion.java b/src/net/sourceforge/plantuml/project/lang/SentenceIsColoredForCompletion.java index c07c2bd8a..502b2e370 100644 --- a/src/net/sourceforge/plantuml/project/lang/SentenceIsColoredForCompletion.java +++ b/src/net/sourceforge/plantuml/project/lang/SentenceIsColoredForCompletion.java @@ -39,7 +39,7 @@ import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.project.GanttDiagram; import net.sourceforge.plantuml.project.core.Task; -public class SentenceIsColoredForCompletion extends SentenceSimple { +public class SentenceIsColoredForCompletion extends SentenceSimple { public SentenceIsColoredForCompletion() { super(SubjectTask.ME, Verbs.isColored, Words.exactly(Words.FOR, Words.COMPLETION), diff --git a/src/net/sourceforge/plantuml/project/lang/SentenceIsDeleted.java b/src/net/sourceforge/plantuml/project/lang/SentenceIsDeleted.java index 470793882..6e9840f49 100644 --- a/src/net/sourceforge/plantuml/project/lang/SentenceIsDeleted.java +++ b/src/net/sourceforge/plantuml/project/lang/SentenceIsDeleted.java @@ -39,7 +39,7 @@ import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.project.GanttDiagram; import net.sourceforge.plantuml.project.core.Task; -public class SentenceIsDeleted extends SentenceSimple { +public class SentenceIsDeleted extends SentenceSimple { public SentenceIsDeleted() { super(SubjectTask.ME, Verbs.isDeleted, new ComplementEmpty()); diff --git a/src/net/sourceforge/plantuml/project/lang/SentenceIsDisplayedAs.java b/src/net/sourceforge/plantuml/project/lang/SentenceIsDisplayedAs.java index 78de0f2b3..9cd47e52c 100644 --- a/src/net/sourceforge/plantuml/project/lang/SentenceIsDisplayedAs.java +++ b/src/net/sourceforge/plantuml/project/lang/SentenceIsDisplayedAs.java @@ -39,7 +39,7 @@ import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.project.GanttDiagram; import net.sourceforge.plantuml.project.core.Task; -public class SentenceIsDisplayedAs extends SentenceSimple { +public class SentenceIsDisplayedAs extends SentenceSimple { public SentenceIsDisplayedAs() { super(SubjectTask.ME, Verbs.isDisplayedAs, new ComplementAnything()); diff --git a/src/net/sourceforge/plantuml/project/lang/SentenceIsForTask.java b/src/net/sourceforge/plantuml/project/lang/SentenceIsForTask.java index f69a156e7..2744814c7 100644 --- a/src/net/sourceforge/plantuml/project/lang/SentenceIsForTask.java +++ b/src/net/sourceforge/plantuml/project/lang/SentenceIsForTask.java @@ -40,7 +40,7 @@ import net.sourceforge.plantuml.project.Completion; import net.sourceforge.plantuml.project.GanttDiagram; import net.sourceforge.plantuml.project.core.Task; -public class SentenceIsForTask extends SentenceSimple { +public class SentenceIsForTask extends SentenceSimple { public SentenceIsForTask() { super(SubjectTask.ME, Verbs.is, new ComplementCompleted()); diff --git a/src/net/sourceforge/plantuml/project/lang/SentenceLinksTo.java b/src/net/sourceforge/plantuml/project/lang/SentenceLinksTo.java index 68aca0d68..0901fd427 100644 --- a/src/net/sourceforge/plantuml/project/lang/SentenceLinksTo.java +++ b/src/net/sourceforge/plantuml/project/lang/SentenceLinksTo.java @@ -40,7 +40,7 @@ import net.sourceforge.plantuml.project.GanttDiagram; import net.sourceforge.plantuml.project.core.Task; import net.sourceforge.plantuml.url.Url; -public class SentenceLinksTo extends SentenceSimple { +public class SentenceLinksTo extends SentenceSimple { public SentenceLinksTo() { super(SubjectTask.ME, Verbs.linksTo, new ComplementUrl()); diff --git a/src/net/sourceforge/plantuml/project/lang/SentenceOccurs.java b/src/net/sourceforge/plantuml/project/lang/SentenceOccurs.java index b307a2dc1..04fe2c3e3 100644 --- a/src/net/sourceforge/plantuml/project/lang/SentenceOccurs.java +++ b/src/net/sourceforge/plantuml/project/lang/SentenceOccurs.java @@ -42,7 +42,7 @@ import net.sourceforge.plantuml.project.core.Task; import net.sourceforge.plantuml.project.core.TaskAttribute; import net.sourceforge.plantuml.project.core.TaskInstant; -public class SentenceOccurs extends SentenceSimple { +public class SentenceOccurs extends SentenceSimple { public SentenceOccurs() { super(SubjectTask.ME, Verbs.occurs, new ComplementFromTo()); diff --git a/src/net/sourceforge/plantuml/project/lang/SentencePausesDate.java b/src/net/sourceforge/plantuml/project/lang/SentencePausesDate.java index 8cf020b38..893a20967 100644 --- a/src/net/sourceforge/plantuml/project/lang/SentencePausesDate.java +++ b/src/net/sourceforge/plantuml/project/lang/SentencePausesDate.java @@ -40,7 +40,7 @@ import net.sourceforge.plantuml.project.GanttDiagram; import net.sourceforge.plantuml.project.core.Task; import net.sourceforge.plantuml.project.time.Day; -public class SentencePausesDate extends SentenceSimple { +public class SentencePausesDate extends SentenceSimple { public SentencePausesDate() { super(SubjectTask.ME, Verbs.pauses, Words.zeroOrMore(Words.THE, Words.ON, Words.AT, Words.FROM), diff --git a/src/net/sourceforge/plantuml/project/lang/SentencePausesDates.java b/src/net/sourceforge/plantuml/project/lang/SentencePausesDates.java index 46d074559..36ac07c9a 100644 --- a/src/net/sourceforge/plantuml/project/lang/SentencePausesDates.java +++ b/src/net/sourceforge/plantuml/project/lang/SentencePausesDates.java @@ -41,7 +41,7 @@ import net.sourceforge.plantuml.project.GanttDiagram; import net.sourceforge.plantuml.project.core.Task; import net.sourceforge.plantuml.project.time.Day; -public class SentencePausesDates extends SentenceSimple { +public class SentencePausesDates extends SentenceSimple { public SentencePausesDates() { super(SubjectTask.ME, Verbs.pauses, Words.zeroOrMore(Words.THE, Words.ON, Words.AT, Words.FROM), diff --git a/src/net/sourceforge/plantuml/project/lang/SentencePausesDayOfWeek.java b/src/net/sourceforge/plantuml/project/lang/SentencePausesDayOfWeek.java index 8edc3d2b5..da52bf859 100644 --- a/src/net/sourceforge/plantuml/project/lang/SentencePausesDayOfWeek.java +++ b/src/net/sourceforge/plantuml/project/lang/SentencePausesDayOfWeek.java @@ -40,7 +40,7 @@ import net.sourceforge.plantuml.project.GanttDiagram; import net.sourceforge.plantuml.project.core.Task; import net.sourceforge.plantuml.project.time.DayOfWeek; -public class SentencePausesDayOfWeek extends SentenceSimple { +public class SentencePausesDayOfWeek extends SentenceSimple { public SentencePausesDayOfWeek() { super(SubjectTask.ME, Verbs.pauses, Words.zeroOrMore(Words.THE, Words.ON, Words.AT, Words.FROM), diff --git a/src/net/sourceforge/plantuml/project/lang/SentenceRequire.java b/src/net/sourceforge/plantuml/project/lang/SentenceRequire.java index d22d11f1b..d866359c9 100644 --- a/src/net/sourceforge/plantuml/project/lang/SentenceRequire.java +++ b/src/net/sourceforge/plantuml/project/lang/SentenceRequire.java @@ -40,7 +40,7 @@ import net.sourceforge.plantuml.project.GanttDiagram; import net.sourceforge.plantuml.project.Load; import net.sourceforge.plantuml.project.core.Task; -public class SentenceRequire extends SentenceSimple { +public class SentenceRequire extends SentenceSimple { public SentenceRequire() { super(SubjectTask.ME, Verbs.requires, new ComplementSeveralDays()); diff --git a/src/net/sourceforge/plantuml/project/lang/SentenceSimple.java b/src/net/sourceforge/plantuml/project/lang/SentenceSimple.java index d36769296..a82b8121e 100644 --- a/src/net/sourceforge/plantuml/project/lang/SentenceSimple.java +++ b/src/net/sourceforge/plantuml/project/lang/SentenceSimple.java @@ -36,25 +36,25 @@ package net.sourceforge.plantuml.project.lang; import net.sourceforge.plantuml.command.CommandExecutionResult; +import net.sourceforge.plantuml.core.Diagram; import net.sourceforge.plantuml.project.Failable; -import net.sourceforge.plantuml.project.GanttDiagram; import net.sourceforge.plantuml.regex.IRegex; import net.sourceforge.plantuml.regex.RegexConcat; import net.sourceforge.plantuml.regex.RegexLeaf; import net.sourceforge.plantuml.regex.RegexResult; -public abstract class SentenceSimple implements Sentence { +public abstract class SentenceSimple implements Sentence { - private final Subject subject; + private final Subject subject; private final IRegex verb; private final IRegex adverbialOrPropositon; - private final Something complement; + private final Something complement; - public SentenceSimple(Subject subject, IRegex verb, Something complement) { + public SentenceSimple(Subject subject, IRegex verb, Something complement) { this(subject, verb, new RegexLeaf(""), complement); } - public SentenceSimple(Subject subject, IRegex verb, IRegex adverbialOrPropositon, Something complement) { + public SentenceSimple(Subject subject, IRegex verb, IRegex adverbialOrPropositon, Something complement) { this.subject = subject; this.verb = verb; this.adverbialOrPropositon = adverbialOrPropositon; @@ -86,7 +86,7 @@ public abstract class SentenceSimple implements Sentence { OPTIONAL_FINAL_DOT); } - public final CommandExecutionResult execute(GanttDiagram project, RegexResult arg) { + public final CommandExecutionResult execute(D project, RegexResult arg) { final Failable currentSubject = subject.getMe(project, arg); if (currentSubject.isFail()) return CommandExecutionResult.error(currentSubject.getError()); @@ -99,7 +99,7 @@ public abstract class SentenceSimple implements Sentence { } - public abstract CommandExecutionResult execute(GanttDiagram project, Object subject, Object complement); + public abstract CommandExecutionResult execute(D project, Object subject, Object complement); public IRegex getVerbRegex() { return verb; @@ -108,15 +108,13 @@ public abstract class SentenceSimple implements Sentence { protected final IRegex getAdverbialOrPropositon() { return adverbialOrPropositon; } - - protected final Subject getSubject() { + + protected final Subject getSubject() { return subject; } - protected final Something getComplement() { + protected final Something getComplement() { return complement; } - - } diff --git a/src/net/sourceforge/plantuml/project/lang/SentenceTaskEndsAbsolute.java b/src/net/sourceforge/plantuml/project/lang/SentenceTaskEndsAbsolute.java index ea10010e9..57d26e398 100644 --- a/src/net/sourceforge/plantuml/project/lang/SentenceTaskEndsAbsolute.java +++ b/src/net/sourceforge/plantuml/project/lang/SentenceTaskEndsAbsolute.java @@ -40,7 +40,7 @@ import net.sourceforge.plantuml.project.GanttDiagram; import net.sourceforge.plantuml.project.core.Task; import net.sourceforge.plantuml.project.time.Day; -public class SentenceTaskEndsAbsolute extends SentenceSimple { +public class SentenceTaskEndsAbsolute extends SentenceSimple { public SentenceTaskEndsAbsolute() { super(SubjectTask.ME, Verbs.ends, Words.zeroOrMore(Words.THE, Words.ON, Words.AT), ComplementDate.any()); diff --git a/src/net/sourceforge/plantuml/project/lang/SentenceTaskEndsOnlyRelative.java b/src/net/sourceforge/plantuml/project/lang/SentenceTaskEndsOnlyRelative.java index 25524553f..0fbbd5676 100644 --- a/src/net/sourceforge/plantuml/project/lang/SentenceTaskEndsOnlyRelative.java +++ b/src/net/sourceforge/plantuml/project/lang/SentenceTaskEndsOnlyRelative.java @@ -40,7 +40,7 @@ import net.sourceforge.plantuml.project.GanttDiagram; import net.sourceforge.plantuml.project.core.Task; import net.sourceforge.plantuml.project.time.Day; -public class SentenceTaskEndsOnlyRelative extends SentenceSimple { +public class SentenceTaskEndsOnlyRelative extends SentenceSimple { public SentenceTaskEndsOnlyRelative() { super(SubjectTask.ME, Verbs.ends, Words.zeroOrMore(Words.THE, Words.ON, Words.AT), diff --git a/src/net/sourceforge/plantuml/project/lang/SentenceTaskStarts.java b/src/net/sourceforge/plantuml/project/lang/SentenceTaskStarts.java index 6ce0543d3..95aeb442b 100644 --- a/src/net/sourceforge/plantuml/project/lang/SentenceTaskStarts.java +++ b/src/net/sourceforge/plantuml/project/lang/SentenceTaskStarts.java @@ -43,7 +43,7 @@ import net.sourceforge.plantuml.project.core.Task; import net.sourceforge.plantuml.project.core.TaskAttribute; import net.sourceforge.plantuml.project.core.TaskInstant; -public class SentenceTaskStarts extends SentenceSimple { +public class SentenceTaskStarts extends SentenceSimple { public SentenceTaskStarts() { super(SubjectTask.ME, Verbs.starts, new ComplementBeforeOrAfterOrAtTaskStartOrEnd()); diff --git a/src/net/sourceforge/plantuml/project/lang/SentenceTaskStartsAbsolute.java b/src/net/sourceforge/plantuml/project/lang/SentenceTaskStartsAbsolute.java index 3eb5b6616..a37db325d 100644 --- a/src/net/sourceforge/plantuml/project/lang/SentenceTaskStartsAbsolute.java +++ b/src/net/sourceforge/plantuml/project/lang/SentenceTaskStartsAbsolute.java @@ -40,7 +40,7 @@ import net.sourceforge.plantuml.project.GanttDiagram; import net.sourceforge.plantuml.project.core.Task; import net.sourceforge.plantuml.project.time.Day; -public class SentenceTaskStartsAbsolute extends SentenceSimple { +public class SentenceTaskStartsAbsolute extends SentenceSimple { public SentenceTaskStartsAbsolute() { super(SubjectTask.ME, Verbs.starts, Words.zeroOrMore(Words.THE, Words.ON, Words.AT), ComplementDate.any()); diff --git a/src/net/sourceforge/plantuml/project/lang/SentenceTaskStartsOnlyRelative.java b/src/net/sourceforge/plantuml/project/lang/SentenceTaskStartsOnlyRelative.java index 80b4ded71..223a321d4 100644 --- a/src/net/sourceforge/plantuml/project/lang/SentenceTaskStartsOnlyRelative.java +++ b/src/net/sourceforge/plantuml/project/lang/SentenceTaskStartsOnlyRelative.java @@ -40,7 +40,7 @@ import net.sourceforge.plantuml.project.GanttDiagram; import net.sourceforge.plantuml.project.core.Task; import net.sourceforge.plantuml.project.time.Day; -public class SentenceTaskStartsOnlyRelative extends SentenceSimple { +public class SentenceTaskStartsOnlyRelative extends SentenceSimple { public SentenceTaskStartsOnlyRelative() { super(SubjectTask.ME, Verbs.starts, Words.zeroOrMore(Words.THE, Words.ON, Words.AT), diff --git a/src/net/sourceforge/plantuml/project/lang/SentenceTaskStartsWithColor.java b/src/net/sourceforge/plantuml/project/lang/SentenceTaskStartsWithColor.java index 2e3acc159..a02ff614a 100644 --- a/src/net/sourceforge/plantuml/project/lang/SentenceTaskStartsWithColor.java +++ b/src/net/sourceforge/plantuml/project/lang/SentenceTaskStartsWithColor.java @@ -43,11 +43,11 @@ import net.sourceforge.plantuml.project.core.Task; import net.sourceforge.plantuml.project.core.TaskAttribute; import net.sourceforge.plantuml.project.core.TaskInstant; -public class SentenceTaskStartsWithColor extends SentenceSimple { +public class SentenceTaskStartsWithColor extends SentenceSimple { public SentenceTaskStartsWithColor() { super(SubjectTask.ME, Verbs.starts, - new PairOfSomething(new ComplementBeforeOrAfterOrAtTaskStartOrEnd(), new ComplementWithColorLink())); + new PairOfSomething<>(new ComplementBeforeOrAfterOrAtTaskStartOrEnd(), new ComplementWithColorLink())); } @Override diff --git a/src/net/sourceforge/plantuml/project/lang/Something.java b/src/net/sourceforge/plantuml/project/lang/Something.java index 174518188..ac005a991 100644 --- a/src/net/sourceforge/plantuml/project/lang/Something.java +++ b/src/net/sourceforge/plantuml/project/lang/Something.java @@ -35,15 +35,15 @@ */ package net.sourceforge.plantuml.project.lang; +import net.sourceforge.plantuml.core.Diagram; import net.sourceforge.plantuml.project.Failable; -import net.sourceforge.plantuml.project.GanttDiagram; import net.sourceforge.plantuml.regex.IRegex; import net.sourceforge.plantuml.regex.RegexResult; -public interface Something { +public interface Something { public IRegex toRegex(String suffix); - public Failable getMe(GanttDiagram project, RegexResult arg, String suffix); + public Failable getMe(D diagram, RegexResult arg, String suffix); } diff --git a/src/net/sourceforge/plantuml/project/lang/Subject.java b/src/net/sourceforge/plantuml/project/lang/Subject.java index 92c80670c..f53c0f906 100644 --- a/src/net/sourceforge/plantuml/project/lang/Subject.java +++ b/src/net/sourceforge/plantuml/project/lang/Subject.java @@ -37,17 +37,17 @@ package net.sourceforge.plantuml.project.lang; import java.util.Collection; +import net.sourceforge.plantuml.core.Diagram; import net.sourceforge.plantuml.project.Failable; -import net.sourceforge.plantuml.project.GanttDiagram; import net.sourceforge.plantuml.regex.IRegex; import net.sourceforge.plantuml.regex.RegexResult; -public interface Subject { +public interface Subject { - public Collection getSentences(); + public Collection> getSentences(); public IRegex toRegex(); - public Failable getMe(GanttDiagram project, RegexResult arg); + public Failable getMe(D project, RegexResult arg); } diff --git a/src/net/sourceforge/plantuml/project/lang/SubjectDayAsDate.java b/src/net/sourceforge/plantuml/project/lang/SubjectDayAsDate.java index 473218921..ddc48e6e1 100644 --- a/src/net/sourceforge/plantuml/project/lang/SubjectDayAsDate.java +++ b/src/net/sourceforge/plantuml/project/lang/SubjectDayAsDate.java @@ -49,9 +49,9 @@ import net.sourceforge.plantuml.regex.RegexLeaf; import net.sourceforge.plantuml.regex.RegexOr; import net.sourceforge.plantuml.regex.RegexResult; -public class SubjectDayAsDate implements Subject { +public class SubjectDayAsDate implements Subject { - public static final Subject ME = new SubjectDayAsDate(); + public static final Subject ME = new SubjectDayAsDate(); private SubjectDayAsDate() { } @@ -89,11 +89,11 @@ public class SubjectDayAsDate implements Subject { throw new IllegalStateException(); } - public Collection getSentences() { + public Collection> getSentences() { return Arrays.asList(new Close(), new Open(), new InColor()); } - class Close extends SentenceSimple { + class Close extends SentenceSimple { public Close() { super(SubjectDayAsDate.this, Verbs.isOrAre, new ComplementClose()); @@ -106,7 +106,7 @@ public class SubjectDayAsDate implements Subject { } } - class Open extends SentenceSimple { + class Open extends SentenceSimple { public Open() { super(SubjectDayAsDate.this, Verbs.isOrAre, new ComplementOpen()); } @@ -118,7 +118,7 @@ public class SubjectDayAsDate implements Subject { } } - class InColor extends SentenceSimple { + class InColor extends SentenceSimple { public InColor() { super(SubjectDayAsDate.this, Verbs.isOrAre, new ComplementInColors2()); diff --git a/src/net/sourceforge/plantuml/project/lang/SubjectDayOfWeek.java b/src/net/sourceforge/plantuml/project/lang/SubjectDayOfWeek.java index a1c643774..9b4fffd05 100644 --- a/src/net/sourceforge/plantuml/project/lang/SubjectDayOfWeek.java +++ b/src/net/sourceforge/plantuml/project/lang/SubjectDayOfWeek.java @@ -47,9 +47,9 @@ import net.sourceforge.plantuml.regex.IRegex; import net.sourceforge.plantuml.regex.RegexLeaf; import net.sourceforge.plantuml.regex.RegexResult; -public class SubjectDayOfWeek implements Subject { +public class SubjectDayOfWeek implements Subject { - public static final Subject ME = new SubjectDayOfWeek(); + public static final Subject ME = new SubjectDayOfWeek(); private SubjectDayOfWeek() { } @@ -63,11 +63,11 @@ public class SubjectDayOfWeek implements Subject { return Failable.ok(DayOfWeek.fromString(s)); } - public Collection getSentences() { + public Collection> getSentences() { return Arrays.asList(new AreClose(), new AreOpen(), new InColor()); } - class AreOpen extends SentenceSimple { + class AreOpen extends SentenceSimple { public AreOpen() { super(SubjectDayOfWeek.this, Verbs.are, new ComplementOpen()); } @@ -80,7 +80,7 @@ public class SubjectDayOfWeek implements Subject { } } - class AreClose extends SentenceSimple { + class AreClose extends SentenceSimple { public AreClose() { super(SubjectDayOfWeek.this, Verbs.are, new ComplementClose()); @@ -95,7 +95,7 @@ public class SubjectDayOfWeek implements Subject { } - class InColor extends SentenceSimple { + class InColor extends SentenceSimple { public InColor() { super(SubjectDayOfWeek.this, Verbs.isOrAre, new ComplementInColors2()); diff --git a/src/net/sourceforge/plantuml/project/lang/SubjectDaysAsDates.java b/src/net/sourceforge/plantuml/project/lang/SubjectDaysAsDates.java index 99680e27b..6f8955fa7 100644 --- a/src/net/sourceforge/plantuml/project/lang/SubjectDaysAsDates.java +++ b/src/net/sourceforge/plantuml/project/lang/SubjectDaysAsDates.java @@ -50,9 +50,9 @@ import net.sourceforge.plantuml.regex.RegexLeaf; import net.sourceforge.plantuml.regex.RegexOr; import net.sourceforge.plantuml.regex.RegexResult; -public class SubjectDaysAsDates implements Subject { +public class SubjectDaysAsDates implements Subject { - public static final Subject ME = new SubjectDaysAsDates(); + public static final Subject ME = new SubjectDaysAsDates(); private SubjectDaysAsDates() { } @@ -136,11 +136,11 @@ public class SubjectDaysAsDates implements Subject { throw new IllegalStateException(); } - public Collection getSentences() { + public Collection> getSentences() { return Arrays.asList(new Close(), new Open(), new InColor(), new Named()); } - class Close extends SentenceSimple { + class Close extends SentenceSimple { public Close() { super(SubjectDaysAsDates.this, Verbs.isOrAre, new ComplementClose()); @@ -156,7 +156,7 @@ public class SubjectDaysAsDates implements Subject { } } - class Open extends SentenceSimple { + class Open extends SentenceSimple { public Open() { super(SubjectDaysAsDates.this, Verbs.isOrAre, new ComplementOpen()); @@ -173,7 +173,7 @@ public class SubjectDaysAsDates implements Subject { } - class InColor extends SentenceSimple { + class InColor extends SentenceSimple { public InColor() { super(SubjectDaysAsDates.this, Verbs.isOrAre, new ComplementInColors2()); @@ -191,7 +191,7 @@ public class SubjectDaysAsDates implements Subject { } - class Named extends SentenceSimple { + class Named extends SentenceSimple { public Named() { super(SubjectDaysAsDates.this, Verbs.isOrAreNamed, new ComplementNamed()); diff --git a/src/net/sourceforge/plantuml/project/lang/SubjectLinks.java b/src/net/sourceforge/plantuml/project/lang/SubjectLinks.java index c76eaec28..164726cb6 100644 --- a/src/net/sourceforge/plantuml/project/lang/SubjectLinks.java +++ b/src/net/sourceforge/plantuml/project/lang/SubjectLinks.java @@ -46,7 +46,7 @@ import net.sourceforge.plantuml.regex.RegexLeaf; import net.sourceforge.plantuml.regex.RegexResult; // Removed -public class SubjectLinks implements Subject { +public class SubjectLinks implements Subject { private SubjectLinks() { } @@ -59,11 +59,11 @@ public class SubjectLinks implements Subject { return Failable.ok(project); } - public Collection getSentences() { + public Collection> getSentences() { return Arrays.asList(new InColor()); } - public class InColor extends SentenceSimple { + public class InColor extends SentenceSimple { public InColor() { super(SubjectLinks.this, Verbs.areColored, new ComplementInColors()); diff --git a/src/net/sourceforge/plantuml/project/lang/SubjectProject.java b/src/net/sourceforge/plantuml/project/lang/SubjectProject.java index 4f72a2748..6bafeb2f2 100644 --- a/src/net/sourceforge/plantuml/project/lang/SubjectProject.java +++ b/src/net/sourceforge/plantuml/project/lang/SubjectProject.java @@ -46,9 +46,9 @@ import net.sourceforge.plantuml.regex.IRegex; import net.sourceforge.plantuml.regex.RegexLeaf; import net.sourceforge.plantuml.regex.RegexResult; -public class SubjectProject implements Subject { +public class SubjectProject implements Subject { - public static final Subject ME = new SubjectProject(); + public static final Subject ME = new SubjectProject(); private SubjectProject() { } @@ -61,11 +61,11 @@ public class SubjectProject implements Subject { return Failable.ok(project); } - public Collection getSentences() { + public Collection> getSentences() { return Arrays.asList(new Starts()); } - class Starts extends SentenceSimple { + class Starts extends SentenceSimple { public Starts() { super(SubjectProject.this, Verbs.starts, Words.zeroOrMore(Words.ON, Words.FOR, Words.THE, Words.AT), diff --git a/src/net/sourceforge/plantuml/project/lang/SubjectResource.java b/src/net/sourceforge/plantuml/project/lang/SubjectResource.java index d9d311e2d..ab9ab182a 100644 --- a/src/net/sourceforge/plantuml/project/lang/SubjectResource.java +++ b/src/net/sourceforge/plantuml/project/lang/SubjectResource.java @@ -51,9 +51,9 @@ import net.sourceforge.plantuml.regex.RegexLeaf; import net.sourceforge.plantuml.regex.RegexOr; import net.sourceforge.plantuml.regex.RegexResult; -public class SubjectResource implements Subject { +public class SubjectResource implements Subject { - public static final Subject ME = new SubjectResource(); + public static final Subject ME = new SubjectResource(); private SubjectResource() { } @@ -71,7 +71,7 @@ public class SubjectResource implements Subject { return Failable.ok(result); } - public Collection getSentences() { + public Collection> getSentences() { return Arrays.asList(new IsOffDate(), new IsOffDates(), new IsOffDayOfWeek(), new IsOnDate(), new IsOnDates(), new IsOffBeforeDate(), new IsOffAfterDate(), new WorksOn()); } @@ -83,7 +83,7 @@ public class SubjectResource implements Subject { ); } - public class WorksOn extends SentenceSimple { + public class WorksOn extends SentenceSimple { public WorksOn() { super(SubjectResource.this, Verbs.worksOn, new ComplementTask()); @@ -99,7 +99,7 @@ public class SubjectResource implements Subject { } - public class IsOffBeforeDate extends SentenceSimple { + public class IsOffBeforeDate extends SentenceSimple { public IsOffBeforeDate() { super(SubjectResource.this, Verbs.isOff, @@ -116,7 +116,7 @@ public class SubjectResource implements Subject { } - public class IsOffAfterDate extends SentenceSimple { + public class IsOffAfterDate extends SentenceSimple { public IsOffAfterDate() { super(SubjectResource.this, Verbs.isOff, @@ -133,7 +133,7 @@ public class SubjectResource implements Subject { } - public class IsOffDate extends SentenceSimple { + public class IsOffDate extends SentenceSimple { public IsOffDate() { super(SubjectResource.this, Verbs.isOff, @@ -150,7 +150,7 @@ public class SubjectResource implements Subject { } - public class IsOffDates extends SentenceSimple { + public class IsOffDates extends SentenceSimple { public IsOffDates() { super(SubjectResource.this, Verbs.isOff, @@ -168,7 +168,7 @@ public class SubjectResource implements Subject { } - public class IsOffDayOfWeek extends SentenceSimple { + public class IsOffDayOfWeek extends SentenceSimple { public IsOffDayOfWeek() { super(SubjectResource.this, Verbs.isOff, @@ -184,7 +184,7 @@ public class SubjectResource implements Subject { } - public class IsOnDate extends SentenceSimple { + public class IsOnDate extends SentenceSimple { public IsOnDate() { super(SubjectResource.this, Verbs.isOn, @@ -201,7 +201,7 @@ public class SubjectResource implements Subject { } - public class IsOnDates extends SentenceSimple { + public class IsOnDates extends SentenceSimple { public IsOnDates() { super(SubjectResource.this, Verbs.isOn, diff --git a/src/net/sourceforge/plantuml/project/lang/SubjectSeparator.java b/src/net/sourceforge/plantuml/project/lang/SubjectSeparator.java index 4ed3a05e8..473696163 100644 --- a/src/net/sourceforge/plantuml/project/lang/SubjectSeparator.java +++ b/src/net/sourceforge/plantuml/project/lang/SubjectSeparator.java @@ -47,9 +47,9 @@ import net.sourceforge.plantuml.regex.IRegex; import net.sourceforge.plantuml.regex.RegexLeaf; import net.sourceforge.plantuml.regex.RegexResult; -public class SubjectSeparator implements Subject { +public class SubjectSeparator implements Subject { - public static final Subject ME = new SubjectSeparator(); + public static final Subject ME = new SubjectSeparator(); private SubjectSeparator() { } @@ -62,11 +62,11 @@ public class SubjectSeparator implements Subject { return Failable.ok(project); } - public Collection getSentences() { + public Collection> getSentences() { return Arrays.asList(new JustBefore(), new JustAfter(), new Just()); } - class JustBefore extends SentenceSimple { + class JustBefore extends SentenceSimple { public JustBefore() { super(SubjectSeparator.this, Verbs.just, Words.exactly(Words.BEFORE), ComplementDate.any()); @@ -82,7 +82,7 @@ public class SubjectSeparator implements Subject { } - class JustAfter extends SentenceSimple { + class JustAfter extends SentenceSimple { public JustAfter() { super(SubjectSeparator.this, Verbs.just, Words.exactly(Words.AFTER), ComplementDate.any()); @@ -98,7 +98,7 @@ public class SubjectSeparator implements Subject { } - class Just extends SentenceSimple { + class Just extends SentenceSimple { public Just() { super(SubjectSeparator.this, Verbs.just, new ComplementBeforeOrAfterOrAtTaskStartOrEnd()); diff --git a/src/net/sourceforge/plantuml/project/lang/SubjectTask.java b/src/net/sourceforge/plantuml/project/lang/SubjectTask.java index da31a4542..0a0ef31dd 100644 --- a/src/net/sourceforge/plantuml/project/lang/SubjectTask.java +++ b/src/net/sourceforge/plantuml/project/lang/SubjectTask.java @@ -48,10 +48,12 @@ import net.sourceforge.plantuml.regex.RegexLeaf; import net.sourceforge.plantuml.regex.RegexOptional; import net.sourceforge.plantuml.regex.RegexOr; import net.sourceforge.plantuml.regex.RegexResult; +import net.sourceforge.plantuml.stereo.Stereotype; +import net.sourceforge.plantuml.stereo.StereotypePattern; -public class SubjectTask implements Subject { +public class SubjectTask implements Subject { - public static final Subject ME = new SubjectTask(); + public static final Subject ME = new SubjectTask(); private SubjectTask() { } @@ -64,9 +66,16 @@ public class SubjectTask implements Subject { return Failable.error("Not sure what are you refering to?"); } else { final String subject = arg.get("SUBJECT", 0); - final String shortName = arg.get("SUBJECT", 1); + final String shortName = arg.get("SHORTNAME", 0); final String then = arg.get("THEN", 0); + final String stereotype = arg.get("STEREOTYPE", 0); + result = gantt.getOrCreateTask(subject, shortName, then != null); + + if (stereotype != null) + result.setStereotype(Stereotype.build(arg.get("STEREOTYPE", 0))); + + gantt.setIt(result); } @@ -89,7 +98,7 @@ public class SubjectTask implements Subject { return Failable.ok(result); } - public Collection getSentences() { + public Collection> getSentences() { return Arrays.asList(new SentenceRequire(), new SentenceTaskStarts(), new SentenceTaskStartsWithColor(), new SentenceTaskStartsOnlyRelative(), new SentenceTaskStartsAbsolute(), new SentenceHappens(), new SentenceHappensDate(), new SentenceEnds(), new SentenceTaskEndsOnlyRelative(), @@ -103,13 +112,17 @@ public class SubjectTask implements Subject { return new RegexOr( // new RegexLeaf("IT", "(it)"), // new RegexConcat(new RegexLeaf("THEN", "(then[%s]+)?"), // - new RegexLeaf("SUBJECT", "\\[([^\\[\\]]+?)\\](?:[%s]+as[%s]+\\[([^\\[\\]]+?)\\])?"), // - new RegexOptional( // - new RegexConcat( // - Words.exactly(Words.ON), // - RegexLeaf.spaceOneOrMore(), // - new RegexLeaf("RESOURCE", "((?:\\{[^{}]+\\}[%s]*)+)") // - )))); + new RegexLeaf("SUBJECT", "\\[([^\\[\\]]+?)\\]"), // + StereotypePattern.optional("STEREOTYPE"), // + new RegexOptional(new RegexConcat(// + Words.exactly(Words.AS), // + RegexLeaf.spaceOneOrMore(), // + new RegexLeaf("SHORTNAME", "\\[([^\\[\\]]+?)\\]"))), // + new RegexOptional(new RegexConcat( // + Words.exactly(Words.ON), // + RegexLeaf.spaceOneOrMore(), // + new RegexLeaf("RESOURCE", "((?:\\{[^{}]+\\}[%s]*)+)") // + )))); } } diff --git a/src/net/sourceforge/plantuml/project/lang/SubjectToday.java b/src/net/sourceforge/plantuml/project/lang/SubjectToday.java index 3ee19a018..0f4854f16 100644 --- a/src/net/sourceforge/plantuml/project/lang/SubjectToday.java +++ b/src/net/sourceforge/plantuml/project/lang/SubjectToday.java @@ -48,10 +48,10 @@ import net.sourceforge.plantuml.regex.RegexConcat; import net.sourceforge.plantuml.regex.RegexLeaf; import net.sourceforge.plantuml.regex.RegexResult; -public class SubjectToday implements Subject { - // ::remove folder when __HAXE__ +public class SubjectToday implements Subject { + // ::remove folder when __HAXE__ - public static final Subject ME = new SubjectToday(); + public static final Subject ME = new SubjectToday(); private SubjectToday() { } @@ -66,11 +66,11 @@ public class SubjectToday implements Subject { return Failable.ok(new Today()); } - public Collection getSentences() { + public Collection> getSentences() { return Arrays.asList(new InColor(), new IsDate()); } - class InColor extends SentenceSimple { + class InColor extends SentenceSimple { public InColor() { super(SubjectToday.this, Verbs.isColored, new ComplementInColors()); @@ -87,7 +87,7 @@ public class SubjectToday implements Subject { } - class IsDate extends SentenceSimple { + class IsDate extends SentenceSimple { public IsDate() { super(SubjectToday.this, Verbs.is, ComplementDate.any()); diff --git a/src/net/sourceforge/plantuml/project/lang/Words.java b/src/net/sourceforge/plantuml/project/lang/Words.java index e3239c218..41bb31782 100644 --- a/src/net/sourceforge/plantuml/project/lang/Words.java +++ b/src/net/sourceforge/plantuml/project/lang/Words.java @@ -45,6 +45,7 @@ public class Words { public final static String AFTER = "after"; public final static String AND = "and"; + public final static String AS = "as"; public final static String AT = "at"; public final static String BEFORE = "before"; public final static String COMPLETION = "completion"; diff --git a/src/net/sourceforge/plantuml/project/time/Day.java b/src/net/sourceforge/plantuml/project/time/Day.java index b6eb3df98..f8d27cae6 100644 --- a/src/net/sourceforge/plantuml/project/time/Day.java +++ b/src/net/sourceforge/plantuml/project/time/Day.java @@ -36,6 +36,7 @@ package net.sourceforge.plantuml.project.time; import java.util.Calendar; +import java.util.Locale; import java.util.TimeZone; import net.sourceforge.plantuml.project.Value; @@ -48,7 +49,7 @@ public class Day implements Comparable, Value { private final int dayOfMonth; private final MonthYear monthYear; - private final long ms1; + private final long milliseconds; public static Day create(int year, String month, int dayOfMonth) { return new Day(year, Month.fromString(month), dayOfMonth); @@ -66,10 +67,14 @@ public class Day implements Comparable, Value { return create(System.currentTimeMillis()); } + public String toStringShort(Locale locale) { + return monthYear.shortName(locale) + " " + dayOfMonth; + } + public int getWeekOfYear(WeekNumberStrategy strategy) { synchronized (gmt) { gmt.clear(); - gmt.setTimeInMillis(ms1); + gmt.setTimeInMillis(milliseconds); gmt.setFirstDayOfWeek(strategy.getFirstDayOfWeekAsLegacyInt()); gmt.setMinimalDaysInFirstWeek(strategy.getMinimalDaysInFirstWeek()); return gmt.get(Calendar.WEEK_OF_YEAR); @@ -82,12 +87,12 @@ public class Day implements Comparable, Value { synchronized (gmt) { gmt.clear(); gmt.set(year, month.ordinal(), dayOfMonth); - this.ms1 = gmt.getTimeInMillis(); + this.milliseconds = gmt.getTimeInMillis(); } } private Day(long ms) { - this.ms1 = ms; + this.milliseconds = ms; synchronized (gmt) { gmt.clear(); gmt.setTimeInMillis(ms); @@ -113,11 +118,11 @@ public class Day implements Comparable, Value { } public final int getAbsoluteDayNum() { - return (int) (ms1 / MILLISECONDS_PER_DAY); + return (int) (milliseconds / MILLISECONDS_PER_DAY); } public final long getMillis() { - return ms1; + return milliseconds; } public int year() { @@ -195,4 +200,12 @@ public class Day implements Comparable, Value { return increment(); } + public Day roundDayDown() { + return new Day((milliseconds / MILLISECONDS_PER_DAY) * MILLISECONDS_PER_DAY); + } + + public Day roundDayUp() { + return new Day(((milliseconds + MILLISECONDS_PER_DAY - 1) / MILLISECONDS_PER_DAY) * MILLISECONDS_PER_DAY); + } + } diff --git a/src/net/sourceforge/plantuml/regexdiagram/PSystemRegex.java b/src/net/sourceforge/plantuml/regexdiagram/PSystemRegex.java index af874516c..e66975752 100644 --- a/src/net/sourceforge/plantuml/regexdiagram/PSystemRegex.java +++ b/src/net/sourceforge/plantuml/regexdiagram/PSystemRegex.java @@ -122,11 +122,11 @@ public class PSystemRegex extends TitledDiagram { @Override protected ImageData exportDiagramNow(OutputStream os, int index, FileFormatOption fileFormatOption) throws IOException { - return createImageBuilder(fileFormatOption).drawable(getTextBlock()).write(os); + return createImageBuilder(fileFormatOption).drawable(getTextMainBlock(fileFormatOption)).write(os); } @Override - protected TextBlock getTextBlock() { + protected TextBlock getTextMainBlock(FileFormatOption fileFormatOption) { // while (stack.size() > 1) // concatenation(); final ETile peekFirst = stack.peekFirst(); @@ -266,9 +266,10 @@ public class PSystemRegex extends TitledDiagram { if (arg1 instanceof ETileConcatenation) { arg1.push(arg2); stack.addFirst(arg1); - } else if (arg2 instanceof ETileConcatenation) { - arg2.push(arg1); - stack.addFirst(arg2); + // This does not work for (A[B])(C) +// } else if (arg2 instanceof ETileConcatenation) { +// arg2.push(arg1); +// stack.addFirst(arg2); } else { final ETile concat = new ETileConcatenation(); concat.push(arg1); diff --git a/src/net/sourceforge/plantuml/regexdiagram/RegexExpression.java b/src/net/sourceforge/plantuml/regexdiagram/RegexExpression.java index 77ab74334..584ed4e63 100644 --- a/src/net/sourceforge/plantuml/regexdiagram/RegexExpression.java +++ b/src/net/sourceforge/plantuml/regexdiagram/RegexExpression.java @@ -103,7 +103,7 @@ public class RegexExpression { return false; } - private static String readOpenParenthesis(CharInspector it) { + private static String readOpenParenthesis(CharInspector it) throws RegexParsingException { final char current0 = it.peek(0); it.jump(); final StringBuilder result = new StringBuilder(); @@ -118,6 +118,17 @@ public class RegexExpression { it.jump(); result.append("?!"); } + if (it.peek(0) == '?' && it.peek(1) == '<') { + while (true) { + if (it.peek(0) == 0) + throw new RegexParsingException("Unclosed named capturing group"); + if (it.peek(0) == '>') { + it.jump(); + return result.toString(); + } + it.jump(); + } + } return result.toString(); } diff --git a/src/net/sourceforge/plantuml/salt/PSystemSalt.java b/src/net/sourceforge/plantuml/salt/PSystemSalt.java index be3c0922a..303aa32bf 100644 --- a/src/net/sourceforge/plantuml/salt/PSystemSalt.java +++ b/src/net/sourceforge/plantuml/salt/PSystemSalt.java @@ -126,8 +126,7 @@ public class PSystemSalt extends TitledDiagram implements WithSprite { } @Override - protected TextBlock getTextBlock() { - final FileFormatOption fileFormatOption = new FileFormatOption(FileFormat.PNG); + protected TextBlock getTextMainBlock(FileFormatOption fileFormatOption) { final Element salt = createElement(manageSprite()); final StringBounder stringBounder = fileFormatOption.getDefaultStringBounder(getSkinParam()); final XDimension2D size = salt.getPreferredDimension(stringBounder, 0, 0); diff --git a/src/net/sourceforge/plantuml/sequencediagram/SequenceDiagram.java b/src/net/sourceforge/plantuml/sequencediagram/SequenceDiagram.java index d70277fb4..21bd66775 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/SequenceDiagram.java +++ b/src/net/sourceforge/plantuml/sequencediagram/SequenceDiagram.java @@ -296,13 +296,13 @@ public class SequenceDiagram extends UmlDiagram { } @Override - final public void exportDiagramGraphic(UGraphic ug) { - final FileMaker sequenceDiagramPngMaker = getSequenceDiagramPngMaker(0, new FileFormatOption(FileFormat.PNG)); + final public void exportDiagramGraphic(UGraphic ug, FileFormatOption fileFormatOption) { + final FileMaker sequenceDiagramPngMaker = getSequenceDiagramPngMaker(0, fileFormatOption); sequenceDiagramPngMaker.createOneGraphic(ug); } @Override - final protected TextBlock getTextBlock() { + final protected TextBlock getTextMainBlock(FileFormatOption fileFormatOption) { throw new UnsupportedOperationException(); } diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandArrow.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandArrow.java index c41b98fbd..5b4aa1ebe 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandArrow.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandArrow.java @@ -65,6 +65,7 @@ import net.sourceforge.plantuml.skin.ArrowDecoration; import net.sourceforge.plantuml.skin.ArrowHead; import net.sourceforge.plantuml.skin.ArrowPart; import net.sourceforge.plantuml.stereo.Stereotype; +import net.sourceforge.plantuml.stereo.StereotypePattern; import net.sourceforge.plantuml.url.Url; import net.sourceforge.plantuml.url.UrlBuilder; import net.sourceforge.plantuml.url.UrlMode; @@ -123,9 +124,7 @@ public class CommandArrow extends SingleLineCommand2 { new RegexLeaf("ACTIVATION", "(?:(\\+\\+|\\*\\*|!!|--|--\\+\\+|\\+\\+--)?)"), // RegexLeaf.spaceZeroOrMore(), // new RegexLeaf("LIFECOLOR", "(?:(#\\w+)?)"), // - RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("STEREOTYPE", "(\\<\\<.*\\>\\>)?"), // - RegexLeaf.spaceZeroOrMore(), // + StereotypePattern.optional("STEREOTYPE"), // UrlBuilder.OPTIONAL, // RegexLeaf.spaceZeroOrMore(), // new RegexLeaf("MESSAGE", "(?::[%s]*(.*))?"), // diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandBoxStart.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandBoxStart.java index 9dc4752c6..10bd93bdd 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandBoxStart.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandBoxStart.java @@ -50,6 +50,7 @@ import net.sourceforge.plantuml.regex.RegexOr; import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.sequencediagram.SequenceDiagram; import net.sourceforge.plantuml.stereo.Stereotype; +import net.sourceforge.plantuml.stereo.StereotypePattern; import net.sourceforge.plantuml.style.ISkinParam; import net.sourceforge.plantuml.utils.LineLocation; @@ -69,8 +70,7 @@ public class CommandBoxStart extends SingleLineCommand2 { new RegexConcat( // RegexLeaf.spaceOneOrMore(), // new RegexLeaf("NAME2", "([^#]+)")))), // - RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("STEREO", "(\\<\\<.*\\>\\>)?"), // + StereotypePattern.optional("STEREO"), // color().getRegex(), // RegexLeaf.end()); } diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipantA.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipantA.java index 03c0cd3df..04236f68c 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipantA.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipantA.java @@ -40,6 +40,7 @@ import net.sourceforge.plantuml.regex.IRegex; import net.sourceforge.plantuml.regex.RegexConcat; import net.sourceforge.plantuml.regex.RegexLeaf; import net.sourceforge.plantuml.regex.RegexOptional; +import net.sourceforge.plantuml.stereo.StereotypePattern; import net.sourceforge.plantuml.url.UrlBuilder; public class CommandParticipantA extends CommandParticipant { @@ -60,13 +61,12 @@ public class CommandParticipantA extends CommandParticipant { RegexLeaf.spaceOneOrMore() // )), // new RegexLeaf("CODE", "([%pLN_.@]+)"), // - RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("STEREO", "(\\<\\<.*\\>\\>)?"), // - RegexLeaf.spaceZeroOrMore(), // + StereotypePattern.optional("STEREO"), // getOrderRegex(), // RegexLeaf.spaceZeroOrMore(), // UrlBuilder.OPTIONAL, // RegexLeaf.spaceZeroOrMore(), // ColorParser.exp1(), RegexLeaf.end()); } + } diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipantA2.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipantA2.java index 954bf7ac2..7014b0073 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipantA2.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipantA2.java @@ -39,6 +39,7 @@ import net.sourceforge.plantuml.klimt.color.ColorParser; import net.sourceforge.plantuml.regex.IRegex; import net.sourceforge.plantuml.regex.RegexConcat; import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.stereo.StereotypePattern; import net.sourceforge.plantuml.url.UrlBuilder; public class CommandParticipantA2 extends CommandParticipant { @@ -56,9 +57,7 @@ public class CommandParticipantA2 extends CommandParticipant { new RegexLeaf("as"), // RegexLeaf.spaceOneOrMore(), // new RegexLeaf("FULL", "[%g]([^%g]+)[%g]"), // - RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("STEREO", "(\\<\\<.*\\>\\>)?"), // - RegexLeaf.spaceZeroOrMore(), // + StereotypePattern.optional("STEREO"), // getOrderRegex(), // RegexLeaf.spaceZeroOrMore(), // UrlBuilder.OPTIONAL, // diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipantA3.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipantA3.java index dcb2b2f0c..fe05fbc49 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipantA3.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipantA3.java @@ -39,6 +39,7 @@ import net.sourceforge.plantuml.klimt.color.ColorParser; import net.sourceforge.plantuml.regex.IRegex; import net.sourceforge.plantuml.regex.RegexConcat; import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.stereo.StereotypePattern; import net.sourceforge.plantuml.url.UrlBuilder; public class CommandParticipantA3 extends CommandParticipant { @@ -56,9 +57,7 @@ public class CommandParticipantA3 extends CommandParticipant { new RegexLeaf("as"), // RegexLeaf.spaceOneOrMore(), // new RegexLeaf("CODE", "([%pLN_.@]+)"), // - RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("STEREO", "(\\<\\<.*\\>\\>)?"), // - RegexLeaf.spaceZeroOrMore(), // + StereotypePattern.optional("STEREO"), // getOrderRegex(), // RegexLeaf.spaceZeroOrMore(), // UrlBuilder.OPTIONAL, // diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipantA4.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipantA4.java index 6197f0265..c2ec8e1d0 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipantA4.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipantA4.java @@ -39,6 +39,7 @@ import net.sourceforge.plantuml.klimt.color.ColorParser; import net.sourceforge.plantuml.regex.IRegex; import net.sourceforge.plantuml.regex.RegexConcat; import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.stereo.StereotypePattern; import net.sourceforge.plantuml.url.UrlBuilder; public class CommandParticipantA4 extends CommandParticipant { @@ -52,9 +53,7 @@ public class CommandParticipantA4 extends CommandParticipant { getRegexType(), // RegexLeaf.spaceOneOrMore(), // new RegexLeaf("CODE", "[%g]([^%g]+)[%g]"), // - RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("STEREO", "(\\<\\<.*\\>\\>)?"), // - RegexLeaf.spaceZeroOrMore(), // + StereotypePattern.optional("STEREO"), // getOrderRegex(), // RegexLeaf.spaceZeroOrMore(), // UrlBuilder.OPTIONAL, // diff --git a/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipantMultilines.java b/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipantMultilines.java index b9d3a554e..6404fb347 100644 --- a/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipantMultilines.java +++ b/src/net/sourceforge/plantuml/sequencediagram/command/CommandParticipantMultilines.java @@ -52,6 +52,7 @@ import net.sourceforge.plantuml.sequencediagram.Participant; import net.sourceforge.plantuml.sequencediagram.ParticipantType; import net.sourceforge.plantuml.sequencediagram.SequenceDiagram; import net.sourceforge.plantuml.stereo.Stereotype; +import net.sourceforge.plantuml.stereo.StereotypePattern; import net.sourceforge.plantuml.style.ISkinParam; import net.sourceforge.plantuml.url.Url; import net.sourceforge.plantuml.url.UrlBuilder; @@ -74,9 +75,7 @@ public class CommandParticipantMultilines extends CommandMultilines2\\>)?"), // - RegexLeaf.spaceZeroOrMore(), // + StereotypePattern.optional("STEREO"), // CommandParticipant.getOrderRegex(), // RegexLeaf.spaceZeroOrMore(), // UrlBuilder.OPTIONAL, // diff --git a/src/net/sourceforge/plantuml/skin/UmlDiagramType.java b/src/net/sourceforge/plantuml/skin/UmlDiagramType.java index 3beaf0691..00bdbd29f 100644 --- a/src/net/sourceforge/plantuml/skin/UmlDiagramType.java +++ b/src/net/sourceforge/plantuml/skin/UmlDiagramType.java @@ -39,7 +39,7 @@ import net.sourceforge.plantuml.style.SName; public enum UmlDiagramType { SEQUENCE, STATE, CLASS, OBJECT, ACTIVITY, DESCRIPTION, COMPOSITE, FLOW, TIMING, BPM, NWDIAG, MINDMAP, WBS, WIRE, - HELP, GANTT, SALT, JSON, GIT, BOARD, YAML, HCL, EBNF, REGEX, FILES; + HELP, GANTT, SALT, JSON, GIT, BOARD, YAML, HCL, EBNF, REGEX, FILES, CHRONOLOGY; public SName getStyleName() { if (this == SEQUENCE) @@ -96,6 +96,9 @@ public enum UmlDiagramType { if (this == REGEX) return SName.regex; + if (this == CHRONOLOGY) + return SName.ganttDiagram; + return SName.activityDiagram; } } diff --git a/src/net/sourceforge/plantuml/statediagram/command/CommandCreatePackage2.java b/src/net/sourceforge/plantuml/statediagram/command/CommandCreatePackage2.java index a683fe5b7..b2d94a443 100644 --- a/src/net/sourceforge/plantuml/statediagram/command/CommandCreatePackage2.java +++ b/src/net/sourceforge/plantuml/statediagram/command/CommandCreatePackage2.java @@ -55,6 +55,7 @@ import net.sourceforge.plantuml.regex.RegexOr; import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.statediagram.StateDiagram; import net.sourceforge.plantuml.stereo.Stereotype; +import net.sourceforge.plantuml.stereo.StereotypePattern; import net.sourceforge.plantuml.url.Url; import net.sourceforge.plantuml.url.UrlBuilder; import net.sourceforge.plantuml.url.UrlMode; @@ -83,9 +84,7 @@ public class CommandCreatePackage2 extends SingleLineCommand2 { new RegexLeaf("as"), RegexLeaf.spaceOneOrMore() // )), // new RegexLeaf("CODE2", "([%pLN_.]+)"))), // - RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("STEREOTYPE", "(\\<\\<.*\\>\\>)?"), // - RegexLeaf.spaceZeroOrMore(), // + StereotypePattern.optional("STEREOTYPE"), // UrlBuilder.OPTIONAL, // RegexLeaf.spaceZeroOrMore(), // color().getRegex(), // diff --git a/src/net/sourceforge/plantuml/statediagram/command/CommandCreatePackageState.java b/src/net/sourceforge/plantuml/statediagram/command/CommandCreatePackageState.java index 6a8e408aa..b8a502ab9 100644 --- a/src/net/sourceforge/plantuml/statediagram/command/CommandCreatePackageState.java +++ b/src/net/sourceforge/plantuml/statediagram/command/CommandCreatePackageState.java @@ -56,6 +56,7 @@ import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.statediagram.StateDiagram; import net.sourceforge.plantuml.stereo.Stereotag; import net.sourceforge.plantuml.stereo.Stereotype; +import net.sourceforge.plantuml.stereo.StereotypePattern; import net.sourceforge.plantuml.url.Url; import net.sourceforge.plantuml.url.UrlBuilder; import net.sourceforge.plantuml.url.UrlMode; @@ -86,9 +87,7 @@ public class CommandCreatePackageState extends SingleLineCommand2 new RegexLeaf("CODE2", "([%pLN_.]+)"))), // RegexLeaf.spaceZeroOrMore(), // new RegexLeaf("TAGS1", Stereotag.pattern() + "?"), // - RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("STEREOTYPE", "(\\<\\<.*\\>\\>)?"), // - RegexLeaf.spaceZeroOrMore(), // + StereotypePattern.optional("STEREOTYPE"), // new RegexLeaf("TAGS2", Stereotag.pattern() + "?"), // RegexLeaf.spaceZeroOrMore(), // UrlBuilder.OPTIONAL, // diff --git a/src/net/sourceforge/plantuml/statediagram/command/CommandCreateState.java b/src/net/sourceforge/plantuml/statediagram/command/CommandCreateState.java index 1de76f5f1..abb561747 100644 --- a/src/net/sourceforge/plantuml/statediagram/command/CommandCreateState.java +++ b/src/net/sourceforge/plantuml/statediagram/command/CommandCreateState.java @@ -56,6 +56,7 @@ import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.statediagram.StateDiagram; import net.sourceforge.plantuml.stereo.Stereotag; import net.sourceforge.plantuml.stereo.Stereotype; +import net.sourceforge.plantuml.stereo.StereotypePattern; import net.sourceforge.plantuml.url.Url; import net.sourceforge.plantuml.url.UrlBuilder; import net.sourceforge.plantuml.url.UrlMode; @@ -85,9 +86,7 @@ public class CommandCreateState extends SingleLineCommand2 { new RegexLeaf("CODE4", "[%g]([^%g]+)[%g]")), // RegexLeaf.spaceZeroOrMore(), // new RegexLeaf("TAGS1", Stereotag.pattern() + "?"), // - RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("STEREOTYPE", "(\\<\\<.*\\>\\>)?"), // - RegexLeaf.spaceZeroOrMore(), // + StereotypePattern.optional("STEREOTYPE"), // new RegexLeaf("TAGS2", Stereotag.pattern() + "?"), // RegexLeaf.spaceZeroOrMore(), // UrlBuilder.OPTIONAL, // diff --git a/src/net/sourceforge/plantuml/stereo/Stereotype.java b/src/net/sourceforge/plantuml/stereo/Stereotype.java index 0268b9ae6..7cc43cd38 100644 --- a/src/net/sourceforge/plantuml/stereo/Stereotype.java +++ b/src/net/sourceforge/plantuml/stereo/Stereotype.java @@ -78,6 +78,8 @@ public class Stereotype implements CharSequence { } public static Stereotype build(String label) { + if (label == null) + return null; return build(label, true); } diff --git a/src/net/sourceforge/plantuml/stereo/StereotypePattern.java b/src/net/sourceforge/plantuml/stereo/StereotypePattern.java new file mode 100644 index 000000000..c86520408 --- /dev/null +++ b/src/net/sourceforge/plantuml/stereo/StereotypePattern.java @@ -0,0 +1,71 @@ +/* ======================================================================== + * PlantUML : a free UML diagram generator + * ======================================================================== + * + * (C) Copyright 2009-2024, Arnaud Roques + * + * Project Info: https://plantuml.com + * + * If you like this project or if you find it useful, you can support us at: + * + * https://plantuml.com/patreon (only 1$ per month!) + * https://plantuml.com/paypal + * + * This file is part of PlantUML. + * + * PlantUML is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * PlantUML distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public + * License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. + * + * + * Original Author: Arnaud Roques + * + * + */ +package net.sourceforge.plantuml.stereo; + +import net.sourceforge.plantuml.regex.IRegex; +import net.sourceforge.plantuml.regex.RegexConcat; +import net.sourceforge.plantuml.regex.RegexLeaf; +import net.sourceforge.plantuml.regex.RegexOptional; + +public class StereotypePattern { + + public static IRegex optional(String param) { + return new RegexConcat( // + RegexLeaf.spaceZeroOrMore(), // + new RegexOptional(mandatory(param)), // + RegexLeaf.spaceZeroOrMore() // + ); + } + + public static IRegex mandatory(String param) { + return new RegexLeaf(param, "(\\<\\<.+\\>\\>)"); + } + + public static IRegex optionalArchimate(String param) { + return new RegexConcat( // + RegexLeaf.spaceZeroOrMore(), // + new RegexOptional(new RegexLeaf(param, "(\\<\\<[-\\w]+\\>\\>)")), // + RegexLeaf.spaceZeroOrMore() // + ); + } + + public static String removeChevronBrackets(String stereo) { + if (stereo != null && stereo.startsWith("<<") && stereo.endsWith(">>")) + return stereo.substring(2, stereo.length() - 2); + return stereo; + } + +} diff --git a/src/net/sourceforge/plantuml/sudoku/PSystemSudoku.java b/src/net/sourceforge/plantuml/sudoku/PSystemSudoku.java index 90ce3c596..11c342031 100644 --- a/src/net/sourceforge/plantuml/sudoku/PSystemSudoku.java +++ b/src/net/sourceforge/plantuml/sudoku/PSystemSudoku.java @@ -70,7 +70,7 @@ public class PSystemSudoku extends AbstractPSystem { } @Override - public void exportDiagramGraphic(UGraphic ug) { + public void exportDiagramGraphic(UGraphic ug, FileFormatOption fileFormatOption) { final GraphicsSudoku sud = new GraphicsSudoku(sudoku); sud.drawInternal(ug); } diff --git a/src/net/sourceforge/plantuml/tim/Eater.java b/src/net/sourceforge/plantuml/tim/Eater.java index a4b74b118..c23fbf085 100644 --- a/src/net/sourceforge/plantuml/tim/Eater.java +++ b/src/net/sourceforge/plantuml/tim/Eater.java @@ -79,7 +79,7 @@ public abstract class Eater { } final public TValue eatExpression(TContext context, TMemory memory) throws EaterException, EaterExceptionLocated { - char ch = peekChar(); + final char ch = peekChar(); if (ch == '{' || ch == '[') { final String data = eatAllToEnd(); // System.err.println("data=" + data); diff --git a/src/net/sourceforge/plantuml/timingdiagram/TimingDiagram.java b/src/net/sourceforge/plantuml/timingdiagram/TimingDiagram.java index 0847489b3..03d10d127 100644 --- a/src/net/sourceforge/plantuml/timingdiagram/TimingDiagram.java +++ b/src/net/sourceforge/plantuml/timingdiagram/TimingDiagram.java @@ -99,11 +99,11 @@ public class TimingDiagram extends UmlDiagram implements Clocks { protected ImageData exportDiagramInternal(OutputStream os, int index, FileFormatOption fileFormatOption) throws IOException { - return createImageBuilder(fileFormatOption).drawable(getTextBlock()).write(os); + return createImageBuilder(fileFormatOption).drawable(getTextMainBlock(fileFormatOption)).write(os); } @Override - protected TextBlock getTextBlock() { + protected TextBlock getTextMainBlock(FileFormatOption fileFormatOption) { return new AbstractTextBlock() { public void drawU(UGraphic ug) { diff --git a/src/net/sourceforge/plantuml/timingdiagram/command/CommandAnalog.java b/src/net/sourceforge/plantuml/timingdiagram/command/CommandAnalog.java index ebbaf7a68..2c16fc6c2 100644 --- a/src/net/sourceforge/plantuml/timingdiagram/command/CommandAnalog.java +++ b/src/net/sourceforge/plantuml/timingdiagram/command/CommandAnalog.java @@ -43,6 +43,7 @@ import net.sourceforge.plantuml.regex.RegexLeaf; import net.sourceforge.plantuml.regex.RegexOptional; import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.stereo.Stereotype; +import net.sourceforge.plantuml.stereo.StereotypePattern; import net.sourceforge.plantuml.timingdiagram.PlayerAnalog; import net.sourceforge.plantuml.timingdiagram.TimingDiagram; import net.sourceforge.plantuml.utils.LineLocation; @@ -62,9 +63,7 @@ public class CommandAnalog extends SingleLineCommand2 { new RegexLeaf("analog"), // RegexLeaf.spaceOneOrMore(), // new RegexLeaf("FULL", "[%g]([^%g]+)[%g]"), // - RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("STEREOTYPE", "(\\<\\<.*\\>\\>)?"), // - RegexLeaf.spaceOneOrMore(), // + StereotypePattern.optional("STEREOTYPE"), // new RegexOptional(// new RegexConcat( // new RegexLeaf("between"), // @@ -78,9 +77,7 @@ public class CommandAnalog extends SingleLineCommand2 { new RegexLeaf("as"), // RegexLeaf.spaceOneOrMore(), // new RegexLeaf("CODE", "([%pLN_.@]+)"), // - RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("STEREOTYPE2", "(\\<\\<.*\\>\\>)?"), // - RegexLeaf.spaceZeroOrMore(), // + StereotypePattern.optional("STEREOTYPE2"), // RegexLeaf.end()); } diff --git a/src/net/sourceforge/plantuml/timingdiagram/command/CommandBinary.java b/src/net/sourceforge/plantuml/timingdiagram/command/CommandBinary.java index 8feb151ab..e46b9d077 100644 --- a/src/net/sourceforge/plantuml/timingdiagram/command/CommandBinary.java +++ b/src/net/sourceforge/plantuml/timingdiagram/command/CommandBinary.java @@ -43,6 +43,7 @@ import net.sourceforge.plantuml.regex.RegexLeaf; import net.sourceforge.plantuml.regex.RegexOptional; import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.stereo.Stereotype; +import net.sourceforge.plantuml.stereo.StereotypePattern; import net.sourceforge.plantuml.timingdiagram.TimingDiagram; import net.sourceforge.plantuml.utils.LineLocation; @@ -61,15 +62,11 @@ public class CommandBinary extends SingleLineCommand2 { new RegexLeaf("binary"), // RegexLeaf.spaceOneOrMore(), // new RegexLeaf("FULL", "[%g]([^%g]+)[%g]"), // - RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("STEREOTYPE", "(\\<\\<.*\\>\\>)?"), // - RegexLeaf.spaceOneOrMore(), // + StereotypePattern.optional("STEREOTYPE"), // new RegexLeaf("as"), // RegexLeaf.spaceOneOrMore(), // new RegexLeaf("CODE", "([%pLN_.@]+)"), // - RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("STEREOTYPE2", "(\\<\\<.*\\>\\>)?"), // - RegexLeaf.spaceZeroOrMore(), // + StereotypePattern.optional("STEREOTYPE2"), // RegexLeaf.end()); } diff --git a/src/net/sourceforge/plantuml/timingdiagram/command/CommandRobustConcise.java b/src/net/sourceforge/plantuml/timingdiagram/command/CommandRobustConcise.java index 432b0fde1..51716350c 100644 --- a/src/net/sourceforge/plantuml/timingdiagram/command/CommandRobustConcise.java +++ b/src/net/sourceforge/plantuml/timingdiagram/command/CommandRobustConcise.java @@ -43,6 +43,7 @@ import net.sourceforge.plantuml.regex.RegexLeaf; import net.sourceforge.plantuml.regex.RegexOptional; import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.stereo.Stereotype; +import net.sourceforge.plantuml.stereo.StereotypePattern; import net.sourceforge.plantuml.timingdiagram.TimingDiagram; import net.sourceforge.plantuml.timingdiagram.TimingStyle; import net.sourceforge.plantuml.utils.LineLocation; @@ -64,15 +65,11 @@ public class CommandRobustConcise extends SingleLineCommand2 { new RegexOptional( // new RegexConcat( // new RegexLeaf("FULL", "[%g]([^%g]+)[%g]"), // - RegexLeaf.spaceOneOrMore(), // - new RegexLeaf("STEREOTYPE", "(\\<\\<.*\\>\\>)?"), // - RegexLeaf.spaceZeroOrMore(), // + StereotypePattern.optional("STEREOTYPE"), // new RegexLeaf("as"), // RegexLeaf.spaceOneOrMore())), // new RegexLeaf("CODE", "([%pLN_.@]+)"), // - RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("STEREOTYPE2", "(\\<\\<.*\\>\\>)?"), // - RegexLeaf.spaceZeroOrMore(), // + StereotypePattern.optional("STEREOTYPE2"), // RegexLeaf.end()); } diff --git a/src/net/sourceforge/plantuml/version/PSystemLicense.java b/src/net/sourceforge/plantuml/version/PSystemLicense.java index 50cebbdee..d3ecb24e8 100644 --- a/src/net/sourceforge/plantuml/version/PSystemLicense.java +++ b/src/net/sourceforge/plantuml/version/PSystemLicense.java @@ -76,7 +76,7 @@ public class PSystemLicense extends PlainDiagram implements UDrawable { } @Override - public void exportDiagramGraphic(UGraphic ug) { + public void exportDiagramGraphic(UGraphic ug, FileFormatOption fileFormatOption) { final LicenseInfo licenseInfo = LicenseInfo.retrieveQuick(); getTextBlock(licenseInfo).drawU(ug); } diff --git a/src/net/sourceforge/plantuml/version/Version.java b/src/net/sourceforge/plantuml/version/Version.java index 942297437..1d1a930c7 100644 --- a/src/net/sourceforge/plantuml/version/Version.java +++ b/src/net/sourceforge/plantuml/version/Version.java @@ -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.13beta3"; + private static final String version = "1.2023.13beta4"; public static String versionString() { return version; diff --git a/src/net/sourceforge/plantuml/wbs/CommandWBSLink.java b/src/net/sourceforge/plantuml/wbs/CommandWBSLink.java index a8ca6d469..0a88bb07e 100644 --- a/src/net/sourceforge/plantuml/wbs/CommandWBSLink.java +++ b/src/net/sourceforge/plantuml/wbs/CommandWBSLink.java @@ -46,6 +46,7 @@ import net.sourceforge.plantuml.regex.RegexConcat; import net.sourceforge.plantuml.regex.RegexLeaf; import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.stereo.Stereotype; +import net.sourceforge.plantuml.stereo.StereotypePattern; import net.sourceforge.plantuml.utils.LineLocation; public class CommandWBSLink extends SingleLineCommand2 { @@ -64,9 +65,7 @@ public class CommandWBSLink extends SingleLineCommand2 { new RegexLeaf("CODE2", "([%pLN_]+)"), // RegexLeaf.spaceZeroOrMore(), // color().getRegex(), // - RegexLeaf.spaceZeroOrMore(), // - new RegexLeaf("STEREOTYPE", "(\\<\\<.*\\>\\>)?"), // - RegexLeaf.spaceZeroOrMore(), // + StereotypePattern.optional("STEREOTYPE"), // new RegexLeaf("LABEL_LINK", "(?::[%s]*(.+))?"), // RegexLeaf.end()); } diff --git a/src/net/sourceforge/plantuml/wbs/WBSDiagram.java b/src/net/sourceforge/plantuml/wbs/WBSDiagram.java index 6d3e03663..192d9e3b4 100644 --- a/src/net/sourceforge/plantuml/wbs/WBSDiagram.java +++ b/src/net/sourceforge/plantuml/wbs/WBSDiagram.java @@ -92,11 +92,11 @@ public class WBSDiagram extends UmlDiagram { protected ImageData exportDiagramInternal(OutputStream os, int index, FileFormatOption fileFormatOption) throws IOException { - return createImageBuilder(fileFormatOption).drawable(getTextBlock()).write(os); + return createImageBuilder(fileFormatOption).drawable(getTextMainBlock(fileFormatOption)).write(os); } @Override - protected TextBlock getTextBlock() { + protected TextBlock getTextMainBlock(FileFormatOption fileFormatOption) { return new AbstractTextBlock() { public void drawU(UGraphic ug) { diff --git a/src/net/sourceforge/plantuml/wire/WireDiagram.java b/src/net/sourceforge/plantuml/wire/WireDiagram.java index 12cf30cc3..7919be884 100644 --- a/src/net/sourceforge/plantuml/wire/WireDiagram.java +++ b/src/net/sourceforge/plantuml/wire/WireDiagram.java @@ -76,11 +76,11 @@ public class WireDiagram extends UmlDiagram { protected ImageData exportDiagramInternal(OutputStream os, int index, FileFormatOption fileFormatOption) throws IOException { - return createImageBuilder(fileFormatOption).drawable(getTextBlock()).write(os); + return createImageBuilder(fileFormatOption).drawable(getTextMainBlock(fileFormatOption)).write(os); } @Override - protected TextBlock getTextBlock() { + protected TextBlock getTextMainBlock(FileFormatOption fileFormatOption) { return new AbstractTextBlock() { public void drawU(UGraphic ug) { diff --git a/test/net/sourceforge/plantuml/PipeTest.java b/test/net/sourceforge/plantuml/PipeTest.java index a975bf26c..6db686723 100644 --- a/test/net/sourceforge/plantuml/PipeTest.java +++ b/test/net/sourceforge/plantuml/PipeTest.java @@ -127,7 +127,7 @@ class PipeTest { false, false)); l.add(TestCase.of("-syntax", "@startuml\na->b\n@enduml\n@startuml\na->b\nb->c\n@enduml\n", "SEQUENCE\n(2 participants)\nSEQUENCE\n(3 participants)\n", Verification.EXACT, false, false)); - l.add(TestCase.of("-syntax", "@startgantt\n[a] lasts 1 day\n@endgantt", "OTHER\n(Project)\n", + l.add(TestCase.of("-syntax", "@startgantt\n[a] lasts 1 day\n@endgantt", "OTHER\n(Gantt)\n", Verification.EXACT, false, false)); // invalid syntax diff --git a/test/nonreg/RenderViaApiTest.java b/test/nonreg/RenderViaApiTest.java new file mode 100644 index 000000000..295eb1a56 --- /dev/null +++ b/test/nonreg/RenderViaApiTest.java @@ -0,0 +1,56 @@ +package nonreg; + +import static java.nio.charset.StandardCharsets.UTF_8; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.util.Lists.newArrayList; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.io.PrintStream; +import java.util.Collections; +import java.util.List; + +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.CsvSource; + +import net.sourceforge.plantuml.FileFormat; +import net.sourceforge.plantuml.FileFormatOption; +import net.sourceforge.plantuml.SourceStringReader; +import net.sourceforge.plantuml.core.DiagramDescription; + +/** + * Tests the Render + */ +class RenderViaApiTest { + + @ParameterizedTest(name = "[{index}] {1}") + @CsvSource(nullValues = "null", value = { + "'@startuml\n!$a={\"k\": \"exampleValue\"}\ntitle $a.k\na -> b\n@enduml\n' , exampleValue", + "'@startuml\n!$a=[1, 2, 3]\ntitle xx $a[2] yy\na -> a\n@enduml' , xx 3 yy", + "'@startuml\ntitle\n!foreach $i in [1, 2, 3]\nxx $i yy\n!endfor\nendtitle\na -> a\n@enduml' , xx 2 yy", + "'@startuml\ntitle\n!foreach $i in [\"a\", \"b\", \"c\"]\nxx $i yy\n!endfor\nendtitle\na -> a\n@enduml' , xx b yy", + }) + void RenderTest(String input, String expected) throws Exception { + assertRenderExpectedOutput(input, expected); + } + + // TODO: to Factorize on a specific test package... + + private String RenderViaApiTest(String diagram, FileFormat format) throws IOException, UnsupportedEncodingException { + final SourceStringReader ssr = new SourceStringReader(diagram, UTF_8); + final ByteArrayOutputStream baos = new ByteArrayOutputStream(); + final DiagramDescription diagramDescription = ssr.outputImage(baos, 0, new FileFormatOption(format)); + final String rendered = new String(baos.toByteArray(), UTF_8); + // System.out.println(rendered); + return rendered; + } + + public void assertRenderExpectedOutput(String input, String expected) throws Exception { + final String rendered = RenderViaApiTest(input, FileFormat.PREPROC); + // OK with: + // final String rendered = RenderViaApiTest(input, FileFormat.UTXT); + assertThat(rendered).doesNotContain("syntax").contains(expected); + } +} diff --git a/test/nonreg/RenderViaPipeTest.java b/test/nonreg/RenderViaPipeTest.java new file mode 100644 index 000000000..9a76078b9 --- /dev/null +++ b/test/nonreg/RenderViaPipeTest.java @@ -0,0 +1,63 @@ +package nonreg; + +import static java.nio.charset.StandardCharsets.UTF_8; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.util.Lists.newArrayList; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.PrintStream; +import java.util.Collections; +import java.util.List; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.CsvSource; + +import net.sourceforge.plantuml.ErrorStatus; +import net.sourceforge.plantuml.Option; +import net.sourceforge.plantuml.Pipe; + +/** + * Tests the Render + */ +class RenderViaPipeTest { + + @ParameterizedTest(name = "[{index}] {1}") + @CsvSource(nullValues = "null", value = { + "'@startuml\n!$a={\"k\": \"exampleValue\"}\ntitle $a.k\na -> b\n@enduml\n' , exampleValue", + "'@startuml\n!$a=[1, 2, 3]\ntitle xx $a[2] yy\na -> a\n' , xx 3 yy", + "'@startuml\ntitle\n!foreach $i in [1, 2, 3]\nxx $i yy\n!endfor\nendtitle\na -> a\n' , xx 2 yy", + "'@startuml\ntitle\n!foreach $i in [\"a\", \"b\", \"c\"]\nxx $i yy\n!endfor\nendtitle\na -> a\n' , xx b yy", + }) + void RenderTest(String input, String expected) throws Exception { + assertRenderExpectedOutput(input, expected); + } + + // TODO: to Factorize on a specific test package... + private static final String[] COMMON_OPTIONS = {"-preproc"}; + // OK with "-tutxt" + // private static final String[] COMMON_OPTIONS = {"-tutxt"}; + + private String[] optionArray(String... extraOptions) { + final List list = newArrayList(COMMON_OPTIONS); + Collections.addAll(list, extraOptions); + return list.toArray(new String[0]); + } + + private String renderViaPipe(String diagram, String... extraOptions) throws Exception { + final Option option = new Option(optionArray(extraOptions)); + final ByteArrayInputStream bais = new ByteArrayInputStream(diagram.getBytes(UTF_8)); + final ByteArrayOutputStream baos = new ByteArrayOutputStream(); + final Pipe pipe = new Pipe(option, new PrintStream(baos), bais, option.getCharset()); + pipe.managePipe(ErrorStatus.init()); + final String rendered = new String(baos.toByteArray(), UTF_8); + // System.out.println(rendered); + return rendered; + } + + public void assertRenderExpectedOutput(String input, String expected) throws Exception { + final String rendered = renderViaPipe(input); + assertThat(rendered).doesNotContain("syntax").contains(expected); + } +} diff --git a/test/nonreg/simple/A0003_Test.java b/test/nonreg/simple/A0003_Test.java index 5d78367bd..99bbf5888 100644 --- a/test/nonreg/simple/A0003_Test.java +++ b/test/nonreg/simple/A0003_Test.java @@ -29,6 +29,6 @@ public class A0003_Test extends BasicTest { @Test void testSimple() throws IOException { - checkImage("(Project)"); + checkImage("(Gantt)"); } } From a061b11305e8754a958fd8f59ed336de0c99f7b5 Mon Sep 17 00:00:00 2001 From: Arnaud Roques Date: Mon, 11 Dec 2023 18:47:30 +0100 Subject: [PATCH 33/95] chore: formatting issue --- src/net/sourceforge/plantuml/PSystemBuilder.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/net/sourceforge/plantuml/PSystemBuilder.java b/src/net/sourceforge/plantuml/PSystemBuilder.java index 5d1fbca15..40bde6ee6 100644 --- a/src/net/sourceforge/plantuml/PSystemBuilder.java +++ b/src/net/sourceforge/plantuml/PSystemBuilder.java @@ -224,8 +224,7 @@ public class PSystemBuilder { // factories.add(new PSystemSudokuFactory()); // ::done - // ::comment when __CORE__ or __MIT__ or __EPL__ or __BSD__ or __ASL__ or - // __LGPL__ + // ::comment when __CORE__ or __MIT__ or __EPL__ or __BSD__ or __ASL__ or __LGPL__ factories.add(new PSystemJcckitFactory()); factories.add(new PSystemSudokuFactory()); // ::done @@ -249,8 +248,7 @@ public class PSystemBuilder { // ::done factories.add(new PSystemCharlieFactory()); - // ::comment when __CORE__ or __MIT__ or __EPL__ or __BSD__ or __ASL__ or - // __LGPL__ + // ::comment when __CORE__ or __MIT__ or __EPL__ or __BSD__ or __ASL__ or __LGPL__ factories.add(new PSystemXearthFactory()); // ::done From a87f84406465e29784342173ee1eb2733d135b81 Mon Sep 17 00:00:00 2001 From: Arnaud Roques Date: Mon, 11 Dec 2023 19:03:13 +0100 Subject: [PATCH 34/95] fix: missing label in activity diagrams https://github.com/plantuml/plantuml/issues/1622#issuecomment-1847091587 --- .../plantuml/activitydiagram3/InstructionList.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/net/sourceforge/plantuml/activitydiagram3/InstructionList.java b/src/net/sourceforge/plantuml/activitydiagram3/InstructionList.java index 7bec98e0d..d8362f656 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/InstructionList.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/InstructionList.java @@ -129,8 +129,13 @@ public class InstructionList extends WithNote implements Instruction, Instructio @Override public Ftile createFtile(FtileFactory factory) { - if (all.size() == 0) - return new FtileEmpty(factory.skinParam(), defaultSwimlane); + if (all.size() == 0) { + Ftile result = new FtileEmpty(factory.skinParam(), defaultSwimlane); + // Not a typo, in that case, we decide to decorate the entry link. + if (outlinkRendering != null) + result = factory.decorateIn(result, outlinkRendering); + return result; + } final List breaks = new ArrayList<>(); Ftile result = eventuallyAddNote(factory, null, getSwimlaneIn(), VerticalAlignment.CENTER); From 5128891a0fe3473bf660a24f2077c5f6eab6d9e7 Mon Sep 17 00:00:00 2001 From: Arnaud Roques Date: Mon, 11 Dec 2023 19:24:54 +0100 Subject: [PATCH 35/95] chore: version 1.2023.13 --- gradle.properties | 2 +- src/net/sourceforge/plantuml/version/Version.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index ee1cf3aff..e5189954b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -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.13beta4 +version = 1.2023.13 org.gradle.workers.max = 3 \ No newline at end of file diff --git a/src/net/sourceforge/plantuml/version/Version.java b/src/net/sourceforge/plantuml/version/Version.java index 1d1a930c7..c14810bc1 100644 --- a/src/net/sourceforge/plantuml/version/Version.java +++ b/src/net/sourceforge/plantuml/version/Version.java @@ -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.13beta4"; + private static final String version = "1.2023.13"; public static String versionString() { return version; @@ -80,7 +80,7 @@ public class Version { } public static long compileTime() { - return 1697809794384L; + return 1702318857783L; } public static String compileTimeString() { From cc80d86bc3c13e4f95d6c4060692fbab15301fde Mon Sep 17 00:00:00 2001 From: Arnaud Roques Date: Tue, 12 Dec 2023 21:35:19 +0100 Subject: [PATCH 36/95] chore: prepare next development cycle --- gradle.properties | 2 +- src/net/sourceforge/plantuml/version/Version.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index e5189954b..13efff07a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -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.13 +version = 1.2023.14beta1 org.gradle.workers.max = 3 \ No newline at end of file diff --git a/src/net/sourceforge/plantuml/version/Version.java b/src/net/sourceforge/plantuml/version/Version.java index c14810bc1..05f088d68 100644 --- a/src/net/sourceforge/plantuml/version/Version.java +++ b/src/net/sourceforge/plantuml/version/Version.java @@ -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.13"; + private static final String version = "1.2023.14beta1"; public static String versionString() { return version; From 371bafaade0a51030c3cb7b86d49d5e14bef5a6d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 15 Dec 2023 02:43:21 +0000 Subject: [PATCH 37/95] chore(deps): bump actions/upload-artifact from 3 to 4 Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3 to 4. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ec444f245..88dde8a0e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -115,7 +115,7 @@ jobs: run: gradle test --no-daemon -i - name: Upload test reports - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: needs.workflow_config.outputs.do_test_linux == 'true' with: # Using github.run_number here to reduce confusion when downloading & comparing from several builds @@ -244,7 +244,7 @@ jobs: enableCrossOsArchive: true - name: Upload artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: # Using github.run_number here to reduce confusion when downloading & comparing artifacts from several builds name: ${{ github.run_number }}-artifacts From b65aaff80b1837ea1e56d70802c88e7dbfb1470f Mon Sep 17 00:00:00 2001 From: Arnaud Roques Date: Mon, 18 Dec 2023 18:24:29 +0100 Subject: [PATCH 38/95] fix: improve local style for activity diagrams https://github.com/plantuml/plantuml/issues/1623 --- .../activitydiagram3/InstructionIf.java | 11 +- .../activitydiagram3/ftile/FtileFactory.java | 4 +- .../ftile/FtileFactoryDelegator.java | 7 +- .../vcompact/FtileFactoryDelegatorIf.java | 8 +- .../ftile/vcompact/VCompactFactory.java | 3 +- .../plantuml/ebnf/ETileNamedGroup.java | 143 ++++++++++++++++++ .../plantuml/regexdiagram/PSystemRegex.java | 11 +- .../plantuml/regexdiagram/ReTokenType.java | 3 + .../regexdiagram/RegexExpression.java | 73 +++++++-- .../plantuml/regexdiagram/ShuntingYard.java | 7 +- 10 files changed, 240 insertions(+), 30 deletions(-) create mode 100644 src/net/sourceforge/plantuml/ebnf/ETileNamedGroup.java diff --git a/src/net/sourceforge/plantuml/activitydiagram3/InstructionIf.java b/src/net/sourceforge/plantuml/activitydiagram3/InstructionIf.java index ee2b423b8..49e136308 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/InstructionIf.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/InstructionIf.java @@ -59,6 +59,7 @@ import net.sourceforge.plantuml.sequencediagram.NotePosition; import net.sourceforge.plantuml.sequencediagram.NoteType; import net.sourceforge.plantuml.stereo.Stereotype; import net.sourceforge.plantuml.style.ISkinParam; +import net.sourceforge.plantuml.style.StyleBuilder; import net.sourceforge.plantuml.url.Url; public class InstructionIf extends WithNote implements Instruction, InstructionCollection { @@ -77,6 +78,7 @@ public class InstructionIf extends WithNote implements Instruction, InstructionC private final Stereotype stereotype; private final Swimlane swimlane; + private final StyleBuilder currentStyleBuilder; @Override public boolean containsBreak() { @@ -98,8 +100,9 @@ public class InstructionIf extends WithNote implements Instruction, InstructionC this.skinParam = skinParam; this.topInlinkRendering = Objects.requireNonNull(inlinkRendering); this.swimlane = swimlane; - this.thens.add(new Branch(skinParam.getCurrentStyleBuilder(), swimlane, whenThen, labelTest, color, - LinkRendering.none(), stereotype)); + this.currentStyleBuilder = skinParam.getCurrentStyleBuilder(); + this.thens.add(new Branch(currentStyleBuilder, swimlane, whenThen, labelTest, color, LinkRendering.none(), + stereotype)); this.current = this.thens.get(0); } @@ -138,12 +141,12 @@ public class InstructionIf extends WithNote implements Instruction, InstructionC branch.updateFtile(factory); if (elseBranch == null) - this.elseBranch = new Branch(skinParam.getCurrentStyleBuilder(), swimlane, LinkRendering.none(), + this.elseBranch = new Branch(currentStyleBuilder, swimlane, LinkRendering.none(), Display.NULL, null, LinkRendering.none(), stereotype); elseBranch.updateFtile(factory); Ftile result = factory.createIf(swimlane, thens, elseBranch, outColor, topInlinkRendering, url, - getPositionedNotes(), stereotype); + getPositionedNotes(), stereotype, currentStyleBuilder); // if (getPositionedNotes().size() > 0) // result = FtileWithNoteOpale.create(result, getPositionedNotes(), false, VerticalAlignment.CENTER); diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileFactory.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileFactory.java index ada34034c..7b4f9a4bf 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileFactory.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileFactory.java @@ -52,6 +52,7 @@ import net.sourceforge.plantuml.klimt.geom.VerticalAlignment; import net.sourceforge.plantuml.stereo.Stereotype; import net.sourceforge.plantuml.style.ISkinParam; import net.sourceforge.plantuml.style.Style; +import net.sourceforge.plantuml.style.StyleBuilder; import net.sourceforge.plantuml.url.Url; public interface FtileFactory { @@ -89,7 +90,8 @@ public interface FtileFactory { HColor color, Instruction specialOut, Ftile backward, LinkRendering incoming1, LinkRendering incoming2); public Ftile createIf(Swimlane swimlane, List thens, Branch elseBranch, LinkRendering outColor, - LinkRendering topInlinkRendering, Url url, Collection notes, Stereotype stereotype); + LinkRendering topInlinkRendering, Url url, Collection notes, Stereotype stereotype, + StyleBuilder currentStyleBuilder); public Ftile createSwitch(Swimlane swimlane, List branches, LinkRendering afterEndwhile, LinkRendering topInlinkRendering, Display labelTest); diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileFactoryDelegator.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileFactoryDelegator.java index c95352ecb..4738d0725 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileFactoryDelegator.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileFactoryDelegator.java @@ -60,6 +60,7 @@ import net.sourceforge.plantuml.stereo.Stereotype; import net.sourceforge.plantuml.style.ISkinParam; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; +import net.sourceforge.plantuml.style.StyleBuilder; import net.sourceforge.plantuml.style.StyleSignatureBasic; import net.sourceforge.plantuml.url.Url; @@ -188,8 +189,10 @@ public class FtileFactoryDelegator implements FtileFactory { @Override public Ftile createIf(Swimlane swimlane, List thens, Branch elseBranch, LinkRendering afterEndwhile, - LinkRendering topInlinkRendering, Url url, Collection notes, Stereotype stereotype) { - return factory.createIf(swimlane, thens, elseBranch, afterEndwhile, topInlinkRendering, url, notes, stereotype); + LinkRendering topInlinkRendering, Url url, Collection notes, Stereotype stereotype, + StyleBuilder currentStyleBuilder) { + return factory.createIf(swimlane, thens, elseBranch, afterEndwhile, topInlinkRendering, url, notes, stereotype, + currentStyleBuilder); } @Override diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorIf.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorIf.java index bd116dc3f..92eda31fe 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorIf.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorIf.java @@ -51,6 +51,7 @@ import net.sourceforge.plantuml.skin.Pragma; import net.sourceforge.plantuml.stereo.Stereotype; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.Style; +import net.sourceforge.plantuml.style.StyleBuilder; import net.sourceforge.plantuml.svek.ConditionEndStyle; import net.sourceforge.plantuml.svek.ConditionStyle; import net.sourceforge.plantuml.url.Url; @@ -66,15 +67,16 @@ public class FtileFactoryDelegatorIf extends FtileFactoryDelegator { @Override public Ftile createIf(Swimlane swimlane, List thens, Branch elseBranch, LinkRendering afterEndwhile, - LinkRendering topInlinkRendering, Url url, Collection notes, Stereotype stereotype) { + LinkRendering topInlinkRendering, Url url, Collection notes, Stereotype stereotype, + StyleBuilder currentStyleBuilder) { final ConditionStyle conditionStyle = skinParam().getConditionStyle(); final ConditionEndStyle conditionEndStyle = skinParam().getConditionEndStyle(); final Branch branch0 = thens.get(0); - final Style styleArrow = getDefaultStyleDefinitionArrow().getMergedStyle(skinParam().getCurrentStyleBuilder()); + final Style styleArrow = getDefaultStyleDefinitionArrow().getMergedStyle(currentStyleBuilder); final Style styleDiamond = getDefaultStyleDefinitionDiamond().withTOBECHANGED(stereotype) - .getMergedStyle(skinParam().getCurrentStyleBuilder()); + .getMergedStyle(currentStyleBuilder); final HColor backColor = branch0.getColor() == null ? styleDiamond.value(PName.BackGroundColor).asColor(skinParam().getIHtmlColorSet()) : branch0.getColor(); diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/VCompactFactory.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/VCompactFactory.java index e2ee4eaa6..340ed7a57 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/VCompactFactory.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/VCompactFactory.java @@ -169,7 +169,8 @@ public class VCompactFactory implements FtileFactory { @Override public Ftile createIf(Swimlane swimlane, List thens, Branch elseBranch, LinkRendering afterEndwhile, - LinkRendering topInlinkRendering, Url url, Collection notes, Stereotype stereotype) { + LinkRendering topInlinkRendering, Url url, Collection notes, Stereotype stereotype, + StyleBuilder currentStyleBuilder) { final List ftiles = new ArrayList<>(); for (Branch branch : thens) ftiles.add(branch.getFtile()); diff --git a/src/net/sourceforge/plantuml/ebnf/ETileNamedGroup.java b/src/net/sourceforge/plantuml/ebnf/ETileNamedGroup.java new file mode 100644 index 000000000..60927fa4c --- /dev/null +++ b/src/net/sourceforge/plantuml/ebnf/ETileNamedGroup.java @@ -0,0 +1,143 @@ +/* ======================================================================== + * PlantUML : a free UML diagram generator + * ======================================================================== + * + * (C) Copyright 2009-2020, Arnaud Roques + * + * Project Info: https://plantuml.com + * + * If you like this project or if you find it useful, you can support us at: + * + * https://plantuml.com/patreon (only 1$ per month!) + * https://plantuml.com/paypal + * + * This file is part of PlantUML. + * + * PlantUML is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * PlantUML distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public + * License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. + * + * + * Original Author: Arnaud Roques + * + * + */ +package net.sourceforge.plantuml.ebnf; + +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColorSet; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.klimt.drawing.UGraphic; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.XDimension2D; +import net.sourceforge.plantuml.klimt.shape.URectangle; +import net.sourceforge.plantuml.klimt.shape.UText; +import net.sourceforge.plantuml.style.ISkinParam; + +public class ETileNamedGroup extends ETile { + + private final ETile orig; + private final ISkinParam skinParam; + private String commentAbove; + private String commentBelow; + private final HColorSet colorSet; + private final double deltax = 10; + private final double deltay1 = 10; + private final double deltay2 = 10; + private final UText groupName; + + private final FontConfiguration fc; + + public ETileNamedGroup(ETile orig, FontConfiguration fc, HColorSet colorSet, ISkinParam skinParam, String name) { + this.skinParam = skinParam; + this.orig = orig; + this.fc = fc; + this.colorSet = colorSet; + this.groupName = UText.build(name, fc); + + } + + @Override + public double getH1(StringBounder stringBounder) { + // final TextBlock note = getNoteAbove(stringBounder); + return deltay1 + orig.getH1(stringBounder); + } + + @Override + public double getH2(StringBounder stringBounder) { + // final TextBlock note = getNoteBelow(stringBounder); + return orig.getH2(stringBounder) + deltay2; + } + + @Override + public double getWidth(StringBounder stringBounder) { + return orig.getWidth(stringBounder) + 2 * deltax; + } + + @Override + public void drawU(UGraphic ug) { + final StringBounder stringBounder = ug.getStringBounder(); + final XDimension2D dim = calculateDimension(stringBounder); + + try { + final HColor background = colorSet.getColor("#E8E8FF"); + final UGraphic ugBack = ug.apply(background).apply(background.bg()); + ugBack.draw(URectangle.build(dim)); + final XDimension2D dimText = stringBounder.calculateDimension(fc.getFont(), groupName.getText()); + ugBack.apply(UTranslate.dy(-dimText.getHeight())).draw(URectangle.build(dimText.delta(10, 0))); + + } catch (NoSuchColorException e) { + e.printStackTrace(); + } + final double linePos = getH1(stringBounder); + drawHline(ug, linePos, 0, deltax); + drawHline(ug, linePos, dim.getWidth() - deltax, dim.getWidth()); + + orig.drawU(ug.apply(new UTranslate(deltax, deltay1))); + ug.apply(UTranslate.dx(5)).draw(groupName); + + } + + @Override + public void push(ETile tile) { + throw new UnsupportedOperationException(); + } + +// @Override +// protected void addCommentAbove(String comment) { +// this.commentAbove = comment; +// } +// +// @Override +// protected void addCommentBelow(String comment) { +// this.commentBelow = comment; +// } + +// private TextBlock getNoteAbove(StringBounder stringBounder) { +// if (commentAbove == null) +// return TextBlockUtils.EMPTY_TEXT_BLOCK; +// final FloatingNote note = FloatingNote.create(Display.getWithNewlines(commentAbove), skinParam, SName.ebnf); +// return TextBlockUtils.withMargin(note, 0, 0, 0, 10); +// } +// +// private TextBlock getNoteBelow(StringBounder stringBounder) { +// if (commentBelow == null) +// return TextBlockUtils.EMPTY_TEXT_BLOCK; +// final FloatingNote note = FloatingNote.create(Display.getWithNewlines(commentBelow), skinParam, SName.ebnf); +// return TextBlockUtils.withMargin(note, 0, 0, 10, 0); +// } + +} diff --git a/src/net/sourceforge/plantuml/regexdiagram/PSystemRegex.java b/src/net/sourceforge/plantuml/regexdiagram/PSystemRegex.java index e66975752..03e171ef1 100644 --- a/src/net/sourceforge/plantuml/regexdiagram/PSystemRegex.java +++ b/src/net/sourceforge/plantuml/regexdiagram/PSystemRegex.java @@ -52,11 +52,11 @@ import net.sourceforge.plantuml.ebnf.ETile; import net.sourceforge.plantuml.ebnf.ETileAlternation; import net.sourceforge.plantuml.ebnf.ETileBox; import net.sourceforge.plantuml.ebnf.ETileConcatenation; +import net.sourceforge.plantuml.ebnf.ETileNamedGroup; import net.sourceforge.plantuml.ebnf.ETileOneOrMore; import net.sourceforge.plantuml.ebnf.ETileOptional; import net.sourceforge.plantuml.ebnf.ETileZeroOrMore; import net.sourceforge.plantuml.ebnf.Symbol; -import net.sourceforge.plantuml.ebnf.TextBlockable; import net.sourceforge.plantuml.klimt.color.HColor; import net.sourceforge.plantuml.klimt.color.HColorSet; import net.sourceforge.plantuml.klimt.color.HColors; @@ -76,8 +76,6 @@ import net.sourceforge.plantuml.utils.CharInspector; public class PSystemRegex extends TitledDiagram { - private final List expressions = new ArrayList<>(); - public PSystemRegex(UmlSource source) { super(source, UmlDiagramType.REGEX, null); final ISkinParam skinParam = getSkinParam(); @@ -164,6 +162,8 @@ public class PSystemRegex extends TitledDiagram { push(token, Symbol.TERMINAL_STRING1); else if (token.getType() == ReTokenType.GROUP) push(token, Symbol.SPECIAL_SEQUENCE); + else if (token.getType() == ReTokenType.NAMED_GROUP) + namedGroup(token.getData()); else if (token.getType() == ReTokenType.CLASS) push(token, Symbol.LITTERAL); else if (token.getType() == ReTokenType.ANCHOR) @@ -205,6 +205,11 @@ public class PSystemRegex extends TitledDiagram { stack.addFirst(new ETileBox(element.getData(), type, fontConfiguration, style, colorSet, getSkinParam())); } + private void namedGroup(String name) { + final ETile arg1 = stack.removeFirst(); + stack.addFirst(new ETileNamedGroup(arg1, fontConfiguration, colorSet, getSkinParam(), name)); + } + private void repetitionZeroOrMore(boolean isCompact) { final ETile arg1 = stack.removeFirst(); if (isCompact) diff --git a/src/net/sourceforge/plantuml/regexdiagram/ReTokenType.java b/src/net/sourceforge/plantuml/regexdiagram/ReTokenType.java index d723fcfed..11d68ff88 100644 --- a/src/net/sourceforge/plantuml/regexdiagram/ReTokenType.java +++ b/src/net/sourceforge/plantuml/regexdiagram/ReTokenType.java @@ -43,12 +43,15 @@ public enum ReTokenType { QUANTIFIER, // ANCHOR, // GROUP, // + NAMED_GROUP, // ALTERNATIVE, // PARENTHESIS_OPEN, // PARENTHESIS_CLOSE, // CONCATENATION_IMPLICIT; static public boolean needImplicitConcatenation(ReTokenType token1, ReTokenType token2) { + if (token1 == NAMED_GROUP) + return false; if (token1 == ALTERNATIVE) return false; if (token2 == ALTERNATIVE) diff --git a/src/net/sourceforge/plantuml/regexdiagram/RegexExpression.java b/src/net/sourceforge/plantuml/regexdiagram/RegexExpression.java index 584ed4e63..01bd39abd 100644 --- a/src/net/sourceforge/plantuml/regexdiagram/RegexExpression.java +++ b/src/net/sourceforge/plantuml/regexdiagram/RegexExpression.java @@ -63,9 +63,15 @@ public class RegexExpression { } else if (current == '[') { final String s = readGroup(it); result.add(new ReToken(ReTokenType.GROUP, s)); + } else if (isStartComment(it)) { + skipComment(it); + } else if (isStartNamedCapturingGroup(it)) { + final ReToken token = readNamedGroup(it); + result.add(token); + result.add(new ReToken(ReTokenType.PARENTHESIS_OPEN, "(")); } else if (isStartOpenParenthesis(it)) { - final String s = readOpenParenthesis(it); - result.add(new ReToken(ReTokenType.PARENTHESIS_OPEN, s)); + final ReToken token = readOpenParenthesis(it); + result.add(token); } else if (current == ')') { result.add(new ReToken(ReTokenType.PARENTHESIS_CLOSE, ")")); it.jump(); @@ -103,7 +109,55 @@ public class RegexExpression { return false; } - private static String readOpenParenthesis(CharInspector it) throws RegexParsingException { + private static boolean isStartNamedCapturingGroup(CharInspector it) { + final char current0 = it.peek(0); + if (current0 == '(' && it.peek(1) == '?' && it.peek(2) == '<') + return true; + return false; + } + + private static boolean isStartComment(CharInspector it) { + final char current0 = it.peek(0); + if (current0 == '(' && it.peek(1) == '?' && it.peek(2) == '#') + return true; + return false; + } + + private static void skipComment(CharInspector it) throws RegexParsingException { + it.jump(); + it.jump(); + it.jump(); + final StringBuilder comment = new StringBuilder(); + while (true) { + if (it.peek(0) == 0) + throw new RegexParsingException("Unclosed comment"); + if (it.peek(0) == ')') { + it.jump(); + return; + } + comment.append(it.peek(0)); + it.jump(); + } + } + + private static ReToken readNamedGroup(CharInspector it) throws RegexParsingException { + it.jump(); + it.jump(); + it.jump(); + final StringBuilder namedGroup = new StringBuilder(); + while (true) { + if (it.peek(0) == 0) + throw new RegexParsingException("Unclosed named capturing group"); + if (it.peek(0) == '>') { + it.jump(); + return new ReToken(ReTokenType.NAMED_GROUP, namedGroup.toString()); + } + namedGroup.append(it.peek(0)); + it.jump(); + } + } + + private static ReToken readOpenParenthesis(CharInspector it) { final char current0 = it.peek(0); it.jump(); final StringBuilder result = new StringBuilder(); @@ -118,18 +172,7 @@ public class RegexExpression { it.jump(); result.append("?!"); } - if (it.peek(0) == '?' && it.peek(1) == '<') { - while (true) { - if (it.peek(0) == 0) - throw new RegexParsingException("Unclosed named capturing group"); - if (it.peek(0) == '>') { - it.jump(); - return result.toString(); - } - it.jump(); - } - } - return result.toString(); + return new ReToken(ReTokenType.PARENTHESIS_OPEN, result.toString()); } private static boolean isStartQuantifier(CharInspector it) { diff --git a/src/net/sourceforge/plantuml/regexdiagram/ShuntingYard.java b/src/net/sourceforge/plantuml/regexdiagram/ShuntingYard.java index c29e83702..8b45b6274 100644 --- a/src/net/sourceforge/plantuml/regexdiagram/ShuntingYard.java +++ b/src/net/sourceforge/plantuml/regexdiagram/ShuntingYard.java @@ -59,6 +59,8 @@ public class ShuntingYard { ouputQueue.add(token); } else if (token.getType() == ReTokenType.GROUP) { ouputQueue.add(token); + } else if (token.getType() == ReTokenType.NAMED_GROUP) { + operatorStack.addFirst(token); } else if (token.getType() == ReTokenType.CLASS) { ouputQueue.add(token); } else if (token.getType() == ReTokenType.ANCHOR) { @@ -80,7 +82,10 @@ public class ShuntingYard { && operatorStack.peekFirst().getType() != ReTokenType.PARENTHESIS_OPEN) ouputQueue.add(operatorStack.removeFirst()); final ReToken first = operatorStack.removeFirst(); -// ouputQueue.add(first); + if (operatorStack.peekFirst() != null + && operatorStack.peekFirst().getType() == ReTokenType.NAMED_GROUP) + ouputQueue.add(operatorStack.removeFirst()); + } else { throw new UnsupportedOperationException(token.toString()); From 26189b1e64e142df0277c7deaeb59d79fcd92c49 Mon Sep 17 00:00:00 2001 From: Arnaud Roques Date: Tue, 19 Dec 2023 19:08:24 +0100 Subject: [PATCH 39/95] fix: improve local style management for activity diagrams https://github.com/plantuml/plantuml/issues/1629 --- gradle.properties | 2 +- .../activitydiagram3/InstructionRepeat.java | 5 +- .../activitydiagram3/InstructionWhile.java | 5 +- .../activitydiagram3/ftile/FtileFactory.java | 5 +- .../ftile/FtileFactoryDelegator.java | 9 +- .../activitydiagram3/ftile/Swimlanes.java | 9 +- .../vcompact/FtileFactoryDelegatorRepeat.java | 8 +- .../vcompact/FtileFactoryDelegatorWhile.java | 9 +- .../ftile/vcompact/VCompactFactory.java | 4 +- .../plantuml/ebnf/ETileLookAheadOrBehind.java | 110 ++++++++++++++++++ .../plantuml/klimt/shape/UText.java | 5 + .../plantuml/regexdiagram/PSystemRegex.java | 10 ++ .../plantuml/regexdiagram/ReTokenType.java | 8 +- .../regexdiagram/RegexExpression.java | 81 ++++++++++++- .../plantuml/regexdiagram/ShuntingYard.java | 6 +- .../sourceforge/plantuml/version/Version.java | 2 +- 16 files changed, 249 insertions(+), 29 deletions(-) create mode 100644 src/net/sourceforge/plantuml/ebnf/ETileLookAheadOrBehind.java diff --git a/gradle.properties b/gradle.properties index 13efff07a..07537229c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -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.14beta1 +version = 1.2023.14beta2 org.gradle.workers.max = 3 \ No newline at end of file diff --git a/src/net/sourceforge/plantuml/activitydiagram3/InstructionRepeat.java b/src/net/sourceforge/plantuml/activitydiagram3/InstructionRepeat.java index 287b84a21..1680f463f 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/InstructionRepeat.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/InstructionRepeat.java @@ -59,6 +59,7 @@ import net.sourceforge.plantuml.sequencediagram.NotePosition; import net.sourceforge.plantuml.sequencediagram.NoteType; import net.sourceforge.plantuml.stereo.Stereotype; import net.sourceforge.plantuml.style.ISkinParam; +import net.sourceforge.plantuml.style.StyleBuilder; public class InstructionRepeat extends AbstractInstruction implements Instruction { @@ -87,6 +88,7 @@ public class InstructionRepeat extends AbstractInstruction implements Instructio private LinkRendering endRepeatLinkRendering = LinkRendering.none(); private final Colors colors; + private final StyleBuilder currentStyleBuilder; public boolean containsBreak() { return repeatList.containsBreak(); @@ -94,6 +96,7 @@ public class InstructionRepeat extends AbstractInstruction implements Instructio public InstructionRepeat(Swimlanes swimlanes, Instruction parent, LinkRendering nextLinkRenderer, HColor color, Display startLabel, BoxStyle boxStyleIn, Colors colors) { + this.currentStyleBuilder = swimlanes.getCurrentStyleBuilder(); this.swimlanes = swimlanes; this.swimlane = swimlanes.getCurrentSwimlane(); this.repeatList = new InstructionList(this.swimlane); @@ -158,7 +161,7 @@ public class InstructionRepeat extends AbstractInstruction implements Instructio if (this.testCalled == false && incoming1.isNone()) incoming1 = swimlanes.nextLinkRenderer(); final Ftile result = factory.repeat(boxStyleIn, swimlane, swimlaneOut, startLabel, decorateOut, test, yes, out, - colors, back, isLastOfTheParent(), incoming1, incoming2); + colors, back, isLastOfTheParent(), incoming1, incoming2, currentStyleBuilder); if (killed) return new FtileKilled(result); diff --git a/src/net/sourceforge/plantuml/activitydiagram3/InstructionWhile.java b/src/net/sourceforge/plantuml/activitydiagram3/InstructionWhile.java index 554510da7..8ec637324 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/InstructionWhile.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/InstructionWhile.java @@ -56,6 +56,7 @@ import net.sourceforge.plantuml.klimt.geom.VerticalAlignment; import net.sourceforge.plantuml.sequencediagram.NotePosition; import net.sourceforge.plantuml.sequencediagram.NoteType; import net.sourceforge.plantuml.style.ISkinParam; +import net.sourceforge.plantuml.style.StyleBuilder; public class InstructionWhile extends WithNote implements Instruction, InstructionCollection { @@ -82,6 +83,7 @@ public class InstructionWhile extends WithNote implements Instruction, Instructi private LinkRendering incoming1 = LinkRendering.none(); private LinkRendering incoming2 = LinkRendering.none(); private boolean backwardCalled; + private final StyleBuilder currentStyleBuilder; public void overwriteYes(Display yes) { this.yes = yes; @@ -94,6 +96,7 @@ public class InstructionWhile extends WithNote implements Instruction, Instructi this.nextLinkRenderer = Objects.requireNonNull(nextLinkRenderer); this.yes = Objects.requireNonNull(yes); this.swimlane = swimlane; + this.currentStyleBuilder = skinParam.getCurrentStyleBuilder(); this.color = color; this.skinParam = skinParam; } @@ -118,7 +121,7 @@ public class InstructionWhile extends WithNote implements Instruction, Instructi final Ftile back = Display.isNull(backward) ? null : factory.activity(backward, swimlane, boxStyle, Colors.empty(), null); Ftile tmp = repeatList.createFtile(factory); - tmp = factory.createWhile(outColor, swimlane, tmp, test, yes, color, specialOut, back, incoming1, incoming2); + tmp = factory.createWhile(outColor, swimlane, tmp, test, yes, color, specialOut, back, incoming1, incoming2, currentStyleBuilder); if (getPositionedNotes().size() > 0) tmp = FtileWithNoteOpale.create(tmp, getPositionedNotes(), false, VerticalAlignment.CENTER); diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileFactory.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileFactory.java index 7b4f9a4bf..f7cabc662 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileFactory.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileFactory.java @@ -84,10 +84,11 @@ public interface FtileFactory { public Ftile repeat(BoxStyle boxStyleIn, Swimlane swimlane, Swimlane swimlaneOut, Display startLabel, Ftile repeat, Display test, Display yes, Display out, Colors colors, Ftile backward, boolean noOut, - LinkRendering incoming1, LinkRendering incoming2); + LinkRendering incoming1, LinkRendering incoming2, StyleBuilder currentStyleBuilder); public Ftile createWhile(LinkRendering outColor, Swimlane swimlane, Ftile whileBlock, Display test, Display yes, - HColor color, Instruction specialOut, Ftile backward, LinkRendering incoming1, LinkRendering incoming2); + HColor color, Instruction specialOut, Ftile backward, LinkRendering incoming1, LinkRendering incoming2, + StyleBuilder currentStyleBuilder); public Ftile createIf(Swimlane swimlane, List thens, Branch elseBranch, LinkRendering outColor, LinkRendering topInlinkRendering, Url url, Collection notes, Stereotype stereotype, diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileFactoryDelegator.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileFactoryDelegator.java index 4738d0725..b39f1ad2e 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileFactoryDelegator.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/FtileFactoryDelegator.java @@ -175,16 +175,17 @@ public class FtileFactoryDelegator implements FtileFactory { @Override public Ftile repeat(BoxStyle boxStyleIn, Swimlane swimlane, Swimlane swimlaneOut, Display startLabel, Ftile repeat, Display test, Display yes, Display out, Colors colors, Ftile backward, boolean noOut, - LinkRendering incoming1, LinkRendering incoming2) { + LinkRendering incoming1, LinkRendering incoming2, StyleBuilder currentStyleBuilder) { return factory.repeat(boxStyleIn, swimlane, swimlaneOut, startLabel, repeat, test, yes, out, colors, backward, - noOut, incoming1, incoming2); + noOut, incoming1, incoming2, currentStyleBuilder); } @Override public Ftile createWhile(LinkRendering outColor, Swimlane swimlane, Ftile whileBlock, Display test, Display yes, - HColor color, Instruction specialOut, Ftile back, LinkRendering incoming1, LinkRendering incoming2) { + HColor color, Instruction specialOut, Ftile back, LinkRendering incoming1, LinkRendering incoming2, + StyleBuilder styleBuilder) { return factory.createWhile(outColor, swimlane, whileBlock, test, yes, color, specialOut, back, incoming1, - incoming2); + incoming2, styleBuilder); } @Override diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/Swimlanes.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/Swimlanes.java index 1d5bebdd7..0df019d31 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/Swimlanes.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/Swimlanes.java @@ -82,6 +82,7 @@ import net.sourceforge.plantuml.style.ISkinParam; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.SName; import net.sourceforge.plantuml.style.Style; +import net.sourceforge.plantuml.style.StyleBuilder; import net.sourceforge.plantuml.style.StyleSignatureBasic; import net.sourceforge.plantuml.style.Styleable; import net.sourceforge.plantuml.svek.UGraphicForSnake; @@ -127,9 +128,9 @@ public class Swimlanes extends AbstractTextBlock implements TextBlock, Styleable } protected Style getStyle() { - if (style == null) { + if (style == null) this.style = getStyleSignature().getMergedStyle(skinParam.getCurrentStyleBuilder()); - } + return style; } @@ -455,4 +456,8 @@ public class Swimlanes extends AbstractTextBlock implements TextBlock, Styleable return cachedMinMax; } + public StyleBuilder getCurrentStyleBuilder() { + return skinParam.getCurrentStyleBuilder(); + } + } diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorRepeat.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorRepeat.java index a289a153d..140845b0a 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorRepeat.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorRepeat.java @@ -62,6 +62,7 @@ import net.sourceforge.plantuml.klimt.font.FontConfiguration; import net.sourceforge.plantuml.klimt.geom.XDimension2D; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.Style; +import net.sourceforge.plantuml.style.StyleBuilder; import net.sourceforge.plantuml.svek.ConditionStyle; public class FtileFactoryDelegatorRepeat extends FtileFactoryDelegator { @@ -73,13 +74,12 @@ public class FtileFactoryDelegatorRepeat extends FtileFactoryDelegator { @Override public Ftile repeat(BoxStyle boxStyleIn, Swimlane swimlane, Swimlane swimlaneOut, Display startLabel, final Ftile repeat, Display test, Display yes, Display out, Colors colors, Ftile backward, boolean noOut, - LinkRendering incoming1, LinkRendering incoming2) { + LinkRendering incoming1, LinkRendering incoming2, StyleBuilder currentStyleBuilder) { final ConditionStyle conditionStyle = skinParam().getConditionStyle(); - final Style styleArrow = getDefaultStyleDefinitionArrow().getMergedStyle(skinParam().getCurrentStyleBuilder()); - final Style styleDiamond = getDefaultStyleDefinitionDiamond() - .getMergedStyle(skinParam().getCurrentStyleBuilder()); + final Style styleArrow = getDefaultStyleDefinitionArrow().getMergedStyle(currentStyleBuilder); + final Style styleDiamond = getDefaultStyleDefinitionDiamond().getMergedStyle(currentStyleBuilder); final HColor borderColor = styleDiamond.value(PName.LineColor).asColor(skinParam().getIHtmlColorSet()); final HColor diamondColor = styleDiamond.value(PName.BackGroundColor).asColor(skinParam().getIHtmlColorSet()); final Rainbow arrowColor = Rainbow.build(styleArrow, skinParam().getIHtmlColorSet()); diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorWhile.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorWhile.java index 510a8df34..09e28adbc 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorWhile.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/FtileFactoryDelegatorWhile.java @@ -58,6 +58,7 @@ import net.sourceforge.plantuml.klimt.drawing.UGraphic; import net.sourceforge.plantuml.klimt.font.FontConfiguration; import net.sourceforge.plantuml.style.PName; import net.sourceforge.plantuml.style.Style; +import net.sourceforge.plantuml.style.StyleBuilder; import net.sourceforge.plantuml.svek.ConditionStyle; public class FtileFactoryDelegatorWhile extends FtileFactoryDelegator { @@ -68,13 +69,13 @@ public class FtileFactoryDelegatorWhile extends FtileFactoryDelegator { @Override public Ftile createWhile(LinkRendering outColor, Swimlane swimlane, Ftile whileBlock, Display test, Display yes, - HColor color, Instruction specialOut, Ftile backward, LinkRendering incoming1, LinkRendering incoming2) { + HColor color, Instruction specialOut, Ftile backward, LinkRendering incoming1, LinkRendering incoming2, + StyleBuilder currentStyleBuilder) { final ConditionStyle conditionStyle = skinParam().getConditionStyle(); - final Style styleArrow = getDefaultStyleDefinitionArrow().getMergedStyle(skinParam().getCurrentStyleBuilder()); - final Style styleDiamond = getDefaultStyleDefinitionDiamond() - .getMergedStyle(skinParam().getCurrentStyleBuilder()); + final Style styleArrow = getDefaultStyleDefinitionArrow().getMergedStyle(currentStyleBuilder); + final Style styleDiamond = getDefaultStyleDefinitionDiamond().getMergedStyle(currentStyleBuilder); final HColor borderColor = styleDiamond.value(PName.LineColor).asColor(skinParam().getIHtmlColorSet()); final HColor backColor = styleDiamond.value(PName.BackGroundColor).asColor(skinParam().getIHtmlColorSet()); final Rainbow arrowColor = Rainbow.build(styleArrow, skinParam().getIHtmlColorSet()); diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/VCompactFactory.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/VCompactFactory.java index 340ed7a57..743936057 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/VCompactFactory.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/vcompact/VCompactFactory.java @@ -156,14 +156,14 @@ public class VCompactFactory implements FtileFactory { @Override public Ftile repeat(BoxStyle boxStyleIn, Swimlane swimlane, Swimlane swimlaneOut, Display startLabel, Ftile repeat, Display test, Display yes, Display out, Colors colors, Ftile backward, boolean noOut, - LinkRendering incoming1, LinkRendering incoming2) { + LinkRendering incoming1, LinkRendering incoming2, StyleBuilder currentStyleBuilder) { return repeat; } @Override public Ftile createWhile(LinkRendering afterEndwhile, Swimlane swimlane, Ftile whileBlock, Display test, Display yes, HColor color, Instruction specialOut, Ftile back, LinkRendering incoming1, - LinkRendering incoming2) { + LinkRendering incoming2, StyleBuilder styleBuilder) { return whileBlock; } diff --git a/src/net/sourceforge/plantuml/ebnf/ETileLookAheadOrBehind.java b/src/net/sourceforge/plantuml/ebnf/ETileLookAheadOrBehind.java new file mode 100644 index 000000000..23a046faf --- /dev/null +++ b/src/net/sourceforge/plantuml/ebnf/ETileLookAheadOrBehind.java @@ -0,0 +1,110 @@ +/* ======================================================================== + * PlantUML : a free UML diagram generator + * ======================================================================== + * + * (C) Copyright 2009-2020, Arnaud Roques + * + * Project Info: https://plantuml.com + * + * If you like this project or if you find it useful, you can support us at: + * + * https://plantuml.com/patreon (only 1$ per month!) + * https://plantuml.com/paypal + * + * This file is part of PlantUML. + * + * PlantUML is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * PlantUML distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public + * License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. + * + * + * Original Author: Arnaud Roques + * + * + */ +package net.sourceforge.plantuml.ebnf; + +import net.sourceforge.plantuml.klimt.UStroke; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColorSet; +import net.sourceforge.plantuml.klimt.drawing.UGraphic; +import net.sourceforge.plantuml.klimt.font.FontConfiguration; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.XDimension2D; +import net.sourceforge.plantuml.klimt.shape.URectangle; +import net.sourceforge.plantuml.klimt.shape.UText; +import net.sourceforge.plantuml.style.PName; +import net.sourceforge.plantuml.style.Style; + +public class ETileLookAheadOrBehind extends ETile { + + private final ETile orig; + private final HColorSet colorSet; + private final double deltax1 = 4; + private final double deltax2 = 8; + private final double deltay = 6; + private final Style style; + private final UText supText; + + private final FontConfiguration fc; + + public ETileLookAheadOrBehind(ETile orig, FontConfiguration fc, Style style, HColorSet colorSet, String type) { + this.style = style; + this.orig = orig; + this.fc = fc; + this.colorSet = colorSet; + this.supText = UText.build(type, fc); + + } + + @Override + public double getH1(StringBounder stringBounder) { + return deltay + orig.getH1(stringBounder); + } + + @Override + public double getH2(StringBounder stringBounder) { + return orig.getH2(stringBounder) + deltay; + } + + @Override + public double getWidth(StringBounder stringBounder) { + return orig.getWidth(stringBounder) + deltax1 + deltax2 + supText.calculateDimension(stringBounder).getWidth(); + } + + @Override + public void drawU(UGraphic ug) { + final StringBounder stringBounder = ug.getStringBounder(); + final XDimension2D dim = calculateDimension(stringBounder); + + final HColor lineColor = style.value(PName.LineColor).asColor(colorSet); + + final URectangle rect = URectangle.build(dim).rounded(30); + + ug.apply(lineColor).apply(new UStroke(2, 3, 1)).draw(rect); + final double posText = getH1(stringBounder) + supText.getDescent(stringBounder); + + ug.apply(new UTranslate(4, 2 + posText)).draw(supText); + + orig.drawU(ug.apply(new UTranslate(deltax1 + supText.calculateDimension(stringBounder).getWidth(), deltay))); + + } + + @Override + public void push(ETile tile) { + throw new UnsupportedOperationException(); + } + +} diff --git a/src/net/sourceforge/plantuml/klimt/shape/UText.java b/src/net/sourceforge/plantuml/klimt/shape/UText.java index 938007efb..6968ba1ed 100644 --- a/src/net/sourceforge/plantuml/klimt/shape/UText.java +++ b/src/net/sourceforge/plantuml/klimt/shape/UText.java @@ -38,6 +38,7 @@ package net.sourceforge.plantuml.klimt.shape; import net.sourceforge.plantuml.klimt.UShape; import net.sourceforge.plantuml.klimt.font.FontConfiguration; import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.XDimension2D; public class UText implements UShape { @@ -83,4 +84,8 @@ public class UText implements UShape { return orientation; } + public XDimension2D calculateDimension(StringBounder stringBounder) { + return stringBounder.calculateDimension(font.getFont(), text); + } + } diff --git a/src/net/sourceforge/plantuml/regexdiagram/PSystemRegex.java b/src/net/sourceforge/plantuml/regexdiagram/PSystemRegex.java index 03e171ef1..4a1e610f0 100644 --- a/src/net/sourceforge/plantuml/regexdiagram/PSystemRegex.java +++ b/src/net/sourceforge/plantuml/regexdiagram/PSystemRegex.java @@ -52,6 +52,7 @@ import net.sourceforge.plantuml.ebnf.ETile; import net.sourceforge.plantuml.ebnf.ETileAlternation; import net.sourceforge.plantuml.ebnf.ETileBox; import net.sourceforge.plantuml.ebnf.ETileConcatenation; +import net.sourceforge.plantuml.ebnf.ETileLookAheadOrBehind; import net.sourceforge.plantuml.ebnf.ETileNamedGroup; import net.sourceforge.plantuml.ebnf.ETileOneOrMore; import net.sourceforge.plantuml.ebnf.ETileOptional; @@ -162,6 +163,10 @@ public class PSystemRegex extends TitledDiagram { push(token, Symbol.TERMINAL_STRING1); else if (token.getType() == ReTokenType.GROUP) push(token, Symbol.SPECIAL_SEQUENCE); + else if (token.getType() == ReTokenType.LOOK_AHEAD) + lookAheadOrBehind(token.getData()); + else if (token.getType() == ReTokenType.LOOK_BEHIND) + lookAheadOrBehind(token.getData()); else if (token.getType() == ReTokenType.NAMED_GROUP) namedGroup(token.getData()); else if (token.getType() == ReTokenType.CLASS) @@ -205,6 +210,11 @@ public class PSystemRegex extends TitledDiagram { stack.addFirst(new ETileBox(element.getData(), type, fontConfiguration, style, colorSet, getSkinParam())); } + private void lookAheadOrBehind(String name) { + final ETile arg1 = stack.removeFirst(); + stack.addFirst(new ETileLookAheadOrBehind(arg1, fontConfiguration, style, colorSet, name)); + } + private void namedGroup(String name) { final ETile arg1 = stack.removeFirst(); stack.addFirst(new ETileNamedGroup(arg1, fontConfiguration, colorSet, getSkinParam(), name)); diff --git a/src/net/sourceforge/plantuml/regexdiagram/ReTokenType.java b/src/net/sourceforge/plantuml/regexdiagram/ReTokenType.java index 11d68ff88..5941488ea 100644 --- a/src/net/sourceforge/plantuml/regexdiagram/ReTokenType.java +++ b/src/net/sourceforge/plantuml/regexdiagram/ReTokenType.java @@ -44,13 +44,19 @@ public enum ReTokenType { ANCHOR, // GROUP, // NAMED_GROUP, // + LOOK_AHEAD, // + LOOK_BEHIND, // ALTERNATIVE, // PARENTHESIS_OPEN, // PARENTHESIS_CLOSE, // CONCATENATION_IMPLICIT; + public boolean isNamedGroupOrLookAheadOrLookBehind() { + return this == NAMED_GROUP || this == LOOK_AHEAD || this == LOOK_BEHIND; + } + static public boolean needImplicitConcatenation(ReTokenType token1, ReTokenType token2) { - if (token1 == NAMED_GROUP) + if (token1.isNamedGroupOrLookAheadOrLookBehind()) return false; if (token1 == ALTERNATIVE) return false; diff --git a/src/net/sourceforge/plantuml/regexdiagram/RegexExpression.java b/src/net/sourceforge/plantuml/regexdiagram/RegexExpression.java index 01bd39abd..50a3003e3 100644 --- a/src/net/sourceforge/plantuml/regexdiagram/RegexExpression.java +++ b/src/net/sourceforge/plantuml/regexdiagram/RegexExpression.java @@ -60,11 +60,22 @@ public class RegexExpression { } else if (current == '|') { result.add(new ReToken(ReTokenType.ALTERNATIVE, "|")); it.jump(); + } else if (isStartPosixGroup(it)) { + final String s = readGroupPosix(it); + result.add(new ReToken(ReTokenType.CLASS, s)); } else if (current == '[') { final String s = readGroup(it); result.add(new ReToken(ReTokenType.GROUP, s)); } else if (isStartComment(it)) { skipComment(it); + } else if (isStartLookAhead(it)) { + final ReToken token = readLookAhead(it); + result.add(token); + result.add(new ReToken(ReTokenType.PARENTHESIS_OPEN, "(")); + } else if (isStartLookBehind(it)) { + final ReToken token = readLookBehind(it); + result.add(token); + result.add(new ReToken(ReTokenType.PARENTHESIS_OPEN, "(")); } else if (isStartNamedCapturingGroup(it)) { final ReToken token = readNamedGroup(it); result.add(token); @@ -102,6 +113,20 @@ public class RegexExpression { } + private static boolean isStartLookAhead(CharInspector it) { + final char current0 = it.peek(0); + if (current0 == '(' && it.peek(1) == '?' && (it.peek(2) == '=' || it.peek(2) == '!')) + return true; + return false; + } + + private static boolean isStartLookBehind(CharInspector it) { + final char current0 = it.peek(0); + if (current0 == '(' && it.peek(1) == '?' && it.peek(2) == '<' && (it.peek(3) == '=' || it.peek(3) == '!')) + return true; + return false; + } + private static boolean isStartOpenParenthesis(CharInspector it) { final char current0 = it.peek(0); if (current0 == '(') @@ -109,10 +134,28 @@ public class RegexExpression { return false; } + private static boolean isStartPosixGroup(CharInspector it) { + final char current0 = it.peek(0); + if (current0 == '[' && it.peek(1) == '[' && it.peek(2) == ':') + return true; + return false; + } + private static boolean isStartNamedCapturingGroup(CharInspector it) { final char current0 = it.peek(0); - if (current0 == '(' && it.peek(1) == '?' && it.peek(2) == '<') - return true; + if (current0 == '(' && it.peek(1) == '?' && it.peek(2) == '<') { + int i = 3; + while (it.peek(i) != 0) { + if (it.peek(i) == '>' && i == 3) + return false; + if (it.peek(i) == '>') + return true; + if (Character.isLetter(it.peek(i)) == false) + return false; + i++; + } + + } return false; } @@ -140,6 +183,23 @@ public class RegexExpression { } } + private static ReToken readLookAhead(CharInspector it) throws RegexParsingException { + it.jump(); + it.jump(); + final char ch = it.peek(0); + it.jump(); + return new ReToken(ReTokenType.LOOK_AHEAD, "?" + ch); + } + + private static ReToken readLookBehind(CharInspector it) throws RegexParsingException { + it.jump(); + it.jump(); + it.jump(); + final char ch = it.peek(0); + it.jump(); + return new ReToken(ReTokenType.LOOK_BEHIND, "?<" + ch); + } + private static ReToken readNamedGroup(CharInspector it) throws RegexParsingException { it.jump(); it.jump(); @@ -218,6 +278,23 @@ public class RegexExpression { return false; } + private static String readGroupPosix(CharInspector it) { + it.jump(); + it.jump(); + it.jump(); + final StringBuilder result = new StringBuilder(":"); + while (it.peek(0) != 0) { + char ch = it.peek(0); + it.jump(); + result.append(ch); + if (ch == ':') + break; + } + it.jump(); + it.jump(); + return result.toString(); + } + private static String readGroup(CharInspector it) { final char current0 = it.peek(0); if (current0 != '[') diff --git a/src/net/sourceforge/plantuml/regexdiagram/ShuntingYard.java b/src/net/sourceforge/plantuml/regexdiagram/ShuntingYard.java index 8b45b6274..3749d771e 100644 --- a/src/net/sourceforge/plantuml/regexdiagram/ShuntingYard.java +++ b/src/net/sourceforge/plantuml/regexdiagram/ShuntingYard.java @@ -59,7 +59,7 @@ public class ShuntingYard { ouputQueue.add(token); } else if (token.getType() == ReTokenType.GROUP) { ouputQueue.add(token); - } else if (token.getType() == ReTokenType.NAMED_GROUP) { + } else if (token.getType().isNamedGroupOrLookAheadOrLookBehind()) { operatorStack.addFirst(token); } else if (token.getType() == ReTokenType.CLASS) { ouputQueue.add(token); @@ -82,10 +82,8 @@ public class ShuntingYard { && operatorStack.peekFirst().getType() != ReTokenType.PARENTHESIS_OPEN) ouputQueue.add(operatorStack.removeFirst()); final ReToken first = operatorStack.removeFirst(); - if (operatorStack.peekFirst() != null - && operatorStack.peekFirst().getType() == ReTokenType.NAMED_GROUP) + if (operatorStack.peekFirst() != null && operatorStack.peekFirst().getType().isNamedGroupOrLookAheadOrLookBehind()) ouputQueue.add(operatorStack.removeFirst()); - } else { throw new UnsupportedOperationException(token.toString()); diff --git a/src/net/sourceforge/plantuml/version/Version.java b/src/net/sourceforge/plantuml/version/Version.java index 05f088d68..fa4a80d68 100644 --- a/src/net/sourceforge/plantuml/version/Version.java +++ b/src/net/sourceforge/plantuml/version/Version.java @@ -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.14beta1"; + private static final String version = "1.2023.14beta2"; public static String versionString() { return version; From 533c27cba52db66726a924fa26913a602478a3f9 Mon Sep 17 00:00:00 2001 From: Arnaud Roques Date: Wed, 3 Jan 2024 18:21:29 +0100 Subject: [PATCH 40/95] feat: adding edgy tools in stdlib https://github.com/plantuml/plantuml-stdlib/pull/84 --- gradle.properties | 2 +- .../sourceforge/plantuml/version/Version.java | 2 +- stdlib/edgy-abx.repx | Bin 0 -> 3430 bytes stdlib/edgy-dex.repx | 1 + stdlib/home.repx | 1 + 5 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 stdlib/edgy-abx.repx create mode 100644 stdlib/edgy-dex.repx diff --git a/gradle.properties b/gradle.properties index 07537229c..fd7b57c96 100644 --- a/gradle.properties +++ b/gradle.properties @@ -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.14beta2 +version = 1.2024.0beta1 org.gradle.workers.max = 3 \ No newline at end of file diff --git a/src/net/sourceforge/plantuml/version/Version.java b/src/net/sourceforge/plantuml/version/Version.java index fa4a80d68..b00a5ec7b 100644 --- a/src/net/sourceforge/plantuml/version/Version.java +++ b/src/net/sourceforge/plantuml/version/Version.java @@ -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.14beta2"; + private static final String version = "1.2024.0beta1"; public static String versionString() { return version; diff --git a/stdlib/edgy-abx.repx b/stdlib/edgy-abx.repx new file mode 100644 index 0000000000000000000000000000000000000000..de91dc97bfdf0e358d925e3d9ccd6e1a92abfb4e GIT binary patch literal 3430 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 I_x1YT1A Date: Sat, 6 Jan 2024 12:02:26 +0100 Subject: [PATCH 41/95] feat: adding action and process keywords https://github.com/plantuml/plantuml/issues/1631 --- .../decoration/symbol/USymbolAction.java | 113 +++++++++++++++++ .../decoration/symbol/USymbolProcess.java | 114 ++++++++++++++++++ .../plantuml/decoration/symbol/USymbols.java | 6 + .../command/CommandCreateElementFull.java | 2 +- .../sourceforge/plantuml/version/version.txt | 2 - 5 files changed, 234 insertions(+), 3 deletions(-) create mode 100644 src/net/sourceforge/plantuml/decoration/symbol/USymbolAction.java create mode 100644 src/net/sourceforge/plantuml/decoration/symbol/USymbolProcess.java delete mode 100644 src/net/sourceforge/plantuml/version/version.txt diff --git a/src/net/sourceforge/plantuml/decoration/symbol/USymbolAction.java b/src/net/sourceforge/plantuml/decoration/symbol/USymbolAction.java new file mode 100644 index 000000000..3326d96c9 --- /dev/null +++ b/src/net/sourceforge/plantuml/decoration/symbol/USymbolAction.java @@ -0,0 +1,113 @@ +/* ======================================================================== + * PlantUML : a free UML diagram generator + * ======================================================================== + * + * (C) Copyright 2009-2024, Arnaud Roques + * + * Project Info: https://plantuml.com + * + * If you like this project or if you find it useful, you can support us at: + * + * https://plantuml.com/patreon (only 1$ per month!) + * https://plantuml.com/paypal + * + * This file is part of PlantUML. + * + * PlantUML is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * PlantUML distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public + * License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. + * + * + * Original Author: Arnaud Roques + * + * + */ +package net.sourceforge.plantuml.decoration.symbol; + +import net.sourceforge.plantuml.klimt.Fashion; +import net.sourceforge.plantuml.klimt.Shadowable; +import net.sourceforge.plantuml.klimt.UPath; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.drawing.UGraphic; +import net.sourceforge.plantuml.klimt.drawing.UGraphicStencil; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; +import net.sourceforge.plantuml.klimt.geom.XDimension2D; +import net.sourceforge.plantuml.klimt.shape.AbstractTextBlock; +import net.sourceforge.plantuml.klimt.shape.TextBlock; +import net.sourceforge.plantuml.klimt.shape.TextBlockUtils; +import net.sourceforge.plantuml.klimt.shape.UPolygon; +import net.sourceforge.plantuml.klimt.shape.URectangle; +import net.sourceforge.plantuml.style.SName; + +class USymbolAction extends USymbol { + + private final SName sname; + + public USymbolAction(SName sname) { + this.sname = sname; + } + + @Override + public SName getSName() { + return sname; + } + + private void drawAction(UGraphic ug, double width, double height, double shadowing, double roundCorner, + double diagonalCorner) { + final UPolygon shape = new UPolygon(); + shape.addPoint(0, 0); + shape.addPoint(width - 10, 0); + shape.addPoint(width, height / 2); + shape.addPoint(width - 10, height); + shape.addPoint(0, height); + ug.draw(shape); + } + + private Margin getMargin() { + return new Margin(10, 20, 10, 10); + } + + @Override + public TextBlock asSmall(TextBlock name, final TextBlock label, final TextBlock stereotype, + final Fashion symbolContext, final HorizontalAlignment stereoAlignment) { + return new AbstractTextBlock() { + + public void drawU(UGraphic ug) { + final XDimension2D dim = calculateDimension(ug.getStringBounder()); + ug = UGraphicStencil.create(ug, dim); + ug = symbolContext.apply(ug); + drawAction(ug, dim.getWidth(), dim.getHeight(), symbolContext.getDeltaShadow(), + symbolContext.getRoundCorner(), symbolContext.getDiagonalCorner()); + final Margin margin = getMargin(); + final TextBlock tb = TextBlockUtils.mergeTB(stereotype, label, stereoAlignment); + tb.drawU(ug.apply(new UTranslate(margin.getX1(), margin.getY1()))); + } + + public XDimension2D calculateDimension(StringBounder stringBounder) { + final XDimension2D dimLabel = label.calculateDimension(stringBounder); + final XDimension2D dimStereo = stereotype.calculateDimension(stringBounder); + return getMargin().addDimension(dimStereo.mergeTB(dimLabel)); + } + }; + } + + @Override + public TextBlock asBig(final TextBlock title, final HorizontalAlignment labelAlignment, final TextBlock stereotype, + final double width, final double height, final Fashion symbolContext, + final HorizontalAlignment stereoAlignment) { + throw new UnsupportedOperationException(); + } + +} \ No newline at end of file diff --git a/src/net/sourceforge/plantuml/decoration/symbol/USymbolProcess.java b/src/net/sourceforge/plantuml/decoration/symbol/USymbolProcess.java new file mode 100644 index 000000000..2c566b9f9 --- /dev/null +++ b/src/net/sourceforge/plantuml/decoration/symbol/USymbolProcess.java @@ -0,0 +1,114 @@ +/* ======================================================================== + * PlantUML : a free UML diagram generator + * ======================================================================== + * + * (C) Copyright 2009-2024, Arnaud Roques + * + * Project Info: https://plantuml.com + * + * If you like this project or if you find it useful, you can support us at: + * + * https://plantuml.com/patreon (only 1$ per month!) + * https://plantuml.com/paypal + * + * This file is part of PlantUML. + * + * PlantUML is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * PlantUML distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public + * License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. + * + * + * Original Author: Arnaud Roques + * + * + */ +package net.sourceforge.plantuml.decoration.symbol; + +import net.sourceforge.plantuml.klimt.Fashion; +import net.sourceforge.plantuml.klimt.Shadowable; +import net.sourceforge.plantuml.klimt.UPath; +import net.sourceforge.plantuml.klimt.UTranslate; +import net.sourceforge.plantuml.klimt.drawing.UGraphic; +import net.sourceforge.plantuml.klimt.drawing.UGraphicStencil; +import net.sourceforge.plantuml.klimt.font.StringBounder; +import net.sourceforge.plantuml.klimt.geom.HorizontalAlignment; +import net.sourceforge.plantuml.klimt.geom.XDimension2D; +import net.sourceforge.plantuml.klimt.shape.AbstractTextBlock; +import net.sourceforge.plantuml.klimt.shape.TextBlock; +import net.sourceforge.plantuml.klimt.shape.TextBlockUtils; +import net.sourceforge.plantuml.klimt.shape.UPolygon; +import net.sourceforge.plantuml.klimt.shape.URectangle; +import net.sourceforge.plantuml.style.SName; + +class USymbolProcess extends USymbol { + + private final SName sname; + + public USymbolProcess(SName sname) { + this.sname = sname; + } + + @Override + public SName getSName() { + return sname; + } + + private void drawAction(UGraphic ug, double width, double height, double shadowing, double roundCorner, + double diagonalCorner) { + final UPolygon shape = new UPolygon(); + shape.addPoint(0, 0); + shape.addPoint(width - 10, 0); + shape.addPoint(width, height / 2); + shape.addPoint(width - 10, height); + shape.addPoint(0, height); + shape.addPoint(10, height / 2); + ug.draw(shape); + } + + private Margin getMargin() { + return new Margin(20, 20, 10, 10); + } + + @Override + public TextBlock asSmall(TextBlock name, final TextBlock label, final TextBlock stereotype, + final Fashion symbolContext, final HorizontalAlignment stereoAlignment) { + return new AbstractTextBlock() { + + public void drawU(UGraphic ug) { + final XDimension2D dim = calculateDimension(ug.getStringBounder()); + ug = UGraphicStencil.create(ug, dim); + ug = symbolContext.apply(ug); + drawAction(ug, dim.getWidth(), dim.getHeight(), symbolContext.getDeltaShadow(), + symbolContext.getRoundCorner(), symbolContext.getDiagonalCorner()); + final Margin margin = getMargin(); + final TextBlock tb = TextBlockUtils.mergeTB(stereotype, label, stereoAlignment); + tb.drawU(ug.apply(new UTranslate(margin.getX1(), margin.getY1()))); + } + + public XDimension2D calculateDimension(StringBounder stringBounder) { + final XDimension2D dimLabel = label.calculateDimension(stringBounder); + final XDimension2D dimStereo = stereotype.calculateDimension(stringBounder); + return getMargin().addDimension(dimStereo.mergeTB(dimLabel)); + } + }; + } + + @Override + public TextBlock asBig(final TextBlock title, final HorizontalAlignment labelAlignment, final TextBlock stereotype, + final double width, final double height, final Fashion symbolContext, + final HorizontalAlignment stereoAlignment) { + throw new UnsupportedOperationException(); + } + +} \ No newline at end of file diff --git a/src/net/sourceforge/plantuml/decoration/symbol/USymbols.java b/src/net/sourceforge/plantuml/decoration/symbol/USymbols.java index b2f64a4a2..1fad58c66 100644 --- a/src/net/sourceforge/plantuml/decoration/symbol/USymbols.java +++ b/src/net/sourceforge/plantuml/decoration/symbol/USymbols.java @@ -70,6 +70,8 @@ public abstract class USymbols { public final static USymbol FOLDER = record("FOLDER", new USymbolFolder(SName.folder, false)); public final static USymbol FILE = record("FILE", new USymbolFile()); public final static USymbol RECTANGLE = record("RECTANGLE", new USymbolRectangle(SName.rectangle)); + public final static USymbol ACTION = record("ACTION", new USymbolAction(SName.rectangle)); + public final static USymbol PROCESS = record("PROCESS", new USymbolProcess(SName.rectangle)); public final static USymbol HEXAGON = record("HEXAGON", new USymbolHexagon()); public final static USymbol PERSON = record("PERSON", new USymbolPerson()); public final static USymbol LABEL = record("LABEL", new USymbolLabel()); @@ -142,6 +144,10 @@ public abstract class USymbols { usymbol = USymbols.FRAME; else if (symbol.equalsIgnoreCase("cloud")) usymbol = USymbols.CLOUD; + else if (symbol.equalsIgnoreCase("action")) + usymbol = USymbols.ACTION; + else if (symbol.equalsIgnoreCase("process")) + usymbol = USymbols.PROCESS; else if (symbol.equalsIgnoreCase("database")) usymbol = USymbols.DATABASE; else if (symbol.equalsIgnoreCase("queue")) diff --git a/src/net/sourceforge/plantuml/descdiagram/command/CommandCreateElementFull.java b/src/net/sourceforge/plantuml/descdiagram/command/CommandCreateElementFull.java index 84eeedbc0..b4fd353ba 100644 --- a/src/net/sourceforge/plantuml/descdiagram/command/CommandCreateElementFull.java +++ b/src/net/sourceforge/plantuml/descdiagram/command/CommandCreateElementFull.java @@ -69,7 +69,7 @@ import net.sourceforge.plantuml.utils.LineLocation; public class CommandCreateElementFull extends SingleLineCommand2 { - public static final String ALL_TYPES = "person|artifact|actor/|actor|folder|card|file|package|rectangle|hexagon|label|node|frame|cloud|database|queue|stack|storage|agent|usecase/|usecase|component|boundary|control|entity|interface|circle|collections|port|portin|portout"; + public static final String ALL_TYPES = "person|artifact|actor/|actor|folder|card|file|package|rectangle|hexagon|label|node|frame|cloud|action|process|database|queue|stack|storage|agent|usecase/|usecase|component|boundary|control|entity|interface|circle|collections|port|portin|portout"; public CommandCreateElementFull() { super(getRegexConcat()); diff --git a/src/net/sourceforge/plantuml/version/version.txt b/src/net/sourceforge/plantuml/version/version.txt deleted file mode 100644 index 3dfd733c5..000000000 --- a/src/net/sourceforge/plantuml/version/version.txt +++ /dev/null @@ -1,2 +0,0 @@ -1.2023.6-beta-3 -1680642535564 \ No newline at end of file From 6c73caa94375b1ec09920de90ad396777dcf459d Mon Sep 17 00:00:00 2001 From: Arnaud Roques Date: Mon, 8 Jan 2024 21:11:41 +0100 Subject: [PATCH 42/95] fix: minor issues about multiples stereotype and improve new shapes action and process https://github.com/plantuml/plantuml/issues/1538 https://github.com/plantuml/plantuml/issues/1631 --- .../activitydiagram3/ActivityDiagram3.java | 8 ++--- .../activitydiagram3/InstructionSimple.java | 12 +++---- .../activitydiagram3/InstructionWhile.java | 22 ++++++------ .../activitydiagram3/ftile/BoxStyle.java | 11 +++--- .../decoration/symbol/USymbolAction.java | 34 +++++++++++++++++- .../decoration/symbol/USymbolProcess.java | 36 +++++++++++++++++-- .../command/CommandPackageWithUSymbol.java | 2 +- 7 files changed, 95 insertions(+), 30 deletions(-) diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ActivityDiagram3.java b/src/net/sourceforge/plantuml/activitydiagram3/ActivityDiagram3.java index 4378abb42..281e6c6ce 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ActivityDiagram3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ActivityDiagram3.java @@ -108,11 +108,11 @@ public class ActivityDiagram3 extends UmlDiagram { return swinlanes.nextLinkRenderer(); } - public CommandExecutionResult addActivity(Display activity, BoxStyle style, Url url, Colors colors, + public CommandExecutionResult addActivity(Display activity, BoxStyle boxStyle, Url url, Colors colors, Stereotype stereotype) { manageSwimlaneStrategy(); final InstructionSimple ins = new InstructionSimple(activity, nextLinkRenderer(), - swinlanes.getCurrentSwimlane(), style, url, colors, stereotype); + swinlanes.getCurrentSwimlane(), boxStyle, url, colors, stereotype); final CommandExecutionResult added = current().add(ins); if (added.isOk() == false) return added; @@ -396,7 +396,7 @@ public class ActivityDiagram3 extends UmlDiagram { } if (current() instanceof InstructionWhile) { final InstructionWhile instructionWhile = (InstructionWhile) current(); - instructionWhile.setBackward(label, swinlanes.getCurrentSwimlane(), boxStyle, incoming1, incoming2); + instructionWhile.setBackward(label, boxStyle, incoming1, incoming2, stereotype); return CommandExecutionResult.ok(); } return CommandExecutionResult.error("Cannot find repeat"); @@ -406,7 +406,7 @@ public class ActivityDiagram3 extends UmlDiagram { public void doWhile(Display test, Display yes, HColor color) { manageSwimlaneStrategy(); final InstructionWhile instructionWhile = new InstructionWhile(swinlanes.getCurrentSwimlane(), current(), test, - nextLinkRenderer(), yes, color, getSkinParam()); + nextLinkRenderer(), yes, color, getSkinParam().getCurrentStyleBuilder()); current().add(instructionWhile); setCurrent(instructionWhile); } diff --git a/src/net/sourceforge/plantuml/activitydiagram3/InstructionSimple.java b/src/net/sourceforge/plantuml/activitydiagram3/InstructionSimple.java index 901b55ce5..d6886bd0b 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/InstructionSimple.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/InstructionSimple.java @@ -62,7 +62,7 @@ public class InstructionSimple extends MonoSwimable implements Instruction { private final Display label; private final Colors colors; private final LinkRendering inlinkRendering; - private final BoxStyle style; + private final BoxStyle boxStyle; private final Url url; private final Stereotype stereotype; @@ -71,12 +71,12 @@ public class InstructionSimple extends MonoSwimable implements Instruction { return false; } - public InstructionSimple(Display label, LinkRendering inlinkRendering, Swimlane swimlane, BoxStyle style, Url url, - Colors colors, Stereotype stereotype) { + public InstructionSimple(Display label, LinkRendering inlinkRendering, Swimlane swimlane, BoxStyle boxStyle, + Url url, Colors colors, Stereotype stereotype) { super(swimlane); this.stereotype = stereotype; this.url = url; - this.style = style; + this.boxStyle = boxStyle; this.label = label; this.inlinkRendering = Objects.requireNonNull(inlinkRendering); this.colors = Objects.requireNonNull(colors); @@ -85,7 +85,7 @@ public class InstructionSimple extends MonoSwimable implements Instruction { // ::comment when __CORE__ @Override public Gtile createGtile(ISkinParam skinParam, StringBounder stringBounder) { - GtileBox result = GtileBox.create(stringBounder, colors.mute(skinParam), label, getSwimlaneIn(), style, + GtileBox result = GtileBox.create(stringBounder, colors.mute(skinParam), label, getSwimlaneIn(), boxStyle, stereotype); if (hasNotes()) { final Collection notes = getPositionedNotes(); @@ -103,7 +103,7 @@ public class InstructionSimple extends MonoSwimable implements Instruction { @Override public Ftile createFtile(FtileFactory factory) { - Ftile result = factory.activity(label, getSwimlaneIn(), style, colors, stereotype); + Ftile result = factory.activity(label, getSwimlaneIn(), boxStyle, colors, stereotype); if (url != null) { result = factory.addUrl(result, url); } diff --git a/src/net/sourceforge/plantuml/activitydiagram3/InstructionWhile.java b/src/net/sourceforge/plantuml/activitydiagram3/InstructionWhile.java index 8ec637324..721f882d0 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/InstructionWhile.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/InstructionWhile.java @@ -55,6 +55,7 @@ import net.sourceforge.plantuml.klimt.font.StringBounder; import net.sourceforge.plantuml.klimt.geom.VerticalAlignment; import net.sourceforge.plantuml.sequencediagram.NotePosition; import net.sourceforge.plantuml.sequencediagram.NoteType; +import net.sourceforge.plantuml.stereo.Stereotype; import net.sourceforge.plantuml.style.ISkinParam; import net.sourceforge.plantuml.style.StyleBuilder; @@ -73,13 +74,14 @@ public class InstructionWhile extends WithNote implements Instruction, Instructi private LinkRendering outColor = LinkRendering.none(); private final Swimlane swimlane; - private final ISkinParam skinParam; private Instruction specialOut; private BoxStyle boxStyle; - private Swimlane swimlaneOut; + private Display backward = Display.NULL; + private Stereotype stereotype; + private LinkRendering incoming1 = LinkRendering.none(); private LinkRendering incoming2 = LinkRendering.none(); private boolean backwardCalled; @@ -90,15 +92,14 @@ public class InstructionWhile extends WithNote implements Instruction, Instructi } public InstructionWhile(Swimlane swimlane, Instruction parent, Display test, LinkRendering nextLinkRenderer, - Display yes, HColor color, ISkinParam skinParam) { + Display yes, HColor color, StyleBuilder currentStyleBuilder) { this.parent = parent; this.test = Objects.requireNonNull(test); this.nextLinkRenderer = Objects.requireNonNull(nextLinkRenderer); this.yes = Objects.requireNonNull(yes); this.swimlane = swimlane; - this.currentStyleBuilder = skinParam.getCurrentStyleBuilder(); + this.currentStyleBuilder = currentStyleBuilder; this.color = color; - this.skinParam = skinParam; } @Override @@ -119,9 +120,10 @@ public class InstructionWhile extends WithNote implements Instruction, Instructi @Override public Ftile createFtile(FtileFactory factory) { final Ftile back = Display.isNull(backward) ? null - : factory.activity(backward, swimlane, boxStyle, Colors.empty(), null); + : factory.activity(backward, swimlane, boxStyle, Colors.empty(), stereotype); Ftile tmp = repeatList.createFtile(factory); - tmp = factory.createWhile(outColor, swimlane, tmp, test, yes, color, specialOut, back, incoming1, incoming2, currentStyleBuilder); + tmp = factory.createWhile(outColor, swimlane, tmp, test, yes, color, specialOut, back, incoming1, incoming2, + currentStyleBuilder); if (getPositionedNotes().size() > 0) tmp = FtileWithNoteOpale.create(tmp, getPositionedNotes(), false, VerticalAlignment.CENTER); @@ -194,14 +196,14 @@ public class InstructionWhile extends WithNote implements Instruction, Instructi return repeatList.containsBreak(); } - public void setBackward(Display label, Swimlane swimlaneOut, BoxStyle boxStyle, LinkRendering incoming1, - LinkRendering incoming2) { + public void setBackward(Display label, BoxStyle boxStyle, LinkRendering incoming1, LinkRendering incoming2, + Stereotype stereotype) { this.backward = label; - this.swimlaneOut = swimlaneOut; this.boxStyle = boxStyle; this.incoming1 = incoming1; this.incoming2 = incoming2; this.backwardCalled = true; + this.stereotype = stereotype; } public void incoming(LinkRendering incoming) { diff --git a/src/net/sourceforge/plantuml/activitydiagram3/ftile/BoxStyle.java b/src/net/sourceforge/plantuml/activitydiagram3/ftile/BoxStyle.java index d2e6a70a3..f803285e7 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/ftile/BoxStyle.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/ftile/BoxStyle.java @@ -160,11 +160,12 @@ public enum BoxStyle { if (bs.style == style.charAt(0)) return bs; - style = style.replaceAll("\\W", ""); - - for (BoxStyle bs : BoxStyle.values()) - if (style.equalsIgnoreCase(bs.stereotype)) - return bs; + for (String s : style.split("\\s")) { + s = s.replaceAll("\\W", ""); + for (BoxStyle bs : BoxStyle.values()) + if (s.equalsIgnoreCase(bs.stereotype)) + return bs; + } } return PLAIN; } diff --git a/src/net/sourceforge/plantuml/decoration/symbol/USymbolAction.java b/src/net/sourceforge/plantuml/decoration/symbol/USymbolAction.java index 3326d96c9..7ee042799 100644 --- a/src/net/sourceforge/plantuml/decoration/symbol/USymbolAction.java +++ b/src/net/sourceforge/plantuml/decoration/symbol/USymbolAction.java @@ -102,12 +102,44 @@ class USymbolAction extends USymbol { } }; } + + private double getHTitle(XDimension2D dimTitle) { + final double htitle; + if (dimTitle.getWidth() == 0) + htitle = 10; + else + htitle = dimTitle.getHeight(); + + return htitle; + } + + @Override public TextBlock asBig(final TextBlock title, final HorizontalAlignment labelAlignment, final TextBlock stereotype, final double width, final double height, final Fashion symbolContext, final HorizontalAlignment stereoAlignment) { - throw new UnsupportedOperationException(); + return new AbstractTextBlock() { + + public void drawU(UGraphic ug) { + final StringBounder stringBounder = ug.getStringBounder(); + final XDimension2D dim = calculateDimension(stringBounder); + ug = symbolContext.apply(ug); + final XDimension2D dimTitle = title.calculateDimension(stringBounder); + drawAction(ug, dim.getWidth(), dim.getHeight(), symbolContext.getDeltaShadow(), + symbolContext.getRoundCorner(), symbolContext.getDiagonalCorner()); + final double posTitle = (width - dimTitle.getWidth()) / 2; + title.drawU(ug.apply(new UTranslate(posTitle, 2))); + final XDimension2D dimStereo = stereotype.calculateDimension(stringBounder); + final double posStereo = (width - dimStereo.getWidth()) / 2; + + stereotype.drawU(ug.apply(new UTranslate(4 + posStereo, 2 + getHTitle(dimTitle)))); + } + + public XDimension2D calculateDimension(StringBounder stringBounder) { + return new XDimension2D(width, height); + } + }; } } \ No newline at end of file diff --git a/src/net/sourceforge/plantuml/decoration/symbol/USymbolProcess.java b/src/net/sourceforge/plantuml/decoration/symbol/USymbolProcess.java index 2c566b9f9..e8bcb9315 100644 --- a/src/net/sourceforge/plantuml/decoration/symbol/USymbolProcess.java +++ b/src/net/sourceforge/plantuml/decoration/symbol/USymbolProcess.java @@ -64,7 +64,7 @@ class USymbolProcess extends USymbol { return sname; } - private void drawAction(UGraphic ug, double width, double height, double shadowing, double roundCorner, + private void drawProcess(UGraphic ug, double width, double height, double shadowing, double roundCorner, double diagonalCorner) { final UPolygon shape = new UPolygon(); shape.addPoint(0, 0); @@ -89,7 +89,7 @@ class USymbolProcess extends USymbol { final XDimension2D dim = calculateDimension(ug.getStringBounder()); ug = UGraphicStencil.create(ug, dim); ug = symbolContext.apply(ug); - drawAction(ug, dim.getWidth(), dim.getHeight(), symbolContext.getDeltaShadow(), + drawProcess(ug, dim.getWidth(), dim.getHeight(), symbolContext.getDeltaShadow(), symbolContext.getRoundCorner(), symbolContext.getDiagonalCorner()); final Margin margin = getMargin(); final TextBlock tb = TextBlockUtils.mergeTB(stereotype, label, stereoAlignment); @@ -104,11 +104,41 @@ class USymbolProcess extends USymbol { }; } + private double getHTitle(XDimension2D dimTitle) { + final double htitle; + if (dimTitle.getWidth() == 0) + htitle = 10; + else + htitle = dimTitle.getHeight(); + + return htitle; + } + @Override public TextBlock asBig(final TextBlock title, final HorizontalAlignment labelAlignment, final TextBlock stereotype, final double width, final double height, final Fashion symbolContext, final HorizontalAlignment stereoAlignment) { - throw new UnsupportedOperationException(); + return new AbstractTextBlock() { + + public void drawU(UGraphic ug) { + final StringBounder stringBounder = ug.getStringBounder(); + final XDimension2D dim = calculateDimension(stringBounder); + ug = symbolContext.apply(ug); + final XDimension2D dimTitle = title.calculateDimension(stringBounder); + drawProcess(ug, dim.getWidth(), dim.getHeight(), symbolContext.getDeltaShadow(), + symbolContext.getRoundCorner(), symbolContext.getDiagonalCorner()); + final double posTitle = (width - dimTitle.getWidth()) / 2; + title.drawU(ug.apply(new UTranslate(posTitle, 2))); + final XDimension2D dimStereo = stereotype.calculateDimension(stringBounder); + final double posStereo = (width - dimStereo.getWidth()) / 2; + + stereotype.drawU(ug.apply(new UTranslate(4 + posStereo, 2 + getHTitle(dimTitle)))); + } + + public XDimension2D calculateDimension(StringBounder stringBounder) { + return new XDimension2D(width, height); + } + }; } } \ No newline at end of file diff --git a/src/net/sourceforge/plantuml/descdiagram/command/CommandPackageWithUSymbol.java b/src/net/sourceforge/plantuml/descdiagram/command/CommandPackageWithUSymbol.java index fbbfa15a9..bbe8fc65c 100644 --- a/src/net/sourceforge/plantuml/descdiagram/command/CommandPackageWithUSymbol.java +++ b/src/net/sourceforge/plantuml/descdiagram/command/CommandPackageWithUSymbol.java @@ -72,7 +72,7 @@ public class CommandPackageWithUSymbol extends SingleLineCommand2 Date: Tue, 9 Jan 2024 18:46:10 +0100 Subject: [PATCH 43/95] fix: note placement in listfiles --- .../plantuml/decoration/symbol/USymbols.java | 4 +- .../plantuml/filesdiagram/FEntry.java | 40 +++++++++++-------- .../plantuml/filesdiagram/FilesListing.java | 10 +++-- src/net/sourceforge/plantuml/style/SName.java | 2 + 4 files changed, 34 insertions(+), 22 deletions(-) diff --git a/src/net/sourceforge/plantuml/decoration/symbol/USymbols.java b/src/net/sourceforge/plantuml/decoration/symbol/USymbols.java index 1fad58c66..98758878f 100644 --- a/src/net/sourceforge/plantuml/decoration/symbol/USymbols.java +++ b/src/net/sourceforge/plantuml/decoration/symbol/USymbols.java @@ -70,8 +70,8 @@ public abstract class USymbols { public final static USymbol FOLDER = record("FOLDER", new USymbolFolder(SName.folder, false)); public final static USymbol FILE = record("FILE", new USymbolFile()); public final static USymbol RECTANGLE = record("RECTANGLE", new USymbolRectangle(SName.rectangle)); - public final static USymbol ACTION = record("ACTION", new USymbolAction(SName.rectangle)); - public final static USymbol PROCESS = record("PROCESS", new USymbolProcess(SName.rectangle)); + public final static USymbol ACTION = record("ACTION", new USymbolAction(SName.action)); + public final static USymbol PROCESS = record("PROCESS", new USymbolProcess(SName.process)); public final static USymbol HEXAGON = record("HEXAGON", new USymbolHexagon()); public final static USymbol PERSON = record("PERSON", new USymbolPerson()); public final static USymbol LABEL = record("LABEL", new USymbolLabel()); diff --git a/src/net/sourceforge/plantuml/filesdiagram/FEntry.java b/src/net/sourceforge/plantuml/filesdiagram/FEntry.java index 8364e560d..c48785d39 100644 --- a/src/net/sourceforge/plantuml/filesdiagram/FEntry.java +++ b/src/net/sourceforge/plantuml/filesdiagram/FEntry.java @@ -60,47 +60,48 @@ import net.sourceforge.plantuml.svek.image.Opale; public class FEntry implements Iterable { - private final ISkinParam skinParam; + private final FEntry parent; private final List note; private final String name; private FilesType type; private List children = new ArrayList<>(); - public static FEntry createRoot(ISkinParam skinParam) { - return new FEntry(null, "", FilesType.FOLDER, skinParam); + public static FEntry createRoot() { + return new FEntry(null, FilesType.FOLDER, "", null); } - private FEntry(List note, String name, FilesType type, ISkinParam skinParam) { + private FEntry(FEntry parent, FilesType type, String name, List note) { + this.parent = parent; this.note = note; this.name = name; this.type = type; - this.skinParam = skinParam; } - public void addRawEntry(String raw, ISkinParam skinParam) { + public FEntry addRawEntry(String raw) { final int x = raw.indexOf('/'); if (x == -1) { - final FEntry result = new FEntry(null, raw, FilesType.DATA, skinParam); + final FEntry result = new FEntry(this, FilesType.DATA, raw, null); children.add(result); - return; + return result; } - final FEntry folder = getOrCreateFolder(raw.substring(0, x), skinParam); + final FEntry folder = getOrCreateFolder(raw.substring(0, x)); final String remain = raw.substring(x + 1); if (remain.length() != 0) - folder.addRawEntry(remain, skinParam); + return folder.addRawEntry(remain); + return null; } - public void addNote(List note, ISkinParam skinParam) { - final FEntry result = new FEntry(note, "NONE", FilesType.NOTE, skinParam); + public void addNote(List note) { + final FEntry result = new FEntry(this, FilesType.NOTE, "NONE", note); children.add(result); } - private FEntry getOrCreateFolder(String folderName, ISkinParam skinParam) { + private FEntry getOrCreateFolder(String folderName) { for (FEntry child : children) if (child.type == FilesType.FOLDER && child.getName().equals(folderName)) return child; - final FEntry result = new FEntry(null, folderName, FilesType.FOLDER, skinParam); + final FEntry result = new FEntry(this, FilesType.FOLDER, folderName, null); children.add(result); return result; } @@ -110,6 +111,10 @@ public class FEntry implements Iterable { return Collections.unmodifiableCollection(children).iterator(); } + public FEntry getParent() { + return parent; + } + public String getName() { return name; } @@ -132,14 +137,15 @@ public class FEntry implements Iterable { private TextBlock getTextBlock(FontConfiguration fontConfiguration, ISkinParam skinParam) { if (type == FilesType.NOTE) - return createOpale(); + return createOpale(skinParam); final Display display = Display.getWithNewlines(getEmoticon() + getName()); - TextBlock result = display.create7(fontConfiguration, HorizontalAlignment.LEFT, skinParam, CreoleMode.NO_CREOLE); + TextBlock result = display.create7(fontConfiguration, HorizontalAlignment.LEFT, skinParam, + CreoleMode.NO_CREOLE); return result; } - private Opale createOpale() { + private Opale createOpale(ISkinParam skinParam) { final StyleSignatureBasic signature = StyleSignatureBasic.of(SName.root, SName.element, SName.timingDiagram, SName.note); diff --git a/src/net/sourceforge/plantuml/filesdiagram/FilesListing.java b/src/net/sourceforge/plantuml/filesdiagram/FilesListing.java index 592a779a0..a90e78caf 100644 --- a/src/net/sourceforge/plantuml/filesdiagram/FilesListing.java +++ b/src/net/sourceforge/plantuml/filesdiagram/FilesListing.java @@ -49,10 +49,11 @@ public class FilesListing extends AbstractTextBlock { private final ISkinParam skinParam; private final FontConfiguration fontConfiguration = FontConfiguration.blackBlueTrue(UFont.courier(14)); private final FEntry root; + private FEntry lastCreated; public FilesListing(ISkinParam skinParam) { this.skinParam = skinParam; - this.root = FEntry.createRoot(skinParam); + this.root = FEntry.createRoot(); } @Override @@ -67,11 +68,14 @@ public class FilesListing extends AbstractTextBlock { } public void addRawEntry(String raw) { - root.addRawEntry(raw, skinParam); + lastCreated = root.addRawEntry(raw); } public void addNote(List note) { - root.addNote(note, skinParam); + if (lastCreated == null) + root.addNote(note); + else + lastCreated.getParent().addNote(note); } } diff --git a/src/net/sourceforge/plantuml/style/SName.java b/src/net/sourceforge/plantuml/style/SName.java index 111c7863a..7f1f9689f 100644 --- a/src/net/sourceforge/plantuml/style/SName.java +++ b/src/net/sourceforge/plantuml/style/SName.java @@ -36,6 +36,7 @@ package net.sourceforge.plantuml.style; public enum SName { + action, // activity, // activityBar, // activityDiagram, // @@ -113,6 +114,7 @@ public enum SName { partition, // person, // port, // + process, // queue, // rectangle, // reference, // From 9502ed812b5683e7e0b40b0d1798cab5c0a6df8a Mon Sep 17 00:00:00 2001 From: The-Lum <86879521+The-Lum@users.noreply.github.com> Date: Tue, 16 Jan 2024 16:22:19 +0000 Subject: [PATCH 44/95] add: Language Descriptor Improvement (adding `action` and `process`) --- src/net/sourceforge/plantuml/syntax/LanguageDescriptor.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/net/sourceforge/plantuml/syntax/LanguageDescriptor.java b/src/net/sourceforge/plantuml/syntax/LanguageDescriptor.java index 31bd7245a..a0a414d4f 100644 --- a/src/net/sourceforge/plantuml/syntax/LanguageDescriptor.java +++ b/src/net/sourceforge/plantuml/syntax/LanguageDescriptor.java @@ -93,6 +93,8 @@ public class LanguageDescriptor { type.add("metaclass"); type.add("map"); type.add("json"); + type.add("action"); + type.add("process"); keyword.add("@startwire"); keyword.add("@startbpm"); From bf2312a2523c0715e40eaaedc9c9e0ebcaa784a1 Mon Sep 17 00:00:00 2001 From: Arnaud Roques Date: Tue, 16 Jan 2024 22:19:10 +0100 Subject: [PATCH 45/95] feat: edgy standard library improvement https://github.com/plantuml/plantuml-stdlib/pull/86 --- stdlib/edgy-abx.repx | Bin 3430 -> 3897 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/stdlib/edgy-abx.repx b/stdlib/edgy-abx.repx index de91dc97bfdf0e358d925e3d9ccd6e1a92abfb4e..4500959ddf04ef9d69500c2398e123eb712c3fc6 100644 GIT binary patch literal 3897 zcmV-95618t|7B6sD8Z^wMCImqK+6K&5T9NNt7fXALI5#_2qRjCKp=o&KXt0E@pgXu zvI!k~_WLPEXz3&R`yX?+`Ay9J%nUJWp2-#pkC4eEN+WbH0FX_!Y2}wm=>4UE?DRVv z`p5>ir^vxyngbo&)bm@QiaN_ovnVZGyj7a+X)_bP@l^Bx-(~gQeY!$ROa1xlby-T5@feDTjD9feM#i2w_0{Kc?TVoy?qk@J3-!-N+SW~KQfu;L^iJyc2<^K|PCSNPohNq-< zIkjFW{9eG<>r|H2CR?jUzLy>U{tHQQNS(K1c{3*KYleK6cwx=-aKY2k1L(_XAio zDPLS`u#<;J+G%?J1=+<}Zv_&??gf;z3ihMcLEhIX6q(iEODVLr#p^JE0vfFS9h5?= zq{^+0mBOD$33lpnO~|}I(9#TR+;$Wdx6t@n?ImaD>P)DNgD_Uuu&G4941@By2dlJE z5RM$0F$i&X7F99T>u`j#%DJMbTQiL#J_bp9#3&O>rR|cc6H@%?i1Rj~trcRt+J8)t zM4^Qkj&vCWnAyZ}SqY|+jkHP5_EE>*9IPFvvbw>GOYIN>AlU1oF|swX`wH%f=_86D z-&9c$zCcOEuPgchflKmkw82$NJ@}pVuC78aXF2TW8>j$s#~BFGkL$#nBs3n>ZF{aB z3xe8&_yyun(nc*5f*2dtL5G@lg8&R$5|_k$0nzCLy}tWqvzHJs0+c&^v+P@8D*zze z5b$MDeVLWvxPZ|p;|e;&R(#MP6L!+W&4!x-74J|GWOBD%r2|mX=fZ_DkzMEr8~`?j z55oEn0Z0a&zVRj@G+cDv1x-6cg#L_@H`$1mSvWRExfqm;9woq00|k$i6llR#K%9bN z8zwmVYiE?F2tCP{w4%9+l7eVWk*M1ujTlXf^nsS$-bwIkTs%Z1$5Nzzf|v(55HCYj zlb2Gv?hr8YO4S<)vE7D*T{T#HWOi&9PF5Rs~OW?H`>{|0=B~Av<(yF z!%X&xCg*40OF&2Z8H7>R%h(6ZJak0B7kGxzR&SxHnuIm$Z zRW%jAxe^iqUOjcJ5jy8iEru7qG}zc7EAuOF0+B4jey}*fJpw9+hj=&p=lG>-%jYYz zQRC-m7gzNt$*^!^K`@4k7}SpubC1UBeZl(R{-hM^^!{9UNe*N2u+Vq2UXFV;X7)OK zc7b^T9y#uWez2fM5US=YS#Vouz9m1Y$<-*a{G?S2;^{}|hO-p!)VelG_@tz!wX2EJ zWMlZnp;kg<_mtcyVIh@Mnku;_PgLnIW0X-qHRgAbHnB3$pM@_)0c|#HqVpmeC9S7! zUF-iBdYy6=kbT3#4K0?V)V4ADYr?utpc;WzhNJa;V|89Qk$x#FlodB!U@K9VsVykA zg|eDt^*L1@Je515ADh*W#_BxyL;`s)T8k1n8C?cSZJX0yeo3QSK0-M$w$6K zDqDw+H`$W)Vac|Xejr8&%cHe955$~Dq>5wYVNb35Nm%$U@veWSpX_Iie?OrNCnmm!jE)W9mJ@ii10uAV^>te@*J7Lg@s zbE24JY<{PwdK*X$oB|Zwpw7}*L$I@|HDRaxcQZBC0B(@p3TayhzA}%0AMw9$+EGWw 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 I_x1YT1A Date: Thu, 18 Jan 2024 02:11:38 +0000 Subject: [PATCH 46/95] chore(deps): bump actions/cache from 3 to 4 Bumps [actions/cache](https://github.com/actions/cache) from 3 to 4. - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](https://github.com/actions/cache/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/cache dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/ci.yml | 4 ++-- .github/workflows/native-image.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ec444f245..a8ad22dc1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -172,7 +172,7 @@ jobs: run: | echo "release_version=$(gradle properties -q | grep "version:" | awk '{print $2}')" >> $GITHUB_OUTPUT - name: Cache libs - uses: actions/cache/save@v3 + uses: actions/cache/save@v4 with: path: | build/libs @@ -228,7 +228,7 @@ jobs: cache: gradle - name: Restore Libs cache - uses: actions/cache/restore@v3 + uses: actions/cache/restore@v4 with: path: | build/libs diff --git a/.github/workflows/native-image.yml b/.github/workflows/native-image.yml index de3990925..7db154b09 100644 --- a/.github/workflows/native-image.yml +++ b/.github/workflows/native-image.yml @@ -32,7 +32,7 @@ jobs: components: 'native-image' github-token: ${{ secrets.GITHUB_TOKEN }} - - uses: actions/cache/restore@v3 + - uses: actions/cache/restore@v4 with: path: | build/libs @@ -57,7 +57,7 @@ jobs: native-image -H:ConfigurationFileDirectories=native-image-config-dir --no-fallback --report-unsupported-elements-at-runtime -jar "build/libs/plantuml-${{ inputs.release-version }}.jar" -H:Path="build/libs" -H:Name="plantuml-${{ matrix.platform }}-${{ inputs.release-version }}" - name: Cache native image - uses: actions/cache/save@v3 + uses: actions/cache/save@v4 with: path: "build/libs/plantuml-${{ matrix.platform }}-*" key: "native-image-${{ matrix.platform }}-${{ github.run_id }}" From 40268783002ff8b08efae45bcb2467c75bba2cbf Mon Sep 17 00:00:00 2001 From: Arnaud Roques Date: Thu, 18 Jan 2024 22:32:45 +0100 Subject: [PATCH 47/95] perf: stop recompiling pattern at runtime https://github.com/plantuml/plantuml/issues/1642 --- gradle.properties | 2 +- .../klimt/drawing/svg/SvgGraphics.java | 2 +- .../sourceforge/plantuml/text/TLineType.java | 211 +++++++++++------- .../sourceforge/plantuml/version/Version.java | 2 +- 4 files changed, 139 insertions(+), 78 deletions(-) diff --git a/gradle.properties b/gradle.properties index fd7b57c96..b35705355 100644 --- a/gradle.properties +++ b/gradle.properties @@ -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.2024.0beta1 +version = 1.2024.0beta2 org.gradle.workers.max = 3 \ No newline at end of file diff --git a/src/net/sourceforge/plantuml/klimt/drawing/svg/SvgGraphics.java b/src/net/sourceforge/plantuml/klimt/drawing/svg/SvgGraphics.java index c13d9b5a7..be1e8f466 100644 --- a/src/net/sourceforge/plantuml/klimt/drawing/svg/SvgGraphics.java +++ b/src/net/sourceforge/plantuml/klimt/drawing/svg/SvgGraphics.java @@ -1024,7 +1024,7 @@ public class SvgGraphics { public void addCommentMetadata(String metadata) { // ::comment when __CORE__ - final String signature = getMetadataHex(metadata); + final String signature = getMetadataHex(metadata).replace("--", "- -"); final String comment = "SRC=[" + signature + "]"; final Comment commentElement = document.createComment(comment); getG().appendChild(commentElement); diff --git a/src/net/sourceforge/plantuml/text/TLineType.java b/src/net/sourceforge/plantuml/text/TLineType.java index 869f3d810..315c58b88 100644 --- a/src/net/sourceforge/plantuml/text/TLineType.java +++ b/src/net/sourceforge/plantuml/text/TLineType.java @@ -34,6 +34,8 @@ */ package net.sourceforge.plantuml.text; +import java.util.regex.Pattern; + public enum TLineType { PLAIN, AFFECTATION_DEFINE, AFFECTATION, ASSERT, IF, IFDEF, UNDEF, IFNDEF, ELSE, ELSEIF, ENDIF, WHILE, ENDWHILE, @@ -41,115 +43,174 @@ public enum TLineType { LEGACY_DEFINELONG, THEME, INCLUDE, INCLUDE_DEF, IMPORT, STARTSUB, ENDSUB, INCLUDESUB, LOG, DUMP_MEMORY, COMMENT_SIMPLE, COMMENT_LONG_START; -// private boolean elseLike() { -// return this == ELSE || this == ELSEIF; -// } -// -// public boolean incIndentAfter() { -// return this == IF || this == IFDEF || this == IFNDEF || elseLike(); -// } -// -// public boolean decIndentBefore() { -// return this == ENDIF || elseLike(); -// } + private static final Pattern PATTERN_LEGACY_DEFINE = Pattern.compile("^\\s*!define\\s+[\\p{L}_][\\p{L}_0-9]*\\(.*"); + + private static final Pattern PATTERN_LEGACY_DEFINELONG = Pattern + .compile("^\\s*!definelong\\s+[\\p{L}_][\\p{L}_0-9]*\\b.*"); + + private static final Pattern PATTERN_AFFECTATION_DEFINE = Pattern + .compile("^\\s*!define\\s+[\\p{L}_][\\p{L}_0-9]*\\b.*"); + + private static final Pattern PATTERN_AFFECTATION = Pattern + .compile("^\\s*!\\s*(local|global)?\\s*\\$?[\\p{L}_][\\p{L}_0-9]*\\s*\\??=.*"); + + private static final Pattern PATTERN_COMMENT_SIMPLE1 = Pattern.compile("^\\s*'.*"); + + private static final Pattern PATTERN_COMMENT_SIMPLE2 = Pattern.compile("^\\s*/'.*'/\\s*$"); + + private static final Pattern PATTERN_COMMENT_LONG_START = Pattern.compile("^\\s*/'.*"); + + private static final Pattern PATTERN_IFDEF = Pattern.compile("^\\s*!ifdef\\s+.*"); + + private static final Pattern PATTERN_UNDEF = Pattern.compile("^\\s*!undef\\s+.*"); + + private static final Pattern PATTERN_IFNDEF = Pattern.compile("^\\s*!ifndef\\s+.*"); + + private static final Pattern PATTERN_ASSERT = Pattern.compile("^\\s*!assert\\s+.*"); + + private static final Pattern PATTERN_IF = Pattern.compile("^\\s*!if\\s+.*"); + + private static final Pattern PATTERN_DECLARE_RETURN_FUNCTION = Pattern + .compile("^\\s*!(unquoted\\s|final\\s)*(function)\\s+\\$?[\\p{L}_][\\p{L}_0-9]*.*"); + + private static final Pattern PATTERN_DECLARE_PROCEDURE = Pattern + .compile("^\\s*!(unquoted\\s|final\\s)*(procedure)\\s+\\$?[\\p{L}_][\\p{L}_0-9]*.*"); + + private static final Pattern PATTERN_ELSE = Pattern.compile("^\\s*!else\\b.*"); + + private static final Pattern PATTERN_ELSEIF = Pattern.compile("^\\s*!elseif\\b.*"); + + private static final Pattern PATTERN_ENDIF = Pattern.compile("^\\s*!endif\\b.*"); + + private static final Pattern PATTERN_WHILE = Pattern.compile("^\\s*!while\\s+.*"); + + private static final Pattern PATTERN_ENDWHILE = Pattern.compile("^\\s*!endwhile\\b.*"); + + private static final Pattern PATTERN_FOREACH = Pattern.compile("^\\s*!foreach\\s+.*"); + + private static final Pattern PATTERN_ENDFOREACH = Pattern.compile("^\\s*!endfor\\b.*"); + + private static final Pattern PATTERN_END_FUNCTION = Pattern + .compile("^\\s*!(end\\s*function|end\\s*definelong|end\\s*procedure)\\b.*"); + + private static final Pattern PATTERN_RETURN = Pattern.compile("^\\s*!return\\b.*"); + + private static final Pattern PATTERN_THEME = Pattern.compile("^\\s*!theme\\b.*"); + + private static final Pattern PATTERN_INCLUDE = Pattern + .compile("^\\s*!(include|includeurl|include_many|include_once)\\b.*"); + + private static final Pattern PATTERN_INCLUDE_DEF = Pattern.compile("^\\s*!(includedef)\\b.*"); + + private static final Pattern PATTERN_IMPORT = Pattern.compile("^\\s*!(import)\\b.*"); + + private static final Pattern PATTERN_STARTSUB = Pattern.compile("^\\s*!startsub\\s+.*"); + + private static final Pattern PATTERN_ENDSUB = Pattern.compile("^\\s*!endsub\\b.*"); + + private static final Pattern PATTERN_INCLUDESUB = Pattern.compile("^\\s*!includesub\\b.*"); + + private static final Pattern PATTERN_LOG = Pattern.compile("^\\s*!(log)\\b.*"); + + private static final Pattern PATTERN_DUMP_MEMORY = Pattern.compile("^\\s*!(dump_memory)\\b.*"); public static TLineType getFromLineInternal(String s) { - if (s.matches("^\\s*!define\\s+[\\p{L}_][\\p{L}_0-9]*\\(.*")) { + if (PATTERN_LEGACY_DEFINE.matcher(s).matches()) return LEGACY_DEFINE; - } - if (s.matches("^\\s*!definelong\\s+[\\p{L}_][\\p{L}_0-9]*\\b.*")) { + + if (PATTERN_LEGACY_DEFINELONG.matcher(s).matches()) return LEGACY_DEFINELONG; - } - if (s.matches("^\\s*!define\\s+[\\p{L}_][\\p{L}_0-9]*\\b.*")) { + + if (PATTERN_AFFECTATION_DEFINE.matcher(s).matches()) return AFFECTATION_DEFINE; - } - if (s.matches("^\\s*!\\s*(local|global)?\\s*\\$?[\\p{L}_][\\p{L}_0-9]*\\s*\\??=.*")) { + + if (PATTERN_AFFECTATION.matcher(s).matches()) return AFFECTATION; - } - if (s.matches("^\\s*'.*")) { + + if (PATTERN_COMMENT_SIMPLE1.matcher(s).matches()) return COMMENT_SIMPLE; - } - if (s.matches("^\\s*/'.*'/\\s*$")) { + + if (PATTERN_COMMENT_SIMPLE2.matcher(s).matches()) return COMMENT_SIMPLE; - } - if (s.matches("^\\s*/'.*") && s.contains("'/") == false) { + + if (PATTERN_COMMENT_LONG_START.matcher(s).matches() && s.contains("'/") == false) return COMMENT_LONG_START; - } - if (s.matches("^\\s*!ifdef\\s+.*")) { + + if (PATTERN_IFDEF.matcher(s).matches()) return IFDEF; - } - if (s.matches("^\\s*!undef\\s+.*")) { + + if (PATTERN_UNDEF.matcher(s).matches()) return UNDEF; - } - if (s.matches("^\\s*!ifndef\\s+.*")) { + + if (PATTERN_IFNDEF.matcher(s).matches()) return IFNDEF; - } - if (s.matches("^\\s*!assert\\s+.*")) { + + if (PATTERN_ASSERT.matcher(s).matches()) return ASSERT; - } - if (s.matches("^\\s*!if\\s+.*")) { + + if (PATTERN_IF.matcher(s).matches()) return IF; - } - if (s.matches("^\\s*!(unquoted\\s|final\\s)*(function)\\s+\\$?[\\p{L}_][\\p{L}_0-9]*.*")) { + + if (PATTERN_DECLARE_RETURN_FUNCTION.matcher(s).matches()) return DECLARE_RETURN_FUNCTION; - } - if (s.matches("^\\s*!(unquoted\\s|final\\s)*(procedure)\\s+\\$?[\\p{L}_][\\p{L}_0-9]*.*")) { + + if (PATTERN_DECLARE_PROCEDURE.matcher(s).matches()) return DECLARE_PROCEDURE; - } - if (s.matches("^\\s*!else\\b.*")) { + + if (PATTERN_ELSE.matcher(s).matches()) return ELSE; - } - if (s.matches("^\\s*!elseif\\b.*")) { + + if (PATTERN_ELSEIF.matcher(s).matches()) return ELSEIF; - } - if (s.matches("^\\s*!endif\\b.*")) { + + if (PATTERN_ENDIF.matcher(s).matches()) return ENDIF; - } - if (s.matches("^\\s*!while\\s+.*")) { + + if (PATTERN_WHILE.matcher(s).matches()) return WHILE; - } - if (s.matches("^\\s*!endwhile\\b.*")) { + + if (PATTERN_ENDWHILE.matcher(s).matches()) return ENDWHILE; - } - if (s.matches("^\\s*!foreach\\s+.*")) { + + if (PATTERN_FOREACH.matcher(s).matches()) return FOREACH; - } - if (s.matches("^\\s*!endfor\\b.*")) { + + if (PATTERN_ENDFOREACH.matcher(s).matches()) return ENDFOREACH; - } - if (s.matches("^\\s*!(end\\s*function|end\\s*definelong|end\\s*procedure)\\b.*")) { + + if (PATTERN_END_FUNCTION.matcher(s).matches()) return END_FUNCTION; - } - if (s.matches("^\\s*!return\\b.*")) { + + if (PATTERN_RETURN.matcher(s).matches()) return RETURN; - } - if (s.matches("^\\s*!theme\\b.*")) { + + if (PATTERN_THEME.matcher(s).matches()) return THEME; - } - if (s.matches("^\\s*!(include|includeurl|include_many|include_once)\\b.*")) { + + if (PATTERN_INCLUDE.matcher(s).matches()) return INCLUDE; - } - if (s.matches("^\\s*!(includedef)\\b.*")) { + + if (PATTERN_INCLUDE_DEF.matcher(s).matches()) return INCLUDE_DEF; - } - if (s.matches("^\\s*!(import)\\b.*")) { + + if (PATTERN_IMPORT.matcher(s).matches()) return IMPORT; - } - if (s.matches("^\\s*!startsub\\s+.*")) { + + if (PATTERN_STARTSUB.matcher(s).matches()) return STARTSUB; - } - if (s.matches("^\\s*!endsub\\b.*")) { + + if (PATTERN_ENDSUB.matcher(s).matches()) return ENDSUB; - } - if (s.matches("^\\s*!includesub\\b.*")) { + + if (PATTERN_INCLUDESUB.matcher(s).matches()) return INCLUDESUB; - } - if (s.matches("^\\s*!(log)\\b.*")) { + + if (PATTERN_LOG.matcher(s).matches()) return LOG; - } - if (s.matches("^\\s*!(dump_memory)\\b.*")) { + + if (PATTERN_DUMP_MEMORY.matcher(s).matches()) return DUMP_MEMORY; - } + return PLAIN; } diff --git a/src/net/sourceforge/plantuml/version/Version.java b/src/net/sourceforge/plantuml/version/Version.java index b00a5ec7b..861b87679 100644 --- a/src/net/sourceforge/plantuml/version/Version.java +++ b/src/net/sourceforge/plantuml/version/Version.java @@ -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.2024.0beta1"; + private static final String version = "1.2024.0beta2"; public static String versionString() { return version; From f805d983fde835e100839d597ec56503063ec646 Mon Sep 17 00:00:00 2001 From: The-Lum <86879521+The-Lum@users.noreply.github.com> Date: Wed, 24 Jan 2024 12:29:33 +0100 Subject: [PATCH 48/95] docs: add `readme.md` on `chronology` --- src/net/sourceforge/plantuml/chronology/readme.md | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 src/net/sourceforge/plantuml/chronology/readme.md diff --git a/src/net/sourceforge/plantuml/chronology/readme.md b/src/net/sourceforge/plantuml/chronology/readme.md new file mode 100644 index 000000000..59ffb89f4 --- /dev/null +++ b/src/net/sourceforge/plantuml/chronology/readme.md @@ -0,0 +1,10 @@ +# Directory Documentation for `chronology` + +## Description +This package provides classes used to manage [Chronology Diagram](https://plantuml.com/chronology-diagram). + +## Link +- [Chronology Diagram](https://plantuml.com/chronology-diagram) + +## Reference +- [Gantt Diagram](https://plantuml.com/gantt-diagram) From 6d158d119673c7765bedf56702db8a418d9527e6 Mon Sep 17 00:00:00 2001 From: The-Lum <86879521+The-Lum@users.noreply.github.com> Date: Wed, 24 Jan 2024 12:35:16 +0100 Subject: [PATCH 49/95] docs: add `package-info.java` on `chronology` --- .../sourceforge/plantuml/chronology/package-info.java | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 src/net/sourceforge/plantuml/chronology/package-info.java diff --git a/src/net/sourceforge/plantuml/chronology/package-info.java b/src/net/sourceforge/plantuml/chronology/package-info.java new file mode 100644 index 000000000..297264f3b --- /dev/null +++ b/src/net/sourceforge/plantuml/chronology/package-info.java @@ -0,0 +1,9 @@ +/** + * Provides classes used to manage + * + * Chronology Diagram. + * + * @see net.sourceforge.plantuml.project + * + */ +package net.sourceforge.plantuml.chronology; From dbb535473cda22f17eb757fabb0799e402c2794c Mon Sep 17 00:00:00 2001 From: Arnaud Roques Date: Sat, 27 Jan 2024 13:48:28 +0100 Subject: [PATCH 50/95] fix: clear cache when StringBounder has changed https://github.com/plantuml/plantuml/issues/1575 https://forum.plantuml.net/18480/teoz-produces-odd-legend-for-sequence-diagrams --- gradle.properties | 2 +- .../plantuml/klimt/creole/atom/AtomTable.java | 64 ++++++++++--------- .../sourceforge/plantuml/version/Version.java | 2 +- 3 files changed, 37 insertions(+), 31 deletions(-) diff --git a/gradle.properties b/gradle.properties index b35705355..2bd531824 100644 --- a/gradle.properties +++ b/gradle.properties @@ -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.2024.0beta2 +version = 1.2024.0beta3 org.gradle.workers.max = 3 \ No newline at end of file diff --git a/src/net/sourceforge/plantuml/klimt/creole/atom/AtomTable.java b/src/net/sourceforge/plantuml/klimt/creole/atom/AtomTable.java index 9e32d2a7a..d49fe62be 100644 --- a/src/net/sourceforge/plantuml/klimt/creole/atom/AtomTable.java +++ b/src/net/sourceforge/plantuml/klimt/creole/atom/AtomTable.java @@ -81,6 +81,7 @@ public class AtomTable extends AbstractAtom implements Atom { private final List lines = new ArrayList<>(); private final Map positions = new HashMap(); private final HColor lineColor; + private Class lastCaller; public AtomTable(HColor lineColor) { this.lineColor = lineColor; @@ -110,14 +111,14 @@ public class AtomTable extends AbstractAtom implements Atom { .draw(URectangle.build(x2 - x1, y2 - y1)); } for (int j = 0; j < getNbCols(); j++) { - if (j >= line.cells.size()) { + if (j >= line.cells.size()) continue; - } + final Atom cell = line.cells.get(j); HorizontalAlignment align = HorizontalAlignment.LEFT; - if (cell instanceof SheetBlock1) { + if (cell instanceof SheetBlock1) align = ((SheetBlock1) cell).getCellAlignment(); - } + final HColor cellBackColor = line.cellsBackColor.get(j); final double x1 = getStartingX(j); final double x2 = getStartingX(j + 1); @@ -131,11 +132,11 @@ public class AtomTable extends AbstractAtom implements Atom { final Position pos = positions.get(cell); final XDimension2D dimCell = cell.calculateDimension(ug.getStringBounder()); final double dx; - if (align == HorizontalAlignment.RIGHT) { + if (align == HorizontalAlignment.RIGHT) dx = cellWidth - dimCell.getWidth(); - } else { + else dx = 0; - } + if (cellBackColor == null) cell.drawU(ug.apply(pos.getTranslate().compose(UTranslate.dx(dx)))); else @@ -144,20 +145,25 @@ public class AtomTable extends AbstractAtom implements Atom { } ug = ug.apply(lineColor); final ULine hline = ULine.hline(getEndingX(getNbCols() - 1)); - for (int i = 0; i <= getNbLines(); i++) { + for (int i = 0; i <= getNbLines(); i++) ug.apply(UTranslate.dy(getStartingY(i))).draw(hline); - } + final ULine vline = ULine.vline(getEndingY(getNbLines() - 1)); - for (int i = 0; i <= getNbCols(); i++) { + for (int i = 0; i <= getNbCols(); i++) ug.apply(UTranslate.dx(getStartingX(i))).draw(vline); - } } private void initMap(StringBounder stringBounder) { - if (positions.size() > 0) { + final Class currentCaller = stringBounder.getClass(); + if (lastCaller != currentCaller) + positions.clear(); + + this.lastCaller = currentCaller; + + if (positions.size() > 0) return; - } + for (Line line : lines) { for (Atom cell : line.cells) { final XDimension2D dim = cell.calculateDimension(stringBounder); @@ -179,33 +185,33 @@ public class AtomTable extends AbstractAtom implements Atom { private double getStartingX(int col) { double result = 0; - for (int i = 0; i < col; i++) { + for (int i = 0; i < col; i++) result += getColWidth(i); - } + return result; } private double getEndingX(int col) { double result = 0; - for (int i = 0; i <= col; i++) { + for (int i = 0; i <= col; i++) result += getColWidth(i); - } + return result; } private double getStartingY(int line) { double result = 0; - for (int i = 0; i < line; i++) { + for (int i = 0; i < line; i++) result += getLineHeight(i); - } + return result; } private double getEndingY(int line) { double result = 0; - for (int i = 0; i <= line; i++) { + for (int i = 0; i <= line; i++) result += getLineHeight(i); - } + return result; } @@ -213,9 +219,9 @@ public class AtomTable extends AbstractAtom implements Atom { double result = 0; for (int i = 0; i < getNbLines(); i++) { final Position position = getPosition(i, col); - if (position == null) { + if (position == null) continue; - } + final double width = position.getWidth(); result = Math.max(result, width); } @@ -226,9 +232,9 @@ public class AtomTable extends AbstractAtom implements Atom { double result = 0; for (int i = 0; i < getNbCols(); i++) { final Position position = getPosition(line, i); - if (position == null) { + if (position == null) continue; - } + final double height = position.getHeight(); result = Math.max(result, height); } @@ -236,13 +242,13 @@ public class AtomTable extends AbstractAtom implements Atom { } private Position getPosition(int line, int col) { - if (line >= lines.size()) { + if (line >= lines.size()) return null; - } + final Line l = lines.get(line); - if (col >= l.cells.size()) { + if (col >= l.cells.size()) return null; - } + final Atom atom = l.cells.get(col); return positions.get(atom); } diff --git a/src/net/sourceforge/plantuml/version/Version.java b/src/net/sourceforge/plantuml/version/Version.java index 861b87679..2556013d9 100644 --- a/src/net/sourceforge/plantuml/version/Version.java +++ b/src/net/sourceforge/plantuml/version/Version.java @@ -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.2024.0beta2"; + private static final String version = "1.2024.0beta3"; public static String versionString() { return version; From e9139c8a38b595481aeb62831ce0e03adc0d9f27 Mon Sep 17 00:00:00 2001 From: The-Lum <86879521+The-Lum@users.noreply.github.com> Date: Sat, 27 Jan 2024 13:36:57 +0000 Subject: [PATCH 51/95] fix: Restore missing file `HelpTest.java` on an accurate folder. _Ref._: - https://github.com/plantuml/plantuml/commit/9c62daa35dbaef9c6c6c326243ec66b9c2192d95 - https://github.com/plantuml/plantuml/commit/e739cd8f5dccfdac2cec085ca37e2f1081b16b5d --- test/testhelper/TestHelper.java | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 test/testhelper/TestHelper.java diff --git a/test/testhelper/TestHelper.java b/test/testhelper/TestHelper.java new file mode 100644 index 000000000..0a06fd1c8 --- /dev/null +++ b/test/testhelper/TestHelper.java @@ -0,0 +1,23 @@ +package testhelper; + +import static net.sourceforge.plantuml.test.PlantUmlTestUtils.exportDiagram; +import static org.assertj.core.api.Assertions.assertThat; + +import org.junit.jupiter.api.Test; + +class TestHelper { + + @Test + public void test_help_themes() throws Exception { + + final String output = exportDiagram( + "@startuml", + "help themes", + "@enduml" + ).asString(); + + assertThat(output) + .startsWith(" \nHelp on themes") + .contains("bluegray", "hacker"); + } +} \ No newline at end of file From 5fae97f44e369daba5a247c079e8a01c7d9e2f72 Mon Sep 17 00:00:00 2001 From: Arnaud Roques Date: Thu, 1 Feb 2024 18:52:57 +0100 Subject: [PATCH 52/95] fix: Gantt Layout issue when Print between is used with Printscale weekly https://github.com/plantuml/plantuml/issues/1664 --- src/net/sourceforge/plantuml/project/GanttDiagram.java | 10 +++++----- .../plantuml/project/draw/TimeHeaderDaily.java | 2 +- .../plantuml/project/draw/TimeHeaderMonthly.java | 4 ++-- .../plantuml/project/draw/TimeHeaderQuarterly.java | 4 ++-- .../plantuml/project/draw/TimeHeaderWeekly.java | 4 ++-- .../plantuml/project/draw/TimeHeaderYearly.java | 4 ++-- .../project/timescale/TimeScaleCompressed.java | 4 ++-- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/net/sourceforge/plantuml/project/GanttDiagram.java b/src/net/sourceforge/plantuml/project/GanttDiagram.java index 529e21ae8..44e2bb2e6 100644 --- a/src/net/sourceforge/plantuml/project/GanttDiagram.java +++ b/src/net/sourceforge/plantuml/project/GanttDiagram.java @@ -307,15 +307,15 @@ public class GanttDiagram extends TitledDiagram implements ToTaskDraw, WithSprit if (openClose.getStartingDay() == null) return new TimeHeaderSimple(stringBounder, thParam(), printScale); else if (printScale == PrintScale.DAILY) - return new TimeHeaderDaily(stringBounder, thParam(), nameDays, printStart, printEnd); + return new TimeHeaderDaily(stringBounder, thParam(), nameDays, printStart); else if (printScale == PrintScale.WEEKLY) - return new TimeHeaderWeekly(stringBounder, thParam(), weekNumberStrategy, withCalendarDate); + return new TimeHeaderWeekly(stringBounder, thParam(), weekNumberStrategy, withCalendarDate, printStart); else if (printScale == PrintScale.MONTHLY) - return new TimeHeaderMonthly(stringBounder, thParam()); + return new TimeHeaderMonthly(stringBounder, thParam(), printStart); else if (printScale == PrintScale.QUARTERLY) - return new TimeHeaderQuarterly(stringBounder, thParam()); + return new TimeHeaderQuarterly(stringBounder, thParam(), printStart); else if (printScale == PrintScale.YEARLY) - return new TimeHeaderYearly(stringBounder, thParam()); + return new TimeHeaderYearly(stringBounder, thParam(), printStart); else throw new IllegalStateException(); diff --git a/src/net/sourceforge/plantuml/project/draw/TimeHeaderDaily.java b/src/net/sourceforge/plantuml/project/draw/TimeHeaderDaily.java index 6d5a550bb..039180af5 100644 --- a/src/net/sourceforge/plantuml/project/draw/TimeHeaderDaily.java +++ b/src/net/sourceforge/plantuml/project/draw/TimeHeaderDaily.java @@ -96,7 +96,7 @@ public class TimeHeaderDaily extends TimeHeaderCalendar { private final Map nameDays; public TimeHeaderDaily(StringBounder stringBounder, TimeHeaderParameters thParam, Map nameDays, - Day printStart, Day printEnd) { + Day printStart) { super(thParam, new TimeScaleDaily(thParam.getCellWidth(stringBounder), thParam.getStartingDay(), thParam.getScale(), printStart)); this.nameDays = nameDays; diff --git a/src/net/sourceforge/plantuml/project/draw/TimeHeaderMonthly.java b/src/net/sourceforge/plantuml/project/draw/TimeHeaderMonthly.java index 81e619c86..f784519cd 100644 --- a/src/net/sourceforge/plantuml/project/draw/TimeHeaderMonthly.java +++ b/src/net/sourceforge/plantuml/project/draw/TimeHeaderMonthly.java @@ -67,9 +67,9 @@ public class TimeHeaderMonthly extends TimeHeaderCalendar { return getTimeHeaderHeight(stringBounder); } - public TimeHeaderMonthly(StringBounder stringBounder, TimeHeaderParameters thParam) { + public TimeHeaderMonthly(StringBounder stringBounder, TimeHeaderParameters thParam, Day printStart) { super(thParam, new TimeScaleCompressed(thParam.getCellWidth(stringBounder), thParam.getStartingDay(), - thParam.getScale())); + thParam.getScale(), printStart)); } @Override diff --git a/src/net/sourceforge/plantuml/project/draw/TimeHeaderQuarterly.java b/src/net/sourceforge/plantuml/project/draw/TimeHeaderQuarterly.java index 87e202be0..daa68bcfe 100644 --- a/src/net/sourceforge/plantuml/project/draw/TimeHeaderQuarterly.java +++ b/src/net/sourceforge/plantuml/project/draw/TimeHeaderQuarterly.java @@ -67,9 +67,9 @@ public class TimeHeaderQuarterly extends TimeHeaderCalendar { return getTimeHeaderHeight(stringBounder); } - public TimeHeaderQuarterly(StringBounder stringBounder, TimeHeaderParameters thParam) { + public TimeHeaderQuarterly(StringBounder stringBounder, TimeHeaderParameters thParam, Day printStart) { super(thParam, new TimeScaleCompressed(thParam.getCellWidth(stringBounder), thParam.getStartingDay(), - thParam.getScale())); + thParam.getScale(), printStart)); } @Override diff --git a/src/net/sourceforge/plantuml/project/draw/TimeHeaderWeekly.java b/src/net/sourceforge/plantuml/project/draw/TimeHeaderWeekly.java index c2cbc0d96..af6fbaffd 100644 --- a/src/net/sourceforge/plantuml/project/draw/TimeHeaderWeekly.java +++ b/src/net/sourceforge/plantuml/project/draw/TimeHeaderWeekly.java @@ -76,9 +76,9 @@ public class TimeHeaderWeekly extends TimeHeaderCalendar { } public TimeHeaderWeekly(StringBounder stringBounder, TimeHeaderParameters thParam, - WeekNumberStrategy weekNumberStrategy, boolean withCalendarDate) { + WeekNumberStrategy weekNumberStrategy, boolean withCalendarDate, Day printStart) { super(thParam, new TimeScaleCompressed(thParam.getCellWidth(stringBounder), thParam.getStartingDay(), - thParam.getScale())); + thParam.getScale(), printStart)); this.weekNumberStrategy = weekNumberStrategy; this.withCalendarDate = withCalendarDate; } diff --git a/src/net/sourceforge/plantuml/project/draw/TimeHeaderYearly.java b/src/net/sourceforge/plantuml/project/draw/TimeHeaderYearly.java index 1c569b4ff..fddee9e9a 100644 --- a/src/net/sourceforge/plantuml/project/draw/TimeHeaderYearly.java +++ b/src/net/sourceforge/plantuml/project/draw/TimeHeaderYearly.java @@ -64,9 +64,9 @@ public class TimeHeaderYearly extends TimeHeaderCalendar { return getTimeHeaderHeight(stringBounder); } - public TimeHeaderYearly(StringBounder stringBounder, TimeHeaderParameters thParam) { + public TimeHeaderYearly(StringBounder stringBounder, TimeHeaderParameters thParam, Day printStart) { super(thParam, new TimeScaleCompressed(thParam.getCellWidth(stringBounder), thParam.getStartingDay(), - thParam.getScale())); + thParam.getScale(), printStart)); } @Override diff --git a/src/net/sourceforge/plantuml/project/timescale/TimeScaleCompressed.java b/src/net/sourceforge/plantuml/project/timescale/TimeScaleCompressed.java index 31cc3283a..3e8155866 100644 --- a/src/net/sourceforge/plantuml/project/timescale/TimeScaleCompressed.java +++ b/src/net/sourceforge/plantuml/project/timescale/TimeScaleCompressed.java @@ -42,8 +42,8 @@ public class TimeScaleCompressed implements TimeScale { private final TimeScale daily; - public TimeScaleCompressed(double size, Day calendar, double scale) { - this.daily = new TimeScaleDaily(size, calendar, scale, null); + public TimeScaleCompressed(double size, Day calendar, double scale, Day zeroDay) { + this.daily = new TimeScaleDaily(size, calendar, scale, zeroDay); } public double getStartingPosition(Day instant) { From dbbdf1277be55de8c6c4647c22c2e46572d28d60 Mon Sep 17 00:00:00 2001 From: Arnaud Roques Date: Thu, 1 Feb 2024 19:30:28 +0100 Subject: [PATCH 53/95] chore: version 1.2024.0 --- gradle.properties | 2 +- src/net/sourceforge/plantuml/version/Version.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index 2bd531824..494210599 100644 --- a/gradle.properties +++ b/gradle.properties @@ -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.2024.0beta3 +version = 1.2024.0 org.gradle.workers.max = 3 \ No newline at end of file diff --git a/src/net/sourceforge/plantuml/version/Version.java b/src/net/sourceforge/plantuml/version/Version.java index 2556013d9..029ed51d6 100644 --- a/src/net/sourceforge/plantuml/version/Version.java +++ b/src/net/sourceforge/plantuml/version/Version.java @@ -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.2024.0beta3"; + private static final String version = "1.2024.0"; public static String versionString() { return version; @@ -80,7 +80,7 @@ public class Version { } public static long compileTime() { - return 1702318857783L; + return 1706811534365L; } public static String compileTimeString() { From dbaf8ac2cd50f04ac4ec4309e7dadae234ea8375 Mon Sep 17 00:00:00 2001 From: Arnaud Roques Date: Thu, 1 Feb 2024 22:29:55 +0100 Subject: [PATCH 54/95] feat: add some %random function https://github.com/plantuml/plantuml/issues/1667 --- gradle.properties | 2 +- .../sourceforge/plantuml/tim/TContext.java | 2 + .../plantuml/tim/stdlib/Random.java | 67 +++++++++++++++++++ .../sourceforge/plantuml/version/Version.java | 2 +- 4 files changed, 71 insertions(+), 2 deletions(-) create mode 100644 src/net/sourceforge/plantuml/tim/stdlib/Random.java diff --git a/gradle.properties b/gradle.properties index 494210599..c1112c317 100644 --- a/gradle.properties +++ b/gradle.properties @@ -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.2024.0 +version = 1.2024.1beta1 org.gradle.workers.max = 3 \ No newline at end of file diff --git a/src/net/sourceforge/plantuml/tim/TContext.java b/src/net/sourceforge/plantuml/tim/TContext.java index 23c43aa07..7f789424a 100644 --- a/src/net/sourceforge/plantuml/tim/TContext.java +++ b/src/net/sourceforge/plantuml/tim/TContext.java @@ -122,6 +122,7 @@ import net.sourceforge.plantuml.tim.stdlib.Lower; import net.sourceforge.plantuml.tim.stdlib.Newline; import net.sourceforge.plantuml.tim.stdlib.Now; import net.sourceforge.plantuml.tim.stdlib.Ord; +import net.sourceforge.plantuml.tim.stdlib.Random; import net.sourceforge.plantuml.tim.stdlib.RetrieveProcedure; import net.sourceforge.plantuml.tim.stdlib.ReverseColor; import net.sourceforge.plantuml.tim.stdlib.ReverseHsluvColor; @@ -208,6 +209,7 @@ public class TContext { functionsSet.addFunction(new LogicalNor()); functionsSet.addFunction(new LogicalNxor()); functionsSet.addFunction(new Ord()); + functionsSet.addFunction(new Random()); // %standard_exists_function // %str_replace // !exit diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Random.java b/src/net/sourceforge/plantuml/tim/stdlib/Random.java new file mode 100644 index 000000000..51e0accdf --- /dev/null +++ b/src/net/sourceforge/plantuml/tim/stdlib/Random.java @@ -0,0 +1,67 @@ +/* ======================================================================== + * PlantUML : a free UML diagram generator + * ======================================================================== + * + * (C) Copyright 2009-2024, Arnaud Roques + * + * Project Info: https://plantuml.com + * + * If you like this project or if you find it useful, you can support us at: + * + * https://plantuml.com/patreon (only 1$ per month!) + * https://plantuml.com/paypal + * + * This file is part of PlantUML. + * + * PlantUML is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * PlantUML distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public + * License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. + * + * + * Original Author: Arnaud Roques + * + */ +package net.sourceforge.plantuml.tim.stdlib; + +import java.util.List; +import java.util.Map; +import java.util.Set; + +import net.sourceforge.plantuml.tim.EaterException; +import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.TContext; +import net.sourceforge.plantuml.tim.TFunctionSignature; +import net.sourceforge.plantuml.tim.TMemory; +import net.sourceforge.plantuml.tim.expression.TValue; +import net.sourceforge.plantuml.utils.LineLocation; + +public class Random extends SimpleReturnFunction { + + public TFunctionSignature getSignature() { + return new TFunctionSignature("%random", 1); + } + + public boolean canCover(int nbArg, Set namedArgument) { + return nbArg == 1; + } + + public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, + Map named) throws EaterException, EaterExceptionLocated { + if (values.get(0).isNumber()) { + final int limit = values.get(0).toInt(); + return TValue.fromInt((int) (Math.random() * limit)); + } + return TValue.fromInt(0); + } +} diff --git a/src/net/sourceforge/plantuml/version/Version.java b/src/net/sourceforge/plantuml/version/Version.java index 029ed51d6..dcbf669b6 100644 --- a/src/net/sourceforge/plantuml/version/Version.java +++ b/src/net/sourceforge/plantuml/version/Version.java @@ -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.2024.0"; + private static final String version = "1.2024.1beta1"; public static String versionString() { return version; From 9e18d34936adbb8848e9c2c46097617705be3449 Mon Sep 17 00:00:00 2001 From: The-Lum <86879521+The-Lum@users.noreply.github.com> Date: Thu, 1 Feb 2024 23:10:43 +0100 Subject: [PATCH 55/95] Update and rename Random.java to RandomFunction.java Feat: improve to accept 0, 1, 2 args --- .../{Random.java => RandomFunction.java} | 28 ++++++++++++++----- 1 file changed, 21 insertions(+), 7 deletions(-) rename src/net/sourceforge/plantuml/tim/stdlib/{Random.java => RandomFunction.java} (75%) diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Random.java b/src/net/sourceforge/plantuml/tim/stdlib/RandomFunction.java similarity index 75% rename from src/net/sourceforge/plantuml/tim/stdlib/Random.java rename to src/net/sourceforge/plantuml/tim/stdlib/RandomFunction.java index 51e0accdf..915779c9c 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Random.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/RandomFunction.java @@ -36,6 +36,7 @@ package net.sourceforge.plantuml.tim.stdlib; import java.util.List; import java.util.Map; +import java.util.Random; import java.util.Set; import net.sourceforge.plantuml.tim.EaterException; @@ -46,22 +47,35 @@ import net.sourceforge.plantuml.tim.TMemory; import net.sourceforge.plantuml.tim.expression.TValue; import net.sourceforge.plantuml.utils.LineLocation; -public class Random extends SimpleReturnFunction { +public class RandomFunction extends SimpleReturnFunction { public TFunctionSignature getSignature() { - return new TFunctionSignature("%random", 1); + return new TFunctionSignature("%random", 2); } public boolean canCover(int nbArg, Set namedArgument) { - return nbArg == 1; + return nbArg == 0 || nbArg == 1 || nbArg == 2; } + final Random random = new Random(); + public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, Map named) throws EaterException, EaterExceptionLocated { - if (values.get(0).isNumber()) { - final int limit = values.get(0).toInt(); - return TValue.fromInt((int) (Math.random() * limit)); + switch (values.size()) { + case 0: + return TValue.fromInt(random.nextInt(2)); + + case 1: + final Integer mx = values.get(0).toInt(); + return TValue.fromInt(random.nextInt(mx)); + + case 2: + final Integer min = values.get(0).toInt(); + final Integer max = values.get(1).toInt(); + return TValue.fromInt(random.nextInt(max - min) + min); + + default: + throw EaterException.located("Error on Random: Too many argument"); } - return TValue.fromInt(0); } } From 376ee9d8c212c6814f1d7152d0377a323f3300fd Mon Sep 17 00:00:00 2001 From: The-Lum <86879521+The-Lum@users.noreply.github.com> Date: Thu, 1 Feb 2024 23:13:41 +0100 Subject: [PATCH 56/95] Update `TContext.java` with `RandomFunction` --- src/net/sourceforge/plantuml/tim/TContext.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/net/sourceforge/plantuml/tim/TContext.java b/src/net/sourceforge/plantuml/tim/TContext.java index 7f789424a..b5eeeac68 100644 --- a/src/net/sourceforge/plantuml/tim/TContext.java +++ b/src/net/sourceforge/plantuml/tim/TContext.java @@ -209,7 +209,7 @@ public class TContext { functionsSet.addFunction(new LogicalNor()); functionsSet.addFunction(new LogicalNxor()); functionsSet.addFunction(new Ord()); - functionsSet.addFunction(new Random()); + functionsSet.addFunction(new RandomFunction()); // %standard_exists_function // %str_replace // !exit From c10ac1769d85ac17909d8f0a4fe21b2cd4628a7d Mon Sep 17 00:00:00 2001 From: The-Lum <86879521+The-Lum@users.noreply.github.com> Date: Thu, 1 Feb 2024 23:31:08 +0100 Subject: [PATCH 57/95] fix: import the file `RandomFunction` --- src/net/sourceforge/plantuml/tim/TContext.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/net/sourceforge/plantuml/tim/TContext.java b/src/net/sourceforge/plantuml/tim/TContext.java index b5eeeac68..af2db5c95 100644 --- a/src/net/sourceforge/plantuml/tim/TContext.java +++ b/src/net/sourceforge/plantuml/tim/TContext.java @@ -122,7 +122,7 @@ import net.sourceforge.plantuml.tim.stdlib.Lower; import net.sourceforge.plantuml.tim.stdlib.Newline; import net.sourceforge.plantuml.tim.stdlib.Now; import net.sourceforge.plantuml.tim.stdlib.Ord; -import net.sourceforge.plantuml.tim.stdlib.Random; +import net.sourceforge.plantuml.tim.stdlib.RandomFunction; import net.sourceforge.plantuml.tim.stdlib.RetrieveProcedure; import net.sourceforge.plantuml.tim.stdlib.ReverseColor; import net.sourceforge.plantuml.tim.stdlib.ReverseHsluvColor; From 23c86ba5b9ae435b8a718ffdde5f082d6f561a34 Mon Sep 17 00:00:00 2001 From: The-Lum <86879521+The-Lum@users.noreply.github.com> Date: Thu, 1 Feb 2024 22:36:05 +0000 Subject: [PATCH 58/95] Improve `Chronology diagram` management Adding `Chronology diagram` on: - Syntax - Sub-diagram - Readme --- README.md | 1 + src/net/sourceforge/plantuml/EmbeddedDiagram.java | 3 +++ src/net/sourceforge/plantuml/syntax/LanguageDescriptor.java | 2 ++ 3 files changed, 6 insertions(+) diff --git a/README.md b/README.md index 94a914390..ed53dcb1e 100644 --- a/README.md +++ b/README.md @@ -56,6 +56,7 @@ PlantUML is a component that allows you to create various UML diagrams through s - [SDL (Specification and Description Language)](http://plantuml.com/activity-diagram-beta#sdl) - [Ditaa diagram](http://plantuml.com/ditaa) - [Gantt diagram](http://plantuml.com/gantt-diagram) + - [Chronology diagram](http://plantuml.com/chronology-diagram) - [MindMap diagram](http://plantuml.com/mindmap-diagram) - [WBS (Work Breakdown Structure)](http://plantuml.com/wbs-diagram) - [Mathematical Notations (AsciiMath, JLaTeXMath)](http://plantuml.com/ascii-math) diff --git a/src/net/sourceforge/plantuml/EmbeddedDiagram.java b/src/net/sourceforge/plantuml/EmbeddedDiagram.java index 9543cdd91..6cdd7abed 100644 --- a/src/net/sourceforge/plantuml/EmbeddedDiagram.java +++ b/src/net/sourceforge/plantuml/EmbeddedDiagram.java @@ -119,6 +119,9 @@ public class EmbeddedDiagram extends AbstractTextBlock implements Line, Atom { if (s.equals(EMBEDDED_START + "files")) return "files"; + if (s.equals(EMBEDDED_START + "chronology")) + return "chronology"; + return null; } diff --git a/src/net/sourceforge/plantuml/syntax/LanguageDescriptor.java b/src/net/sourceforge/plantuml/syntax/LanguageDescriptor.java index a0a414d4f..597b5b2e7 100644 --- a/src/net/sourceforge/plantuml/syntax/LanguageDescriptor.java +++ b/src/net/sourceforge/plantuml/syntax/LanguageDescriptor.java @@ -123,6 +123,7 @@ public class LanguageDescriptor { keyword.add("@startebnf"); keyword.add("@startregex"); keyword.add("@startfiles"); + keyword.add("@startchronology"); keyword.add("@endwire"); keyword.add("@endbpm"); keyword.add("@enduml"); @@ -150,6 +151,7 @@ public class LanguageDescriptor { keyword.add("@endebnf"); keyword.add("@endregex"); keyword.add("@endfiles"); + keyword.add("@endchronology"); keyword.add("as"); keyword.add("also"); keyword.add("autonumber"); From 3bd3edb7402e09a4a33b9a12b267faf05d838c3f Mon Sep 17 00:00:00 2001 From: The-Lum <86879521+The-Lum@users.noreply.github.com> Date: Sat, 3 Feb 2024 14:06:49 +0000 Subject: [PATCH 59/95] feat: `Random` function: add test and private declaration Add: - `RandomFunctionTest` test file - private declaration for random lib. Ref.: - #1667 Improve: - https://github.com/plantuml/plantuml/commit/dbaf8ac2cd50f04ac4ec4309e7dadae234ea8375 - #1668 --- .../plantuml/tim/stdlib/RandomFunction.java | 2 +- .../tim/stdlib/RandomFuntionTest.java | 50 +++++++++++++++++++ 2 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 test/net/sourceforge/plantuml/tim/stdlib/RandomFuntionTest.java diff --git a/src/net/sourceforge/plantuml/tim/stdlib/RandomFunction.java b/src/net/sourceforge/plantuml/tim/stdlib/RandomFunction.java index 915779c9c..d33a0af09 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/RandomFunction.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/RandomFunction.java @@ -57,7 +57,7 @@ public class RandomFunction extends SimpleReturnFunction { return nbArg == 0 || nbArg == 1 || nbArg == 2; } - final Random random = new Random(); + private final Random random = new Random(); public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, Map named) throws EaterException, EaterExceptionLocated { diff --git a/test/net/sourceforge/plantuml/tim/stdlib/RandomFuntionTest.java b/test/net/sourceforge/plantuml/tim/stdlib/RandomFuntionTest.java new file mode 100644 index 000000000..c8505449e --- /dev/null +++ b/test/net/sourceforge/plantuml/tim/stdlib/RandomFuntionTest.java @@ -0,0 +1,50 @@ +package net.sourceforge.plantuml.tim.stdlib; + +import static org.assertj.core.api.Assertions.assertThat; + +import java.util.Arrays; +import java.util.Collections; + +import org.junit.jupiter.api.DisplayNameGenerator.ReplaceUnderscores; +import org.junit.jupiter.api.IndicativeSentencesGeneration; +import org.junit.jupiter.api.RepeatedTest; + +import net.sourceforge.plantuml.tim.EaterException; +import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.TFunction; +import net.sourceforge.plantuml.tim.expression.TValue; + +/** + * Tests the builtin function. + */ +@IndicativeSentencesGeneration(separator = ": ", generator = ReplaceUnderscores.class) + +class RandomFunctionTest { + TFunction cut = new RandomFunction(); + final String cutName = "Random"; + final String repetitionLabel = "[{currentRepetition}/{totalRepetitions}] "; + + @RepeatedTest(value = 10, name = repetitionLabel + cutName + "()") + void test_with_no_argument() throws EaterException, EaterExceptionLocated { + final TValue tValue = cut.executeReturnFunction(null, null, null, Collections.emptyList(), null); + assertThat(tValue.toInt()).isIn(0, 1); + } + + @RepeatedTest(value = 10, name = repetitionLabel + cutName + "(7)") + void test_with_one_argument() throws EaterException, EaterExceptionLocated { + final TValue tValue = cut.executeReturnFunction(null, null, null, Arrays.asList(TValue.fromInt(7)), null); + assertThat(tValue.toInt()).isBetween(0, 7-1); + } + + @RepeatedTest(value = 10, name = repetitionLabel + cutName + "(0, 7)") + void test_with_two_argument_first_zero() throws EaterException, EaterExceptionLocated { + final TValue tValue = cut.executeReturnFunction(null, null, null, Arrays.asList(TValue.fromInt(0), TValue.fromInt(7)), null); + assertThat(tValue.toInt()).isBetween(0, 7-1); + } + + @RepeatedTest(value = 10, name = repetitionLabel + cutName + "(3, 7)") + void test_with_two_argument() throws EaterException, EaterExceptionLocated { + final TValue tValue = cut.executeReturnFunction(null, null, null, Arrays.asList(TValue.fromInt(3), TValue.fromInt(7)), null); + assertThat(tValue.toInt()).isBetween(3, 7-1); + } +} \ No newline at end of file From 1690ca3cc315cd2a8821cf0eeb4461e8e660d489 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Feb 2024 02:49:43 +0000 Subject: [PATCH 60/95] chore(deps): bump org.assertj:assertj-core from 3.24.2 to 3.25.3 Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.24.2 to 3.25.3. - [Release notes](https://github.com/assertj/assertj/releases) - [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.24.2...assertj-build-3.25.3) --- updated-dependencies: - dependency-name: org.assertj:assertj-core dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- build.gradle.kts | 2 +- plantuml-asl/build.gradle.kts | 2 +- plantuml-bsd/build.gradle.kts | 2 +- plantuml-epl/build.gradle.kts | 2 +- plantuml-gplv2/build.gradle.kts | 2 +- plantuml-lgpl/build.gradle.kts | 2 +- plantuml-mit/build.gradle.kts | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 6aa48b2dd..e251ee2f9 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -31,7 +31,7 @@ dependencies { compileOnly("org.apache.ant:ant:1.10.14") testImplementation("io.github.glytching:junit-extensions:2.6.0") - testImplementation("org.assertj:assertj-core:3.24.2") + testImplementation("org.assertj:assertj-core:3.25.3") testImplementation("org.junit.jupiter:junit-jupiter:5.10.1") testImplementation("org.xmlunit:xmlunit-core:2.9.+") if (JavaVersion.current().isJava8) { diff --git a/plantuml-asl/build.gradle.kts b/plantuml-asl/build.gradle.kts index b27324b28..d6ed938b7 100644 --- a/plantuml-asl/build.gradle.kts +++ b/plantuml-asl/build.gradle.kts @@ -25,7 +25,7 @@ java { dependencies { compileOnly("org.apache.ant:ant:1.10.14") - testImplementation("org.assertj:assertj-core:3.24.2") + testImplementation("org.assertj:assertj-core:3.25.3") testImplementation("org.junit.jupiter:junit-jupiter:5.10.1") testImplementation("org.scilab.forge:jlatexmath:1.0.7") testImplementation("org.xmlunit:xmlunit-core:2.9.+") diff --git a/plantuml-bsd/build.gradle.kts b/plantuml-bsd/build.gradle.kts index f57ec2fe1..63ae98403 100644 --- a/plantuml-bsd/build.gradle.kts +++ b/plantuml-bsd/build.gradle.kts @@ -25,7 +25,7 @@ java { dependencies { compileOnly("org.apache.ant:ant:1.10.14") - testImplementation("org.assertj:assertj-core:3.24.2") + testImplementation("org.assertj:assertj-core:3.25.3") testImplementation("org.junit.jupiter:junit-jupiter:5.10.1") testImplementation("org.scilab.forge:jlatexmath:1.0.7") } diff --git a/plantuml-epl/build.gradle.kts b/plantuml-epl/build.gradle.kts index 5d0683378..eb88ac5ec 100644 --- a/plantuml-epl/build.gradle.kts +++ b/plantuml-epl/build.gradle.kts @@ -25,7 +25,7 @@ java { dependencies { compileOnly("org.apache.ant:ant:1.10.14") - testImplementation("org.assertj:assertj-core:3.24.2") + testImplementation("org.assertj:assertj-core:3.25.3") testImplementation("org.junit.jupiter:junit-jupiter:5.10.1") testImplementation("org.scilab.forge:jlatexmath:1.0.7") testImplementation("org.xmlunit:xmlunit-core:2.9.+") diff --git a/plantuml-gplv2/build.gradle.kts b/plantuml-gplv2/build.gradle.kts index e5903f8ba..31c5670e4 100644 --- a/plantuml-gplv2/build.gradle.kts +++ b/plantuml-gplv2/build.gradle.kts @@ -25,7 +25,7 @@ java { dependencies { compileOnly("org.apache.ant:ant:1.10.14") - testImplementation("org.assertj:assertj-core:3.24.2") + testImplementation("org.assertj:assertj-core:3.25.3") testImplementation("org.junit.jupiter:junit-jupiter:5.10.1") testImplementation("org.scilab.forge:jlatexmath:1.0.7") testImplementation("org.xmlunit:xmlunit-core:2.9.+") diff --git a/plantuml-lgpl/build.gradle.kts b/plantuml-lgpl/build.gradle.kts index 5f6ebfd67..79b38afc5 100644 --- a/plantuml-lgpl/build.gradle.kts +++ b/plantuml-lgpl/build.gradle.kts @@ -25,7 +25,7 @@ java { dependencies { compileOnly("org.apache.ant:ant:1.10.14") - testImplementation("org.assertj:assertj-core:3.24.2") + testImplementation("org.assertj:assertj-core:3.25.3") testImplementation("org.junit.jupiter:junit-jupiter:5.10.1") testImplementation("org.scilab.forge:jlatexmath:1.0.7") testImplementation("org.xmlunit:xmlunit-core:2.9.+") diff --git a/plantuml-mit/build.gradle.kts b/plantuml-mit/build.gradle.kts index 4d3655bfa..bf9d48878 100644 --- a/plantuml-mit/build.gradle.kts +++ b/plantuml-mit/build.gradle.kts @@ -25,7 +25,7 @@ java { dependencies { compileOnly("org.apache.ant:ant:1.10.14") - testImplementation("org.assertj:assertj-core:3.24.2") + testImplementation("org.assertj:assertj-core:3.25.3") testImplementation("org.junit.jupiter:junit-jupiter:5.10.1") testImplementation("org.scilab.forge:jlatexmath:1.0.7") testImplementation("org.xmlunit:xmlunit-core:2.9.+") From 81e1c967c37f5377ae960b7aff553e26b8c4d0c1 Mon Sep 17 00:00:00 2001 From: Arnaud Roques Date: Tue, 6 Feb 2024 23:02:32 +0100 Subject: [PATCH 61/95] feat: add eip in standard library https://github.com/plantuml/plantuml-stdlib/issues/88 --- stdlib/eip-abx.repx | Bin 0 -> 4370 bytes stdlib/eip-dex.repx | Bin 0 -> 11993 bytes stdlib/home.repx | 1 + 3 files changed, 1 insertion(+) create mode 100644 stdlib/eip-abx.repx create mode 100644 stdlib/eip-dex.repx diff --git a/stdlib/eip-abx.repx b/stdlib/eip-abx.repx new file mode 100644 index 0000000000000000000000000000000000000000..79df260821ee82d92ddc7fff5d89daedb0a8747f GIT binary patch literal 4370 zcmV+t5$*09u4@s+d=pVg3IOOV$jRu_0h2lWm!79sS+UyG?1JJVJX}PJa2O#&Zu|f3 zXWlJ1q`;dGm@M-I@P}{`UI11-zN)rLRLc6M>WgW7Kc(|aX{Bs9%EZaM&;Y|Ce|gx( z{OVw>%~*PmU|rgmn)%rxNlEvr09{q)90$v7$|C<3*0bL*h2A#64?Bfs9%)b_ew zIpZ=iB4&GQ=6toRr>A{f+(SL?2or(=LT- zbAJCAKjYaXUajAs@Sn%9C^+mtwe2-OU%~V-B7HAH^M7c(^E~FBCm;b(%_TNLGr0U^ zD}Vs3)zgUX;X3i@vWqrV;J)1R1k#yACd;Ddo13^^*ytV;0b84BPgazax^0y|EB7)> z5r0!ntQ=8P)Q;{#kJk$vxC>YZX|lua$0Sk*_uuSz5%0^3(|?r!Q;0%+7!QQtwZ4JhuN+X;l*B z`~x5wmVzY4`ul#KdL@2UVr$6OMk5UKV3;t0N3+ZR>lGa@4OQOul@K-g=V9(SiYlKubEdhtbo+)C@R%|62Zf@UaWo2CLLt40hJ|L z(I-S_b5q&RgJY5maC&A^4q@mi%tNeyzjwv6?CG zCwuwwI|}b_9!ehz#s5M#OQ=p?e0TYI#1x|OB*d@(_wZO5xGqN-HGbW#eQPIbTj@GS zT5pt3AX{qNn#A?TXm|AaYu7(;l4AkJcgO&1r?yA}V|zrBUT8=mhs|5{5%d|d-!Us# zYIVUmqFKceDg`WWHsk45UJS8p(cT|*W}xyVd%uG7`Suk2hznvVH$;tbYW#R=YDY;I zUg+ZcZhyo7&k}^i%3#bp`Cg`Ma}?a^W&W~g|CXQmqxWgo3oD0}r}fp`ONTloN^S4; zc;IROR`tuI2KW~EFD&#Cjo6UNzW$JbR>*x5&IJ0&E=qHLqyRV_FyIL4@#APFtz%@- zFETQ(bcE+IGnK+iKX9MJ6Mok^KadWR@!$P?RQ4&`}ytPZ#6r5Iuo?KVm$K6!Qf_E z7mHL+ZqhDPL^=bjYwQy;nt4Ql{)nUqT|?vDoe1=oSVplWcLcA|dVd|~Sli=9gXd00 zFn}xai8)Xo=2Q84X$HP@jO3rvisV^zg}+g&!F!D|^qfA(&1dI*p(JvN+%6>XuFtPS z=l_`(AI;AVeK4H>*<-+kVQ&}I_lTBPG9MXaq^NF(9EXhABrjh&9fh}}+cXS5*;v3F5qsBeo#z>Evqs|gEtrJB8S%X8F8QY$;5&NC zb^}nOM%}pCsZ>ZBFZ`E@r_gI4Sd0^TsOwfk1zNE97L+YxS6p<143)#!$(AXI6KpbR zhV=aee~LV+(!>XY9}De(?FSECKZfAa0`v-O)M(;;`7&fA7=`c~si{lR=nNVNJ{90j zmd$-f{rG@8G53QdNi)pB+PUM_^3iDAvlhfUGu%7efh9>}hJN)94CIZ?Bt614VK{4z z<&*gmgxC(wR=Y@nCX+*jI~vt18AmsiW#dZ0feJ)I zsgLr91I)7doDAO1ePfmhlt=<%=GceP60?Yig9jw;2r^fctcdNNhw5@nH|h-w+cXl$v6IqfuvX1)~L_2sqVjwXDQI)=T) zp=2pSVP87bWpz7SPKXJ6n+tMQ#uF{<@25vPxaR{8VwPM}_7$>bByvxzKfP8$O-e`g z1c`)F90nLk02dixXJu^22Kz4Y(@SBBVH%+zC|;>smvfBsuBFYObwwS(%8^U=9vy+duCIJp$uwQ+1HVj&^^pQrpMo|>86CA#%mQkGJ)o-x>@S~bDy6jwZ`or$vD89vH>ih!MWd% zG~NMxx+U2=(A0J+tiFo(1M}xQf#D}lBA-(Wl_Ep0W{0hdMgMEf-pub>-1wAM@>?y` zZ5BMG<+85*X$A0Ih_IXW+};8o z2`z7f$GYjfKz#_>rYU7~)T+1$s3&OwT|Ho@0bG2?qwKiPoDp6ZDj^?t%**&}3W3xR z`zle3`K}NLOWN!aT1^o$9NT}+SI&5^3zZE8)n%kO1T5p+PhzZ{o*#v}N*K(j8l#aT z#&*|I`uzX8P$d?+%ScWkVTtoHRbz2)h{rXx>QUE@XrtlSZe$k$ABorb_>xa2Zbv%L zbHNz}MBS*ydg0Q>*4iGc;}^NKy?-V|Quyaaf3&%t+5GN_gCvSLHBROVX+r%YHMoQ&9_oYeY`>RY%jk}S&;{4|{+%1pqa7-*gEH5j0Emf$Z6;UZElnw-wS>Qg8NDoPn0wT77jT0P|v*wpSW@--Gv>U8=sYjo@u z+i*|kAV2DkAq@w^`rnZed1f_!Z_O)O*Uu5XG33|ois{w4UP`p~nhv15OnOQ{!1BG< zsh;Mt#`!1+ok(q?ZltuCO?Qpf^jcLkbcA4=v!Qm+;TWy&vZ8 zsN9R*x8?1CAmE_|{PYs;`Or)LxIx&?+JrW6Cg7kBQp$o_YyCP{gaFt`02dixXJxeO z9dAXqv%b4_dN4+s6ckg_jwY#_TevRKO>S)(xEgL5VS6_-?C+WdBtp9a*WvkgdTN#z z90+OHN-q-Tu$$dTX7^C}$OpBM!Y7EBd}_jB*1WAdMso?|e7*JMSFz?7( zPzs@@sgVkBQUYFX-QekeewL~2G=ao)tbJf69NY5cDr)+G5CP`4QUOj%z|F0;O3_NpGLxTDSrYreK)tmUJ(zZSYAIl zCg)rjA0Ivv4zjywSALoT&wY7n!I486wu1lTv(MIj*fZ=(^LZ-;&Be#$(!rmBDPw31( z6L3%pOhYvu7SM;}ElbY`z<&W=Rh@vY8;S2C(d!~zb{sowJIphp{M$&4XSd%uJ>ZI_lqWj>D>2cOodQ4Z&SJ2C&?q7>|Q)ZV~61A?QCY$ zvrpM&2=h-TpUMP^VM##BI@X4Wz6dp#>SoKxzg>~cF}bMAwk6`2kKLht=YzgSGdp;&`xt0EM*^i@druPr8{o2Hd; z&4=~K%PS`L4D4YydWQEcEgXZpVvvjRlG+}c}TCf+hU73qF1Apj=dUH2dvx`N6};Q^j_Ls+~-3`a9N$}XZru)&pWG^Nq&F4p5vs8+Cs^V3(BhT zL$HQ-)>VL%3d^$G8^lNGE0M?CQsoz2lLew@lr&y?Wu-qX>MR|*%DxkN zNpuTx9(UZ=tkvVFS#Rf?)E1!Cbf+cT6sOvT1|NQpii{p?W4b=m=EV}WCW4`x*~d@T zXV-E;@ug4<6y$q#z}yy#e-?_{3YjhBJ4W>ozWm22*>gopvsufKrec@j`{19lF;LnimsDa5XSJI9Cm zbRLzX@)(MNoI*f1q44Z3KI$GhN1>?|# zgVDn`$;_hu!_@Ge*ZOb?pS*)#(oPY*U&94)8IBv``bGME=&~)mUy>$&a6x3mb<7II MRqzAP|Ns5>3uK#~yZ`_I literal 0 HcmV?d00001 diff --git a/stdlib/eip-dex.repx b/stdlib/eip-dex.repx new file mode 100644 index 0000000000000000000000000000000000000000..d550fd7b341ebaad2b790cbca1395513ed5fab16 GIT binary patch literal 11993 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 Date: Wed, 7 Feb 2024 22:51:18 +0100 Subject: [PATCH 62/95] feat: improve standard library https://github.com/plantuml/plantuml-stdlib/issues/88 https://github.com/plantuml/plantuml-stdlib/pull/90 https://github.com/plantuml/plantuml-stdlib/pull/91 --- stdlib/edgy-abx.repx | Bin 3897 -> 3908 bytes stdlib/gcp-abx.repx | Bin 0 -> 6974 bytes stdlib/gcp-dex.repx | Bin 0 -> 17777 bytes stdlib/home.repx | 1 + 4 files changed, 1 insertion(+) create mode 100644 stdlib/gcp-abx.repx create mode 100644 stdlib/gcp-dex.repx diff --git a/stdlib/edgy-abx.repx b/stdlib/edgy-abx.repx index 4500959ddf04ef9d69500c2398e123eb712c3fc6..d3ea483fefa99f4b6120c9abc002e605528651eb 100644 GIT binary patch literal 3908 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 SgPf-p9SJ19vfnK3=ga_wnTd4( literal 3897 zcmV-95618t|7B6sD8Z^wMCImqK+6K&5T9NNt7fXALI5#_2qRjCKp=o&KXt0E@pgXu zvI!k~_WLPEXz3&R`yX?+`Ay9J%nUJWp2-#pkC4eEN+WbH0FX_!Y2}wm=>4UE?DRVv z`p5>ir^vxyngbo&)bm@QiaN_ovnVZGyj7a+X)_bP@l^Bx-(~gQeY!$ROa1xlby-T5@feDTjD9feM#i2w_0{Kc?TVoy?qk@J3-!-N+SW~KQfu;L^iJyc2<^K|PCSNPohNq-< zIkjFW{9eG<>r|H2CR?jUzLy>U{tHQQNS(K1c{3*KYleK6cwx=-aKY2k1L(_XAio zDPLS`u#<;J+G%?J1=+<}Zv_&??gf;z3ihMcLEhIX6q(iEODVLr#p^JE0vfFS9h5?= zq{^+0mBOD$33lpnO~|}I(9#TR+;$Wdx6t@n?ImaD>P)DNgD_Uuu&G4941@By2dlJE z5RM$0F$i&X7F99T>u`j#%DJMbTQiL#J_bp9#3&O>rR|cc6H@%?i1Rj~trcRt+J8)t zM4^Qkj&vCWnAyZ}SqY|+jkHP5_EE>*9IPFvvbw>GOYIN>AlU1oF|swX`wH%f=_86D z-&9c$zCcOEuPgchflKmkw82$NJ@}pVuC78aXF2TW8>j$s#~BFGkL$#nBs3n>ZF{aB z3xe8&_yyun(nc*5f*2dtL5G@lg8&R$5|_k$0nzCLy}tWqvzHJs0+c&^v+P@8D*zze z5b$MDeVLWvxPZ|p;|e;&R(#MP6L!+W&4!x-74J|GWOBD%r2|mX=fZ_DkzMEr8~`?j z55oEn0Z0a&zVRj@G+cDv1x-6cg#L_@H`$1mSvWRExfqm;9woq00|k$i6llR#K%9bN z8zwmVYiE?F2tCP{w4%9+l7eVWk*M1ujTlXf^nsS$-bwIkTs%Z1$5Nzzf|v(55HCYj zlb2Gv?hr8YO4S<)vE7D*T{T#HWOi&9PF5Rs~OW?H`>{|0=B~Av<(yF z!%X&xCg*40OF&2Z8H7>R%h(6ZJak0B7kGxzR&SxHnuIm$Z zRW%jAxe^iqUOjcJ5jy8iEru7qG}zc7EAuOF0+B4jey}*fJpw9+hj=&p=lG>-%jYYz zQRC-m7gzNt$*^!^K`@4k7}SpubC1UBeZl(R{-hM^^!{9UNe*N2u+Vq2UXFV;X7)OK zc7b^T9y#uWez2fM5US=YS#Vouz9m1Y$<-*a{G?S2;^{}|hO-p!)VelG_@tz!wX2EJ zWMlZnp;kg<_mtcyVIh@Mnku;_PgLnIW0X-qHRgAbHnB3$pM@_)0c|#HqVpmeC9S7! zUF-iBdYy6=kbT3#4K0?V)V4ADYr?utpc;WzhNJa;V|89Qk$x#FlodB!U@K9VsVykA zg|eDt^*L1@Je515ADh*W#_BxyL;`s)T8k1n8C?cSZJX0yeo3QSK0-M$w$6K zDqDw+H`$W)Vac|Xejr8&%cHe955$~Dq>5wYVNb35Nm%$U@veWSpX_Iie?OrNCnmm!jE)W9mJ@ii10uAV^>te@*J7Lg@s zbE24JY<{PwdK*X$oB|Zwpw7}*L$I@|HDRaxcQZBC0B(@p3TayhzA}%0AMw9$+EGWw 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 I!v}zV=mZ@@vH$=8 literal 0 HcmV?d00001 diff --git a/stdlib/home.repx b/stdlib/home.repx index 8efc6813d..0c294ef9a 100644 --- a/stdlib/home.repx +++ b/stdlib/home.repx @@ -11,6 +11,7 @@ domainstory edgy eip elastic +gcp kubernetes logos material From 1c0c7d828c276ad6ffe034a677e4083f3b7c95b8 Mon Sep 17 00:00:00 2001 From: "Artem V. Ageev" Date: Thu, 8 Feb 2024 20:36:50 +0200 Subject: [PATCH 63/95] Add files via upload --- themes/puml-theme-sunlust.puml | 130 +++++++++++++++++++++++++++++++++ 1 file changed, 130 insertions(+) create mode 100644 themes/puml-theme-sunlust.puml diff --git a/themes/puml-theme-sunlust.puml b/themes/puml-theme-sunlust.puml new file mode 100644 index 000000000..9f80e9b3e --- /dev/null +++ b/themes/puml-theme-sunlust.puml @@ -0,0 +1,130 @@ +@startuml +!$THEME = 'sunlust' +!if %not(%variable_exists("$BGCOLOR")) +!$BGCOLOR = '#fdf6e3' +!endif +scale max 2000 * 2000 +!$colors = { + "font" : "#657b83", + "bg" : "#fdf6e3", + "yellow" : "#b58900", + "yellow_bg" : "#BUSINESS", + "orange" : "#cb4b16", + "orange_bg" : "#STRATEGY", + "red" : "#dc322f", + "red_bg" : "#IMPLEMENTATION", + "violet" : "#6c71c4", + "violet_bg" : "#MOTIVATION", + "blue" : "#268bd2", + "blue_bg" : "#APPLICATION", + "green" : "#859900", + "green_bg" : "#TECHNOLOGY" +} +!$shapes = { + "TECHNOLOGY" : { + "color" : "#859900", + "shapes" : [ "Node", "File"] + }, + "APPLICATION" : { + "color" : "#268bd2", + "shapes" : [ "Participant", "Rectangle", "Component" ] + }, + "BUSINESS" : { + "color" : "#b58900", + "shapes" : [ "Actor", "Note", "Hexagon", "Boundary", "Control", "Entity" ] + }, + "IMPLEMENTATION" : { + "color" : "#dc322f", + "shapes" : [ "Class", "Map", "Json" ] + }, + "MOTIVATION" : { + "color" : "#6c71c4", + "shapes" : [ "Cloud", "Frame", "Collections", "Database", "Queue" ] + }, + "STRATEGY" : { + "color" : "#STRATEGY", + "shapes" : [ "Partition", "Folder", "Card" ] + } +} +!$thickness = 2 + +skinparam { + noteTextAlignment left + actorStyle awesome + Dpi 100 + Shadowing false + BackgroundColor $colors.bg + WrapWidth 200 + RoundCorner 15 + Swimlane { + BorderColor $colors.font + Thickness $thickness + WrapTitleWidth 150 + } + Arrow { + Color $colors.font + Thickness $thickness + } + Default { + TextAlignment center + FontName Dejavu Serif + } + Legend { + FontName VL Gothic + BorderColor transparent + BackgroundColor transparent + } + Sequence { + MessageAlign direction + ArrowThickness $thickness + LifeLineBorderColor $colors.yellow + BoxBorderThickness $thickness + } + !foreach $shape in %splitstr('Activity.State', '.') + $shape { + BackgroundColor transparent + Border { + Color $colors.violet + Thickness $thickness + } + Diamond { + BorderColor $colors.red + BackgroundColor transparent + } + } + !endfor + !foreach $key in %get_json_keys($shapes) + !foreach $shape in $shapes[$key].shapes + $shape { + BackgroundColor #$key + Border { + Color $shapes[$key].color + Thickness $thickness + } + } + !endfor + !endfor +} +@enduml From 68fdb662fe24ccd7e361befa3da37f43a0b959c9 Mon Sep 17 00:00:00 2001 From: Arnaud Roques Date: Thu, 8 Feb 2024 22:37:13 +0100 Subject: [PATCH 64/95] chore: version 1.2024.1 --- gradle.properties | 2 +- src/net/sourceforge/plantuml/version/Version.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index c1112c317..a6470a4d8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -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.2024.1beta1 +version = 1.2024.1 org.gradle.workers.max = 3 \ No newline at end of file diff --git a/src/net/sourceforge/plantuml/version/Version.java b/src/net/sourceforge/plantuml/version/Version.java index dcbf669b6..c7ebef382 100644 --- a/src/net/sourceforge/plantuml/version/Version.java +++ b/src/net/sourceforge/plantuml/version/Version.java @@ -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.2024.1beta1"; + private static final String version = "1.2024.1"; public static String versionString() { return version; From 0ba45e079687bc360c8c5a2d65f41eb38e05e857 Mon Sep 17 00:00:00 2001 From: "Artem V. Ageev" Date: Fri, 9 Feb 2024 11:28:11 +0200 Subject: [PATCH 65/95] Update puml-theme-sunlust.puml add Description theme --- themes/puml-theme-sunlust.puml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/themes/puml-theme-sunlust.puml b/themes/puml-theme-sunlust.puml index 9f80e9b3e..8ea47681d 100644 --- a/themes/puml-theme-sunlust.puml +++ b/themes/puml-theme-sunlust.puml @@ -1,4 +1,9 @@ @startuml +'' NAME = Sunlust +'' DESCRIPTION = sunlust theme based off of the [solarized theme](https://ethanschoonover.com/solarized) +'' AUTHOR = Artem V. Ageev +'' LICENCE = GPL 3+ + !$THEME = 'sunlust' !if %not(%variable_exists("$BGCOLOR")) !$BGCOLOR = '#fdf6e3' From d65951f520bc9c92c5644147e47146c9731c7536 Mon Sep 17 00:00:00 2001 From: Arnaud Roques Date: Sun, 11 Feb 2024 12:20:28 +0100 Subject: [PATCH 66/95] feat: Update C4-PlantUML to v2.9.0 https://github.com/plantuml/plantuml-stdlib/pull/93 --- gradle.properties | 2 +- .../sourceforge/plantuml/version/Version.java | 2 +- stdlib/c4-abx.repx | Bin 15559 -> 16046 bytes 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index a6470a4d8..faafaa448 100644 --- a/gradle.properties +++ b/gradle.properties @@ -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.2024.1 +version = 1.2024.2beta1 org.gradle.workers.max = 3 \ No newline at end of file diff --git a/src/net/sourceforge/plantuml/version/Version.java b/src/net/sourceforge/plantuml/version/Version.java index c7ebef382..9dc1f8365 100644 --- a/src/net/sourceforge/plantuml/version/Version.java +++ b/src/net/sourceforge/plantuml/version/Version.java @@ -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.2024.1"; + private static final String version = "1.2024.2beta1"; public static String versionString() { return version; diff --git a/stdlib/c4-abx.repx b/stdlib/c4-abx.repx index 24cd069abddb08baa9352d5793a58c3994da624f..10ef9117eb1b11a42125947a9d41157896ee4f4e 100644 GIT binary patch literal 16046 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 literal 15559 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 Date: Sun, 11 Feb 2024 19:43:14 +0100 Subject: [PATCH 67/95] fix: update graphviz version check pattern Right now, the `graphviz` version detection failed to match with `10.x.x`, thus relaxing the version check regex. Signed-off-by: Rui Chen --- src/net/sourceforge/plantuml/dot/GraphvizUtils.java | 2 +- src/net/sourceforge/plantuml/dot/GraphvizVersionFinder.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/net/sourceforge/plantuml/dot/GraphvizUtils.java b/src/net/sourceforge/plantuml/dot/GraphvizUtils.java index 803023cbc..23261f328 100644 --- a/src/net/sourceforge/plantuml/dot/GraphvizUtils.java +++ b/src/net/sourceforge/plantuml/dot/GraphvizUtils.java @@ -197,7 +197,7 @@ public class GraphvizUtils { if (s == null) return -1; - final Pattern p = Pattern.compile("\\s(\\d)\\.(\\d\\d?)\\D"); + final Pattern p = Pattern.compile("\\s(\\d+)\\.(\\d\\d?)\\D"); final Matcher m = p.matcher(s); if (m.find() == false) return -1; diff --git a/src/net/sourceforge/plantuml/dot/GraphvizVersionFinder.java b/src/net/sourceforge/plantuml/dot/GraphvizVersionFinder.java index 8a58e7b25..706bb5f0a 100644 --- a/src/net/sourceforge/plantuml/dot/GraphvizVersionFinder.java +++ b/src/net/sourceforge/plantuml/dot/GraphvizVersionFinder.java @@ -73,7 +73,7 @@ public class GraphvizVersionFinder { public GraphvizVersion getVersion() { final String dotVersion = dotVersion(); - final Pattern p = Pattern.compile("(\\d)\\.(\\d\\d?)"); + final Pattern p = Pattern.compile("(\\d+)\\.(\\d\\d?)"); final Matcher m = p.matcher(dotVersion); final boolean find = m.find(); if (find == false) From e11d974ce59f217abf6d76bc1c6845d8a8180a22 Mon Sep 17 00:00:00 2001 From: The-Lum <86879521+The-Lum@users.noreply.github.com> Date: Mon, 12 Feb 2024 19:13:02 +0000 Subject: [PATCH 68/95] refactor: place `net.sourceforge.plantuml.test` on `test.utils` Create `test` folder with: - `example` - `utils` And put all `net.sourceforge.plantuml.test` on `test.utils`. _[no other change]_ --- test/net/sourceforge/plantuml/LoadJsonTest.java | 2 +- test/net/sourceforge/plantuml/TestFileDirOption.java | 2 +- test/net/sourceforge/plantuml/tim/stdlib/FeatureTest.java | 2 +- .../net/sourceforge/plantuml/tim/stdlib/GetJsonKeyTest.java | 2 +- .../sourceforge/plantuml/tim/stdlib/GetJsonTypeTest.java | 2 +- test/net/sourceforge/plantuml/tim/stdlib/LowerTest.java | 2 +- test/net/sourceforge/plantuml/tim/stdlib/SizeTest.java | 2 +- test/net/sourceforge/plantuml/tim/stdlib/UpperTest.java | 2 +- .../plantuml/tim/stdlib/_TemplateStdlibTest.template | 2 +- .../TestHelper.java => test/example/TestExample.java} | 6 +++--- .../plantuml/test => test/utils}/ImageTestUtils.java | 2 +- .../plantuml/test => test/utils}/ImageTestUtilsTest.java | 6 +++--- .../plantuml/test => test/utils}/JunitUtils.java | 2 +- .../plantuml/test => test/utils}/PlantUmlTestUtils.java | 2 +- .../plantuml/test => test/utils}/StringTestUtils.java | 2 +- .../sourceforge/plantuml/test => test/utils}/TestUtils.java | 2 +- 16 files changed, 20 insertions(+), 20 deletions(-) rename test/{testhelper/TestHelper.java => test/example/TestExample.java} (76%) rename test/{net/sourceforge/plantuml/test => test/utils}/ImageTestUtils.java (98%) rename test/{net/sourceforge/plantuml/test => test/utils}/ImageTestUtilsTest.java (93%) rename test/{net/sourceforge/plantuml/test => test/utils}/JunitUtils.java (95%) rename test/{net/sourceforge/plantuml/test => test/utils}/PlantUmlTestUtils.java (98%) rename test/{net/sourceforge/plantuml/test => test/utils}/StringTestUtils.java (96%) rename test/{net/sourceforge/plantuml/test => test/utils}/TestUtils.java (89%) diff --git a/test/net/sourceforge/plantuml/LoadJsonTest.java b/test/net/sourceforge/plantuml/LoadJsonTest.java index cd5302be7..3ff4c3bb9 100644 --- a/test/net/sourceforge/plantuml/LoadJsonTest.java +++ b/test/net/sourceforge/plantuml/LoadJsonTest.java @@ -1,9 +1,9 @@ package net.sourceforge.plantuml; import static java.nio.charset.StandardCharsets.UTF_8; -import static net.sourceforge.plantuml.test.TestUtils.writeUtf8File; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.util.Lists.newArrayList; +import static test.utils.TestUtils.writeUtf8File; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/test/net/sourceforge/plantuml/TestFileDirOption.java b/test/net/sourceforge/plantuml/TestFileDirOption.java index d68165ef6..5e71d1937 100644 --- a/test/net/sourceforge/plantuml/TestFileDirOption.java +++ b/test/net/sourceforge/plantuml/TestFileDirOption.java @@ -1,9 +1,9 @@ package net.sourceforge.plantuml; import static java.nio.charset.StandardCharsets.UTF_8; -import static net.sourceforge.plantuml.test.TestUtils.writeUtf8File; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.util.Lists.newArrayList; +import static test.utils.TestUtils.writeUtf8File; import java.io.BufferedOutputStream; import java.io.ByteArrayInputStream; diff --git a/test/net/sourceforge/plantuml/tim/stdlib/FeatureTest.java b/test/net/sourceforge/plantuml/tim/stdlib/FeatureTest.java index 74bdf712a..52507fb51 100644 --- a/test/net/sourceforge/plantuml/tim/stdlib/FeatureTest.java +++ b/test/net/sourceforge/plantuml/tim/stdlib/FeatureTest.java @@ -1,8 +1,8 @@ package net.sourceforge.plantuml.tim.stdlib; -import static net.sourceforge.plantuml.test.JunitUtils.StringJsonConverter; import static net.sourceforge.plantuml.tim.TimTestUtils.assertTimExpectedOutput; import static net.sourceforge.plantuml.tim.TimTestUtils.assertTimExpectedOutputFromInput; +import static test.utils.JunitUtils.StringJsonConverter; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.DisplayNameGenerator.ReplaceUnderscores; diff --git a/test/net/sourceforge/plantuml/tim/stdlib/GetJsonKeyTest.java b/test/net/sourceforge/plantuml/tim/stdlib/GetJsonKeyTest.java index c84f32bd8..80635e456 100644 --- a/test/net/sourceforge/plantuml/tim/stdlib/GetJsonKeyTest.java +++ b/test/net/sourceforge/plantuml/tim/stdlib/GetJsonKeyTest.java @@ -1,8 +1,8 @@ package net.sourceforge.plantuml.tim.stdlib; -import static net.sourceforge.plantuml.test.JunitUtils.StringJsonConverter; import static net.sourceforge.plantuml.tim.TimTestUtils.assertTimExpectedOutput; import static net.sourceforge.plantuml.tim.TimTestUtils.assertTimExpectedOutputFromInput; +import static test.utils.JunitUtils.StringJsonConverter; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.DisplayNameGenerator.ReplaceUnderscores; diff --git a/test/net/sourceforge/plantuml/tim/stdlib/GetJsonTypeTest.java b/test/net/sourceforge/plantuml/tim/stdlib/GetJsonTypeTest.java index 1b720c9e5..0fe35543c 100644 --- a/test/net/sourceforge/plantuml/tim/stdlib/GetJsonTypeTest.java +++ b/test/net/sourceforge/plantuml/tim/stdlib/GetJsonTypeTest.java @@ -1,8 +1,8 @@ package net.sourceforge.plantuml.tim.stdlib; -import static net.sourceforge.plantuml.test.JunitUtils.StringJsonConverter; import static net.sourceforge.plantuml.tim.TimTestUtils.assertTimExpectedOutput; import static net.sourceforge.plantuml.tim.TimTestUtils.assertTimExpectedOutputFromInput; +import static test.utils.JunitUtils.StringJsonConverter; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.DisplayNameGenerator.ReplaceUnderscores; diff --git a/test/net/sourceforge/plantuml/tim/stdlib/LowerTest.java b/test/net/sourceforge/plantuml/tim/stdlib/LowerTest.java index d149c26b9..3b50a2d30 100644 --- a/test/net/sourceforge/plantuml/tim/stdlib/LowerTest.java +++ b/test/net/sourceforge/plantuml/tim/stdlib/LowerTest.java @@ -1,8 +1,8 @@ package net.sourceforge.plantuml.tim.stdlib; -import static net.sourceforge.plantuml.test.JunitUtils.StringJsonConverter; import static net.sourceforge.plantuml.tim.TimTestUtils.assertTimExpectedOutput; import static net.sourceforge.plantuml.tim.TimTestUtils.assertTimExpectedOutputFromInput; +import static test.utils.JunitUtils.StringJsonConverter; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.DisplayNameGenerator.ReplaceUnderscores; diff --git a/test/net/sourceforge/plantuml/tim/stdlib/SizeTest.java b/test/net/sourceforge/plantuml/tim/stdlib/SizeTest.java index 137ff9bef..6bcfd105e 100644 --- a/test/net/sourceforge/plantuml/tim/stdlib/SizeTest.java +++ b/test/net/sourceforge/plantuml/tim/stdlib/SizeTest.java @@ -1,8 +1,8 @@ package net.sourceforge.plantuml.tim.stdlib; -import static net.sourceforge.plantuml.test.JunitUtils.StringJsonConverter; import static net.sourceforge.plantuml.tim.TimTestUtils.assertTimExpectedOutput; import static net.sourceforge.plantuml.tim.TimTestUtils.assertTimExpectedOutputFromInput; +import static test.utils.JunitUtils.StringJsonConverter; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.DisplayNameGenerator.ReplaceUnderscores; diff --git a/test/net/sourceforge/plantuml/tim/stdlib/UpperTest.java b/test/net/sourceforge/plantuml/tim/stdlib/UpperTest.java index 049f0b531..35c1e2e87 100644 --- a/test/net/sourceforge/plantuml/tim/stdlib/UpperTest.java +++ b/test/net/sourceforge/plantuml/tim/stdlib/UpperTest.java @@ -1,8 +1,8 @@ package net.sourceforge.plantuml.tim.stdlib; -import static net.sourceforge.plantuml.test.JunitUtils.StringJsonConverter; import static net.sourceforge.plantuml.tim.TimTestUtils.assertTimExpectedOutput; import static net.sourceforge.plantuml.tim.TimTestUtils.assertTimExpectedOutputFromInput; +import static test.utils.JunitUtils.StringJsonConverter; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.DisplayNameGenerator.ReplaceUnderscores; diff --git a/test/net/sourceforge/plantuml/tim/stdlib/_TemplateStdlibTest.template b/test/net/sourceforge/plantuml/tim/stdlib/_TemplateStdlibTest.template index a949f6023..d85b08db0 100644 --- a/test/net/sourceforge/plantuml/tim/stdlib/_TemplateStdlibTest.template +++ b/test/net/sourceforge/plantuml/tim/stdlib/_TemplateStdlibTest.template @@ -1,8 +1,8 @@ package net.sourceforge.plantuml.tim.stdlib; -import static net.sourceforge.plantuml.test.JunitUtils.StringJsonConverter; import static net.sourceforge.plantuml.tim.TimTestUtils.assertTimExpectedOutput; import static net.sourceforge.plantuml.tim.TimTestUtils.assertTimExpectedOutputFromInput; +import static test.utils.JunitUtils.StringJsonConverter; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.DisplayNameGenerator.ReplaceUnderscores; diff --git a/test/testhelper/TestHelper.java b/test/test/example/TestExample.java similarity index 76% rename from test/testhelper/TestHelper.java rename to test/test/example/TestExample.java index 0a06fd1c8..1fc15a8d4 100644 --- a/test/testhelper/TestHelper.java +++ b/test/test/example/TestExample.java @@ -1,11 +1,11 @@ -package testhelper; +package test.example; -import static net.sourceforge.plantuml.test.PlantUmlTestUtils.exportDiagram; +import static test.utils.PlantUmlTestUtils.exportDiagram; import static org.assertj.core.api.Assertions.assertThat; import org.junit.jupiter.api.Test; -class TestHelper { +class TestExample { @Test public void test_help_themes() throws Exception { diff --git a/test/net/sourceforge/plantuml/test/ImageTestUtils.java b/test/test/utils/ImageTestUtils.java similarity index 98% rename from test/net/sourceforge/plantuml/test/ImageTestUtils.java rename to test/test/utils/ImageTestUtils.java index cd989f3a7..21dcd284a 100644 --- a/test/net/sourceforge/plantuml/test/ImageTestUtils.java +++ b/test/test/utils/ImageTestUtils.java @@ -1,4 +1,4 @@ -package net.sourceforge.plantuml.test; +package test.utils; import static org.assertj.core.api.Assertions.assertThat; diff --git a/test/net/sourceforge/plantuml/test/ImageTestUtilsTest.java b/test/test/utils/ImageTestUtilsTest.java similarity index 93% rename from test/net/sourceforge/plantuml/test/ImageTestUtilsTest.java rename to test/test/utils/ImageTestUtilsTest.java index 5d96a85a7..c29cb1687 100644 --- a/test/net/sourceforge/plantuml/test/ImageTestUtilsTest.java +++ b/test/test/utils/ImageTestUtilsTest.java @@ -1,9 +1,9 @@ -package net.sourceforge.plantuml.test; +package test.utils; -import static net.sourceforge.plantuml.test.ImageTestUtils.assertImageSizeEqual; -import static net.sourceforge.plantuml.test.ImageTestUtils.assertImagesEqual; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; +import static test.utils.ImageTestUtils.assertImageSizeEqual; +import static test.utils.ImageTestUtils.assertImagesEqual; import java.awt.image.BufferedImage; diff --git a/test/net/sourceforge/plantuml/test/JunitUtils.java b/test/test/utils/JunitUtils.java similarity index 95% rename from test/net/sourceforge/plantuml/test/JunitUtils.java rename to test/test/utils/JunitUtils.java index 8064ba1fc..e0b6add41 100644 --- a/test/net/sourceforge/plantuml/test/JunitUtils.java +++ b/test/test/utils/JunitUtils.java @@ -1,4 +1,4 @@ -package net.sourceforge.plantuml.test; +package test.utils; import org.junit.jupiter.params.converter.ArgumentConversionException; import org.junit.jupiter.params.converter.SimpleArgumentConverter; diff --git a/test/net/sourceforge/plantuml/test/PlantUmlTestUtils.java b/test/test/utils/PlantUmlTestUtils.java similarity index 98% rename from test/net/sourceforge/plantuml/test/PlantUmlTestUtils.java rename to test/test/utils/PlantUmlTestUtils.java index e4bac23ce..f1f5774ad 100644 --- a/test/net/sourceforge/plantuml/test/PlantUmlTestUtils.java +++ b/test/test/utils/PlantUmlTestUtils.java @@ -1,4 +1,4 @@ -package net.sourceforge.plantuml.test; +package test.utils; import static java.nio.charset.StandardCharsets.UTF_8; import static org.assertj.core.api.Assertions.assertThat; diff --git a/test/net/sourceforge/plantuml/test/StringTestUtils.java b/test/test/utils/StringTestUtils.java similarity index 96% rename from test/net/sourceforge/plantuml/test/StringTestUtils.java rename to test/test/utils/StringTestUtils.java index 2248dc201..df3705a85 100644 --- a/test/net/sourceforge/plantuml/test/StringTestUtils.java +++ b/test/test/utils/StringTestUtils.java @@ -1,4 +1,4 @@ -package net.sourceforge.plantuml.test; +package test.utils; import static java.util.Objects.requireNonNull; diff --git a/test/net/sourceforge/plantuml/test/TestUtils.java b/test/test/utils/TestUtils.java similarity index 89% rename from test/net/sourceforge/plantuml/test/TestUtils.java rename to test/test/utils/TestUtils.java index 2506ddf4a..d381f545e 100644 --- a/test/net/sourceforge/plantuml/test/TestUtils.java +++ b/test/test/utils/TestUtils.java @@ -1,4 +1,4 @@ -package net.sourceforge.plantuml.test; +package test.utils; import static java.nio.charset.StandardCharsets.UTF_8; From e70f23b8fe8cc7ae5c296b16680da02dd0563f63 Mon Sep 17 00:00:00 2001 From: The-Lum <86879521+The-Lum@users.noreply.github.com> Date: Tue, 13 Feb 2024 11:04:02 +0000 Subject: [PATCH 69/95] refactor: Change `HelpTest` to `CommandHelpThemeTest` on a more accurate folder To continue: - #1655 Change `HelpTest.java` to `CommandHelpThemeTest.java` Put on a more accurate folder: - `net.sourceforge.plantuml.help` --- .../plantuml/help/CommandHelpThemeTest.java | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 test/net/sourceforge/plantuml/help/CommandHelpThemeTest.java diff --git a/test/net/sourceforge/plantuml/help/CommandHelpThemeTest.java b/test/net/sourceforge/plantuml/help/CommandHelpThemeTest.java new file mode 100644 index 000000000..180522880 --- /dev/null +++ b/test/net/sourceforge/plantuml/help/CommandHelpThemeTest.java @@ -0,0 +1,23 @@ +package net.sourceforge.plantuml.help; + +import static org.assertj.core.api.Assertions.assertThat; +import static test.utils.PlantUmlTestUtils.exportDiagram; + +import org.junit.jupiter.api.Test; + +class CommandHelpThemeTest { + + @Test + public void command_help_theme() throws Exception { + + final String output = exportDiagram( + "@startuml", + "help themes", + "@enduml" + ).asString(); + + assertThat(output) + .startsWith(" \nHelp on themes") + .contains("bluegray", "hacker"); + } +} \ No newline at end of file From 7be48049ff8b059447eadecddbfd6eb29e914c64 Mon Sep 17 00:00:00 2001 From: The-Lum <86879521+The-Lum@users.noreply.github.com> Date: Tue, 13 Feb 2024 13:11:30 +0100 Subject: [PATCH 70/95] fix: emergency change to be compatible with `actions/labeler` v5 Emergency change to be compatible with `actions/labeler` v5 Observed on: - #1620 --- .github/labeler.yml | 58 +++++++++++++++++++++++++++++---------------- 1 file changed, 38 insertions(+), 20 deletions(-) diff --git a/.github/labeler.yml b/.github/labeler.yml index 4f260b7ec..3924b988d 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -1,37 +1,55 @@ 'm:release': -- 'CHANGELOG.md' -- 'gradle.properties' +- changed-files: + - any-glob-to-any-file: + - 'CHANGELOG.md' + - 'gradle.properties' 'm:docs': -- '*.md' -- 'docs/**/*' +- changed-files: + - any-glob-to-any-file: + - '*.md' + - 'docs/**/*' 'm:workflow': -- .github/** +- changed-files: + - any-glob-to-any-file: + - .github/** 'm:gradle': -- 'gradle*' -- 'gradle/**' -- '**/settings.gradle.*' -- '**/build.gradle.*' -- 'sjpp.jar' +- changed-files: + - any-glob-to-any-file: + - 'gradle*' + - 'gradle/**' + - '**/settings.gradle.*' + - '**/build.gradle.*' + - 'sjpp.jar' 'm:source': -- 'skin/**/*' -- 'src/**/*' -- 'stdlib/**/*' -- 'svg/**/*' -- 'themes/**/*' -- 'manifest.txt' +- changed-files: + - any-glob-to-any-file: + - 'skin/**/*' + - 'src/**/*' + - 'stdlib/**/*' + - 'svg/**/*' + - 'themes/**/*' + - 'manifest.txt' 'm:test': -- 'test/**/*' +- changed-files: + - any-glob-to-any-file: + - 'test/**/*' 'm:license': -- '**/*license.txt' +- changed-files: + - any-glob-to-any-file: + - '**/*license.txt' 'm:docker': -- Dockerfile +- changed-files: + - any-glob-to-any-file: + - Dockerfile 'm:native': -- .github/workflows/native-image.yml +- changed-files: + - any-glob-to-any-file: + - .github/workflows/native-image.yml From af3c49c2aa29c903c89c6a1adaef58c7bdfe8188 Mon Sep 17 00:00:00 2001 From: The-Lum <86879521+The-Lum@users.noreply.github.com> Date: Tue, 13 Feb 2024 14:19:22 +0100 Subject: [PATCH 71/95] docs: fix links _(due to emoji)_ --- BUILDING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BUILDING.md b/BUILDING.md index 3c436bdb5..be2856729 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -2,7 +2,7 @@ Thank you for your interest in contributing to PlantUML! This guide will help you build the PlantUML project. -PlantUML can be built using either [Gradle](#building-plantuml-with-gradle) or [Ant](#building-plantuml-with-ant-alternative-method). It's recommended to use Gradle as the primary build tool for this project. You will find instructions for both methods, starting with Gradle. +PlantUML can be built using either [Gradle](#-building-plantuml-with-gradle) or [Ant](#-building-plantuml-with-ant-alternative-method). It's recommended to use Gradle as the primary build tool for this project. You will find instructions for both methods, starting with Gradle. ## ☕ Java Compatibility and Development Notes From ababa00835e04a9082690f4eca114b7c6f27d27f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 13 Feb 2024 16:51:50 +0000 Subject: [PATCH 72/95] chore(deps): bump org.junit.jupiter:junit-jupiter from 5.10.1 to 5.10.2 Bumps [org.junit.jupiter:junit-jupiter](https://github.com/junit-team/junit5) from 5.10.1 to 5.10.2. - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.10.1...r5.10.2) --- updated-dependencies: - dependency-name: org.junit.jupiter:junit-jupiter dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- build.gradle.kts | 2 +- plantuml-asl/build.gradle.kts | 2 +- plantuml-bsd/build.gradle.kts | 2 +- plantuml-epl/build.gradle.kts | 2 +- plantuml-gplv2/build.gradle.kts | 2 +- plantuml-lgpl/build.gradle.kts | 2 +- plantuml-mit/build.gradle.kts | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index e251ee2f9..6b79adc39 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -32,7 +32,7 @@ dependencies { testImplementation("io.github.glytching:junit-extensions:2.6.0") testImplementation("org.assertj:assertj-core:3.25.3") - testImplementation("org.junit.jupiter:junit-jupiter:5.10.1") + testImplementation("org.junit.jupiter:junit-jupiter:5.10.2") testImplementation("org.xmlunit:xmlunit-core:2.9.+") if (JavaVersion.current().isJava8) { testImplementation("org.mockito:mockito-core:4.+") diff --git a/plantuml-asl/build.gradle.kts b/plantuml-asl/build.gradle.kts index d6ed938b7..b4217ad15 100644 --- a/plantuml-asl/build.gradle.kts +++ b/plantuml-asl/build.gradle.kts @@ -26,7 +26,7 @@ java { dependencies { compileOnly("org.apache.ant:ant:1.10.14") testImplementation("org.assertj:assertj-core:3.25.3") - testImplementation("org.junit.jupiter:junit-jupiter:5.10.1") + testImplementation("org.junit.jupiter:junit-jupiter:5.10.2") testImplementation("org.scilab.forge:jlatexmath:1.0.7") testImplementation("org.xmlunit:xmlunit-core:2.9.+") } diff --git a/plantuml-bsd/build.gradle.kts b/plantuml-bsd/build.gradle.kts index 63ae98403..393e7a45c 100644 --- a/plantuml-bsd/build.gradle.kts +++ b/plantuml-bsd/build.gradle.kts @@ -26,7 +26,7 @@ java { dependencies { compileOnly("org.apache.ant:ant:1.10.14") testImplementation("org.assertj:assertj-core:3.25.3") - testImplementation("org.junit.jupiter:junit-jupiter:5.10.1") + testImplementation("org.junit.jupiter:junit-jupiter:5.10.2") testImplementation("org.scilab.forge:jlatexmath:1.0.7") } diff --git a/plantuml-epl/build.gradle.kts b/plantuml-epl/build.gradle.kts index eb88ac5ec..5bf7756f4 100644 --- a/plantuml-epl/build.gradle.kts +++ b/plantuml-epl/build.gradle.kts @@ -26,7 +26,7 @@ java { dependencies { compileOnly("org.apache.ant:ant:1.10.14") testImplementation("org.assertj:assertj-core:3.25.3") - testImplementation("org.junit.jupiter:junit-jupiter:5.10.1") + testImplementation("org.junit.jupiter:junit-jupiter:5.10.2") testImplementation("org.scilab.forge:jlatexmath:1.0.7") testImplementation("org.xmlunit:xmlunit-core:2.9.+") } diff --git a/plantuml-gplv2/build.gradle.kts b/plantuml-gplv2/build.gradle.kts index 31c5670e4..c7df0ca29 100644 --- a/plantuml-gplv2/build.gradle.kts +++ b/plantuml-gplv2/build.gradle.kts @@ -26,7 +26,7 @@ java { dependencies { compileOnly("org.apache.ant:ant:1.10.14") testImplementation("org.assertj:assertj-core:3.25.3") - testImplementation("org.junit.jupiter:junit-jupiter:5.10.1") + testImplementation("org.junit.jupiter:junit-jupiter:5.10.2") testImplementation("org.scilab.forge:jlatexmath:1.0.7") testImplementation("org.xmlunit:xmlunit-core:2.9.+") } diff --git a/plantuml-lgpl/build.gradle.kts b/plantuml-lgpl/build.gradle.kts index 79b38afc5..667667df0 100644 --- a/plantuml-lgpl/build.gradle.kts +++ b/plantuml-lgpl/build.gradle.kts @@ -26,7 +26,7 @@ java { dependencies { compileOnly("org.apache.ant:ant:1.10.14") testImplementation("org.assertj:assertj-core:3.25.3") - testImplementation("org.junit.jupiter:junit-jupiter:5.10.1") + testImplementation("org.junit.jupiter:junit-jupiter:5.10.2") testImplementation("org.scilab.forge:jlatexmath:1.0.7") testImplementation("org.xmlunit:xmlunit-core:2.9.+") } diff --git a/plantuml-mit/build.gradle.kts b/plantuml-mit/build.gradle.kts index bf9d48878..d7e2cf555 100644 --- a/plantuml-mit/build.gradle.kts +++ b/plantuml-mit/build.gradle.kts @@ -26,7 +26,7 @@ java { dependencies { compileOnly("org.apache.ant:ant:1.10.14") testImplementation("org.assertj:assertj-core:3.25.3") - testImplementation("org.junit.jupiter:junit-jupiter:5.10.1") + testImplementation("org.junit.jupiter:junit-jupiter:5.10.2") testImplementation("org.scilab.forge:jlatexmath:1.0.7") testImplementation("org.xmlunit:xmlunit-core:2.9.+") } From ab09e2ef1f48b0526c11a692345cc2f530c38ee8 Mon Sep 17 00:00:00 2001 From: The-Lum <86879521+The-Lum@users.noreply.github.com> Date: Wed, 14 Feb 2024 06:14:19 +0000 Subject: [PATCH 73/95] feat: add `%get_all_theme` builtin function --- .../sourceforge/plantuml/tim/TContext.java | 2 + .../plantuml/tim/stdlib/GetAllTheme.java | 76 +++++++++++++++++++ .../plantuml/tim/stdlib/GetTAllThemeTest.java | 30 ++++++++ 3 files changed, 108 insertions(+) create mode 100644 src/net/sourceforge/plantuml/tim/stdlib/GetAllTheme.java create mode 100644 test/net/sourceforge/plantuml/tim/stdlib/GetTAllThemeTest.java diff --git a/src/net/sourceforge/plantuml/tim/TContext.java b/src/net/sourceforge/plantuml/tim/TContext.java index af2db5c95..30f2f0b9f 100644 --- a/src/net/sourceforge/plantuml/tim/TContext.java +++ b/src/net/sourceforge/plantuml/tim/TContext.java @@ -97,6 +97,7 @@ import net.sourceforge.plantuml.tim.stdlib.Feature; import net.sourceforge.plantuml.tim.stdlib.FileExists; import net.sourceforge.plantuml.tim.stdlib.Filename; import net.sourceforge.plantuml.tim.stdlib.FunctionExists; +import net.sourceforge.plantuml.tim.stdlib.GetAllTheme; import net.sourceforge.plantuml.tim.stdlib.GetJsonKey; import net.sourceforge.plantuml.tim.stdlib.GetJsonType; import net.sourceforge.plantuml.tim.stdlib.GetVariableValue; @@ -210,6 +211,7 @@ public class TContext { functionsSet.addFunction(new LogicalNxor()); functionsSet.addFunction(new Ord()); functionsSet.addFunction(new RandomFunction()); + functionsSet.addFunction(new GetAllTheme()); // %standard_exists_function // %str_replace // !exit diff --git a/src/net/sourceforge/plantuml/tim/stdlib/GetAllTheme.java b/src/net/sourceforge/plantuml/tim/stdlib/GetAllTheme.java new file mode 100644 index 000000000..3446e6de8 --- /dev/null +++ b/src/net/sourceforge/plantuml/tim/stdlib/GetAllTheme.java @@ -0,0 +1,76 @@ +/* ======================================================================== + * PlantUML : a free UML diagram generator + * ======================================================================== + * + * (C) Copyright 2009-2024, Arnaud Roques + * + * Project Info: https://plantuml.com + * + * If you like this project or if you find it useful, you can support us at: + * + * https://plantuml.com/patreon (only 1$ per month!) + * https://plantuml.com/paypal + * + * This file is part of PlantUML. + * + * PlantUML is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * PlantUML distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public + * License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. + * + * + * Original Author: Arnaud Roques + * + */ +package net.sourceforge.plantuml.tim.stdlib; + +import java.io.IOException; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import net.sourceforge.plantuml.log.Logme; +import net.sourceforge.plantuml.json.JsonArray; +import net.sourceforge.plantuml.theme.ThemeUtils; +import net.sourceforge.plantuml.tim.EaterException; +import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.TContext; +import net.sourceforge.plantuml.tim.TFunctionSignature; +import net.sourceforge.plantuml.tim.TMemory; +import net.sourceforge.plantuml.tim.expression.TValue; +import net.sourceforge.plantuml.utils.LineLocation; + +public class GetAllTheme extends SimpleReturnFunction { + + public TFunctionSignature getSignature() { + return new TFunctionSignature("%get_all_theme", 0); + } + + public boolean canCover(int nbArg, Set namedArgument) { + return nbArg == 0; + } + + public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, + Map named) throws EaterException, EaterExceptionLocated { + final JsonArray result = new JsonArray(); + try { + for (String theme : ThemeUtils.getAllThemeNames()) { + result.add(theme); + } + return TValue.fromJson(result); + } catch (IOException e) { + Logme.error(e); + return TValue.fromJson(result); + } + } +} diff --git a/test/net/sourceforge/plantuml/tim/stdlib/GetTAllThemeTest.java b/test/net/sourceforge/plantuml/tim/stdlib/GetTAllThemeTest.java new file mode 100644 index 000000000..c17bc33d2 --- /dev/null +++ b/test/net/sourceforge/plantuml/tim/stdlib/GetTAllThemeTest.java @@ -0,0 +1,30 @@ +package net.sourceforge.plantuml.tim.stdlib; + +import static org.assertj.core.api.Assertions.assertThat; + +import java.util.Collections; + +import org.junit.jupiter.api.DisplayNameGenerator.ReplaceUnderscores; +import org.junit.jupiter.api.IndicativeSentencesGeneration; +import org.junit.jupiter.api.Test; + +import net.sourceforge.plantuml.tim.EaterException; +import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.TFunction; +import net.sourceforge.plantuml.tim.expression.TValue; + +/** + * Tests the builtin function. + */ +@IndicativeSentencesGeneration(separator = ": ", generator = ReplaceUnderscores.class) + +class GetAllThemeTest { + TFunction cut = new GetAllTheme(); + final String cutName = "GetAllTheme"; + + @Test + void Test_without_Param() throws EaterException, EaterExceptionLocated { + final TValue tValue = cut.executeReturnFunction(null, null, null, Collections.emptyList(), null); + assertThat(tValue.toString()).contains("_none_", "amiga", "vibrant"); + } +} From 53bcc028cf9423bfd5bd88bbe7144d31bce36f18 Mon Sep 17 00:00:00 2001 From: The-Lum <86879521+The-Lum@users.noreply.github.com> Date: Wed, 14 Feb 2024 06:19:34 +0000 Subject: [PATCH 74/95] fix: typo on `GetAllThemeTest` filename --- .../tim/stdlib/{GetTAllThemeTest.java => GetAllThemeTest.java} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename test/net/sourceforge/plantuml/tim/stdlib/{GetTAllThemeTest.java => GetAllThemeTest.java} (100%) diff --git a/test/net/sourceforge/plantuml/tim/stdlib/GetTAllThemeTest.java b/test/net/sourceforge/plantuml/tim/stdlib/GetAllThemeTest.java similarity index 100% rename from test/net/sourceforge/plantuml/tim/stdlib/GetTAllThemeTest.java rename to test/net/sourceforge/plantuml/tim/stdlib/GetAllThemeTest.java From cfa16d0f609873d3a41874ed8dbc4d1baa05d048 Mon Sep 17 00:00:00 2001 From: Arnaud Roques Date: Wed, 14 Feb 2024 19:05:53 +0100 Subject: [PATCH 75/95] chore: version 1.2024.2 --- gradle.properties | 2 +- .../drawing/g2d/ExtendedGeneralPath.java | 19 ------------------ .../sourceforge/plantuml/version/Version.java | 4 ++-- stdlib/awslib14-abx.repx | Bin 48688 -> 48765 bytes stdlib/azure-abx.repx | Bin 10752 -> 10890 bytes stdlib/gcp-abx.repx | Bin 6974 -> 7083 bytes stdlib/office-abx.repx | Bin 22962 -> 23868 bytes 7 files changed, 3 insertions(+), 22 deletions(-) diff --git a/gradle.properties b/gradle.properties index faafaa448..42657a6f1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -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.2024.2beta1 +version = 1.2024.2 org.gradle.workers.max = 3 \ No newline at end of file diff --git a/src/net/sourceforge/plantuml/klimt/drawing/g2d/ExtendedGeneralPath.java b/src/net/sourceforge/plantuml/klimt/drawing/g2d/ExtendedGeneralPath.java index 37bfe9b7b..1ff88279b 100644 --- a/src/net/sourceforge/plantuml/klimt/drawing/g2d/ExtendedGeneralPath.java +++ b/src/net/sourceforge/plantuml/klimt/drawing/g2d/ExtendedGeneralPath.java @@ -35,25 +35,6 @@ */ package net.sourceforge.plantuml.klimt.drawing.g2d; -/* - - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - */ - import java.awt.Rectangle; import java.awt.Shape; import java.awt.geom.AffineTransform; diff --git a/src/net/sourceforge/plantuml/version/Version.java b/src/net/sourceforge/plantuml/version/Version.java index 9dc1f8365..c4fd81c82 100644 --- a/src/net/sourceforge/plantuml/version/Version.java +++ b/src/net/sourceforge/plantuml/version/Version.java @@ -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.2024.2beta1"; + private static final String version = "1.2024.2"; public static String versionString() { return version; @@ -80,7 +80,7 @@ public class Version { } public static long compileTime() { - return 1706811534365L; + return 1707932786357L; } public static String compileTimeString() { diff --git a/stdlib/awslib14-abx.repx b/stdlib/awslib14-abx.repx index df02cc1423402a1751fe50d096749fd1ecb3b20a..515704a8794373c1d26fd04abe18770d522a3ca9 100644 GIT binary patch literal 48765 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�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 diff --git a/stdlib/azure-abx.repx b/stdlib/azure-abx.repx index ec8a89f67de87d92582f0e08d4ff02a649ff90d0..d765e254e52fd0c5d8d59bc5825b1c6e730a800d 100644 GIT binary patch literal 10890 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 O3$;#Yg01(}TK^AkRfzBa diff --git a/stdlib/gcp-abx.repx b/stdlib/gcp-abx.repx index 259b440cb55b00b74a78eba81679e8f7275f51ae..df8f296e8fe0e32f57210c9fbd7aaca95d37a7b4 100644 GIT binary patch literal 7083 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 bpbBRL5S*w!wiCD|PKj-w`|;}~Bj7&(eGcNZ From ad4a1bde571a90492a6b75be79c689714e1dea61 Mon Sep 17 00:00:00 2001 From: Arnaud Roques Date: Thu, 15 Feb 2024 20:35:36 +0100 Subject: [PATCH 76/95] feat: adding undocumented support for gzip URL --- gradle.properties | 2 +- .../plantuml/code/CompressionGZip.java | 71 +++++++++++++++++++ .../plantuml/code/TranscoderSmart.java | 5 ++ .../code/TranscoderSmartProtected.java | 5 ++ .../sourceforge/plantuml/version/Version.java | 2 +- 5 files changed, 83 insertions(+), 2 deletions(-) create mode 100644 src/net/sourceforge/plantuml/code/CompressionGZip.java diff --git a/gradle.properties b/gradle.properties index 42657a6f1..0183477bd 100644 --- a/gradle.properties +++ b/gradle.properties @@ -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.2024.2 +version = 1.2024.3beta1 org.gradle.workers.max = 3 \ No newline at end of file diff --git a/src/net/sourceforge/plantuml/code/CompressionGZip.java b/src/net/sourceforge/plantuml/code/CompressionGZip.java new file mode 100644 index 000000000..0f87d56ef --- /dev/null +++ b/src/net/sourceforge/plantuml/code/CompressionGZip.java @@ -0,0 +1,71 @@ +/* ======================================================================== + * PlantUML : a free UML diagram generator + * ======================================================================== + * + * (C) Copyright 2009-2024, Arnaud Roques + * + * Project Info: https://plantuml.com + * + * If you like this project or if you find it useful, you can support us at: + * + * https://plantuml.com/patreon (only 1$ per month!) + * https://plantuml.com/paypal + * + * This file is part of PlantUML. + * + * PlantUML is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * PlantUML distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public + * License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. + * + * + * Original Author: Arnaud Roques + * + * + */ +package net.sourceforge.plantuml.code; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.util.zip.GZIPInputStream; + +public class CompressionGZip implements Compression { + // ::remove file when __CORE__ + + public byte[] compress(byte[] in) { + throw new UnsupportedOperationException(); + } + + public ByteArray decompress(byte[] input) throws NoPlantumlCompressionException { + try { + try (final GZIPInputStream gzip = new GZIPInputStream(new ByteArrayInputStream(input))) { + final byte[] buffer = new byte[10_000]; + + try (final ByteArrayOutputStream baos = new ByteArrayOutputStream()) { + int len; + while ((len = gzip.read(buffer)) > 0) { + baos.write(buffer, 0, len); + if (baos.size() > 200_000) + throw new NoPlantumlCompressionException("Gzip error"); + } + return ByteArray.from(baos.toByteArray()); + } + } + } catch (IOException e) { + throw new NoPlantumlCompressionException(e); + } + + } + +} diff --git a/src/net/sourceforge/plantuml/code/TranscoderSmart.java b/src/net/sourceforge/plantuml/code/TranscoderSmart.java index 072bbd27c..dbf5a2bb2 100644 --- a/src/net/sourceforge/plantuml/code/TranscoderSmart.java +++ b/src/net/sourceforge/plantuml/code/TranscoderSmart.java @@ -49,6 +49,8 @@ public class TranscoderSmart implements Transcoder { new CompressionHuffman()); private final Transcoder zip = TranscoderImpl.utf8(new AsciiEncoder(), new ArobaseStringCompressor(), new CompressionZip()); + private final Transcoder gzip = TranscoderImpl.utf8(new AsciiEncoder(), new ArobaseStringCompressor(), + new CompressionGZip()); // ::done public String decode(String code) throws NoPlantumlCompressionException { @@ -66,6 +68,9 @@ public class TranscoderSmart implements Transcoder { if (code.startsWith("~h")) return hexOnly.decode(code.substring(2)); + if (code.startsWith("~g")) + return gzip.decode(code.substring(2)); + // ::comment when __CORE__ if (code.startsWith("~zip~")) return zip.decode(code.substring(5)); diff --git a/src/net/sourceforge/plantuml/code/TranscoderSmartProtected.java b/src/net/sourceforge/plantuml/code/TranscoderSmartProtected.java index f0b2dc7ca..61aefd6df 100644 --- a/src/net/sourceforge/plantuml/code/TranscoderSmartProtected.java +++ b/src/net/sourceforge/plantuml/code/TranscoderSmartProtected.java @@ -49,6 +49,8 @@ public class TranscoderSmartProtected implements Transcoder { new CompressionNone()); private final Transcoder zip = TranscoderImpl.utf8(new AsciiEncoder(), new ArobaseStringCompressor(), new CompressionZip()); + private final Transcoder gzip = TranscoderImpl.utf8(new AsciiEncoder(), new ArobaseStringCompressor(), + new CompressionGZip()); public String decode(String code) throws NoPlantumlCompressionException { // Work in progress @@ -63,6 +65,9 @@ public class TranscoderSmartProtected implements Transcoder { if (code.startsWith("~h")) return hexOnly.decode(code.substring(2)); + if (code.startsWith("~g")) + return gzip.decode(code.substring(2)); + if (code.startsWith("~zip~")) return zip.decode(code.substring(5)); diff --git a/src/net/sourceforge/plantuml/version/Version.java b/src/net/sourceforge/plantuml/version/Version.java index c4fd81c82..9919c1db5 100644 --- a/src/net/sourceforge/plantuml/version/Version.java +++ b/src/net/sourceforge/plantuml/version/Version.java @@ -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.2024.2"; + private static final String version = "1.2024.3beta1"; public static String versionString() { return version; From c6f150fd4e68997b6a7dd578089e07be2396d3e6 Mon Sep 17 00:00:00 2001 From: Arnaud Roques Date: Thu, 15 Feb 2024 20:43:50 +0100 Subject: [PATCH 77/95] chore: version 1.2024.3 --- gradle.properties | 2 +- .../sourceforge/plantuml/version/Version.java | 4 ++-- stdlib/home.repx | 1 + stdlib/k8s-abx.repx | Bin 0 -> 3118 bytes stdlib/k8s-dex.repx | Bin 0 -> 8727 bytes 5 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 stdlib/k8s-abx.repx create mode 100644 stdlib/k8s-dex.repx diff --git a/gradle.properties b/gradle.properties index 0183477bd..5ab97f29b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -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.2024.3beta1 +version = 1.2024.3 org.gradle.workers.max = 3 \ No newline at end of file diff --git a/src/net/sourceforge/plantuml/version/Version.java b/src/net/sourceforge/plantuml/version/Version.java index 9919c1db5..165700d5f 100644 --- a/src/net/sourceforge/plantuml/version/Version.java +++ b/src/net/sourceforge/plantuml/version/Version.java @@ -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.2024.3beta1"; + private static final String version = "1.2024.3"; public static String versionString() { return version; @@ -80,7 +80,7 @@ public class Version { } public static long compileTime() { - return 1707932786357L; + return 1708026005000L; } public static String compileTimeString() { diff --git a/stdlib/home.repx b/stdlib/home.repx index 0c294ef9a..f2ba66b23 100644 --- a/stdlib/home.repx +++ b/stdlib/home.repx @@ -13,6 +13,7 @@ eip elastic gcp kubernetes +k8s logos material office diff --git a/stdlib/k8s-abx.repx b/stdlib/k8s-abx.repx new file mode 100644 index 0000000000000000000000000000000000000000..c8f870c8c7da084c464913be8d3c0281b5d56609 GIT binary patch literal 3118 zcmV+}4AJu&2XP{b2|EgDG2%26;4H8kt_Lw3m^9JWIGz&(D2~w5GY{LawVVgSE*%$0 z1Cnbh9H9aS$U;@h`m|jBJNI&8w8)9Hv z5+^{V_8pzCmi}m(mUN}Kzy!ds5Yl8zHVO<23p7lOi^c3j6!++?}^%`PjJoWZtSz5BN@ZbTGo<}jIk!R)mv6eveVEV8M<8pkj)9Jt4 z8L79W4n1BrXE{%DnF3I7r1bKxj-*U+C>YKh~#$H;-rK z&Om`8o1IIBG_vz`TjzEa&ZZuXrR1tzdN^mY!n;4%ahd`3DCQ*Wp<7OK5rYLGFDn0n z_B8kRgS|mOOrHQz(8r)p0@@r9cJ7Y^!4U8i)ZspKyuaVf33xKP<{HTc#MjpTPIGyH4yk(QmKBky0^{*;)_F~0;uun?e zTY<9-lLapaPSkR%I^vK{i3j{a<{+6bLdG3_*vCx$VD+o=tt2Z9CK}5Rjjs&GYp=_L zvGeQjSf(NYAb=AUJgt=`Nxhr2&9bKXU%&llYCn~SQ#kZfGVHq!wp@ugZ2;IYetMb5 z=-<`vIIj}o>CY?BpQ4Q)QLXzzpS&NDzK9@e^i=(t0h z*D$17GXW)a;F-6QL?0!^rjvP)`RPOnXU#bQBb!5DGAwPF)F1%f5iJEha{VO+dmrFV zAs5ARX1!%Dawi6A5~taB0&4f!ZoM@es@wfh7Yo+N4KF8{JqPh?)$4huF&$?nim>jQ zSLdN;s?R~Y)u*&0;#vC5&WiUKJsUz2q>A*pAfL>2#mU)$M4D6yOJxF87cA6N|GuFf zejRabd061d(MiP47^eud68nbKMexojOL@`FNG(sur`+$L>3RDX*w=V#=$U|gppANr zPMuZhtp+7gV!&%IW|LL{Z6JN2$bZG>Akd`SRIo`)5*(eNv+w6V*1L3(x`UAEgr6T* zY-(wpVeVv5hZ|}Z$|MEcn{$DToJ~f9m7K|$Vt8s`>)chE&c(4eW4GpAVk5sXS{c4Y z(>hUlfV8AZJB4Y3gWm))zxm=w-ccaPK%t{ls6^A<1){jZqP?o6T>nXR|liR#<($K`J{SxsBt=5w;66i1~M zi_nz~(J#YlA6H-kZZRt`vv`wH*adhLk`8E%A&vakVbRE-0^VXa;AZhnMuXl4*mp72 zXhEp^%A&6$rf_5CpkJh-H11Zl#=gmVt1aprp}u701;P=o%8@a$b;=&PlqJ!YUVR zF*D7LSY14p3y%3yp*>moPFET#P1US&PE%P3?CjpdF*%#_iTl`G6yN4uy34SuS>>B! z0Y9BhrY$&{=eH>uY4Y3=8IJd^%FH=E8hnzb5OP$J_FrylEbojr)J>#P}WLiJs0E8B^ji-1Zy0ji+O?mH&+% z>A!(=W2g5^b*is-;R2m<)0BIXaMM@j*ZIu;?yyOpyzy12R4!Of&J8Va6Zx1S|}B85zujP3s!zi#iRN*9b6ROuGT`SfQx{RgIloj zV=5liIk;qYwH8VRTm*C++=7)KL-DA7e&VA)1-l-q6?6~g4f&?(SVR(+r| zIiK0#&rB5Ta;SFDDbQ3_eV{WrpV=RVe85>6w-{;-WCpaHuGv85;%WVnVv}okt_D|E zDO6kyu1+SN)6Z%Lg4JJZp;W-7@FZ9xSotv)kLugh*6gooXmByqnuZ2a@u>bgt|`2` za6`DO6e{6L_?}Qar_(m}HyQ>mhT3Qtkcvn3PfC9D?WUb0S3|La4S}BXMIG2g&Ik72 zdQF+T%WTN(DuqgBCG(z4Jg1+H4kS<9VyHEcA<%L#vXx(g@w84^zP{WbA4Xo6vLLxL z@tnRpO%=PVXsGBag-S(3MJE)`>6G#M*no$@b%_mlNL-G;nd5)I4CHDkRmhT3Qtkcvn3W77w*>6+JKs5Ouo&~mzF1DT7b^&hE&?>xI&3#9@s0y++E!OD-J IcvR@$08fAii~s-t literal 0 HcmV?d00001 diff --git a/stdlib/k8s-dex.repx b/stdlib/k8s-dex.repx new file mode 100644 index 0000000000000000000000000000000000000000..1a528ba86a3132bae107b4446c0b1587e249d26e GIT binary patch literal 8727 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 literal 0 HcmV?d00001 From 4ce77d3fa84d09c50686cfbec463a13a24771267 Mon Sep 17 00:00:00 2001 From: The-Lum <86879521+The-Lum@users.noreply.github.com> Date: Fri, 16 Feb 2024 18:05:22 +0100 Subject: [PATCH 78/95] fix: suppress `@[start|end]uml` on `sunlust` theme That fix: - https://forum.plantuml.net/18683/sunlust-theme-question --- themes/puml-theme-sunlust.puml | 2 -- 1 file changed, 2 deletions(-) diff --git a/themes/puml-theme-sunlust.puml b/themes/puml-theme-sunlust.puml index 8ea47681d..9001ba947 100644 --- a/themes/puml-theme-sunlust.puml +++ b/themes/puml-theme-sunlust.puml @@ -1,4 +1,3 @@ -@startuml '' NAME = Sunlust '' DESCRIPTION = sunlust theme based off of the [solarized theme](https://ethanschoonover.com/solarized) '' AUTHOR = Artem V. Ageev @@ -132,4 +131,3 @@ skinparam { !endfor !endfor } -@enduml From 04f718781f94bd5c998007e82f338017be507417 Mon Sep 17 00:00:00 2001 From: Arnaud Roques Date: Fri, 16 Feb 2024 20:20:56 +0100 Subject: [PATCH 79/95] refactor: remove dead code --- gradle.properties | 2 +- src/net/sourceforge/plantuml/tim/TFunction.java | 3 --- src/net/sourceforge/plantuml/tim/TFunctionImpl.java | 13 +------------ .../plantuml/tim/stdlib/InvokeProcedure.java | 6 +----- .../plantuml/tim/stdlib/SimpleReturnFunction.java | 6 +----- src/net/sourceforge/plantuml/version/Version.java | 2 +- 6 files changed, 5 insertions(+), 27 deletions(-) diff --git a/gradle.properties b/gradle.properties index 5ab97f29b..6f86d3d81 100644 --- a/gradle.properties +++ b/gradle.properties @@ -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.2024.3 +version = 1.2024.4beta1 org.gradle.workers.max = 3 \ No newline at end of file diff --git a/src/net/sourceforge/plantuml/tim/TFunction.java b/src/net/sourceforge/plantuml/tim/TFunction.java index 028996913..b608b4006 100644 --- a/src/net/sourceforge/plantuml/tim/TFunction.java +++ b/src/net/sourceforge/plantuml/tim/TFunction.java @@ -49,9 +49,6 @@ public interface TFunction { public TFunctionType getFunctionType(); - public void executeProcedure(TContext context, TMemory memory, LineLocation location, String s) - throws EaterException, EaterExceptionLocated; - public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List args, Map named) throws EaterException, EaterExceptionLocated; diff --git a/src/net/sourceforge/plantuml/tim/TFunctionImpl.java b/src/net/sourceforge/plantuml/tim/TFunctionImpl.java index dbdf7eb1a..111942152 100644 --- a/src/net/sourceforge/plantuml/tim/TFunctionImpl.java +++ b/src/net/sourceforge/plantuml/tim/TFunctionImpl.java @@ -130,18 +130,7 @@ public class TFunctionImpl implements TFunction { } } - public void executeProcedure(TContext context, TMemory memory, LineLocation location, String s) - throws EaterException, EaterExceptionLocated { - final EaterFunctionCall call = new EaterFunctionCall(new StringLocated(s, location), - context.isLegacyDefine(signature.getFunctionName()), unquoted); - call.analyze(context, memory); - final String endOfLine = call.getEndOfLine(); - final List args = call.getValues(); - final Map named = call.getNamedArguments(); - executeProcedureInternal(context, memory, args, named); - context.appendEndOfLine(endOfLine); - } - + @Override public void executeProcedureInternal(TContext context, TMemory memory, List args, Map named) throws EaterException, EaterExceptionLocated { if (functionType != TFunctionType.PROCEDURE && functionType != TFunctionType.LEGACY_DEFINELONG) diff --git a/src/net/sourceforge/plantuml/tim/stdlib/InvokeProcedure.java b/src/net/sourceforge/plantuml/tim/stdlib/InvokeProcedure.java index c9079986a..3ea3695aa 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/InvokeProcedure.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/InvokeProcedure.java @@ -62,11 +62,7 @@ public class InvokeProcedure implements TFunction { return TFunctionType.PROCEDURE; } - public void executeProcedure(TContext context, TMemory memory, LineLocation location, String s) - throws EaterException, EaterExceptionLocated { - throw new UnsupportedOperationException(); - } - + @Override public void executeProcedureInternal(TContext context, TMemory memory, List args, Map named) throws EaterException, EaterExceptionLocated { final String fname = args.get(0).toString(); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/SimpleReturnFunction.java b/src/net/sourceforge/plantuml/tim/stdlib/SimpleReturnFunction.java index 146077597..f276bcbdd 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/SimpleReturnFunction.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/SimpleReturnFunction.java @@ -51,11 +51,7 @@ public abstract class SimpleReturnFunction implements TFunction { return TFunctionType.RETURN_FUNCTION; } - final public void executeProcedure(TContext context, TMemory memory, LineLocation location, String s) - throws EaterException { - throw new UnsupportedOperationException(); - } - + @Override final public void executeProcedureInternal(TContext context, TMemory memory, List args, Map named) throws EaterException { throw new UnsupportedOperationException(); diff --git a/src/net/sourceforge/plantuml/version/Version.java b/src/net/sourceforge/plantuml/version/Version.java index 165700d5f..50dd4b24e 100644 --- a/src/net/sourceforge/plantuml/version/Version.java +++ b/src/net/sourceforge/plantuml/version/Version.java @@ -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.2024.3"; + private static final String version = "1.2024.4beta1"; public static String versionString() { return version; From ee43dd0b9900510eccce72c73c13449ddc9665c7 Mon Sep 17 00:00:00 2001 From: Arnaud Roques Date: Fri, 16 Feb 2024 22:10:07 +0100 Subject: [PATCH 80/95] chore: fix some tests on Windows --- test/net/sourceforge/plantuml/help/CommandHelpThemeTest.java | 2 +- test/test/example/TestExample.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/net/sourceforge/plantuml/help/CommandHelpThemeTest.java b/test/net/sourceforge/plantuml/help/CommandHelpThemeTest.java index 180522880..caef807b6 100644 --- a/test/net/sourceforge/plantuml/help/CommandHelpThemeTest.java +++ b/test/net/sourceforge/plantuml/help/CommandHelpThemeTest.java @@ -17,7 +17,7 @@ class CommandHelpThemeTest { ).asString(); assertThat(output) - .startsWith(" \nHelp on themes") + .contains("Help on themes") .contains("bluegray", "hacker"); } } \ No newline at end of file diff --git a/test/test/example/TestExample.java b/test/test/example/TestExample.java index 1fc15a8d4..eeedbb088 100644 --- a/test/test/example/TestExample.java +++ b/test/test/example/TestExample.java @@ -17,7 +17,7 @@ class TestExample { ).asString(); assertThat(output) - .startsWith(" \nHelp on themes") + .contains("Help on themes") .contains("bluegray", "hacker"); } } \ No newline at end of file From 8fe9faec1b63da1400bb69ba7adf434e8df4ed82 Mon Sep 17 00:00:00 2001 From: The-Lum <86879521+The-Lum@users.noreply.github.com> Date: Fri, 16 Feb 2024 21:59:49 +0000 Subject: [PATCH 81/95] tests: add not working example about stdlib --- test/net/sourceforge/plantuml/tim/EaterTest.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/net/sourceforge/plantuml/tim/EaterTest.java b/test/net/sourceforge/plantuml/tim/EaterTest.java index 3dbdbe57f..fc370e459 100644 --- a/test/net/sourceforge/plantuml/tim/EaterTest.java +++ b/test/net/sourceforge/plantuml/tim/EaterTest.java @@ -31,7 +31,9 @@ class EaterTest { "'@startuml\n!$a={\"k\": \"exampleValue\"}\ntitle $a.k\na -> b\n@enduml\n' , exampleValue", "'@startuml\n!$a=[1, 2, 3]\ntitle xx $a[2] yy\na -> a\n' , xx 3 yy", "'@startuml\ntitle\n!foreach $i in [1, 2, 3]\nxx $i yy\n!endfor\nendtitle\na -> a\n' , xx 2 yy", - "'@startuml\ntitle\n!foreach $i in [\"a\", \"b\", \"c\"]\nxx $i yy\n!endfor\nendtitle\na -> a\n' , xx b yy", + "'@startuml\ntitle\n!foreach $i in [\"a\", \"b\", \"c\"]\nxx $i yy\n!endfor\nendtitle\na -> a\n' , xx b yy", +// TODO: fix code to allow test to access on stdlib, the corresponding (not working) test is here: +// "'@startuml\nstdlib\n@enduml', archimate", }) void Test_EaterTest(String input, String expected) throws Exception { assertRenderExpectedOutput(input, expected); From 415886e5d0ff19e51ee398ea11eedcec548e8425 Mon Sep 17 00:00:00 2001 From: The-Lum <86879521+The-Lum@users.noreply.github.com> Date: Sat, 17 Feb 2024 15:14:56 +0100 Subject: [PATCH 82/95] docs: add "PlantUML package and PlantUML on the GNU/Linux distribution" page To answer to: - #1572 Here is the links of plantuml version on: - the _[most popular]_ software package management systems - the _[most popular]_ GNU/Linux distributions --- docs/PACKAGE_AND_DISTRIBUTION.md | 97 ++++++++++++++++++++++++++++++++ 1 file changed, 97 insertions(+) create mode 100644 docs/PACKAGE_AND_DISTRIBUTION.md diff --git a/docs/PACKAGE_AND_DISTRIBUTION.md b/docs/PACKAGE_AND_DISTRIBUTION.md new file mode 100644 index 000000000..c1266219c --- /dev/null +++ b/docs/PACKAGE_AND_DISTRIBUTION.md @@ -0,0 +1,97 @@ +# PlantUML packages and PlantUML on the _[most popular]_ GNU/Linux distributions + +## PlantUML packages + +### GitHub _(The main PlantUML package repository)_ +[![GitHub Release](https://img.shields.io/github/v/release/plantuml/plantuml)](https://github.com/plantuml/plantuml/releases/latest) + +### Chocolatey +[![Chocolatey Version](https://img.shields.io/chocolatey/v/plantuml)](https://community.chocolatey.org/packages/plantuml) + +### Docker +[![Docker Image Version](https://img.shields.io/docker/v/plantuml/plantuml)](https://github.com/plantuml/plantuml/pkgs/container/plantuml) + +### Homebrew +[![homebrew version](https://img.shields.io/homebrew/v/plantuml)](https://formulae.brew.sh/formula/plantuml) + +### Maven +[![Maven Central Version](https://img.shields.io/maven-central/v/net.sourceforge.plantuml/plantuml)](https://mvnrepository.com/artifact/net.sourceforge.plantuml/plantuml) + +### Scoop +[![Scoop Version](https://img.shields.io/scoop/v/plantuml?bucket=extras)](https://scoop.sh/#/apps?q=plantuml) + + + +## PlantUML on the _[most popular]_ GNU/Linux distributions + +### [Alpine Linux](https://www.alpinelinux.org) +| Type | Link | +| ------- | ---- | +| Distribution | ![Alpine Linux](https://img.shields.io/badge/Alpine_Linux-%230D597F.svg?style=for-the-badge&logo=alpine-linux&logoColor=white) | +| Last PlantUML version | | +| Link | https://pkgs.alpinelinux.org/packages?name=plantuml&branch=edge | +| Specificity | | + +### [Archlinux](https://archlinux.org) +| Type | Link | +| ------- | ---- | +| Distribution | ![Arch](https://img.shields.io/badge/Arch%20Linux-1793D1?logo=arch-linux&logoColor=fff&style=for-the-badge) | +| Last PlantUML version | [![Arch Linux package](https://img.shields.io/archlinux/v/extra/any/plantuml)](https://archlinux.org/packages/extra/any/plantuml/) | +| Link | https://archlinux.org/packages/extra/any/plantuml/ | +| Specificity | | + +### [Debian](https://www.debian.org) +| Type | Link | +| ------- | ---- | +| Distribution | ![Debian](https://img.shields.io/badge/Debian-D70A53?style=for-the-badge&logo=debian&logoColor=white) | +| Last PlantUML version | [![Debian package](https://img.shields.io/debian/v/plantuml)](https://salsa.debian.org/debian/plantuml) | +| Link | https://salsa.debian.org/debian/plantuml | +| Specificity | https://salsa.debian.org/debian/plantuml/-/tree/master/debian | + +### [Fedora](https://fedoraproject.org) +| Type | Link | +| ------- | ---- | +| Distribution | ![Fedora](https://img.shields.io/badge/Fedora-294172?style=for-the-badge&logo=fedora&logoColor=white) | +| Last PlantUML version | [![Fedora package](https://img.shields.io/fedora/v/plantuml)](https://src.fedoraproject.org/rpms/plantuml) | +| Link | https://src.fedoraproject.org/rpms/plantuml | +| Specificity | | + +### [Gentoo](https://www.gentoo.org/) +| Type | Link | +| ------- | ---- | +| Distribution | ![Gentoo](https://img.shields.io/badge/Gentoo-54487A?style=for-the-badge&logo=gentoo&logoColor=white) | +| Last PlantUML version | | +| Link | https://packages.gentoo.org/packages/media-gfx/plantuml | +| Specificity | | + +### [openSUSE](https://www.opensuse.org) +| Type | Link | +| ------- | ---- | +| Distribution | ![openSUSE](https://img.shields.io/badge/openSUSE-%2364B345?style=for-the-badge&logo=openSUSE&logoColor=white) | +| Last PlantUML version | | +| Link | https://build.opensuse.org/search?search_text=plantuml | +| Specificity | https://build.opensuse.org/package/show/Java:packages/plantuml
https://build.opensuse.org/package/show/home:mnhauke/plantuml | + +### [SUSE](https://www.suse.com) +| Type | Link | +| ------- | ---- | +| Distribution | ![Suse](https://img.shields.io/badge/SUSE-0C322C?style=for-the-badge&logo=SUSE&logoColor=white) | +| Last PlantUML version | | +| Link | https://packagehub.suse.com/packages/plantuml/ | +| Specificity | | + +### [Ubuntu](https://ubuntu.com) +| Type | Link | +| ------- | ---- | +| Distribution | ![Ubuntu](https://img.shields.io/badge/Ubuntu-E95420?style=for-the-badge&logo=ubuntu&logoColor=white) | +| Last PlantUML version | [![Ubuntu Package Version](https://img.shields.io/ubuntu/v/plantuml)](https://packages.ubuntu.com/search?keywords=plantuml&searchon=names&suite=all§ion=all) | +| Link | https://packages.ubuntu.com/search?keywords=plantuml&searchon=names&suite=all§ion=all | +| Specificity | | + + +# Reference and acknowledgement +- https://en.wikipedia.org/wiki/List_of_software_package_management_systems +- https://en.wikipedia.org/wiki/List_of_Linux_distributions +- https://docs.github.com/en/communities/setting-up-your-project-for-healthy-contributions/creating-a-default-community-health-file +- https://shields.io + From 2a961129f236f0d571b2e47bcd77e101909d6fb6 Mon Sep 17 00:00:00 2001 From: Arnaud Roques Date: Tue, 20 Feb 2024 19:52:29 +0100 Subject: [PATCH 83/95] chore: improve error message when missing stdlib https://github.com/plantuml/plantuml/pull/1692#issuecomment-1952831187 --- src/net/sourceforge/plantuml/preproc/Stdlib.java | 3 +++ src/net/sourceforge/plantuml/tim/TFunctionImpl.java | 6 ++++-- src/net/sourceforge/plantuml/tim/stdlib/AlwaysFalse.java | 4 +++- src/net/sourceforge/plantuml/tim/stdlib/AlwaysTrue.java | 2 ++ .../sourceforge/plantuml/tim/stdlib/CallUserFunction.java | 2 ++ src/net/sourceforge/plantuml/tim/stdlib/Chr.java | 2 ++ src/net/sourceforge/plantuml/tim/stdlib/Darken.java | 2 ++ src/net/sourceforge/plantuml/tim/stdlib/DateFunction.java | 2 ++ src/net/sourceforge/plantuml/tim/stdlib/Dec2hex.java | 2 ++ src/net/sourceforge/plantuml/tim/stdlib/Dirpath.java | 2 ++ src/net/sourceforge/plantuml/tim/stdlib/Eval.java | 2 ++ src/net/sourceforge/plantuml/tim/stdlib/Feature.java | 2 ++ src/net/sourceforge/plantuml/tim/stdlib/FileExists.java | 2 ++ src/net/sourceforge/plantuml/tim/stdlib/Filename.java | 2 ++ src/net/sourceforge/plantuml/tim/stdlib/FunctionExists.java | 2 ++ src/net/sourceforge/plantuml/tim/stdlib/GetAllTheme.java | 2 ++ src/net/sourceforge/plantuml/tim/stdlib/GetJsonKey.java | 2 ++ src/net/sourceforge/plantuml/tim/stdlib/GetJsonType.java | 2 ++ .../sourceforge/plantuml/tim/stdlib/GetVariableValue.java | 2 ++ src/net/sourceforge/plantuml/tim/stdlib/GetVersion.java | 2 ++ src/net/sourceforge/plantuml/tim/stdlib/Getenv.java | 2 ++ src/net/sourceforge/plantuml/tim/stdlib/Hex2dec.java | 2 ++ src/net/sourceforge/plantuml/tim/stdlib/HslColor.java | 2 ++ src/net/sourceforge/plantuml/tim/stdlib/IntVal.java | 2 ++ .../sourceforge/plantuml/tim/stdlib/InvokeProcedure.java | 2 ++ src/net/sourceforge/plantuml/tim/stdlib/IsDark.java | 2 ++ src/net/sourceforge/plantuml/tim/stdlib/IsLight.java | 2 ++ src/net/sourceforge/plantuml/tim/stdlib/JsonKeyExists.java | 2 ++ src/net/sourceforge/plantuml/tim/stdlib/Lighten.java | 2 ++ src/net/sourceforge/plantuml/tim/stdlib/LoadJson.java | 2 ++ src/net/sourceforge/plantuml/tim/stdlib/LogicalAnd.java | 2 ++ src/net/sourceforge/plantuml/tim/stdlib/LogicalNand.java | 2 ++ src/net/sourceforge/plantuml/tim/stdlib/LogicalNor.java | 2 ++ src/net/sourceforge/plantuml/tim/stdlib/LogicalNot.java | 2 ++ src/net/sourceforge/plantuml/tim/stdlib/LogicalNxor.java | 2 ++ src/net/sourceforge/plantuml/tim/stdlib/LogicalOr.java | 2 ++ src/net/sourceforge/plantuml/tim/stdlib/LogicalXor.java | 2 ++ src/net/sourceforge/plantuml/tim/stdlib/Lower.java | 2 ++ src/net/sourceforge/plantuml/tim/stdlib/Newline.java | 2 ++ src/net/sourceforge/plantuml/tim/stdlib/Now.java | 2 ++ src/net/sourceforge/plantuml/tim/stdlib/Ord.java | 2 ++ src/net/sourceforge/plantuml/tim/stdlib/RandomFunction.java | 2 ++ .../sourceforge/plantuml/tim/stdlib/RetrieveProcedure.java | 2 ++ src/net/sourceforge/plantuml/tim/stdlib/ReverseColor.java | 2 ++ .../sourceforge/plantuml/tim/stdlib/ReverseHsluvColor.java | 2 ++ .../sourceforge/plantuml/tim/stdlib/SetVariableValue.java | 2 ++ src/net/sourceforge/plantuml/tim/stdlib/Size.java | 2 ++ src/net/sourceforge/plantuml/tim/stdlib/SplitStr.java | 2 ++ src/net/sourceforge/plantuml/tim/stdlib/StringFunction.java | 2 ++ src/net/sourceforge/plantuml/tim/stdlib/Strlen.java | 2 ++ src/net/sourceforge/plantuml/tim/stdlib/Strpos.java | 2 ++ src/net/sourceforge/plantuml/tim/stdlib/Substr.java | 2 ++ src/net/sourceforge/plantuml/tim/stdlib/Upper.java | 2 ++ src/net/sourceforge/plantuml/tim/stdlib/VariableExists.java | 2 ++ 54 files changed, 112 insertions(+), 3 deletions(-) diff --git a/src/net/sourceforge/plantuml/preproc/Stdlib.java b/src/net/sourceforge/plantuml/preproc/Stdlib.java index 43b00edea..2c4863e15 100644 --- a/src/net/sourceforge/plantuml/preproc/Stdlib.java +++ b/src/net/sourceforge/plantuml/preproc/Stdlib.java @@ -332,6 +332,9 @@ public class Stdlib { private static Collection getAll() throws IOException { final Set result = new TreeSet<>(); final InputStream home = getInternalInputStream("home", ".repx"); + if (home == null) + throw new IOException("Cannot access to /stdlib/*.repx files"); + final BufferedReader br = new BufferedReader(new InputStreamReader(home)); String name; while ((name = br.readLine()) != null) diff --git a/src/net/sourceforge/plantuml/tim/TFunctionImpl.java b/src/net/sourceforge/plantuml/tim/TFunctionImpl.java index 111942152..54183810b 100644 --- a/src/net/sourceforge/plantuml/tim/TFunctionImpl.java +++ b/src/net/sourceforge/plantuml/tim/TFunctionImpl.java @@ -69,6 +69,7 @@ public class TFunctionImpl implements TFunction { this.functionType = functionType; } + @Override public boolean canCover(int nbArg, Set namedArguments) { for (String n : namedArguments) if (signature.getNamedArguments().contains(n) == false) @@ -140,8 +141,9 @@ public class TFunctionImpl implements TFunction { context.executeLines(copy, body, TFunctionType.PROCEDURE, false); } - public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List args, - Map named) throws EaterException, EaterExceptionLocated { + @Override + public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, + List args, Map named) throws EaterException, EaterExceptionLocated { if (functionType == TFunctionType.LEGACY_DEFINE) return executeReturnLegacyDefine(location, context, memory, args); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/AlwaysFalse.java b/src/net/sourceforge/plantuml/tim/stdlib/AlwaysFalse.java index c06523e00..0c73b754a 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/AlwaysFalse.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/AlwaysFalse.java @@ -52,10 +52,12 @@ public class AlwaysFalse extends SimpleReturnFunction { return new TFunctionSignature("%false", 0); } + @Override public boolean canCover(int nbArg, Set namedArgument) { return nbArg == 0; } - + + @Override public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, Map named) throws EaterException, EaterExceptionLocated { return TValue.fromBoolean(false); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/AlwaysTrue.java b/src/net/sourceforge/plantuml/tim/stdlib/AlwaysTrue.java index 90ed2c7c1..66ec893af 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/AlwaysTrue.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/AlwaysTrue.java @@ -52,10 +52,12 @@ public class AlwaysTrue extends SimpleReturnFunction { return new TFunctionSignature("%true", 0); } + @Override public boolean canCover(int nbArg, Set namedArgument) { return nbArg == 0; } + @Override public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, Map named) throws EaterException, EaterExceptionLocated { return TValue.fromBoolean(true); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/CallUserFunction.java b/src/net/sourceforge/plantuml/tim/stdlib/CallUserFunction.java index 3282983ca..5d9107a92 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/CallUserFunction.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/CallUserFunction.java @@ -53,10 +53,12 @@ public class CallUserFunction extends SimpleReturnFunction { return new TFunctionSignature("%call_user_func", 1); } + @Override public boolean canCover(int nbArg, Set namedArgument) { return nbArg > 0; } + @Override public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, Map named) throws EaterException, EaterExceptionLocated { final String fname = values.get(0).toString(); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Chr.java b/src/net/sourceforge/plantuml/tim/stdlib/Chr.java index 7fdc13f2b..cdd7e139a 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Chr.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/Chr.java @@ -52,10 +52,12 @@ public class Chr extends SimpleReturnFunction { return new TFunctionSignature("%chr", 1); } + @Override public boolean canCover(int nbArg, Set namedArgument) { return nbArg == 1; } + @Override public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, Map named) throws EaterException, EaterExceptionLocated { try { diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Darken.java b/src/net/sourceforge/plantuml/tim/stdlib/Darken.java index bb5d05a7b..e053ac6c7 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Darken.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/Darken.java @@ -56,10 +56,12 @@ public class Darken extends SimpleReturnFunction { return new TFunctionSignature("%darken", 2); } + @Override public boolean canCover(int nbArg, Set namedArgument) { return nbArg == 2; } + @Override public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, Map named) throws EaterException, EaterExceptionLocated { final String colorString = values.get(0).toString(); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/DateFunction.java b/src/net/sourceforge/plantuml/tim/stdlib/DateFunction.java index 0140a6385..1c18155d9 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/DateFunction.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/DateFunction.java @@ -54,10 +54,12 @@ public class DateFunction extends SimpleReturnFunction { return new TFunctionSignature("%date", 2); } + @Override public boolean canCover(int nbArg, Set namedArgument) { return nbArg == 0 || nbArg == 1 || nbArg == 2; } + @Override public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, Map named) throws EaterException, EaterExceptionLocated { if (values.size() == 0) diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Dec2hex.java b/src/net/sourceforge/plantuml/tim/stdlib/Dec2hex.java index 1c3172996..3dc6f7b63 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Dec2hex.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/Dec2hex.java @@ -52,10 +52,12 @@ public class Dec2hex extends SimpleReturnFunction { return new TFunctionSignature("%dec2hex", 1); } + @Override public boolean canCover(int nbArg, Set namedArgument) { return nbArg == 1; } + @Override public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, Map named) throws EaterException, EaterExceptionLocated { try { diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Dirpath.java b/src/net/sourceforge/plantuml/tim/stdlib/Dirpath.java index 54fabb43d..1c918c4e8 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Dirpath.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/Dirpath.java @@ -59,10 +59,12 @@ public class Dirpath extends SimpleReturnFunction { return new TFunctionSignature("%dirpath", 0); } + @Override public boolean canCover(int nbArg, Set namedArgument) { return nbArg == 0; } + @Override public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, Map named) throws EaterException, EaterExceptionLocated { if (value == null) { diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Eval.java b/src/net/sourceforge/plantuml/tim/stdlib/Eval.java index 7175e2ffc..ee7ad6e46 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Eval.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/Eval.java @@ -53,10 +53,12 @@ public class Eval extends SimpleReturnFunction { return new TFunctionSignature("%eval", 1); } + @Override public boolean canCover(int nbArg, Set namedArgument) { return nbArg == 1; } + @Override public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, Map named) throws EaterException, EaterExceptionLocated { final String exp = values.get(0).toString(); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Feature.java b/src/net/sourceforge/plantuml/tim/stdlib/Feature.java index 088958f9e..f79b4ed4d 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Feature.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/Feature.java @@ -52,10 +52,12 @@ public class Feature extends SimpleReturnFunction { return new TFunctionSignature("%feature", 1); } + @Override public boolean canCover(int nbArg, Set namedArgument) { return nbArg == 1; } + @Override public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, Map named) throws EaterException, EaterExceptionLocated { final String arg = values.get(0).toString(); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/FileExists.java b/src/net/sourceforge/plantuml/tim/stdlib/FileExists.java index 47355c4dd..d7b68e423 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/FileExists.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/FileExists.java @@ -53,10 +53,12 @@ public class FileExists extends SimpleReturnFunction { return new TFunctionSignature("%file_exists", 1); } + @Override public boolean canCover(int nbArg, Set namedArgument) { return nbArg == 1; } + @Override public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, Map named) throws EaterException, EaterExceptionLocated { // ::comment when __CORE__ diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Filename.java b/src/net/sourceforge/plantuml/tim/stdlib/Filename.java index 02e0f2d56..49fd6b6c8 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Filename.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/Filename.java @@ -59,10 +59,12 @@ public class Filename extends SimpleReturnFunction { return new TFunctionSignature("%filename", 0); } + @Override public boolean canCover(int nbArg, Set namedArgument) { return nbArg == 0; } + @Override public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, Map named) throws EaterException, EaterExceptionLocated { if (value == null) { diff --git a/src/net/sourceforge/plantuml/tim/stdlib/FunctionExists.java b/src/net/sourceforge/plantuml/tim/stdlib/FunctionExists.java index c7ccef030..43442f82e 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/FunctionExists.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/FunctionExists.java @@ -53,10 +53,12 @@ public class FunctionExists extends SimpleReturnFunction { return new TFunctionSignature("%function_exists", 1); } + @Override public boolean canCover(int nbArg, Set namedArgument) { return nbArg == 1; } + @Override public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, Map named) throws EaterException, EaterExceptionLocated { final String name = values.get(0).toString(); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/GetAllTheme.java b/src/net/sourceforge/plantuml/tim/stdlib/GetAllTheme.java index 3446e6de8..e0b2d0281 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/GetAllTheme.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/GetAllTheme.java @@ -56,10 +56,12 @@ public class GetAllTheme extends SimpleReturnFunction { return new TFunctionSignature("%get_all_theme", 0); } + @Override public boolean canCover(int nbArg, Set namedArgument) { return nbArg == 0; } + @Override public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, Map named) throws EaterException, EaterExceptionLocated { final JsonArray result = new JsonArray(); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/GetJsonKey.java b/src/net/sourceforge/plantuml/tim/stdlib/GetJsonKey.java index 4df4bf5b5..244824ee3 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/GetJsonKey.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/GetJsonKey.java @@ -55,10 +55,12 @@ public class GetJsonKey extends SimpleReturnFunction { return new TFunctionSignature("%get_json_keys", 1); } + @Override public boolean canCover(int nbArg, Set namedArgument) { return nbArg == 1; } + @Override public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, Map named) throws EaterException, EaterExceptionLocated { final TValue data = values.get(0); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/GetJsonType.java b/src/net/sourceforge/plantuml/tim/stdlib/GetJsonType.java index e44b7ce55..33d3b5b64 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/GetJsonType.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/GetJsonType.java @@ -53,10 +53,12 @@ public class GetJsonType extends SimpleReturnFunction { return new TFunctionSignature("%get_json_type", 1); } + @Override public boolean canCover(int nbArg, Set namedArgument) { return nbArg == 1; } + @Override public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, Map named) throws EaterException, EaterExceptionLocated { final TValue data = values.get(0); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/GetVariableValue.java b/src/net/sourceforge/plantuml/tim/stdlib/GetVariableValue.java index ac9261793..082921acb 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/GetVariableValue.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/GetVariableValue.java @@ -52,10 +52,12 @@ public class GetVariableValue extends SimpleReturnFunction { return new TFunctionSignature("%get_variable_value", 1); } + @Override public boolean canCover(int nbArg, Set namedArgument) { return nbArg == 1; } + @Override public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, Map named) throws EaterException, EaterExceptionLocated { final String name = values.get(0).toString(); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/GetVersion.java b/src/net/sourceforge/plantuml/tim/stdlib/GetVersion.java index 960fd1fb2..c206538cb 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/GetVersion.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/GetVersion.java @@ -53,10 +53,12 @@ public class GetVersion extends SimpleReturnFunction { return new TFunctionSignature("%version", 0); } + @Override public boolean canCover(int nbArg, Set namedArgument) { return nbArg == 0; } + @Override public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, Map named) throws EaterException, EaterExceptionLocated { return TValue.fromString(Version.versionString()); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Getenv.java b/src/net/sourceforge/plantuml/tim/stdlib/Getenv.java index 6e947d050..88fd8a638 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Getenv.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/Getenv.java @@ -53,10 +53,12 @@ public class Getenv extends SimpleReturnFunction { return new TFunctionSignature("%getenv", 1); } + @Override public boolean canCover(int nbArg, Set namedArgument) { return nbArg == 1; } + @Override public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, Map named) throws EaterException, EaterExceptionLocated { // ::comment when __CORE__ diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Hex2dec.java b/src/net/sourceforge/plantuml/tim/stdlib/Hex2dec.java index 622023df2..27f510248 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Hex2dec.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/Hex2dec.java @@ -52,10 +52,12 @@ public class Hex2dec extends SimpleReturnFunction { return new TFunctionSignature("%hex2dec", 1); } + @Override public boolean canCover(int nbArg, Set namedArgument) { return nbArg == 1; } + @Override public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, Map named) throws EaterException, EaterExceptionLocated { try { diff --git a/src/net/sourceforge/plantuml/tim/stdlib/HslColor.java b/src/net/sourceforge/plantuml/tim/stdlib/HslColor.java index fae231c88..cc1173882 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/HslColor.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/HslColor.java @@ -55,10 +55,12 @@ public class HslColor extends SimpleReturnFunction { return new TFunctionSignature("%hsl_color", 3); } + @Override public boolean canCover(int nbArg, Set namedArgument) { return nbArg == 3 || nbArg == 4; } + @Override public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, Map named) throws EaterException, EaterExceptionLocated { final int h = values.get(0).toInt(); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/IntVal.java b/src/net/sourceforge/plantuml/tim/stdlib/IntVal.java index b9540e5dd..27e19db7a 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/IntVal.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/IntVal.java @@ -53,10 +53,12 @@ public class IntVal extends SimpleReturnFunction { return new TFunctionSignature("%intval", 1); } + @Override public boolean canCover(int nbArg, Set namedArgument) { return nbArg == 1; } + @Override public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, Map named) throws EaterException, EaterExceptionLocated { final String s = values.get(0).toString(); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/InvokeProcedure.java b/src/net/sourceforge/plantuml/tim/stdlib/InvokeProcedure.java index 3ea3695aa..5331f7b2e 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/InvokeProcedure.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/InvokeProcedure.java @@ -54,6 +54,7 @@ public class InvokeProcedure implements TFunction { return new TFunctionSignature("%invoke_procedure", 1); } + @Override public boolean canCover(int nbArg, Set namedArgument) { return nbArg > 0; } @@ -75,6 +76,7 @@ public class InvokeProcedure implements TFunction { func.executeProcedureInternal(context, memory, sublist, named); } + @Override public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, Map named) { throw new UnsupportedOperationException(); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/IsDark.java b/src/net/sourceforge/plantuml/tim/stdlib/IsDark.java index 23a4ccc67..efc4299da 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/IsDark.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/IsDark.java @@ -56,10 +56,12 @@ public class IsDark extends SimpleReturnFunction { return new TFunctionSignature("%is_dark", 1); } + @Override public boolean canCover(int nbArg, Set namedArgument) { return nbArg == 1; } + @Override public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, Map named) throws EaterException, EaterExceptionLocated { final String colorString = values.get(0).toString(); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/IsLight.java b/src/net/sourceforge/plantuml/tim/stdlib/IsLight.java index b75e781ef..deff7b24d 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/IsLight.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/IsLight.java @@ -56,10 +56,12 @@ public class IsLight extends SimpleReturnFunction { return new TFunctionSignature("%is_light", 1); } + @Override public boolean canCover(int nbArg, Set namedArgument) { return nbArg == 1; } + @Override public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, Map named) throws EaterException, EaterExceptionLocated { final String colorString = values.get(0).toString(); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/JsonKeyExists.java b/src/net/sourceforge/plantuml/tim/stdlib/JsonKeyExists.java index 64be7d60f..85eafc540 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/JsonKeyExists.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/JsonKeyExists.java @@ -54,10 +54,12 @@ public class JsonKeyExists extends SimpleReturnFunction { return new TFunctionSignature("%json_key_exists", 1); } + @Override public boolean canCover(int nbArg, Set namedArgument) { return nbArg == 2; } + @Override public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, Map named) throws EaterException, EaterExceptionLocated { final TValue arg0 = values.get(0); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Lighten.java b/src/net/sourceforge/plantuml/tim/stdlib/Lighten.java index 8519054c3..e4de200fe 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Lighten.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/Lighten.java @@ -56,10 +56,12 @@ public class Lighten extends SimpleReturnFunction { return new TFunctionSignature("%lighten", 2); } + @Override public boolean canCover(int nbArg, Set namedArgument) { return nbArg == 2; } + @Override public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, Map named) throws EaterException, EaterExceptionLocated { final String colorString = values.get(0).toString(); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/LoadJson.java b/src/net/sourceforge/plantuml/tim/stdlib/LoadJson.java index 19dffd462..a5021562c 100755 --- a/src/net/sourceforge/plantuml/tim/stdlib/LoadJson.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/LoadJson.java @@ -102,10 +102,12 @@ public class LoadJson extends SimpleReturnFunction { return new TFunctionSignature("%load_json", 3); } + @Override public boolean canCover(int nbArg, Set namedArgument) { return nbArg == 1 || nbArg == 2 || nbArg == 3; } + @Override public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, Map named) throws EaterException, EaterExceptionLocated { final String path = values.get(0).toString(); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/LogicalAnd.java b/src/net/sourceforge/plantuml/tim/stdlib/LogicalAnd.java index b674b4b46..4fe2d2a14 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/LogicalAnd.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/LogicalAnd.java @@ -52,10 +52,12 @@ public class LogicalAnd extends SimpleReturnFunction { return new TFunctionSignature("%and", 2); } + @Override public boolean canCover(int nbArg, Set namedArgument) { return nbArg >= 2; } + @Override public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, Map named) throws EaterException, EaterExceptionLocated { for (TValue v : values) diff --git a/src/net/sourceforge/plantuml/tim/stdlib/LogicalNand.java b/src/net/sourceforge/plantuml/tim/stdlib/LogicalNand.java index c4f5ea8e0..9b018d3c0 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/LogicalNand.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/LogicalNand.java @@ -52,10 +52,12 @@ public class LogicalNand extends SimpleReturnFunction { return new TFunctionSignature("%nand", 2); } + @Override public boolean canCover(int nbArg, Set namedArgument) { return nbArg >= 2; } + @Override public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, Map named) throws EaterException, EaterExceptionLocated { for (TValue v : values) diff --git a/src/net/sourceforge/plantuml/tim/stdlib/LogicalNor.java b/src/net/sourceforge/plantuml/tim/stdlib/LogicalNor.java index de7a99644..95c4e3c6d 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/LogicalNor.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/LogicalNor.java @@ -52,10 +52,12 @@ public class LogicalNor extends SimpleReturnFunction { return new TFunctionSignature("%nor", 2); } + @Override public boolean canCover(int nbArg, Set namedArgument) { return nbArg >= 2; } + @Override public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, Map named) throws EaterException, EaterExceptionLocated { for (TValue v : values) diff --git a/src/net/sourceforge/plantuml/tim/stdlib/LogicalNot.java b/src/net/sourceforge/plantuml/tim/stdlib/LogicalNot.java index b2385ee38..ca6d5ab3a 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/LogicalNot.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/LogicalNot.java @@ -52,10 +52,12 @@ public class LogicalNot extends SimpleReturnFunction { return new TFunctionSignature("%not", 1); } + @Override public boolean canCover(int nbArg, Set namedArgument) { return nbArg == 1; } + @Override public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, Map named) throws EaterException, EaterExceptionLocated { final boolean arg = values.get(0).toBoolean(); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/LogicalNxor.java b/src/net/sourceforge/plantuml/tim/stdlib/LogicalNxor.java index 61f8ab06a..e83c05b1e 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/LogicalNxor.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/LogicalNxor.java @@ -52,10 +52,12 @@ public class LogicalNxor extends SimpleReturnFunction { return new TFunctionSignature("%nxor", 2); } + @Override public boolean canCover(int nbArg, Set namedArgument) { return nbArg >= 2; } + @Override public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, Map named) throws EaterException, EaterExceptionLocated { int cpt = 0; diff --git a/src/net/sourceforge/plantuml/tim/stdlib/LogicalOr.java b/src/net/sourceforge/plantuml/tim/stdlib/LogicalOr.java index 3460a3683..41026ac89 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/LogicalOr.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/LogicalOr.java @@ -52,10 +52,12 @@ public class LogicalOr extends SimpleReturnFunction { return new TFunctionSignature("%or", 2); } + @Override public boolean canCover(int nbArg, Set namedArgument) { return nbArg >= 2; } + @Override public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, Map named) throws EaterException, EaterExceptionLocated { for (TValue v : values) diff --git a/src/net/sourceforge/plantuml/tim/stdlib/LogicalXor.java b/src/net/sourceforge/plantuml/tim/stdlib/LogicalXor.java index 1736b6cde..14ad07a5e 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/LogicalXor.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/LogicalXor.java @@ -52,10 +52,12 @@ public class LogicalXor extends SimpleReturnFunction { return new TFunctionSignature("%xor", 2); } + @Override public boolean canCover(int nbArg, Set namedArgument) { return nbArg >= 2; } + @Override public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, Map named) throws EaterException, EaterExceptionLocated { int cpt = 0; diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Lower.java b/src/net/sourceforge/plantuml/tim/stdlib/Lower.java index 463c272d8..d0dbcb731 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Lower.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/Lower.java @@ -50,10 +50,12 @@ public class Lower extends SimpleReturnFunction { return new TFunctionSignature("%lower", 1); } + @Override public boolean canCover(int nbArg, Set namedArgument) { return nbArg == 1; } + @Override public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, Map named) { return TValue.fromString(values.get(0).toString().toLowerCase()); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Newline.java b/src/net/sourceforge/plantuml/tim/stdlib/Newline.java index 8b3cc6659..2f5c7abb7 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Newline.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/Newline.java @@ -50,10 +50,12 @@ public class Newline extends SimpleReturnFunction { return new TFunctionSignature("%newline", 0); } + @Override public boolean canCover(int nbArg, Set namedArgument) { return nbArg == 0; } + @Override public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, Map named) { return TValue.fromString("\n"); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Now.java b/src/net/sourceforge/plantuml/tim/stdlib/Now.java index 866e90f0e..c90eb25d1 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Now.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/Now.java @@ -52,10 +52,12 @@ public class Now extends SimpleReturnFunction { return new TFunctionSignature("%now", 0); } + @Override public boolean canCover(int nbArg, Set namedArgument) { return nbArg == 0; } + @Override public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, Map named) throws EaterException, EaterExceptionLocated { final long now = System.currentTimeMillis() / 1000L; diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Ord.java b/src/net/sourceforge/plantuml/tim/stdlib/Ord.java index 6e5262189..bf0f7d767 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Ord.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/Ord.java @@ -52,10 +52,12 @@ public class Ord extends SimpleReturnFunction { return new TFunctionSignature("%ord", 1); } + @Override public boolean canCover(int nbArg, Set namedArgument) { return nbArg == 1; } + @Override public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, Map named) throws EaterException, EaterExceptionLocated { try { diff --git a/src/net/sourceforge/plantuml/tim/stdlib/RandomFunction.java b/src/net/sourceforge/plantuml/tim/stdlib/RandomFunction.java index d33a0af09..a165f00a4 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/RandomFunction.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/RandomFunction.java @@ -53,12 +53,14 @@ public class RandomFunction extends SimpleReturnFunction { return new TFunctionSignature("%random", 2); } + @Override public boolean canCover(int nbArg, Set namedArgument) { return nbArg == 0 || nbArg == 1 || nbArg == 2; } private final Random random = new Random(); + @Override public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, Map named) throws EaterException, EaterExceptionLocated { switch (values.size()) { diff --git a/src/net/sourceforge/plantuml/tim/stdlib/RetrieveProcedure.java b/src/net/sourceforge/plantuml/tim/stdlib/RetrieveProcedure.java index 94a98ec81..fa75ab946 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/RetrieveProcedure.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/RetrieveProcedure.java @@ -54,10 +54,12 @@ public class RetrieveProcedure extends SimpleReturnFunction { return new TFunctionSignature("%retrieve_procedure", 1); } + @Override public boolean canCover(int nbArg, Set namedArgument) { return nbArg > 0; } + @Override public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, Map named) throws EaterException, EaterExceptionLocated { final String fname = values.get(0).toString(); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/ReverseColor.java b/src/net/sourceforge/plantuml/tim/stdlib/ReverseColor.java index 3a5d5e718..6084e16d1 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/ReverseColor.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/ReverseColor.java @@ -55,10 +55,12 @@ public class ReverseColor extends SimpleReturnFunction { return new TFunctionSignature("%reverse_color", 1); } + @Override public boolean canCover(int nbArg, Set namedArgument) { return nbArg == 1; } + @Override public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, Map named) throws EaterException, EaterExceptionLocated { final String colorString = values.get(0).toString(); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/ReverseHsluvColor.java b/src/net/sourceforge/plantuml/tim/stdlib/ReverseHsluvColor.java index d9599aecc..6a42843f7 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/ReverseHsluvColor.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/ReverseHsluvColor.java @@ -55,10 +55,12 @@ public class ReverseHsluvColor extends SimpleReturnFunction { return new TFunctionSignature("%reverse_hsluv_color", 1); } + @Override public boolean canCover(int nbArg, Set namedArgument) { return nbArg == 1; } + @Override public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, Map named) throws EaterException, EaterExceptionLocated { final String colorString = values.get(0).toString(); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/SetVariableValue.java b/src/net/sourceforge/plantuml/tim/stdlib/SetVariableValue.java index 31897f608..a35ec7786 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/SetVariableValue.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/SetVariableValue.java @@ -53,10 +53,12 @@ public class SetVariableValue extends SimpleReturnFunction { return new TFunctionSignature("%set_variable_value", 2); } + @Override public boolean canCover(int nbArg, Set namedArgument) { return nbArg == 2; } + @Override public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, Map named) throws EaterException, EaterExceptionLocated { // if (memory instanceof TMemoryLocal) { diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Size.java b/src/net/sourceforge/plantuml/tim/stdlib/Size.java index ecc0891bf..0794bca42 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Size.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/Size.java @@ -55,10 +55,12 @@ public class Size extends SimpleReturnFunction { return new TFunctionSignature("%size", 1); } + @Override public boolean canCover(int nbArg, Set namedArgument) { return nbArg == 1; } + @Override public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, Map named) throws EaterException, EaterExceptionLocated { final TValue value = values.get(0); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/SplitStr.java b/src/net/sourceforge/plantuml/tim/stdlib/SplitStr.java index 2158332ee..d9aa2fded 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/SplitStr.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/SplitStr.java @@ -54,10 +54,12 @@ public class SplitStr extends SimpleReturnFunction { return new TFunctionSignature("%splitstr", 3); } + @Override public boolean canCover(int nbArg, Set namedArgument) { return nbArg == 2; } + @Override public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, Map named) throws EaterException, EaterExceptionLocated { final JsonArray result = new JsonArray(); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/StringFunction.java b/src/net/sourceforge/plantuml/tim/stdlib/StringFunction.java index ef87d8cb9..f2b972a80 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/StringFunction.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/StringFunction.java @@ -50,10 +50,12 @@ public class StringFunction extends SimpleReturnFunction { return new TFunctionSignature("%string", 1); } + @Override public boolean canCover(int nbArg, Set namedArgument) { return nbArg == 1; } + @Override public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, Map named) { return TValue.fromString(values.get(0).toString()); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Strlen.java b/src/net/sourceforge/plantuml/tim/stdlib/Strlen.java index 432c6a42d..3e1578fba 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Strlen.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/Strlen.java @@ -52,10 +52,12 @@ public class Strlen extends SimpleReturnFunction { return new TFunctionSignature("%strlen", 1); } + @Override public boolean canCover(int nbArg, Set namedArgument) { return nbArg == 1; } + @Override public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, Map named) throws EaterException, EaterExceptionLocated { return TValue.fromInt(values.get(0).toString().length()); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Strpos.java b/src/net/sourceforge/plantuml/tim/stdlib/Strpos.java index 7b7b58f1b..09a5c43a9 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Strpos.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/Strpos.java @@ -52,10 +52,12 @@ public class Strpos extends SimpleReturnFunction { return new TFunctionSignature("%strpos", 2); } + @Override public boolean canCover(int nbArg, Set namedArgument) { return nbArg == 2; } + @Override public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, Map named) throws EaterException, EaterExceptionLocated { final String full = values.get(0).toString(); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Substr.java b/src/net/sourceforge/plantuml/tim/stdlib/Substr.java index 2a94fcab6..ba0c0e8ce 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Substr.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/Substr.java @@ -52,10 +52,12 @@ public class Substr extends SimpleReturnFunction { return new TFunctionSignature("%substr", 3); } + @Override public boolean canCover(int nbArg, Set namedArgument) { return nbArg == 2 || nbArg == 3; } + @Override public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, Map named) throws EaterException, EaterExceptionLocated { final String full = values.get(0).toString(); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Upper.java b/src/net/sourceforge/plantuml/tim/stdlib/Upper.java index f3901fb8a..98caf89ff 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Upper.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/Upper.java @@ -50,10 +50,12 @@ public class Upper extends SimpleReturnFunction { return new TFunctionSignature("%upper", 1); } + @Override public boolean canCover(int nbArg, Set namedArgument) { return nbArg == 1; } + @Override public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, Map named) { return TValue.fromString(values.get(0).toString().toUpperCase()); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/VariableExists.java b/src/net/sourceforge/plantuml/tim/stdlib/VariableExists.java index f19110114..a63730447 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/VariableExists.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/VariableExists.java @@ -52,10 +52,12 @@ public class VariableExists extends SimpleReturnFunction { return new TFunctionSignature("%variable_exists", 1); } + @Override public boolean canCover(int nbArg, Set namedArgument) { return nbArg == 1; } + @Override public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, Map named) throws EaterException, EaterExceptionLocated { final String name = values.get(0).toString(); From be69889e7f4450de7458ea45ac206f97ab3c9c79 Mon Sep 17 00:00:00 2001 From: Arnaud Roques Date: Wed, 21 Feb 2024 22:23:31 +0100 Subject: [PATCH 84/95] tests: fix stdlib test https://github.com/plantuml/plantuml/pull/1692#issuecomment-1952831187 --- .gitignore | 2 +- src/net/sourceforge/plantuml/preproc/Stdlib.java | 12 +++++++++--- test/net/sourceforge/plantuml/tim/EaterTest.java | 3 +-- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 73ddb5bb8..da13ed288 100644 --- a/.gitignore +++ b/.gitignore @@ -8,7 +8,7 @@ out #vscode files -/bin +**/bin/ # Ant result file plantuml.jar diff --git a/src/net/sourceforge/plantuml/preproc/Stdlib.java b/src/net/sourceforge/plantuml/preproc/Stdlib.java index 2c4863e15..3072500d0 100644 --- a/src/net/sourceforge/plantuml/preproc/Stdlib.java +++ b/src/net/sourceforge/plantuml/preproc/Stdlib.java @@ -3,10 +3,13 @@ package net.sourceforge.plantuml.preproc; import static java.nio.charset.StandardCharsets.UTF_8; import java.awt.image.BufferedImage; +import java.io.BufferedInputStream; import java.io.BufferedReader; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.DataInputStream; +import java.io.FileInputStream; +import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; @@ -317,9 +320,12 @@ public class Stdlib { return new BrotliInputStream(raw); } - private static InputStream getInternalInputStream(String fullname, String extension) { - final String res = "/stdlib/" + fullname + extension; - return Stdlib.class.getResourceAsStream(res); + private static InputStream getInternalInputStream(String fullname, String extension) throws FileNotFoundException { + final String path = "stdlib/" + fullname + extension; + InputStream result = Stdlib.class.getResourceAsStream("/" + path); + if (result == null) + result = new BufferedInputStream(new FileInputStream(path)); + return result; } public static void extractStdLib() throws IOException { diff --git a/test/net/sourceforge/plantuml/tim/EaterTest.java b/test/net/sourceforge/plantuml/tim/EaterTest.java index fc370e459..1a458ceaa 100644 --- a/test/net/sourceforge/plantuml/tim/EaterTest.java +++ b/test/net/sourceforge/plantuml/tim/EaterTest.java @@ -32,8 +32,7 @@ class EaterTest { "'@startuml\n!$a=[1, 2, 3]\ntitle xx $a[2] yy\na -> a\n' , xx 3 yy", "'@startuml\ntitle\n!foreach $i in [1, 2, 3]\nxx $i yy\n!endfor\nendtitle\na -> a\n' , xx 2 yy", "'@startuml\ntitle\n!foreach $i in [\"a\", \"b\", \"c\"]\nxx $i yy\n!endfor\nendtitle\na -> a\n' , xx b yy", -// TODO: fix code to allow test to access on stdlib, the corresponding (not working) test is here: -// "'@startuml\nstdlib\n@enduml', archimate", + "'@startuml\nstdlib\n@enduml', archimate", }) void Test_EaterTest(String input, String expected) throws Exception { assertRenderExpectedOutput(input, expected); From fea505ab77b591ceb2c9f93413ea9d3c3e4bd855 Mon Sep 17 00:00:00 2001 From: The-Lum <86879521+The-Lum@users.noreply.github.com> Date: Thu, 22 Feb 2024 15:11:26 +0000 Subject: [PATCH 85/95] feat: add `%get_all_stdlib` builtin function --- .../sourceforge/plantuml/preproc/Stdlib.java | 6 +- .../sourceforge/plantuml/tim/TContext.java | 2 + .../plantuml/tim/stdlib/GetAllStdlib.java | 105 ++++++++++++++++++ .../plantuml/tim/stdlib/GetAllStdlibTest.java | 37 ++++++ 4 files changed, 147 insertions(+), 3 deletions(-) create mode 100644 src/net/sourceforge/plantuml/tim/stdlib/GetAllStdlib.java create mode 100644 test/net/sourceforge/plantuml/tim/stdlib/GetAllStdlibTest.java diff --git a/src/net/sourceforge/plantuml/preproc/Stdlib.java b/src/net/sourceforge/plantuml/preproc/Stdlib.java index 3072500d0..805b9f1c8 100644 --- a/src/net/sourceforge/plantuml/preproc/Stdlib.java +++ b/src/net/sourceforge/plantuml/preproc/Stdlib.java @@ -335,7 +335,7 @@ public class Stdlib { } } - private static Collection getAll() throws IOException { + public static Collection getAll() throws IOException { final Set result = new TreeSet<>(); final InputStream home = getInternalInputStream("home", ".repx"); if (home == null) @@ -451,11 +451,11 @@ public class Stdlib { } } - private String getVersion() { + public String getVersion() { return info.get("VERSION"); } - private String getSource() { + public String getSource() { return info.get("SOURCE"); } diff --git a/src/net/sourceforge/plantuml/tim/TContext.java b/src/net/sourceforge/plantuml/tim/TContext.java index 30f2f0b9f..f37dd7819 100644 --- a/src/net/sourceforge/plantuml/tim/TContext.java +++ b/src/net/sourceforge/plantuml/tim/TContext.java @@ -97,6 +97,7 @@ import net.sourceforge.plantuml.tim.stdlib.Feature; import net.sourceforge.plantuml.tim.stdlib.FileExists; import net.sourceforge.plantuml.tim.stdlib.Filename; import net.sourceforge.plantuml.tim.stdlib.FunctionExists; +import net.sourceforge.plantuml.tim.stdlib.GetAllStdlib; import net.sourceforge.plantuml.tim.stdlib.GetAllTheme; import net.sourceforge.plantuml.tim.stdlib.GetJsonKey; import net.sourceforge.plantuml.tim.stdlib.GetJsonType; @@ -212,6 +213,7 @@ public class TContext { functionsSet.addFunction(new Ord()); functionsSet.addFunction(new RandomFunction()); functionsSet.addFunction(new GetAllTheme()); + functionsSet.addFunction(new GetAllStdlib()); // %standard_exists_function // %str_replace // !exit diff --git a/src/net/sourceforge/plantuml/tim/stdlib/GetAllStdlib.java b/src/net/sourceforge/plantuml/tim/stdlib/GetAllStdlib.java new file mode 100644 index 000000000..6a84fd84e --- /dev/null +++ b/src/net/sourceforge/plantuml/tim/stdlib/GetAllStdlib.java @@ -0,0 +1,105 @@ +/* ======================================================================== + * PlantUML : a free UML diagram generator + * ======================================================================== + * + * (C) Copyright 2009-2024, Arnaud Roques + * + * Project Info: https://plantuml.com + * + * If you like this project or if you find it useful, you can support us at: + * + * https://plantuml.com/patreon (only 1$ per month!) + * https://plantuml.com/paypal + * + * This file is part of PlantUML. + * + * PlantUML is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * PlantUML distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public + * License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. + * + * + * Original Author: Arnaud Roques + * + */ +package net.sourceforge.plantuml.tim.stdlib; + +import java.io.IOException; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import net.sourceforge.plantuml.log.Logme; +import net.sourceforge.plantuml.json.Json; +import net.sourceforge.plantuml.json.JsonArray; +import net.sourceforge.plantuml.json.JsonObject; +import net.sourceforge.plantuml.preproc.Stdlib; +import net.sourceforge.plantuml.tim.EaterException; +import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.TContext; +import net.sourceforge.plantuml.tim.TFunctionSignature; +import net.sourceforge.plantuml.tim.TMemory; +import net.sourceforge.plantuml.tim.expression.TValue; +import net.sourceforge.plantuml.utils.LineLocation; + +public class GetAllStdlib extends SimpleReturnFunction { + + public TFunctionSignature getSignature() { + return new TFunctionSignature("%get_all_stdlib", 1); + } + + @Override + public boolean canCover(int nbArg, Set namedArgument) { + return nbArg == 0 || nbArg == 1; + } + + @Override + public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, + Map named) throws EaterException, EaterExceptionLocated { + + switch (values.size()) { + case 0: + final JsonArray result = new JsonArray(); + try { + for (String name : Stdlib.getAll()) { + result.add(name); + } + return TValue.fromJson(result); + } catch (IOException e) { + Logme.error(e); + return TValue.fromJson(result); + } + + case 1: + final JsonObject res = new JsonObject(); + try { + // Inspired by Stdlib.addInfoVersion + for (String name : Stdlib.getAll()) { + final Stdlib folder = Stdlib.retrieve(name); + final JsonObject object = Json.object() // + .add("name", name) // + .add("version", folder.getVersion()) // + .add("source", folder.getSource()); + res.add(name, object); + } + return TValue.fromJson(res); + } catch (IOException e) { + Logme.error(e); + return TValue.fromJson(res); + } + + default: + throw EaterException.located("Error on get_all_stdlib: Too many arguments"); + } + } +} diff --git a/test/net/sourceforge/plantuml/tim/stdlib/GetAllStdlibTest.java b/test/net/sourceforge/plantuml/tim/stdlib/GetAllStdlibTest.java new file mode 100644 index 000000000..f274f52e7 --- /dev/null +++ b/test/net/sourceforge/plantuml/tim/stdlib/GetAllStdlibTest.java @@ -0,0 +1,37 @@ +package net.sourceforge.plantuml.tim.stdlib; + +import static org.assertj.core.api.Assertions.assertThat; + +import java.util.Arrays; +import java.util.Collections; + +import org.junit.jupiter.api.DisplayNameGenerator.ReplaceUnderscores; +import org.junit.jupiter.api.IndicativeSentencesGeneration; +import org.junit.jupiter.api.Test; + +import net.sourceforge.plantuml.tim.EaterException; +import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.TFunction; +import net.sourceforge.plantuml.tim.expression.TValue; + +/** + * Tests the builtin function. + */ +@IndicativeSentencesGeneration(separator = ": ", generator = ReplaceUnderscores.class) + +class GetAllStdlibTest { + TFunction cut = new GetAllStdlib(); + final String cutName = "GetAllStdlib"; + + @Test + void Test_without_Param() throws EaterException, EaterExceptionLocated { + final TValue tValue = cut.executeReturnFunction(null, null, null, Collections.emptyList(), null); + assertThat(tValue.toString()).contains("archimate", "aws", "tupadr3"); + } + + @Test + void Test_with_one_argument() throws EaterException, EaterExceptionLocated { + final TValue tValue = cut.executeReturnFunction(null, null, null, Arrays.asList(TValue.fromInt(0)), null); + assertThat(tValue.toString()).contains("archimate", "https://github.com/plantuml-stdlib/Archimate-PlantUML"); + } +} From 436fb37f1a37b52190880c837fa30972f3734d6b Mon Sep 17 00:00:00 2001 From: Arnaud Roques Date: Thu, 22 Feb 2024 18:33:29 +0100 Subject: [PATCH 86/95] refactor: prepare preprocessor error improvement (in progress) https://github.com/plantuml/plantuml/pull/1668 --- gradle.properties | 2 +- .../plantuml/text/StringLocated.java | 4 ++ src/net/sourceforge/plantuml/tim/Eater.java | 60 +++++++++--------- .../plantuml/tim/EaterAffectation.java | 3 +- .../plantuml/tim/EaterAffectationDefine.java | 2 +- .../plantuml/tim/EaterFunctionCall.java | 13 ++-- .../sourceforge/plantuml/tim/EaterImport.java | 9 +-- .../plantuml/tim/EaterInclude.java | 3 +- .../plantuml/tim/EaterIncludeDef.java | 3 +- .../plantuml/tim/EaterIncludesub.java | 3 +- .../sourceforge/plantuml/tim/EaterLog.java | 3 +- .../sourceforge/plantuml/tim/EaterTheme.java | 4 +- .../plantuml/tim/ExecutionContextWhile.java | 3 +- .../sourceforge/plantuml/tim/StringEater.java | 4 +- .../sourceforge/plantuml/tim/TContext.java | 40 ++++++------ .../sourceforge/plantuml/tim/TFunction.java | 8 +-- .../plantuml/tim/TFunctionImpl.java | 12 ++-- .../plantuml/tim/VariableManager.java | 6 +- .../expression/ReversePolishInterpretor.java | 3 +- .../plantuml/tim/expression/TokenStack.java | 5 +- .../tim/iterator/CodeIteratorWhile.java | 12 ++-- .../plantuml/tim/package-info.java | 6 +- .../plantuml/tim/stdlib/AlwaysFalse.java | 6 +- .../plantuml/tim/stdlib/AlwaysTrue.java | 4 +- .../plantuml/tim/stdlib/CallUserFunction.java | 4 +- .../sourceforge/plantuml/tim/stdlib/Chr.java | 4 +- .../plantuml/tim/stdlib/Darken.java | 4 +- .../plantuml/tim/stdlib/DateFunction.java | 4 +- .../plantuml/tim/stdlib/Dec2hex.java | 4 +- .../plantuml/tim/stdlib/Dirpath.java | 8 +-- .../sourceforge/plantuml/tim/stdlib/Eval.java | 4 +- .../plantuml/tim/stdlib/Feature.java | 12 ++-- .../plantuml/tim/stdlib/FileExists.java | 4 +- .../plantuml/tim/stdlib/Filename.java | 4 +- .../plantuml/tim/stdlib/FunctionExists.java | 6 +- .../plantuml/tim/stdlib/GetAllStdlib.java | 62 +++++++++---------- .../plantuml/tim/stdlib/GetAllTheme.java | 6 +- .../plantuml/tim/stdlib/GetJsonKey.java | 4 +- .../plantuml/tim/stdlib/GetJsonType.java | 4 +- .../plantuml/tim/stdlib/GetVariableValue.java | 8 +-- .../plantuml/tim/stdlib/GetVersion.java | 4 +- .../plantuml/tim/stdlib/Getenv.java | 6 +- .../plantuml/tim/stdlib/Hex2dec.java | 4 +- .../plantuml/tim/stdlib/HslColor.java | 4 +- .../plantuml/tim/stdlib/IntVal.java | 4 +- .../plantuml/tim/stdlib/InvokeProcedure.java | 14 ++--- .../plantuml/tim/stdlib/IsDark.java | 4 +- .../plantuml/tim/stdlib/IsLight.java | 4 +- .../plantuml/tim/stdlib/JsonKeyExists.java | 4 +- .../plantuml/tim/stdlib/Lighten.java | 4 +- .../plantuml/tim/stdlib/LoadJson.java | 4 +- .../plantuml/tim/stdlib/LogicalAnd.java | 4 +- .../plantuml/tim/stdlib/LogicalNand.java | 4 +- .../plantuml/tim/stdlib/LogicalNor.java | 4 +- .../plantuml/tim/stdlib/LogicalNot.java | 4 +- .../plantuml/tim/stdlib/LogicalNxor.java | 4 +- .../plantuml/tim/stdlib/LogicalOr.java | 4 +- .../plantuml/tim/stdlib/LogicalXor.java | 4 +- .../plantuml/tim/stdlib/Lower.java | 4 +- .../plantuml/tim/stdlib/Newline.java | 4 +- .../sourceforge/plantuml/tim/stdlib/Now.java | 4 +- .../sourceforge/plantuml/tim/stdlib/Ord.java | 4 +- .../plantuml/tim/stdlib/RandomFunction.java | 28 ++++----- .../tim/stdlib/RetrieveProcedure.java | 6 +- .../plantuml/tim/stdlib/ReverseColor.java | 4 +- .../tim/stdlib/ReverseHsluvColor.java | 4 +- .../plantuml/tim/stdlib/SetVariableValue.java | 4 +- .../tim/stdlib/SimpleReturnFunction.java | 6 +- .../sourceforge/plantuml/tim/stdlib/Size.java | 4 +- .../plantuml/tim/stdlib/SplitStr.java | 4 +- .../plantuml/tim/stdlib/StringFunction.java | 4 +- .../plantuml/tim/stdlib/Strlen.java | 4 +- .../plantuml/tim/stdlib/Strpos.java | 4 +- .../plantuml/tim/stdlib/Substr.java | 4 +- .../plantuml/tim/stdlib/Upper.java | 4 +- .../plantuml/tim/stdlib/VariableExists.java | 4 +- .../sourceforge/plantuml/version/Version.java | 2 +- 77 files changed, 281 insertions(+), 265 deletions(-) diff --git a/gradle.properties b/gradle.properties index 6f86d3d81..4336095e9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -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.2024.4beta1 +version = 1.2024.4beta2 org.gradle.workers.max = 3 \ No newline at end of file diff --git a/src/net/sourceforge/plantuml/text/StringLocated.java b/src/net/sourceforge/plantuml/text/StringLocated.java index ed15e2f11..bc99b864a 100644 --- a/src/net/sourceforge/plantuml/text/StringLocated.java +++ b/src/net/sourceforge/plantuml/text/StringLocated.java @@ -158,4 +158,8 @@ final public class StringLocated { return s.length(); } + public char charAt(int i) { + return s.charAt(i); + } + } diff --git a/src/net/sourceforge/plantuml/tim/Eater.java b/src/net/sourceforge/plantuml/tim/Eater.java index c23fbf085..193a62c5f 100644 --- a/src/net/sourceforge/plantuml/tim/Eater.java +++ b/src/net/sourceforge/plantuml/tim/Eater.java @@ -50,20 +50,18 @@ import net.sourceforge.plantuml.utils.LineLocation; public abstract class Eater { private int i = 0; - private final String s; - private final LineLocation lineLocation; + private final StringLocated stringLocated; - public Eater(StringLocated sl) { - this(sl.getString(), sl.getLocation()); - } - - protected Eater(String s, LineLocation lineLocation) { - this.s = s; - this.lineLocation = lineLocation; + public Eater(StringLocated stringLocated) { + this.stringLocated = stringLocated; } public final LineLocation getLineLocation() { - return lineLocation; + return stringLocated.getLocation(); + } + + public final StringLocated getStringLocated() { + return stringLocated; } public abstract void analyze(TContext context, TMemory memory) throws EaterException, EaterExceptionLocated; @@ -73,8 +71,8 @@ public abstract class Eater { } final protected String eatAllToEnd() throws EaterException { - final String result = s.substring(i); - i = s.length(); + final String result = stringLocated.getString().substring(i); + i = stringLocated.length(); return result; } @@ -88,7 +86,7 @@ public abstract class Eater { return TValue.fromJson(json); } final TokenStack tokenStack = eatTokenStack(); - return tokenStack.getResult(getLineLocation(), context, memory); + return tokenStack.getResult(getStringLocated(), context, memory); } final protected TokenStack eatTokenStack() throws EaterException { @@ -104,7 +102,7 @@ public abstract class Eater { throws EaterException, EaterExceptionLocated { final TokenStack tokenStack = new TokenStack(); addIntoTokenStack(tokenStack, true); - return tokenStack.getResult(getLineLocation(), context, memory); + return tokenStack.getResult(getStringLocated(), context, memory); } final protected void addIntoTokenStack(TokenStack tokenStack, boolean stopAtColon) throws EaterException { @@ -208,56 +206,56 @@ public abstract class Eater { } final public void skipSpaces() { - while (i < s.length() && Character.isWhitespace(s.charAt(i))) + while (i < stringLocated.length() && Character.isWhitespace(stringLocated.charAt(i))) i++; } final protected void skipUntilChar(char ch) { - while (i < s.length() && s.charAt(i) != ch) + while (i < stringLocated.length() && stringLocated.charAt(i) != ch) i++; } final public char peekChar() { - if (i >= s.length()) + if (i >= stringLocated.length()) return 0; - return s.charAt(i); + return stringLocated.charAt(i); } final public boolean matchAffectation() { - final String tmp = s.substring(i); + final String tmp = stringLocated.getString().substring(i); final boolean result = tmp.matches("^\\$?[_\\p{L}][_\\p{L}0-9]*\\s*=.*"); return result; } final public char peekCharN2() { - if (i + 1 >= s.length()) + if (i + 1 >= stringLocated.length()) return 0; - return s.charAt(i + 1); + return stringLocated.charAt(i + 1); } final protected boolean hasNextChar() { - return i < s.length(); + return i < stringLocated.length(); } final public char eatOneChar() { - final char ch = s.charAt(i); + final char ch = stringLocated.charAt(i); i++; return ch; } final protected void checkAndEatChar(char ch) throws EaterException { - if (i >= s.length() || s.charAt(i) != ch) + if (i >= stringLocated.length() || stringLocated.charAt(i) != ch) throw EaterException.located("a001"); i++; } final protected boolean safeCheckAndEatChar(char ch) throws EaterException { - if (i >= s.length() || s.charAt(i) != ch) + if (i >= stringLocated.length() || stringLocated.charAt(i) != ch) return false; i++; @@ -265,10 +263,10 @@ public abstract class Eater { } final protected void optionallyEatChar(char ch) throws EaterException { - if (i >= s.length() || s.charAt(i) != ch) + if (i >= stringLocated.length() || stringLocated.charAt(i) != ch) return; - assert s.charAt(i) == ch; + assert stringLocated.charAt(i) == ch; i++; } @@ -279,8 +277,8 @@ public abstract class Eater { } final protected void addUpToLastLetterOrUnderscoreOrDigit(StringBuilder sb) { - while (i < s.length()) { - final char ch = s.charAt(i); + while (i < stringLocated.length()) { + final char ch = stringLocated.charAt(i); if (TLineType.isLetterOrUnderscoreOrDigit(ch) == false) return; @@ -290,7 +288,7 @@ public abstract class Eater { } final protected void addUpTo(char separator, StringBuilder sb) { - while (i < s.length()) { + while (i < stringLocated.length()) { final char ch = peekChar(); if (ch == separator) return; @@ -323,7 +321,7 @@ public abstract class Eater { eatOneChar(); final TokenStack def = TokenStack.eatUntilCloseParenthesisOrComma(this); def.guessFunctions(); - defValue = def.getResult(getLineLocation(), context, memory); + defValue = def.getResult(getStringLocated(), context, memory); // System.err.println("result=" + defValue); } else { defValue = null; diff --git a/src/net/sourceforge/plantuml/tim/EaterAffectation.java b/src/net/sourceforge/plantuml/tim/EaterAffectation.java index 1c7297580..99d25e20f 100644 --- a/src/net/sourceforge/plantuml/tim/EaterAffectation.java +++ b/src/net/sourceforge/plantuml/tim/EaterAffectation.java @@ -53,7 +53,8 @@ public class EaterAffectation extends Eater { if (scope != null) { skipSpaces(); if (peekChar() == '?' || peekChar() == '=') { - // The variable itself is "local" or "glocal", which is not a good idea by the way + // The variable itself is "local" or "glocal", which is not a good idea by the + // way scope = null; } else varname = eatAndGetVarname(); diff --git a/src/net/sourceforge/plantuml/tim/EaterAffectationDefine.java b/src/net/sourceforge/plantuml/tim/EaterAffectationDefine.java index d5a4fb950..c6cb3fbd2 100644 --- a/src/net/sourceforge/plantuml/tim/EaterAffectationDefine.java +++ b/src/net/sourceforge/plantuml/tim/EaterAffectationDefine.java @@ -51,7 +51,7 @@ public class EaterAffectationDefine extends Eater { final String varname = eatAndGetVarname(); skipSpaces(); final String tmp = eatAllToEnd(); - final String tmp2 = context.applyFunctionsAndVariables(memory, getLineLocation(), tmp); + final String tmp2 = context.applyFunctionsAndVariables(memory, new StringLocated(tmp, getLineLocation())); final TValue value = TValue.fromString(tmp2); // if (memory instanceof TMemoryLocal) { // memory = ((TMemoryLocal) memory).getGlobalForInternalUseOnly(); diff --git a/src/net/sourceforge/plantuml/tim/EaterFunctionCall.java b/src/net/sourceforge/plantuml/tim/EaterFunctionCall.java index 22c233868..1c116eab0 100644 --- a/src/net/sourceforge/plantuml/tim/EaterFunctionCall.java +++ b/src/net/sourceforge/plantuml/tim/EaterFunctionCall.java @@ -70,7 +70,8 @@ public class EaterFunctionCall extends Eater { skipSpaces(); if (isLegacyDefine) { final String read = eatAndGetOptionalQuotedString(); - final String value = context.applyFunctionsAndVariables(memory, getLineLocation(), read); + final String value = context.applyFunctionsAndVariables(memory, + new StringLocated(read, getLineLocation())); final TValue result = TValue.fromString(value); values.add(result); } else if (unquoted) { @@ -80,12 +81,14 @@ public class EaterFunctionCall extends Eater { checkAndEatChar('='); skipSpaces(); final String read = eatAndGetOptionalQuotedString(); - final String value = context.applyFunctionsAndVariables(memory, getLineLocation(), read); + final String value = context.applyFunctionsAndVariables(memory, + new StringLocated(read, getLineLocation())); final TValue result = TValue.fromString(value); namedArguments.put(varname, result); } else { final String read = eatAndGetOptionalQuotedString(); - final String value = context.applyFunctionsAndVariables(memory, getLineLocation(), read); + final String value = context.applyFunctionsAndVariables(memory, + new StringLocated(read, getLineLocation())); final TValue result = TValue.fromString(value); values.add(result); } @@ -98,12 +101,12 @@ public class EaterFunctionCall extends Eater { skipSpaces(); final TokenStack tokens = TokenStack.eatUntilCloseParenthesisOrComma(this).withoutSpace(); tokens.guessFunctions(); - final TValue result = tokens.getResult(getLineLocation(), context, memory); + final TValue result = tokens.getResult(getStringLocated(), context, memory); namedArguments.put(varname, result); } else { final TokenStack tokens = TokenStack.eatUntilCloseParenthesisOrComma(this).withoutSpace(); tokens.guessFunctions(); - final TValue result = tokens.getResult(getLineLocation(), context, memory); + final TValue result = tokens.getResult(getStringLocated(), context, memory); values.add(result); } } diff --git a/src/net/sourceforge/plantuml/tim/EaterImport.java b/src/net/sourceforge/plantuml/tim/EaterImport.java index b17727d17..6784a01f2 100644 --- a/src/net/sourceforge/plantuml/tim/EaterImport.java +++ b/src/net/sourceforge/plantuml/tim/EaterImport.java @@ -38,7 +38,7 @@ import net.sourceforge.plantuml.text.StringLocated; public class EaterImport extends Eater { - private String location; + private String what; public EaterImport(StringLocated s) { super(s); @@ -49,12 +49,13 @@ public class EaterImport extends Eater { skipSpaces(); checkAndEatChar("!import"); skipSpaces(); - this.location = context.applyFunctionsAndVariables(memory, getLineLocation(), this.eatAllToEnd()); + this.what = context.applyFunctionsAndVariables(memory, + new StringLocated(this.eatAllToEnd(), getLineLocation())); } - public final String getLocation() { - return location; + public final String getWhat() { + return what; } } diff --git a/src/net/sourceforge/plantuml/tim/EaterInclude.java b/src/net/sourceforge/plantuml/tim/EaterInclude.java index c41bd9f88..dd16097f9 100644 --- a/src/net/sourceforge/plantuml/tim/EaterInclude.java +++ b/src/net/sourceforge/plantuml/tim/EaterInclude.java @@ -65,7 +65,8 @@ public class EaterInclude extends Eater { } } skipSpaces(); - this.location = context.applyFunctionsAndVariables(memory, getLineLocation(), this.eatAllToEnd()); + this.location = context.applyFunctionsAndVariables(memory, + new StringLocated(this.eatAllToEnd(), getLineLocation())); // final TValue value = eatExpression(context, memory); // this.location = value.toString(); diff --git a/src/net/sourceforge/plantuml/tim/EaterIncludeDef.java b/src/net/sourceforge/plantuml/tim/EaterIncludeDef.java index 1cb813363..f0ffecce5 100644 --- a/src/net/sourceforge/plantuml/tim/EaterIncludeDef.java +++ b/src/net/sourceforge/plantuml/tim/EaterIncludeDef.java @@ -49,7 +49,8 @@ public class EaterIncludeDef extends Eater { skipSpaces(); checkAndEatChar("!includedef"); skipSpaces(); - this.location = context.applyFunctionsAndVariables(memory, getLineLocation(), this.eatAllToEnd()); + this.location = context.applyFunctionsAndVariables(memory, + new StringLocated(this.eatAllToEnd(), getLineLocation())); } diff --git a/src/net/sourceforge/plantuml/tim/EaterIncludesub.java b/src/net/sourceforge/plantuml/tim/EaterIncludesub.java index 355b11605..cfd9da7dc 100644 --- a/src/net/sourceforge/plantuml/tim/EaterIncludesub.java +++ b/src/net/sourceforge/plantuml/tim/EaterIncludesub.java @@ -49,7 +49,8 @@ public class EaterIncludesub extends Eater { skipSpaces(); checkAndEatChar("!includesub"); skipSpaces(); - this.location = context.applyFunctionsAndVariables(memory, getLineLocation(), this.eatAllToEnd()); + this.location = context.applyFunctionsAndVariables(memory, + new StringLocated(this.eatAllToEnd(), getLineLocation())); } diff --git a/src/net/sourceforge/plantuml/tim/EaterLog.java b/src/net/sourceforge/plantuml/tim/EaterLog.java index 4a0bc62df..805a64306 100644 --- a/src/net/sourceforge/plantuml/tim/EaterLog.java +++ b/src/net/sourceforge/plantuml/tim/EaterLog.java @@ -48,7 +48,8 @@ public class EaterLog extends Eater { skipSpaces(); checkAndEatChar("!log"); skipSpaces(); - final String logData = context.applyFunctionsAndVariables(memory, getLineLocation(), this.eatAllToEnd()); + final String logData = context.applyFunctionsAndVariables(memory, + new StringLocated(this.eatAllToEnd(), getLineLocation())); Log.error("[Log] " + logData); } diff --git a/src/net/sourceforge/plantuml/tim/EaterTheme.java b/src/net/sourceforge/plantuml/tim/EaterTheme.java index 35dfc4938..09e292785 100644 --- a/src/net/sourceforge/plantuml/tim/EaterTheme.java +++ b/src/net/sourceforge/plantuml/tim/EaterTheme.java @@ -76,12 +76,12 @@ public class EaterTheme extends Eater { final int x = this.name.toLowerCase().indexOf(" from "); if (x != -1) { final String fromTmp = this.name.substring(x + " from ".length()).trim(); - this.from = context.applyFunctionsAndVariables(memory, getLineLocation(), fromTmp); + this.from = context.applyFunctionsAndVariables(memory, new StringLocated(fromTmp, getLineLocation())); this.name = this.name.substring(0, x).trim(); this.context = context; } - this.realName = context.applyFunctionsAndVariables(memory, getLineLocation(), this.name); + this.realName = context.applyFunctionsAndVariables(memory, new StringLocated(this.name, getLineLocation())); } diff --git a/src/net/sourceforge/plantuml/tim/ExecutionContextWhile.java b/src/net/sourceforge/plantuml/tim/ExecutionContextWhile.java index 424a3d845..cc65cc222 100644 --- a/src/net/sourceforge/plantuml/tim/ExecutionContextWhile.java +++ b/src/net/sourceforge/plantuml/tim/ExecutionContextWhile.java @@ -34,6 +34,7 @@ */ package net.sourceforge.plantuml.tim; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.tim.expression.TValue; import net.sourceforge.plantuml.tim.expression.TokenStack; import net.sourceforge.plantuml.tim.iterator.CodePosition; @@ -59,7 +60,7 @@ public class ExecutionContextWhile { return new ExecutionContextWhile(whileExpression, codePosition); } - public TValue conditionValue(LineLocation location, TContext context, TMemory memory) + public TValue conditionValue(StringLocated location, TContext context, TMemory memory) throws EaterException, EaterExceptionLocated { return whileExpression.getResult(location, context, memory); } diff --git a/src/net/sourceforge/plantuml/tim/StringEater.java b/src/net/sourceforge/plantuml/tim/StringEater.java index 6e6a1489a..85ca881c9 100644 --- a/src/net/sourceforge/plantuml/tim/StringEater.java +++ b/src/net/sourceforge/plantuml/tim/StringEater.java @@ -34,10 +34,12 @@ */ package net.sourceforge.plantuml.tim; +import net.sourceforge.plantuml.text.StringLocated; + public class StringEater extends Eater { public StringEater(String s) { - super(s, null); + super(new StringLocated(s, null)); } @Override diff --git a/src/net/sourceforge/plantuml/tim/TContext.java b/src/net/sourceforge/plantuml/tim/TContext.java index f37dd7819..6a79011f4 100644 --- a/src/net/sourceforge/plantuml/tim/TContext.java +++ b/src/net/sourceforge/plantuml/tim/TContext.java @@ -252,7 +252,7 @@ public class TContext { private TValue fromJson(TMemory memory, String name, LineLocation location) throws EaterException, EaterExceptionLocated { - final String result = applyFunctionsAndVariables(memory, location, name); + final String result = applyFunctionsAndVariables(memory, new StringLocated(name, location)); try { final JsonValue json = Json.parse(result); return TValue.fromJson(json); @@ -428,7 +428,7 @@ public class TContext { if (memory.isEmpty() && functionsSet.size() == 0) return new StringLocated[] { located }; - final String result = applyFunctionsAndVariables(memory, located.getLocation(), located.getString()); + final String result = applyFunctionsAndVariables(memory, located); if (result == null) return null; @@ -442,7 +442,7 @@ public class TContext { private String pendingAdd = null; - public String applyFunctionsAndVariables(TMemory memory, LineLocation location, final String str) + public String applyFunctionsAndVariables(TMemory memory, final StringLocated str) throws EaterException, EaterExceptionLocated { // https://en.wikipedia.org/wiki/Boyer%E2%80%93Moore%E2%80%93Horspool_algorithm // https://stackoverflow.com/questions/1326682/java-replacing-multiple-different-substring-in-a-string-at-once-or-in-the-most @@ -450,15 +450,15 @@ public class TContext { // https://www.quora.com/What-is-the-most-efficient-algorithm-to-replace-all-occurrences-of-a-pattern-P-in-a-string-with-a-pattern-P // https://en.wikipedia.org/wiki/Trie if (memory.isEmpty() && functionsSet.size() == 0) - return str; + return str.getString(); final StringBuilder result = new StringBuilder(); for (int i = 0; i < str.length(); i++) { final char c = str.charAt(i); - final String presentFunction = getFunctionNameAt(str, i); + final String presentFunction = getFunctionNameAt(str.getString(), i); if (presentFunction != null) { - final String sub = str.substring(i); - final EaterFunctionCall call = new EaterFunctionCall(new StringLocated(sub, location), + final String sub = str.getString().substring(i); + final EaterFunctionCall call = new EaterFunctionCall(new StringLocated(sub, str.getLocation()), isLegacyDefine(presentFunction), isUnquoted(presentFunction)); call.analyze(this, memory); final TFunctionSignature signature = new TFunctionSignature(presentFunction, call.getValues().size(), @@ -469,27 +469,27 @@ public class TContext { if (function.getFunctionType() == TFunctionType.PROCEDURE) { this.pendingAdd = result.toString(); - executeVoid3(location, memory, sub, function, call); + executeVoid3(str, memory, function, call); i += call.getCurrentPosition(); - final String remaining = str.substring(i); + final String remaining = str.getString().substring(i); if (remaining.length() > 0) appendToLastResult(remaining); return null; } if (function.getFunctionType() == TFunctionType.LEGACY_DEFINELONG) { - this.pendingAdd = str.substring(0, i); - executeVoid3(location, memory, sub, function, call); + this.pendingAdd = str.getString().substring(0, i); + executeVoid3(str, memory, function, call); return null; } assert function.getFunctionType() == TFunctionType.RETURN_FUNCTION || function.getFunctionType() == TFunctionType.LEGACY_DEFINE; - final TValue functionReturn = function.executeReturnFunction(this, memory, location, call.getValues(), + final TValue functionReturn = function.executeReturnFunction(this, memory, str, call.getValues(), call.getNamedArguments()); result.append(functionReturn.toString()); i += call.getCurrentPosition() - 1; - } else if (new VariableManager(this, memory, location).getVarnameAt(str, i) != null) { - i = new VariableManager(this, memory, location).replaceVariables(str, i, result); + } else if (new VariableManager(this, memory, str.getLocation()).getVarnameAt(str.getString(), i) != null) { + i = new VariableManager(this, memory, str.getLocation()).replaceVariables(str.getString(), i, result); } else { result.append(c); } @@ -502,11 +502,9 @@ public class TContext { this.resultList.set(this.resultList.size() - 1, last.append(remaining)); } - private void executeVoid3(LineLocation location, TMemory memory, String s, TFunction function, - EaterFunctionCall call) throws EaterException, EaterExceptionLocated { - function.executeProcedureInternal(this, memory, call.getValues(), call.getNamedArguments()); - // function.executeProcedure(this, memory, location, s, call.getValues(), - // call.getNamedArguments()); + private void executeVoid3(StringLocated location, TMemory memory, TFunction function, EaterFunctionCall call) + throws EaterException, EaterExceptionLocated { + function.executeProcedureInternal(this, memory, location, call.getValues(), call.getNamedArguments()); } private void executeImport(TMemory memory, StringLocated s) throws EaterException, EaterExceptionLocated { @@ -514,8 +512,8 @@ public class TContext { _import.analyze(this, memory); try { - final SFile file = FileSystem.getInstance() - .getFile(applyFunctionsAndVariables(memory, s.getLocation(), _import.getLocation())); + final SFile file = FileSystem.getInstance().getFile( + applyFunctionsAndVariables(memory, new StringLocated(_import.getWhat(), s.getLocation()))); if (file.exists() && file.isDirectory() == false) { importedFiles.add(file); return; diff --git a/src/net/sourceforge/plantuml/tim/TFunction.java b/src/net/sourceforge/plantuml/tim/TFunction.java index b608b4006..d6572f378 100644 --- a/src/net/sourceforge/plantuml/tim/TFunction.java +++ b/src/net/sourceforge/plantuml/tim/TFunction.java @@ -38,8 +38,8 @@ import java.util.List; import java.util.Map; import java.util.Set; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.tim.expression.TValue; -import net.sourceforge.plantuml.utils.LineLocation; public interface TFunction { @@ -49,11 +49,11 @@ public interface TFunction { public TFunctionType getFunctionType(); - public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List args, + public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List args, Map named) throws EaterException, EaterExceptionLocated; - public void executeProcedureInternal(TContext context, TMemory memory, List args, Map named) - throws EaterException, EaterExceptionLocated; + public void executeProcedureInternal(TContext context, TMemory memory, StringLocated location, List args, + Map named) throws EaterException, EaterExceptionLocated; public boolean isUnquoted(); diff --git a/src/net/sourceforge/plantuml/tim/TFunctionImpl.java b/src/net/sourceforge/plantuml/tim/TFunctionImpl.java index 54183810b..4d1237feb 100644 --- a/src/net/sourceforge/plantuml/tim/TFunctionImpl.java +++ b/src/net/sourceforge/plantuml/tim/TFunctionImpl.java @@ -132,8 +132,8 @@ public class TFunctionImpl implements TFunction { } @Override - public void executeProcedureInternal(TContext context, TMemory memory, List args, Map named) - throws EaterException, EaterExceptionLocated { + public void executeProcedureInternal(TContext context, TMemory memory, StringLocated location, List args, + Map named) throws EaterException, EaterExceptionLocated { if (functionType != TFunctionType.PROCEDURE && functionType != TFunctionType.LEGACY_DEFINELONG) throw new IllegalStateException(); @@ -142,10 +142,10 @@ public class TFunctionImpl implements TFunction { } @Override - public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, - List args, Map named) throws EaterException, EaterExceptionLocated { + public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List args, + Map named) throws EaterException, EaterExceptionLocated { if (functionType == TFunctionType.LEGACY_DEFINE) - return executeReturnLegacyDefine(location, context, memory, args); + return executeReturnLegacyDefine(location.getLocation(), context, memory, args); if (functionType != TFunctionType.RETURN_FUNCTION) throw EaterException.unlocated("Illegal call here. Is there a return directive in your function?"); @@ -164,7 +164,7 @@ public class TFunctionImpl implements TFunction { throw new IllegalStateException(); final TMemory copy = getNewMemory(memory, args, Collections.emptyMap()); - final String tmp = context.applyFunctionsAndVariables(copy, location, legacyDefinition); + final String tmp = context.applyFunctionsAndVariables(copy, new StringLocated(legacyDefinition, location)); if (tmp == null) return TValue.fromString(""); diff --git a/src/net/sourceforge/plantuml/tim/VariableManager.java b/src/net/sourceforge/plantuml/tim/VariableManager.java index 8f3a7bd00..88332ac3d 100644 --- a/src/net/sourceforge/plantuml/tim/VariableManager.java +++ b/src/net/sourceforge/plantuml/tim/VariableManager.java @@ -37,6 +37,7 @@ package net.sourceforge.plantuml.tim; import net.sourceforge.plantuml.json.JsonArray; import net.sourceforge.plantuml.json.JsonObject; import net.sourceforge.plantuml.json.JsonValue; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.text.TLineType; import net.sourceforge.plantuml.tim.expression.TValue; import net.sourceforge.plantuml.utils.LineLocation; @@ -67,7 +68,7 @@ public class VariableManager { result.append(value.toJson().toString()); } else { JsonValue jsonValue = (value.toJson().isArray()) ? (JsonArray) value.toJson() - : (JsonObject) value.toJson(); + : (JsonObject) value.toJson(); i++; i = replaceJson(jsonValue, str, i, result) - 1; } @@ -111,7 +112,8 @@ public class VariableManager { inBracket.append(str.charAt(i)); i++; } - final String nbString = context.applyFunctionsAndVariables(memory, location, inBracket.toString()); + final String nbString = context.applyFunctionsAndVariables(memory, + new StringLocated(inBracket.toString(), location)); if (jsonValue instanceof JsonArray) { final int nb = Integer.parseInt(nbString); jsonValue = ((JsonArray) jsonValue).get(nb); diff --git a/src/net/sourceforge/plantuml/tim/expression/ReversePolishInterpretor.java b/src/net/sourceforge/plantuml/tim/expression/ReversePolishInterpretor.java index c5b4be109..4d19e7642 100644 --- a/src/net/sourceforge/plantuml/tim/expression/ReversePolishInterpretor.java +++ b/src/net/sourceforge/plantuml/tim/expression/ReversePolishInterpretor.java @@ -40,6 +40,7 @@ import java.util.Collections; import java.util.Deque; import java.util.List; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; @@ -58,7 +59,7 @@ public class ReversePolishInterpretor { this(null, queue, knowledge, memory, context); } - public ReversePolishInterpretor(LineLocation location, TokenStack queue, Knowledge knowledge, TMemory memory, + public ReversePolishInterpretor(StringLocated location, TokenStack queue, Knowledge knowledge, TMemory memory, TContext context) throws EaterException, EaterExceptionLocated { final Deque stack = new ArrayDeque<>(); diff --git a/src/net/sourceforge/plantuml/tim/expression/TokenStack.java b/src/net/sourceforge/plantuml/tim/expression/TokenStack.java index 3bd091e4b..61eeebae6 100644 --- a/src/net/sourceforge/plantuml/tim/expression/TokenStack.java +++ b/src/net/sourceforge/plantuml/tim/expression/TokenStack.java @@ -42,6 +42,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.tim.Eater; import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; @@ -210,9 +211,9 @@ public class TokenStack { return new InternalIterator(); } - public TValue getResult(LineLocation location, TContext context, TMemory memory) + public TValue getResult(StringLocated location, TContext context, TMemory memory) throws EaterException, EaterExceptionLocated { - final Knowledge knowledge = context.asKnowledge(memory, location); + final Knowledge knowledge = context.asKnowledge(memory, location.getLocation()); final TokenStack tmp = withoutSpace(); tmp.guessFunctions(); final TokenIterator it = tmp.tokenIterator(); diff --git a/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorWhile.java b/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorWhile.java index 037c33200..84f201e6a 100644 --- a/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorWhile.java +++ b/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorWhile.java @@ -90,10 +90,10 @@ public class CodeIteratorWhile extends AbstractCodeIterator { continue; } else if (result.getType() == TLineType.ENDWHILE) { logs.add(result); - if (currentWhile == null) { + if (currentWhile == null) throw EaterException.located("No while related to this endwhile"); - } - final TValue value = currentWhile.conditionValue(result.getLocation(), context, memory); + + final TValue value = currentWhile.conditionValue(result, context, memory); if (value.toBoolean()) { source.jumpToCodePosition(currentWhile.getStartWhile()); } else { @@ -113,10 +113,10 @@ public class CodeIteratorWhile extends AbstractCodeIterator { final TokenStack whileExpression = condition.getWhileExpression(); final ExecutionContextWhile theWhile = ExecutionContextWhile.fromValue(whileExpression, source.getCodePosition()); - final TValue value = theWhile.conditionValue(s.getLocation(), context, memory); - if (value.toBoolean() == false) { + final TValue value = theWhile.conditionValue(s, context, memory); + if (value.toBoolean() == false) theWhile.skipMe(); - } + memory.addWhile(theWhile); } diff --git a/src/net/sourceforge/plantuml/tim/package-info.java b/src/net/sourceforge/plantuml/tim/package-info.java index d185cc4bd..7aa0e198b 100644 --- a/src/net/sourceforge/plantuml/tim/package-info.java +++ b/src/net/sourceforge/plantuml/tim/package-info.java @@ -1,7 +1,7 @@ /** - * Provides classes used to manage - * - * Preprocessing of PlantUML input. + * Provides classes used to manage + * Preprocessing + * of PlantUML input. * * @see net.sourceforge.plantuml.text.TLineType * @see net.sourceforge.plantuml.preproc diff --git a/src/net/sourceforge/plantuml/tim/stdlib/AlwaysFalse.java b/src/net/sourceforge/plantuml/tim/stdlib/AlwaysFalse.java index 0c73b754a..6d13ce01e 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/AlwaysFalse.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/AlwaysFalse.java @@ -38,13 +38,13 @@ import java.util.List; import java.util.Map; import java.util.Set; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; import net.sourceforge.plantuml.tim.expression.TValue; -import net.sourceforge.plantuml.utils.LineLocation; public class AlwaysFalse extends SimpleReturnFunction { @@ -56,9 +56,9 @@ public class AlwaysFalse extends SimpleReturnFunction { public boolean canCover(int nbArg, Set namedArgument) { return nbArg == 0; } - + @Override - public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, + public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, Map named) throws EaterException, EaterExceptionLocated { return TValue.fromBoolean(false); } diff --git a/src/net/sourceforge/plantuml/tim/stdlib/AlwaysTrue.java b/src/net/sourceforge/plantuml/tim/stdlib/AlwaysTrue.java index 66ec893af..e9a1362b6 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/AlwaysTrue.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/AlwaysTrue.java @@ -38,13 +38,13 @@ import java.util.List; import java.util.Map; import java.util.Set; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; import net.sourceforge.plantuml.tim.expression.TValue; -import net.sourceforge.plantuml.utils.LineLocation; public class AlwaysTrue extends SimpleReturnFunction { @@ -58,7 +58,7 @@ public class AlwaysTrue extends SimpleReturnFunction { } @Override - public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, + public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, Map named) throws EaterException, EaterExceptionLocated { return TValue.fromBoolean(true); } diff --git a/src/net/sourceforge/plantuml/tim/stdlib/CallUserFunction.java b/src/net/sourceforge/plantuml/tim/stdlib/CallUserFunction.java index 5d9107a92..0bc47532a 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/CallUserFunction.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/CallUserFunction.java @@ -38,6 +38,7 @@ import java.util.List; import java.util.Map; import java.util.Set; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; @@ -45,7 +46,6 @@ import net.sourceforge.plantuml.tim.TFunction; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; import net.sourceforge.plantuml.tim.expression.TValue; -import net.sourceforge.plantuml.utils.LineLocation; public class CallUserFunction extends SimpleReturnFunction { @@ -59,7 +59,7 @@ public class CallUserFunction extends SimpleReturnFunction { } @Override - public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, + public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, Map named) throws EaterException, EaterExceptionLocated { final String fname = values.get(0).toString(); final List args = values.subList(1, values.size()); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Chr.java b/src/net/sourceforge/plantuml/tim/stdlib/Chr.java index cdd7e139a..aa7daa6cb 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Chr.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/Chr.java @@ -38,13 +38,13 @@ import java.util.List; import java.util.Map; import java.util.Set; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; import net.sourceforge.plantuml.tim.expression.TValue; -import net.sourceforge.plantuml.utils.LineLocation; public class Chr extends SimpleReturnFunction { @@ -58,7 +58,7 @@ public class Chr extends SimpleReturnFunction { } @Override - public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, + public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, Map named) throws EaterException, EaterExceptionLocated { try { final String value = String.valueOf(Character.toChars(values.get(0).toInt())); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Darken.java b/src/net/sourceforge/plantuml/tim/stdlib/Darken.java index e053ac6c7..4a282d150 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Darken.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/Darken.java @@ -41,13 +41,13 @@ import java.util.Set; import net.sourceforge.plantuml.klimt.color.HColor; import net.sourceforge.plantuml.klimt.color.HColorSet; import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; import net.sourceforge.plantuml.tim.expression.TValue; -import net.sourceforge.plantuml.utils.LineLocation; public class Darken extends SimpleReturnFunction { @@ -62,7 +62,7 @@ public class Darken extends SimpleReturnFunction { } @Override - public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, + public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, Map named) throws EaterException, EaterExceptionLocated { final String colorString = values.get(0).toString(); final int ratio = values.get(1).toInt(); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/DateFunction.java b/src/net/sourceforge/plantuml/tim/stdlib/DateFunction.java index 1c18155d9..e596ef4b7 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/DateFunction.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/DateFunction.java @@ -40,13 +40,13 @@ import java.util.List; import java.util.Map; import java.util.Set; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; import net.sourceforge.plantuml.tim.expression.TValue; -import net.sourceforge.plantuml.utils.LineLocation; public class DateFunction extends SimpleReturnFunction { @@ -60,7 +60,7 @@ public class DateFunction extends SimpleReturnFunction { } @Override - public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, + public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, Map named) throws EaterException, EaterExceptionLocated { if (values.size() == 0) return TValue.fromString(new Date().toString()); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Dec2hex.java b/src/net/sourceforge/plantuml/tim/stdlib/Dec2hex.java index 3dc6f7b63..668f618da 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Dec2hex.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/Dec2hex.java @@ -38,13 +38,13 @@ import java.util.List; import java.util.Map; import java.util.Set; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; import net.sourceforge.plantuml.tim.expression.TValue; -import net.sourceforge.plantuml.utils.LineLocation; public class Dec2hex extends SimpleReturnFunction { @@ -58,7 +58,7 @@ public class Dec2hex extends SimpleReturnFunction { } @Override - public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, + public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, Map named) throws EaterException, EaterExceptionLocated { try { return TValue.fromString("" + Integer.toHexString(values.get(0).toInt())); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Dirpath.java b/src/net/sourceforge/plantuml/tim/stdlib/Dirpath.java index 1c918c4e8..a3a0b4e9e 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Dirpath.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/Dirpath.java @@ -39,13 +39,13 @@ import java.util.Map; import java.util.Set; import net.sourceforge.plantuml.preproc.Defines; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; import net.sourceforge.plantuml.tim.expression.TValue; -import net.sourceforge.plantuml.utils.LineLocation; public class Dirpath extends SimpleReturnFunction { @@ -65,11 +65,11 @@ public class Dirpath extends SimpleReturnFunction { } @Override - public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, + public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, Map named) throws EaterException, EaterExceptionLocated { - if (value == null) { + if (value == null) return TValue.fromString(""); - } + return TValue.fromString(value); } } diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Eval.java b/src/net/sourceforge/plantuml/tim/stdlib/Eval.java index ee7ad6e46..d08e45363 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Eval.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/Eval.java @@ -38,6 +38,7 @@ import java.util.List; import java.util.Map; import java.util.Set; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.StringEater; @@ -45,7 +46,6 @@ import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; import net.sourceforge.plantuml.tim.expression.TValue; -import net.sourceforge.plantuml.utils.LineLocation; public class Eval extends SimpleReturnFunction { @@ -59,7 +59,7 @@ public class Eval extends SimpleReturnFunction { } @Override - public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, + public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, Map named) throws EaterException, EaterExceptionLocated { final String exp = values.get(0).toString(); final StringEater eater = new StringEater(exp); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Feature.java b/src/net/sourceforge/plantuml/tim/stdlib/Feature.java index f79b4ed4d..042bfee0b 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Feature.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/Feature.java @@ -38,13 +38,13 @@ import java.util.List; import java.util.Map; import java.util.Set; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; import net.sourceforge.plantuml.tim.expression.TValue; -import net.sourceforge.plantuml.utils.LineLocation; public class Feature extends SimpleReturnFunction { @@ -58,15 +58,15 @@ public class Feature extends SimpleReturnFunction { } @Override - public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, + public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, Map named) throws EaterException, EaterExceptionLocated { final String arg = values.get(0).toString(); - if ("style".equalsIgnoreCase(arg)) { + if ("style".equalsIgnoreCase(arg)) return TValue.fromInt(1); - } - if ("theme".equalsIgnoreCase(arg)) { + + if ("theme".equalsIgnoreCase(arg)) return TValue.fromInt(1); - } + return TValue.fromInt(0); } } diff --git a/src/net/sourceforge/plantuml/tim/stdlib/FileExists.java b/src/net/sourceforge/plantuml/tim/stdlib/FileExists.java index d7b68e423..f43b345a1 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/FileExists.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/FileExists.java @@ -39,13 +39,13 @@ import java.util.Map; import java.util.Set; import net.sourceforge.plantuml.security.SFile; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; import net.sourceforge.plantuml.tim.expression.TValue; -import net.sourceforge.plantuml.utils.LineLocation; public class FileExists extends SimpleReturnFunction { @@ -59,7 +59,7 @@ public class FileExists extends SimpleReturnFunction { } @Override - public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, + public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, Map named) throws EaterException, EaterExceptionLocated { // ::comment when __CORE__ final String path = values.get(0).toString(); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Filename.java b/src/net/sourceforge/plantuml/tim/stdlib/Filename.java index 49fd6b6c8..fd6089946 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Filename.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/Filename.java @@ -39,13 +39,13 @@ import java.util.Map; import java.util.Set; import net.sourceforge.plantuml.preproc.Defines; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; import net.sourceforge.plantuml.tim.expression.TValue; -import net.sourceforge.plantuml.utils.LineLocation; public class Filename extends SimpleReturnFunction { @@ -65,7 +65,7 @@ public class Filename extends SimpleReturnFunction { } @Override - public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, + public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, Map named) throws EaterException, EaterExceptionLocated { if (value == null) { return TValue.fromString(""); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/FunctionExists.java b/src/net/sourceforge/plantuml/tim/stdlib/FunctionExists.java index 43442f82e..f72dae133 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/FunctionExists.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/FunctionExists.java @@ -38,16 +38,16 @@ import java.util.List; import java.util.Map; import java.util.Set; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; import net.sourceforge.plantuml.tim.expression.TValue; -import net.sourceforge.plantuml.utils.LineLocation; public class FunctionExists extends SimpleReturnFunction { - // ::remove folder when __HAXE__ + // ::remove folder when __HAXE__ public TFunctionSignature getSignature() { return new TFunctionSignature("%function_exists", 1); @@ -59,7 +59,7 @@ public class FunctionExists extends SimpleReturnFunction { } @Override - public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, + public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, Map named) throws EaterException, EaterExceptionLocated { final String name = values.get(0).toString(); return TValue.fromBoolean(context.doesFunctionExist(name)); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/GetAllStdlib.java b/src/net/sourceforge/plantuml/tim/stdlib/GetAllStdlib.java index 6a84fd84e..4bac0865e 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/GetAllStdlib.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/GetAllStdlib.java @@ -39,18 +39,18 @@ import java.util.List; import java.util.Map; import java.util.Set; -import net.sourceforge.plantuml.log.Logme; import net.sourceforge.plantuml.json.Json; import net.sourceforge.plantuml.json.JsonArray; import net.sourceforge.plantuml.json.JsonObject; +import net.sourceforge.plantuml.log.Logme; import net.sourceforge.plantuml.preproc.Stdlib; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; import net.sourceforge.plantuml.tim.expression.TValue; -import net.sourceforge.plantuml.utils.LineLocation; public class GetAllStdlib extends SimpleReturnFunction { @@ -64,42 +64,42 @@ public class GetAllStdlib extends SimpleReturnFunction { } @Override - public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, + public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, Map named) throws EaterException, EaterExceptionLocated { switch (values.size()) { - case 0: - final JsonArray result = new JsonArray(); - try { - for (String name : Stdlib.getAll()) { - result.add(name); - } - return TValue.fromJson(result); - } catch (IOException e) { - Logme.error(e); - return TValue.fromJson(result); + case 0: + final JsonArray result = new JsonArray(); + try { + for (String name : Stdlib.getAll()) { + result.add(name); } + return TValue.fromJson(result); + } catch (IOException e) { + Logme.error(e); + return TValue.fromJson(result); + } - case 1: - final JsonObject res = new JsonObject(); - try { - // Inspired by Stdlib.addInfoVersion - for (String name : Stdlib.getAll()) { - final Stdlib folder = Stdlib.retrieve(name); - final JsonObject object = Json.object() // - .add("name", name) // - .add("version", folder.getVersion()) // - .add("source", folder.getSource()); - res.add(name, object); - } - return TValue.fromJson(res); - } catch (IOException e) { - Logme.error(e); - return TValue.fromJson(res); + case 1: + final JsonObject res = new JsonObject(); + try { + // Inspired by Stdlib.addInfoVersion + for (String name : Stdlib.getAll()) { + final Stdlib folder = Stdlib.retrieve(name); + final JsonObject object = Json.object() // + .add("name", name) // + .add("version", folder.getVersion()) // + .add("source", folder.getSource()); + res.add(name, object); } + return TValue.fromJson(res); + } catch (IOException e) { + Logme.error(e); + return TValue.fromJson(res); + } - default: - throw EaterException.located("Error on get_all_stdlib: Too many arguments"); + default: + throw EaterException.located("Error on get_all_stdlib: Too many arguments"); } } } diff --git a/src/net/sourceforge/plantuml/tim/stdlib/GetAllTheme.java b/src/net/sourceforge/plantuml/tim/stdlib/GetAllTheme.java index e0b2d0281..f26379843 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/GetAllTheme.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/GetAllTheme.java @@ -39,8 +39,9 @@ import java.util.List; import java.util.Map; import java.util.Set; -import net.sourceforge.plantuml.log.Logme; import net.sourceforge.plantuml.json.JsonArray; +import net.sourceforge.plantuml.log.Logme; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.theme.ThemeUtils; import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; @@ -48,7 +49,6 @@ import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; import net.sourceforge.plantuml.tim.expression.TValue; -import net.sourceforge.plantuml.utils.LineLocation; public class GetAllTheme extends SimpleReturnFunction { @@ -62,7 +62,7 @@ public class GetAllTheme extends SimpleReturnFunction { } @Override - public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, + public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, Map named) throws EaterException, EaterExceptionLocated { final JsonArray result = new JsonArray(); try { diff --git a/src/net/sourceforge/plantuml/tim/stdlib/GetJsonKey.java b/src/net/sourceforge/plantuml/tim/stdlib/GetJsonKey.java index 244824ee3..0bd617053 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/GetJsonKey.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/GetJsonKey.java @@ -41,13 +41,13 @@ import java.util.Set; import net.sourceforge.plantuml.json.JsonArray; import net.sourceforge.plantuml.json.JsonObject; import net.sourceforge.plantuml.json.JsonValue; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; import net.sourceforge.plantuml.tim.expression.TValue; -import net.sourceforge.plantuml.utils.LineLocation; public class GetJsonKey extends SimpleReturnFunction { @@ -61,7 +61,7 @@ public class GetJsonKey extends SimpleReturnFunction { } @Override - public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, + public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, Map named) throws EaterException, EaterExceptionLocated { final TValue data = values.get(0); if (data.isJson() == false) diff --git a/src/net/sourceforge/plantuml/tim/stdlib/GetJsonType.java b/src/net/sourceforge/plantuml/tim/stdlib/GetJsonType.java index 33d3b5b64..17a2f164a 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/GetJsonType.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/GetJsonType.java @@ -39,13 +39,13 @@ import java.util.Map; import java.util.Set; import net.sourceforge.plantuml.json.JsonValue; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; import net.sourceforge.plantuml.tim.expression.TValue; -import net.sourceforge.plantuml.utils.LineLocation; public class GetJsonType extends SimpleReturnFunction { @@ -59,7 +59,7 @@ public class GetJsonType extends SimpleReturnFunction { } @Override - public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, + public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, Map named) throws EaterException, EaterExceptionLocated { final TValue data = values.get(0); if (data.isString()) diff --git a/src/net/sourceforge/plantuml/tim/stdlib/GetVariableValue.java b/src/net/sourceforge/plantuml/tim/stdlib/GetVariableValue.java index 082921acb..c950f7c7b 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/GetVariableValue.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/GetVariableValue.java @@ -38,13 +38,13 @@ import java.util.List; import java.util.Map; import java.util.Set; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; import net.sourceforge.plantuml.tim.expression.TValue; -import net.sourceforge.plantuml.utils.LineLocation; public class GetVariableValue extends SimpleReturnFunction { @@ -58,13 +58,13 @@ public class GetVariableValue extends SimpleReturnFunction { } @Override - public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, + public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, Map named) throws EaterException, EaterExceptionLocated { final String name = values.get(0).toString(); final TValue variable = memory.getVariable(name); - if (variable == null) { + if (variable == null) return TValue.fromString(""); - } + return variable; } diff --git a/src/net/sourceforge/plantuml/tim/stdlib/GetVersion.java b/src/net/sourceforge/plantuml/tim/stdlib/GetVersion.java index c206538cb..68e66ec23 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/GetVersion.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/GetVersion.java @@ -38,13 +38,13 @@ import java.util.List; import java.util.Map; import java.util.Set; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; import net.sourceforge.plantuml.tim.expression.TValue; -import net.sourceforge.plantuml.utils.LineLocation; import net.sourceforge.plantuml.version.Version; public class GetVersion extends SimpleReturnFunction { @@ -59,7 +59,7 @@ public class GetVersion extends SimpleReturnFunction { } @Override - public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, + public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, Map named) throws EaterException, EaterExceptionLocated { return TValue.fromString(Version.versionString()); } diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Getenv.java b/src/net/sourceforge/plantuml/tim/stdlib/Getenv.java index 88fd8a638..380448942 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Getenv.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/Getenv.java @@ -39,13 +39,13 @@ import java.util.Map; import java.util.Set; import net.sourceforge.plantuml.security.SecurityUtils; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; import net.sourceforge.plantuml.tim.expression.TValue; -import net.sourceforge.plantuml.utils.LineLocation; public class Getenv extends SimpleReturnFunction { @@ -59,7 +59,7 @@ public class Getenv extends SimpleReturnFunction { } @Override - public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, + public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, Map named) throws EaterException, EaterExceptionLocated { // ::comment when __CORE__ final String value = getenv(values.get(0).toString()); @@ -82,7 +82,7 @@ public class Getenv extends SimpleReturnFunction { // also stop here in other deployments. if (SecurityUtils.getSecurityProfile().canWeReadThisEnvironmentVariable(name) == false) return null; - + final String env = System.getProperty(name); if (env != null) return env; diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Hex2dec.java b/src/net/sourceforge/plantuml/tim/stdlib/Hex2dec.java index 27f510248..0cc471567 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Hex2dec.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/Hex2dec.java @@ -38,13 +38,13 @@ import java.util.List; import java.util.Map; import java.util.Set; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; import net.sourceforge.plantuml.tim.expression.TValue; -import net.sourceforge.plantuml.utils.LineLocation; public class Hex2dec extends SimpleReturnFunction { @@ -58,7 +58,7 @@ public class Hex2dec extends SimpleReturnFunction { } @Override - public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, + public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, Map named) throws EaterException, EaterExceptionLocated { try { return TValue.fromInt(Integer.parseInt(values.get(0).toString(), 16)); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/HslColor.java b/src/net/sourceforge/plantuml/tim/stdlib/HslColor.java index cc1173882..2618bfbf6 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/HslColor.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/HslColor.java @@ -41,13 +41,13 @@ import java.util.Set; import net.sourceforge.plantuml.klimt.color.HColors; import net.sourceforge.plantuml.klimt.color.HSLColor; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; import net.sourceforge.plantuml.tim.expression.TValue; -import net.sourceforge.plantuml.utils.LineLocation; public class HslColor extends SimpleReturnFunction { @@ -61,7 +61,7 @@ public class HslColor extends SimpleReturnFunction { } @Override - public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, + public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, Map named) throws EaterException, EaterExceptionLocated { final int h = values.get(0).toInt(); final int s = values.get(1).toInt(); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/IntVal.java b/src/net/sourceforge/plantuml/tim/stdlib/IntVal.java index 27e19db7a..b412cad9d 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/IntVal.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/IntVal.java @@ -38,13 +38,13 @@ import java.util.List; import java.util.Map; import java.util.Set; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; import net.sourceforge.plantuml.tim.expression.TValue; -import net.sourceforge.plantuml.utils.LineLocation; import net.sourceforge.plantuml.utils.Log; public class IntVal extends SimpleReturnFunction { @@ -59,7 +59,7 @@ public class IntVal extends SimpleReturnFunction { } @Override - public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, + public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, Map named) throws EaterException, EaterExceptionLocated { final String s = values.get(0).toString(); try { diff --git a/src/net/sourceforge/plantuml/tim/stdlib/InvokeProcedure.java b/src/net/sourceforge/plantuml/tim/stdlib/InvokeProcedure.java index 5331f7b2e..64503ed11 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/InvokeProcedure.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/InvokeProcedure.java @@ -38,6 +38,7 @@ import java.util.List; import java.util.Map; import java.util.Set; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; @@ -46,7 +47,6 @@ import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TFunctionType; import net.sourceforge.plantuml.tim.TMemory; import net.sourceforge.plantuml.tim.expression.TValue; -import net.sourceforge.plantuml.utils.LineLocation; public class InvokeProcedure implements TFunction { @@ -64,20 +64,20 @@ public class InvokeProcedure implements TFunction { } @Override - public void executeProcedureInternal(TContext context, TMemory memory, List args, Map named) - throws EaterException, EaterExceptionLocated { + public void executeProcedureInternal(TContext context, TMemory memory, StringLocated location, List args, + Map named) throws EaterException, EaterExceptionLocated { final String fname = args.get(0).toString(); final List sublist = args.subList(1, args.size()); final TFunctionSignature signature = new TFunctionSignature(fname, sublist.size()); final TFunction func = context.getFunctionSmart(signature); - if (func == null) { + if (func == null) throw EaterException.located("Cannot find void function " + fname); - } - func.executeProcedureInternal(context, memory, sublist, named); + + func.executeProcedureInternal(context, memory, location, sublist, named); } @Override - public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, + public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, Map named) { throw new UnsupportedOperationException(); } diff --git a/src/net/sourceforge/plantuml/tim/stdlib/IsDark.java b/src/net/sourceforge/plantuml/tim/stdlib/IsDark.java index efc4299da..d8f337bf5 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/IsDark.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/IsDark.java @@ -41,13 +41,13 @@ import java.util.Set; import net.sourceforge.plantuml.klimt.color.HColor; import net.sourceforge.plantuml.klimt.color.HColorSet; import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; import net.sourceforge.plantuml.tim.expression.TValue; -import net.sourceforge.plantuml.utils.LineLocation; public class IsDark extends SimpleReturnFunction { @@ -62,7 +62,7 @@ public class IsDark extends SimpleReturnFunction { } @Override - public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, + public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, Map named) throws EaterException, EaterExceptionLocated { final String colorString = values.get(0).toString(); try { diff --git a/src/net/sourceforge/plantuml/tim/stdlib/IsLight.java b/src/net/sourceforge/plantuml/tim/stdlib/IsLight.java index deff7b24d..e298e1baa 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/IsLight.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/IsLight.java @@ -41,13 +41,13 @@ import java.util.Set; import net.sourceforge.plantuml.klimt.color.HColor; import net.sourceforge.plantuml.klimt.color.HColorSet; import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; import net.sourceforge.plantuml.tim.expression.TValue; -import net.sourceforge.plantuml.utils.LineLocation; public class IsLight extends SimpleReturnFunction { @@ -62,7 +62,7 @@ public class IsLight extends SimpleReturnFunction { } @Override - public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, + public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, Map named) throws EaterException, EaterExceptionLocated { final String colorString = values.get(0).toString(); try { diff --git a/src/net/sourceforge/plantuml/tim/stdlib/JsonKeyExists.java b/src/net/sourceforge/plantuml/tim/stdlib/JsonKeyExists.java index 85eafc540..71d6eaed8 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/JsonKeyExists.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/JsonKeyExists.java @@ -40,13 +40,13 @@ import java.util.Set; import net.sourceforge.plantuml.json.JsonObject; import net.sourceforge.plantuml.json.JsonValue; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; import net.sourceforge.plantuml.tim.expression.TValue; -import net.sourceforge.plantuml.utils.LineLocation; public class JsonKeyExists extends SimpleReturnFunction { @@ -60,7 +60,7 @@ public class JsonKeyExists extends SimpleReturnFunction { } @Override - public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, + public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, Map named) throws EaterException, EaterExceptionLocated { final TValue arg0 = values.get(0); if (arg0.isJson() == false) diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Lighten.java b/src/net/sourceforge/plantuml/tim/stdlib/Lighten.java index e4de200fe..ac69bf9e4 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Lighten.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/Lighten.java @@ -41,13 +41,13 @@ import java.util.Set; import net.sourceforge.plantuml.klimt.color.HColor; import net.sourceforge.plantuml.klimt.color.HColorSet; import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; import net.sourceforge.plantuml.tim.expression.TValue; -import net.sourceforge.plantuml.utils.LineLocation; public class Lighten extends SimpleReturnFunction { @@ -62,7 +62,7 @@ public class Lighten extends SimpleReturnFunction { } @Override - public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, + public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, Map named) throws EaterException, EaterExceptionLocated { final String colorString = values.get(0).toString(); final int ratio = values.get(1).toInt(); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/LoadJson.java b/src/net/sourceforge/plantuml/tim/stdlib/LoadJson.java index a5021562c..58e6a74bf 100755 --- a/src/net/sourceforge/plantuml/tim/stdlib/LoadJson.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/LoadJson.java @@ -49,13 +49,13 @@ import net.sourceforge.plantuml.json.ParseException; import net.sourceforge.plantuml.log.Logme; import net.sourceforge.plantuml.security.SFile; import net.sourceforge.plantuml.security.SURL; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; import net.sourceforge.plantuml.tim.expression.TValue; -import net.sourceforge.plantuml.utils.LineLocation; /** * Loads JSON data from file or URL source. @@ -108,7 +108,7 @@ public class LoadJson extends SimpleReturnFunction { } @Override - public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, + public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, Map named) throws EaterException, EaterExceptionLocated { final String path = values.get(0).toString(); try { diff --git a/src/net/sourceforge/plantuml/tim/stdlib/LogicalAnd.java b/src/net/sourceforge/plantuml/tim/stdlib/LogicalAnd.java index 4fe2d2a14..3770e1b05 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/LogicalAnd.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/LogicalAnd.java @@ -38,13 +38,13 @@ import java.util.List; import java.util.Map; import java.util.Set; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; import net.sourceforge.plantuml.tim.expression.TValue; -import net.sourceforge.plantuml.utils.LineLocation; public class LogicalAnd extends SimpleReturnFunction { @@ -58,7 +58,7 @@ public class LogicalAnd extends SimpleReturnFunction { } @Override - public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, + public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, Map named) throws EaterException, EaterExceptionLocated { for (TValue v : values) if (v.toBoolean() == false) diff --git a/src/net/sourceforge/plantuml/tim/stdlib/LogicalNand.java b/src/net/sourceforge/plantuml/tim/stdlib/LogicalNand.java index 9b018d3c0..7d655c92f 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/LogicalNand.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/LogicalNand.java @@ -38,13 +38,13 @@ import java.util.List; import java.util.Map; import java.util.Set; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; import net.sourceforge.plantuml.tim.expression.TValue; -import net.sourceforge.plantuml.utils.LineLocation; public class LogicalNand extends SimpleReturnFunction { @@ -58,7 +58,7 @@ public class LogicalNand extends SimpleReturnFunction { } @Override - public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, + public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, Map named) throws EaterException, EaterExceptionLocated { for (TValue v : values) if (v.toBoolean() == false) diff --git a/src/net/sourceforge/plantuml/tim/stdlib/LogicalNor.java b/src/net/sourceforge/plantuml/tim/stdlib/LogicalNor.java index 95c4e3c6d..12b003616 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/LogicalNor.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/LogicalNor.java @@ -38,13 +38,13 @@ import java.util.List; import java.util.Map; import java.util.Set; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; import net.sourceforge.plantuml.tim.expression.TValue; -import net.sourceforge.plantuml.utils.LineLocation; public class LogicalNor extends SimpleReturnFunction { @@ -58,7 +58,7 @@ public class LogicalNor extends SimpleReturnFunction { } @Override - public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, + public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, Map named) throws EaterException, EaterExceptionLocated { for (TValue v : values) if (v.toBoolean() == true) diff --git a/src/net/sourceforge/plantuml/tim/stdlib/LogicalNot.java b/src/net/sourceforge/plantuml/tim/stdlib/LogicalNot.java index ca6d5ab3a..7ffb3689e 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/LogicalNot.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/LogicalNot.java @@ -38,13 +38,13 @@ import java.util.List; import java.util.Map; import java.util.Set; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; import net.sourceforge.plantuml.tim.expression.TValue; -import net.sourceforge.plantuml.utils.LineLocation; public class LogicalNot extends SimpleReturnFunction { @@ -58,7 +58,7 @@ public class LogicalNot extends SimpleReturnFunction { } @Override - public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, + public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, Map named) throws EaterException, EaterExceptionLocated { final boolean arg = values.get(0).toBoolean(); return TValue.fromBoolean(!arg); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/LogicalNxor.java b/src/net/sourceforge/plantuml/tim/stdlib/LogicalNxor.java index e83c05b1e..a5ed319e3 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/LogicalNxor.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/LogicalNxor.java @@ -38,13 +38,13 @@ import java.util.List; import java.util.Map; import java.util.Set; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; import net.sourceforge.plantuml.tim.expression.TValue; -import net.sourceforge.plantuml.utils.LineLocation; public class LogicalNxor extends SimpleReturnFunction { @@ -58,7 +58,7 @@ public class LogicalNxor extends SimpleReturnFunction { } @Override - public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, + public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, Map named) throws EaterException, EaterExceptionLocated { int cpt = 0; for (TValue v : values) diff --git a/src/net/sourceforge/plantuml/tim/stdlib/LogicalOr.java b/src/net/sourceforge/plantuml/tim/stdlib/LogicalOr.java index 41026ac89..e78dcc546 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/LogicalOr.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/LogicalOr.java @@ -38,13 +38,13 @@ import java.util.List; import java.util.Map; import java.util.Set; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; import net.sourceforge.plantuml.tim.expression.TValue; -import net.sourceforge.plantuml.utils.LineLocation; public class LogicalOr extends SimpleReturnFunction { @@ -58,7 +58,7 @@ public class LogicalOr extends SimpleReturnFunction { } @Override - public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, + public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, Map named) throws EaterException, EaterExceptionLocated { for (TValue v : values) if (v.toBoolean() == true) diff --git a/src/net/sourceforge/plantuml/tim/stdlib/LogicalXor.java b/src/net/sourceforge/plantuml/tim/stdlib/LogicalXor.java index 14ad07a5e..da04addf5 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/LogicalXor.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/LogicalXor.java @@ -38,13 +38,13 @@ import java.util.List; import java.util.Map; import java.util.Set; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; import net.sourceforge.plantuml.tim.expression.TValue; -import net.sourceforge.plantuml.utils.LineLocation; public class LogicalXor extends SimpleReturnFunction { @@ -58,7 +58,7 @@ public class LogicalXor extends SimpleReturnFunction { } @Override - public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, + public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, Map named) throws EaterException, EaterExceptionLocated { int cpt = 0; for (TValue v : values) diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Lower.java b/src/net/sourceforge/plantuml/tim/stdlib/Lower.java index d0dbcb731..721a521b8 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Lower.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/Lower.java @@ -38,11 +38,11 @@ import java.util.List; import java.util.Map; import java.util.Set; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; import net.sourceforge.plantuml.tim.expression.TValue; -import net.sourceforge.plantuml.utils.LineLocation; public class Lower extends SimpleReturnFunction { @@ -56,7 +56,7 @@ public class Lower extends SimpleReturnFunction { } @Override - public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, + public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, Map named) { return TValue.fromString(values.get(0).toString().toLowerCase()); } diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Newline.java b/src/net/sourceforge/plantuml/tim/stdlib/Newline.java index 2f5c7abb7..d3b4b8768 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Newline.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/Newline.java @@ -38,11 +38,11 @@ import java.util.List; import java.util.Map; import java.util.Set; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; import net.sourceforge.plantuml.tim.expression.TValue; -import net.sourceforge.plantuml.utils.LineLocation; public class Newline extends SimpleReturnFunction { @@ -56,7 +56,7 @@ public class Newline extends SimpleReturnFunction { } @Override - public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, + public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, Map named) { return TValue.fromString("\n"); } diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Now.java b/src/net/sourceforge/plantuml/tim/stdlib/Now.java index c90eb25d1..f827d6e9f 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Now.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/Now.java @@ -38,13 +38,13 @@ import java.util.List; import java.util.Map; import java.util.Set; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; import net.sourceforge.plantuml.tim.expression.TValue; -import net.sourceforge.plantuml.utils.LineLocation; public class Now extends SimpleReturnFunction { @@ -58,7 +58,7 @@ public class Now extends SimpleReturnFunction { } @Override - public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, + public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, Map named) throws EaterException, EaterExceptionLocated { final long now = System.currentTimeMillis() / 1000L; return TValue.fromInt((int) now); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Ord.java b/src/net/sourceforge/plantuml/tim/stdlib/Ord.java index bf0f7d767..8ae31e5c4 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Ord.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/Ord.java @@ -38,13 +38,13 @@ import java.util.List; import java.util.Map; import java.util.Set; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; import net.sourceforge.plantuml.tim.expression.TValue; -import net.sourceforge.plantuml.utils.LineLocation; public class Ord extends SimpleReturnFunction { @@ -58,7 +58,7 @@ public class Ord extends SimpleReturnFunction { } @Override - public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, + public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, Map named) throws EaterException, EaterExceptionLocated { try { final int codePoint = values.get(0).toString().codePointAt(0); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/RandomFunction.java b/src/net/sourceforge/plantuml/tim/stdlib/RandomFunction.java index a165f00a4..bf7786f5c 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/RandomFunction.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/RandomFunction.java @@ -39,13 +39,13 @@ import java.util.Map; import java.util.Random; import java.util.Set; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; import net.sourceforge.plantuml.tim.expression.TValue; -import net.sourceforge.plantuml.utils.LineLocation; public class RandomFunction extends SimpleReturnFunction { @@ -59,25 +59,25 @@ public class RandomFunction extends SimpleReturnFunction { } private final Random random = new Random(); - + @Override - public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, + public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, Map named) throws EaterException, EaterExceptionLocated { switch (values.size()) { - case 0: - return TValue.fromInt(random.nextInt(2)); + case 0: + return TValue.fromInt(random.nextInt(2)); - case 1: - final Integer mx = values.get(0).toInt(); - return TValue.fromInt(random.nextInt(mx)); + case 1: + final Integer mx = values.get(0).toInt(); + return TValue.fromInt(random.nextInt(mx)); - case 2: - final Integer min = values.get(0).toInt(); - final Integer max = values.get(1).toInt(); - return TValue.fromInt(random.nextInt(max - min) + min); + case 2: + final Integer min = values.get(0).toInt(); + final Integer max = values.get(1).toInt(); + return TValue.fromInt(random.nextInt(max - min) + min); - default: - throw EaterException.located("Error on Random: Too many argument"); + default: + throw EaterException.located("Error on Random: Too many argument"); } } } diff --git a/src/net/sourceforge/plantuml/tim/stdlib/RetrieveProcedure.java b/src/net/sourceforge/plantuml/tim/stdlib/RetrieveProcedure.java index fa75ab946..8c31c3520 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/RetrieveProcedure.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/RetrieveProcedure.java @@ -39,6 +39,7 @@ import java.util.List; import java.util.Map; import java.util.Set; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; @@ -46,7 +47,6 @@ import net.sourceforge.plantuml.tim.TFunction; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; import net.sourceforge.plantuml.tim.expression.TValue; -import net.sourceforge.plantuml.utils.LineLocation; public class RetrieveProcedure extends SimpleReturnFunction { @@ -60,14 +60,14 @@ public class RetrieveProcedure extends SimpleReturnFunction { } @Override - public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, + public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, Map named) throws EaterException, EaterExceptionLocated { final String fname = values.get(0).toString(); final List args = values.subList(1, values.size()); final TFunctionSignature signature = new TFunctionSignature(fname, args.size()); final TFunction func = context.getFunctionSmart(signature); final int n1 = context.getResultList().size(); - func.executeProcedureInternal(context, memory, args, Collections.emptyMap()); + func.executeProcedureInternal(context, memory, location, args, Collections.emptyMap()); final String extracted = context.extractFromResultList(n1); return TValue.fromString(extracted); } diff --git a/src/net/sourceforge/plantuml/tim/stdlib/ReverseColor.java b/src/net/sourceforge/plantuml/tim/stdlib/ReverseColor.java index 6084e16d1..43521f070 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/ReverseColor.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/ReverseColor.java @@ -41,13 +41,13 @@ import java.util.Set; import net.sourceforge.plantuml.klimt.color.HColor; import net.sourceforge.plantuml.klimt.color.HColorSet; import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; import net.sourceforge.plantuml.tim.expression.TValue; -import net.sourceforge.plantuml.utils.LineLocation; public class ReverseColor extends SimpleReturnFunction { @@ -61,7 +61,7 @@ public class ReverseColor extends SimpleReturnFunction { } @Override - public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, + public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, Map named) throws EaterException, EaterExceptionLocated { final String colorString = values.get(0).toString(); try { diff --git a/src/net/sourceforge/plantuml/tim/stdlib/ReverseHsluvColor.java b/src/net/sourceforge/plantuml/tim/stdlib/ReverseHsluvColor.java index 6a42843f7..bcfaa72b9 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/ReverseHsluvColor.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/ReverseHsluvColor.java @@ -41,13 +41,13 @@ import java.util.Set; import net.sourceforge.plantuml.klimt.color.HColor; import net.sourceforge.plantuml.klimt.color.HColorSet; import net.sourceforge.plantuml.klimt.color.NoSuchColorException; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; import net.sourceforge.plantuml.tim.expression.TValue; -import net.sourceforge.plantuml.utils.LineLocation; public class ReverseHsluvColor extends SimpleReturnFunction { @@ -61,7 +61,7 @@ public class ReverseHsluvColor extends SimpleReturnFunction { } @Override - public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, + public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, Map named) throws EaterException, EaterExceptionLocated { final String colorString = values.get(0).toString(); try { diff --git a/src/net/sourceforge/plantuml/tim/stdlib/SetVariableValue.java b/src/net/sourceforge/plantuml/tim/stdlib/SetVariableValue.java index a35ec7786..1dd202157 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/SetVariableValue.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/SetVariableValue.java @@ -38,6 +38,7 @@ import java.util.List; import java.util.Map; import java.util.Set; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; @@ -45,7 +46,6 @@ import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; import net.sourceforge.plantuml.tim.TVariableScope; import net.sourceforge.plantuml.tim.expression.TValue; -import net.sourceforge.plantuml.utils.LineLocation; public class SetVariableValue extends SimpleReturnFunction { @@ -59,7 +59,7 @@ public class SetVariableValue extends SimpleReturnFunction { } @Override - public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, + public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, Map named) throws EaterException, EaterExceptionLocated { // if (memory instanceof TMemoryLocal) { // memory = ((TMemoryLocal) memory).getGlobalForInternalUseOnly(); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/SimpleReturnFunction.java b/src/net/sourceforge/plantuml/tim/stdlib/SimpleReturnFunction.java index f276bcbdd..c649a86a4 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/SimpleReturnFunction.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/SimpleReturnFunction.java @@ -37,13 +37,13 @@ package net.sourceforge.plantuml.tim.stdlib; import java.util.List; import java.util.Map; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunction; import net.sourceforge.plantuml.tim.TFunctionType; import net.sourceforge.plantuml.tim.TMemory; import net.sourceforge.plantuml.tim.expression.TValue; -import net.sourceforge.plantuml.utils.LineLocation; public abstract class SimpleReturnFunction implements TFunction { @@ -52,8 +52,8 @@ public abstract class SimpleReturnFunction implements TFunction { } @Override - final public void executeProcedureInternal(TContext context, TMemory memory, List args, - Map named) throws EaterException { + final public void executeProcedureInternal(TContext context, TMemory memory, StringLocated location, + List args, Map named) throws EaterException { throw new UnsupportedOperationException(); } diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Size.java b/src/net/sourceforge/plantuml/tim/stdlib/Size.java index 0794bca42..0bf62d6d6 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Size.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/Size.java @@ -41,13 +41,13 @@ import java.util.Set; import net.sourceforge.plantuml.json.JsonArray; import net.sourceforge.plantuml.json.JsonObject; import net.sourceforge.plantuml.json.JsonValue; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; import net.sourceforge.plantuml.tim.expression.TValue; -import net.sourceforge.plantuml.utils.LineLocation; public class Size extends SimpleReturnFunction { @@ -61,7 +61,7 @@ public class Size extends SimpleReturnFunction { } @Override - public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, + public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, Map named) throws EaterException, EaterExceptionLocated { final TValue value = values.get(0); if (value.isNumber()) diff --git a/src/net/sourceforge/plantuml/tim/stdlib/SplitStr.java b/src/net/sourceforge/plantuml/tim/stdlib/SplitStr.java index d9aa2fded..5e181ffca 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/SplitStr.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/SplitStr.java @@ -40,13 +40,13 @@ import java.util.Set; import java.util.StringTokenizer; import net.sourceforge.plantuml.json.JsonArray; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; import net.sourceforge.plantuml.tim.expression.TValue; -import net.sourceforge.plantuml.utils.LineLocation; public class SplitStr extends SimpleReturnFunction { @@ -60,7 +60,7 @@ public class SplitStr extends SimpleReturnFunction { } @Override - public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, + public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, Map named) throws EaterException, EaterExceptionLocated { final JsonArray result = new JsonArray(); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/StringFunction.java b/src/net/sourceforge/plantuml/tim/stdlib/StringFunction.java index f2b972a80..de63add20 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/StringFunction.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/StringFunction.java @@ -38,11 +38,11 @@ import java.util.List; import java.util.Map; import java.util.Set; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; import net.sourceforge.plantuml.tim.expression.TValue; -import net.sourceforge.plantuml.utils.LineLocation; public class StringFunction extends SimpleReturnFunction { @@ -56,7 +56,7 @@ public class StringFunction extends SimpleReturnFunction { } @Override - public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, + public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, Map named) { return TValue.fromString(values.get(0).toString()); } diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Strlen.java b/src/net/sourceforge/plantuml/tim/stdlib/Strlen.java index 3e1578fba..3aeb5b609 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Strlen.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/Strlen.java @@ -38,13 +38,13 @@ import java.util.List; import java.util.Map; import java.util.Set; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; import net.sourceforge.plantuml.tim.expression.TValue; -import net.sourceforge.plantuml.utils.LineLocation; public class Strlen extends SimpleReturnFunction { @@ -58,7 +58,7 @@ public class Strlen extends SimpleReturnFunction { } @Override - public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, + public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, Map named) throws EaterException, EaterExceptionLocated { return TValue.fromInt(values.get(0).toString().length()); } diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Strpos.java b/src/net/sourceforge/plantuml/tim/stdlib/Strpos.java index 09a5c43a9..8db94424f 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Strpos.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/Strpos.java @@ -38,13 +38,13 @@ import java.util.List; import java.util.Map; import java.util.Set; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; import net.sourceforge.plantuml.tim.expression.TValue; -import net.sourceforge.plantuml.utils.LineLocation; public class Strpos extends SimpleReturnFunction { @@ -58,7 +58,7 @@ public class Strpos extends SimpleReturnFunction { } @Override - public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, + public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, Map named) throws EaterException, EaterExceptionLocated { final String full = values.get(0).toString(); final String searched = values.get(1).toString(); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Substr.java b/src/net/sourceforge/plantuml/tim/stdlib/Substr.java index ba0c0e8ce..ec254565b 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Substr.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/Substr.java @@ -38,13 +38,13 @@ import java.util.List; import java.util.Map; import java.util.Set; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; import net.sourceforge.plantuml.tim.expression.TValue; -import net.sourceforge.plantuml.utils.LineLocation; public class Substr extends SimpleReturnFunction { @@ -58,7 +58,7 @@ public class Substr extends SimpleReturnFunction { } @Override - public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, + public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, Map named) throws EaterException, EaterExceptionLocated { final String full = values.get(0).toString(); final int pos = values.get(1).toInt(); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Upper.java b/src/net/sourceforge/plantuml/tim/stdlib/Upper.java index 98caf89ff..71ebe587e 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Upper.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/Upper.java @@ -38,11 +38,11 @@ import java.util.List; import java.util.Map; import java.util.Set; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; import net.sourceforge.plantuml.tim.expression.TValue; -import net.sourceforge.plantuml.utils.LineLocation; public class Upper extends SimpleReturnFunction { @@ -56,7 +56,7 @@ public class Upper extends SimpleReturnFunction { } @Override - public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, + public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, Map named) { return TValue.fromString(values.get(0).toString().toUpperCase()); } diff --git a/src/net/sourceforge/plantuml/tim/stdlib/VariableExists.java b/src/net/sourceforge/plantuml/tim/stdlib/VariableExists.java index a63730447..3f06d5e62 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/VariableExists.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/VariableExists.java @@ -38,13 +38,13 @@ import java.util.List; import java.util.Map; import java.util.Set; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; import net.sourceforge.plantuml.tim.expression.TValue; -import net.sourceforge.plantuml.utils.LineLocation; public class VariableExists extends SimpleReturnFunction { @@ -58,7 +58,7 @@ public class VariableExists extends SimpleReturnFunction { } @Override - public TValue executeReturnFunction(TContext context, TMemory memory, LineLocation location, List values, + public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, Map named) throws EaterException, EaterExceptionLocated { final String name = values.get(0).toString(); return TValue.fromBoolean(memory.getVariable(name) != null); diff --git a/src/net/sourceforge/plantuml/version/Version.java b/src/net/sourceforge/plantuml/version/Version.java index 50dd4b24e..77f7aa10b 100644 --- a/src/net/sourceforge/plantuml/version/Version.java +++ b/src/net/sourceforge/plantuml/version/Version.java @@ -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.2024.4beta1"; + private static final String version = "1.2024.4beta2"; public static String versionString() { return version; From 6329d9a8d5cf69cec80e3aefe0c74f9f3204c133 Mon Sep 17 00:00:00 2001 From: Arnaud Roques Date: Thu, 22 Feb 2024 19:32:38 +0100 Subject: [PATCH 87/95] refactor: prepare preprocessor error improvement (in progress) https://github.com/plantuml/plantuml/pull/1668 --- gradle.properties | 2 +- src/net/sourceforge/plantuml/BlockUml.java | 2 +- .../sourceforge/plantuml/preproc/Defines.java | 43 ++++++----- .../sourceforge/plantuml/preproc/Truth.java | 1 + .../plantuml/preproc2/PreprocessorUtils.java | 10 +-- src/net/sourceforge/plantuml/tim/Eater.java | 28 ++++---- .../plantuml/tim/EaterAffectation.java | 4 +- .../plantuml/tim/EaterAffectationDefine.java | 2 +- .../sourceforge/plantuml/tim/EaterAssert.java | 4 +- .../plantuml/tim/EaterDeclareProcedure.java | 5 +- .../tim/EaterDeclareReturnFunction.java | 5 +- .../plantuml/tim/EaterException.java | 10 +-- .../plantuml/tim/EaterFunctionCall.java | 8 +-- .../plantuml/tim/EaterInclude.java | 8 +-- .../plantuml/tim/EaterIncludesub.java | 8 +-- .../plantuml/tim/EaterLegacyDefine.java | 2 +- .../plantuml/tim/EaterLegacyDefineLong.java | 2 +- .../plantuml/tim/EaterStartsub.java | 6 +- .../sourceforge/plantuml/tim/EaterTheme.java | 14 ++-- .../plantuml/tim/FunctionsSet.java | 72 +++++++++---------- .../sourceforge/plantuml/tim/TContext.java | 54 +++++++------- .../plantuml/tim/TFunctionImpl.java | 4 +- src/net/sourceforge/plantuml/tim/TMemory.java | 4 +- .../plantuml/tim/TMemoryGlobal.java | 18 +++-- .../plantuml/tim/TMemoryLocal.java | 43 ++++++----- .../sourceforge/plantuml/tim/TimLoader.java | 4 +- .../plantuml/tim/VariableManager.java | 44 ++++++------ .../expression/ReversePolishInterpretor.java | 44 +++++------- .../plantuml/tim/expression/ShuntingYard.java | 6 +- .../plantuml/tim/expression/TokenStack.java | 23 +++--- .../tim/iterator/AbstractCodeIterator.java | 8 ++- .../plantuml/tim/iterator/CodeIterator.java | 4 +- .../tim/iterator/CodeIteratorAffectation.java | 7 +- .../tim/iterator/CodeIteratorForeach.java | 19 +++-- .../plantuml/tim/iterator/CodeIteratorIf.java | 21 +++--- .../tim/iterator/CodeIteratorImpl.java | 24 ++++--- .../tim/iterator/CodeIteratorSub.java | 18 ++--- .../tim/iterator/CodeIteratorWhile.java | 13 ++-- .../plantuml/tim/stdlib/CallUserFunction.java | 6 +- .../plantuml/tim/stdlib/Darken.java | 2 +- .../plantuml/tim/stdlib/DateFunction.java | 3 +- .../plantuml/tim/stdlib/GetAllStdlib.java | 3 +- .../plantuml/tim/stdlib/GetJsonKey.java | 5 +- .../plantuml/tim/stdlib/InvokeProcedure.java | 2 +- .../plantuml/tim/stdlib/IsDark.java | 2 +- .../plantuml/tim/stdlib/IsLight.java | 2 +- .../plantuml/tim/stdlib/Lighten.java | 2 +- .../plantuml/tim/stdlib/LoadJson.java | 5 +- .../plantuml/tim/stdlib/RandomFunction.java | 3 +- .../plantuml/tim/stdlib/ReverseColor.java | 2 +- .../tim/stdlib/ReverseHsluvColor.java | 2 +- .../plantuml/tim/stdlib/SetVariableValue.java | 2 +- .../sourceforge/plantuml/version/Version.java | 2 +- 53 files changed, 331 insertions(+), 306 deletions(-) diff --git a/gradle.properties b/gradle.properties index 4336095e9..acb37ac5e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -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.2024.4beta2 +version = 1.2024.4beta3 org.gradle.workers.max = 3 \ No newline at end of file diff --git a/src/net/sourceforge/plantuml/BlockUml.java b/src/net/sourceforge/plantuml/BlockUml.java index 9a4229bad..b5c6b76c7 100644 --- a/src/net/sourceforge/plantuml/BlockUml.java +++ b/src/net/sourceforge/plantuml/BlockUml.java @@ -143,7 +143,7 @@ public class BlockUml { this.data = new ArrayList<>(strings); } else { final TimLoader timLoader = new TimLoader(mode.getImportedFiles(), defines, charset, - (DefinitionsContainer) mode); + (DefinitionsContainer) mode, strings.get(0)); this.included.addAll(timLoader.load(strings)); this.data = timLoader.getResultList(); this.debug = timLoader.getDebug(); diff --git a/src/net/sourceforge/plantuml/preproc/Defines.java b/src/net/sourceforge/plantuml/preproc/Defines.java index ed1478741..14ec49a0e 100644 --- a/src/net/sourceforge/plantuml/preproc/Defines.java +++ b/src/net/sourceforge/plantuml/preproc/Defines.java @@ -55,6 +55,7 @@ import net.sourceforge.plantuml.file.AParentFolder; import net.sourceforge.plantuml.security.SFile; import net.sourceforge.plantuml.security.SecurityProfile; import net.sourceforge.plantuml.security.SecurityUtils; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.TMemory; import net.sourceforge.plantuml.tim.TVariableScope; @@ -81,11 +82,11 @@ public class Defines implements Truth { return new Defines(); } - public void copyTo(TMemory memory) throws EaterException { + public void copyTo(TMemory memory, StringLocated location) throws EaterException { for (Entry ent : values.entrySet()) { final String name = ent.getKey(); final Define def = ent.getValue(); - memory.putVariable(name, def.asTVariable(), TVariableScope.GLOBAL); + memory.putVariable(name, def.asTVariable(), TVariableScope.GLOBAL, location); } } @@ -114,10 +115,10 @@ public class Defines implements Truth { final Defines result = createEmpty(); result.overrideFilename(file.getName()); result.environment.put("filedate", new Date(file.lastModified()).toString()); - if (SecurityUtils.getSecurityProfile() == SecurityProfile.UNSECURE) { + if (SecurityUtils.getSecurityProfile() == SecurityProfile.UNSECURE) result.environment.put("dirpath", file.getAbsoluteFile().getParentFile().getAbsolutePath().replace('\\', '/')); - } + return result; } @@ -126,10 +127,10 @@ public class Defines implements Truth { final Defines result = createEmpty(); result.overrideFilename(file.getName()); result.environment.put("filedate", new Date(file.lastModified()).toString()); - if (SecurityUtils.getSecurityProfile() == SecurityProfile.UNSECURE) { + if (SecurityUtils.getSecurityProfile() == SecurityProfile.UNSECURE) result.environment.put("dirpath", file.getAbsoluteFile().getParentFile().getAbsolutePath().replace('\\', '/')); - } + return result; } @@ -147,9 +148,9 @@ public class Defines implements Truth { private static String nameNoExtension(String name) { final int x = name.lastIndexOf('.'); - if (x == -1) { + if (x == -1) return name; - } + return name.substring(0, x); } @@ -169,11 +170,10 @@ public class Defines implements Truth { } public boolean isTrue(String name) { - for (String key : values.keySet()) { - if (key.equals(name) || key.startsWith(name + "(")) { + for (String key : values.keySet()) + if (key.equals(name) || key.startsWith(name + "(")) return true; - } - } + return false; } @@ -192,9 +192,9 @@ public class Defines implements Truth { } private String method1(String line) { - for (Define def : values.values()) { + for (Define def : values.values()) line = def.apply(line); - } + return line; } @@ -215,18 +215,17 @@ public class Defines implements Truth { private String method2(String line) { final Set words = words(line); - if (magic == null) { + if (magic == null) magic = getAll(); - } for (String w : words) { Collection tmp = magic.get(w); - if (tmp == null) { + if (tmp == null) continue; - } - for (Define def : tmp) { + + for (Define def : tmp) line = def.apply(line); - } + } return line; } @@ -236,9 +235,9 @@ public class Defines implements Truth { Pattern p = Pattern.compile(ID); Matcher m = p.matcher(line); final Set words = new HashSet<>(); - while (m.find()) { + while (m.find()) words.add(m.group(0)); - } + return words; } diff --git a/src/net/sourceforge/plantuml/preproc/Truth.java b/src/net/sourceforge/plantuml/preproc/Truth.java index 7a33da793..1ec283d02 100644 --- a/src/net/sourceforge/plantuml/preproc/Truth.java +++ b/src/net/sourceforge/plantuml/preproc/Truth.java @@ -36,6 +36,7 @@ package net.sourceforge.plantuml.preproc; public interface Truth { + public boolean isTrue(String name); } diff --git a/src/net/sourceforge/plantuml/preproc2/PreprocessorUtils.java b/src/net/sourceforge/plantuml/preproc2/PreprocessorUtils.java index ee238c99c..4ed855154 100644 --- a/src/net/sourceforge/plantuml/preproc2/PreprocessorUtils.java +++ b/src/net/sourceforge/plantuml/preproc2/PreprocessorUtils.java @@ -139,21 +139,21 @@ public class PreprocessorUtils { if (StartDiagramExtractReader.containsStartDiagram(url, s, charset)) return StartDiagramExtractReader.build(url, s, suf, charset); - return getReaderInclude(url, s.getLocation(), charset); + return getReaderInclude(url, s, charset); } catch (IOException e) { Logme.error(e); - throw EaterException.located("Cannot open URL " + e.getMessage()); + throw EaterException.located("Cannot open URL " + e.getMessage(), s); } } - public static ReadLine getReaderInclude(SURL url, LineLocation lineLocation, Charset charset) + public static ReadLine getReaderInclude(SURL url, StringLocated s, Charset charset) throws EaterException, UnsupportedEncodingException { final InputStream is = url.openStream(); if (is == null) - throw EaterException.located("Cannot open URL"); + throw EaterException.located("Cannot open URL", s); - return ReadLineReader.create(new InputStreamReader(is, charset), url.toString(), lineLocation); + return ReadLineReader.create(new InputStreamReader(is, charset), url.toString(), s.getLocation()); } } diff --git a/src/net/sourceforge/plantuml/tim/Eater.java b/src/net/sourceforge/plantuml/tim/Eater.java index 193a62c5f..3ccc10440 100644 --- a/src/net/sourceforge/plantuml/tim/Eater.java +++ b/src/net/sourceforge/plantuml/tim/Eater.java @@ -93,7 +93,7 @@ public abstract class Eater { final TokenStack tokenStack = new TokenStack(); addIntoTokenStack(tokenStack, false); if (tokenStack.size() == 0) - throw EaterException.located("Missing expression"); + throw EaterException.located("Missing expression", stringLocated); return tokenStack; } @@ -121,7 +121,7 @@ public abstract class Eater { final public String eatAndGetQuotedString() throws EaterException { final char separator = peekChar(); if (TLineType.isQuote(separator) == false) - throw EaterException.located("quote10"); + throw EaterException.located("quote10", stringLocated); checkAndEatChar(separator); final StringBuilder value = new StringBuilder(); @@ -142,7 +142,7 @@ public abstract class Eater { while (true) { char ch = peekChar(); if (ch == 0) - throw EaterException.located("until001"); + throw EaterException.located("until001", stringLocated); if (level == 0 && (ch == ',' || ch == ')')) return value.toString().trim(); @@ -190,7 +190,7 @@ public abstract class Eater { final protected String eatAndGetVarname() throws EaterException { final StringBuilder varname = new StringBuilder("" + eatOneChar()); if (TLineType.isLetterOrUnderscoreOrDollar(varname.charAt(0)) == false) - throw EaterException.located("a002"); + throw EaterException.located("a002", stringLocated); addUpToLastLetterOrUnderscoreOrDigit(varname); return varname.toString(); @@ -199,7 +199,7 @@ public abstract class Eater { final protected String eatAndGetFunctionName() throws EaterException { final StringBuilder varname = new StringBuilder("" + eatOneChar()); if (TLineType.isLetterOrUnderscoreOrDollar(varname.charAt(0)) == false) - throw EaterException.located("a003"); + throw EaterException.located("a003", stringLocated); addUpToLastLetterOrUnderscoreOrDigit(varname); return varname.toString(); @@ -249,7 +249,7 @@ public abstract class Eater { final protected void checkAndEatChar(char ch) throws EaterException { if (i >= stringLocated.length() || stringLocated.charAt(i) != ch) - throw EaterException.located("a001"); + throw EaterException.located("a001", stringLocated); i++; } @@ -299,7 +299,7 @@ public abstract class Eater { } final protected TFunctionImpl eatDeclareFunction(TContext context, TMemory memory, boolean unquoted, - LineLocation location, boolean allowNoParenthesis, TFunctionType type) + StringLocated location, boolean allowNoParenthesis, TFunctionType type) throws EaterException, EaterExceptionLocated { final List args = new ArrayList<>(); final String functionName = eatAndGetFunctionName(); @@ -308,7 +308,7 @@ public abstract class Eater { if (allowNoParenthesis) return new TFunctionImpl(functionName, args, unquoted, type); - throw EaterException.located("Missing opening parenthesis"); + throw EaterException.located("Missing opening parenthesis", stringLocated); } while (true) { skipSpaces(); @@ -320,7 +320,7 @@ public abstract class Eater { if (peekChar() == '=') { eatOneChar(); final TokenStack def = TokenStack.eatUntilCloseParenthesisOrComma(this); - def.guessFunctions(); + def.guessFunctions(location); defValue = def.getResult(getStringLocated(), context, memory); // System.err.println("result=" + defValue); } else { @@ -333,7 +333,7 @@ public abstract class Eater { checkAndEatChar(")"); break; } else { - throw EaterException.located("Error in function definition"); + throw EaterException.located("Error in function definition", stringLocated); } } skipSpaces(); @@ -341,25 +341,25 @@ public abstract class Eater { } final protected TFunctionImpl eatDeclareReturnFunctionWithOptionalReturn(TContext context, TMemory memory, - boolean unquoted, LineLocation location) throws EaterException, EaterExceptionLocated { + boolean unquoted, StringLocated location) throws EaterException, EaterExceptionLocated { final TFunctionImpl result = eatDeclareFunction(context, memory, unquoted, location, false, TFunctionType.RETURN_FUNCTION); if (peekChar() == 'r') { checkAndEatChar("return"); skipSpaces(); final String line = "!return " + eatAllToEnd(); - result.addBody(new StringLocated(line, location)); + result.addBody(new StringLocated(line, location.getLocation())); } else if (peekChar() == '!') { checkAndEatChar("!return"); skipSpaces(); final String line = "!return " + eatAllToEnd(); - result.addBody(new StringLocated(line, location)); + result.addBody(new StringLocated(line, location.getLocation())); } return result; } final protected TFunctionImpl eatDeclareProcedure(TContext context, TMemory memory, boolean unquoted, - LineLocation location) throws EaterException, EaterExceptionLocated { + StringLocated location) throws EaterException, EaterExceptionLocated { final TFunctionImpl result = eatDeclareFunction(context, memory, unquoted, location, false, TFunctionType.PROCEDURE); return result; diff --git a/src/net/sourceforge/plantuml/tim/EaterAffectation.java b/src/net/sourceforge/plantuml/tim/EaterAffectation.java index 99d25e20f..726ef28f8 100644 --- a/src/net/sourceforge/plantuml/tim/EaterAffectation.java +++ b/src/net/sourceforge/plantuml/tim/EaterAffectation.java @@ -53,7 +53,7 @@ public class EaterAffectation extends Eater { if (scope != null) { skipSpaces(); if (peekChar() == '?' || peekChar() == '=') { - // The variable itself is "local" or "glocal", which is not a good idea by the + // The variable itself is "local" or "global", which is not a good idea by the // way scope = null; } else @@ -72,7 +72,7 @@ public class EaterAffectation extends Eater { skipSpaces(); final TValue value = eatExpression(context, memory); - memory.putVariable(varname, value, scope); + memory.putVariable(varname, value, scope, getStringLocated()); } } diff --git a/src/net/sourceforge/plantuml/tim/EaterAffectationDefine.java b/src/net/sourceforge/plantuml/tim/EaterAffectationDefine.java index c6cb3fbd2..aa689aeab 100644 --- a/src/net/sourceforge/plantuml/tim/EaterAffectationDefine.java +++ b/src/net/sourceforge/plantuml/tim/EaterAffectationDefine.java @@ -56,7 +56,7 @@ public class EaterAffectationDefine extends Eater { // if (memory instanceof TMemoryLocal) { // memory = ((TMemoryLocal) memory).getGlobalForInternalUseOnly(); // } - memory.putVariable(varname, value, TVariableScope.GLOBAL); + memory.putVariable(varname, value, TVariableScope.GLOBAL, getStringLocated()); } } diff --git a/src/net/sourceforge/plantuml/tim/EaterAssert.java b/src/net/sourceforge/plantuml/tim/EaterAssert.java index 1858579ee..e854c06ad 100644 --- a/src/net/sourceforge/plantuml/tim/EaterAssert.java +++ b/src/net/sourceforge/plantuml/tim/EaterAssert.java @@ -55,9 +55,9 @@ public class EaterAssert extends Eater { if (ch == ':') { checkAndEatChar(':'); final TValue message = eatExpression(context, memory); - throw EaterException.located("Assertion error : " + message.toString()); + throw EaterException.located("Assertion error : " + message.toString(), getStringLocated()); } - throw EaterException.located("Assertion error"); + throw EaterException.located("Assertion error", getStringLocated()); } } diff --git a/src/net/sourceforge/plantuml/tim/EaterDeclareProcedure.java b/src/net/sourceforge/plantuml/tim/EaterDeclareProcedure.java index 43dc732c3..9c155df18 100644 --- a/src/net/sourceforge/plantuml/tim/EaterDeclareProcedure.java +++ b/src/net/sourceforge/plantuml/tim/EaterDeclareProcedure.java @@ -35,17 +35,16 @@ package net.sourceforge.plantuml.tim; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.utils.LineLocation; public class EaterDeclareProcedure extends Eater { private TFunctionImpl function; - private final LineLocation location; + private final StringLocated location; private boolean finalFlag; public EaterDeclareProcedure(StringLocated s) { super(s.getTrimmed()); - this.location = s.getLocation(); + this.location = s; } @Override diff --git a/src/net/sourceforge/plantuml/tim/EaterDeclareReturnFunction.java b/src/net/sourceforge/plantuml/tim/EaterDeclareReturnFunction.java index e02ad1e30..8c6415d1a 100644 --- a/src/net/sourceforge/plantuml/tim/EaterDeclareReturnFunction.java +++ b/src/net/sourceforge/plantuml/tim/EaterDeclareReturnFunction.java @@ -35,17 +35,16 @@ package net.sourceforge.plantuml.tim; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.utils.LineLocation; public class EaterDeclareReturnFunction extends Eater { private TFunctionImpl function; - private final LineLocation location; + private final StringLocated location; private boolean finalFlag; public EaterDeclareReturnFunction(StringLocated s) { super(s.getTrimmed()); - this.location = s.getLocation(); + this.location = s; } @Override diff --git a/src/net/sourceforge/plantuml/tim/EaterException.java b/src/net/sourceforge/plantuml/tim/EaterException.java index 94cf2a604..ee3439e13 100644 --- a/src/net/sourceforge/plantuml/tim/EaterException.java +++ b/src/net/sourceforge/plantuml/tim/EaterException.java @@ -40,16 +40,16 @@ public class EaterException extends Exception { private final String message; - private EaterException(String message) { + private EaterException(String message, StringLocated location) { this.message = message; } - public static EaterException unlocated(String message) { - return new EaterException(message); + public static EaterException unlocated(String message, StringLocated location) { + return new EaterException(message, location); } - public static EaterException located(String message) { - return unlocated(message); + public static EaterException located(String message, StringLocated location) { + return unlocated(message, location); } public final String getMessage() { diff --git a/src/net/sourceforge/plantuml/tim/EaterFunctionCall.java b/src/net/sourceforge/plantuml/tim/EaterFunctionCall.java index 1c116eab0..8e703fde8 100644 --- a/src/net/sourceforge/plantuml/tim/EaterFunctionCall.java +++ b/src/net/sourceforge/plantuml/tim/EaterFunctionCall.java @@ -100,12 +100,12 @@ public class EaterFunctionCall extends Eater { checkAndEatChar('='); skipSpaces(); final TokenStack tokens = TokenStack.eatUntilCloseParenthesisOrComma(this).withoutSpace(); - tokens.guessFunctions(); + tokens.guessFunctions(getStringLocated()); final TValue result = tokens.getResult(getStringLocated(), context, memory); namedArguments.put(varname, result); } else { final TokenStack tokens = TokenStack.eatUntilCloseParenthesisOrComma(this).withoutSpace(); - tokens.guessFunctions(); + tokens.guessFunctions(getStringLocated()); final TValue result = tokens.getResult(getStringLocated(), context, memory); values.add(result); } @@ -119,9 +119,9 @@ public class EaterFunctionCall extends Eater { break; } if (unquoted) { - throw EaterException.located("unquoted function/procedure cannot use expression."); + throw EaterException.located("unquoted function/procedure cannot use expression.", getStringLocated()); } - throw EaterException.located("call001"); + throw EaterException.located("call001", getStringLocated()); } } diff --git a/src/net/sourceforge/plantuml/tim/EaterInclude.java b/src/net/sourceforge/plantuml/tim/EaterInclude.java index dd16097f9..5366d8a4a 100644 --- a/src/net/sourceforge/plantuml/tim/EaterInclude.java +++ b/src/net/sourceforge/plantuml/tim/EaterInclude.java @@ -39,7 +39,7 @@ import net.sourceforge.plantuml.text.StringLocated; public class EaterInclude extends Eater { - private String location; + private String what; private PreprocessorIncludeStrategy strategy = PreprocessorIncludeStrategy.DEFAULT; public EaterInclude(StringLocated s) { @@ -65,15 +65,15 @@ public class EaterInclude extends Eater { } } skipSpaces(); - this.location = context.applyFunctionsAndVariables(memory, + this.what = context.applyFunctionsAndVariables(memory, new StringLocated(this.eatAllToEnd(), getLineLocation())); // final TValue value = eatExpression(context, memory); // this.location = value.toString(); } - public final String getLocation() { - return location; + public final String getWhat() { + return what; } public final PreprocessorIncludeStrategy getPreprocessorIncludeStrategy() { diff --git a/src/net/sourceforge/plantuml/tim/EaterIncludesub.java b/src/net/sourceforge/plantuml/tim/EaterIncludesub.java index cfd9da7dc..bd93e2e1e 100644 --- a/src/net/sourceforge/plantuml/tim/EaterIncludesub.java +++ b/src/net/sourceforge/plantuml/tim/EaterIncludesub.java @@ -38,7 +38,7 @@ import net.sourceforge.plantuml.text.StringLocated; public class EaterIncludesub extends Eater { - private String location; + private String what; public EaterIncludesub(StringLocated s) { super(s); @@ -49,13 +49,13 @@ public class EaterIncludesub extends Eater { skipSpaces(); checkAndEatChar("!includesub"); skipSpaces(); - this.location = context.applyFunctionsAndVariables(memory, + this.what = context.applyFunctionsAndVariables(memory, new StringLocated(this.eatAllToEnd(), getLineLocation())); } - public final String getLocation() { - return location; + public final String getWhat() { + return what; } } diff --git a/src/net/sourceforge/plantuml/tim/EaterLegacyDefine.java b/src/net/sourceforge/plantuml/tim/EaterLegacyDefine.java index bd82decbe..532470560 100644 --- a/src/net/sourceforge/plantuml/tim/EaterLegacyDefine.java +++ b/src/net/sourceforge/plantuml/tim/EaterLegacyDefine.java @@ -49,7 +49,7 @@ public class EaterLegacyDefine extends Eater { skipSpaces(); checkAndEatChar("!define"); skipSpaces(); - function = eatDeclareFunction(context, memory, true, getLineLocation(), false, TFunctionType.LEGACY_DEFINE); + function = eatDeclareFunction(context, memory, true, getStringLocated(), false, TFunctionType.LEGACY_DEFINE); final String def = this.eatAllToEnd(); // function.setFunctionType(TFunctionType.LEGACY_DEFINE); function.setLegacyDefinition(def); diff --git a/src/net/sourceforge/plantuml/tim/EaterLegacyDefineLong.java b/src/net/sourceforge/plantuml/tim/EaterLegacyDefineLong.java index 56a10e488..54a782553 100644 --- a/src/net/sourceforge/plantuml/tim/EaterLegacyDefineLong.java +++ b/src/net/sourceforge/plantuml/tim/EaterLegacyDefineLong.java @@ -49,7 +49,7 @@ public class EaterLegacyDefineLong extends Eater { skipSpaces(); checkAndEatChar("!definelong"); skipSpaces(); - function = eatDeclareFunction(context, memory, true, getLineLocation(), true, TFunctionType.LEGACY_DEFINELONG); + function = eatDeclareFunction(context, memory, true, getStringLocated(), true, TFunctionType.LEGACY_DEFINELONG); // function.setFunctionType(TFunctionType.LEGACY_DEFINELONG); } diff --git a/src/net/sourceforge/plantuml/tim/EaterStartsub.java b/src/net/sourceforge/plantuml/tim/EaterStartsub.java index 44a1ba175..9bb1a02c9 100644 --- a/src/net/sourceforge/plantuml/tim/EaterStartsub.java +++ b/src/net/sourceforge/plantuml/tim/EaterStartsub.java @@ -50,9 +50,9 @@ public class EaterStartsub extends Eater { checkAndEatChar("!startsub"); skipSpaces(); this.subname = eatAllToEnd(); - if (this.subname.matches("\\w+") == false) { - throw EaterException.located("Bad sub name"); - } + if (this.subname.matches("\\w+") == false) + throw EaterException.located("Bad sub name", getStringLocated()); + } public final String getSubname() { diff --git a/src/net/sourceforge/plantuml/tim/EaterTheme.java b/src/net/sourceforge/plantuml/tim/EaterTheme.java index 09e292785..c43fdc33f 100644 --- a/src/net/sourceforge/plantuml/tim/EaterTheme.java +++ b/src/net/sourceforge/plantuml/tim/EaterTheme.java @@ -101,24 +101,24 @@ public class EaterTheme extends Eater { } catch (IOException e) { Logme.error(e); } - throw EaterException.located("Cannot load " + realName); + throw EaterException.located("Cannot load " + realName, getStringLocated()); } if (from.startsWith("<") && from.endsWith(">")) { final ReadLine reader = ThemeUtils.getReaderTheme(realName, from); if (reader == null) - throw EaterException.located("No such theme " + realName + " in " + from); + throw EaterException.located("No such theme " + realName + " in " + from, getStringLocated()); return reader; } else if (from.startsWith("http://") || from.startsWith("https://")) { final SURL url = SURL.create(ThemeUtils.getFullPath(from, realName)); if (url == null) - throw EaterException.located("Cannot open URL"); + throw EaterException.located("Cannot open URL", getStringLocated()); try { - return PreprocessorUtils.getReaderInclude(url, getLineLocation(), UTF_8); + return PreprocessorUtils.getReaderInclude(url, getStringLocated(), UTF_8); } catch (UnsupportedEncodingException e) { Logme.error(e); - throw EaterException.located("Cannot decode charset"); + throw EaterException.located("Cannot decode charset", getStringLocated()); } } @@ -126,12 +126,12 @@ public class EaterTheme extends Eater { final FileWithSuffix file = context.getFileWithSuffix(from, realName); final Reader tmp = file.getReader(UTF_8); if (tmp == null) - throw EaterException.located("No such theme " + realName); + throw EaterException.located("No such theme " + realName, getStringLocated()); return ReadLineReader.create(tmp, "theme " + realName); } catch (IOException e) { Logme.error(e); - throw EaterException.located("Cannot load " + realName); + throw EaterException.located("Cannot load " + realName, getStringLocated()); } } diff --git a/src/net/sourceforge/plantuml/tim/FunctionsSet.java b/src/net/sourceforge/plantuml/tim/FunctionsSet.java index ee9d21019..0f910fb66 100644 --- a/src/net/sourceforge/plantuml/tim/FunctionsSet.java +++ b/src/net/sourceforge/plantuml/tim/FunctionsSet.java @@ -51,16 +51,16 @@ public class FunctionsSet { public TFunction getFunctionSmart(TFunctionSignature searched) { final TFunction func = this.functions.get(searched); - if (func != null) { + if (func != null) return func; - } + for (TFunction candidate : this.functions.values()) { - if (candidate.getSignature().sameFunctionNameAs(searched) == false) { + if (candidate.getSignature().sameFunctionNameAs(searched) == false) continue; - } - if (candidate.canCover(searched.getNbArg(), searched.getNamedArguments())) { + + if (candidate.canCover(searched.getNbArg(), searched.getNamedArguments())) return candidate; - } + } return null; } @@ -82,9 +82,9 @@ public class FunctionsSet { } public void addFunction(TFunction func) { - if (func.getFunctionType() == TFunctionType.LEGACY_DEFINELONG) { + if (func.getFunctionType() == TFunctionType.LEGACY_DEFINELONG) ((TFunctionImpl) func).finalizeEnddefinelong(); - } + this.functions.put(func.getSignature(), func); this.functions3.add(func.getSignature().getFunctionName() + "("); } @@ -96,9 +96,9 @@ public class FunctionsSet { public void executeLegacyDefine(TContext context, TMemory memory, StringLocated s) throws EaterException, EaterExceptionLocated { - if (this.pendingFunction != null) { - throw EaterException.located("already0048"); - } + if (this.pendingFunction != null) + throw EaterException.located("already0048", s); + final EaterLegacyDefine legacyDefine = new EaterLegacyDefine(s); legacyDefine.analyze(context, memory); final TFunction function = legacyDefine.getFunction(); @@ -108,9 +108,9 @@ public class FunctionsSet { public void executeLegacyDefineLong(TContext context, TMemory memory, StringLocated s) throws EaterException, EaterExceptionLocated { - if (this.pendingFunction != null) { - throw EaterException.located("already0068"); - } + if (this.pendingFunction != null) + throw EaterException.located("already0068", s); + final EaterLegacyDefineLong legacyDefineLong = new EaterLegacyDefineLong(s); legacyDefineLong.analyze(context, memory); this.pendingFunction = legacyDefineLong.getFunction(); @@ -118,48 +118,48 @@ public class FunctionsSet { public void executeDeclareReturnFunction(TContext context, TMemory memory, StringLocated s) throws EaterException, EaterExceptionLocated { - if (this.pendingFunction != null) { - throw EaterException.located("already0068"); - } + if (this.pendingFunction != null) + throw EaterException.located("already0068", s); + final EaterDeclareReturnFunction declareFunction = new EaterDeclareReturnFunction(s); declareFunction.analyze(context, memory); final boolean finalFlag = declareFunction.getFinalFlag(); final TFunctionSignature declaredSignature = declareFunction.getFunction().getSignature(); final TFunction previous = this.functions.get(declaredSignature); - if (previous != null && (finalFlag || this.functionsFinal.contains(declaredSignature))) { - throw EaterException.located("This function is already defined"); - } - if (finalFlag) { + if (previous != null && (finalFlag || this.functionsFinal.contains(declaredSignature))) + throw EaterException.located("This function is already defined", s); + + if (finalFlag) this.functionsFinal.add(declaredSignature); - } - if (declareFunction.getFunction().hasBody()) { + + if (declareFunction.getFunction().hasBody()) this.addFunction(declareFunction.getFunction()); - } else { + else this.pendingFunction = declareFunction.getFunction(); - } + } public void executeDeclareProcedure(TContext context, TMemory memory, StringLocated s) throws EaterException, EaterExceptionLocated { - if (this.pendingFunction != null) { - throw EaterException.located("already0068"); - } + if (this.pendingFunction != null) + throw EaterException.located("already0068", s); + final EaterDeclareProcedure declareFunction = new EaterDeclareProcedure(s); declareFunction.analyze(context, memory); final boolean finalFlag = declareFunction.getFinalFlag(); final TFunctionSignature declaredSignature = declareFunction.getFunction().getSignature(); final TFunction previous = this.functions.get(declaredSignature); - if (previous != null && (finalFlag || this.functionsFinal.contains(declaredSignature))) { - throw EaterException.located("This function is already defined"); - } - if (finalFlag) { + if (previous != null && (finalFlag || this.functionsFinal.contains(declaredSignature))) + throw EaterException.located("This function is already defined", s); + + if (finalFlag) this.functionsFinal.add(declaredSignature); - } - if (declareFunction.getFunction().hasBody()) { + + if (declareFunction.getFunction().hasBody()) this.addFunction(declareFunction.getFunction()); - } else { + else this.pendingFunction = declareFunction.getFunction(); - } + } } diff --git a/src/net/sourceforge/plantuml/tim/TContext.java b/src/net/sourceforge/plantuml/tim/TContext.java index 6a79011f4..547313c90 100644 --- a/src/net/sourceforge/plantuml/tim/TContext.java +++ b/src/net/sourceforge/plantuml/tim/TContext.java @@ -322,7 +322,7 @@ public class TContext { if (e instanceof EaterExceptionLocated) throw (EaterExceptionLocated) e; Logme.error(e); - throw EaterException.located("Fatal parsing error"); + throw EaterException.located("Fatal parsing error", s); } } @@ -382,7 +382,7 @@ public class TContext { } else if (s.getString().matches("^\\s+$")) { return null; } else { - throw EaterException.located("Compile Error " + ftype + " " + type); + throw EaterException.located("Compile Error " + ftype + " " + type, s); } } @@ -465,7 +465,7 @@ public class TContext { call.getNamedArguments().keySet()); final TFunction function = functionsSet.getFunctionSmart(signature); if (function == null) - throw EaterException.located("Function not found " + presentFunction); + throw EaterException.located("Function not found " + presentFunction, str); if (function.getFunctionType() == TFunctionType.PROCEDURE) { this.pendingAdd = result.toString(); @@ -488,8 +488,8 @@ public class TContext { call.getNamedArguments()); result.append(functionReturn.toString()); i += call.getCurrentPosition() - 1; - } else if (new VariableManager(this, memory, str.getLocation()).getVarnameAt(str.getString(), i) != null) { - i = new VariableManager(this, memory, str.getLocation()).replaceVariables(str.getString(), i, result); + } else if (new VariableManager(this, memory, str).getVarnameAt(str.getString(), i) != null) { + i = new VariableManager(this, memory, str).replaceVariables(str.getString(), i, result); } else { result.append(c); } @@ -512,18 +512,18 @@ public class TContext { _import.analyze(this, memory); try { - final SFile file = FileSystem.getInstance().getFile( - applyFunctionsAndVariables(memory, new StringLocated(_import.getWhat(), s.getLocation()))); + final SFile file = FileSystem.getInstance() + .getFile(applyFunctionsAndVariables(memory, new StringLocated(_import.getWhat(), s.getLocation()))); if (file.exists() && file.isDirectory() == false) { importedFiles.add(file); return; } } catch (IOException e) { Logme.error(e); - throw EaterException.located("Cannot import " + e.getMessage()); + throw EaterException.located("Cannot import " + e.getMessage(), s); } - throw EaterException.located("Cannot import"); + throw EaterException.located("Cannot import", s); } private void executeLog(TMemory memory, StringLocated s) throws EaterException, EaterExceptionLocated { @@ -543,12 +543,12 @@ public class TContext { try { final EaterIncludesub include = new EaterIncludesub(s.getTrimmed()); include.analyze(this, memory); - final String location = include.getLocation(); - final int idx = location.indexOf('!'); + final String what = include.getWhat(); + final int idx = what.indexOf('!'); Sub sub = null; if (idx != -1) { - final String filename = location.substring(0, idx); - final String blocname = location.substring(idx + 1); + final String filename = what.substring(0, idx); + final String blocname = what.substring(idx + 1); try { final FileWithSuffix f2 = importedFiles.getFile(filename, null); if (f2.fileOk()) { @@ -556,10 +556,10 @@ public class TContext { this.importedFiles = this.importedFiles.withCurrentDir(f2.getParentFile()); final Reader reader = f2.getReader(charset); if (reader == null) - throw EaterException.located("cannot include " + location); + throw EaterException.located("cannot include " + what, s); try { - ReadLine readerline = ReadLineReader.create(reader, location, s.getLocation()); + ReadLine readerline = ReadLineReader.create(reader, what, s.getLocation()); readerline = new UncommentReadLine(readerline); sub = Sub.fromFile(readerline, blocname, this, memory); } finally { @@ -568,14 +568,14 @@ public class TContext { } } catch (IOException e) { Logme.error(e); - throw EaterException.located("cannot include " + location); + throw EaterException.located("cannot include " + what, s); } } if (sub == null) - sub = subs.get(location); + sub = subs.get(what); if (sub == null) - throw EaterException.located("cannot include " + location); + throw EaterException.located("cannot include " + what, s); executeLinesInternal(memory, sub.lines(), null); } finally { @@ -604,7 +604,7 @@ public class TContext { } while (true); } catch (IOException e) { Logme.error(e); - throw EaterException.located("" + e); + throw EaterException.located("" + e, s); } finally { try { reader2.close(); @@ -619,7 +619,7 @@ public class TContext { eater.analyze(this, memory); final ReadLine reader = eater.getTheme(); if (reader == null) - throw EaterException.located("No such theme " + eater.getName()); + throw EaterException.located("No such theme " + eater.getName(), s); try { final List body = new ArrayList<>(); @@ -633,7 +633,7 @@ public class TContext { } while (true); } catch (IOException e) { Logme.error(e); - throw EaterException.located("Error reading theme " + e); + throw EaterException.located("Error reading theme " + e, s); } finally { try { reader.close(); @@ -646,7 +646,7 @@ public class TContext { private void executeInclude(TMemory memory, StringLocated s) throws EaterException, EaterExceptionLocated { final EaterInclude include = new EaterInclude(s.getTrimmed()); include.analyze(this, memory); - String location = include.getLocation(); + String location = include.getWhat(); final PreprocessorIncludeStrategy strategy = include.getPreprocessorIncludeStrategy(); final int idx = location.lastIndexOf('!'); String suf = null; @@ -661,7 +661,7 @@ public class TContext { if (location.startsWith("http://") || location.startsWith("https://")) { final SURL url = SURL.create(location); if (url == null) - throw EaterException.located("Cannot open URL"); + throw EaterException.located("Cannot open URL", s); reader = PreprocessorUtils.getReaderIncludeUrl(url, s, suf, charset); } else if (location.startsWith("<") && location.endsWith(">")) { @@ -677,14 +677,14 @@ public class TContext { return; if (strategy == PreprocessorIncludeStrategy.ONCE && filesUsedCurrent.contains(f2)) - throw EaterException.located("This file has already been included"); + throw EaterException.located("This file has already been included", s); if (StartDiagramExtractReader.containsStartDiagram(f2, s, charset)) { reader = StartDiagramExtractReader.build(f2, s, charset); } else { final Reader tmp = f2.getReader(charset); if (tmp == null) - throw EaterException.located("Cannot include file"); + throw EaterException.located("Cannot include file", s); reader = ReadLineReader.create(tmp, location, s.getLocation()); } @@ -713,7 +713,7 @@ public class TContext { } } catch (IOException e) { Logme.error(e); - throw EaterException.located("cannot include " + e); + throw EaterException.located("cannot include " + e, s); } finally { if (reader != null) { try { @@ -724,7 +724,7 @@ public class TContext { } } - throw EaterException.located("cannot include " + location); + throw EaterException.located("cannot include " + location, s); } public boolean isLegacyDefine(String functionName) { diff --git a/src/net/sourceforge/plantuml/tim/TFunctionImpl.java b/src/net/sourceforge/plantuml/tim/TFunctionImpl.java index 4d1237feb..506dc465d 100644 --- a/src/net/sourceforge/plantuml/tim/TFunctionImpl.java +++ b/src/net/sourceforge/plantuml/tim/TFunctionImpl.java @@ -148,12 +148,12 @@ public class TFunctionImpl implements TFunction { return executeReturnLegacyDefine(location.getLocation(), context, memory, args); if (functionType != TFunctionType.RETURN_FUNCTION) - throw EaterException.unlocated("Illegal call here. Is there a return directive in your function?"); + throw EaterException.unlocated("Illegal call here. Is there a return directive in your function?", location); final TMemory copy = getNewMemory(memory, args, named); final TValue result = context.executeLines(copy, body, TFunctionType.RETURN_FUNCTION, true); if (result == null) - throw EaterException.unlocated("No return directive found in your function"); + throw EaterException.unlocated("No return directive found in your function", location); return result; } diff --git a/src/net/sourceforge/plantuml/tim/TMemory.java b/src/net/sourceforge/plantuml/tim/TMemory.java index a1f830e79..466b5951b 100644 --- a/src/net/sourceforge/plantuml/tim/TMemory.java +++ b/src/net/sourceforge/plantuml/tim/TMemory.java @@ -37,13 +37,15 @@ package net.sourceforge.plantuml.tim; import java.util.Map; import java.util.Set; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.tim.expression.TValue; public interface TMemory { public TValue getVariable(String varname); - public void putVariable(String varname, TValue value, TVariableScope scope) throws EaterException; + public void putVariable(String varname, TValue value, TVariableScope scope, StringLocated location) + throws EaterException; public void removeVariable(String varname); diff --git a/src/net/sourceforge/plantuml/tim/TMemoryGlobal.java b/src/net/sourceforge/plantuml/tim/TMemoryGlobal.java index 9b10805a4..f5587df1b 100644 --- a/src/net/sourceforge/plantuml/tim/TMemoryGlobal.java +++ b/src/net/sourceforge/plantuml/tim/TMemoryGlobal.java @@ -41,6 +41,7 @@ import java.util.Map.Entry; import java.util.Set; import java.util.TreeMap; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.tim.expression.TValue; import net.sourceforge.plantuml.utils.Log; @@ -49,10 +50,12 @@ public class TMemoryGlobal extends ExecutionContexts implements TMemory { private final Map globalVariables = new HashMap(); private final TrieImpl variables = new TrieImpl(); + @Override public TValue getVariable(String varname) { return this.globalVariables.get(varname); } + @Override public void dumpDebug(String message) { Log.error("[MemGlobal] Start of memory_dump " + message); dumpMemoryInternal(); @@ -68,32 +71,39 @@ public class TMemoryGlobal extends ExecutionContexts implements TMemory { } } - public void putVariable(String varname, TValue value, TVariableScope scope) throws EaterException { + @Override + public void putVariable(String varname, TValue value, TVariableScope scope, StringLocated location) + throws EaterException { Log.info("[MemGlobal] Setting " + varname); - if (scope == TVariableScope.LOCAL) { - throw EaterException.unlocated("Cannot use local variable here"); - } + if (scope == TVariableScope.LOCAL) + throw EaterException.unlocated("Cannot use local variable here", location); + this.globalVariables.put(varname, value); this.variables.add(varname); } + @Override public void removeVariable(String varname) { this.globalVariables.remove(varname); this.variables.remove(varname); } + @Override public boolean isEmpty() { return globalVariables.isEmpty(); } + @Override public Set variablesNames() { return Collections.unmodifiableSet(globalVariables.keySet()); } + @Override public Trie variablesNames3() { return variables; } + @Override public TMemory forkFromGlobal(Map input) { return new TMemoryLocal(this, input); } diff --git a/src/net/sourceforge/plantuml/tim/TMemoryLocal.java b/src/net/sourceforge/plantuml/tim/TMemoryLocal.java index 4d9b7da33..2603e1d0d 100644 --- a/src/net/sourceforge/plantuml/tim/TMemoryLocal.java +++ b/src/net/sourceforge/plantuml/tim/TMemoryLocal.java @@ -40,6 +40,7 @@ import java.util.Map.Entry; import java.util.Set; import java.util.TreeMap; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.tim.expression.TValue; import net.sourceforge.plantuml.utils.Log; @@ -76,19 +77,21 @@ public class TMemoryLocal extends ExecutionContexts implements TMemory { Log.error("[MemGlobal] End of memory_dump"); } - public void putVariable(String varname, TValue value, TVariableScope scope) throws EaterException { + @Override + public void putVariable(String varname, TValue value, TVariableScope scope, StringLocated location) + throws EaterException { if (scope == TVariableScope.GLOBAL) { - memoryGlobal.putVariable(varname, value, scope); + memoryGlobal.putVariable(varname, value, scope, location); return; } if (scope == TVariableScope.LOCAL || overridenVariables01.containsKey(varname)) { this.overridenVariables01.put(varname, value); - if (this.overridenVariables00 != null) { + if (this.overridenVariables00 != null) this.overridenVariables00.add(varname); - } + Log.info("[MemLocal/overrriden] Setting " + varname); } else if (memoryGlobal.getVariable(varname) != null) { - memoryGlobal.putVariable(varname, value, scope); + memoryGlobal.putVariable(varname, value, scope, location); } else { this.localVariables01.put(varname, value); this.localVariables00.add(varname); @@ -96,12 +99,13 @@ public class TMemoryLocal extends ExecutionContexts implements TMemory { } } + @Override public void removeVariable(String varname) { if (overridenVariables01.containsKey(varname)) { this.overridenVariables01.remove(varname); - if (this.overridenVariables00 != null) { + if (this.overridenVariables00 != null) this.overridenVariables00.remove(varname); - } + } else if (memoryGlobal.getVariable(varname) != null) { memoryGlobal.removeVariable(varname); } else { @@ -110,25 +114,27 @@ public class TMemoryLocal extends ExecutionContexts implements TMemory { } } + @Override public TValue getVariable(String varname) { TValue result = overridenVariables01.get(varname); - if (result != null) { + if (result != null) return result; - } + result = memoryGlobal.getVariable(varname); - if (result != null) { + if (result != null) return result; - } + result = localVariables01.get(varname); return result; } + @Override public Trie variablesNames3() { if (overridenVariables00 == null) { overridenVariables00 = new TrieImpl(); - for (String name : overridenVariables01.keySet()) { + for (String name : overridenVariables01.keySet()) overridenVariables00.add(name); - } + } return new Trie() { public void add(String s) { @@ -140,12 +146,12 @@ public class TMemoryLocal extends ExecutionContexts implements TMemory { final String s2 = overridenVariables00.getLonguestMatchStartingIn(s); final String s3 = localVariables00.getLonguestMatchStartingIn(s); - if (s1.length() >= s2.length() && s1.length() >= s3.length()) { + if (s1.length() >= s2.length() && s1.length() >= s3.length()) return s1; - } - if (s2.length() >= s3.length() && s2.length() >= s1.length()) { + + if (s2.length() >= s3.length() && s2.length() >= s1.length()) return s2; - } + return s3; } }; @@ -162,14 +168,17 @@ public class TMemoryLocal extends ExecutionContexts implements TMemory { // return result; } + @Override public boolean isEmpty() { return memoryGlobal.isEmpty() && localVariables01.isEmpty() && overridenVariables01.isEmpty(); } + @Override public Set variablesNames() { throw new UnsupportedOperationException(); } + @Override public TMemory forkFromGlobal(Map input) { return new TMemoryLocal(memoryGlobal, input); } diff --git a/src/net/sourceforge/plantuml/tim/TimLoader.java b/src/net/sourceforge/plantuml/tim/TimLoader.java index de15c55f9..7d8bd5c93 100644 --- a/src/net/sourceforge/plantuml/tim/TimLoader.java +++ b/src/net/sourceforge/plantuml/tim/TimLoader.java @@ -53,10 +53,10 @@ public class TimLoader { private List resultList; public TimLoader(ImportedFiles importedFiles, Defines defines, Charset charset, - DefinitionsContainer definitionsContainer) { + DefinitionsContainer definitionsContainer, StringLocated location) { this.context = new TContext(importedFiles, defines, charset, definitionsContainer); try { - defines.copyTo(global); + defines.copyTo(global, location); } catch (EaterException e) { Logme.error(e); } diff --git a/src/net/sourceforge/plantuml/tim/VariableManager.java b/src/net/sourceforge/plantuml/tim/VariableManager.java index 88332ac3d..1f9a66dc4 100644 --- a/src/net/sourceforge/plantuml/tim/VariableManager.java +++ b/src/net/sourceforge/plantuml/tim/VariableManager.java @@ -46,9 +46,9 @@ public class VariableManager { private final TMemory memory; private final TContext context; - private final LineLocation location; + private final StringLocated location; - public VariableManager(TContext context, TMemory memory, LineLocation location) { + public VariableManager(TContext context, TMemory memory, StringLocated location) { this.memory = memory; this.context = context; this.location = location; @@ -56,9 +56,9 @@ public class VariableManager { public int replaceVariables(String str, int i, StringBuilder result) throws EaterException, EaterExceptionLocated { final String presentVariable = getVarnameAt(str, i); - if (result.toString().endsWith("##")) { + if (result.toString().endsWith("##")) result.setLength(result.length() - 2); - } + final TValue value = memory.getVariable(presentVariable); i += presentVariable.length() - 1; if (value.isJson()) { @@ -75,9 +75,9 @@ public class VariableManager { } else { result.append(value.toString()); } - if (i + 2 < str.length() && str.charAt(i + 1) == '#' && str.charAt(i + 2) == '#') { + if (i + 2 < str.length() && str.charAt(i + 1) == '#' && str.charAt(i + 2) == '#') i += 2; - } + return i; } @@ -89,9 +89,9 @@ public class VariableManager { i++; final StringBuilder fieldName = new StringBuilder(); while (i < str.length()) { - if (Character.isJavaIdentifierPart(str.charAt(i)) == false) { + if (Character.isJavaIdentifierPart(str.charAt(i)) == false) break; - } + fieldName.append(str.charAt(i)); i++; } @@ -101,9 +101,9 @@ public class VariableManager { final StringBuilder inBracket = new StringBuilder(); int level = 0; while (true) { - if (str.charAt(i) == '[') { + if (str.charAt(i) == '[') level++; - } + if (str.charAt(i) == ']') { if (level == 0) break; @@ -113,29 +113,29 @@ public class VariableManager { i++; } final String nbString = context.applyFunctionsAndVariables(memory, - new StringLocated(inBracket.toString(), location)); + new StringLocated(inBracket.toString(), location.getLocation())); if (jsonValue instanceof JsonArray) { final int nb = Integer.parseInt(nbString); jsonValue = ((JsonArray) jsonValue).get(nb); } else if (jsonValue instanceof JsonObject) { jsonValue = ((JsonObject) jsonValue).get(nbString); } else { - throw EaterException.unlocated("Major parsing error"); - } - if (jsonValue == null) { - throw EaterException.unlocated("Data parsing error"); + throw EaterException.unlocated("Major parsing error", location); } + + if (jsonValue == null) + throw EaterException.unlocated("Data parsing error", location); + i++; } else { break; } } if (jsonValue != null) { - if (jsonValue.isString()) { + if (jsonValue.isString()) result.append(jsonValue.asString()); - } else { + else result.append(jsonValue.toString()); - } } return i; } @@ -146,13 +146,13 @@ public class VariableManager { return null; } final String varname = memory.variablesNames3().getLonguestMatchStartingIn(s.substring(pos)); - if (varname.length() == 0) { + if (varname.length() == 0) return null; - } + if (pos + varname.length() == s.length() - || TLineType.isLetterOrUnderscoreOrDigit(s.charAt(pos + varname.length())) == false) { + || TLineType.isLetterOrUnderscoreOrDigit(s.charAt(pos + varname.length())) == false) return varname; - } + return null; } diff --git a/src/net/sourceforge/plantuml/tim/expression/ReversePolishInterpretor.java b/src/net/sourceforge/plantuml/tim/expression/ReversePolishInterpretor.java index 4d19e7642..5ef785efd 100644 --- a/src/net/sourceforge/plantuml/tim/expression/ReversePolishInterpretor.java +++ b/src/net/sourceforge/plantuml/tim/expression/ReversePolishInterpretor.java @@ -47,18 +47,12 @@ import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunction; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; -import net.sourceforge.plantuml.utils.LineLocation; public class ReversePolishInterpretor { private final TValue result; private final boolean trace = false; - public ReversePolishInterpretor(TokenStack queue, Knowledge knowledge, TMemory memory, TContext context) - throws EaterException, EaterExceptionLocated { - this(null, queue, knowledge, memory, context); - } - public ReversePolishInterpretor(StringLocated location, TokenStack queue, Knowledge knowledge, TMemory memory, TContext context) throws EaterException, EaterExceptionLocated { @@ -79,45 +73,45 @@ public class ReversePolishInterpretor { final TValue v2 = stack.removeFirst(); final TValue v1 = stack.removeFirst(); final TokenOperator op = token.getTokenOperator(); - if (op == null) { - throw EaterException.unlocated("bad op"); - } + if (op == null) + throw EaterException.unlocated("bad op", location); + final TValue tmp = op.operate(v1, v2); stack.addFirst(tmp); } else if (token.getTokenType() == TokenType.OPEN_PAREN_FUNC) { final int nb = Integer.parseInt(token.getSurface()); final Token token2 = it.nextToken(); - if (token2.getTokenType() != TokenType.FUNCTION_NAME) { - throw EaterException.unlocated("rpn43"); - } + if (token2.getTokenType() != TokenType.FUNCTION_NAME) + throw EaterException.unlocated("rpn43", location); + if (trace) System.err.println("token2=" + token2); final TFunction function = knowledge.getFunction(new TFunctionSignature(token2.getSurface(), nb)); if (trace) System.err.println("function=" + function); - if (function == null) { - throw EaterException.unlocated("Unknown built-in function " + token2.getSurface()); - } - if (function.canCover(nb, Collections.emptySet()) == false) { - throw EaterException - .unlocated("Bad number of arguments for " + function.getSignature().getFunctionName()); - } + if (function == null) + throw EaterException.unlocated("Unknown built-in function " + token2.getSurface(), location); + + if (function.canCover(nb, Collections.emptySet()) == false) + throw EaterException.unlocated( + "Bad number of arguments for " + function.getSignature().getFunctionName(), location); + final List args = new ArrayList<>(); - for (int i = 0; i < nb; i++) { + for (int i = 0; i < nb; i++) args.add(0, stack.removeFirst()); - } + if (trace) System.err.println("args=" + args); - if (location == null) { - throw EaterException.unlocated("rpn44"); - } + if (location == null) + throw EaterException.unlocated("rpn44", location); + final TValue r = function.executeReturnFunction(context, memory, location, args, Collections.emptyMap()); if (trace) System.err.println("r=" + r); stack.addFirst(r); } else { - throw EaterException.unlocated("rpn41"); + throw EaterException.unlocated("rpn41", location); } } result = stack.removeFirst(); diff --git a/src/net/sourceforge/plantuml/tim/expression/ShuntingYard.java b/src/net/sourceforge/plantuml/tim/expression/ShuntingYard.java index c6366f6bd..4b40aab8f 100644 --- a/src/net/sourceforge/plantuml/tim/expression/ShuntingYard.java +++ b/src/net/sourceforge/plantuml/tim/expression/ShuntingYard.java @@ -37,6 +37,7 @@ package net.sourceforge.plantuml.tim.expression; import java.util.ArrayDeque; import java.util.Deque; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; @@ -58,7 +59,8 @@ public class ShuntingYard { System.err.println(""); } - public ShuntingYard(TokenIterator it, Knowledge knowledge) throws EaterException, EaterExceptionLocated { + public ShuntingYard(TokenIterator it, Knowledge knowledge, StringLocated location) + throws EaterException, EaterExceptionLocated { while (it.hasMoreTokens()) { final Token token = it.nextToken(); @@ -74,7 +76,7 @@ public class ShuntingYard { final TValue variable = knowledge.getVariable(name); if (variable == null) { if (isVariableName(name) == false) - throw EaterException.unlocated("Parsing syntax error about " + name); + throw EaterException.unlocated("Parsing syntax error about " + name, location); ouputQueue.add(new Token(name, TokenType.QUOTED_STRING, null)); } else { diff --git a/src/net/sourceforge/plantuml/tim/expression/TokenStack.java b/src/net/sourceforge/plantuml/tim/expression/TokenStack.java index 61eeebae6..b25c96f6c 100644 --- a/src/net/sourceforge/plantuml/tim/expression/TokenStack.java +++ b/src/net/sourceforge/plantuml/tim/expression/TokenStack.java @@ -48,7 +48,6 @@ import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TMemory; -import net.sourceforge.plantuml.utils.LineLocation; public class TokenStack { @@ -96,7 +95,7 @@ public class TokenStack { eater.skipSpaces(); final char ch = eater.peekChar(); if (ch == 0) - throw EaterException.unlocated("until001"); + throw EaterException.unlocated("until001", eater.getStringLocated()); if (level == 0 && (ch == ',' || ch == ')')) return result; @@ -114,12 +113,12 @@ public class TokenStack { } } - static public void eatUntilCloseParenthesisOrComma(TokenIterator it) throws EaterException { + static public void eatUntilCloseParenthesisOrComma(TokenIterator it, StringLocated location) throws EaterException { int level = 0; while (true) { final Token ch = it.peekToken(); if (ch == null) - throw EaterException.unlocated("until002"); + throw EaterException.unlocated("until002", location); final TokenType typech = ch.getTokenType(); if (level == 0 && (typech == TokenType.COMMA || typech == TokenType.CLOSE_PAREN_MATH) @@ -136,7 +135,7 @@ public class TokenStack { } } - private int countFunctionArg(TokenIterator it) throws EaterException { + private int countFunctionArg(TokenIterator it, StringLocated location) throws EaterException { // return 42; final TokenType type1 = it.peekToken().getTokenType(); if (type1 == TokenType.CLOSE_PAREN_MATH || type1 == TokenType.CLOSE_PAREN_FUNC) @@ -144,7 +143,7 @@ public class TokenStack { int result = 1; while (it.hasMoreTokens()) { - eatUntilCloseParenthesisOrComma(it); + eatUntilCloseParenthesisOrComma(it, location); final Token token = it.nextToken(); final TokenType type = token.getTokenType(); if (type == TokenType.CLOSE_PAREN_MATH || type == TokenType.CLOSE_PAREN_FUNC) @@ -152,13 +151,13 @@ public class TokenStack { else if (type == TokenType.COMMA) result++; else - throw EaterException.unlocated("count13"); + throw EaterException.unlocated("count13", location); } - throw EaterException.unlocated("count12"); + throw EaterException.unlocated("count12", location); } - public void guessFunctions() throws EaterException { + public void guessFunctions(StringLocated location) throws EaterException { final Deque open = new ArrayDeque<>(); final Map parens = new HashMap(); for (int i = 0; i < tokens.size(); i++) { @@ -178,7 +177,7 @@ public class TokenStack { assert tokens.get(iclose).getTokenType() == TokenType.CLOSE_PAREN_MATH; if (iopen > 0 && tokens.get(iopen - 1).getTokenType() == TokenType.PLAIN_TEXT) { tokens.set(iopen - 1, new Token(tokens.get(iopen - 1).getSurface(), TokenType.FUNCTION_NAME, null)); - final int nbArg = countFunctionArg(subTokenStack(iopen + 1).tokenIterator()); + final int nbArg = countFunctionArg(subTokenStack(iopen + 1).tokenIterator(), location); tokens.set(iopen, new Token("" + nbArg, TokenType.OPEN_PAREN_FUNC, null)); tokens.set(iclose, new Token(")", TokenType.CLOSE_PAREN_FUNC, null)); } @@ -215,9 +214,9 @@ public class TokenStack { throws EaterException, EaterExceptionLocated { final Knowledge knowledge = context.asKnowledge(memory, location.getLocation()); final TokenStack tmp = withoutSpace(); - tmp.guessFunctions(); + tmp.guessFunctions(location); final TokenIterator it = tmp.tokenIterator(); - final ShuntingYard shuntingYard = new ShuntingYard(it, knowledge); + final ShuntingYard shuntingYard = new ShuntingYard(it, knowledge, location); final ReversePolishInterpretor rpn = new ReversePolishInterpretor(location, shuntingYard.getQueue(), knowledge, memory, context); return rpn.getResult(); diff --git a/src/net/sourceforge/plantuml/tim/iterator/AbstractCodeIterator.java b/src/net/sourceforge/plantuml/tim/iterator/AbstractCodeIterator.java index 83165b8ee..a4e9a62aa 100644 --- a/src/net/sourceforge/plantuml/tim/iterator/AbstractCodeIterator.java +++ b/src/net/sourceforge/plantuml/tim/iterator/AbstractCodeIterator.java @@ -34,6 +34,7 @@ */ package net.sourceforge.plantuml.tim.iterator; +import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; @@ -45,16 +46,19 @@ public abstract class AbstractCodeIterator implements CodeIterator { this.source = source; } + @Override public void next() throws EaterException, EaterExceptionLocated { source.next(); } + @Override final public CodePosition getCodePosition() { return source.getCodePosition(); } - final public void jumpToCodePosition(CodePosition newPosition) throws EaterException { - source.jumpToCodePosition(newPosition); + @Override + final public void jumpToCodePosition(CodePosition newPosition, StringLocated location) throws EaterException { + source.jumpToCodePosition(newPosition, location); } } diff --git a/src/net/sourceforge/plantuml/tim/iterator/CodeIterator.java b/src/net/sourceforge/plantuml/tim/iterator/CodeIterator.java index c0b59f04d..48698ab5c 100644 --- a/src/net/sourceforge/plantuml/tim/iterator/CodeIterator.java +++ b/src/net/sourceforge/plantuml/tim/iterator/CodeIterator.java @@ -39,7 +39,7 @@ import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; public interface CodeIterator { - // ::remove folder when __HAXE__ + // ::remove folder when __HAXE__ public StringLocated peek() throws EaterException, EaterExceptionLocated; @@ -47,6 +47,6 @@ public interface CodeIterator { public CodePosition getCodePosition(); - public void jumpToCodePosition(CodePosition newPosition) throws EaterException; + public void jumpToCodePosition(CodePosition newPosition, StringLocated location) throws EaterException; } diff --git a/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorAffectation.java b/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorAffectation.java index e2a5fc5e9..0d380a436 100644 --- a/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorAffectation.java +++ b/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorAffectation.java @@ -58,6 +58,7 @@ public class CodeIteratorAffectation extends AbstractCodeIterator { this.logs = log; } + @Override public StringLocated peek() throws EaterException, EaterExceptionLocated { while (true) { final StringLocated result = source.peek(); @@ -81,9 +82,9 @@ public class CodeIteratorAffectation extends AbstractCodeIterator { this.executeAffectation(context, memory, result); return; } catch (ParseException e) { - if (e.getColumn() <= lastLocation) { - throw EaterException.located("Error in JSON format"); - } + if (e.getColumn() <= lastLocation) + throw EaterException.located("Error in JSON format", result); + lastLocation = e.getColumn(); next(); final StringLocated forward = source.peek(); diff --git a/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorForeach.java b/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorForeach.java index 540b1e1be..87a783882 100644 --- a/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorForeach.java +++ b/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorForeach.java @@ -65,9 +65,8 @@ public class CodeIteratorForeach extends AbstractCodeIterator { int level = 0; while (true) { final StringLocated result = source.peek(); - if (result == null) { + if (result == null) return null; - } final ExecutionContextForeach foreach = memory.peekForeach(); if (foreach != null && foreach.isSkipMe()) { @@ -91,15 +90,15 @@ public class CodeIteratorForeach extends AbstractCodeIterator { continue; } else if (result.getType() == TLineType.ENDFOREACH) { logs.add(result); - if (foreach == null) { - throw EaterException.located("No foreach related to this endforeach"); - } + if (foreach == null) + throw EaterException.located("No foreach related to this endforeach", result); + foreach.inc(); if (foreach.isSkipMe()) { memory.pollForeach(); } else { setLoopVariable(memory, foreach, result); - source.jumpToCodePosition(foreach.getStartForeach()); + source.jumpToCodePosition(foreach.getStartForeach(), result); } next(); continue; @@ -114,18 +113,18 @@ public class CodeIteratorForeach extends AbstractCodeIterator { condition.analyze(context, memory); final ExecutionContextForeach foreach = ExecutionContextForeach.fromValue(condition.getVarname(), condition.getJsonArray(), source.getCodePosition()); - if (condition.isSkip()) { + if (condition.isSkip()) foreach.skipMeNow(); - } else { + else setLoopVariable(memory, foreach, s); - } + memory.addForeach(foreach); } private void setLoopVariable(TMemory memory, ExecutionContextForeach foreach, StringLocated position) throws EaterException { final JsonValue first = foreach.getJsonArray().get(foreach.currentIndex()); - memory.putVariable(foreach.getVarname(), TValue.fromJson(first), TVariableScope.GLOBAL); + memory.putVariable(foreach.getVarname(), TValue.fromJson(first), TVariableScope.GLOBAL, position); } } diff --git a/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorIf.java b/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorIf.java index 8ee1d08a1..43ae09658 100644 --- a/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorIf.java +++ b/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorIf.java @@ -118,18 +118,17 @@ public class CodeIteratorIf extends AbstractCodeIterator { private void executeElseIf(TContext context, TMemory memory, StringLocated s) throws EaterException, EaterExceptionLocated { final ExecutionContextIf poll = (ExecutionContextIf) memory.peekIf(); - if (poll == null) { - throw EaterException.located("No if related to this else"); - } + if (poll == null) + throw EaterException.located("No if related to this else", s); poll.enteringElseIf(); if (poll.hasBeenBurn() == false) { final EaterElseIf condition = new EaterElseIf(s); condition.analyze(context, memory); final boolean isTrue = condition.isTrue(); - if (isTrue) { + if (isTrue) poll.nowInSomeElseIf(); - } + } } @@ -149,17 +148,17 @@ public class CodeIteratorIf extends AbstractCodeIterator { private void executeElse(TContext context, TMemory memory, StringLocated s) throws EaterException { final ExecutionContextIf poll = (ExecutionContextIf) memory.peekIf(); - if (poll == null) { - throw EaterException.located("No if related to this else"); - } + if (poll == null) + throw EaterException.located("No if related to this else", s); + poll.nowInElse(); } private void executeEndif(TContext context, TMemory memory, StringLocated s) throws EaterException { final ExecutionContextIf poll = (ExecutionContextIf) memory.pollIf(); - if (poll == null) { - throw EaterException.located("No if related to this endif"); - } + if (poll == null) + throw EaterException.located("No if related to this endif", s); + } } diff --git a/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorImpl.java b/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorImpl.java index e00986810..985fcd398 100644 --- a/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorImpl.java +++ b/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorImpl.java @@ -62,34 +62,38 @@ public class CodeIteratorImpl implements CodeIterator { this.list = list; } + @Override public StringLocated peek() { - if (current == list.size()) { + if (current == list.size()) return null; - } - if (current > list.size()) { + + if (current > list.size()) throw new IllegalStateException(); - } + return list.get(current); } + @Override public void next() { - if (current >= list.size()) { + if (current >= list.size()) throw new IllegalStateException(); - } + assert current < list.size(); current++; assert current <= list.size(); } + @Override public CodePosition getCodePosition() { return new Position(current); } - public void jumpToCodePosition(CodePosition newPosition) throws EaterException { + @Override + public void jumpToCodePosition(CodePosition newPosition, StringLocated location) throws EaterException { this.countJump++; - if (this.countJump > 999) { - throw EaterException.unlocated("Infinite loop?"); - } + if (this.countJump > 999) + throw EaterException.unlocated("Infinite loop?", location); + final Position pos = (Position) newPosition; this.current = pos.pos; diff --git a/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorSub.java b/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorSub.java index 6a7aaa876..2c15a7b3e 100644 --- a/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorSub.java +++ b/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorSub.java @@ -67,13 +67,13 @@ public class CodeIteratorSub extends AbstractCodeIterator { } public StringLocated peek() throws EaterException, EaterExceptionLocated { - if (readingInProgress != null) { + if (readingInProgress != null) return readingInProgress.peek(); - } + StringLocated result = source.peek(); - if (result == null) { + if (result == null) return null; - } + if (result.getType() == TLineType.STARTSUB) { final EaterStartsub eater = new EaterStartsub(result.getTrimmed()); eater.analyze(context, memory); @@ -83,7 +83,7 @@ public class CodeIteratorSub extends AbstractCodeIterator { StringLocated s = null; while ((s = source.peek()) != null) { if (s.getType() == TLineType.STARTSUB) { - throw EaterException.located("Cannot nest sub"); + throw EaterException.located("Cannot nest sub", result); } else if (s.getType() == TLineType.ENDSUB) { source.next(); readingInProgress = new CodeIteratorImpl(created.lines()); @@ -94,9 +94,9 @@ public class CodeIteratorSub extends AbstractCodeIterator { } } } - if (readingInProgress != null) { + if (readingInProgress != null) return readingInProgress.peek(); - } + return result; } @@ -107,9 +107,9 @@ public class CodeIteratorSub extends AbstractCodeIterator { return; } readingInProgress.next(); - if (readingInProgress.peek() == null) { + if (readingInProgress.peek() == null) readingInProgress = null; - } + } } diff --git a/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorWhile.java b/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorWhile.java index 84f201e6a..01b445898 100644 --- a/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorWhile.java +++ b/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorWhile.java @@ -64,9 +64,8 @@ public class CodeIteratorWhile extends AbstractCodeIterator { int level = 0; while (true) { final StringLocated result = source.peek(); - if (result == null) { + if (result == null) return null; - } final ExecutionContextWhile currentWhile = memory.peekWhile(); if (currentWhile != null && currentWhile.isSkipMe()) { @@ -91,14 +90,14 @@ public class CodeIteratorWhile extends AbstractCodeIterator { } else if (result.getType() == TLineType.ENDWHILE) { logs.add(result); if (currentWhile == null) - throw EaterException.located("No while related to this endwhile"); + throw EaterException.located("No while related to this endwhile", result); final TValue value = currentWhile.conditionValue(result, context, memory); - if (value.toBoolean()) { - source.jumpToCodePosition(currentWhile.getStartWhile()); - } else { + if (value.toBoolean()) + source.jumpToCodePosition(currentWhile.getStartWhile(), result); + else memory.pollWhile(); - } + next(); continue; } diff --git a/src/net/sourceforge/plantuml/tim/stdlib/CallUserFunction.java b/src/net/sourceforge/plantuml/tim/stdlib/CallUserFunction.java index 0bc47532a..830f5bf25 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/CallUserFunction.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/CallUserFunction.java @@ -65,9 +65,9 @@ public class CallUserFunction extends SimpleReturnFunction { final List args = values.subList(1, values.size()); final TFunctionSignature signature = new TFunctionSignature(fname, args.size()); final TFunction func = context.getFunctionSmart(signature); - if (func == null) { - throw EaterException.unlocated("Cannot find void function " + fname); - } + if (func == null) + throw EaterException.unlocated("Cannot find void function " + fname, location); + return func.executeReturnFunction(context, memory, location, args, named); } diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Darken.java b/src/net/sourceforge/plantuml/tim/stdlib/Darken.java index 4a282d150..1365c7614 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Darken.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/Darken.java @@ -71,7 +71,7 @@ public class Darken extends SimpleReturnFunction { color = color.darken(ratio); return TValue.fromString(color.asString()); } catch (NoSuchColorException e) { - throw EaterException.located("No such color"); + throw EaterException.located("No such color", location); } } } diff --git a/src/net/sourceforge/plantuml/tim/stdlib/DateFunction.java b/src/net/sourceforge/plantuml/tim/stdlib/DateFunction.java index e596ef4b7..0db1db510 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/DateFunction.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/DateFunction.java @@ -71,10 +71,11 @@ public class DateFunction extends SimpleReturnFunction { now = 1000L * values.get(1).toInt(); else now = System.currentTimeMillis(); + try { return TValue.fromString(new SimpleDateFormat(format).format(now)); } catch (Exception e) { - throw EaterException.unlocated("Bad date pattern"); + throw EaterException.unlocated("Bad date pattern", location); } } } diff --git a/src/net/sourceforge/plantuml/tim/stdlib/GetAllStdlib.java b/src/net/sourceforge/plantuml/tim/stdlib/GetAllStdlib.java index 4bac0865e..2bc32f045 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/GetAllStdlib.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/GetAllStdlib.java @@ -99,7 +99,8 @@ public class GetAllStdlib extends SimpleReturnFunction { } default: - throw EaterException.located("Error on get_all_stdlib: Too many arguments"); + assert false; // Should not append because of canCover() + throw EaterException.located("Error on get_all_stdlib: Too many arguments", location); } } } diff --git a/src/net/sourceforge/plantuml/tim/stdlib/GetJsonKey.java b/src/net/sourceforge/plantuml/tim/stdlib/GetJsonKey.java index 0bd617053..5b48e27c4 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/GetJsonKey.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/GetJsonKey.java @@ -65,7 +65,8 @@ public class GetJsonKey extends SimpleReturnFunction { Map named) throws EaterException, EaterExceptionLocated { final TValue data = values.get(0); if (data.isJson() == false) - throw EaterException.unlocated("Not JSON data"); + throw EaterException.unlocated("Not JSON data", location); + final JsonValue json = data.toJson(); if (json.isObject()) { final JsonObject object = (JsonObject) json; @@ -87,7 +88,7 @@ public class GetJsonKey extends SimpleReturnFunction { return TValue.fromJson(result); } - throw EaterException.unlocated("Bad JSON type"); + throw EaterException.unlocated("Bad JSON type", location); } diff --git a/src/net/sourceforge/plantuml/tim/stdlib/InvokeProcedure.java b/src/net/sourceforge/plantuml/tim/stdlib/InvokeProcedure.java index 64503ed11..01e4f2036 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/InvokeProcedure.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/InvokeProcedure.java @@ -71,7 +71,7 @@ public class InvokeProcedure implements TFunction { final TFunctionSignature signature = new TFunctionSignature(fname, sublist.size()); final TFunction func = context.getFunctionSmart(signature); if (func == null) - throw EaterException.located("Cannot find void function " + fname); + throw EaterException.located("Cannot find void function " + fname, location); func.executeProcedureInternal(context, memory, location, sublist, named); } diff --git a/src/net/sourceforge/plantuml/tim/stdlib/IsDark.java b/src/net/sourceforge/plantuml/tim/stdlib/IsDark.java index d8f337bf5..f8fa6c394 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/IsDark.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/IsDark.java @@ -69,7 +69,7 @@ public class IsDark extends SimpleReturnFunction { final HColor color = HColorSet.instance().getColorLEGACY(colorString); return TValue.fromBoolean(color.isDark()); } catch (NoSuchColorException e) { - throw EaterException.located("No such color"); + throw EaterException.located("No such color", location); } } } diff --git a/src/net/sourceforge/plantuml/tim/stdlib/IsLight.java b/src/net/sourceforge/plantuml/tim/stdlib/IsLight.java index e298e1baa..771425750 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/IsLight.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/IsLight.java @@ -69,7 +69,7 @@ public class IsLight extends SimpleReturnFunction { final HColor color = HColorSet.instance().getColorLEGACY(colorString); return TValue.fromBoolean(!color.isDark()); } catch (NoSuchColorException e) { - throw EaterException.located("No such color"); + throw EaterException.located("No such color", location); } } } diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Lighten.java b/src/net/sourceforge/plantuml/tim/stdlib/Lighten.java index ac69bf9e4..1ec5b593b 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Lighten.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/Lighten.java @@ -71,7 +71,7 @@ public class Lighten extends SimpleReturnFunction { color = color.lighten(ratio); return TValue.fromString(color.asString()); } catch (NoSuchColorException e) { - throw EaterException.located("No such color"); + throw EaterException.located("No such color", location); } } } diff --git a/src/net/sourceforge/plantuml/tim/stdlib/LoadJson.java b/src/net/sourceforge/plantuml/tim/stdlib/LoadJson.java index 58e6a74bf..a03972239 100755 --- a/src/net/sourceforge/plantuml/tim/stdlib/LoadJson.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/LoadJson.java @@ -120,10 +120,11 @@ public class LoadJson extends SimpleReturnFunction { return TValue.fromJson(jsonValue); } catch (ParseException pe) { Logme.error(pe); - throw EaterException.unlocated("JSON parse issue in source " + path + " on location " + pe.getLocation()); + throw EaterException.unlocated("JSON parse issue in source " + path + " on location " + pe.getLocation(), + location); } catch (UnsupportedEncodingException e) { Logme.error(e); - throw EaterException.unlocated("JSON encoding issue in source " + path + ": " + e.getMessage()); + throw EaterException.unlocated("JSON encoding issue in source " + path + ": " + e.getMessage(), location); } } diff --git a/src/net/sourceforge/plantuml/tim/stdlib/RandomFunction.java b/src/net/sourceforge/plantuml/tim/stdlib/RandomFunction.java index bf7786f5c..d284045a6 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/RandomFunction.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/RandomFunction.java @@ -77,7 +77,8 @@ public class RandomFunction extends SimpleReturnFunction { return TValue.fromInt(random.nextInt(max - min) + min); default: - throw EaterException.located("Error on Random: Too many argument"); + assert false; // Should not append because of canCover() + throw EaterException.located("Error on Random: Too many argument", location); } } } diff --git a/src/net/sourceforge/plantuml/tim/stdlib/ReverseColor.java b/src/net/sourceforge/plantuml/tim/stdlib/ReverseColor.java index 43521f070..ef1d94ff3 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/ReverseColor.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/ReverseColor.java @@ -69,7 +69,7 @@ public class ReverseColor extends SimpleReturnFunction { color = color.reverse(); return TValue.fromString(color.asString()); } catch (NoSuchColorException e) { - throw EaterException.located("No such color"); + throw EaterException.located("No such color", location); } } } diff --git a/src/net/sourceforge/plantuml/tim/stdlib/ReverseHsluvColor.java b/src/net/sourceforge/plantuml/tim/stdlib/ReverseHsluvColor.java index bcfaa72b9..041fe5cab 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/ReverseHsluvColor.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/ReverseHsluvColor.java @@ -69,7 +69,7 @@ public class ReverseHsluvColor extends SimpleReturnFunction { color = color.reverseHsluv(); return TValue.fromString(color.asString()); } catch (NoSuchColorException e) { - throw EaterException.located("No such color"); + throw EaterException.located("No such color", location); } } } diff --git a/src/net/sourceforge/plantuml/tim/stdlib/SetVariableValue.java b/src/net/sourceforge/plantuml/tim/stdlib/SetVariableValue.java index 1dd202157..18123b644 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/SetVariableValue.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/SetVariableValue.java @@ -66,7 +66,7 @@ public class SetVariableValue extends SimpleReturnFunction { // } final String name = values.get(0).toString(); final TValue value = values.get(1); - memory.putVariable(name, value, TVariableScope.GLOBAL); + memory.putVariable(name, value, TVariableScope.GLOBAL, location); return TValue.fromString(""); } diff --git a/src/net/sourceforge/plantuml/version/Version.java b/src/net/sourceforge/plantuml/version/Version.java index 77f7aa10b..80dec5df6 100644 --- a/src/net/sourceforge/plantuml/version/Version.java +++ b/src/net/sourceforge/plantuml/version/Version.java @@ -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.2024.4beta2"; + private static final String version = "1.2024.4beta3"; public static String versionString() { return version; From a48dd52d9ffc19b576ae4a75041c9575ada80fbf Mon Sep 17 00:00:00 2001 From: Arnaud Roques Date: Thu, 22 Feb 2024 20:06:59 +0100 Subject: [PATCH 88/95] refactor: prepare preprocessor error improvement (almost finished :-) https://github.com/plantuml/plantuml/pull/1668 --- gradle.properties | 2 +- .../sourceforge/plantuml/preproc/Defines.java | 4 +- src/net/sourceforge/plantuml/preproc/Sub.java | 6 +- .../plantuml/preproc2/PreprocessorUtils.java | 11 +-- src/net/sourceforge/plantuml/tim/Eater.java | 56 ++++++----- .../plantuml/tim/EaterAffectation.java | 2 +- .../plantuml/tim/EaterAffectationDefine.java | 2 +- .../sourceforge/plantuml/tim/EaterAssert.java | 6 +- .../plantuml/tim/EaterDeclareProcedure.java | 2 +- .../tim/EaterDeclareReturnFunction.java | 2 +- .../plantuml/tim/EaterDumpMemory.java | 2 +- .../sourceforge/plantuml/tim/EaterElseIf.java | 2 +- .../plantuml/tim/EaterException.java | 63 ------------- .../plantuml/tim/EaterExceptionLocated.java | 4 + .../plantuml/tim/EaterForeach.java | 2 +- .../plantuml/tim/EaterFunctionCall.java | 9 +- src/net/sourceforge/plantuml/tim/EaterIf.java | 2 +- .../sourceforge/plantuml/tim/EaterIfdef.java | 2 +- .../sourceforge/plantuml/tim/EaterIfndef.java | 2 +- .../sourceforge/plantuml/tim/EaterImport.java | 2 +- .../plantuml/tim/EaterInclude.java | 2 +- .../plantuml/tim/EaterIncludeDef.java | 2 +- .../plantuml/tim/EaterIncludesub.java | 2 +- .../plantuml/tim/EaterLegacyDefine.java | 2 +- .../plantuml/tim/EaterLegacyDefineLong.java | 2 +- .../sourceforge/plantuml/tim/EaterLog.java | 2 +- .../sourceforge/plantuml/tim/EaterReturn.java | 2 +- .../plantuml/tim/EaterStartsub.java | 4 +- .../sourceforge/plantuml/tim/EaterTheme.java | 16 ++-- .../sourceforge/plantuml/tim/EaterUndef.java | 2 +- .../sourceforge/plantuml/tim/EaterWhile.java | 2 +- .../plantuml/tim/ExecutionContextWhile.java | 2 +- .../plantuml/tim/ExecutionContexts.java | 10 +- .../plantuml/tim/FunctionsSet.java | 20 ++-- .../sourceforge/plantuml/tim/StringEater.java | 2 +- .../sourceforge/plantuml/tim/TContext.java | 93 +++++++++---------- .../sourceforge/plantuml/tim/TFunction.java | 4 +- .../plantuml/tim/TFunctionImpl.java | 11 ++- src/net/sourceforge/plantuml/tim/TMemory.java | 4 +- .../plantuml/tim/TMemoryGlobal.java | 4 +- .../plantuml/tim/TMemoryLocal.java | 2 +- .../sourceforge/plantuml/tim/TimLoader.java | 2 +- .../plantuml/tim/VariableManager.java | 10 +- .../plantuml/tim/expression/Knowledge.java | 3 +- .../expression/ReversePolishInterpretor.java | 39 ++++---- .../plantuml/tim/expression/ShuntingYard.java | 6 +- .../plantuml/tim/expression/TokenStack.java | 21 ++--- .../plantuml/tim/expression/TokenType.java | 9 +- .../tim/iterator/AbstractCodeIterator.java | 6 +- .../plantuml/tim/iterator/CodeIterator.java | 7 +- .../tim/iterator/CodeIteratorAffectation.java | 13 ++- .../tim/iterator/CodeIteratorForeach.java | 9 +- .../plantuml/tim/iterator/CodeIteratorIf.java | 23 ++--- .../tim/iterator/CodeIteratorImpl.java | 6 +- .../iterator/CodeIteratorInnerComment.java | 3 +- .../iterator/CodeIteratorLegacyDefine.java | 3 +- .../tim/iterator/CodeIteratorLongComment.java | 3 +- .../tim/iterator/CodeIteratorProcedure.java | 3 +- .../iterator/CodeIteratorReturnFunction.java | 3 +- .../iterator/CodeIteratorShortComment.java | 3 +- .../tim/iterator/CodeIteratorSub.java | 7 +- .../tim/iterator/CodeIteratorWhile.java | 7 +- .../plantuml/tim/stdlib/AlwaysFalse.java | 3 +- .../plantuml/tim/stdlib/AlwaysTrue.java | 3 +- .../plantuml/tim/stdlib/CallUserFunction.java | 5 +- .../sourceforge/plantuml/tim/stdlib/Chr.java | 3 +- .../plantuml/tim/stdlib/Darken.java | 5 +- .../plantuml/tim/stdlib/DateFunction.java | 7 +- .../plantuml/tim/stdlib/Dec2hex.java | 3 +- .../plantuml/tim/stdlib/Dirpath.java | 3 +- .../sourceforge/plantuml/tim/stdlib/Eval.java | 3 +- .../plantuml/tim/stdlib/Feature.java | 3 +- .../plantuml/tim/stdlib/FileExists.java | 3 +- .../plantuml/tim/stdlib/Filename.java | 3 +- .../plantuml/tim/stdlib/FunctionExists.java | 3 +- .../plantuml/tim/stdlib/GetAllStdlib.java | 5 +- .../plantuml/tim/stdlib/GetAllTheme.java | 3 +- .../plantuml/tim/stdlib/GetJsonKey.java | 9 +- .../plantuml/tim/stdlib/GetJsonType.java | 3 +- .../plantuml/tim/stdlib/GetVariableValue.java | 3 +- .../plantuml/tim/stdlib/GetVersion.java | 3 +- .../plantuml/tim/stdlib/Getenv.java | 3 +- .../plantuml/tim/stdlib/Hex2dec.java | 3 +- .../plantuml/tim/stdlib/HslColor.java | 3 +- .../plantuml/tim/stdlib/IntVal.java | 3 +- .../plantuml/tim/stdlib/InvokeProcedure.java | 5 +- .../plantuml/tim/stdlib/IsDark.java | 5 +- .../plantuml/tim/stdlib/IsLight.java | 5 +- .../plantuml/tim/stdlib/JsonKeyExists.java | 3 +- .../plantuml/tim/stdlib/Lighten.java | 5 +- .../plantuml/tim/stdlib/LoadJson.java | 13 +-- .../plantuml/tim/stdlib/LogicalAnd.java | 3 +- .../plantuml/tim/stdlib/LogicalNand.java | 3 +- .../plantuml/tim/stdlib/LogicalNor.java | 3 +- .../plantuml/tim/stdlib/LogicalNot.java | 3 +- .../plantuml/tim/stdlib/LogicalNxor.java | 3 +- .../plantuml/tim/stdlib/LogicalOr.java | 3 +- .../plantuml/tim/stdlib/LogicalXor.java | 3 +- .../sourceforge/plantuml/tim/stdlib/Now.java | 3 +- .../sourceforge/plantuml/tim/stdlib/Ord.java | 3 +- .../plantuml/tim/stdlib/RandomFunction.java | 5 +- .../tim/stdlib/RetrieveProcedure.java | 3 +- .../plantuml/tim/stdlib/ReverseColor.java | 5 +- .../tim/stdlib/ReverseHsluvColor.java | 5 +- .../plantuml/tim/stdlib/SetVariableValue.java | 3 +- .../tim/stdlib/SimpleReturnFunction.java | 4 +- .../sourceforge/plantuml/tim/stdlib/Size.java | 3 +- .../plantuml/tim/stdlib/SplitStr.java | 3 +- .../plantuml/tim/stdlib/Strlen.java | 3 +- .../plantuml/tim/stdlib/Strpos.java | 3 +- .../plantuml/tim/stdlib/Substr.java | 3 +- .../plantuml/tim/stdlib/VariableExists.java | 3 +- .../sourceforge/plantuml/version/Version.java | 2 +- .../plantuml/tim/TimTestUtils.java | 8 +- .../plantuml/tim/stdlib/AlwaysFalseTest.java | 8 +- .../plantuml/tim/stdlib/AlwaysTrueTest.java | 8 +- .../plantuml/tim/stdlib/ChrTest.java | 3 +- .../plantuml/tim/stdlib/Dec2hexTest.java | 8 +- .../plantuml/tim/stdlib/FeatureTest.java | 13 ++- .../plantuml/tim/stdlib/GetAllStdlibTest.java | 11 ++- .../plantuml/tim/stdlib/GetAllThemeTest.java | 9 +- .../plantuml/tim/stdlib/GetJsonKeyTest.java | 13 ++- .../plantuml/tim/stdlib/GetJsonTypeTest.java | 13 ++- .../plantuml/tim/stdlib/GetenvTest.java | 5 +- .../plantuml/tim/stdlib/Hex2decTest.java | 8 +- .../plantuml/tim/stdlib/LowerTest.java | 13 ++- .../plantuml/tim/stdlib/OrdTest.java | 3 +- .../tim/stdlib/RandomFuntionTest.java | 27 +++--- .../plantuml/tim/stdlib/SizeTest.java | 13 ++- .../plantuml/tim/stdlib/UpperTest.java | 13 ++- 130 files changed, 390 insertions(+), 538 deletions(-) delete mode 100644 src/net/sourceforge/plantuml/tim/EaterException.java diff --git a/gradle.properties b/gradle.properties index acb37ac5e..159ed6443 100644 --- a/gradle.properties +++ b/gradle.properties @@ -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.2024.4beta3 +version = 1.2024.4beta4 org.gradle.workers.max = 3 \ No newline at end of file diff --git a/src/net/sourceforge/plantuml/preproc/Defines.java b/src/net/sourceforge/plantuml/preproc/Defines.java index 14ec49a0e..eb2a1550f 100644 --- a/src/net/sourceforge/plantuml/preproc/Defines.java +++ b/src/net/sourceforge/plantuml/preproc/Defines.java @@ -56,7 +56,7 @@ import net.sourceforge.plantuml.security.SFile; import net.sourceforge.plantuml.security.SecurityProfile; import net.sourceforge.plantuml.security.SecurityUtils; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterException; +import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TMemory; import net.sourceforge.plantuml.tim.TVariableScope; import net.sourceforge.plantuml.utils.Log; @@ -82,7 +82,7 @@ public class Defines implements Truth { return new Defines(); } - public void copyTo(TMemory memory, StringLocated location) throws EaterException { + public void copyTo(TMemory memory, StringLocated location) throws EaterExceptionLocated { for (Entry ent : values.entrySet()) { final String name = ent.getKey(); final Define def = ent.getValue(); diff --git a/src/net/sourceforge/plantuml/preproc/Sub.java b/src/net/sourceforge/plantuml/preproc/Sub.java index 00b7bddcd..e14e5e746 100644 --- a/src/net/sourceforge/plantuml/preproc/Sub.java +++ b/src/net/sourceforge/plantuml/preproc/Sub.java @@ -42,13 +42,13 @@ import java.util.List; import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.text.TLineType; -import net.sourceforge.plantuml.tim.EaterException; +import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.EaterStartsub; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TMemory; public class Sub { - // ::remove folder when __HAXE__ + // ::remove folder when __HAXE__ private final String name; private final List lines = new ArrayList<>(); @@ -79,7 +79,7 @@ public class Sub { } public static Sub fromFile(ReadLine reader, String blocname, TContext context, TMemory memory) - throws IOException, EaterException { + throws IOException, EaterExceptionLocated { Sub result = null; StringLocated s = null; boolean skip = false; diff --git a/src/net/sourceforge/plantuml/preproc2/PreprocessorUtils.java b/src/net/sourceforge/plantuml/preproc2/PreprocessorUtils.java index 4ed855154..4fc609f49 100644 --- a/src/net/sourceforge/plantuml/preproc2/PreprocessorUtils.java +++ b/src/net/sourceforge/plantuml/preproc2/PreprocessorUtils.java @@ -53,8 +53,7 @@ import net.sourceforge.plantuml.preproc.StartDiagramExtractReader; import net.sourceforge.plantuml.preproc.Stdlib; import net.sourceforge.plantuml.security.SURL; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterException; -import net.sourceforge.plantuml.utils.LineLocation; +import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.utils.Log; public class PreprocessorUtils { @@ -134,7 +133,7 @@ public class PreprocessorUtils { } public static ReadLine getReaderIncludeUrl(final SURL url, StringLocated s, String suf, Charset charset) - throws EaterException { + throws EaterExceptionLocated { try { if (StartDiagramExtractReader.containsStartDiagram(url, s, charset)) return StartDiagramExtractReader.build(url, s, suf, charset); @@ -142,16 +141,16 @@ public class PreprocessorUtils { return getReaderInclude(url, s, charset); } catch (IOException e) { Logme.error(e); - throw EaterException.located("Cannot open URL " + e.getMessage(), s); + throw EaterExceptionLocated.located("Cannot open URL " + e.getMessage(), s); } } public static ReadLine getReaderInclude(SURL url, StringLocated s, Charset charset) - throws EaterException, UnsupportedEncodingException { + throws EaterExceptionLocated, UnsupportedEncodingException { final InputStream is = url.openStream(); if (is == null) - throw EaterException.located("Cannot open URL", s); + throw EaterExceptionLocated.located("Cannot open URL", s); return ReadLineReader.create(new InputStreamReader(is, charset), url.toString(), s.getLocation()); } diff --git a/src/net/sourceforge/plantuml/tim/Eater.java b/src/net/sourceforge/plantuml/tim/Eater.java index 3ccc10440..20d123720 100644 --- a/src/net/sourceforge/plantuml/tim/Eater.java +++ b/src/net/sourceforge/plantuml/tim/Eater.java @@ -64,19 +64,19 @@ public abstract class Eater { return stringLocated; } - public abstract void analyze(TContext context, TMemory memory) throws EaterException, EaterExceptionLocated; + public abstract void analyze(TContext context, TMemory memory) throws EaterExceptionLocated; public int getCurrentPosition() { return i; } - final protected String eatAllToEnd() throws EaterException { + final protected String eatAllToEnd() throws EaterExceptionLocated { final String result = stringLocated.getString().substring(i); i = stringLocated.length(); return result; } - final public TValue eatExpression(TContext context, TMemory memory) throws EaterException, EaterExceptionLocated { + final public TValue eatExpression(TContext context, TMemory memory) throws EaterExceptionLocated { final char ch = peekChar(); if (ch == '{' || ch == '[') { final String data = eatAllToEnd(); @@ -89,23 +89,22 @@ public abstract class Eater { return tokenStack.getResult(getStringLocated(), context, memory); } - final protected TokenStack eatTokenStack() throws EaterException { + final protected TokenStack eatTokenStack() throws EaterExceptionLocated { final TokenStack tokenStack = new TokenStack(); addIntoTokenStack(tokenStack, false); if (tokenStack.size() == 0) - throw EaterException.located("Missing expression", stringLocated); + throw EaterExceptionLocated.located("Missing expression", stringLocated); return tokenStack; } - final protected TValue eatExpressionStopAtColon(TContext context, TMemory memory) - throws EaterException, EaterExceptionLocated { + final protected TValue eatExpressionStopAtColon(TContext context, TMemory memory) throws EaterExceptionLocated { final TokenStack tokenStack = new TokenStack(); addIntoTokenStack(tokenStack, true); return tokenStack.getResult(getStringLocated(), context, memory); } - final protected void addIntoTokenStack(TokenStack tokenStack, boolean stopAtColon) throws EaterException { + final protected void addIntoTokenStack(TokenStack tokenStack, boolean stopAtColon) throws EaterExceptionLocated { Token lastToken = null; while (true) { final Token token = TokenType.eatOneToken(lastToken, this, stopAtColon); @@ -118,10 +117,10 @@ public abstract class Eater { } } - final public String eatAndGetQuotedString() throws EaterException { + final public String eatAndGetQuotedString() throws EaterExceptionLocated { final char separator = peekChar(); if (TLineType.isQuote(separator) == false) - throw EaterException.located("quote10", stringLocated); + throw EaterExceptionLocated.located("quote10", stringLocated); checkAndEatChar(separator); final StringBuilder value = new StringBuilder(); @@ -130,7 +129,7 @@ public abstract class Eater { return value.toString(); } - final protected String eatAndGetOptionalQuotedString() throws EaterException { + final protected String eatAndGetOptionalQuotedString() throws EaterExceptionLocated { final char quote = peekChar(); if (TLineType.isQuote(quote)) return eatAndGetQuotedString(); @@ -142,7 +141,7 @@ public abstract class Eater { while (true) { char ch = peekChar(); if (ch == 0) - throw EaterException.located("until001", stringLocated); + throw EaterExceptionLocated.located("until001", stringLocated); if (level == 0 && (ch == ',' || ch == ')')) return value.toString().trim(); @@ -160,7 +159,7 @@ public abstract class Eater { // return value.toString(); } - final public String eatAndGetNumber() throws EaterException { + final public String eatAndGetNumber() throws EaterExceptionLocated { final StringBuilder result = new StringBuilder(); while (true) { final char ch = peekChar(); @@ -176,7 +175,7 @@ public abstract class Eater { } } - final public String eatAndGetSpaces() throws EaterException { + final public String eatAndGetSpaces() throws EaterExceptionLocated { final StringBuilder result = new StringBuilder(); while (true) { final char ch = peekChar(); @@ -187,19 +186,19 @@ public abstract class Eater { } } - final protected String eatAndGetVarname() throws EaterException { + final protected String eatAndGetVarname() throws EaterExceptionLocated { final StringBuilder varname = new StringBuilder("" + eatOneChar()); if (TLineType.isLetterOrUnderscoreOrDollar(varname.charAt(0)) == false) - throw EaterException.located("a002", stringLocated); + throw EaterExceptionLocated.located("a002", stringLocated); addUpToLastLetterOrUnderscoreOrDigit(varname); return varname.toString(); } - final protected String eatAndGetFunctionName() throws EaterException { + final protected String eatAndGetFunctionName() throws EaterExceptionLocated { final StringBuilder varname = new StringBuilder("" + eatOneChar()); if (TLineType.isLetterOrUnderscoreOrDollar(varname.charAt(0)) == false) - throw EaterException.located("a003", stringLocated); + throw EaterExceptionLocated.located("a003", stringLocated); addUpToLastLetterOrUnderscoreOrDigit(varname); return varname.toString(); @@ -247,14 +246,14 @@ public abstract class Eater { return ch; } - final protected void checkAndEatChar(char ch) throws EaterException { + final protected void checkAndEatChar(char ch) throws EaterExceptionLocated { if (i >= stringLocated.length() || stringLocated.charAt(i) != ch) - throw EaterException.located("a001", stringLocated); + throw EaterExceptionLocated.located("a001", stringLocated); i++; } - final protected boolean safeCheckAndEatChar(char ch) throws EaterException { + final protected boolean safeCheckAndEatChar(char ch) throws EaterExceptionLocated { if (i >= stringLocated.length() || stringLocated.charAt(i) != ch) return false; @@ -262,7 +261,7 @@ public abstract class Eater { return true; } - final protected void optionallyEatChar(char ch) throws EaterException { + final protected void optionallyEatChar(char ch) throws EaterExceptionLocated { if (i >= stringLocated.length() || stringLocated.charAt(i) != ch) return; @@ -270,7 +269,7 @@ public abstract class Eater { i++; } - final protected void checkAndEatChar(String s) throws EaterException { + final protected void checkAndEatChar(String s) throws EaterExceptionLocated { for (int j = 0; j < s.length(); j++) checkAndEatChar(s.charAt(j)); @@ -299,8 +298,7 @@ public abstract class Eater { } final protected TFunctionImpl eatDeclareFunction(TContext context, TMemory memory, boolean unquoted, - StringLocated location, boolean allowNoParenthesis, TFunctionType type) - throws EaterException, EaterExceptionLocated { + StringLocated location, boolean allowNoParenthesis, TFunctionType type) throws EaterExceptionLocated { final List args = new ArrayList<>(); final String functionName = eatAndGetFunctionName(); skipSpaces(); @@ -308,7 +306,7 @@ public abstract class Eater { if (allowNoParenthesis) return new TFunctionImpl(functionName, args, unquoted, type); - throw EaterException.located("Missing opening parenthesis", stringLocated); + throw EaterExceptionLocated.located("Missing opening parenthesis", stringLocated); } while (true) { skipSpaces(); @@ -333,7 +331,7 @@ public abstract class Eater { checkAndEatChar(")"); break; } else { - throw EaterException.located("Error in function definition", stringLocated); + throw EaterExceptionLocated.located("Error in function definition", stringLocated); } } skipSpaces(); @@ -341,7 +339,7 @@ public abstract class Eater { } final protected TFunctionImpl eatDeclareReturnFunctionWithOptionalReturn(TContext context, TMemory memory, - boolean unquoted, StringLocated location) throws EaterException, EaterExceptionLocated { + boolean unquoted, StringLocated location) throws EaterExceptionLocated { final TFunctionImpl result = eatDeclareFunction(context, memory, unquoted, location, false, TFunctionType.RETURN_FUNCTION); if (peekChar() == 'r') { @@ -359,7 +357,7 @@ public abstract class Eater { } final protected TFunctionImpl eatDeclareProcedure(TContext context, TMemory memory, boolean unquoted, - StringLocated location) throws EaterException, EaterExceptionLocated { + StringLocated location) throws EaterExceptionLocated { final TFunctionImpl result = eatDeclareFunction(context, memory, unquoted, location, false, TFunctionType.PROCEDURE); return result; diff --git a/src/net/sourceforge/plantuml/tim/EaterAffectation.java b/src/net/sourceforge/plantuml/tim/EaterAffectation.java index 726ef28f8..efe99b76f 100644 --- a/src/net/sourceforge/plantuml/tim/EaterAffectation.java +++ b/src/net/sourceforge/plantuml/tim/EaterAffectation.java @@ -44,7 +44,7 @@ public class EaterAffectation extends Eater { } @Override - public void analyze(TContext context, TMemory memory) throws EaterException, EaterExceptionLocated { + public void analyze(TContext context, TMemory memory) throws EaterExceptionLocated { skipSpaces(); checkAndEatChar("!"); skipSpaces(); diff --git a/src/net/sourceforge/plantuml/tim/EaterAffectationDefine.java b/src/net/sourceforge/plantuml/tim/EaterAffectationDefine.java index aa689aeab..863f3d91f 100644 --- a/src/net/sourceforge/plantuml/tim/EaterAffectationDefine.java +++ b/src/net/sourceforge/plantuml/tim/EaterAffectationDefine.java @@ -44,7 +44,7 @@ public class EaterAffectationDefine extends Eater { } @Override - public void analyze(TContext context, TMemory memory) throws EaterException, EaterExceptionLocated { + public void analyze(TContext context, TMemory memory) throws EaterExceptionLocated { skipSpaces(); checkAndEatChar("!define"); skipSpaces(); diff --git a/src/net/sourceforge/plantuml/tim/EaterAssert.java b/src/net/sourceforge/plantuml/tim/EaterAssert.java index e854c06ad..3c34cacb1 100644 --- a/src/net/sourceforge/plantuml/tim/EaterAssert.java +++ b/src/net/sourceforge/plantuml/tim/EaterAssert.java @@ -44,7 +44,7 @@ public class EaterAssert extends Eater { } @Override - public void analyze(TContext context, TMemory memory) throws EaterException, EaterExceptionLocated { + public void analyze(TContext context, TMemory memory) throws EaterExceptionLocated { skipSpaces(); checkAndEatChar("!assert"); skipSpaces(); @@ -55,9 +55,9 @@ public class EaterAssert extends Eater { if (ch == ':') { checkAndEatChar(':'); final TValue message = eatExpression(context, memory); - throw EaterException.located("Assertion error : " + message.toString(), getStringLocated()); + throw EaterExceptionLocated.located("Assertion error : " + message.toString(), getStringLocated()); } - throw EaterException.located("Assertion error", getStringLocated()); + throw EaterExceptionLocated.located("Assertion error", getStringLocated()); } } diff --git a/src/net/sourceforge/plantuml/tim/EaterDeclareProcedure.java b/src/net/sourceforge/plantuml/tim/EaterDeclareProcedure.java index 9c155df18..d0cdbdd16 100644 --- a/src/net/sourceforge/plantuml/tim/EaterDeclareProcedure.java +++ b/src/net/sourceforge/plantuml/tim/EaterDeclareProcedure.java @@ -48,7 +48,7 @@ public class EaterDeclareProcedure extends Eater { } @Override - public void analyze(TContext context, TMemory memory) throws EaterException, EaterExceptionLocated { + public void analyze(TContext context, TMemory memory) throws EaterExceptionLocated { skipSpaces(); checkAndEatChar("!"); boolean unquoted = false; diff --git a/src/net/sourceforge/plantuml/tim/EaterDeclareReturnFunction.java b/src/net/sourceforge/plantuml/tim/EaterDeclareReturnFunction.java index 8c6415d1a..84bf4c5c2 100644 --- a/src/net/sourceforge/plantuml/tim/EaterDeclareReturnFunction.java +++ b/src/net/sourceforge/plantuml/tim/EaterDeclareReturnFunction.java @@ -48,7 +48,7 @@ public class EaterDeclareReturnFunction extends Eater { } @Override - public void analyze(TContext context, TMemory memory) throws EaterException, EaterExceptionLocated { + public void analyze(TContext context, TMemory memory) throws EaterExceptionLocated { skipSpaces(); checkAndEatChar("!"); boolean unquoted = false; diff --git a/src/net/sourceforge/plantuml/tim/EaterDumpMemory.java b/src/net/sourceforge/plantuml/tim/EaterDumpMemory.java index 33315178b..fcf4eac86 100644 --- a/src/net/sourceforge/plantuml/tim/EaterDumpMemory.java +++ b/src/net/sourceforge/plantuml/tim/EaterDumpMemory.java @@ -43,7 +43,7 @@ public class EaterDumpMemory extends Eater { } @Override - public void analyze(TContext context, TMemory memory) throws EaterException { + public void analyze(TContext context, TMemory memory) throws EaterExceptionLocated { skipSpaces(); checkAndEatChar("!dump_memory"); skipSpaces(); diff --git a/src/net/sourceforge/plantuml/tim/EaterElseIf.java b/src/net/sourceforge/plantuml/tim/EaterElseIf.java index 8ddc5e35a..e83bbbf5a 100644 --- a/src/net/sourceforge/plantuml/tim/EaterElseIf.java +++ b/src/net/sourceforge/plantuml/tim/EaterElseIf.java @@ -46,7 +46,7 @@ public class EaterElseIf extends Eater { } @Override - public void analyze(TContext context, TMemory memory) throws EaterException, EaterExceptionLocated { + public void analyze(TContext context, TMemory memory) throws EaterExceptionLocated { skipSpaces(); checkAndEatChar("!elseif"); skipSpaces(); diff --git a/src/net/sourceforge/plantuml/tim/EaterException.java b/src/net/sourceforge/plantuml/tim/EaterException.java deleted file mode 100644 index ee3439e13..000000000 --- a/src/net/sourceforge/plantuml/tim/EaterException.java +++ /dev/null @@ -1,63 +0,0 @@ -/* ======================================================================== - * PlantUML : a free UML diagram generator - * ======================================================================== - * - * (C) Copyright 2009-2024, Arnaud Roques - * - * Project Info: https://plantuml.com - * - * If you like this project or if you find it useful, you can support us at: - * - * https://plantuml.com/patreon (only 1$ per month!) - * https://plantuml.com/paypal - * - * This file is part of PlantUML. - * - * PlantUML is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * PlantUML distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public - * License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - * USA. - * - * - * Original Author: Arnaud Roques - * - */ -package net.sourceforge.plantuml.tim; - -import net.sourceforge.plantuml.text.StringLocated; - -public class EaterException extends Exception { - - private final String message; - - private EaterException(String message, StringLocated location) { - this.message = message; - } - - public static EaterException unlocated(String message, StringLocated location) { - return new EaterException(message, location); - } - - public static EaterException located(String message, StringLocated location) { - return unlocated(message, location); - } - - public final String getMessage() { - return message; - } - - public EaterExceptionLocated withLocation(StringLocated sl) { - return EaterExceptionLocated.located(message, sl); - } - -} diff --git a/src/net/sourceforge/plantuml/tim/EaterExceptionLocated.java b/src/net/sourceforge/plantuml/tim/EaterExceptionLocated.java index 36ee62187..4aeb0a0da 100644 --- a/src/net/sourceforge/plantuml/tim/EaterExceptionLocated.java +++ b/src/net/sourceforge/plantuml/tim/EaterExceptionLocated.java @@ -52,6 +52,10 @@ public class EaterExceptionLocated extends Exception { return new EaterExceptionLocated(message, Objects.requireNonNull(location)); } + public static EaterExceptionLocated unlocated(String message, StringLocated location) { + return new EaterExceptionLocated(message, Objects.requireNonNull(location)); + } + public final String getMessage() { return message; } diff --git a/src/net/sourceforge/plantuml/tim/EaterForeach.java b/src/net/sourceforge/plantuml/tim/EaterForeach.java index b7be391da..c631ed8f7 100644 --- a/src/net/sourceforge/plantuml/tim/EaterForeach.java +++ b/src/net/sourceforge/plantuml/tim/EaterForeach.java @@ -48,7 +48,7 @@ public class EaterForeach extends Eater { } @Override - public void analyze(TContext context, TMemory memory) throws EaterException, EaterExceptionLocated { + public void analyze(TContext context, TMemory memory) throws EaterExceptionLocated { skipSpaces(); checkAndEatChar("!foreach"); skipSpaces(); diff --git a/src/net/sourceforge/plantuml/tim/EaterFunctionCall.java b/src/net/sourceforge/plantuml/tim/EaterFunctionCall.java index 8e703fde8..767671aed 100644 --- a/src/net/sourceforge/plantuml/tim/EaterFunctionCall.java +++ b/src/net/sourceforge/plantuml/tim/EaterFunctionCall.java @@ -58,7 +58,7 @@ public class EaterFunctionCall extends Eater { } @Override - public void analyze(TContext context, TMemory memory) throws EaterException, EaterExceptionLocated { + public void analyze(TContext context, TMemory memory) throws EaterExceptionLocated { skipUntilChar('('); checkAndEatChar('('); skipSpaces(); @@ -119,9 +119,10 @@ public class EaterFunctionCall extends Eater { break; } if (unquoted) { - throw EaterException.located("unquoted function/procedure cannot use expression.", getStringLocated()); + throw EaterExceptionLocated.located("unquoted function/procedure cannot use expression.", + getStringLocated()); } - throw EaterException.located("call001", getStringLocated()); + throw EaterExceptionLocated.located("call001", getStringLocated()); } } @@ -133,7 +134,7 @@ public class EaterFunctionCall extends Eater { return Collections.unmodifiableMap(namedArguments); } - public final String getEndOfLine() throws EaterException { + public final String getEndOfLine() throws EaterExceptionLocated { return this.eatAllToEnd(); } diff --git a/src/net/sourceforge/plantuml/tim/EaterIf.java b/src/net/sourceforge/plantuml/tim/EaterIf.java index 50ad453da..ed544cba9 100644 --- a/src/net/sourceforge/plantuml/tim/EaterIf.java +++ b/src/net/sourceforge/plantuml/tim/EaterIf.java @@ -46,7 +46,7 @@ public class EaterIf extends Eater { } @Override - public void analyze(TContext context, TMemory memory) throws EaterException, EaterExceptionLocated { + public void analyze(TContext context, TMemory memory) throws EaterExceptionLocated { skipSpaces(); checkAndEatChar("!if"); skipSpaces(); diff --git a/src/net/sourceforge/plantuml/tim/EaterIfdef.java b/src/net/sourceforge/plantuml/tim/EaterIfdef.java index b197abc20..7173965df 100644 --- a/src/net/sourceforge/plantuml/tim/EaterIfdef.java +++ b/src/net/sourceforge/plantuml/tim/EaterIfdef.java @@ -48,7 +48,7 @@ public class EaterIfdef extends Eater { } @Override - public void analyze(TContext context, TMemory memory) throws EaterException { + public void analyze(TContext context, TMemory memory) throws EaterExceptionLocated { skipSpaces(); checkAndEatChar("!ifdef"); skipSpaces(); diff --git a/src/net/sourceforge/plantuml/tim/EaterIfndef.java b/src/net/sourceforge/plantuml/tim/EaterIfndef.java index ae9d7478f..a79da59a6 100644 --- a/src/net/sourceforge/plantuml/tim/EaterIfndef.java +++ b/src/net/sourceforge/plantuml/tim/EaterIfndef.java @@ -46,7 +46,7 @@ public class EaterIfndef extends Eater { } @Override - public void analyze(TContext context, TMemory memory) throws EaterException { + public void analyze(TContext context, TMemory memory) throws EaterExceptionLocated { skipSpaces(); checkAndEatChar("!ifndef"); skipSpaces(); diff --git a/src/net/sourceforge/plantuml/tim/EaterImport.java b/src/net/sourceforge/plantuml/tim/EaterImport.java index 6784a01f2..c292af610 100644 --- a/src/net/sourceforge/plantuml/tim/EaterImport.java +++ b/src/net/sourceforge/plantuml/tim/EaterImport.java @@ -45,7 +45,7 @@ public class EaterImport extends Eater { } @Override - public void analyze(TContext context, TMemory memory) throws EaterException, EaterExceptionLocated { + public void analyze(TContext context, TMemory memory) throws EaterExceptionLocated { skipSpaces(); checkAndEatChar("!import"); skipSpaces(); diff --git a/src/net/sourceforge/plantuml/tim/EaterInclude.java b/src/net/sourceforge/plantuml/tim/EaterInclude.java index 5366d8a4a..fac2806ff 100644 --- a/src/net/sourceforge/plantuml/tim/EaterInclude.java +++ b/src/net/sourceforge/plantuml/tim/EaterInclude.java @@ -47,7 +47,7 @@ public class EaterInclude extends Eater { } @Override - public void analyze(TContext context, TMemory memory) throws EaterException, EaterExceptionLocated { + public void analyze(TContext context, TMemory memory) throws EaterExceptionLocated { skipSpaces(); checkAndEatChar("!include"); final char peekChar = peekChar(); diff --git a/src/net/sourceforge/plantuml/tim/EaterIncludeDef.java b/src/net/sourceforge/plantuml/tim/EaterIncludeDef.java index f0ffecce5..b275c1169 100644 --- a/src/net/sourceforge/plantuml/tim/EaterIncludeDef.java +++ b/src/net/sourceforge/plantuml/tim/EaterIncludeDef.java @@ -45,7 +45,7 @@ public class EaterIncludeDef extends Eater { } @Override - public void analyze(TContext context, TMemory memory) throws EaterException, EaterExceptionLocated { + public void analyze(TContext context, TMemory memory) throws EaterExceptionLocated { skipSpaces(); checkAndEatChar("!includedef"); skipSpaces(); diff --git a/src/net/sourceforge/plantuml/tim/EaterIncludesub.java b/src/net/sourceforge/plantuml/tim/EaterIncludesub.java index bd93e2e1e..53778e2e1 100644 --- a/src/net/sourceforge/plantuml/tim/EaterIncludesub.java +++ b/src/net/sourceforge/plantuml/tim/EaterIncludesub.java @@ -45,7 +45,7 @@ public class EaterIncludesub extends Eater { } @Override - public void analyze(TContext context, TMemory memory) throws EaterException, EaterExceptionLocated { + public void analyze(TContext context, TMemory memory) throws EaterExceptionLocated { skipSpaces(); checkAndEatChar("!includesub"); skipSpaces(); diff --git a/src/net/sourceforge/plantuml/tim/EaterLegacyDefine.java b/src/net/sourceforge/plantuml/tim/EaterLegacyDefine.java index 532470560..bb0257003 100644 --- a/src/net/sourceforge/plantuml/tim/EaterLegacyDefine.java +++ b/src/net/sourceforge/plantuml/tim/EaterLegacyDefine.java @@ -45,7 +45,7 @@ public class EaterLegacyDefine extends Eater { } @Override - public void analyze(TContext context, TMemory memory) throws EaterException, EaterExceptionLocated { + public void analyze(TContext context, TMemory memory) throws EaterExceptionLocated { skipSpaces(); checkAndEatChar("!define"); skipSpaces(); diff --git a/src/net/sourceforge/plantuml/tim/EaterLegacyDefineLong.java b/src/net/sourceforge/plantuml/tim/EaterLegacyDefineLong.java index 54a782553..3b93fbfd1 100644 --- a/src/net/sourceforge/plantuml/tim/EaterLegacyDefineLong.java +++ b/src/net/sourceforge/plantuml/tim/EaterLegacyDefineLong.java @@ -45,7 +45,7 @@ public class EaterLegacyDefineLong extends Eater { } @Override - public void analyze(TContext context, TMemory memory) throws EaterException, EaterExceptionLocated { + public void analyze(TContext context, TMemory memory) throws EaterExceptionLocated { skipSpaces(); checkAndEatChar("!definelong"); skipSpaces(); diff --git a/src/net/sourceforge/plantuml/tim/EaterLog.java b/src/net/sourceforge/plantuml/tim/EaterLog.java index 805a64306..53f938091 100644 --- a/src/net/sourceforge/plantuml/tim/EaterLog.java +++ b/src/net/sourceforge/plantuml/tim/EaterLog.java @@ -44,7 +44,7 @@ public class EaterLog extends Eater { } @Override - public void analyze(TContext context, TMemory memory) throws EaterException, EaterExceptionLocated { + public void analyze(TContext context, TMemory memory) throws EaterExceptionLocated { skipSpaces(); checkAndEatChar("!log"); skipSpaces(); diff --git a/src/net/sourceforge/plantuml/tim/EaterReturn.java b/src/net/sourceforge/plantuml/tim/EaterReturn.java index 99ed3dd21..58ade8267 100644 --- a/src/net/sourceforge/plantuml/tim/EaterReturn.java +++ b/src/net/sourceforge/plantuml/tim/EaterReturn.java @@ -46,7 +46,7 @@ public class EaterReturn extends Eater { } @Override - public void analyze(TContext context, TMemory memory) throws EaterException, EaterExceptionLocated { + public void analyze(TContext context, TMemory memory) throws EaterExceptionLocated { skipSpaces(); checkAndEatChar("!return"); skipSpaces(); diff --git a/src/net/sourceforge/plantuml/tim/EaterStartsub.java b/src/net/sourceforge/plantuml/tim/EaterStartsub.java index 9bb1a02c9..ca67a6574 100644 --- a/src/net/sourceforge/plantuml/tim/EaterStartsub.java +++ b/src/net/sourceforge/plantuml/tim/EaterStartsub.java @@ -45,13 +45,13 @@ public class EaterStartsub extends Eater { } @Override - public void analyze(TContext context, TMemory memory) throws EaterException { + public void analyze(TContext context, TMemory memory) throws EaterExceptionLocated { skipSpaces(); checkAndEatChar("!startsub"); skipSpaces(); this.subname = eatAllToEnd(); if (this.subname.matches("\\w+") == false) - throw EaterException.located("Bad sub name", getStringLocated()); + throw EaterExceptionLocated.located("Bad sub name", getStringLocated()); } diff --git a/src/net/sourceforge/plantuml/tim/EaterTheme.java b/src/net/sourceforge/plantuml/tim/EaterTheme.java index c43fdc33f..891b101a0 100644 --- a/src/net/sourceforge/plantuml/tim/EaterTheme.java +++ b/src/net/sourceforge/plantuml/tim/EaterTheme.java @@ -67,7 +67,7 @@ public class EaterTheme extends Eater { } @Override - public void analyze(TContext context, TMemory memory) throws EaterException, EaterExceptionLocated { + public void analyze(TContext context, TMemory memory) throws EaterExceptionLocated { skipSpaces(); checkAndEatChar("!theme"); skipSpaces(); @@ -85,7 +85,7 @@ public class EaterTheme extends Eater { } - public final ReadLine getTheme() throws EaterException { + public final ReadLine getTheme() throws EaterExceptionLocated { if (from == null) { try { final ReadLine reader = ThemeUtils.getReaderTheme(realName); @@ -101,24 +101,24 @@ public class EaterTheme extends Eater { } catch (IOException e) { Logme.error(e); } - throw EaterException.located("Cannot load " + realName, getStringLocated()); + throw EaterExceptionLocated.located("Cannot load " + realName, getStringLocated()); } if (from.startsWith("<") && from.endsWith(">")) { final ReadLine reader = ThemeUtils.getReaderTheme(realName, from); if (reader == null) - throw EaterException.located("No such theme " + realName + " in " + from, getStringLocated()); + throw EaterExceptionLocated.located("No such theme " + realName + " in " + from, getStringLocated()); return reader; } else if (from.startsWith("http://") || from.startsWith("https://")) { final SURL url = SURL.create(ThemeUtils.getFullPath(from, realName)); if (url == null) - throw EaterException.located("Cannot open URL", getStringLocated()); + throw EaterExceptionLocated.located("Cannot open URL", getStringLocated()); try { return PreprocessorUtils.getReaderInclude(url, getStringLocated(), UTF_8); } catch (UnsupportedEncodingException e) { Logme.error(e); - throw EaterException.located("Cannot decode charset", getStringLocated()); + throw EaterExceptionLocated.located("Cannot decode charset", getStringLocated()); } } @@ -126,12 +126,12 @@ public class EaterTheme extends Eater { final FileWithSuffix file = context.getFileWithSuffix(from, realName); final Reader tmp = file.getReader(UTF_8); if (tmp == null) - throw EaterException.located("No such theme " + realName, getStringLocated()); + throw EaterExceptionLocated.located("No such theme " + realName, getStringLocated()); return ReadLineReader.create(tmp, "theme " + realName); } catch (IOException e) { Logme.error(e); - throw EaterException.located("Cannot load " + realName, getStringLocated()); + throw EaterExceptionLocated.located("Cannot load " + realName, getStringLocated()); } } diff --git a/src/net/sourceforge/plantuml/tim/EaterUndef.java b/src/net/sourceforge/plantuml/tim/EaterUndef.java index 01e48c910..525644758 100644 --- a/src/net/sourceforge/plantuml/tim/EaterUndef.java +++ b/src/net/sourceforge/plantuml/tim/EaterUndef.java @@ -43,7 +43,7 @@ public class EaterUndef extends Eater { } @Override - public void analyze(TContext context, TMemory memory) throws EaterException { + public void analyze(TContext context, TMemory memory) throws EaterExceptionLocated { skipSpaces(); checkAndEatChar("!undef"); skipSpaces(); diff --git a/src/net/sourceforge/plantuml/tim/EaterWhile.java b/src/net/sourceforge/plantuml/tim/EaterWhile.java index 8538d6978..4b3844b87 100644 --- a/src/net/sourceforge/plantuml/tim/EaterWhile.java +++ b/src/net/sourceforge/plantuml/tim/EaterWhile.java @@ -46,7 +46,7 @@ public class EaterWhile extends Eater { } @Override - public void analyze(TContext context, TMemory memory) throws EaterException { + public void analyze(TContext context, TMemory memory) throws EaterExceptionLocated { skipSpaces(); checkAndEatChar("!while"); skipSpaces(); diff --git a/src/net/sourceforge/plantuml/tim/ExecutionContextWhile.java b/src/net/sourceforge/plantuml/tim/ExecutionContextWhile.java index cc65cc222..c1c6b6898 100644 --- a/src/net/sourceforge/plantuml/tim/ExecutionContextWhile.java +++ b/src/net/sourceforge/plantuml/tim/ExecutionContextWhile.java @@ -61,7 +61,7 @@ public class ExecutionContextWhile { } public TValue conditionValue(StringLocated location, TContext context, TMemory memory) - throws EaterException, EaterExceptionLocated { + throws EaterExceptionLocated { return whileExpression.getResult(location, context, memory); } diff --git a/src/net/sourceforge/plantuml/tim/ExecutionContexts.java b/src/net/sourceforge/plantuml/tim/ExecutionContexts.java index 8a3cb8518..33ab5821b 100644 --- a/src/net/sourceforge/plantuml/tim/ExecutionContexts.java +++ b/src/net/sourceforge/plantuml/tim/ExecutionContexts.java @@ -79,12 +79,12 @@ public abstract class ExecutionContexts { return allForeachs.pollLast(); } - public boolean areAllIfOk(TContext context, TMemory memory) throws EaterException { - for (ExecutionContextIf conditionalContext : allIfs) { - if (conditionalContext.conditionIsOkHere() == false) { + public boolean areAllIfOk(TContext context, TMemory memory) throws EaterExceptionLocated { + for (ExecutionContextIf conditionalContext : allIfs) + if (conditionalContext.conditionIsOkHere() == false) return false; - } - } + + return true; } diff --git a/src/net/sourceforge/plantuml/tim/FunctionsSet.java b/src/net/sourceforge/plantuml/tim/FunctionsSet.java index 0f910fb66..b5702c62d 100644 --- a/src/net/sourceforge/plantuml/tim/FunctionsSet.java +++ b/src/net/sourceforge/plantuml/tim/FunctionsSet.java @@ -95,9 +95,9 @@ public class FunctionsSet { } public void executeLegacyDefine(TContext context, TMemory memory, StringLocated s) - throws EaterException, EaterExceptionLocated { + throws EaterExceptionLocated { if (this.pendingFunction != null) - throw EaterException.located("already0048", s); + throw EaterExceptionLocated.located("already0048", s); final EaterLegacyDefine legacyDefine = new EaterLegacyDefine(s); legacyDefine.analyze(context, memory); @@ -107,9 +107,9 @@ public class FunctionsSet { } public void executeLegacyDefineLong(TContext context, TMemory memory, StringLocated s) - throws EaterException, EaterExceptionLocated { + throws EaterExceptionLocated { if (this.pendingFunction != null) - throw EaterException.located("already0068", s); + throw EaterExceptionLocated.located("already0068", s); final EaterLegacyDefineLong legacyDefineLong = new EaterLegacyDefineLong(s); legacyDefineLong.analyze(context, memory); @@ -117,9 +117,9 @@ public class FunctionsSet { } public void executeDeclareReturnFunction(TContext context, TMemory memory, StringLocated s) - throws EaterException, EaterExceptionLocated { + throws EaterExceptionLocated { if (this.pendingFunction != null) - throw EaterException.located("already0068", s); + throw EaterExceptionLocated.located("already0068", s); final EaterDeclareReturnFunction declareFunction = new EaterDeclareReturnFunction(s); declareFunction.analyze(context, memory); @@ -127,7 +127,7 @@ public class FunctionsSet { final TFunctionSignature declaredSignature = declareFunction.getFunction().getSignature(); final TFunction previous = this.functions.get(declaredSignature); if (previous != null && (finalFlag || this.functionsFinal.contains(declaredSignature))) - throw EaterException.located("This function is already defined", s); + throw EaterExceptionLocated.located("This function is already defined", s); if (finalFlag) this.functionsFinal.add(declaredSignature); @@ -140,9 +140,9 @@ public class FunctionsSet { } public void executeDeclareProcedure(TContext context, TMemory memory, StringLocated s) - throws EaterException, EaterExceptionLocated { + throws EaterExceptionLocated { if (this.pendingFunction != null) - throw EaterException.located("already0068", s); + throw EaterExceptionLocated.located("already0068", s); final EaterDeclareProcedure declareFunction = new EaterDeclareProcedure(s); declareFunction.analyze(context, memory); @@ -150,7 +150,7 @@ public class FunctionsSet { final TFunctionSignature declaredSignature = declareFunction.getFunction().getSignature(); final TFunction previous = this.functions.get(declaredSignature); if (previous != null && (finalFlag || this.functionsFinal.contains(declaredSignature))) - throw EaterException.located("This function is already defined", s); + throw EaterExceptionLocated.located("This function is already defined", s); if (finalFlag) this.functionsFinal.add(declaredSignature); diff --git a/src/net/sourceforge/plantuml/tim/StringEater.java b/src/net/sourceforge/plantuml/tim/StringEater.java index 85ca881c9..e8b2825e2 100644 --- a/src/net/sourceforge/plantuml/tim/StringEater.java +++ b/src/net/sourceforge/plantuml/tim/StringEater.java @@ -43,7 +43,7 @@ public class StringEater extends Eater { } @Override - public void analyze(TContext context, TMemory memory) throws EaterException, EaterExceptionLocated { + public void analyze(TContext context, TMemory memory) throws EaterExceptionLocated { throw new UnsupportedOperationException(); } diff --git a/src/net/sourceforge/plantuml/tim/TContext.java b/src/net/sourceforge/plantuml/tim/TContext.java index 547313c90..86a3bb0b1 100644 --- a/src/net/sourceforge/plantuml/tim/TContext.java +++ b/src/net/sourceforge/plantuml/tim/TContext.java @@ -236,7 +236,7 @@ public class TContext { public Knowledge asKnowledge(final TMemory memory, final LineLocation location) { return new Knowledge() { - public TValue getVariable(String name) throws EaterException, EaterExceptionLocated { + public TValue getVariable(String name) throws EaterExceptionLocated { if (name.contains(".") || name.contains("[")) { final TValue result = fromJson(memory, name, location); return result; @@ -250,8 +250,7 @@ public class TContext { }; } - private TValue fromJson(TMemory memory, String name, LineLocation location) - throws EaterException, EaterExceptionLocated { + private TValue fromJson(TMemory memory, String name, LineLocation location) throws EaterExceptionLocated { final String result = applyFunctionsAndVariables(memory, new StringLocated(name, location)); try { final JsonValue json = Json.parse(result); @@ -284,23 +283,19 @@ public class TContext { final CodeIterator it = buildCodeIterator(memory, body); StringLocated s = null; - try { - while ((s = it.peek()) != null) { - final TValue result = executeOneLineSafe(memory, s, ftype, modeSpecial); - if (result != null) - return result; + while ((s = it.peek()) != null) { + final TValue result = executeOneLineSafe(memory, s, ftype, modeSpecial); + if (result != null) + return result; - it.next(); - } - return null; - } catch (EaterException e) { - throw e.withLocation(s); + it.next(); } + return null; } private void executeLinesInternal(TMemory memory, List body, TFunctionType ftype) - throws EaterExceptionLocated, EaterException { + throws EaterExceptionLocated { final CodeIterator it = buildCodeIterator(memory, body); StringLocated s = null; @@ -312,22 +307,20 @@ public class TContext { } private TValue executeOneLineSafe(TMemory memory, StringLocated s, TFunctionType ftype, boolean modeSpecial) - throws EaterException, EaterExceptionLocated { + throws EaterExceptionLocated { try { this.debug.add(s); return executeOneLineNotSafe(memory, s, ftype, modeSpecial); } catch (Exception e) { - if (e instanceof EaterException) - throw (EaterException) e; if (e instanceof EaterExceptionLocated) throw (EaterExceptionLocated) e; Logme.error(e); - throw EaterException.located("Fatal parsing error", s); + throw EaterExceptionLocated.located("Fatal parsing error", s); } } private TValue executeOneLineNotSafe(TMemory memory, StringLocated s, TFunctionType ftype, boolean modeSpecial) - throws EaterException, EaterExceptionLocated { + throws EaterExceptionLocated { final TLineType type = s.getType(); if (type == TLineType.INCLUDESUB) { @@ -382,11 +375,11 @@ public class TContext { } else if (s.getString().matches("^\\s+$")) { return null; } else { - throw EaterException.located("Compile Error " + ftype + " " + type, s); + throw EaterExceptionLocated.located("Compile Error " + ftype + " " + type, s); } } - private void addPlain(TMemory memory, StringLocated s) throws EaterException, EaterExceptionLocated { + private void addPlain(TMemory memory, StringLocated s) throws EaterExceptionLocated { final StringLocated tmp[] = applyFunctionsAndVariablesInternal(memory, s); if (tmp != null) { if (pendingAdd != null) { @@ -399,32 +392,31 @@ public class TContext { } } - private void simulatePlain(TMemory memory, StringLocated s) throws EaterException, EaterExceptionLocated { + private void simulatePlain(TMemory memory, StringLocated s) throws EaterExceptionLocated { final StringLocated ignored[] = applyFunctionsAndVariablesInternal(memory, s); } - private void executeAffectationDefine(TMemory memory, StringLocated s) - throws EaterException, EaterExceptionLocated { + private void executeAffectationDefine(TMemory memory, StringLocated s) throws EaterExceptionLocated { new EaterAffectationDefine(s).analyze(this, memory); } - private void executeDumpMemory(TMemory memory, StringLocated s) throws EaterException { + private void executeDumpMemory(TMemory memory, StringLocated s) throws EaterExceptionLocated { final EaterDumpMemory condition = new EaterDumpMemory(s); condition.analyze(this, memory); } - private void executeAssert(TMemory memory, StringLocated s) throws EaterException, EaterExceptionLocated { + private void executeAssert(TMemory memory, StringLocated s) throws EaterExceptionLocated { final EaterAssert condition = new EaterAssert(s); condition.analyze(this, memory); } - private void executeUndef(TMemory memory, StringLocated s) throws EaterException { + private void executeUndef(TMemory memory, StringLocated s) throws EaterExceptionLocated { final EaterUndef undef = new EaterUndef(s); undef.analyze(this, memory); } private StringLocated[] applyFunctionsAndVariablesInternal(TMemory memory, StringLocated located) - throws EaterException, EaterExceptionLocated { + throws EaterExceptionLocated { if (memory.isEmpty() && functionsSet.size() == 0) return new StringLocated[] { located }; @@ -442,8 +434,7 @@ public class TContext { private String pendingAdd = null; - public String applyFunctionsAndVariables(TMemory memory, final StringLocated str) - throws EaterException, EaterExceptionLocated { + public String applyFunctionsAndVariables(TMemory memory, final StringLocated str) throws EaterExceptionLocated { // https://en.wikipedia.org/wiki/Boyer%E2%80%93Moore%E2%80%93Horspool_algorithm // https://stackoverflow.com/questions/1326682/java-replacing-multiple-different-substring-in-a-string-at-once-or-in-the-most // https://en.wikipedia.org/wiki/String-searching_algorithm @@ -465,7 +456,7 @@ public class TContext { call.getNamedArguments().keySet()); final TFunction function = functionsSet.getFunctionSmart(signature); if (function == null) - throw EaterException.located("Function not found " + presentFunction, str); + throw EaterExceptionLocated.located("Function not found " + presentFunction, str); if (function.getFunctionType() == TFunctionType.PROCEDURE) { this.pendingAdd = result.toString(); @@ -503,11 +494,11 @@ public class TContext { } private void executeVoid3(StringLocated location, TMemory memory, TFunction function, EaterFunctionCall call) - throws EaterException, EaterExceptionLocated { + throws EaterExceptionLocated { function.executeProcedureInternal(this, memory, location, call.getValues(), call.getNamedArguments()); } - private void executeImport(TMemory memory, StringLocated s) throws EaterException, EaterExceptionLocated { + private void executeImport(TMemory memory, StringLocated s) throws EaterExceptionLocated { final EaterImport _import = new EaterImport(s.getTrimmed()); _import.analyze(this, memory); @@ -520,13 +511,13 @@ public class TContext { } } catch (IOException e) { Logme.error(e); - throw EaterException.located("Cannot import " + e.getMessage(), s); + throw EaterExceptionLocated.located("Cannot import " + e.getMessage(), s); } - throw EaterException.located("Cannot import", s); + throw EaterExceptionLocated.located("Cannot import", s); } - private void executeLog(TMemory memory, StringLocated s) throws EaterException, EaterExceptionLocated { + private void executeLog(TMemory memory, StringLocated s) throws EaterExceptionLocated { final EaterLog log = new EaterLog(s.getTrimmed()); log.analyze(this, memory); } @@ -538,7 +529,7 @@ public class TContext { } - private void executeIncludesub(TMemory memory, StringLocated s) throws EaterException, EaterExceptionLocated { + private void executeIncludesub(TMemory memory, StringLocated s) throws EaterExceptionLocated { ImportedFiles saveImportedFiles = null; try { final EaterIncludesub include = new EaterIncludesub(s.getTrimmed()); @@ -556,7 +547,7 @@ public class TContext { this.importedFiles = this.importedFiles.withCurrentDir(f2.getParentFile()); final Reader reader = f2.getReader(charset); if (reader == null) - throw EaterException.located("cannot include " + what, s); + throw EaterExceptionLocated.located("cannot include " + what, s); try { ReadLine readerline = ReadLineReader.create(reader, what, s.getLocation()); @@ -568,14 +559,14 @@ public class TContext { } } catch (IOException e) { Logme.error(e); - throw EaterException.located("cannot include " + what, s); + throw EaterExceptionLocated.located("cannot include " + what, s); } } if (sub == null) sub = subs.get(what); if (sub == null) - throw EaterException.located("cannot include " + what, s); + throw EaterExceptionLocated.located("cannot include " + what, s); executeLinesInternal(memory, sub.lines(), null); } finally { @@ -585,7 +576,7 @@ public class TContext { } } - private void executeIncludeDef(TMemory memory, StringLocated s) throws EaterException, EaterExceptionLocated { + private void executeIncludeDef(TMemory memory, StringLocated s) throws EaterExceptionLocated { final EaterIncludeDef include = new EaterIncludeDef(s.getTrimmed()); include.analyze(this, memory); final String definitionName = include.getLocation(); @@ -604,7 +595,7 @@ public class TContext { } while (true); } catch (IOException e) { Logme.error(e); - throw EaterException.located("" + e, s); + throw EaterExceptionLocated.located("" + e, s); } finally { try { reader2.close(); @@ -614,12 +605,12 @@ public class TContext { } } - private void executeTheme(TMemory memory, StringLocated s) throws EaterException, EaterExceptionLocated { + private void executeTheme(TMemory memory, StringLocated s) throws EaterExceptionLocated { final EaterTheme eater = new EaterTheme(s.getTrimmed(), importedFiles); eater.analyze(this, memory); final ReadLine reader = eater.getTheme(); if (reader == null) - throw EaterException.located("No such theme " + eater.getName(), s); + throw EaterExceptionLocated.located("No such theme " + eater.getName(), s); try { final List body = new ArrayList<>(); @@ -633,7 +624,7 @@ public class TContext { } while (true); } catch (IOException e) { Logme.error(e); - throw EaterException.located("Error reading theme " + e, s); + throw EaterExceptionLocated.located("Error reading theme " + e, s); } finally { try { reader.close(); @@ -643,7 +634,7 @@ public class TContext { } } - private void executeInclude(TMemory memory, StringLocated s) throws EaterException, EaterExceptionLocated { + private void executeInclude(TMemory memory, StringLocated s) throws EaterExceptionLocated { final EaterInclude include = new EaterInclude(s.getTrimmed()); include.analyze(this, memory); String location = include.getWhat(); @@ -661,7 +652,7 @@ public class TContext { if (location.startsWith("http://") || location.startsWith("https://")) { final SURL url = SURL.create(location); if (url == null) - throw EaterException.located("Cannot open URL", s); + throw EaterExceptionLocated.located("Cannot open URL", s); reader = PreprocessorUtils.getReaderIncludeUrl(url, s, suf, charset); } else if (location.startsWith("<") && location.endsWith(">")) { @@ -677,14 +668,14 @@ public class TContext { return; if (strategy == PreprocessorIncludeStrategy.ONCE && filesUsedCurrent.contains(f2)) - throw EaterException.located("This file has already been included", s); + throw EaterExceptionLocated.located("This file has already been included", s); if (StartDiagramExtractReader.containsStartDiagram(f2, s, charset)) { reader = StartDiagramExtractReader.build(f2, s, charset); } else { final Reader tmp = f2.getReader(charset); if (tmp == null) - throw EaterException.located("Cannot include file", s); + throw EaterExceptionLocated.located("Cannot include file", s); reader = ReadLineReader.create(tmp, location, s.getLocation()); } @@ -713,7 +704,7 @@ public class TContext { } } catch (IOException e) { Logme.error(e); - throw EaterException.located("cannot include " + e, s); + throw EaterExceptionLocated.located("cannot include " + e, s); } finally { if (reader != null) { try { @@ -724,7 +715,7 @@ public class TContext { } } - throw EaterException.located("cannot include " + location, s); + throw EaterExceptionLocated.located("cannot include " + location, s); } public boolean isLegacyDefine(String functionName) { diff --git a/src/net/sourceforge/plantuml/tim/TFunction.java b/src/net/sourceforge/plantuml/tim/TFunction.java index d6572f378..f8032a23e 100644 --- a/src/net/sourceforge/plantuml/tim/TFunction.java +++ b/src/net/sourceforge/plantuml/tim/TFunction.java @@ -50,10 +50,10 @@ public interface TFunction { public TFunctionType getFunctionType(); public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List args, - Map named) throws EaterException, EaterExceptionLocated; + Map named) throws EaterExceptionLocated; public void executeProcedureInternal(TContext context, TMemory memory, StringLocated location, List args, - Map named) throws EaterException, EaterExceptionLocated; + Map named) throws EaterExceptionLocated; public boolean isUnquoted(); diff --git a/src/net/sourceforge/plantuml/tim/TFunctionImpl.java b/src/net/sourceforge/plantuml/tim/TFunctionImpl.java index 506dc465d..eb36bbb3e 100644 --- a/src/net/sourceforge/plantuml/tim/TFunctionImpl.java +++ b/src/net/sourceforge/plantuml/tim/TFunctionImpl.java @@ -133,7 +133,7 @@ public class TFunctionImpl implements TFunction { @Override public void executeProcedureInternal(TContext context, TMemory memory, StringLocated location, List args, - Map named) throws EaterException, EaterExceptionLocated { + Map named) throws EaterExceptionLocated { if (functionType != TFunctionType.PROCEDURE && functionType != TFunctionType.LEGACY_DEFINELONG) throw new IllegalStateException(); @@ -143,23 +143,24 @@ public class TFunctionImpl implements TFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List args, - Map named) throws EaterException, EaterExceptionLocated { + Map named) throws EaterExceptionLocated { if (functionType == TFunctionType.LEGACY_DEFINE) return executeReturnLegacyDefine(location.getLocation(), context, memory, args); if (functionType != TFunctionType.RETURN_FUNCTION) - throw EaterException.unlocated("Illegal call here. Is there a return directive in your function?", location); + throw EaterExceptionLocated.unlocated("Illegal call here. Is there a return directive in your function?", + location); final TMemory copy = getNewMemory(memory, args, named); final TValue result = context.executeLines(copy, body, TFunctionType.RETURN_FUNCTION, true); if (result == null) - throw EaterException.unlocated("No return directive found in your function", location); + throw EaterExceptionLocated.unlocated("No return directive found in your function", location); return result; } private TValue executeReturnLegacyDefine(LineLocation location, TContext context, TMemory memory, List args) - throws EaterException, EaterExceptionLocated { + throws EaterExceptionLocated { if (legacyDefinition == null) throw new IllegalStateException(); diff --git a/src/net/sourceforge/plantuml/tim/TMemory.java b/src/net/sourceforge/plantuml/tim/TMemory.java index 466b5951b..cf89df812 100644 --- a/src/net/sourceforge/plantuml/tim/TMemory.java +++ b/src/net/sourceforge/plantuml/tim/TMemory.java @@ -45,7 +45,7 @@ public interface TMemory { public TValue getVariable(String varname); public void putVariable(String varname, TValue value, TVariableScope scope, StringLocated location) - throws EaterException; + throws EaterExceptionLocated; public void removeVariable(String varname); @@ -59,7 +59,7 @@ public interface TMemory { public ExecutionContextIf peekIf(); - public boolean areAllIfOk(TContext context, TMemory memory) throws EaterException; + public boolean areAllIfOk(TContext context, TMemory memory) throws EaterExceptionLocated; public void addIf(ExecutionContextIf context); diff --git a/src/net/sourceforge/plantuml/tim/TMemoryGlobal.java b/src/net/sourceforge/plantuml/tim/TMemoryGlobal.java index f5587df1b..f8d5aaec3 100644 --- a/src/net/sourceforge/plantuml/tim/TMemoryGlobal.java +++ b/src/net/sourceforge/plantuml/tim/TMemoryGlobal.java @@ -73,10 +73,10 @@ public class TMemoryGlobal extends ExecutionContexts implements TMemory { @Override public void putVariable(String varname, TValue value, TVariableScope scope, StringLocated location) - throws EaterException { + throws EaterExceptionLocated { Log.info("[MemGlobal] Setting " + varname); if (scope == TVariableScope.LOCAL) - throw EaterException.unlocated("Cannot use local variable here", location); + throw EaterExceptionLocated.unlocated("Cannot use local variable here", location); this.globalVariables.put(varname, value); this.variables.add(varname); diff --git a/src/net/sourceforge/plantuml/tim/TMemoryLocal.java b/src/net/sourceforge/plantuml/tim/TMemoryLocal.java index 2603e1d0d..4271d6e36 100644 --- a/src/net/sourceforge/plantuml/tim/TMemoryLocal.java +++ b/src/net/sourceforge/plantuml/tim/TMemoryLocal.java @@ -79,7 +79,7 @@ public class TMemoryLocal extends ExecutionContexts implements TMemory { @Override public void putVariable(String varname, TValue value, TVariableScope scope, StringLocated location) - throws EaterException { + throws EaterExceptionLocated { if (scope == TVariableScope.GLOBAL) { memoryGlobal.putVariable(varname, value, scope, location); return; diff --git a/src/net/sourceforge/plantuml/tim/TimLoader.java b/src/net/sourceforge/plantuml/tim/TimLoader.java index 7d8bd5c93..09962e007 100644 --- a/src/net/sourceforge/plantuml/tim/TimLoader.java +++ b/src/net/sourceforge/plantuml/tim/TimLoader.java @@ -57,7 +57,7 @@ public class TimLoader { this.context = new TContext(importedFiles, defines, charset, definitionsContainer); try { defines.copyTo(global, location); - } catch (EaterException e) { + } catch (EaterExceptionLocated e) { Logme.error(e); } } diff --git a/src/net/sourceforge/plantuml/tim/VariableManager.java b/src/net/sourceforge/plantuml/tim/VariableManager.java index 1f9a66dc4..d8fc019ac 100644 --- a/src/net/sourceforge/plantuml/tim/VariableManager.java +++ b/src/net/sourceforge/plantuml/tim/VariableManager.java @@ -40,7 +40,6 @@ import net.sourceforge.plantuml.json.JsonValue; import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.text.TLineType; import net.sourceforge.plantuml.tim.expression.TValue; -import net.sourceforge.plantuml.utils.LineLocation; public class VariableManager { @@ -54,7 +53,7 @@ public class VariableManager { this.location = location; } - public int replaceVariables(String str, int i, StringBuilder result) throws EaterException, EaterExceptionLocated { + public int replaceVariables(String str, int i, StringBuilder result) throws EaterExceptionLocated { final String presentVariable = getVarnameAt(str, i); if (result.toString().endsWith("##")) result.setLength(result.length() - 2); @@ -81,8 +80,7 @@ public class VariableManager { return i; } - private int replaceJson(JsonValue jsonValue, String str, int i, StringBuilder result) - throws EaterException, EaterExceptionLocated { + private int replaceJson(JsonValue jsonValue, String str, int i, StringBuilder result) throws EaterExceptionLocated { while (i < str.length()) { final char n = str.charAt(i); if (n == '.') { @@ -120,11 +118,11 @@ public class VariableManager { } else if (jsonValue instanceof JsonObject) { jsonValue = ((JsonObject) jsonValue).get(nbString); } else { - throw EaterException.unlocated("Major parsing error", location); + throw EaterExceptionLocated.unlocated("Major parsing error", location); } if (jsonValue == null) - throw EaterException.unlocated("Data parsing error", location); + throw EaterExceptionLocated.unlocated("Data parsing error", location); i++; } else { diff --git a/src/net/sourceforge/plantuml/tim/expression/Knowledge.java b/src/net/sourceforge/plantuml/tim/expression/Knowledge.java index 60723a615..b2fdb753d 100644 --- a/src/net/sourceforge/plantuml/tim/expression/Knowledge.java +++ b/src/net/sourceforge/plantuml/tim/expression/Knowledge.java @@ -34,14 +34,13 @@ */ package net.sourceforge.plantuml.tim.expression; -import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TFunction; import net.sourceforge.plantuml.tim.TFunctionSignature; public interface Knowledge { - public TValue getVariable(String name) throws EaterException, EaterExceptionLocated; + public TValue getVariable(String name) throws EaterExceptionLocated; public TFunction getFunction(TFunctionSignature signature); diff --git a/src/net/sourceforge/plantuml/tim/expression/ReversePolishInterpretor.java b/src/net/sourceforge/plantuml/tim/expression/ReversePolishInterpretor.java index 5ef785efd..67996cc69 100644 --- a/src/net/sourceforge/plantuml/tim/expression/ReversePolishInterpretor.java +++ b/src/net/sourceforge/plantuml/tim/expression/ReversePolishInterpretor.java @@ -41,7 +41,6 @@ import java.util.Deque; import java.util.List; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunction; @@ -54,7 +53,7 @@ public class ReversePolishInterpretor { private final boolean trace = false; public ReversePolishInterpretor(StringLocated location, TokenStack queue, Knowledge knowledge, TMemory memory, - TContext context) throws EaterException, EaterExceptionLocated { + TContext context) throws EaterExceptionLocated { final Deque stack = new ArrayDeque<>(); if (trace) @@ -73,45 +72,45 @@ public class ReversePolishInterpretor { final TValue v2 = stack.removeFirst(); final TValue v1 = stack.removeFirst(); final TokenOperator op = token.getTokenOperator(); - if (op == null) - throw EaterException.unlocated("bad op", location); - + if (op == null) + throw EaterExceptionLocated.unlocated("bad op", location); + final TValue tmp = op.operate(v1, v2); stack.addFirst(tmp); } else if (token.getTokenType() == TokenType.OPEN_PAREN_FUNC) { final int nb = Integer.parseInt(token.getSurface()); final Token token2 = it.nextToken(); - if (token2.getTokenType() != TokenType.FUNCTION_NAME) - throw EaterException.unlocated("rpn43", location); - + if (token2.getTokenType() != TokenType.FUNCTION_NAME) + throw EaterExceptionLocated.unlocated("rpn43", location); + if (trace) System.err.println("token2=" + token2); final TFunction function = knowledge.getFunction(new TFunctionSignature(token2.getSurface(), nb)); if (trace) System.err.println("function=" + function); - if (function == null) - throw EaterException.unlocated("Unknown built-in function " + token2.getSurface(), location); - - if (function.canCover(nb, Collections.emptySet()) == false) - throw EaterException.unlocated( + if (function == null) + throw EaterExceptionLocated.unlocated("Unknown built-in function " + token2.getSurface(), location); + + if (function.canCover(nb, Collections.emptySet()) == false) + throw EaterExceptionLocated.unlocated( "Bad number of arguments for " + function.getSignature().getFunctionName(), location); - + final List args = new ArrayList<>(); - for (int i = 0; i < nb; i++) + for (int i = 0; i < nb; i++) args.add(0, stack.removeFirst()); - + if (trace) System.err.println("args=" + args); - if (location == null) - throw EaterException.unlocated("rpn44", location); - + if (location == null) + throw EaterExceptionLocated.unlocated("rpn44", location); + final TValue r = function.executeReturnFunction(context, memory, location, args, Collections.emptyMap()); if (trace) System.err.println("r=" + r); stack.addFirst(r); } else { - throw EaterException.unlocated("rpn41", location); + throw EaterExceptionLocated.unlocated("rpn41", location); } } result = stack.removeFirst(); diff --git a/src/net/sourceforge/plantuml/tim/expression/ShuntingYard.java b/src/net/sourceforge/plantuml/tim/expression/ShuntingYard.java index 4b40aab8f..45ee8e008 100644 --- a/src/net/sourceforge/plantuml/tim/expression/ShuntingYard.java +++ b/src/net/sourceforge/plantuml/tim/expression/ShuntingYard.java @@ -38,7 +38,6 @@ import java.util.ArrayDeque; import java.util.Deque; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; // https://en.wikipedia.org/wiki/Shunting-yard_algorithm @@ -59,8 +58,7 @@ public class ShuntingYard { System.err.println(""); } - public ShuntingYard(TokenIterator it, Knowledge knowledge, StringLocated location) - throws EaterException, EaterExceptionLocated { + public ShuntingYard(TokenIterator it, Knowledge knowledge, StringLocated location) throws EaterExceptionLocated { while (it.hasMoreTokens()) { final Token token = it.nextToken(); @@ -76,7 +74,7 @@ public class ShuntingYard { final TValue variable = knowledge.getVariable(name); if (variable == null) { if (isVariableName(name) == false) - throw EaterException.unlocated("Parsing syntax error about " + name, location); + throw EaterExceptionLocated.unlocated("Parsing syntax error about " + name, location); ouputQueue.add(new Token(name, TokenType.QUOTED_STRING, null)); } else { diff --git a/src/net/sourceforge/plantuml/tim/expression/TokenStack.java b/src/net/sourceforge/plantuml/tim/expression/TokenStack.java index b25c96f6c..bed0e451d 100644 --- a/src/net/sourceforge/plantuml/tim/expression/TokenStack.java +++ b/src/net/sourceforge/plantuml/tim/expression/TokenStack.java @@ -44,7 +44,6 @@ import java.util.Map; import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.tim.Eater; -import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TMemory; @@ -87,7 +86,7 @@ public class TokenStack { return result; } - static public TokenStack eatUntilCloseParenthesisOrComma(Eater eater) throws EaterException { + static public TokenStack eatUntilCloseParenthesisOrComma(Eater eater) throws EaterExceptionLocated { final TokenStack result = new TokenStack(); int level = 0; Token lastToken = null; @@ -95,7 +94,7 @@ public class TokenStack { eater.skipSpaces(); final char ch = eater.peekChar(); if (ch == 0) - throw EaterException.unlocated("until001", eater.getStringLocated()); + throw EaterExceptionLocated.unlocated("until001", eater.getStringLocated()); if (level == 0 && (ch == ',' || ch == ')')) return result; @@ -113,12 +112,13 @@ public class TokenStack { } } - static public void eatUntilCloseParenthesisOrComma(TokenIterator it, StringLocated location) throws EaterException { + static public void eatUntilCloseParenthesisOrComma(TokenIterator it, StringLocated location) + throws EaterExceptionLocated { int level = 0; while (true) { final Token ch = it.peekToken(); if (ch == null) - throw EaterException.unlocated("until002", location); + throw EaterExceptionLocated.unlocated("until002", location); final TokenType typech = ch.getTokenType(); if (level == 0 && (typech == TokenType.COMMA || typech == TokenType.CLOSE_PAREN_MATH) @@ -135,7 +135,7 @@ public class TokenStack { } } - private int countFunctionArg(TokenIterator it, StringLocated location) throws EaterException { + private int countFunctionArg(TokenIterator it, StringLocated location) throws EaterExceptionLocated { // return 42; final TokenType type1 = it.peekToken().getTokenType(); if (type1 == TokenType.CLOSE_PAREN_MATH || type1 == TokenType.CLOSE_PAREN_FUNC) @@ -151,13 +151,13 @@ public class TokenStack { else if (type == TokenType.COMMA) result++; else - throw EaterException.unlocated("count13", location); + throw EaterExceptionLocated.unlocated("count13", location); } - throw EaterException.unlocated("count12", location); + throw EaterExceptionLocated.unlocated("count12", location); } - public void guessFunctions(StringLocated location) throws EaterException { + public void guessFunctions(StringLocated location) throws EaterExceptionLocated { final Deque open = new ArrayDeque<>(); final Map parens = new HashMap(); for (int i = 0; i < tokens.size(); i++) { @@ -210,8 +210,7 @@ public class TokenStack { return new InternalIterator(); } - public TValue getResult(StringLocated location, TContext context, TMemory memory) - throws EaterException, EaterExceptionLocated { + public TValue getResult(StringLocated location, TContext context, TMemory memory) throws EaterExceptionLocated { final Knowledge knowledge = context.asKnowledge(memory, location.getLocation()); final TokenStack tmp = withoutSpace(); tmp.guessFunctions(location); diff --git a/src/net/sourceforge/plantuml/tim/expression/TokenType.java b/src/net/sourceforge/plantuml/tim/expression/TokenType.java index a72a65bef..bdb7c445f 100644 --- a/src/net/sourceforge/plantuml/tim/expression/TokenType.java +++ b/src/net/sourceforge/plantuml/tim/expression/TokenType.java @@ -36,10 +36,10 @@ package net.sourceforge.plantuml.tim.expression; import net.sourceforge.plantuml.text.TLineType; import net.sourceforge.plantuml.tim.Eater; -import net.sourceforge.plantuml.tim.EaterException; +import net.sourceforge.plantuml.tim.EaterExceptionLocated; public enum TokenType { - // ::remove folder when __HAXE__ + // ::remove folder when __HAXE__ QUOTED_STRING, JSON_DATA, OPERATOR, OPEN_PAREN_MATH, COMMA, CLOSE_PAREN_MATH, NUMBER, PLAIN_TEXT, SPACES, FUNCTION_NAME, OPEN_PAREN_FUNC, CLOSE_PAREN_FUNC; @@ -77,7 +77,8 @@ public enum TokenType { return result; } - final static public Token eatOneToken(Token lastToken, Eater eater, boolean manageColon) throws EaterException { + final static public Token eatOneToken(Token lastToken, Eater eater, boolean manageColon) + throws EaterExceptionLocated { char ch = eater.peekChar(); if (ch == 0) return null; @@ -121,7 +122,7 @@ public enum TokenType { return true; } - static private String eatAndGetTokenPlainText(Eater eater) throws EaterException { + static private String eatAndGetTokenPlainText(Eater eater) throws EaterExceptionLocated { final StringBuilder result = new StringBuilder(); while (true) { final char ch = eater.peekChar(); diff --git a/src/net/sourceforge/plantuml/tim/iterator/AbstractCodeIterator.java b/src/net/sourceforge/plantuml/tim/iterator/AbstractCodeIterator.java index a4e9a62aa..e01a9707c 100644 --- a/src/net/sourceforge/plantuml/tim/iterator/AbstractCodeIterator.java +++ b/src/net/sourceforge/plantuml/tim/iterator/AbstractCodeIterator.java @@ -35,7 +35,6 @@ package net.sourceforge.plantuml.tim.iterator; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; public abstract class AbstractCodeIterator implements CodeIterator { @@ -47,7 +46,7 @@ public abstract class AbstractCodeIterator implements CodeIterator { } @Override - public void next() throws EaterException, EaterExceptionLocated { + public void next() throws EaterExceptionLocated { source.next(); } @@ -57,7 +56,8 @@ public abstract class AbstractCodeIterator implements CodeIterator { } @Override - final public void jumpToCodePosition(CodePosition newPosition, StringLocated location) throws EaterException { + final public void jumpToCodePosition(CodePosition newPosition, StringLocated location) + throws EaterExceptionLocated { source.jumpToCodePosition(newPosition, location); } diff --git a/src/net/sourceforge/plantuml/tim/iterator/CodeIterator.java b/src/net/sourceforge/plantuml/tim/iterator/CodeIterator.java index 48698ab5c..f6c613a00 100644 --- a/src/net/sourceforge/plantuml/tim/iterator/CodeIterator.java +++ b/src/net/sourceforge/plantuml/tim/iterator/CodeIterator.java @@ -35,18 +35,17 @@ package net.sourceforge.plantuml.tim.iterator; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; public interface CodeIterator { // ::remove folder when __HAXE__ - public StringLocated peek() throws EaterException, EaterExceptionLocated; + public StringLocated peek() throws EaterExceptionLocated; - public void next() throws EaterException, EaterExceptionLocated; + public void next() throws EaterExceptionLocated; public CodePosition getCodePosition(); - public void jumpToCodePosition(CodePosition newPosition, StringLocated location) throws EaterException; + public void jumpToCodePosition(CodePosition newPosition, StringLocated location) throws EaterExceptionLocated; } diff --git a/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorAffectation.java b/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorAffectation.java index 0d380a436..bb341c11e 100644 --- a/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorAffectation.java +++ b/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorAffectation.java @@ -40,7 +40,6 @@ import net.sourceforge.plantuml.json.ParseException; import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.text.TLineType; import net.sourceforge.plantuml.tim.EaterAffectation; -import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TMemory; @@ -59,7 +58,7 @@ public class CodeIteratorAffectation extends AbstractCodeIterator { } @Override - public StringLocated peek() throws EaterException, EaterExceptionLocated { + public StringLocated peek() throws EaterExceptionLocated { while (true) { final StringLocated result = source.peek(); if (result == null) { @@ -75,16 +74,16 @@ public class CodeIteratorAffectation extends AbstractCodeIterator { } } - private void doAffectation(StringLocated result) throws EaterException, EaterExceptionLocated { + private void doAffectation(StringLocated result) throws EaterExceptionLocated { int lastLocation = -1; for (int i = 0; i < 9999; i++) try { this.executeAffectation(context, memory, result); return; } catch (ParseException e) { - if (e.getColumn() <= lastLocation) - throw EaterException.located("Error in JSON format", result); - + if (e.getColumn() <= lastLocation) + throw EaterExceptionLocated.located("Error in JSON format", result); + lastLocation = e.getColumn(); next(); final StringLocated forward = source.peek(); @@ -93,7 +92,7 @@ public class CodeIteratorAffectation extends AbstractCodeIterator { } private void executeAffectation(TContext context, TMemory memory, StringLocated s) - throws EaterException, EaterExceptionLocated { + throws EaterExceptionLocated { new EaterAffectation(s).analyze(context, memory); } diff --git a/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorForeach.java b/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorForeach.java index 87a783882..d6cb73027 100644 --- a/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorForeach.java +++ b/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorForeach.java @@ -39,7 +39,6 @@ import java.util.List; import net.sourceforge.plantuml.json.JsonValue; import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.text.TLineType; -import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.EaterForeach; import net.sourceforge.plantuml.tim.ExecutionContextForeach; @@ -61,7 +60,7 @@ public class CodeIteratorForeach extends AbstractCodeIterator { this.logs = logs; } - public StringLocated peek() throws EaterException, EaterExceptionLocated { + public StringLocated peek() throws EaterExceptionLocated { int level = 0; while (true) { final StringLocated result = source.peek(); @@ -91,7 +90,7 @@ public class CodeIteratorForeach extends AbstractCodeIterator { } else if (result.getType() == TLineType.ENDFOREACH) { logs.add(result); if (foreach == null) - throw EaterException.located("No foreach related to this endforeach", result); + throw EaterExceptionLocated.located("No foreach related to this endforeach", result); foreach.inc(); if (foreach.isSkipMe()) { @@ -108,7 +107,7 @@ public class CodeIteratorForeach extends AbstractCodeIterator { } } - private void executeForeach(TMemory memory, StringLocated s) throws EaterException, EaterExceptionLocated { + private void executeForeach(TMemory memory, StringLocated s) throws EaterExceptionLocated { final EaterForeach condition = new EaterForeach(s); condition.analyze(context, memory); final ExecutionContextForeach foreach = ExecutionContextForeach.fromValue(condition.getVarname(), @@ -122,7 +121,7 @@ public class CodeIteratorForeach extends AbstractCodeIterator { } private void setLoopVariable(TMemory memory, ExecutionContextForeach foreach, StringLocated position) - throws EaterException { + throws EaterExceptionLocated { final JsonValue first = foreach.getJsonArray().get(foreach.currentIndex()); memory.putVariable(foreach.getVarname(), TValue.fromJson(first), TVariableScope.GLOBAL, position); } diff --git a/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorIf.java b/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorIf.java index 43ae09658..f36954d28 100644 --- a/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorIf.java +++ b/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorIf.java @@ -39,7 +39,6 @@ import java.util.List; import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.text.TLineType; import net.sourceforge.plantuml.tim.EaterElseIf; -import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.EaterIf; import net.sourceforge.plantuml.tim.EaterIfdef; @@ -61,7 +60,7 @@ public class CodeIteratorIf extends AbstractCodeIterator { this.logs = logs; } - public StringLocated peek() throws EaterException, EaterExceptionLocated { + public StringLocated peek() throws EaterExceptionLocated { while (true) { final StringLocated result = source.peek(); if (result == null) { @@ -107,19 +106,17 @@ public class CodeIteratorIf extends AbstractCodeIterator { } } - private void executeIf(TContext context, TMemory memory, StringLocated s) - throws EaterException, EaterExceptionLocated { + private void executeIf(TContext context, TMemory memory, StringLocated s) throws EaterExceptionLocated { final EaterIf condition = new EaterIf(s); condition.analyze(context, memory); final boolean isTrue = condition.isTrue(); memory.addIf(ExecutionContextIf.fromValue(isTrue)); } - private void executeElseIf(TContext context, TMemory memory, StringLocated s) - throws EaterException, EaterExceptionLocated { + private void executeElseIf(TContext context, TMemory memory, StringLocated s) throws EaterExceptionLocated { final ExecutionContextIf poll = (ExecutionContextIf) memory.peekIf(); if (poll == null) - throw EaterException.located("No if related to this else", s); + throw EaterExceptionLocated.located("No if related to this else", s); poll.enteringElseIf(); if (poll.hasBeenBurn() == false) { @@ -132,32 +129,32 @@ public class CodeIteratorIf extends AbstractCodeIterator { } } - private void executeIfdef(TContext context, TMemory memory, StringLocated s) throws EaterException { + private void executeIfdef(TContext context, TMemory memory, StringLocated s) throws EaterExceptionLocated { final EaterIfdef condition = new EaterIfdef(s); condition.analyze(context, memory); final boolean isTrue = condition.isTrue(context, memory); memory.addIf(ExecutionContextIf.fromValue(isTrue)); } - private void executeIfndef(TContext context, TMemory memory, StringLocated s) throws EaterException { + private void executeIfndef(TContext context, TMemory memory, StringLocated s) throws EaterExceptionLocated { final EaterIfndef condition = new EaterIfndef(s); condition.analyze(context, memory); final boolean isTrue = condition.isTrue(context, memory); memory.addIf(ExecutionContextIf.fromValue(isTrue)); } - private void executeElse(TContext context, TMemory memory, StringLocated s) throws EaterException { + private void executeElse(TContext context, TMemory memory, StringLocated s) throws EaterExceptionLocated { final ExecutionContextIf poll = (ExecutionContextIf) memory.peekIf(); if (poll == null) - throw EaterException.located("No if related to this else", s); + throw EaterExceptionLocated.located("No if related to this else", s); poll.nowInElse(); } - private void executeEndif(TContext context, TMemory memory, StringLocated s) throws EaterException { + private void executeEndif(TContext context, TMemory memory, StringLocated s) throws EaterExceptionLocated { final ExecutionContextIf poll = (ExecutionContextIf) memory.pollIf(); if (poll == null) - throw EaterException.located("No if related to this endif", s); + throw EaterExceptionLocated.located("No if related to this endif", s); } diff --git a/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorImpl.java b/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorImpl.java index 985fcd398..c1bbd51a7 100644 --- a/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorImpl.java +++ b/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorImpl.java @@ -37,7 +37,7 @@ package net.sourceforge.plantuml.tim.iterator; import java.util.List; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterException; +import net.sourceforge.plantuml.tim.EaterExceptionLocated; public class CodeIteratorImpl implements CodeIterator { @@ -89,10 +89,10 @@ public class CodeIteratorImpl implements CodeIterator { } @Override - public void jumpToCodePosition(CodePosition newPosition, StringLocated location) throws EaterException { + public void jumpToCodePosition(CodePosition newPosition, StringLocated location) throws EaterExceptionLocated { this.countJump++; if (this.countJump > 999) - throw EaterException.unlocated("Infinite loop?", location); + throw EaterExceptionLocated.unlocated("Infinite loop?", location); final Position pos = (Position) newPosition; this.current = pos.pos; diff --git a/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorInnerComment.java b/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorInnerComment.java index f7baab3e8..fe5a2d094 100644 --- a/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorInnerComment.java +++ b/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorInnerComment.java @@ -35,7 +35,6 @@ package net.sourceforge.plantuml.tim.iterator; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; public class CodeIteratorInnerComment extends AbstractCodeIterator { @@ -44,7 +43,7 @@ public class CodeIteratorInnerComment extends AbstractCodeIterator { super(source); } - public StringLocated peek() throws EaterException, EaterExceptionLocated { + public StringLocated peek() throws EaterExceptionLocated { final StringLocated result = source.peek(); if (result == null) { return null; diff --git a/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorLegacyDefine.java b/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorLegacyDefine.java index 51670f20e..13709df73 100644 --- a/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorLegacyDefine.java +++ b/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorLegacyDefine.java @@ -38,7 +38,6 @@ import java.util.List; import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.text.TLineType; -import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.FunctionsSet; import net.sourceforge.plantuml.tim.TContext; @@ -61,7 +60,7 @@ public class CodeIteratorLegacyDefine extends AbstractCodeIterator { this.memory = memory; } - public StringLocated peek() throws EaterException, EaterExceptionLocated { + public StringLocated peek() throws EaterExceptionLocated { while (true) { final StringLocated result = source.peek(); if (result == null) { diff --git a/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorLongComment.java b/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorLongComment.java index 3f2cc2e0b..cc92cf384 100644 --- a/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorLongComment.java +++ b/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorLongComment.java @@ -38,7 +38,6 @@ import java.util.List; import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.text.TLineType; -import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; public class CodeIteratorLongComment extends AbstractCodeIterator { @@ -50,7 +49,7 @@ public class CodeIteratorLongComment extends AbstractCodeIterator { this.logs = logs; } - public StringLocated peek() throws EaterException, EaterExceptionLocated { + public StringLocated peek() throws EaterExceptionLocated { while (true) { if (source.peek() == null) { return null; diff --git a/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorProcedure.java b/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorProcedure.java index d03dfcc00..1b4be2503 100644 --- a/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorProcedure.java +++ b/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorProcedure.java @@ -38,7 +38,6 @@ import java.util.List; import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.text.TLineType; -import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.FunctionsSet; import net.sourceforge.plantuml.tim.TContext; @@ -62,7 +61,7 @@ public class CodeIteratorProcedure extends AbstractCodeIterator { this.memory = memory; } - public StringLocated peek() throws EaterException, EaterExceptionLocated { + public StringLocated peek() throws EaterExceptionLocated { while (true) { final StringLocated result = source.peek(); if (result == null) { diff --git a/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorReturnFunction.java b/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorReturnFunction.java index 8ff1feea5..791abad71 100644 --- a/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorReturnFunction.java +++ b/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorReturnFunction.java @@ -38,7 +38,6 @@ import java.util.List; import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.text.TLineType; -import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.FunctionsSet; import net.sourceforge.plantuml.tim.TContext; @@ -62,7 +61,7 @@ public class CodeIteratorReturnFunction extends AbstractCodeIterator { this.memory = memory; } - public StringLocated peek() throws EaterException, EaterExceptionLocated { + public StringLocated peek() throws EaterExceptionLocated { while (true) { final StringLocated result = source.peek(); if (result == null) { diff --git a/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorShortComment.java b/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorShortComment.java index b70c45584..f57bcab66 100644 --- a/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorShortComment.java +++ b/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorShortComment.java @@ -38,7 +38,6 @@ import java.util.List; import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.text.TLineType; -import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; public class CodeIteratorShortComment extends AbstractCodeIterator { @@ -50,7 +49,7 @@ public class CodeIteratorShortComment extends AbstractCodeIterator { this.logs = logs; } - public StringLocated peek() throws EaterException, EaterExceptionLocated { + public StringLocated peek() throws EaterExceptionLocated { while (true) { final StringLocated result = source.peek(); if (result == null) { diff --git a/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorSub.java b/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorSub.java index 2c15a7b3e..1c28d1199 100644 --- a/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorSub.java +++ b/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorSub.java @@ -40,7 +40,6 @@ import java.util.Map; import net.sourceforge.plantuml.preproc.Sub; import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.text.TLineType; -import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.EaterStartsub; import net.sourceforge.plantuml.tim.TContext; @@ -66,7 +65,7 @@ public class CodeIteratorSub extends AbstractCodeIterator { return Collections.unmodifiableMap(subs); } - public StringLocated peek() throws EaterException, EaterExceptionLocated { + public StringLocated peek() throws EaterExceptionLocated { if (readingInProgress != null) return readingInProgress.peek(); @@ -83,7 +82,7 @@ public class CodeIteratorSub extends AbstractCodeIterator { StringLocated s = null; while ((s = source.peek()) != null) { if (s.getType() == TLineType.STARTSUB) { - throw EaterException.located("Cannot nest sub", result); + throw EaterExceptionLocated.located("Cannot nest sub", result); } else if (s.getType() == TLineType.ENDSUB) { source.next(); readingInProgress = new CodeIteratorImpl(created.lines()); @@ -101,7 +100,7 @@ public class CodeIteratorSub extends AbstractCodeIterator { } @Override - public void next() throws EaterException, EaterExceptionLocated { + public void next() throws EaterExceptionLocated { if (readingInProgress == null) { source.next(); return; diff --git a/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorWhile.java b/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorWhile.java index 01b445898..db912021e 100644 --- a/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorWhile.java +++ b/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorWhile.java @@ -38,7 +38,6 @@ import java.util.List; import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.text.TLineType; -import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.EaterWhile; import net.sourceforge.plantuml.tim.ExecutionContextWhile; @@ -60,7 +59,7 @@ public class CodeIteratorWhile extends AbstractCodeIterator { this.logs = logs; } - public StringLocated peek() throws EaterException, EaterExceptionLocated { + public StringLocated peek() throws EaterExceptionLocated { int level = 0; while (true) { final StringLocated result = source.peek(); @@ -90,7 +89,7 @@ public class CodeIteratorWhile extends AbstractCodeIterator { } else if (result.getType() == TLineType.ENDWHILE) { logs.add(result); if (currentWhile == null) - throw EaterException.located("No while related to this endwhile", result); + throw EaterExceptionLocated.located("No while related to this endwhile", result); final TValue value = currentWhile.conditionValue(result, context, memory); if (value.toBoolean()) @@ -106,7 +105,7 @@ public class CodeIteratorWhile extends AbstractCodeIterator { } } - private void executeWhile(TMemory memory, StringLocated s) throws EaterException, EaterExceptionLocated { + private void executeWhile(TMemory memory, StringLocated s) throws EaterExceptionLocated { final EaterWhile condition = new EaterWhile(s); condition.analyze(context, memory); final TokenStack whileExpression = condition.getWhileExpression(); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/AlwaysFalse.java b/src/net/sourceforge/plantuml/tim/stdlib/AlwaysFalse.java index 6d13ce01e..5991d486e 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/AlwaysFalse.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/AlwaysFalse.java @@ -39,7 +39,6 @@ import java.util.Map; import java.util.Set; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; @@ -59,7 +58,7 @@ public class AlwaysFalse extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterException, EaterExceptionLocated { + Map named) throws EaterExceptionLocated { return TValue.fromBoolean(false); } } diff --git a/src/net/sourceforge/plantuml/tim/stdlib/AlwaysTrue.java b/src/net/sourceforge/plantuml/tim/stdlib/AlwaysTrue.java index e9a1362b6..d9cf561e0 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/AlwaysTrue.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/AlwaysTrue.java @@ -39,7 +39,6 @@ import java.util.Map; import java.util.Set; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; @@ -59,7 +58,7 @@ public class AlwaysTrue extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterException, EaterExceptionLocated { + Map named) throws EaterExceptionLocated { return TValue.fromBoolean(true); } } diff --git a/src/net/sourceforge/plantuml/tim/stdlib/CallUserFunction.java b/src/net/sourceforge/plantuml/tim/stdlib/CallUserFunction.java index 830f5bf25..6268cf54e 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/CallUserFunction.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/CallUserFunction.java @@ -39,7 +39,6 @@ import java.util.Map; import java.util.Set; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunction; @@ -60,13 +59,13 @@ public class CallUserFunction extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterException, EaterExceptionLocated { + Map named) throws EaterExceptionLocated { final String fname = values.get(0).toString(); final List args = values.subList(1, values.size()); final TFunctionSignature signature = new TFunctionSignature(fname, args.size()); final TFunction func = context.getFunctionSmart(signature); if (func == null) - throw EaterException.unlocated("Cannot find void function " + fname, location); + throw EaterExceptionLocated.unlocated("Cannot find void function " + fname, location); return func.executeReturnFunction(context, memory, location, args, named); } diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Chr.java b/src/net/sourceforge/plantuml/tim/stdlib/Chr.java index aa7daa6cb..3dcbfc7d9 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Chr.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/Chr.java @@ -39,7 +39,6 @@ import java.util.Map; import java.util.Set; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; @@ -59,7 +58,7 @@ public class Chr extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterException, EaterExceptionLocated { + Map named) throws EaterExceptionLocated { try { final String value = String.valueOf(Character.toChars(values.get(0).toInt())); return TValue.fromString(value); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Darken.java b/src/net/sourceforge/plantuml/tim/stdlib/Darken.java index 1365c7614..bef84da7d 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Darken.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/Darken.java @@ -42,7 +42,6 @@ import net.sourceforge.plantuml.klimt.color.HColor; import net.sourceforge.plantuml.klimt.color.HColorSet; import net.sourceforge.plantuml.klimt.color.NoSuchColorException; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; @@ -63,7 +62,7 @@ public class Darken extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterException, EaterExceptionLocated { + Map named) throws EaterExceptionLocated { final String colorString = values.get(0).toString(); final int ratio = values.get(1).toInt(); try { @@ -71,7 +70,7 @@ public class Darken extends SimpleReturnFunction { color = color.darken(ratio); return TValue.fromString(color.asString()); } catch (NoSuchColorException e) { - throw EaterException.located("No such color", location); + throw EaterExceptionLocated.located("No such color", location); } } } diff --git a/src/net/sourceforge/plantuml/tim/stdlib/DateFunction.java b/src/net/sourceforge/plantuml/tim/stdlib/DateFunction.java index 0db1db510..1b77104eb 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/DateFunction.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/DateFunction.java @@ -41,7 +41,6 @@ import java.util.Map; import java.util.Set; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; @@ -61,7 +60,7 @@ public class DateFunction extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterException, EaterExceptionLocated { + Map named) throws EaterExceptionLocated { if (values.size() == 0) return TValue.fromString(new Date().toString()); @@ -71,11 +70,11 @@ public class DateFunction extends SimpleReturnFunction { now = 1000L * values.get(1).toInt(); else now = System.currentTimeMillis(); - + try { return TValue.fromString(new SimpleDateFormat(format).format(now)); } catch (Exception e) { - throw EaterException.unlocated("Bad date pattern", location); + throw EaterExceptionLocated.unlocated("Bad date pattern", location); } } } diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Dec2hex.java b/src/net/sourceforge/plantuml/tim/stdlib/Dec2hex.java index 668f618da..b274f3a7c 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Dec2hex.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/Dec2hex.java @@ -39,7 +39,6 @@ import java.util.Map; import java.util.Set; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; @@ -59,7 +58,7 @@ public class Dec2hex extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterException, EaterExceptionLocated { + Map named) throws EaterExceptionLocated { try { return TValue.fromString("" + Integer.toHexString(values.get(0).toInt())); } catch (Throwable t) { diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Dirpath.java b/src/net/sourceforge/plantuml/tim/stdlib/Dirpath.java index a3a0b4e9e..0eef6ddb9 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Dirpath.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/Dirpath.java @@ -40,7 +40,6 @@ import java.util.Set; import net.sourceforge.plantuml.preproc.Defines; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; @@ -66,7 +65,7 @@ public class Dirpath extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterException, EaterExceptionLocated { + Map named) throws EaterExceptionLocated { if (value == null) return TValue.fromString(""); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Eval.java b/src/net/sourceforge/plantuml/tim/stdlib/Eval.java index d08e45363..b08d6b263 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Eval.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/Eval.java @@ -39,7 +39,6 @@ import java.util.Map; import java.util.Set; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.StringEater; import net.sourceforge.plantuml.tim.TContext; @@ -60,7 +59,7 @@ public class Eval extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterException, EaterExceptionLocated { + Map named) throws EaterExceptionLocated { final String exp = values.get(0).toString(); final StringEater eater = new StringEater(exp); final TValue value = eater.eatExpression(context, memory); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Feature.java b/src/net/sourceforge/plantuml/tim/stdlib/Feature.java index 042bfee0b..89ef049eb 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Feature.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/Feature.java @@ -39,7 +39,6 @@ import java.util.Map; import java.util.Set; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; @@ -59,7 +58,7 @@ public class Feature extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterException, EaterExceptionLocated { + Map named) throws EaterExceptionLocated { final String arg = values.get(0).toString(); if ("style".equalsIgnoreCase(arg)) return TValue.fromInt(1); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/FileExists.java b/src/net/sourceforge/plantuml/tim/stdlib/FileExists.java index f43b345a1..bef8b2246 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/FileExists.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/FileExists.java @@ -40,7 +40,6 @@ import java.util.Set; import net.sourceforge.plantuml.security.SFile; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; @@ -60,7 +59,7 @@ public class FileExists extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterException, EaterExceptionLocated { + Map named) throws EaterExceptionLocated { // ::comment when __CORE__ final String path = values.get(0).toString(); return TValue.fromBoolean(new SFile(path).exists()); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Filename.java b/src/net/sourceforge/plantuml/tim/stdlib/Filename.java index fd6089946..812a0033e 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Filename.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/Filename.java @@ -40,7 +40,6 @@ import java.util.Set; import net.sourceforge.plantuml.preproc.Defines; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; @@ -66,7 +65,7 @@ public class Filename extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterException, EaterExceptionLocated { + Map named) throws EaterExceptionLocated { if (value == null) { return TValue.fromString(""); } diff --git a/src/net/sourceforge/plantuml/tim/stdlib/FunctionExists.java b/src/net/sourceforge/plantuml/tim/stdlib/FunctionExists.java index f72dae133..1d72755cb 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/FunctionExists.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/FunctionExists.java @@ -39,7 +39,6 @@ import java.util.Map; import java.util.Set; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; @@ -60,7 +59,7 @@ public class FunctionExists extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterException, EaterExceptionLocated { + Map named) throws EaterExceptionLocated { final String name = values.get(0).toString(); return TValue.fromBoolean(context.doesFunctionExist(name)); } diff --git a/src/net/sourceforge/plantuml/tim/stdlib/GetAllStdlib.java b/src/net/sourceforge/plantuml/tim/stdlib/GetAllStdlib.java index 2bc32f045..f03178410 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/GetAllStdlib.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/GetAllStdlib.java @@ -45,7 +45,6 @@ import net.sourceforge.plantuml.json.JsonObject; import net.sourceforge.plantuml.log.Logme; import net.sourceforge.plantuml.preproc.Stdlib; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; @@ -65,7 +64,7 @@ public class GetAllStdlib extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterException, EaterExceptionLocated { + Map named) throws EaterExceptionLocated { switch (values.size()) { case 0: @@ -100,7 +99,7 @@ public class GetAllStdlib extends SimpleReturnFunction { default: assert false; // Should not append because of canCover() - throw EaterException.located("Error on get_all_stdlib: Too many arguments", location); + throw EaterExceptionLocated.located("Error on get_all_stdlib: Too many arguments", location); } } } diff --git a/src/net/sourceforge/plantuml/tim/stdlib/GetAllTheme.java b/src/net/sourceforge/plantuml/tim/stdlib/GetAllTheme.java index f26379843..9404e09d9 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/GetAllTheme.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/GetAllTheme.java @@ -43,7 +43,6 @@ import net.sourceforge.plantuml.json.JsonArray; import net.sourceforge.plantuml.log.Logme; import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.theme.ThemeUtils; -import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; @@ -63,7 +62,7 @@ public class GetAllTheme extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterException, EaterExceptionLocated { + Map named) throws EaterExceptionLocated { final JsonArray result = new JsonArray(); try { for (String theme : ThemeUtils.getAllThemeNames()) { diff --git a/src/net/sourceforge/plantuml/tim/stdlib/GetJsonKey.java b/src/net/sourceforge/plantuml/tim/stdlib/GetJsonKey.java index 5b48e27c4..3067496d0 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/GetJsonKey.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/GetJsonKey.java @@ -42,7 +42,6 @@ import net.sourceforge.plantuml.json.JsonArray; import net.sourceforge.plantuml.json.JsonObject; import net.sourceforge.plantuml.json.JsonValue; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; @@ -62,11 +61,11 @@ public class GetJsonKey extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterException, EaterExceptionLocated { + Map named) throws EaterExceptionLocated { final TValue data = values.get(0); if (data.isJson() == false) - throw EaterException.unlocated("Not JSON data", location); - + throw EaterExceptionLocated.unlocated("Not JSON data", location); + final JsonValue json = data.toJson(); if (json.isObject()) { final JsonObject object = (JsonObject) json; @@ -88,7 +87,7 @@ public class GetJsonKey extends SimpleReturnFunction { return TValue.fromJson(result); } - throw EaterException.unlocated("Bad JSON type", location); + throw EaterExceptionLocated.unlocated("Bad JSON type", location); } diff --git a/src/net/sourceforge/plantuml/tim/stdlib/GetJsonType.java b/src/net/sourceforge/plantuml/tim/stdlib/GetJsonType.java index 17a2f164a..b27b68f90 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/GetJsonType.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/GetJsonType.java @@ -40,7 +40,6 @@ import java.util.Set; import net.sourceforge.plantuml.json.JsonValue; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; @@ -60,7 +59,7 @@ public class GetJsonType extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterException, EaterExceptionLocated { + Map named) throws EaterExceptionLocated { final TValue data = values.get(0); if (data.isString()) return TValue.fromString("string"); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/GetVariableValue.java b/src/net/sourceforge/plantuml/tim/stdlib/GetVariableValue.java index c950f7c7b..f7ffb4555 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/GetVariableValue.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/GetVariableValue.java @@ -39,7 +39,6 @@ import java.util.Map; import java.util.Set; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; @@ -59,7 +58,7 @@ public class GetVariableValue extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterException, EaterExceptionLocated { + Map named) throws EaterExceptionLocated { final String name = values.get(0).toString(); final TValue variable = memory.getVariable(name); if (variable == null) diff --git a/src/net/sourceforge/plantuml/tim/stdlib/GetVersion.java b/src/net/sourceforge/plantuml/tim/stdlib/GetVersion.java index 68e66ec23..b6d5e61c2 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/GetVersion.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/GetVersion.java @@ -39,7 +39,6 @@ import java.util.Map; import java.util.Set; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; @@ -60,7 +59,7 @@ public class GetVersion extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterException, EaterExceptionLocated { + Map named) throws EaterExceptionLocated { return TValue.fromString(Version.versionString()); } } diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Getenv.java b/src/net/sourceforge/plantuml/tim/stdlib/Getenv.java index 380448942..28a10472f 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Getenv.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/Getenv.java @@ -40,7 +40,6 @@ import java.util.Set; import net.sourceforge.plantuml.security.SecurityUtils; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; @@ -60,7 +59,7 @@ public class Getenv extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterException, EaterExceptionLocated { + Map named) throws EaterExceptionLocated { // ::comment when __CORE__ final String value = getenv(values.get(0).toString()); if (value == null) diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Hex2dec.java b/src/net/sourceforge/plantuml/tim/stdlib/Hex2dec.java index 0cc471567..f7c45b0ef 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Hex2dec.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/Hex2dec.java @@ -39,7 +39,6 @@ import java.util.Map; import java.util.Set; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; @@ -59,7 +58,7 @@ public class Hex2dec extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterException, EaterExceptionLocated { + Map named) throws EaterExceptionLocated { try { return TValue.fromInt(Integer.parseInt(values.get(0).toString(), 16)); } catch (Throwable t) { diff --git a/src/net/sourceforge/plantuml/tim/stdlib/HslColor.java b/src/net/sourceforge/plantuml/tim/stdlib/HslColor.java index 2618bfbf6..34496e629 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/HslColor.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/HslColor.java @@ -42,7 +42,6 @@ import java.util.Set; import net.sourceforge.plantuml.klimt.color.HColors; import net.sourceforge.plantuml.klimt.color.HSLColor; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; @@ -62,7 +61,7 @@ public class HslColor extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterException, EaterExceptionLocated { + Map named) throws EaterExceptionLocated { final int h = values.get(0).toInt(); final int s = values.get(1).toInt(); final int l = values.get(2).toInt(); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/IntVal.java b/src/net/sourceforge/plantuml/tim/stdlib/IntVal.java index b412cad9d..2b54cc99b 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/IntVal.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/IntVal.java @@ -39,7 +39,6 @@ import java.util.Map; import java.util.Set; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; @@ -60,7 +59,7 @@ public class IntVal extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterException, EaterExceptionLocated { + Map named) throws EaterExceptionLocated { final String s = values.get(0).toString(); try { return TValue.fromInt(Integer.parseInt(s)); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/InvokeProcedure.java b/src/net/sourceforge/plantuml/tim/stdlib/InvokeProcedure.java index 01e4f2036..6328e88f6 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/InvokeProcedure.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/InvokeProcedure.java @@ -39,7 +39,6 @@ import java.util.Map; import java.util.Set; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunction; @@ -65,13 +64,13 @@ public class InvokeProcedure implements TFunction { @Override public void executeProcedureInternal(TContext context, TMemory memory, StringLocated location, List args, - Map named) throws EaterException, EaterExceptionLocated { + Map named) throws EaterExceptionLocated { final String fname = args.get(0).toString(); final List sublist = args.subList(1, args.size()); final TFunctionSignature signature = new TFunctionSignature(fname, sublist.size()); final TFunction func = context.getFunctionSmart(signature); if (func == null) - throw EaterException.located("Cannot find void function " + fname, location); + throw EaterExceptionLocated.located("Cannot find void function " + fname, location); func.executeProcedureInternal(context, memory, location, sublist, named); } diff --git a/src/net/sourceforge/plantuml/tim/stdlib/IsDark.java b/src/net/sourceforge/plantuml/tim/stdlib/IsDark.java index f8fa6c394..f481264d2 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/IsDark.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/IsDark.java @@ -42,7 +42,6 @@ import net.sourceforge.plantuml.klimt.color.HColor; import net.sourceforge.plantuml.klimt.color.HColorSet; import net.sourceforge.plantuml.klimt.color.NoSuchColorException; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; @@ -63,13 +62,13 @@ public class IsDark extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterException, EaterExceptionLocated { + Map named) throws EaterExceptionLocated { final String colorString = values.get(0).toString(); try { final HColor color = HColorSet.instance().getColorLEGACY(colorString); return TValue.fromBoolean(color.isDark()); } catch (NoSuchColorException e) { - throw EaterException.located("No such color", location); + throw EaterExceptionLocated.located("No such color", location); } } } diff --git a/src/net/sourceforge/plantuml/tim/stdlib/IsLight.java b/src/net/sourceforge/plantuml/tim/stdlib/IsLight.java index 771425750..1528ea8fe 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/IsLight.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/IsLight.java @@ -42,7 +42,6 @@ import net.sourceforge.plantuml.klimt.color.HColor; import net.sourceforge.plantuml.klimt.color.HColorSet; import net.sourceforge.plantuml.klimt.color.NoSuchColorException; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; @@ -63,13 +62,13 @@ public class IsLight extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterException, EaterExceptionLocated { + Map named) throws EaterExceptionLocated { final String colorString = values.get(0).toString(); try { final HColor color = HColorSet.instance().getColorLEGACY(colorString); return TValue.fromBoolean(!color.isDark()); } catch (NoSuchColorException e) { - throw EaterException.located("No such color", location); + throw EaterExceptionLocated.located("No such color", location); } } } diff --git a/src/net/sourceforge/plantuml/tim/stdlib/JsonKeyExists.java b/src/net/sourceforge/plantuml/tim/stdlib/JsonKeyExists.java index 71d6eaed8..bc22ce9a7 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/JsonKeyExists.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/JsonKeyExists.java @@ -41,7 +41,6 @@ import java.util.Set; import net.sourceforge.plantuml.json.JsonObject; import net.sourceforge.plantuml.json.JsonValue; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; @@ -61,7 +60,7 @@ public class JsonKeyExists extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterException, EaterExceptionLocated { + Map named) throws EaterExceptionLocated { final TValue arg0 = values.get(0); if (arg0.isJson() == false) return TValue.fromBoolean(false); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Lighten.java b/src/net/sourceforge/plantuml/tim/stdlib/Lighten.java index 1ec5b593b..41d9a31d2 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Lighten.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/Lighten.java @@ -42,7 +42,6 @@ import net.sourceforge.plantuml.klimt.color.HColor; import net.sourceforge.plantuml.klimt.color.HColorSet; import net.sourceforge.plantuml.klimt.color.NoSuchColorException; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; @@ -63,7 +62,7 @@ public class Lighten extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterException, EaterExceptionLocated { + Map named) throws EaterExceptionLocated { final String colorString = values.get(0).toString(); final int ratio = values.get(1).toInt(); try { @@ -71,7 +70,7 @@ public class Lighten extends SimpleReturnFunction { color = color.lighten(ratio); return TValue.fromString(color.asString()); } catch (NoSuchColorException e) { - throw EaterException.located("No such color", location); + throw EaterExceptionLocated.located("No such color", location); } } } diff --git a/src/net/sourceforge/plantuml/tim/stdlib/LoadJson.java b/src/net/sourceforge/plantuml/tim/stdlib/LoadJson.java index a03972239..40e5746c6 100755 --- a/src/net/sourceforge/plantuml/tim/stdlib/LoadJson.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/LoadJson.java @@ -50,7 +50,6 @@ import net.sourceforge.plantuml.log.Logme; import net.sourceforge.plantuml.security.SFile; import net.sourceforge.plantuml.security.SURL; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; @@ -109,7 +108,7 @@ public class LoadJson extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterException, EaterExceptionLocated { + Map named) throws EaterExceptionLocated { final String path = values.get(0).toString(); try { String data = loadStringData(path, getCharset(values)); @@ -120,11 +119,12 @@ public class LoadJson extends SimpleReturnFunction { return TValue.fromJson(jsonValue); } catch (ParseException pe) { Logme.error(pe); - throw EaterException.unlocated("JSON parse issue in source " + path + " on location " + pe.getLocation(), - location); + throw EaterExceptionLocated + .unlocated("JSON parse issue in source " + path + " on location " + pe.getLocation(), location); } catch (UnsupportedEncodingException e) { Logme.error(e); - throw EaterException.unlocated("JSON encoding issue in source " + path + ": " + e.getMessage(), location); + throw EaterExceptionLocated.unlocated("JSON encoding issue in source " + path + ": " + e.getMessage(), + location); } } @@ -163,7 +163,8 @@ public class LoadJson extends SimpleReturnFunction { * @return the decoded String from the data source * @throws EaterException if something went wrong on reading data */ - private String loadStringData(String path, String charset) throws EaterException, UnsupportedEncodingException { + private String loadStringData(String path, String charset) + throws EaterExceptionLocated, UnsupportedEncodingException { byte[] byteData = null; if (path.startsWith("http://") || path.startsWith("https://")) { diff --git a/src/net/sourceforge/plantuml/tim/stdlib/LogicalAnd.java b/src/net/sourceforge/plantuml/tim/stdlib/LogicalAnd.java index 3770e1b05..1bea47ee2 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/LogicalAnd.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/LogicalAnd.java @@ -39,7 +39,6 @@ import java.util.Map; import java.util.Set; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; @@ -59,7 +58,7 @@ public class LogicalAnd extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterException, EaterExceptionLocated { + Map named) throws EaterExceptionLocated { for (TValue v : values) if (v.toBoolean() == false) return TValue.fromBoolean(false); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/LogicalNand.java b/src/net/sourceforge/plantuml/tim/stdlib/LogicalNand.java index 7d655c92f..52345b792 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/LogicalNand.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/LogicalNand.java @@ -39,7 +39,6 @@ import java.util.Map; import java.util.Set; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; @@ -59,7 +58,7 @@ public class LogicalNand extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterException, EaterExceptionLocated { + Map named) throws EaterExceptionLocated { for (TValue v : values) if (v.toBoolean() == false) return TValue.fromBoolean(!false); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/LogicalNor.java b/src/net/sourceforge/plantuml/tim/stdlib/LogicalNor.java index 12b003616..fe59542cf 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/LogicalNor.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/LogicalNor.java @@ -39,7 +39,6 @@ import java.util.Map; import java.util.Set; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; @@ -59,7 +58,7 @@ public class LogicalNor extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterException, EaterExceptionLocated { + Map named) throws EaterExceptionLocated { for (TValue v : values) if (v.toBoolean() == true) return TValue.fromBoolean(!true); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/LogicalNot.java b/src/net/sourceforge/plantuml/tim/stdlib/LogicalNot.java index 7ffb3689e..0dbd650f5 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/LogicalNot.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/LogicalNot.java @@ -39,7 +39,6 @@ import java.util.Map; import java.util.Set; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; @@ -59,7 +58,7 @@ public class LogicalNot extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterException, EaterExceptionLocated { + Map named) throws EaterExceptionLocated { final boolean arg = values.get(0).toBoolean(); return TValue.fromBoolean(!arg); } diff --git a/src/net/sourceforge/plantuml/tim/stdlib/LogicalNxor.java b/src/net/sourceforge/plantuml/tim/stdlib/LogicalNxor.java index a5ed319e3..3abd60263 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/LogicalNxor.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/LogicalNxor.java @@ -39,7 +39,6 @@ import java.util.Map; import java.util.Set; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; @@ -59,7 +58,7 @@ public class LogicalNxor extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterException, EaterExceptionLocated { + Map named) throws EaterExceptionLocated { int cpt = 0; for (TValue v : values) if (v.toBoolean() == true) diff --git a/src/net/sourceforge/plantuml/tim/stdlib/LogicalOr.java b/src/net/sourceforge/plantuml/tim/stdlib/LogicalOr.java index e78dcc546..0d2e5ded2 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/LogicalOr.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/LogicalOr.java @@ -39,7 +39,6 @@ import java.util.Map; import java.util.Set; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; @@ -59,7 +58,7 @@ public class LogicalOr extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterException, EaterExceptionLocated { + Map named) throws EaterExceptionLocated { for (TValue v : values) if (v.toBoolean() == true) return TValue.fromBoolean(true); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/LogicalXor.java b/src/net/sourceforge/plantuml/tim/stdlib/LogicalXor.java index da04addf5..9b9a66cbb 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/LogicalXor.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/LogicalXor.java @@ -39,7 +39,6 @@ import java.util.Map; import java.util.Set; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; @@ -59,7 +58,7 @@ public class LogicalXor extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterException, EaterExceptionLocated { + Map named) throws EaterExceptionLocated { int cpt = 0; for (TValue v : values) if (v.toBoolean() == true) diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Now.java b/src/net/sourceforge/plantuml/tim/stdlib/Now.java index f827d6e9f..f24f75093 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Now.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/Now.java @@ -39,7 +39,6 @@ import java.util.Map; import java.util.Set; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; @@ -59,7 +58,7 @@ public class Now extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterException, EaterExceptionLocated { + Map named) throws EaterExceptionLocated { final long now = System.currentTimeMillis() / 1000L; return TValue.fromInt((int) now); } diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Ord.java b/src/net/sourceforge/plantuml/tim/stdlib/Ord.java index 8ae31e5c4..1c509686a 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Ord.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/Ord.java @@ -39,7 +39,6 @@ import java.util.Map; import java.util.Set; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; @@ -59,7 +58,7 @@ public class Ord extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterException, EaterExceptionLocated { + Map named) throws EaterExceptionLocated { try { final int codePoint = values.get(0).toString().codePointAt(0); return TValue.fromInt(codePoint); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/RandomFunction.java b/src/net/sourceforge/plantuml/tim/stdlib/RandomFunction.java index d284045a6..f2c8c885f 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/RandomFunction.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/RandomFunction.java @@ -40,7 +40,6 @@ import java.util.Random; import java.util.Set; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; @@ -62,7 +61,7 @@ public class RandomFunction extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterException, EaterExceptionLocated { + Map named) throws EaterExceptionLocated { switch (values.size()) { case 0: return TValue.fromInt(random.nextInt(2)); @@ -78,7 +77,7 @@ public class RandomFunction extends SimpleReturnFunction { default: assert false; // Should not append because of canCover() - throw EaterException.located("Error on Random: Too many argument", location); + throw EaterExceptionLocated.located("Error on Random: Too many argument", location); } } } diff --git a/src/net/sourceforge/plantuml/tim/stdlib/RetrieveProcedure.java b/src/net/sourceforge/plantuml/tim/stdlib/RetrieveProcedure.java index 8c31c3520..5e5590ddf 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/RetrieveProcedure.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/RetrieveProcedure.java @@ -40,7 +40,6 @@ import java.util.Map; import java.util.Set; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunction; @@ -61,7 +60,7 @@ public class RetrieveProcedure extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterException, EaterExceptionLocated { + Map named) throws EaterExceptionLocated { final String fname = values.get(0).toString(); final List args = values.subList(1, values.size()); final TFunctionSignature signature = new TFunctionSignature(fname, args.size()); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/ReverseColor.java b/src/net/sourceforge/plantuml/tim/stdlib/ReverseColor.java index ef1d94ff3..e19fe4a30 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/ReverseColor.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/ReverseColor.java @@ -42,7 +42,6 @@ import net.sourceforge.plantuml.klimt.color.HColor; import net.sourceforge.plantuml.klimt.color.HColorSet; import net.sourceforge.plantuml.klimt.color.NoSuchColorException; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; @@ -62,14 +61,14 @@ public class ReverseColor extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterException, EaterExceptionLocated { + Map named) throws EaterExceptionLocated { final String colorString = values.get(0).toString(); try { HColor color = HColorSet.instance().getColorLEGACY(colorString); color = color.reverse(); return TValue.fromString(color.asString()); } catch (NoSuchColorException e) { - throw EaterException.located("No such color", location); + throw EaterExceptionLocated.located("No such color", location); } } } diff --git a/src/net/sourceforge/plantuml/tim/stdlib/ReverseHsluvColor.java b/src/net/sourceforge/plantuml/tim/stdlib/ReverseHsluvColor.java index 041fe5cab..75a60e8ac 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/ReverseHsluvColor.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/ReverseHsluvColor.java @@ -42,7 +42,6 @@ import net.sourceforge.plantuml.klimt.color.HColor; import net.sourceforge.plantuml.klimt.color.HColorSet; import net.sourceforge.plantuml.klimt.color.NoSuchColorException; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; @@ -62,14 +61,14 @@ public class ReverseHsluvColor extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterException, EaterExceptionLocated { + Map named) throws EaterExceptionLocated { final String colorString = values.get(0).toString(); try { HColor color = HColorSet.instance().getColorLEGACY(colorString); color = color.reverseHsluv(); return TValue.fromString(color.asString()); } catch (NoSuchColorException e) { - throw EaterException.located("No such color", location); + throw EaterExceptionLocated.located("No such color", location); } } } diff --git a/src/net/sourceforge/plantuml/tim/stdlib/SetVariableValue.java b/src/net/sourceforge/plantuml/tim/stdlib/SetVariableValue.java index 18123b644..fcc12260c 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/SetVariableValue.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/SetVariableValue.java @@ -39,7 +39,6 @@ import java.util.Map; import java.util.Set; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; @@ -60,7 +59,7 @@ public class SetVariableValue extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterException, EaterExceptionLocated { + Map named) throws EaterExceptionLocated { // if (memory instanceof TMemoryLocal) { // memory = ((TMemoryLocal) memory).getGlobalForInternalUseOnly(); // } diff --git a/src/net/sourceforge/plantuml/tim/stdlib/SimpleReturnFunction.java b/src/net/sourceforge/plantuml/tim/stdlib/SimpleReturnFunction.java index c649a86a4..5276d495e 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/SimpleReturnFunction.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/SimpleReturnFunction.java @@ -38,7 +38,7 @@ import java.util.List; import java.util.Map; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterException; +import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunction; import net.sourceforge.plantuml.tim.TFunctionType; @@ -53,7 +53,7 @@ public abstract class SimpleReturnFunction implements TFunction { @Override final public void executeProcedureInternal(TContext context, TMemory memory, StringLocated location, - List args, Map named) throws EaterException { + List args, Map named) throws EaterExceptionLocated { throw new UnsupportedOperationException(); } diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Size.java b/src/net/sourceforge/plantuml/tim/stdlib/Size.java index 0bf62d6d6..82a72c5ab 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Size.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/Size.java @@ -42,7 +42,6 @@ import net.sourceforge.plantuml.json.JsonArray; import net.sourceforge.plantuml.json.JsonObject; import net.sourceforge.plantuml.json.JsonValue; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; @@ -62,7 +61,7 @@ public class Size extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterException, EaterExceptionLocated { + Map named) throws EaterExceptionLocated { final TValue value = values.get(0); if (value.isNumber()) return TValue.fromInt(0); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/SplitStr.java b/src/net/sourceforge/plantuml/tim/stdlib/SplitStr.java index 5e181ffca..f3e17784a 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/SplitStr.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/SplitStr.java @@ -41,7 +41,6 @@ import java.util.StringTokenizer; import net.sourceforge.plantuml.json.JsonArray; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; @@ -61,7 +60,7 @@ public class SplitStr extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterException, EaterExceptionLocated { + Map named) throws EaterExceptionLocated { final JsonArray result = new JsonArray(); final String str = values.get(0).toString(); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Strlen.java b/src/net/sourceforge/plantuml/tim/stdlib/Strlen.java index 3aeb5b609..f97aad0de 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Strlen.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/Strlen.java @@ -39,7 +39,6 @@ import java.util.Map; import java.util.Set; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; @@ -59,7 +58,7 @@ public class Strlen extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterException, EaterExceptionLocated { + Map named) throws EaterExceptionLocated { return TValue.fromInt(values.get(0).toString().length()); } } diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Strpos.java b/src/net/sourceforge/plantuml/tim/stdlib/Strpos.java index 8db94424f..b27796e0e 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Strpos.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/Strpos.java @@ -39,7 +39,6 @@ import java.util.Map; import java.util.Set; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; @@ -59,7 +58,7 @@ public class Strpos extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterException, EaterExceptionLocated { + Map named) throws EaterExceptionLocated { final String full = values.get(0).toString(); final String searched = values.get(1).toString(); return TValue.fromInt(full.indexOf(searched)); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Substr.java b/src/net/sourceforge/plantuml/tim/stdlib/Substr.java index ec254565b..7f06da48f 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Substr.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/Substr.java @@ -39,7 +39,6 @@ import java.util.Map; import java.util.Set; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; @@ -59,7 +58,7 @@ public class Substr extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterException, EaterExceptionLocated { + Map named) throws EaterExceptionLocated { final String full = values.get(0).toString(); final int pos = values.get(1).toInt(); if (pos >= full.length()) diff --git a/src/net/sourceforge/plantuml/tim/stdlib/VariableExists.java b/src/net/sourceforge/plantuml/tim/stdlib/VariableExists.java index 3f06d5e62..2e024b025 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/VariableExists.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/VariableExists.java @@ -39,7 +39,6 @@ import java.util.Map; import java.util.Set; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; @@ -59,7 +58,7 @@ public class VariableExists extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterException, EaterExceptionLocated { + Map named) throws EaterExceptionLocated { final String name = values.get(0).toString(); return TValue.fromBoolean(memory.getVariable(name) != null); } diff --git a/src/net/sourceforge/plantuml/version/Version.java b/src/net/sourceforge/plantuml/version/Version.java index 80dec5df6..fd32fba24 100644 --- a/src/net/sourceforge/plantuml/version/Version.java +++ b/src/net/sourceforge/plantuml/version/Version.java @@ -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.2024.4beta3"; + private static final String version = "1.2024.4beta4"; public static String versionString() { return version; diff --git a/test/net/sourceforge/plantuml/tim/TimTestUtils.java b/test/net/sourceforge/plantuml/tim/TimTestUtils.java index 81993d3a2..724e227be 100644 --- a/test/net/sourceforge/plantuml/tim/TimTestUtils.java +++ b/test/net/sourceforge/plantuml/tim/TimTestUtils.java @@ -14,27 +14,27 @@ import net.sourceforge.plantuml.json.JsonValue; public class TimTestUtils { // Tfunc: () -> (String) - public static void assertTimExpectedOutput(TFunction func, String expected) throws EaterException, EaterExceptionLocated { + public static void assertTimExpectedOutput(TFunction func, String expected) throws EaterExceptionLocated { TValue tValue = func.executeReturnFunction(null, null, null, null, null); assertEquals(expected, tValue.toString()); } // Tfunc: (Integer) -> (String) - public static void assertTimExpectedOutputFromInput(TFunction func, Integer input, String expected) throws EaterException, EaterExceptionLocated { + public static void assertTimExpectedOutputFromInput(TFunction func, Integer input, String expected) throws EaterExceptionLocated { List values = Collections.singletonList(TValue.fromInt(input)); TValue tValue = func.executeReturnFunction(null, null, null, values, null); assertEquals(expected, tValue.toString()); } // Tfunc: (String) -> (String) - public static void assertTimExpectedOutputFromInput(TFunction func, String input, String expected) throws EaterException, EaterExceptionLocated { + public static void assertTimExpectedOutputFromInput(TFunction func, String input, String expected) throws EaterExceptionLocated { List values = Collections.singletonList(TValue.fromString(input)); TValue tValue = func.executeReturnFunction(null, null, null, values, null); assertEquals(expected, tValue.toString()); } // Tfunc: (JsonValue) -> (String) - public static void assertTimExpectedOutputFromInput(TFunction func, JsonValue input, String expected) throws EaterException, EaterExceptionLocated { + public static void assertTimExpectedOutputFromInput(TFunction func, JsonValue input, String expected) throws EaterExceptionLocated { List values = Collections.singletonList(TValue.fromJson(input)); TValue tValue = func.executeReturnFunction(null, null, null, values, null); assertEquals(expected, tValue.toString()); diff --git a/test/net/sourceforge/plantuml/tim/stdlib/AlwaysFalseTest.java b/test/net/sourceforge/plantuml/tim/stdlib/AlwaysFalseTest.java index addb2050c..595781c47 100644 --- a/test/net/sourceforge/plantuml/tim/stdlib/AlwaysFalseTest.java +++ b/test/net/sourceforge/plantuml/tim/stdlib/AlwaysFalseTest.java @@ -6,11 +6,9 @@ import static net.sourceforge.plantuml.tim.TimTestUtils.assertTimExpectedOutputF import org.junit.jupiter.api.DisplayNameGenerator.ReplaceUnderscores; import org.junit.jupiter.api.IndicativeSentencesGeneration; import org.junit.jupiter.api.Test; -import org.junit.jupiter.params.converter.ConvertWith; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.CsvSource; -import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TFunction; @@ -24,7 +22,7 @@ class AlwaysFalseTest { final String cutName = "AlwaysFalse"; @Test - void Test_without_Param() throws EaterException, EaterExceptionLocated { + void Test_without_Param() throws EaterExceptionLocated { assertTimExpectedOutput(cut, "0"); } @@ -34,7 +32,7 @@ class AlwaysFalseTest { " 1 , 0 ", " 'a' , 0 ", }) - void Test_with_String(String input, String expected) throws EaterException, EaterExceptionLocated { + void Test_with_String(String input, String expected) throws EaterExceptionLocated { assertTimExpectedOutputFromInput(cut, input, expected); } @@ -44,7 +42,7 @@ class AlwaysFalseTest { " 1 , 0 ", " 123 , 0 ", }) - void Test_with_Integer(Integer input, String expected) throws EaterException, EaterExceptionLocated { + void Test_with_Integer(Integer input, String expected) throws EaterExceptionLocated { assertTimExpectedOutputFromInput(cut, input, expected); } } diff --git a/test/net/sourceforge/plantuml/tim/stdlib/AlwaysTrueTest.java b/test/net/sourceforge/plantuml/tim/stdlib/AlwaysTrueTest.java index 439bde93d..cb9de4910 100644 --- a/test/net/sourceforge/plantuml/tim/stdlib/AlwaysTrueTest.java +++ b/test/net/sourceforge/plantuml/tim/stdlib/AlwaysTrueTest.java @@ -6,11 +6,9 @@ import static net.sourceforge.plantuml.tim.TimTestUtils.assertTimExpectedOutputF import org.junit.jupiter.api.DisplayNameGenerator.ReplaceUnderscores; import org.junit.jupiter.api.IndicativeSentencesGeneration; import org.junit.jupiter.api.Test; -import org.junit.jupiter.params.converter.ConvertWith; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.CsvSource; -import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TFunction; @@ -24,7 +22,7 @@ class AlwaysTrueTest { final String cutName = "AlwaysTrue"; @Test - void Test_without_Param() throws EaterException, EaterExceptionLocated { + void Test_without_Param() throws EaterExceptionLocated { assertTimExpectedOutput(cut, "1"); } @@ -34,7 +32,7 @@ class AlwaysTrueTest { " 1 , 1 ", " 'a' , 1 ", }) - void Test_with_String(String input, String expected) throws EaterException, EaterExceptionLocated { + void Test_with_String(String input, String expected) throws EaterExceptionLocated { assertTimExpectedOutputFromInput(cut, input, expected); } @@ -44,7 +42,7 @@ class AlwaysTrueTest { " 1 , 1 ", " 123 , 1 ", }) - void Test_with_Integer(Integer input, String expected) throws EaterException, EaterExceptionLocated { + void Test_with_Integer(Integer input, String expected) throws EaterExceptionLocated { assertTimExpectedOutputFromInput(cut, input, expected); } } diff --git a/test/net/sourceforge/plantuml/tim/stdlib/ChrTest.java b/test/net/sourceforge/plantuml/tim/stdlib/ChrTest.java index 6659ecd95..0294507fc 100644 --- a/test/net/sourceforge/plantuml/tim/stdlib/ChrTest.java +++ b/test/net/sourceforge/plantuml/tim/stdlib/ChrTest.java @@ -7,7 +7,6 @@ import org.junit.jupiter.api.IndicativeSentencesGeneration; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.CsvSource; -import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TFunction; @@ -38,7 +37,7 @@ class ChrTest { " 128512 , 😀 ", " 128512 , \uD83D\uDE00 ", }) - void Test_with_Integer(Integer input, String expected) throws EaterException, EaterExceptionLocated { + void Test_with_Integer(Integer input, String expected) throws EaterExceptionLocated { assertTimExpectedOutputFromInput(cut, input, expected); } } \ No newline at end of file diff --git a/test/net/sourceforge/plantuml/tim/stdlib/Dec2hexTest.java b/test/net/sourceforge/plantuml/tim/stdlib/Dec2hexTest.java index 1134c293d..1603adbe6 100644 --- a/test/net/sourceforge/plantuml/tim/stdlib/Dec2hexTest.java +++ b/test/net/sourceforge/plantuml/tim/stdlib/Dec2hexTest.java @@ -6,11 +6,9 @@ import static net.sourceforge.plantuml.tim.TimTestUtils.assertTimExpectedOutputF import org.junit.jupiter.api.DisplayNameGenerator.ReplaceUnderscores; import org.junit.jupiter.api.IndicativeSentencesGeneration; import org.junit.jupiter.api.Test; -import org.junit.jupiter.params.converter.ConvertWith; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.CsvSource; -import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TFunction; @@ -24,7 +22,7 @@ class Dec2hexTest { final String cutName = "Dec2hex"; @Test - void Test_without_Param() throws EaterException, EaterExceptionLocated { + void Test_without_Param() throws EaterExceptionLocated { assertTimExpectedOutput(cut, ""); } @@ -38,7 +36,7 @@ class Dec2hexTest { " 255 , 0 ", " 65535 , 0 ", }) - void Test_with_String(String input, String expected) throws EaterException, EaterExceptionLocated { + void Test_with_String(String input, String expected) throws EaterExceptionLocated { assertTimExpectedOutputFromInput(cut, input, expected); } @@ -52,7 +50,7 @@ class Dec2hexTest { " 255 , ff ", " 65535 , ffff ", }) - void Test_with_Integer(Integer input, String expected) throws EaterException, EaterExceptionLocated { + void Test_with_Integer(Integer input, String expected) throws EaterExceptionLocated { assertTimExpectedOutputFromInput(cut, input, expected); } } diff --git a/test/net/sourceforge/plantuml/tim/stdlib/FeatureTest.java b/test/net/sourceforge/plantuml/tim/stdlib/FeatureTest.java index 52507fb51..f8a8603aa 100644 --- a/test/net/sourceforge/plantuml/tim/stdlib/FeatureTest.java +++ b/test/net/sourceforge/plantuml/tim/stdlib/FeatureTest.java @@ -2,20 +2,19 @@ package net.sourceforge.plantuml.tim.stdlib; import static net.sourceforge.plantuml.tim.TimTestUtils.assertTimExpectedOutput; import static net.sourceforge.plantuml.tim.TimTestUtils.assertTimExpectedOutputFromInput; -import static test.utils.JunitUtils.StringJsonConverter; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.DisplayNameGenerator.ReplaceUnderscores; import org.junit.jupiter.api.IndicativeSentencesGeneration; import org.junit.jupiter.api.Test; -import org.junit.jupiter.params.converter.ConvertWith; import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.converter.ConvertWith; import org.junit.jupiter.params.provider.CsvSource; import net.sourceforge.plantuml.json.JsonValue; -import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TFunction; +import test.utils.JunitUtils.StringJsonConverter; /** * Tests the builtin function. @@ -28,7 +27,7 @@ class FeatureTest { @Disabled @Test - void Test_without_Param() throws EaterException, EaterExceptionLocated { + void Test_without_Param() throws EaterExceptionLocated { assertTimExpectedOutput(cut, "0"); } @@ -43,7 +42,7 @@ class FeatureTest { " abc , 0", }) - void Test_with_String(String input, String expected) throws EaterException, EaterExceptionLocated { + void Test_with_String(String input, String expected) throws EaterExceptionLocated { assertTimExpectedOutputFromInput(cut, input, expected); } @@ -52,7 +51,7 @@ class FeatureTest { " 0, 0", " 10, 0", }) - void Test_with_Integer(Integer input, String expected) throws EaterException, EaterExceptionLocated { + void Test_with_Integer(Integer input, String expected) throws EaterExceptionLocated { assertTimExpectedOutputFromInput(cut, input, expected); } @@ -62,7 +61,7 @@ class FeatureTest { " \"theme\", 1", " 0, 0", }) - void Test_with_Json(@ConvertWith(StringJsonConverter.class) JsonValue input, String expected) throws EaterException, EaterExceptionLocated { + void Test_with_Json(@ConvertWith(StringJsonConverter.class) JsonValue input, String expected) throws EaterExceptionLocated { assertTimExpectedOutputFromInput(cut, input, expected); } } diff --git a/test/net/sourceforge/plantuml/tim/stdlib/GetAllStdlibTest.java b/test/net/sourceforge/plantuml/tim/stdlib/GetAllStdlibTest.java index f274f52e7..16e3f8eed 100644 --- a/test/net/sourceforge/plantuml/tim/stdlib/GetAllStdlibTest.java +++ b/test/net/sourceforge/plantuml/tim/stdlib/GetAllStdlibTest.java @@ -2,14 +2,14 @@ package net.sourceforge.plantuml.tim.stdlib; import static org.assertj.core.api.Assertions.assertThat; +import java.util.ArrayList; import java.util.Arrays; -import java.util.Collections; +import java.util.List; import org.junit.jupiter.api.DisplayNameGenerator.ReplaceUnderscores; import org.junit.jupiter.api.IndicativeSentencesGeneration; import org.junit.jupiter.api.Test; -import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TFunction; import net.sourceforge.plantuml.tim.expression.TValue; @@ -24,13 +24,14 @@ class GetAllStdlibTest { final String cutName = "GetAllStdlib"; @Test - void Test_without_Param() throws EaterException, EaterExceptionLocated { - final TValue tValue = cut.executeReturnFunction(null, null, null, Collections.emptyList(), null); + void Test_without_Param() throws EaterExceptionLocated { + final List empty = new ArrayList<>(); + final TValue tValue = cut.executeReturnFunction(null, null, null, empty, null); assertThat(tValue.toString()).contains("archimate", "aws", "tupadr3"); } @Test - void Test_with_one_argument() throws EaterException, EaterExceptionLocated { + void Test_with_one_argument() throws EaterExceptionLocated { final TValue tValue = cut.executeReturnFunction(null, null, null, Arrays.asList(TValue.fromInt(0)), null); assertThat(tValue.toString()).contains("archimate", "https://github.com/plantuml-stdlib/Archimate-PlantUML"); } diff --git a/test/net/sourceforge/plantuml/tim/stdlib/GetAllThemeTest.java b/test/net/sourceforge/plantuml/tim/stdlib/GetAllThemeTest.java index c17bc33d2..9201c2d99 100644 --- a/test/net/sourceforge/plantuml/tim/stdlib/GetAllThemeTest.java +++ b/test/net/sourceforge/plantuml/tim/stdlib/GetAllThemeTest.java @@ -2,13 +2,13 @@ package net.sourceforge.plantuml.tim.stdlib; import static org.assertj.core.api.Assertions.assertThat; -import java.util.Collections; +import java.util.ArrayList; +import java.util.List; import org.junit.jupiter.api.DisplayNameGenerator.ReplaceUnderscores; import org.junit.jupiter.api.IndicativeSentencesGeneration; import org.junit.jupiter.api.Test; -import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TFunction; import net.sourceforge.plantuml.tim.expression.TValue; @@ -23,8 +23,9 @@ class GetAllThemeTest { final String cutName = "GetAllTheme"; @Test - void Test_without_Param() throws EaterException, EaterExceptionLocated { - final TValue tValue = cut.executeReturnFunction(null, null, null, Collections.emptyList(), null); + void Test_without_Param() throws EaterExceptionLocated { + final List empty = new ArrayList<>(); + final TValue tValue = cut.executeReturnFunction(null, null, null, empty, null); assertThat(tValue.toString()).contains("_none_", "amiga", "vibrant"); } } diff --git a/test/net/sourceforge/plantuml/tim/stdlib/GetJsonKeyTest.java b/test/net/sourceforge/plantuml/tim/stdlib/GetJsonKeyTest.java index 80635e456..2f19ed62e 100644 --- a/test/net/sourceforge/plantuml/tim/stdlib/GetJsonKeyTest.java +++ b/test/net/sourceforge/plantuml/tim/stdlib/GetJsonKeyTest.java @@ -2,20 +2,19 @@ package net.sourceforge.plantuml.tim.stdlib; import static net.sourceforge.plantuml.tim.TimTestUtils.assertTimExpectedOutput; import static net.sourceforge.plantuml.tim.TimTestUtils.assertTimExpectedOutputFromInput; -import static test.utils.JunitUtils.StringJsonConverter; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.DisplayNameGenerator.ReplaceUnderscores; import org.junit.jupiter.api.IndicativeSentencesGeneration; import org.junit.jupiter.api.Test; -import org.junit.jupiter.params.converter.ConvertWith; import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.converter.ConvertWith; import org.junit.jupiter.params.provider.CsvSource; import net.sourceforge.plantuml.json.JsonValue; -import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TFunction; +import test.utils.JunitUtils.StringJsonConverter; /** * Tests the builtin function. @@ -28,7 +27,7 @@ class GetJsonKeyTest { @Disabled @Test - void Test_without_Param() throws EaterException, EaterExceptionLocated { + void Test_without_Param() throws EaterExceptionLocated { assertTimExpectedOutput(cut, "0"); } @@ -39,7 +38,7 @@ class GetJsonKeyTest { " a, Not JSON data", " -1, Not JSON data", }) - void Test_with_String(String input, String expected) throws EaterException, EaterExceptionLocated { + void Test_with_String(String input, String expected) throws EaterExceptionLocated { assertTimExpectedOutputFromInput(cut, input, expected); } @@ -49,7 +48,7 @@ class GetJsonKeyTest { " 0, Not JSON data", " -1, Not JSON data", }) - void Test_with_Integer(Integer input, String expected) throws EaterException, EaterExceptionLocated { + void Test_with_Integer(Integer input, String expected) throws EaterExceptionLocated { assertTimExpectedOutputFromInput(cut, input, expected); } @@ -67,7 +66,7 @@ class GetJsonKeyTest { // - https://json-schema.org/understanding-json-schema/reference/array.html " '[3, \"different\", { \"types\" : \"of values\" }]', [\"types\"]", }) - void Test_with_Json(@ConvertWith(StringJsonConverter.class) JsonValue input, String expected) throws EaterException, EaterExceptionLocated { + void Test_with_Json(@ConvertWith(StringJsonConverter.class) JsonValue input, String expected) throws EaterExceptionLocated { assertTimExpectedOutputFromInput(cut, input, expected); } } diff --git a/test/net/sourceforge/plantuml/tim/stdlib/GetJsonTypeTest.java b/test/net/sourceforge/plantuml/tim/stdlib/GetJsonTypeTest.java index 0fe35543c..80f5b90eb 100644 --- a/test/net/sourceforge/plantuml/tim/stdlib/GetJsonTypeTest.java +++ b/test/net/sourceforge/plantuml/tim/stdlib/GetJsonTypeTest.java @@ -2,20 +2,19 @@ package net.sourceforge.plantuml.tim.stdlib; import static net.sourceforge.plantuml.tim.TimTestUtils.assertTimExpectedOutput; import static net.sourceforge.plantuml.tim.TimTestUtils.assertTimExpectedOutputFromInput; -import static test.utils.JunitUtils.StringJsonConverter; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.DisplayNameGenerator.ReplaceUnderscores; import org.junit.jupiter.api.IndicativeSentencesGeneration; import org.junit.jupiter.api.Test; -import org.junit.jupiter.params.converter.ConvertWith; import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.converter.ConvertWith; import org.junit.jupiter.params.provider.CsvSource; import net.sourceforge.plantuml.json.JsonValue; -import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TFunction; +import test.utils.JunitUtils.StringJsonConverter; /** * Tests the builtin function. @@ -28,7 +27,7 @@ class GetJsonTypeTest { @Disabled @Test - void Test_without_Param() throws EaterException, EaterExceptionLocated { + void Test_without_Param() throws EaterExceptionLocated { assertTimExpectedOutput(cut, "0"); } @@ -38,7 +37,7 @@ class GetJsonTypeTest { " a, string", " -1, string", }) - void Test_with_String(String input, String expected) throws EaterException, EaterExceptionLocated { + void Test_with_String(String input, String expected) throws EaterExceptionLocated { assertTimExpectedOutputFromInput(cut, input, expected); } @@ -47,7 +46,7 @@ class GetJsonTypeTest { " 0, number", " -1, number", }) - void Test_with_Integer(Integer input, String expected) throws EaterException, EaterExceptionLocated { + void Test_with_Integer(Integer input, String expected) throws EaterExceptionLocated { assertTimExpectedOutputFromInput(cut, input, expected); } @@ -67,7 +66,7 @@ class GetJsonTypeTest { " null , json ", " '{\"a\":[1, 2], \"b\":\"abc\", \"b\":true}' , object", }) - void Test_with_Json(@ConvertWith(StringJsonConverter.class) JsonValue input, String expected) throws EaterException, EaterExceptionLocated { + void Test_with_Json(@ConvertWith(StringJsonConverter.class) JsonValue input, String expected) throws EaterExceptionLocated { assertTimExpectedOutputFromInput(cut, input, expected); } } diff --git a/test/net/sourceforge/plantuml/tim/stdlib/GetenvTest.java b/test/net/sourceforge/plantuml/tim/stdlib/GetenvTest.java index aea38a745..4bbfc443c 100644 --- a/test/net/sourceforge/plantuml/tim/stdlib/GetenvTest.java +++ b/test/net/sourceforge/plantuml/tim/stdlib/GetenvTest.java @@ -8,7 +8,6 @@ import java.util.List; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; -import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.expression.TValue; @@ -29,7 +28,7 @@ class GetenvTest { "plantuml.SECURITY.blabla", "plantuml.security.credentials.path", }) - void executeReturnFunctionSecurityTest(String name) throws EaterException, EaterExceptionLocated { + void executeReturnFunctionSecurityTest(String name) throws EaterExceptionLocated { System.setProperty("plantuml.security.blabla", "example"); Getenv cut = new Getenv(); @@ -49,7 +48,7 @@ class GetenvTest { "path.separator", "line.separator", }) - void executeReturnFunctionTest(String name) throws EaterException, EaterExceptionLocated { + void executeReturnFunctionTest(String name) throws EaterExceptionLocated { Getenv cut = new Getenv(); List values = Collections.singletonList(TValue.fromString(name)); diff --git a/test/net/sourceforge/plantuml/tim/stdlib/Hex2decTest.java b/test/net/sourceforge/plantuml/tim/stdlib/Hex2decTest.java index 329347b79..e11e52469 100644 --- a/test/net/sourceforge/plantuml/tim/stdlib/Hex2decTest.java +++ b/test/net/sourceforge/plantuml/tim/stdlib/Hex2decTest.java @@ -6,11 +6,9 @@ import static net.sourceforge.plantuml.tim.TimTestUtils.assertTimExpectedOutputF import org.junit.jupiter.api.DisplayNameGenerator.ReplaceUnderscores; import org.junit.jupiter.api.IndicativeSentencesGeneration; import org.junit.jupiter.api.Test; -import org.junit.jupiter.params.converter.ConvertWith; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.CsvSource; -import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TFunction; @@ -24,7 +22,7 @@ class Hex2decTest { final String cutName = "Hex2dec"; @Test - void Test_without_Param() throws EaterException, EaterExceptionLocated { + void Test_without_Param() throws EaterExceptionLocated { assertTimExpectedOutput(cut, "0"); } @@ -44,7 +42,7 @@ class Hex2decTest { " -1 , -1 ", " -a , -10 ", }) - void Test_with_String(String input, String expected) throws EaterException, EaterExceptionLocated { + void Test_with_String(String input, String expected) throws EaterExceptionLocated { assertTimExpectedOutputFromInput(cut, input, expected); } @@ -55,7 +53,7 @@ class Hex2decTest { " 10 , 16 ", " -1 , -1 ", }) - void Test_with_Integer(Integer input, String expected) throws EaterException, EaterExceptionLocated { + void Test_with_Integer(Integer input, String expected) throws EaterExceptionLocated { assertTimExpectedOutputFromInput(cut, input, expected); } } diff --git a/test/net/sourceforge/plantuml/tim/stdlib/LowerTest.java b/test/net/sourceforge/plantuml/tim/stdlib/LowerTest.java index 3b50a2d30..57910d42f 100644 --- a/test/net/sourceforge/plantuml/tim/stdlib/LowerTest.java +++ b/test/net/sourceforge/plantuml/tim/stdlib/LowerTest.java @@ -2,20 +2,19 @@ package net.sourceforge.plantuml.tim.stdlib; import static net.sourceforge.plantuml.tim.TimTestUtils.assertTimExpectedOutput; import static net.sourceforge.plantuml.tim.TimTestUtils.assertTimExpectedOutputFromInput; -import static test.utils.JunitUtils.StringJsonConverter; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.DisplayNameGenerator.ReplaceUnderscores; import org.junit.jupiter.api.IndicativeSentencesGeneration; import org.junit.jupiter.api.Test; -import org.junit.jupiter.params.converter.ConvertWith; import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.converter.ConvertWith; import org.junit.jupiter.params.provider.CsvSource; import net.sourceforge.plantuml.json.JsonValue; -import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TFunction; +import test.utils.JunitUtils.StringJsonConverter; /** * Tests the builtin function. @@ -29,7 +28,7 @@ class LowerTest { // TODO: Manage Lower function without param. (today: we observe `Function not found %lower`) @Disabled @Test - void Test_without_Param() throws EaterException, EaterExceptionLocated { + void Test_without_Param() throws EaterExceptionLocated { assertTimExpectedOutput(cut, ""); } @@ -44,7 +43,7 @@ class LowerTest { " É , é ", " 😀 , 😀 ", }) - void Test_with_String(String input, String expected) throws EaterException, EaterExceptionLocated { + void Test_with_String(String input, String expected) throws EaterExceptionLocated { assertTimExpectedOutputFromInput(cut, input, expected); } @@ -55,7 +54,7 @@ class LowerTest { " 10 , 10 ", " -1 , -1 ", }) - void Test_with_Integer(Integer input, String expected) throws EaterException, EaterExceptionLocated { + void Test_with_Integer(Integer input, String expected) throws EaterExceptionLocated { assertTimExpectedOutputFromInput(cut, input, expected); } @@ -70,7 +69,7 @@ class LowerTest { // TODO: See JSON management of TRUE/FALSE //" TRUE , true ", }) - void Test_with_Json(@ConvertWith(StringJsonConverter.class) JsonValue input, String expected) throws EaterException, EaterExceptionLocated { + void Test_with_Json(@ConvertWith(StringJsonConverter.class) JsonValue input, String expected) throws EaterExceptionLocated { assertTimExpectedOutputFromInput(cut, input, expected); } } diff --git a/test/net/sourceforge/plantuml/tim/stdlib/OrdTest.java b/test/net/sourceforge/plantuml/tim/stdlib/OrdTest.java index 4fd0411ab..9ae869b52 100644 --- a/test/net/sourceforge/plantuml/tim/stdlib/OrdTest.java +++ b/test/net/sourceforge/plantuml/tim/stdlib/OrdTest.java @@ -7,7 +7,6 @@ import org.junit.jupiter.api.IndicativeSentencesGeneration; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.CsvSource; -import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TFunction; @@ -41,7 +40,7 @@ class OrdTest { " 😀 , 128512 ", " \uD83D\uDE00 , 128512 ", }) - void Test_with_String(String input, String expected) throws EaterException, EaterExceptionLocated { + void Test_with_String(String input, String expected) throws EaterExceptionLocated { assertTimExpectedOutputFromInput(cut, input, expected); } } \ No newline at end of file diff --git a/test/net/sourceforge/plantuml/tim/stdlib/RandomFuntionTest.java b/test/net/sourceforge/plantuml/tim/stdlib/RandomFuntionTest.java index c8505449e..226ddde52 100644 --- a/test/net/sourceforge/plantuml/tim/stdlib/RandomFuntionTest.java +++ b/test/net/sourceforge/plantuml/tim/stdlib/RandomFuntionTest.java @@ -2,14 +2,14 @@ package net.sourceforge.plantuml.tim.stdlib; import static org.assertj.core.api.Assertions.assertThat; +import java.util.ArrayList; import java.util.Arrays; -import java.util.Collections; +import java.util.List; import org.junit.jupiter.api.DisplayNameGenerator.ReplaceUnderscores; import org.junit.jupiter.api.IndicativeSentencesGeneration; import org.junit.jupiter.api.RepeatedTest; -import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TFunction; import net.sourceforge.plantuml.tim.expression.TValue; @@ -25,26 +25,29 @@ class RandomFunctionTest { final String repetitionLabel = "[{currentRepetition}/{totalRepetitions}] "; @RepeatedTest(value = 10, name = repetitionLabel + cutName + "()") - void test_with_no_argument() throws EaterException, EaterExceptionLocated { - final TValue tValue = cut.executeReturnFunction(null, null, null, Collections.emptyList(), null); + void test_with_no_argument() throws EaterExceptionLocated { + final List empty = new ArrayList<>(); + final TValue tValue = cut.executeReturnFunction(null, null, null, empty, null); assertThat(tValue.toInt()).isIn(0, 1); } @RepeatedTest(value = 10, name = repetitionLabel + cutName + "(7)") - void test_with_one_argument() throws EaterException, EaterExceptionLocated { + void test_with_one_argument() throws EaterExceptionLocated { final TValue tValue = cut.executeReturnFunction(null, null, null, Arrays.asList(TValue.fromInt(7)), null); - assertThat(tValue.toInt()).isBetween(0, 7-1); + assertThat(tValue.toInt()).isBetween(0, 7 - 1); } @RepeatedTest(value = 10, name = repetitionLabel + cutName + "(0, 7)") - void test_with_two_argument_first_zero() throws EaterException, EaterExceptionLocated { - final TValue tValue = cut.executeReturnFunction(null, null, null, Arrays.asList(TValue.fromInt(0), TValue.fromInt(7)), null); - assertThat(tValue.toInt()).isBetween(0, 7-1); + void test_with_two_argument_first_zero() throws EaterExceptionLocated { + final TValue tValue = cut.executeReturnFunction(null, null, null, + Arrays.asList(TValue.fromInt(0), TValue.fromInt(7)), null); + assertThat(tValue.toInt()).isBetween(0, 7 - 1); } @RepeatedTest(value = 10, name = repetitionLabel + cutName + "(3, 7)") - void test_with_two_argument() throws EaterException, EaterExceptionLocated { - final TValue tValue = cut.executeReturnFunction(null, null, null, Arrays.asList(TValue.fromInt(3), TValue.fromInt(7)), null); - assertThat(tValue.toInt()).isBetween(3, 7-1); + void test_with_two_argument() throws EaterExceptionLocated { + final TValue tValue = cut.executeReturnFunction(null, null, null, + Arrays.asList(TValue.fromInt(3), TValue.fromInt(7)), null); + assertThat(tValue.toInt()).isBetween(3, 7 - 1); } } \ No newline at end of file diff --git a/test/net/sourceforge/plantuml/tim/stdlib/SizeTest.java b/test/net/sourceforge/plantuml/tim/stdlib/SizeTest.java index 6bcfd105e..a8c3c5218 100644 --- a/test/net/sourceforge/plantuml/tim/stdlib/SizeTest.java +++ b/test/net/sourceforge/plantuml/tim/stdlib/SizeTest.java @@ -2,20 +2,19 @@ package net.sourceforge.plantuml.tim.stdlib; import static net.sourceforge.plantuml.tim.TimTestUtils.assertTimExpectedOutput; import static net.sourceforge.plantuml.tim.TimTestUtils.assertTimExpectedOutputFromInput; -import static test.utils.JunitUtils.StringJsonConverter; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.DisplayNameGenerator.ReplaceUnderscores; import org.junit.jupiter.api.IndicativeSentencesGeneration; import org.junit.jupiter.api.Test; -import org.junit.jupiter.params.converter.ConvertWith; import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.converter.ConvertWith; import org.junit.jupiter.params.provider.CsvSource; import net.sourceforge.plantuml.json.JsonValue; -import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TFunction; +import test.utils.JunitUtils.StringJsonConverter; /** * Tests the builtin function. @@ -29,7 +28,7 @@ class SizeTest { // TODO: Manage `Size` function without param. (today: we observe `Function not found`) @Disabled @Test - void Test_without_Param() throws EaterException, EaterExceptionLocated { + void Test_without_Param() throws EaterExceptionLocated { assertTimExpectedOutput(cut, "0"); } @@ -48,7 +47,7 @@ class SizeTest { // " 😀 , 1 ", // " \uD83D\uDE00 , 1", }) - void Test_with_String(String input, String expected) throws EaterException, EaterExceptionLocated { + void Test_with_String(String input, String expected) throws EaterExceptionLocated { assertTimExpectedOutputFromInput(cut, input, expected); } @@ -58,7 +57,7 @@ class SizeTest { " 1 , 0 ", " 10 , 0 ", }) - void Test_with_Integer(Integer input, String expected) throws EaterException, EaterExceptionLocated { + void Test_with_Integer(Integer input, String expected) throws EaterExceptionLocated { assertTimExpectedOutputFromInput(cut, input, expected); } @@ -75,7 +74,7 @@ class SizeTest { " 1, 0 ", " null, 0 ", }) - void Test_with_Json(@ConvertWith(StringJsonConverter.class) JsonValue input, String expected) throws EaterException, EaterExceptionLocated { + void Test_with_Json(@ConvertWith(StringJsonConverter.class) JsonValue input, String expected) throws EaterExceptionLocated { assertTimExpectedOutputFromInput(cut, input, expected); } } diff --git a/test/net/sourceforge/plantuml/tim/stdlib/UpperTest.java b/test/net/sourceforge/plantuml/tim/stdlib/UpperTest.java index 35c1e2e87..8a78cbb96 100644 --- a/test/net/sourceforge/plantuml/tim/stdlib/UpperTest.java +++ b/test/net/sourceforge/plantuml/tim/stdlib/UpperTest.java @@ -2,20 +2,19 @@ package net.sourceforge.plantuml.tim.stdlib; import static net.sourceforge.plantuml.tim.TimTestUtils.assertTimExpectedOutput; import static net.sourceforge.plantuml.tim.TimTestUtils.assertTimExpectedOutputFromInput; -import static test.utils.JunitUtils.StringJsonConverter; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.DisplayNameGenerator.ReplaceUnderscores; import org.junit.jupiter.api.IndicativeSentencesGeneration; import org.junit.jupiter.api.Test; -import org.junit.jupiter.params.converter.ConvertWith; import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.converter.ConvertWith; import org.junit.jupiter.params.provider.CsvSource; import net.sourceforge.plantuml.json.JsonValue; -import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterExceptionLocated; import net.sourceforge.plantuml.tim.TFunction; +import test.utils.JunitUtils.StringJsonConverter; /** * Tests the builtin function. @@ -29,7 +28,7 @@ class UpperTest { // TODO: Manage Upper function without param. (today: we observe `Function not found %upper`) @Disabled @Test - void Test_without_Param() throws EaterException, EaterExceptionLocated { + void Test_without_Param() throws EaterExceptionLocated { assertTimExpectedOutput(cut, ""); } @@ -44,7 +43,7 @@ class UpperTest { " é , É ", " 😀 , 😀 ", }) - void Test_with_String(String input, String expected) throws EaterException, EaterExceptionLocated { + void Test_with_String(String input, String expected) throws EaterExceptionLocated { assertTimExpectedOutputFromInput(cut, input, expected); } @@ -55,7 +54,7 @@ class UpperTest { " 10 , 10 ", " -1 , -1 ", }) - void Test_with_Integer(Integer input, String expected) throws EaterException, EaterExceptionLocated { + void Test_with_Integer(Integer input, String expected) throws EaterExceptionLocated { assertTimExpectedOutputFromInput(cut, input, expected); } @@ -66,7 +65,7 @@ class UpperTest { " '{\"a\":[1, 2], \"b\":\"abc\", \"b\":true}' , '{\"A\":[1,2],\"B\":\"ABC\",\"B\":TRUE}'", " true , TRUE ", }) - void Test_with_Json(@ConvertWith(StringJsonConverter.class) JsonValue input, String expected) throws EaterException, EaterExceptionLocated { + void Test_with_Json(@ConvertWith(StringJsonConverter.class) JsonValue input, String expected) throws EaterExceptionLocated { assertTimExpectedOutputFromInput(cut, input, expected); } } From 3cc68235ddf4dd0f9491bc4a3e649b3da14425e8 Mon Sep 17 00:00:00 2001 From: Arnaud Roques Date: Thu, 22 Feb 2024 20:28:03 +0100 Subject: [PATCH 89/95] refactor: prepare preprocessor error improvement --- gradle.properties | 2 +- .../sourceforge/plantuml/preproc/Defines.java | 4 +- src/net/sourceforge/plantuml/preproc/Sub.java | 4 +- .../plantuml/preproc2/PreprocessorUtils.java | 10 +-- src/net/sourceforge/plantuml/tim/Eater.java | 54 ++++++------- .../plantuml/tim/EaterAffectation.java | 2 +- .../plantuml/tim/EaterAffectationDefine.java | 2 +- .../sourceforge/plantuml/tim/EaterAssert.java | 6 +- .../plantuml/tim/EaterDeclareProcedure.java | 2 +- .../tim/EaterDeclareReturnFunction.java | 2 +- .../plantuml/tim/EaterDumpMemory.java | 2 +- .../sourceforge/plantuml/tim/EaterElseIf.java | 2 +- ...eptionLocated.java => EaterException.java} | 16 +--- .../plantuml/tim/EaterForeach.java | 2 +- .../plantuml/tim/EaterFunctionCall.java | 9 +-- src/net/sourceforge/plantuml/tim/EaterIf.java | 2 +- .../sourceforge/plantuml/tim/EaterIfdef.java | 2 +- .../sourceforge/plantuml/tim/EaterIfndef.java | 2 +- .../sourceforge/plantuml/tim/EaterImport.java | 2 +- .../plantuml/tim/EaterInclude.java | 2 +- .../plantuml/tim/EaterIncludeDef.java | 2 +- .../plantuml/tim/EaterIncludesub.java | 2 +- .../plantuml/tim/EaterLegacyDefine.java | 2 +- .../plantuml/tim/EaterLegacyDefineLong.java | 2 +- .../sourceforge/plantuml/tim/EaterLog.java | 2 +- .../sourceforge/plantuml/tim/EaterReturn.java | 2 +- .../plantuml/tim/EaterStartsub.java | 4 +- .../sourceforge/plantuml/tim/EaterTheme.java | 16 ++-- .../sourceforge/plantuml/tim/EaterUndef.java | 2 +- .../sourceforge/plantuml/tim/EaterWhile.java | 2 +- .../plantuml/tim/ExecutionContextWhile.java | 2 +- .../plantuml/tim/ExecutionContexts.java | 2 +- .../plantuml/tim/FunctionsSet.java | 20 ++--- .../sourceforge/plantuml/tim/StringEater.java | 2 +- .../sourceforge/plantuml/tim/TContext.java | 78 +++++++++---------- .../sourceforge/plantuml/tim/TFunction.java | 4 +- .../plantuml/tim/TFunctionImpl.java | 16 ++-- src/net/sourceforge/plantuml/tim/TMemory.java | 4 +- .../plantuml/tim/TMemoryGlobal.java | 4 +- .../plantuml/tim/TMemoryLocal.java | 2 +- .../sourceforge/plantuml/tim/TimLoader.java | 4 +- .../plantuml/tim/VariableManager.java | 8 +- .../plantuml/tim/expression/Knowledge.java | 4 +- .../expression/ReversePolishInterpretor.java | 17 ++-- .../plantuml/tim/expression/ShuntingYard.java | 6 +- .../plantuml/tim/expression/TokenStack.java | 20 ++--- .../plantuml/tim/expression/TokenType.java | 6 +- .../tim/iterator/AbstractCodeIterator.java | 6 +- .../plantuml/tim/iterator/CodeIterator.java | 8 +- .../tim/iterator/CodeIteratorAffectation.java | 10 +-- .../tim/iterator/CodeIteratorForeach.java | 10 +-- .../plantuml/tim/iterator/CodeIteratorIf.java | 22 +++--- .../tim/iterator/CodeIteratorImpl.java | 6 +- .../iterator/CodeIteratorInnerComment.java | 4 +- .../iterator/CodeIteratorLegacyDefine.java | 4 +- .../tim/iterator/CodeIteratorLongComment.java | 4 +- .../tim/iterator/CodeIteratorProcedure.java | 4 +- .../iterator/CodeIteratorReturnFunction.java | 8 +- .../iterator/CodeIteratorShortComment.java | 4 +- .../tim/iterator/CodeIteratorSub.java | 8 +- .../tim/iterator/CodeIteratorWhile.java | 8 +- .../plantuml/tim/stdlib/AlwaysFalse.java | 4 +- .../plantuml/tim/stdlib/AlwaysTrue.java | 4 +- .../plantuml/tim/stdlib/CallUserFunction.java | 6 +- .../sourceforge/plantuml/tim/stdlib/Chr.java | 4 +- .../plantuml/tim/stdlib/Darken.java | 6 +- .../plantuml/tim/stdlib/DateFunction.java | 6 +- .../plantuml/tim/stdlib/Dec2hex.java | 4 +- .../plantuml/tim/stdlib/Dirpath.java | 4 +- .../sourceforge/plantuml/tim/stdlib/Eval.java | 4 +- .../plantuml/tim/stdlib/Feature.java | 4 +- .../plantuml/tim/stdlib/FileExists.java | 4 +- .../plantuml/tim/stdlib/Filename.java | 4 +- .../plantuml/tim/stdlib/FunctionExists.java | 4 +- .../plantuml/tim/stdlib/GetAllStdlib.java | 6 +- .../plantuml/tim/stdlib/GetAllTheme.java | 4 +- .../plantuml/tim/stdlib/GetJsonKey.java | 8 +- .../plantuml/tim/stdlib/GetJsonType.java | 4 +- .../plantuml/tim/stdlib/GetVariableValue.java | 4 +- .../plantuml/tim/stdlib/GetVersion.java | 4 +- .../plantuml/tim/stdlib/Getenv.java | 4 +- .../plantuml/tim/stdlib/Hex2dec.java | 4 +- .../plantuml/tim/stdlib/HslColor.java | 4 +- .../plantuml/tim/stdlib/IntVal.java | 4 +- .../plantuml/tim/stdlib/InvokeProcedure.java | 6 +- .../plantuml/tim/stdlib/IsDark.java | 6 +- .../plantuml/tim/stdlib/IsLight.java | 6 +- .../plantuml/tim/stdlib/JsonKeyExists.java | 4 +- .../plantuml/tim/stdlib/Lighten.java | 6 +- .../plantuml/tim/stdlib/LoadJson.java | 12 ++- .../plantuml/tim/stdlib/LogicalAnd.java | 4 +- .../plantuml/tim/stdlib/LogicalNand.java | 4 +- .../plantuml/tim/stdlib/LogicalNor.java | 4 +- .../plantuml/tim/stdlib/LogicalNot.java | 4 +- .../plantuml/tim/stdlib/LogicalNxor.java | 4 +- .../plantuml/tim/stdlib/LogicalOr.java | 4 +- .../plantuml/tim/stdlib/LogicalXor.java | 4 +- .../sourceforge/plantuml/tim/stdlib/Now.java | 4 +- .../sourceforge/plantuml/tim/stdlib/Ord.java | 4 +- .../plantuml/tim/stdlib/RandomFunction.java | 6 +- .../tim/stdlib/RetrieveProcedure.java | 4 +- .../plantuml/tim/stdlib/ReverseColor.java | 6 +- .../tim/stdlib/ReverseHsluvColor.java | 6 +- .../plantuml/tim/stdlib/SetVariableValue.java | 4 +- .../tim/stdlib/SimpleReturnFunction.java | 4 +- .../sourceforge/plantuml/tim/stdlib/Size.java | 4 +- .../plantuml/tim/stdlib/SplitStr.java | 4 +- .../plantuml/tim/stdlib/Strlen.java | 4 +- .../plantuml/tim/stdlib/Strpos.java | 4 +- .../plantuml/tim/stdlib/Substr.java | 4 +- .../plantuml/tim/stdlib/VariableExists.java | 4 +- .../sourceforge/plantuml/version/Version.java | 2 +- .../plantuml/tim/TimTestUtils.java | 8 +- .../plantuml/tim/stdlib/AlwaysFalseTest.java | 8 +- .../plantuml/tim/stdlib/AlwaysTrueTest.java | 8 +- .../plantuml/tim/stdlib/ChrTest.java | 5 +- .../plantuml/tim/stdlib/Dec2hexTest.java | 8 +- .../plantuml/tim/stdlib/FeatureTest.java | 10 +-- .../plantuml/tim/stdlib/GetAllStdlibTest.java | 6 +- .../plantuml/tim/stdlib/GetAllThemeTest.java | 4 +- .../plantuml/tim/stdlib/GetJsonKeyTest.java | 10 +-- .../plantuml/tim/stdlib/GetJsonTypeTest.java | 10 +-- .../plantuml/tim/stdlib/GetenvTest.java | 8 +- .../plantuml/tim/stdlib/Hex2decTest.java | 8 +- .../plantuml/tim/stdlib/LowerTest.java | 10 +-- .../plantuml/tim/stdlib/OrdTest.java | 5 +- .../tim/stdlib/RandomFuntionTest.java | 10 +-- .../plantuml/tim/stdlib/SizeTest.java | 10 +-- .../plantuml/tim/stdlib/UpperTest.java | 10 +-- 129 files changed, 412 insertions(+), 432 deletions(-) rename src/net/sourceforge/plantuml/tim/{EaterExceptionLocated.java => EaterException.java} (75%) diff --git a/gradle.properties b/gradle.properties index 159ed6443..ddbe9ba1d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -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.2024.4beta4 +version = 1.2024.4beta5 org.gradle.workers.max = 3 \ No newline at end of file diff --git a/src/net/sourceforge/plantuml/preproc/Defines.java b/src/net/sourceforge/plantuml/preproc/Defines.java index eb2a1550f..14ec49a0e 100644 --- a/src/net/sourceforge/plantuml/preproc/Defines.java +++ b/src/net/sourceforge/plantuml/preproc/Defines.java @@ -56,7 +56,7 @@ import net.sourceforge.plantuml.security.SFile; import net.sourceforge.plantuml.security.SecurityProfile; import net.sourceforge.plantuml.security.SecurityUtils; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.TMemory; import net.sourceforge.plantuml.tim.TVariableScope; import net.sourceforge.plantuml.utils.Log; @@ -82,7 +82,7 @@ public class Defines implements Truth { return new Defines(); } - public void copyTo(TMemory memory, StringLocated location) throws EaterExceptionLocated { + public void copyTo(TMemory memory, StringLocated location) throws EaterException { for (Entry ent : values.entrySet()) { final String name = ent.getKey(); final Define def = ent.getValue(); diff --git a/src/net/sourceforge/plantuml/preproc/Sub.java b/src/net/sourceforge/plantuml/preproc/Sub.java index e14e5e746..b39e8d4d0 100644 --- a/src/net/sourceforge/plantuml/preproc/Sub.java +++ b/src/net/sourceforge/plantuml/preproc/Sub.java @@ -42,7 +42,7 @@ import java.util.List; import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.text.TLineType; -import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterStartsub; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TMemory; @@ -79,7 +79,7 @@ public class Sub { } public static Sub fromFile(ReadLine reader, String blocname, TContext context, TMemory memory) - throws IOException, EaterExceptionLocated { + throws IOException, EaterException { Sub result = null; StringLocated s = null; boolean skip = false; diff --git a/src/net/sourceforge/plantuml/preproc2/PreprocessorUtils.java b/src/net/sourceforge/plantuml/preproc2/PreprocessorUtils.java index 4fc609f49..8132faab8 100644 --- a/src/net/sourceforge/plantuml/preproc2/PreprocessorUtils.java +++ b/src/net/sourceforge/plantuml/preproc2/PreprocessorUtils.java @@ -53,7 +53,7 @@ import net.sourceforge.plantuml.preproc.StartDiagramExtractReader; import net.sourceforge.plantuml.preproc.Stdlib; import net.sourceforge.plantuml.security.SURL; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.utils.Log; public class PreprocessorUtils { @@ -133,7 +133,7 @@ public class PreprocessorUtils { } public static ReadLine getReaderIncludeUrl(final SURL url, StringLocated s, String suf, Charset charset) - throws EaterExceptionLocated { + throws EaterException { try { if (StartDiagramExtractReader.containsStartDiagram(url, s, charset)) return StartDiagramExtractReader.build(url, s, suf, charset); @@ -141,16 +141,16 @@ public class PreprocessorUtils { return getReaderInclude(url, s, charset); } catch (IOException e) { Logme.error(e); - throw EaterExceptionLocated.located("Cannot open URL " + e.getMessage(), s); + throw new EaterException("Cannot open URL " + e.getMessage(), s); } } public static ReadLine getReaderInclude(SURL url, StringLocated s, Charset charset) - throws EaterExceptionLocated, UnsupportedEncodingException { + throws EaterException, UnsupportedEncodingException { final InputStream is = url.openStream(); if (is == null) - throw EaterExceptionLocated.located("Cannot open URL", s); + throw new EaterException("Cannot open URL", s); return ReadLineReader.create(new InputStreamReader(is, charset), url.toString(), s.getLocation()); } diff --git a/src/net/sourceforge/plantuml/tim/Eater.java b/src/net/sourceforge/plantuml/tim/Eater.java index 20d123720..2f5287555 100644 --- a/src/net/sourceforge/plantuml/tim/Eater.java +++ b/src/net/sourceforge/plantuml/tim/Eater.java @@ -64,19 +64,19 @@ public abstract class Eater { return stringLocated; } - public abstract void analyze(TContext context, TMemory memory) throws EaterExceptionLocated; + public abstract void analyze(TContext context, TMemory memory) throws EaterException; public int getCurrentPosition() { return i; } - final protected String eatAllToEnd() throws EaterExceptionLocated { + final protected String eatAllToEnd() throws EaterException { final String result = stringLocated.getString().substring(i); i = stringLocated.length(); return result; } - final public TValue eatExpression(TContext context, TMemory memory) throws EaterExceptionLocated { + final public TValue eatExpression(TContext context, TMemory memory) throws EaterException { final char ch = peekChar(); if (ch == '{' || ch == '[') { final String data = eatAllToEnd(); @@ -89,22 +89,22 @@ public abstract class Eater { return tokenStack.getResult(getStringLocated(), context, memory); } - final protected TokenStack eatTokenStack() throws EaterExceptionLocated { + final protected TokenStack eatTokenStack() throws EaterException { final TokenStack tokenStack = new TokenStack(); addIntoTokenStack(tokenStack, false); if (tokenStack.size() == 0) - throw EaterExceptionLocated.located("Missing expression", stringLocated); + throw new EaterException("Missing expression", stringLocated); return tokenStack; } - final protected TValue eatExpressionStopAtColon(TContext context, TMemory memory) throws EaterExceptionLocated { + final protected TValue eatExpressionStopAtColon(TContext context, TMemory memory) throws EaterException { final TokenStack tokenStack = new TokenStack(); addIntoTokenStack(tokenStack, true); return tokenStack.getResult(getStringLocated(), context, memory); } - final protected void addIntoTokenStack(TokenStack tokenStack, boolean stopAtColon) throws EaterExceptionLocated { + final protected void addIntoTokenStack(TokenStack tokenStack, boolean stopAtColon) throws EaterException { Token lastToken = null; while (true) { final Token token = TokenType.eatOneToken(lastToken, this, stopAtColon); @@ -117,10 +117,10 @@ public abstract class Eater { } } - final public String eatAndGetQuotedString() throws EaterExceptionLocated { + final public String eatAndGetQuotedString() throws EaterException { final char separator = peekChar(); if (TLineType.isQuote(separator) == false) - throw EaterExceptionLocated.located("quote10", stringLocated); + throw new EaterException("quote10", stringLocated); checkAndEatChar(separator); final StringBuilder value = new StringBuilder(); @@ -129,7 +129,7 @@ public abstract class Eater { return value.toString(); } - final protected String eatAndGetOptionalQuotedString() throws EaterExceptionLocated { + final protected String eatAndGetOptionalQuotedString() throws EaterException { final char quote = peekChar(); if (TLineType.isQuote(quote)) return eatAndGetQuotedString(); @@ -141,7 +141,7 @@ public abstract class Eater { while (true) { char ch = peekChar(); if (ch == 0) - throw EaterExceptionLocated.located("until001", stringLocated); + throw new EaterException("until001", stringLocated); if (level == 0 && (ch == ',' || ch == ')')) return value.toString().trim(); @@ -159,7 +159,7 @@ public abstract class Eater { // return value.toString(); } - final public String eatAndGetNumber() throws EaterExceptionLocated { + final public String eatAndGetNumber() throws EaterException { final StringBuilder result = new StringBuilder(); while (true) { final char ch = peekChar(); @@ -175,7 +175,7 @@ public abstract class Eater { } } - final public String eatAndGetSpaces() throws EaterExceptionLocated { + final public String eatAndGetSpaces() throws EaterException { final StringBuilder result = new StringBuilder(); while (true) { final char ch = peekChar(); @@ -186,19 +186,19 @@ public abstract class Eater { } } - final protected String eatAndGetVarname() throws EaterExceptionLocated { + final protected String eatAndGetVarname() throws EaterException { final StringBuilder varname = new StringBuilder("" + eatOneChar()); if (TLineType.isLetterOrUnderscoreOrDollar(varname.charAt(0)) == false) - throw EaterExceptionLocated.located("a002", stringLocated); + throw new EaterException("a002", stringLocated); addUpToLastLetterOrUnderscoreOrDigit(varname); return varname.toString(); } - final protected String eatAndGetFunctionName() throws EaterExceptionLocated { + final protected String eatAndGetFunctionName() throws EaterException { final StringBuilder varname = new StringBuilder("" + eatOneChar()); if (TLineType.isLetterOrUnderscoreOrDollar(varname.charAt(0)) == false) - throw EaterExceptionLocated.located("a003", stringLocated); + throw new EaterException("a003", stringLocated); addUpToLastLetterOrUnderscoreOrDigit(varname); return varname.toString(); @@ -246,14 +246,14 @@ public abstract class Eater { return ch; } - final protected void checkAndEatChar(char ch) throws EaterExceptionLocated { + final protected void checkAndEatChar(char ch) throws EaterException { if (i >= stringLocated.length() || stringLocated.charAt(i) != ch) - throw EaterExceptionLocated.located("a001", stringLocated); + throw new EaterException("a001", stringLocated); i++; } - final protected boolean safeCheckAndEatChar(char ch) throws EaterExceptionLocated { + final protected boolean safeCheckAndEatChar(char ch) throws EaterException { if (i >= stringLocated.length() || stringLocated.charAt(i) != ch) return false; @@ -261,7 +261,7 @@ public abstract class Eater { return true; } - final protected void optionallyEatChar(char ch) throws EaterExceptionLocated { + final protected void optionallyEatChar(char ch) throws EaterException { if (i >= stringLocated.length() || stringLocated.charAt(i) != ch) return; @@ -269,7 +269,7 @@ public abstract class Eater { i++; } - final protected void checkAndEatChar(String s) throws EaterExceptionLocated { + final protected void checkAndEatChar(String s) throws EaterException { for (int j = 0; j < s.length(); j++) checkAndEatChar(s.charAt(j)); @@ -298,7 +298,7 @@ public abstract class Eater { } final protected TFunctionImpl eatDeclareFunction(TContext context, TMemory memory, boolean unquoted, - StringLocated location, boolean allowNoParenthesis, TFunctionType type) throws EaterExceptionLocated { + StringLocated location, boolean allowNoParenthesis, TFunctionType type) throws EaterException { final List args = new ArrayList<>(); final String functionName = eatAndGetFunctionName(); skipSpaces(); @@ -306,7 +306,7 @@ public abstract class Eater { if (allowNoParenthesis) return new TFunctionImpl(functionName, args, unquoted, type); - throw EaterExceptionLocated.located("Missing opening parenthesis", stringLocated); + throw new EaterException("Missing opening parenthesis", stringLocated); } while (true) { skipSpaces(); @@ -331,7 +331,7 @@ public abstract class Eater { checkAndEatChar(")"); break; } else { - throw EaterExceptionLocated.located("Error in function definition", stringLocated); + throw new EaterException("Error in function definition", stringLocated); } } skipSpaces(); @@ -339,7 +339,7 @@ public abstract class Eater { } final protected TFunctionImpl eatDeclareReturnFunctionWithOptionalReturn(TContext context, TMemory memory, - boolean unquoted, StringLocated location) throws EaterExceptionLocated { + boolean unquoted, StringLocated location) throws EaterException { final TFunctionImpl result = eatDeclareFunction(context, memory, unquoted, location, false, TFunctionType.RETURN_FUNCTION); if (peekChar() == 'r') { @@ -357,7 +357,7 @@ public abstract class Eater { } final protected TFunctionImpl eatDeclareProcedure(TContext context, TMemory memory, boolean unquoted, - StringLocated location) throws EaterExceptionLocated { + StringLocated location) throws EaterException { final TFunctionImpl result = eatDeclareFunction(context, memory, unquoted, location, false, TFunctionType.PROCEDURE); return result; diff --git a/src/net/sourceforge/plantuml/tim/EaterAffectation.java b/src/net/sourceforge/plantuml/tim/EaterAffectation.java index efe99b76f..cad5ded5e 100644 --- a/src/net/sourceforge/plantuml/tim/EaterAffectation.java +++ b/src/net/sourceforge/plantuml/tim/EaterAffectation.java @@ -44,7 +44,7 @@ public class EaterAffectation extends Eater { } @Override - public void analyze(TContext context, TMemory memory) throws EaterExceptionLocated { + public void analyze(TContext context, TMemory memory) throws EaterException { skipSpaces(); checkAndEatChar("!"); skipSpaces(); diff --git a/src/net/sourceforge/plantuml/tim/EaterAffectationDefine.java b/src/net/sourceforge/plantuml/tim/EaterAffectationDefine.java index 863f3d91f..3db77f96c 100644 --- a/src/net/sourceforge/plantuml/tim/EaterAffectationDefine.java +++ b/src/net/sourceforge/plantuml/tim/EaterAffectationDefine.java @@ -44,7 +44,7 @@ public class EaterAffectationDefine extends Eater { } @Override - public void analyze(TContext context, TMemory memory) throws EaterExceptionLocated { + public void analyze(TContext context, TMemory memory) throws EaterException { skipSpaces(); checkAndEatChar("!define"); skipSpaces(); diff --git a/src/net/sourceforge/plantuml/tim/EaterAssert.java b/src/net/sourceforge/plantuml/tim/EaterAssert.java index 3c34cacb1..00603e675 100644 --- a/src/net/sourceforge/plantuml/tim/EaterAssert.java +++ b/src/net/sourceforge/plantuml/tim/EaterAssert.java @@ -44,7 +44,7 @@ public class EaterAssert extends Eater { } @Override - public void analyze(TContext context, TMemory memory) throws EaterExceptionLocated { + public void analyze(TContext context, TMemory memory) throws EaterException { skipSpaces(); checkAndEatChar("!assert"); skipSpaces(); @@ -55,9 +55,9 @@ public class EaterAssert extends Eater { if (ch == ':') { checkAndEatChar(':'); final TValue message = eatExpression(context, memory); - throw EaterExceptionLocated.located("Assertion error : " + message.toString(), getStringLocated()); + throw new EaterException("Assertion error : " + message.toString(), getStringLocated()); } - throw EaterExceptionLocated.located("Assertion error", getStringLocated()); + throw new EaterException("Assertion error", getStringLocated()); } } diff --git a/src/net/sourceforge/plantuml/tim/EaterDeclareProcedure.java b/src/net/sourceforge/plantuml/tim/EaterDeclareProcedure.java index d0cdbdd16..b26b2b425 100644 --- a/src/net/sourceforge/plantuml/tim/EaterDeclareProcedure.java +++ b/src/net/sourceforge/plantuml/tim/EaterDeclareProcedure.java @@ -48,7 +48,7 @@ public class EaterDeclareProcedure extends Eater { } @Override - public void analyze(TContext context, TMemory memory) throws EaterExceptionLocated { + public void analyze(TContext context, TMemory memory) throws EaterException { skipSpaces(); checkAndEatChar("!"); boolean unquoted = false; diff --git a/src/net/sourceforge/plantuml/tim/EaterDeclareReturnFunction.java b/src/net/sourceforge/plantuml/tim/EaterDeclareReturnFunction.java index 84bf4c5c2..139130ed6 100644 --- a/src/net/sourceforge/plantuml/tim/EaterDeclareReturnFunction.java +++ b/src/net/sourceforge/plantuml/tim/EaterDeclareReturnFunction.java @@ -48,7 +48,7 @@ public class EaterDeclareReturnFunction extends Eater { } @Override - public void analyze(TContext context, TMemory memory) throws EaterExceptionLocated { + public void analyze(TContext context, TMemory memory) throws EaterException { skipSpaces(); checkAndEatChar("!"); boolean unquoted = false; diff --git a/src/net/sourceforge/plantuml/tim/EaterDumpMemory.java b/src/net/sourceforge/plantuml/tim/EaterDumpMemory.java index fcf4eac86..33315178b 100644 --- a/src/net/sourceforge/plantuml/tim/EaterDumpMemory.java +++ b/src/net/sourceforge/plantuml/tim/EaterDumpMemory.java @@ -43,7 +43,7 @@ public class EaterDumpMemory extends Eater { } @Override - public void analyze(TContext context, TMemory memory) throws EaterExceptionLocated { + public void analyze(TContext context, TMemory memory) throws EaterException { skipSpaces(); checkAndEatChar("!dump_memory"); skipSpaces(); diff --git a/src/net/sourceforge/plantuml/tim/EaterElseIf.java b/src/net/sourceforge/plantuml/tim/EaterElseIf.java index e83bbbf5a..85f8a1ae8 100644 --- a/src/net/sourceforge/plantuml/tim/EaterElseIf.java +++ b/src/net/sourceforge/plantuml/tim/EaterElseIf.java @@ -46,7 +46,7 @@ public class EaterElseIf extends Eater { } @Override - public void analyze(TContext context, TMemory memory) throws EaterExceptionLocated { + public void analyze(TContext context, TMemory memory) throws EaterException { skipSpaces(); checkAndEatChar("!elseif"); skipSpaces(); diff --git a/src/net/sourceforge/plantuml/tim/EaterExceptionLocated.java b/src/net/sourceforge/plantuml/tim/EaterException.java similarity index 75% rename from src/net/sourceforge/plantuml/tim/EaterExceptionLocated.java rename to src/net/sourceforge/plantuml/tim/EaterException.java index 4aeb0a0da..4de83e32b 100644 --- a/src/net/sourceforge/plantuml/tim/EaterExceptionLocated.java +++ b/src/net/sourceforge/plantuml/tim/EaterException.java @@ -38,22 +38,14 @@ import java.util.Objects; import net.sourceforge.plantuml.text.StringLocated; -public class EaterExceptionLocated extends Exception { +public class EaterException extends Exception { private final String message; private final StringLocated location; - private EaterExceptionLocated(String message, StringLocated location) { - this.message = message; - this.location = location; - } - - public static EaterExceptionLocated located(String message, StringLocated location) { - return new EaterExceptionLocated(message, Objects.requireNonNull(location)); - } - - public static EaterExceptionLocated unlocated(String message, StringLocated location) { - return new EaterExceptionLocated(message, Objects.requireNonNull(location)); + public EaterException(String message, StringLocated location) { + this.message = Objects.requireNonNull(message); + this.location = Objects.requireNonNull(location); } public final String getMessage() { diff --git a/src/net/sourceforge/plantuml/tim/EaterForeach.java b/src/net/sourceforge/plantuml/tim/EaterForeach.java index c631ed8f7..37be05afc 100644 --- a/src/net/sourceforge/plantuml/tim/EaterForeach.java +++ b/src/net/sourceforge/plantuml/tim/EaterForeach.java @@ -48,7 +48,7 @@ public class EaterForeach extends Eater { } @Override - public void analyze(TContext context, TMemory memory) throws EaterExceptionLocated { + public void analyze(TContext context, TMemory memory) throws EaterException { skipSpaces(); checkAndEatChar("!foreach"); skipSpaces(); diff --git a/src/net/sourceforge/plantuml/tim/EaterFunctionCall.java b/src/net/sourceforge/plantuml/tim/EaterFunctionCall.java index 767671aed..b5cc4204b 100644 --- a/src/net/sourceforge/plantuml/tim/EaterFunctionCall.java +++ b/src/net/sourceforge/plantuml/tim/EaterFunctionCall.java @@ -58,7 +58,7 @@ public class EaterFunctionCall extends Eater { } @Override - public void analyze(TContext context, TMemory memory) throws EaterExceptionLocated { + public void analyze(TContext context, TMemory memory) throws EaterException { skipUntilChar('('); checkAndEatChar('('); skipSpaces(); @@ -119,10 +119,9 @@ public class EaterFunctionCall extends Eater { break; } if (unquoted) { - throw EaterExceptionLocated.located("unquoted function/procedure cannot use expression.", - getStringLocated()); + throw new EaterException("unquoted function/procedure cannot use expression.", getStringLocated()); } - throw EaterExceptionLocated.located("call001", getStringLocated()); + throw new EaterException("call001", getStringLocated()); } } @@ -134,7 +133,7 @@ public class EaterFunctionCall extends Eater { return Collections.unmodifiableMap(namedArguments); } - public final String getEndOfLine() throws EaterExceptionLocated { + public final String getEndOfLine() throws EaterException { return this.eatAllToEnd(); } diff --git a/src/net/sourceforge/plantuml/tim/EaterIf.java b/src/net/sourceforge/plantuml/tim/EaterIf.java index ed544cba9..f44772c48 100644 --- a/src/net/sourceforge/plantuml/tim/EaterIf.java +++ b/src/net/sourceforge/plantuml/tim/EaterIf.java @@ -46,7 +46,7 @@ public class EaterIf extends Eater { } @Override - public void analyze(TContext context, TMemory memory) throws EaterExceptionLocated { + public void analyze(TContext context, TMemory memory) throws EaterException { skipSpaces(); checkAndEatChar("!if"); skipSpaces(); diff --git a/src/net/sourceforge/plantuml/tim/EaterIfdef.java b/src/net/sourceforge/plantuml/tim/EaterIfdef.java index 7173965df..b197abc20 100644 --- a/src/net/sourceforge/plantuml/tim/EaterIfdef.java +++ b/src/net/sourceforge/plantuml/tim/EaterIfdef.java @@ -48,7 +48,7 @@ public class EaterIfdef extends Eater { } @Override - public void analyze(TContext context, TMemory memory) throws EaterExceptionLocated { + public void analyze(TContext context, TMemory memory) throws EaterException { skipSpaces(); checkAndEatChar("!ifdef"); skipSpaces(); diff --git a/src/net/sourceforge/plantuml/tim/EaterIfndef.java b/src/net/sourceforge/plantuml/tim/EaterIfndef.java index a79da59a6..ae9d7478f 100644 --- a/src/net/sourceforge/plantuml/tim/EaterIfndef.java +++ b/src/net/sourceforge/plantuml/tim/EaterIfndef.java @@ -46,7 +46,7 @@ public class EaterIfndef extends Eater { } @Override - public void analyze(TContext context, TMemory memory) throws EaterExceptionLocated { + public void analyze(TContext context, TMemory memory) throws EaterException { skipSpaces(); checkAndEatChar("!ifndef"); skipSpaces(); diff --git a/src/net/sourceforge/plantuml/tim/EaterImport.java b/src/net/sourceforge/plantuml/tim/EaterImport.java index c292af610..3f1296de6 100644 --- a/src/net/sourceforge/plantuml/tim/EaterImport.java +++ b/src/net/sourceforge/plantuml/tim/EaterImport.java @@ -45,7 +45,7 @@ public class EaterImport extends Eater { } @Override - public void analyze(TContext context, TMemory memory) throws EaterExceptionLocated { + public void analyze(TContext context, TMemory memory) throws EaterException { skipSpaces(); checkAndEatChar("!import"); skipSpaces(); diff --git a/src/net/sourceforge/plantuml/tim/EaterInclude.java b/src/net/sourceforge/plantuml/tim/EaterInclude.java index fac2806ff..cf6eb3975 100644 --- a/src/net/sourceforge/plantuml/tim/EaterInclude.java +++ b/src/net/sourceforge/plantuml/tim/EaterInclude.java @@ -47,7 +47,7 @@ public class EaterInclude extends Eater { } @Override - public void analyze(TContext context, TMemory memory) throws EaterExceptionLocated { + public void analyze(TContext context, TMemory memory) throws EaterException { skipSpaces(); checkAndEatChar("!include"); final char peekChar = peekChar(); diff --git a/src/net/sourceforge/plantuml/tim/EaterIncludeDef.java b/src/net/sourceforge/plantuml/tim/EaterIncludeDef.java index b275c1169..6e3ce76c5 100644 --- a/src/net/sourceforge/plantuml/tim/EaterIncludeDef.java +++ b/src/net/sourceforge/plantuml/tim/EaterIncludeDef.java @@ -45,7 +45,7 @@ public class EaterIncludeDef extends Eater { } @Override - public void analyze(TContext context, TMemory memory) throws EaterExceptionLocated { + public void analyze(TContext context, TMemory memory) throws EaterException { skipSpaces(); checkAndEatChar("!includedef"); skipSpaces(); diff --git a/src/net/sourceforge/plantuml/tim/EaterIncludesub.java b/src/net/sourceforge/plantuml/tim/EaterIncludesub.java index 53778e2e1..5cdb7f5c6 100644 --- a/src/net/sourceforge/plantuml/tim/EaterIncludesub.java +++ b/src/net/sourceforge/plantuml/tim/EaterIncludesub.java @@ -45,7 +45,7 @@ public class EaterIncludesub extends Eater { } @Override - public void analyze(TContext context, TMemory memory) throws EaterExceptionLocated { + public void analyze(TContext context, TMemory memory) throws EaterException { skipSpaces(); checkAndEatChar("!includesub"); skipSpaces(); diff --git a/src/net/sourceforge/plantuml/tim/EaterLegacyDefine.java b/src/net/sourceforge/plantuml/tim/EaterLegacyDefine.java index bb0257003..6035a7ed6 100644 --- a/src/net/sourceforge/plantuml/tim/EaterLegacyDefine.java +++ b/src/net/sourceforge/plantuml/tim/EaterLegacyDefine.java @@ -45,7 +45,7 @@ public class EaterLegacyDefine extends Eater { } @Override - public void analyze(TContext context, TMemory memory) throws EaterExceptionLocated { + public void analyze(TContext context, TMemory memory) throws EaterException { skipSpaces(); checkAndEatChar("!define"); skipSpaces(); diff --git a/src/net/sourceforge/plantuml/tim/EaterLegacyDefineLong.java b/src/net/sourceforge/plantuml/tim/EaterLegacyDefineLong.java index 3b93fbfd1..3fccd619c 100644 --- a/src/net/sourceforge/plantuml/tim/EaterLegacyDefineLong.java +++ b/src/net/sourceforge/plantuml/tim/EaterLegacyDefineLong.java @@ -45,7 +45,7 @@ public class EaterLegacyDefineLong extends Eater { } @Override - public void analyze(TContext context, TMemory memory) throws EaterExceptionLocated { + public void analyze(TContext context, TMemory memory) throws EaterException { skipSpaces(); checkAndEatChar("!definelong"); skipSpaces(); diff --git a/src/net/sourceforge/plantuml/tim/EaterLog.java b/src/net/sourceforge/plantuml/tim/EaterLog.java index 53f938091..3e31b00f7 100644 --- a/src/net/sourceforge/plantuml/tim/EaterLog.java +++ b/src/net/sourceforge/plantuml/tim/EaterLog.java @@ -44,7 +44,7 @@ public class EaterLog extends Eater { } @Override - public void analyze(TContext context, TMemory memory) throws EaterExceptionLocated { + public void analyze(TContext context, TMemory memory) throws EaterException { skipSpaces(); checkAndEatChar("!log"); skipSpaces(); diff --git a/src/net/sourceforge/plantuml/tim/EaterReturn.java b/src/net/sourceforge/plantuml/tim/EaterReturn.java index 58ade8267..327940207 100644 --- a/src/net/sourceforge/plantuml/tim/EaterReturn.java +++ b/src/net/sourceforge/plantuml/tim/EaterReturn.java @@ -46,7 +46,7 @@ public class EaterReturn extends Eater { } @Override - public void analyze(TContext context, TMemory memory) throws EaterExceptionLocated { + public void analyze(TContext context, TMemory memory) throws EaterException { skipSpaces(); checkAndEatChar("!return"); skipSpaces(); diff --git a/src/net/sourceforge/plantuml/tim/EaterStartsub.java b/src/net/sourceforge/plantuml/tim/EaterStartsub.java index ca67a6574..5cd8207b2 100644 --- a/src/net/sourceforge/plantuml/tim/EaterStartsub.java +++ b/src/net/sourceforge/plantuml/tim/EaterStartsub.java @@ -45,13 +45,13 @@ public class EaterStartsub extends Eater { } @Override - public void analyze(TContext context, TMemory memory) throws EaterExceptionLocated { + public void analyze(TContext context, TMemory memory) throws EaterException { skipSpaces(); checkAndEatChar("!startsub"); skipSpaces(); this.subname = eatAllToEnd(); if (this.subname.matches("\\w+") == false) - throw EaterExceptionLocated.located("Bad sub name", getStringLocated()); + throw new EaterException("Bad sub name", getStringLocated()); } diff --git a/src/net/sourceforge/plantuml/tim/EaterTheme.java b/src/net/sourceforge/plantuml/tim/EaterTheme.java index 891b101a0..7203c5521 100644 --- a/src/net/sourceforge/plantuml/tim/EaterTheme.java +++ b/src/net/sourceforge/plantuml/tim/EaterTheme.java @@ -67,7 +67,7 @@ public class EaterTheme extends Eater { } @Override - public void analyze(TContext context, TMemory memory) throws EaterExceptionLocated { + public void analyze(TContext context, TMemory memory) throws EaterException { skipSpaces(); checkAndEatChar("!theme"); skipSpaces(); @@ -85,7 +85,7 @@ public class EaterTheme extends Eater { } - public final ReadLine getTheme() throws EaterExceptionLocated { + public final ReadLine getTheme() throws EaterException { if (from == null) { try { final ReadLine reader = ThemeUtils.getReaderTheme(realName); @@ -101,24 +101,24 @@ public class EaterTheme extends Eater { } catch (IOException e) { Logme.error(e); } - throw EaterExceptionLocated.located("Cannot load " + realName, getStringLocated()); + throw new EaterException("Cannot load " + realName, getStringLocated()); } if (from.startsWith("<") && from.endsWith(">")) { final ReadLine reader = ThemeUtils.getReaderTheme(realName, from); if (reader == null) - throw EaterExceptionLocated.located("No such theme " + realName + " in " + from, getStringLocated()); + throw new EaterException("No such theme " + realName + " in " + from, getStringLocated()); return reader; } else if (from.startsWith("http://") || from.startsWith("https://")) { final SURL url = SURL.create(ThemeUtils.getFullPath(from, realName)); if (url == null) - throw EaterExceptionLocated.located("Cannot open URL", getStringLocated()); + throw new EaterException("Cannot open URL", getStringLocated()); try { return PreprocessorUtils.getReaderInclude(url, getStringLocated(), UTF_8); } catch (UnsupportedEncodingException e) { Logme.error(e); - throw EaterExceptionLocated.located("Cannot decode charset", getStringLocated()); + throw new EaterException("Cannot decode charset", getStringLocated()); } } @@ -126,12 +126,12 @@ public class EaterTheme extends Eater { final FileWithSuffix file = context.getFileWithSuffix(from, realName); final Reader tmp = file.getReader(UTF_8); if (tmp == null) - throw EaterExceptionLocated.located("No such theme " + realName, getStringLocated()); + throw new EaterException("No such theme " + realName, getStringLocated()); return ReadLineReader.create(tmp, "theme " + realName); } catch (IOException e) { Logme.error(e); - throw EaterExceptionLocated.located("Cannot load " + realName, getStringLocated()); + throw new EaterException("Cannot load " + realName, getStringLocated()); } } diff --git a/src/net/sourceforge/plantuml/tim/EaterUndef.java b/src/net/sourceforge/plantuml/tim/EaterUndef.java index 525644758..01e48c910 100644 --- a/src/net/sourceforge/plantuml/tim/EaterUndef.java +++ b/src/net/sourceforge/plantuml/tim/EaterUndef.java @@ -43,7 +43,7 @@ public class EaterUndef extends Eater { } @Override - public void analyze(TContext context, TMemory memory) throws EaterExceptionLocated { + public void analyze(TContext context, TMemory memory) throws EaterException { skipSpaces(); checkAndEatChar("!undef"); skipSpaces(); diff --git a/src/net/sourceforge/plantuml/tim/EaterWhile.java b/src/net/sourceforge/plantuml/tim/EaterWhile.java index 4b3844b87..8538d6978 100644 --- a/src/net/sourceforge/plantuml/tim/EaterWhile.java +++ b/src/net/sourceforge/plantuml/tim/EaterWhile.java @@ -46,7 +46,7 @@ public class EaterWhile extends Eater { } @Override - public void analyze(TContext context, TMemory memory) throws EaterExceptionLocated { + public void analyze(TContext context, TMemory memory) throws EaterException { skipSpaces(); checkAndEatChar("!while"); skipSpaces(); diff --git a/src/net/sourceforge/plantuml/tim/ExecutionContextWhile.java b/src/net/sourceforge/plantuml/tim/ExecutionContextWhile.java index c1c6b6898..9e406e185 100644 --- a/src/net/sourceforge/plantuml/tim/ExecutionContextWhile.java +++ b/src/net/sourceforge/plantuml/tim/ExecutionContextWhile.java @@ -61,7 +61,7 @@ public class ExecutionContextWhile { } public TValue conditionValue(StringLocated location, TContext context, TMemory memory) - throws EaterExceptionLocated { + throws EaterException { return whileExpression.getResult(location, context, memory); } diff --git a/src/net/sourceforge/plantuml/tim/ExecutionContexts.java b/src/net/sourceforge/plantuml/tim/ExecutionContexts.java index 33ab5821b..f42116e1a 100644 --- a/src/net/sourceforge/plantuml/tim/ExecutionContexts.java +++ b/src/net/sourceforge/plantuml/tim/ExecutionContexts.java @@ -79,7 +79,7 @@ public abstract class ExecutionContexts { return allForeachs.pollLast(); } - public boolean areAllIfOk(TContext context, TMemory memory) throws EaterExceptionLocated { + public boolean areAllIfOk(TContext context, TMemory memory) throws EaterException { for (ExecutionContextIf conditionalContext : allIfs) if (conditionalContext.conditionIsOkHere() == false) return false; diff --git a/src/net/sourceforge/plantuml/tim/FunctionsSet.java b/src/net/sourceforge/plantuml/tim/FunctionsSet.java index b5702c62d..683d0d7fa 100644 --- a/src/net/sourceforge/plantuml/tim/FunctionsSet.java +++ b/src/net/sourceforge/plantuml/tim/FunctionsSet.java @@ -95,9 +95,9 @@ public class FunctionsSet { } public void executeLegacyDefine(TContext context, TMemory memory, StringLocated s) - throws EaterExceptionLocated { + throws EaterException { if (this.pendingFunction != null) - throw EaterExceptionLocated.located("already0048", s); + throw new EaterException("already0048", s); final EaterLegacyDefine legacyDefine = new EaterLegacyDefine(s); legacyDefine.analyze(context, memory); @@ -107,9 +107,9 @@ public class FunctionsSet { } public void executeLegacyDefineLong(TContext context, TMemory memory, StringLocated s) - throws EaterExceptionLocated { + throws EaterException { if (this.pendingFunction != null) - throw EaterExceptionLocated.located("already0068", s); + throw new EaterException("already0068", s); final EaterLegacyDefineLong legacyDefineLong = new EaterLegacyDefineLong(s); legacyDefineLong.analyze(context, memory); @@ -117,9 +117,9 @@ public class FunctionsSet { } public void executeDeclareReturnFunction(TContext context, TMemory memory, StringLocated s) - throws EaterExceptionLocated { + throws EaterException { if (this.pendingFunction != null) - throw EaterExceptionLocated.located("already0068", s); + throw new EaterException("already0068", s); final EaterDeclareReturnFunction declareFunction = new EaterDeclareReturnFunction(s); declareFunction.analyze(context, memory); @@ -127,7 +127,7 @@ public class FunctionsSet { final TFunctionSignature declaredSignature = declareFunction.getFunction().getSignature(); final TFunction previous = this.functions.get(declaredSignature); if (previous != null && (finalFlag || this.functionsFinal.contains(declaredSignature))) - throw EaterExceptionLocated.located("This function is already defined", s); + throw new EaterException("This function is already defined", s); if (finalFlag) this.functionsFinal.add(declaredSignature); @@ -140,9 +140,9 @@ public class FunctionsSet { } public void executeDeclareProcedure(TContext context, TMemory memory, StringLocated s) - throws EaterExceptionLocated { + throws EaterException { if (this.pendingFunction != null) - throw EaterExceptionLocated.located("already0068", s); + throw new EaterException("already0068", s); final EaterDeclareProcedure declareFunction = new EaterDeclareProcedure(s); declareFunction.analyze(context, memory); @@ -150,7 +150,7 @@ public class FunctionsSet { final TFunctionSignature declaredSignature = declareFunction.getFunction().getSignature(); final TFunction previous = this.functions.get(declaredSignature); if (previous != null && (finalFlag || this.functionsFinal.contains(declaredSignature))) - throw EaterExceptionLocated.located("This function is already defined", s); + throw new EaterException("This function is already defined", s); if (finalFlag) this.functionsFinal.add(declaredSignature); diff --git a/src/net/sourceforge/plantuml/tim/StringEater.java b/src/net/sourceforge/plantuml/tim/StringEater.java index e8b2825e2..818a7856d 100644 --- a/src/net/sourceforge/plantuml/tim/StringEater.java +++ b/src/net/sourceforge/plantuml/tim/StringEater.java @@ -43,7 +43,7 @@ public class StringEater extends Eater { } @Override - public void analyze(TContext context, TMemory memory) throws EaterExceptionLocated { + public void analyze(TContext context, TMemory memory) throws EaterException { throw new UnsupportedOperationException(); } diff --git a/src/net/sourceforge/plantuml/tim/TContext.java b/src/net/sourceforge/plantuml/tim/TContext.java index 86a3bb0b1..79188e5ca 100644 --- a/src/net/sourceforge/plantuml/tim/TContext.java +++ b/src/net/sourceforge/plantuml/tim/TContext.java @@ -236,7 +236,7 @@ public class TContext { public Knowledge asKnowledge(final TMemory memory, final LineLocation location) { return new Knowledge() { - public TValue getVariable(String name) throws EaterExceptionLocated { + public TValue getVariable(String name) throws EaterException { if (name.contains(".") || name.contains("[")) { final TValue result = fromJson(memory, name, location); return result; @@ -250,7 +250,7 @@ public class TContext { }; } - private TValue fromJson(TMemory memory, String name, LineLocation location) throws EaterExceptionLocated { + private TValue fromJson(TMemory memory, String name, LineLocation location) throws EaterException { final String result = applyFunctionsAndVariables(memory, new StringLocated(name, location)); try { final JsonValue json = Json.parse(result); @@ -279,7 +279,7 @@ public class TContext { } public TValue executeLines(TMemory memory, List body, TFunctionType ftype, boolean modeSpecial) - throws EaterExceptionLocated { + throws EaterException { final CodeIterator it = buildCodeIterator(memory, body); StringLocated s = null; @@ -295,7 +295,7 @@ public class TContext { } private void executeLinesInternal(TMemory memory, List body, TFunctionType ftype) - throws EaterExceptionLocated { + throws EaterException { final CodeIterator it = buildCodeIterator(memory, body); StringLocated s = null; @@ -307,20 +307,20 @@ public class TContext { } private TValue executeOneLineSafe(TMemory memory, StringLocated s, TFunctionType ftype, boolean modeSpecial) - throws EaterExceptionLocated { + throws EaterException { try { this.debug.add(s); return executeOneLineNotSafe(memory, s, ftype, modeSpecial); } catch (Exception e) { - if (e instanceof EaterExceptionLocated) - throw (EaterExceptionLocated) e; + if (e instanceof EaterException) + throw (EaterException) e; Logme.error(e); - throw EaterExceptionLocated.located("Fatal parsing error", s); + throw new EaterException("Fatal parsing error", s); } } private TValue executeOneLineNotSafe(TMemory memory, StringLocated s, TFunctionType ftype, boolean modeSpecial) - throws EaterExceptionLocated { + throws EaterException { final TLineType type = s.getType(); if (type == TLineType.INCLUDESUB) { @@ -375,11 +375,11 @@ public class TContext { } else if (s.getString().matches("^\\s+$")) { return null; } else { - throw EaterExceptionLocated.located("Compile Error " + ftype + " " + type, s); + throw new EaterException("Compile Error " + ftype + " " + type, s); } } - private void addPlain(TMemory memory, StringLocated s) throws EaterExceptionLocated { + private void addPlain(TMemory memory, StringLocated s) throws EaterException { final StringLocated tmp[] = applyFunctionsAndVariablesInternal(memory, s); if (tmp != null) { if (pendingAdd != null) { @@ -392,31 +392,31 @@ public class TContext { } } - private void simulatePlain(TMemory memory, StringLocated s) throws EaterExceptionLocated { + private void simulatePlain(TMemory memory, StringLocated s) throws EaterException { final StringLocated ignored[] = applyFunctionsAndVariablesInternal(memory, s); } - private void executeAffectationDefine(TMemory memory, StringLocated s) throws EaterExceptionLocated { + private void executeAffectationDefine(TMemory memory, StringLocated s) throws EaterException { new EaterAffectationDefine(s).analyze(this, memory); } - private void executeDumpMemory(TMemory memory, StringLocated s) throws EaterExceptionLocated { + private void executeDumpMemory(TMemory memory, StringLocated s) throws EaterException { final EaterDumpMemory condition = new EaterDumpMemory(s); condition.analyze(this, memory); } - private void executeAssert(TMemory memory, StringLocated s) throws EaterExceptionLocated { + private void executeAssert(TMemory memory, StringLocated s) throws EaterException { final EaterAssert condition = new EaterAssert(s); condition.analyze(this, memory); } - private void executeUndef(TMemory memory, StringLocated s) throws EaterExceptionLocated { + private void executeUndef(TMemory memory, StringLocated s) throws EaterException { final EaterUndef undef = new EaterUndef(s); undef.analyze(this, memory); } private StringLocated[] applyFunctionsAndVariablesInternal(TMemory memory, StringLocated located) - throws EaterExceptionLocated { + throws EaterException { if (memory.isEmpty() && functionsSet.size() == 0) return new StringLocated[] { located }; @@ -434,7 +434,7 @@ public class TContext { private String pendingAdd = null; - public String applyFunctionsAndVariables(TMemory memory, final StringLocated str) throws EaterExceptionLocated { + public String applyFunctionsAndVariables(TMemory memory, final StringLocated str) throws EaterException { // https://en.wikipedia.org/wiki/Boyer%E2%80%93Moore%E2%80%93Horspool_algorithm // https://stackoverflow.com/questions/1326682/java-replacing-multiple-different-substring-in-a-string-at-once-or-in-the-most // https://en.wikipedia.org/wiki/String-searching_algorithm @@ -456,7 +456,7 @@ public class TContext { call.getNamedArguments().keySet()); final TFunction function = functionsSet.getFunctionSmart(signature); if (function == null) - throw EaterExceptionLocated.located("Function not found " + presentFunction, str); + throw new EaterException("Function not found " + presentFunction, str); if (function.getFunctionType() == TFunctionType.PROCEDURE) { this.pendingAdd = result.toString(); @@ -494,11 +494,11 @@ public class TContext { } private void executeVoid3(StringLocated location, TMemory memory, TFunction function, EaterFunctionCall call) - throws EaterExceptionLocated { + throws EaterException { function.executeProcedureInternal(this, memory, location, call.getValues(), call.getNamedArguments()); } - private void executeImport(TMemory memory, StringLocated s) throws EaterExceptionLocated { + private void executeImport(TMemory memory, StringLocated s) throws EaterException { final EaterImport _import = new EaterImport(s.getTrimmed()); _import.analyze(this, memory); @@ -511,13 +511,13 @@ public class TContext { } } catch (IOException e) { Logme.error(e); - throw EaterExceptionLocated.located("Cannot import " + e.getMessage(), s); + throw new EaterException("Cannot import " + e.getMessage(), s); } - throw EaterExceptionLocated.located("Cannot import", s); + throw new EaterException("Cannot import", s); } - private void executeLog(TMemory memory, StringLocated s) throws EaterExceptionLocated { + private void executeLog(TMemory memory, StringLocated s) throws EaterException { final EaterLog log = new EaterLog(s.getTrimmed()); log.analyze(this, memory); } @@ -529,7 +529,7 @@ public class TContext { } - private void executeIncludesub(TMemory memory, StringLocated s) throws EaterExceptionLocated { + private void executeIncludesub(TMemory memory, StringLocated s) throws EaterException { ImportedFiles saveImportedFiles = null; try { final EaterIncludesub include = new EaterIncludesub(s.getTrimmed()); @@ -547,7 +547,7 @@ public class TContext { this.importedFiles = this.importedFiles.withCurrentDir(f2.getParentFile()); final Reader reader = f2.getReader(charset); if (reader == null) - throw EaterExceptionLocated.located("cannot include " + what, s); + throw new EaterException("cannot include " + what, s); try { ReadLine readerline = ReadLineReader.create(reader, what, s.getLocation()); @@ -559,14 +559,14 @@ public class TContext { } } catch (IOException e) { Logme.error(e); - throw EaterExceptionLocated.located("cannot include " + what, s); + throw new EaterException("cannot include " + what, s); } } if (sub == null) sub = subs.get(what); if (sub == null) - throw EaterExceptionLocated.located("cannot include " + what, s); + throw new EaterException("cannot include " + what, s); executeLinesInternal(memory, sub.lines(), null); } finally { @@ -576,7 +576,7 @@ public class TContext { } } - private void executeIncludeDef(TMemory memory, StringLocated s) throws EaterExceptionLocated { + private void executeIncludeDef(TMemory memory, StringLocated s) throws EaterException { final EaterIncludeDef include = new EaterIncludeDef(s.getTrimmed()); include.analyze(this, memory); final String definitionName = include.getLocation(); @@ -595,7 +595,7 @@ public class TContext { } while (true); } catch (IOException e) { Logme.error(e); - throw EaterExceptionLocated.located("" + e, s); + throw new EaterException("" + e, s); } finally { try { reader2.close(); @@ -605,12 +605,12 @@ public class TContext { } } - private void executeTheme(TMemory memory, StringLocated s) throws EaterExceptionLocated { + private void executeTheme(TMemory memory, StringLocated s) throws EaterException { final EaterTheme eater = new EaterTheme(s.getTrimmed(), importedFiles); eater.analyze(this, memory); final ReadLine reader = eater.getTheme(); if (reader == null) - throw EaterExceptionLocated.located("No such theme " + eater.getName(), s); + throw new EaterException("No such theme " + eater.getName(), s); try { final List body = new ArrayList<>(); @@ -624,7 +624,7 @@ public class TContext { } while (true); } catch (IOException e) { Logme.error(e); - throw EaterExceptionLocated.located("Error reading theme " + e, s); + throw new EaterException("Error reading theme " + e, s); } finally { try { reader.close(); @@ -634,7 +634,7 @@ public class TContext { } } - private void executeInclude(TMemory memory, StringLocated s) throws EaterExceptionLocated { + private void executeInclude(TMemory memory, StringLocated s) throws EaterException { final EaterInclude include = new EaterInclude(s.getTrimmed()); include.analyze(this, memory); String location = include.getWhat(); @@ -652,7 +652,7 @@ public class TContext { if (location.startsWith("http://") || location.startsWith("https://")) { final SURL url = SURL.create(location); if (url == null) - throw EaterExceptionLocated.located("Cannot open URL", s); + throw new EaterException("Cannot open URL", s); reader = PreprocessorUtils.getReaderIncludeUrl(url, s, suf, charset); } else if (location.startsWith("<") && location.endsWith(">")) { @@ -668,14 +668,14 @@ public class TContext { return; if (strategy == PreprocessorIncludeStrategy.ONCE && filesUsedCurrent.contains(f2)) - throw EaterExceptionLocated.located("This file has already been included", s); + throw new EaterException("This file has already been included", s); if (StartDiagramExtractReader.containsStartDiagram(f2, s, charset)) { reader = StartDiagramExtractReader.build(f2, s, charset); } else { final Reader tmp = f2.getReader(charset); if (tmp == null) - throw EaterExceptionLocated.located("Cannot include file", s); + throw new EaterException("Cannot include file", s); reader = ReadLineReader.create(tmp, location, s.getLocation()); } @@ -704,7 +704,7 @@ public class TContext { } } catch (IOException e) { Logme.error(e); - throw EaterExceptionLocated.located("cannot include " + e, s); + throw new EaterException("cannot include " + e, s); } finally { if (reader != null) { try { @@ -715,7 +715,7 @@ public class TContext { } } - throw EaterExceptionLocated.located("cannot include " + location, s); + throw new EaterException("cannot include " + location, s); } public boolean isLegacyDefine(String functionName) { diff --git a/src/net/sourceforge/plantuml/tim/TFunction.java b/src/net/sourceforge/plantuml/tim/TFunction.java index f8032a23e..3570bfbea 100644 --- a/src/net/sourceforge/plantuml/tim/TFunction.java +++ b/src/net/sourceforge/plantuml/tim/TFunction.java @@ -50,10 +50,10 @@ public interface TFunction { public TFunctionType getFunctionType(); public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List args, - Map named) throws EaterExceptionLocated; + Map named) throws EaterException; public void executeProcedureInternal(TContext context, TMemory memory, StringLocated location, List args, - Map named) throws EaterExceptionLocated; + Map named) throws EaterException; public boolean isUnquoted(); diff --git a/src/net/sourceforge/plantuml/tim/TFunctionImpl.java b/src/net/sourceforge/plantuml/tim/TFunctionImpl.java index eb36bbb3e..bf51f7064 100644 --- a/src/net/sourceforge/plantuml/tim/TFunctionImpl.java +++ b/src/net/sourceforge/plantuml/tim/TFunctionImpl.java @@ -121,19 +121,18 @@ public class TFunctionImpl implements TFunction { return "FUNCTION " + signature + " " + args; } - public void addBody(StringLocated s) throws EaterExceptionLocated { + public void addBody(StringLocated s) throws EaterException { body.add(s); if (s.getType() == TLineType.RETURN) { this.containsReturn = true; if (functionType == TFunctionType.PROCEDURE) - throw EaterExceptionLocated - .located("A procedure cannot have !return directive. Declare it as a function instead ?", s); + throw new EaterException("A procedure cannot have !return directive. Declare it as a function instead ?", s); } } @Override public void executeProcedureInternal(TContext context, TMemory memory, StringLocated location, List args, - Map named) throws EaterExceptionLocated { + Map named) throws EaterException { if (functionType != TFunctionType.PROCEDURE && functionType != TFunctionType.LEGACY_DEFINELONG) throw new IllegalStateException(); @@ -143,24 +142,23 @@ public class TFunctionImpl implements TFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List args, - Map named) throws EaterExceptionLocated { + Map named) throws EaterException { if (functionType == TFunctionType.LEGACY_DEFINE) return executeReturnLegacyDefine(location.getLocation(), context, memory, args); if (functionType != TFunctionType.RETURN_FUNCTION) - throw EaterExceptionLocated.unlocated("Illegal call here. Is there a return directive in your function?", - location); + throw new EaterException("Illegal call here. Is there a return directive in your function?", location); final TMemory copy = getNewMemory(memory, args, named); final TValue result = context.executeLines(copy, body, TFunctionType.RETURN_FUNCTION, true); if (result == null) - throw EaterExceptionLocated.unlocated("No return directive found in your function", location); + throw new EaterException("No return directive found in your function", location); return result; } private TValue executeReturnLegacyDefine(LineLocation location, TContext context, TMemory memory, List args) - throws EaterExceptionLocated { + throws EaterException { if (legacyDefinition == null) throw new IllegalStateException(); diff --git a/src/net/sourceforge/plantuml/tim/TMemory.java b/src/net/sourceforge/plantuml/tim/TMemory.java index cf89df812..466b5951b 100644 --- a/src/net/sourceforge/plantuml/tim/TMemory.java +++ b/src/net/sourceforge/plantuml/tim/TMemory.java @@ -45,7 +45,7 @@ public interface TMemory { public TValue getVariable(String varname); public void putVariable(String varname, TValue value, TVariableScope scope, StringLocated location) - throws EaterExceptionLocated; + throws EaterException; public void removeVariable(String varname); @@ -59,7 +59,7 @@ public interface TMemory { public ExecutionContextIf peekIf(); - public boolean areAllIfOk(TContext context, TMemory memory) throws EaterExceptionLocated; + public boolean areAllIfOk(TContext context, TMemory memory) throws EaterException; public void addIf(ExecutionContextIf context); diff --git a/src/net/sourceforge/plantuml/tim/TMemoryGlobal.java b/src/net/sourceforge/plantuml/tim/TMemoryGlobal.java index f8d5aaec3..86629e910 100644 --- a/src/net/sourceforge/plantuml/tim/TMemoryGlobal.java +++ b/src/net/sourceforge/plantuml/tim/TMemoryGlobal.java @@ -73,10 +73,10 @@ public class TMemoryGlobal extends ExecutionContexts implements TMemory { @Override public void putVariable(String varname, TValue value, TVariableScope scope, StringLocated location) - throws EaterExceptionLocated { + throws EaterException { Log.info("[MemGlobal] Setting " + varname); if (scope == TVariableScope.LOCAL) - throw EaterExceptionLocated.unlocated("Cannot use local variable here", location); + throw new EaterException("Cannot use local variable here", location); this.globalVariables.put(varname, value); this.variables.add(varname); diff --git a/src/net/sourceforge/plantuml/tim/TMemoryLocal.java b/src/net/sourceforge/plantuml/tim/TMemoryLocal.java index 4271d6e36..2603e1d0d 100644 --- a/src/net/sourceforge/plantuml/tim/TMemoryLocal.java +++ b/src/net/sourceforge/plantuml/tim/TMemoryLocal.java @@ -79,7 +79,7 @@ public class TMemoryLocal extends ExecutionContexts implements TMemory { @Override public void putVariable(String varname, TValue value, TVariableScope scope, StringLocated location) - throws EaterExceptionLocated { + throws EaterException { if (scope == TVariableScope.GLOBAL) { memoryGlobal.putVariable(varname, value, scope, location); return; diff --git a/src/net/sourceforge/plantuml/tim/TimLoader.java b/src/net/sourceforge/plantuml/tim/TimLoader.java index 09962e007..1dcdd9670 100644 --- a/src/net/sourceforge/plantuml/tim/TimLoader.java +++ b/src/net/sourceforge/plantuml/tim/TimLoader.java @@ -57,7 +57,7 @@ public class TimLoader { this.context = new TContext(importedFiles, defines, charset, definitionsContainer); try { defines.copyTo(global, location); - } catch (EaterExceptionLocated e) { + } catch (EaterException e) { Logme.error(e); } } @@ -66,7 +66,7 @@ public class TimLoader { // CodeIteratorImpl.indentNow(list); try { context.executeLines(global, list, null, false); - } catch (EaterExceptionLocated e) { + } catch (EaterException e) { context.getResultList().add(e.getLocation().withErrorPreprocessor(e.getMessage())); changeLastLine(context.getDebug(), e.getMessage()); this.preprocessorError = true; diff --git a/src/net/sourceforge/plantuml/tim/VariableManager.java b/src/net/sourceforge/plantuml/tim/VariableManager.java index d8fc019ac..c2a7aed7c 100644 --- a/src/net/sourceforge/plantuml/tim/VariableManager.java +++ b/src/net/sourceforge/plantuml/tim/VariableManager.java @@ -53,7 +53,7 @@ public class VariableManager { this.location = location; } - public int replaceVariables(String str, int i, StringBuilder result) throws EaterExceptionLocated { + public int replaceVariables(String str, int i, StringBuilder result) throws EaterException { final String presentVariable = getVarnameAt(str, i); if (result.toString().endsWith("##")) result.setLength(result.length() - 2); @@ -80,7 +80,7 @@ public class VariableManager { return i; } - private int replaceJson(JsonValue jsonValue, String str, int i, StringBuilder result) throws EaterExceptionLocated { + private int replaceJson(JsonValue jsonValue, String str, int i, StringBuilder result) throws EaterException { while (i < str.length()) { final char n = str.charAt(i); if (n == '.') { @@ -118,11 +118,11 @@ public class VariableManager { } else if (jsonValue instanceof JsonObject) { jsonValue = ((JsonObject) jsonValue).get(nbString); } else { - throw EaterExceptionLocated.unlocated("Major parsing error", location); + throw new EaterException("Major parsing error", location); } if (jsonValue == null) - throw EaterExceptionLocated.unlocated("Data parsing error", location); + throw new EaterException("Data parsing error", location); i++; } else { diff --git a/src/net/sourceforge/plantuml/tim/expression/Knowledge.java b/src/net/sourceforge/plantuml/tim/expression/Knowledge.java index b2fdb753d..1ca3fba7b 100644 --- a/src/net/sourceforge/plantuml/tim/expression/Knowledge.java +++ b/src/net/sourceforge/plantuml/tim/expression/Knowledge.java @@ -34,13 +34,13 @@ */ package net.sourceforge.plantuml.tim.expression; -import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.TFunction; import net.sourceforge.plantuml.tim.TFunctionSignature; public interface Knowledge { - public TValue getVariable(String name) throws EaterExceptionLocated; + public TValue getVariable(String name) throws EaterException; public TFunction getFunction(TFunctionSignature signature); diff --git a/src/net/sourceforge/plantuml/tim/expression/ReversePolishInterpretor.java b/src/net/sourceforge/plantuml/tim/expression/ReversePolishInterpretor.java index 67996cc69..7d4aff50f 100644 --- a/src/net/sourceforge/plantuml/tim/expression/ReversePolishInterpretor.java +++ b/src/net/sourceforge/plantuml/tim/expression/ReversePolishInterpretor.java @@ -41,7 +41,7 @@ import java.util.Deque; import java.util.List; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunction; import net.sourceforge.plantuml.tim.TFunctionSignature; @@ -53,7 +53,7 @@ public class ReversePolishInterpretor { private final boolean trace = false; public ReversePolishInterpretor(StringLocated location, TokenStack queue, Knowledge knowledge, TMemory memory, - TContext context) throws EaterExceptionLocated { + TContext context) throws EaterException { final Deque stack = new ArrayDeque<>(); if (trace) @@ -73,7 +73,7 @@ public class ReversePolishInterpretor { final TValue v1 = stack.removeFirst(); final TokenOperator op = token.getTokenOperator(); if (op == null) - throw EaterExceptionLocated.unlocated("bad op", location); + throw new EaterException("bad op", location); final TValue tmp = op.operate(v1, v2); stack.addFirst(tmp); @@ -81,7 +81,7 @@ public class ReversePolishInterpretor { final int nb = Integer.parseInt(token.getSurface()); final Token token2 = it.nextToken(); if (token2.getTokenType() != TokenType.FUNCTION_NAME) - throw EaterExceptionLocated.unlocated("rpn43", location); + throw new EaterException("rpn43", location); if (trace) System.err.println("token2=" + token2); @@ -89,11 +89,10 @@ public class ReversePolishInterpretor { if (trace) System.err.println("function=" + function); if (function == null) - throw EaterExceptionLocated.unlocated("Unknown built-in function " + token2.getSurface(), location); + throw new EaterException("Unknown built-in function " + token2.getSurface(), location); if (function.canCover(nb, Collections.emptySet()) == false) - throw EaterExceptionLocated.unlocated( - "Bad number of arguments for " + function.getSignature().getFunctionName(), location); + throw new EaterException("Bad number of arguments for " + function.getSignature().getFunctionName(), location); final List args = new ArrayList<>(); for (int i = 0; i < nb; i++) @@ -102,7 +101,7 @@ public class ReversePolishInterpretor { if (trace) System.err.println("args=" + args); if (location == null) - throw EaterExceptionLocated.unlocated("rpn44", location); + throw new EaterException("rpn44", location); final TValue r = function.executeReturnFunction(context, memory, location, args, Collections.emptyMap()); @@ -110,7 +109,7 @@ public class ReversePolishInterpretor { System.err.println("r=" + r); stack.addFirst(r); } else { - throw EaterExceptionLocated.unlocated("rpn41", location); + throw new EaterException("rpn41", location); } } result = stack.removeFirst(); diff --git a/src/net/sourceforge/plantuml/tim/expression/ShuntingYard.java b/src/net/sourceforge/plantuml/tim/expression/ShuntingYard.java index 45ee8e008..fb75931c5 100644 --- a/src/net/sourceforge/plantuml/tim/expression/ShuntingYard.java +++ b/src/net/sourceforge/plantuml/tim/expression/ShuntingYard.java @@ -38,7 +38,7 @@ import java.util.ArrayDeque; import java.util.Deque; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.EaterException; // https://en.wikipedia.org/wiki/Shunting-yard_algorithm // https://en.cppreference.com/w/c/language/operator_precedence @@ -58,7 +58,7 @@ public class ShuntingYard { System.err.println(""); } - public ShuntingYard(TokenIterator it, Knowledge knowledge, StringLocated location) throws EaterExceptionLocated { + public ShuntingYard(TokenIterator it, Knowledge knowledge, StringLocated location) throws EaterException { while (it.hasMoreTokens()) { final Token token = it.nextToken(); @@ -74,7 +74,7 @@ public class ShuntingYard { final TValue variable = knowledge.getVariable(name); if (variable == null) { if (isVariableName(name) == false) - throw EaterExceptionLocated.unlocated("Parsing syntax error about " + name, location); + throw new EaterException("Parsing syntax error about " + name, location); ouputQueue.add(new Token(name, TokenType.QUOTED_STRING, null)); } else { diff --git a/src/net/sourceforge/plantuml/tim/expression/TokenStack.java b/src/net/sourceforge/plantuml/tim/expression/TokenStack.java index bed0e451d..e94574dab 100644 --- a/src/net/sourceforge/plantuml/tim/expression/TokenStack.java +++ b/src/net/sourceforge/plantuml/tim/expression/TokenStack.java @@ -44,7 +44,7 @@ import java.util.Map; import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.tim.Eater; -import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TMemory; @@ -86,7 +86,7 @@ public class TokenStack { return result; } - static public TokenStack eatUntilCloseParenthesisOrComma(Eater eater) throws EaterExceptionLocated { + static public TokenStack eatUntilCloseParenthesisOrComma(Eater eater) throws EaterException { final TokenStack result = new TokenStack(); int level = 0; Token lastToken = null; @@ -94,7 +94,7 @@ public class TokenStack { eater.skipSpaces(); final char ch = eater.peekChar(); if (ch == 0) - throw EaterExceptionLocated.unlocated("until001", eater.getStringLocated()); + throw new EaterException("until001", eater.getStringLocated()); if (level == 0 && (ch == ',' || ch == ')')) return result; @@ -113,12 +113,12 @@ public class TokenStack { } static public void eatUntilCloseParenthesisOrComma(TokenIterator it, StringLocated location) - throws EaterExceptionLocated { + throws EaterException { int level = 0; while (true) { final Token ch = it.peekToken(); if (ch == null) - throw EaterExceptionLocated.unlocated("until002", location); + throw new EaterException("until002", location); final TokenType typech = ch.getTokenType(); if (level == 0 && (typech == TokenType.COMMA || typech == TokenType.CLOSE_PAREN_MATH) @@ -135,7 +135,7 @@ public class TokenStack { } } - private int countFunctionArg(TokenIterator it, StringLocated location) throws EaterExceptionLocated { + private int countFunctionArg(TokenIterator it, StringLocated location) throws EaterException { // return 42; final TokenType type1 = it.peekToken().getTokenType(); if (type1 == TokenType.CLOSE_PAREN_MATH || type1 == TokenType.CLOSE_PAREN_FUNC) @@ -151,13 +151,13 @@ public class TokenStack { else if (type == TokenType.COMMA) result++; else - throw EaterExceptionLocated.unlocated("count13", location); + throw new EaterException("count13", location); } - throw EaterExceptionLocated.unlocated("count12", location); + throw new EaterException("count12", location); } - public void guessFunctions(StringLocated location) throws EaterExceptionLocated { + public void guessFunctions(StringLocated location) throws EaterException { final Deque open = new ArrayDeque<>(); final Map parens = new HashMap(); for (int i = 0; i < tokens.size(); i++) { @@ -210,7 +210,7 @@ public class TokenStack { return new InternalIterator(); } - public TValue getResult(StringLocated location, TContext context, TMemory memory) throws EaterExceptionLocated { + public TValue getResult(StringLocated location, TContext context, TMemory memory) throws EaterException { final Knowledge knowledge = context.asKnowledge(memory, location.getLocation()); final TokenStack tmp = withoutSpace(); tmp.guessFunctions(location); diff --git a/src/net/sourceforge/plantuml/tim/expression/TokenType.java b/src/net/sourceforge/plantuml/tim/expression/TokenType.java index bdb7c445f..41c0fc7ef 100644 --- a/src/net/sourceforge/plantuml/tim/expression/TokenType.java +++ b/src/net/sourceforge/plantuml/tim/expression/TokenType.java @@ -36,7 +36,7 @@ package net.sourceforge.plantuml.tim.expression; import net.sourceforge.plantuml.text.TLineType; import net.sourceforge.plantuml.tim.Eater; -import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.EaterException; public enum TokenType { // ::remove folder when __HAXE__ @@ -78,7 +78,7 @@ public enum TokenType { } final static public Token eatOneToken(Token lastToken, Eater eater, boolean manageColon) - throws EaterExceptionLocated { + throws EaterException { char ch = eater.peekChar(); if (ch == 0) return null; @@ -122,7 +122,7 @@ public enum TokenType { return true; } - static private String eatAndGetTokenPlainText(Eater eater) throws EaterExceptionLocated { + static private String eatAndGetTokenPlainText(Eater eater) throws EaterException { final StringBuilder result = new StringBuilder(); while (true) { final char ch = eater.peekChar(); diff --git a/src/net/sourceforge/plantuml/tim/iterator/AbstractCodeIterator.java b/src/net/sourceforge/plantuml/tim/iterator/AbstractCodeIterator.java index e01a9707c..51fbdfad5 100644 --- a/src/net/sourceforge/plantuml/tim/iterator/AbstractCodeIterator.java +++ b/src/net/sourceforge/plantuml/tim/iterator/AbstractCodeIterator.java @@ -35,7 +35,7 @@ package net.sourceforge.plantuml.tim.iterator; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.EaterException; public abstract class AbstractCodeIterator implements CodeIterator { @@ -46,7 +46,7 @@ public abstract class AbstractCodeIterator implements CodeIterator { } @Override - public void next() throws EaterExceptionLocated { + public void next() throws EaterException { source.next(); } @@ -57,7 +57,7 @@ public abstract class AbstractCodeIterator implements CodeIterator { @Override final public void jumpToCodePosition(CodePosition newPosition, StringLocated location) - throws EaterExceptionLocated { + throws EaterException { source.jumpToCodePosition(newPosition, location); } diff --git a/src/net/sourceforge/plantuml/tim/iterator/CodeIterator.java b/src/net/sourceforge/plantuml/tim/iterator/CodeIterator.java index f6c613a00..401102893 100644 --- a/src/net/sourceforge/plantuml/tim/iterator/CodeIterator.java +++ b/src/net/sourceforge/plantuml/tim/iterator/CodeIterator.java @@ -35,17 +35,17 @@ package net.sourceforge.plantuml.tim.iterator; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.EaterException; public interface CodeIterator { // ::remove folder when __HAXE__ - public StringLocated peek() throws EaterExceptionLocated; + public StringLocated peek() throws EaterException; - public void next() throws EaterExceptionLocated; + public void next() throws EaterException; public CodePosition getCodePosition(); - public void jumpToCodePosition(CodePosition newPosition, StringLocated location) throws EaterExceptionLocated; + public void jumpToCodePosition(CodePosition newPosition, StringLocated location) throws EaterException; } diff --git a/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorAffectation.java b/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorAffectation.java index bb341c11e..8bd3a2b4f 100644 --- a/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorAffectation.java +++ b/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorAffectation.java @@ -40,7 +40,7 @@ import net.sourceforge.plantuml.json.ParseException; import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.text.TLineType; import net.sourceforge.plantuml.tim.EaterAffectation; -import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TMemory; @@ -58,7 +58,7 @@ public class CodeIteratorAffectation extends AbstractCodeIterator { } @Override - public StringLocated peek() throws EaterExceptionLocated { + public StringLocated peek() throws EaterException { while (true) { final StringLocated result = source.peek(); if (result == null) { @@ -74,7 +74,7 @@ public class CodeIteratorAffectation extends AbstractCodeIterator { } } - private void doAffectation(StringLocated result) throws EaterExceptionLocated { + private void doAffectation(StringLocated result) throws EaterException { int lastLocation = -1; for (int i = 0; i < 9999; i++) try { @@ -82,7 +82,7 @@ public class CodeIteratorAffectation extends AbstractCodeIterator { return; } catch (ParseException e) { if (e.getColumn() <= lastLocation) - throw EaterExceptionLocated.located("Error in JSON format", result); + throw new EaterException("Error in JSON format", result); lastLocation = e.getColumn(); next(); @@ -92,7 +92,7 @@ public class CodeIteratorAffectation extends AbstractCodeIterator { } private void executeAffectation(TContext context, TMemory memory, StringLocated s) - throws EaterExceptionLocated { + throws EaterException { new EaterAffectation(s).analyze(context, memory); } diff --git a/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorForeach.java b/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorForeach.java index d6cb73027..2ea2ef990 100644 --- a/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorForeach.java +++ b/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorForeach.java @@ -39,7 +39,7 @@ import java.util.List; import net.sourceforge.plantuml.json.JsonValue; import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.text.TLineType; -import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterForeach; import net.sourceforge.plantuml.tim.ExecutionContextForeach; import net.sourceforge.plantuml.tim.TContext; @@ -60,7 +60,7 @@ public class CodeIteratorForeach extends AbstractCodeIterator { this.logs = logs; } - public StringLocated peek() throws EaterExceptionLocated { + public StringLocated peek() throws EaterException { int level = 0; while (true) { final StringLocated result = source.peek(); @@ -90,7 +90,7 @@ public class CodeIteratorForeach extends AbstractCodeIterator { } else if (result.getType() == TLineType.ENDFOREACH) { logs.add(result); if (foreach == null) - throw EaterExceptionLocated.located("No foreach related to this endforeach", result); + throw new EaterException("No foreach related to this endforeach", result); foreach.inc(); if (foreach.isSkipMe()) { @@ -107,7 +107,7 @@ public class CodeIteratorForeach extends AbstractCodeIterator { } } - private void executeForeach(TMemory memory, StringLocated s) throws EaterExceptionLocated { + private void executeForeach(TMemory memory, StringLocated s) throws EaterException { final EaterForeach condition = new EaterForeach(s); condition.analyze(context, memory); final ExecutionContextForeach foreach = ExecutionContextForeach.fromValue(condition.getVarname(), @@ -121,7 +121,7 @@ public class CodeIteratorForeach extends AbstractCodeIterator { } private void setLoopVariable(TMemory memory, ExecutionContextForeach foreach, StringLocated position) - throws EaterExceptionLocated { + throws EaterException { final JsonValue first = foreach.getJsonArray().get(foreach.currentIndex()); memory.putVariable(foreach.getVarname(), TValue.fromJson(first), TVariableScope.GLOBAL, position); } diff --git a/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorIf.java b/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorIf.java index f36954d28..831726ecc 100644 --- a/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorIf.java +++ b/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorIf.java @@ -39,7 +39,7 @@ import java.util.List; import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.text.TLineType; import net.sourceforge.plantuml.tim.EaterElseIf; -import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterIf; import net.sourceforge.plantuml.tim.EaterIfdef; import net.sourceforge.plantuml.tim.EaterIfndef; @@ -60,7 +60,7 @@ public class CodeIteratorIf extends AbstractCodeIterator { this.logs = logs; } - public StringLocated peek() throws EaterExceptionLocated { + public StringLocated peek() throws EaterException { while (true) { final StringLocated result = source.peek(); if (result == null) { @@ -106,17 +106,17 @@ public class CodeIteratorIf extends AbstractCodeIterator { } } - private void executeIf(TContext context, TMemory memory, StringLocated s) throws EaterExceptionLocated { + private void executeIf(TContext context, TMemory memory, StringLocated s) throws EaterException { final EaterIf condition = new EaterIf(s); condition.analyze(context, memory); final boolean isTrue = condition.isTrue(); memory.addIf(ExecutionContextIf.fromValue(isTrue)); } - private void executeElseIf(TContext context, TMemory memory, StringLocated s) throws EaterExceptionLocated { + private void executeElseIf(TContext context, TMemory memory, StringLocated s) throws EaterException { final ExecutionContextIf poll = (ExecutionContextIf) memory.peekIf(); if (poll == null) - throw EaterExceptionLocated.located("No if related to this else", s); + throw new EaterException("No if related to this else", s); poll.enteringElseIf(); if (poll.hasBeenBurn() == false) { @@ -129,32 +129,32 @@ public class CodeIteratorIf extends AbstractCodeIterator { } } - private void executeIfdef(TContext context, TMemory memory, StringLocated s) throws EaterExceptionLocated { + private void executeIfdef(TContext context, TMemory memory, StringLocated s) throws EaterException { final EaterIfdef condition = new EaterIfdef(s); condition.analyze(context, memory); final boolean isTrue = condition.isTrue(context, memory); memory.addIf(ExecutionContextIf.fromValue(isTrue)); } - private void executeIfndef(TContext context, TMemory memory, StringLocated s) throws EaterExceptionLocated { + private void executeIfndef(TContext context, TMemory memory, StringLocated s) throws EaterException { final EaterIfndef condition = new EaterIfndef(s); condition.analyze(context, memory); final boolean isTrue = condition.isTrue(context, memory); memory.addIf(ExecutionContextIf.fromValue(isTrue)); } - private void executeElse(TContext context, TMemory memory, StringLocated s) throws EaterExceptionLocated { + private void executeElse(TContext context, TMemory memory, StringLocated s) throws EaterException { final ExecutionContextIf poll = (ExecutionContextIf) memory.peekIf(); if (poll == null) - throw EaterExceptionLocated.located("No if related to this else", s); + throw new EaterException("No if related to this else", s); poll.nowInElse(); } - private void executeEndif(TContext context, TMemory memory, StringLocated s) throws EaterExceptionLocated { + private void executeEndif(TContext context, TMemory memory, StringLocated s) throws EaterException { final ExecutionContextIf poll = (ExecutionContextIf) memory.pollIf(); if (poll == null) - throw EaterExceptionLocated.located("No if related to this endif", s); + throw new EaterException("No if related to this endif", s); } diff --git a/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorImpl.java b/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorImpl.java index c1bbd51a7..07dead5aa 100644 --- a/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorImpl.java +++ b/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorImpl.java @@ -37,7 +37,7 @@ package net.sourceforge.plantuml.tim.iterator; import java.util.List; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.EaterException; public class CodeIteratorImpl implements CodeIterator { @@ -89,10 +89,10 @@ public class CodeIteratorImpl implements CodeIterator { } @Override - public void jumpToCodePosition(CodePosition newPosition, StringLocated location) throws EaterExceptionLocated { + public void jumpToCodePosition(CodePosition newPosition, StringLocated location) throws EaterException { this.countJump++; if (this.countJump > 999) - throw EaterExceptionLocated.unlocated("Infinite loop?", location); + throw new EaterException("Infinite loop?", location); final Position pos = (Position) newPosition; this.current = pos.pos; diff --git a/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorInnerComment.java b/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorInnerComment.java index fe5a2d094..501bd9b4e 100644 --- a/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorInnerComment.java +++ b/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorInnerComment.java @@ -35,7 +35,7 @@ package net.sourceforge.plantuml.tim.iterator; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.EaterException; public class CodeIteratorInnerComment extends AbstractCodeIterator { @@ -43,7 +43,7 @@ public class CodeIteratorInnerComment extends AbstractCodeIterator { super(source); } - public StringLocated peek() throws EaterExceptionLocated { + public StringLocated peek() throws EaterException { final StringLocated result = source.peek(); if (result == null) { return null; diff --git a/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorLegacyDefine.java b/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorLegacyDefine.java index 13709df73..fb4a99f75 100644 --- a/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorLegacyDefine.java +++ b/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorLegacyDefine.java @@ -38,7 +38,7 @@ import java.util.List; import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.text.TLineType; -import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.FunctionsSet; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TMemory; @@ -60,7 +60,7 @@ public class CodeIteratorLegacyDefine extends AbstractCodeIterator { this.memory = memory; } - public StringLocated peek() throws EaterExceptionLocated { + public StringLocated peek() throws EaterException { while (true) { final StringLocated result = source.peek(); if (result == null) { diff --git a/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorLongComment.java b/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorLongComment.java index cc92cf384..656cf882d 100644 --- a/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorLongComment.java +++ b/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorLongComment.java @@ -38,7 +38,7 @@ import java.util.List; import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.text.TLineType; -import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.EaterException; public class CodeIteratorLongComment extends AbstractCodeIterator { @@ -49,7 +49,7 @@ public class CodeIteratorLongComment extends AbstractCodeIterator { this.logs = logs; } - public StringLocated peek() throws EaterExceptionLocated { + public StringLocated peek() throws EaterException { while (true) { if (source.peek() == null) { return null; diff --git a/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorProcedure.java b/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorProcedure.java index 1b4be2503..ba88da272 100644 --- a/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorProcedure.java +++ b/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorProcedure.java @@ -38,7 +38,7 @@ import java.util.List; import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.text.TLineType; -import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.FunctionsSet; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionType; @@ -61,7 +61,7 @@ public class CodeIteratorProcedure extends AbstractCodeIterator { this.memory = memory; } - public StringLocated peek() throws EaterExceptionLocated { + public StringLocated peek() throws EaterException { while (true) { final StringLocated result = source.peek(); if (result == null) { diff --git a/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorReturnFunction.java b/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorReturnFunction.java index 791abad71..b3c628fa1 100644 --- a/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorReturnFunction.java +++ b/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorReturnFunction.java @@ -38,7 +38,7 @@ import java.util.List; import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.text.TLineType; -import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.FunctionsSet; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionType; @@ -61,7 +61,7 @@ public class CodeIteratorReturnFunction extends AbstractCodeIterator { this.memory = memory; } - public StringLocated peek() throws EaterExceptionLocated { + public StringLocated peek() throws EaterException { while (true) { final StringLocated result = source.peek(); if (result == null) { @@ -73,9 +73,7 @@ public class CodeIteratorReturnFunction extends AbstractCodeIterator { logs.add(result); if (result.getType() == TLineType.END_FUNCTION) { if (functionsSet.pendingFunction().doesContainReturn() == false) { - throw EaterExceptionLocated.located( - "This function does not have any !return directive. Declare it as a procedure instead ?", - result); + throw new EaterException("This function does not have any !return directive. Declare it as a procedure instead ?", result); } functionsSet.executeEndfunction(); } else { diff --git a/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorShortComment.java b/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorShortComment.java index f57bcab66..0b36e2374 100644 --- a/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorShortComment.java +++ b/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorShortComment.java @@ -38,7 +38,7 @@ import java.util.List; import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.text.TLineType; -import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.EaterException; public class CodeIteratorShortComment extends AbstractCodeIterator { @@ -49,7 +49,7 @@ public class CodeIteratorShortComment extends AbstractCodeIterator { this.logs = logs; } - public StringLocated peek() throws EaterExceptionLocated { + public StringLocated peek() throws EaterException { while (true) { final StringLocated result = source.peek(); if (result == null) { diff --git a/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorSub.java b/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorSub.java index 1c28d1199..248f200f8 100644 --- a/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorSub.java +++ b/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorSub.java @@ -40,7 +40,7 @@ import java.util.Map; import net.sourceforge.plantuml.preproc.Sub; import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.text.TLineType; -import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterStartsub; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TMemory; @@ -65,7 +65,7 @@ public class CodeIteratorSub extends AbstractCodeIterator { return Collections.unmodifiableMap(subs); } - public StringLocated peek() throws EaterExceptionLocated { + public StringLocated peek() throws EaterException { if (readingInProgress != null) return readingInProgress.peek(); @@ -82,7 +82,7 @@ public class CodeIteratorSub extends AbstractCodeIterator { StringLocated s = null; while ((s = source.peek()) != null) { if (s.getType() == TLineType.STARTSUB) { - throw EaterExceptionLocated.located("Cannot nest sub", result); + throw new EaterException("Cannot nest sub", result); } else if (s.getType() == TLineType.ENDSUB) { source.next(); readingInProgress = new CodeIteratorImpl(created.lines()); @@ -100,7 +100,7 @@ public class CodeIteratorSub extends AbstractCodeIterator { } @Override - public void next() throws EaterExceptionLocated { + public void next() throws EaterException { if (readingInProgress == null) { source.next(); return; diff --git a/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorWhile.java b/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorWhile.java index db912021e..68679b1d3 100644 --- a/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorWhile.java +++ b/src/net/sourceforge/plantuml/tim/iterator/CodeIteratorWhile.java @@ -38,7 +38,7 @@ import java.util.List; import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.text.TLineType; -import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.EaterWhile; import net.sourceforge.plantuml.tim.ExecutionContextWhile; import net.sourceforge.plantuml.tim.TContext; @@ -59,7 +59,7 @@ public class CodeIteratorWhile extends AbstractCodeIterator { this.logs = logs; } - public StringLocated peek() throws EaterExceptionLocated { + public StringLocated peek() throws EaterException { int level = 0; while (true) { final StringLocated result = source.peek(); @@ -89,7 +89,7 @@ public class CodeIteratorWhile extends AbstractCodeIterator { } else if (result.getType() == TLineType.ENDWHILE) { logs.add(result); if (currentWhile == null) - throw EaterExceptionLocated.located("No while related to this endwhile", result); + throw new EaterException("No while related to this endwhile", result); final TValue value = currentWhile.conditionValue(result, context, memory); if (value.toBoolean()) @@ -105,7 +105,7 @@ public class CodeIteratorWhile extends AbstractCodeIterator { } } - private void executeWhile(TMemory memory, StringLocated s) throws EaterExceptionLocated { + private void executeWhile(TMemory memory, StringLocated s) throws EaterException { final EaterWhile condition = new EaterWhile(s); condition.analyze(context, memory); final TokenStack whileExpression = condition.getWhileExpression(); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/AlwaysFalse.java b/src/net/sourceforge/plantuml/tim/stdlib/AlwaysFalse.java index 5991d486e..29b116da7 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/AlwaysFalse.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/AlwaysFalse.java @@ -39,7 +39,7 @@ import java.util.Map; import java.util.Set; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; @@ -58,7 +58,7 @@ public class AlwaysFalse extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterExceptionLocated { + Map named) throws EaterException { return TValue.fromBoolean(false); } } diff --git a/src/net/sourceforge/plantuml/tim/stdlib/AlwaysTrue.java b/src/net/sourceforge/plantuml/tim/stdlib/AlwaysTrue.java index d9cf561e0..e59c5e0f6 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/AlwaysTrue.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/AlwaysTrue.java @@ -39,7 +39,7 @@ import java.util.Map; import java.util.Set; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; @@ -58,7 +58,7 @@ public class AlwaysTrue extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterExceptionLocated { + Map named) throws EaterException { return TValue.fromBoolean(true); } } diff --git a/src/net/sourceforge/plantuml/tim/stdlib/CallUserFunction.java b/src/net/sourceforge/plantuml/tim/stdlib/CallUserFunction.java index 6268cf54e..36bbdf7c1 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/CallUserFunction.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/CallUserFunction.java @@ -39,7 +39,7 @@ import java.util.Map; import java.util.Set; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunction; import net.sourceforge.plantuml.tim.TFunctionSignature; @@ -59,13 +59,13 @@ public class CallUserFunction extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterExceptionLocated { + Map named) throws EaterException { final String fname = values.get(0).toString(); final List args = values.subList(1, values.size()); final TFunctionSignature signature = new TFunctionSignature(fname, args.size()); final TFunction func = context.getFunctionSmart(signature); if (func == null) - throw EaterExceptionLocated.unlocated("Cannot find void function " + fname, location); + throw new EaterException("Cannot find void function " + fname, location); return func.executeReturnFunction(context, memory, location, args, named); } diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Chr.java b/src/net/sourceforge/plantuml/tim/stdlib/Chr.java index 3dcbfc7d9..fb55e335a 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Chr.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/Chr.java @@ -39,7 +39,7 @@ import java.util.Map; import java.util.Set; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; @@ -58,7 +58,7 @@ public class Chr extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterExceptionLocated { + Map named) throws EaterException { try { final String value = String.valueOf(Character.toChars(values.get(0).toInt())); return TValue.fromString(value); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Darken.java b/src/net/sourceforge/plantuml/tim/stdlib/Darken.java index bef84da7d..924f24be1 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Darken.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/Darken.java @@ -42,7 +42,7 @@ import net.sourceforge.plantuml.klimt.color.HColor; import net.sourceforge.plantuml.klimt.color.HColorSet; import net.sourceforge.plantuml.klimt.color.NoSuchColorException; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; @@ -62,7 +62,7 @@ public class Darken extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterExceptionLocated { + Map named) throws EaterException { final String colorString = values.get(0).toString(); final int ratio = values.get(1).toInt(); try { @@ -70,7 +70,7 @@ public class Darken extends SimpleReturnFunction { color = color.darken(ratio); return TValue.fromString(color.asString()); } catch (NoSuchColorException e) { - throw EaterExceptionLocated.located("No such color", location); + throw new EaterException("No such color", location); } } } diff --git a/src/net/sourceforge/plantuml/tim/stdlib/DateFunction.java b/src/net/sourceforge/plantuml/tim/stdlib/DateFunction.java index 1b77104eb..6f8efa2ea 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/DateFunction.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/DateFunction.java @@ -41,7 +41,7 @@ import java.util.Map; import java.util.Set; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; @@ -60,7 +60,7 @@ public class DateFunction extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterExceptionLocated { + Map named) throws EaterException { if (values.size() == 0) return TValue.fromString(new Date().toString()); @@ -74,7 +74,7 @@ public class DateFunction extends SimpleReturnFunction { try { return TValue.fromString(new SimpleDateFormat(format).format(now)); } catch (Exception e) { - throw EaterExceptionLocated.unlocated("Bad date pattern", location); + throw new EaterException("Bad date pattern", location); } } } diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Dec2hex.java b/src/net/sourceforge/plantuml/tim/stdlib/Dec2hex.java index b274f3a7c..9bbc29e4c 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Dec2hex.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/Dec2hex.java @@ -39,7 +39,7 @@ import java.util.Map; import java.util.Set; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; @@ -58,7 +58,7 @@ public class Dec2hex extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterExceptionLocated { + Map named) throws EaterException { try { return TValue.fromString("" + Integer.toHexString(values.get(0).toInt())); } catch (Throwable t) { diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Dirpath.java b/src/net/sourceforge/plantuml/tim/stdlib/Dirpath.java index 0eef6ddb9..ef08879cc 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Dirpath.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/Dirpath.java @@ -40,7 +40,7 @@ import java.util.Set; import net.sourceforge.plantuml.preproc.Defines; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; @@ -65,7 +65,7 @@ public class Dirpath extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterExceptionLocated { + Map named) throws EaterException { if (value == null) return TValue.fromString(""); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Eval.java b/src/net/sourceforge/plantuml/tim/stdlib/Eval.java index b08d6b263..311404c17 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Eval.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/Eval.java @@ -39,7 +39,7 @@ import java.util.Map; import java.util.Set; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.StringEater; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; @@ -59,7 +59,7 @@ public class Eval extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterExceptionLocated { + Map named) throws EaterException { final String exp = values.get(0).toString(); final StringEater eater = new StringEater(exp); final TValue value = eater.eatExpression(context, memory); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Feature.java b/src/net/sourceforge/plantuml/tim/stdlib/Feature.java index 89ef049eb..0f789f30c 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Feature.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/Feature.java @@ -39,7 +39,7 @@ import java.util.Map; import java.util.Set; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; @@ -58,7 +58,7 @@ public class Feature extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterExceptionLocated { + Map named) throws EaterException { final String arg = values.get(0).toString(); if ("style".equalsIgnoreCase(arg)) return TValue.fromInt(1); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/FileExists.java b/src/net/sourceforge/plantuml/tim/stdlib/FileExists.java index bef8b2246..cee70de58 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/FileExists.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/FileExists.java @@ -40,7 +40,7 @@ import java.util.Set; import net.sourceforge.plantuml.security.SFile; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; @@ -59,7 +59,7 @@ public class FileExists extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterExceptionLocated { + Map named) throws EaterException { // ::comment when __CORE__ final String path = values.get(0).toString(); return TValue.fromBoolean(new SFile(path).exists()); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Filename.java b/src/net/sourceforge/plantuml/tim/stdlib/Filename.java index 812a0033e..9a4223d45 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Filename.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/Filename.java @@ -40,7 +40,7 @@ import java.util.Set; import net.sourceforge.plantuml.preproc.Defines; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; @@ -65,7 +65,7 @@ public class Filename extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterExceptionLocated { + Map named) throws EaterException { if (value == null) { return TValue.fromString(""); } diff --git a/src/net/sourceforge/plantuml/tim/stdlib/FunctionExists.java b/src/net/sourceforge/plantuml/tim/stdlib/FunctionExists.java index 1d72755cb..d2bd9d1b2 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/FunctionExists.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/FunctionExists.java @@ -39,7 +39,7 @@ import java.util.Map; import java.util.Set; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; @@ -59,7 +59,7 @@ public class FunctionExists extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterExceptionLocated { + Map named) throws EaterException { final String name = values.get(0).toString(); return TValue.fromBoolean(context.doesFunctionExist(name)); } diff --git a/src/net/sourceforge/plantuml/tim/stdlib/GetAllStdlib.java b/src/net/sourceforge/plantuml/tim/stdlib/GetAllStdlib.java index f03178410..d1b0bff9d 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/GetAllStdlib.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/GetAllStdlib.java @@ -45,7 +45,7 @@ import net.sourceforge.plantuml.json.JsonObject; import net.sourceforge.plantuml.log.Logme; import net.sourceforge.plantuml.preproc.Stdlib; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; @@ -64,7 +64,7 @@ public class GetAllStdlib extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterExceptionLocated { + Map named) throws EaterException { switch (values.size()) { case 0: @@ -99,7 +99,7 @@ public class GetAllStdlib extends SimpleReturnFunction { default: assert false; // Should not append because of canCover() - throw EaterExceptionLocated.located("Error on get_all_stdlib: Too many arguments", location); + throw new EaterException("Error on get_all_stdlib: Too many arguments", location); } } } diff --git a/src/net/sourceforge/plantuml/tim/stdlib/GetAllTheme.java b/src/net/sourceforge/plantuml/tim/stdlib/GetAllTheme.java index 9404e09d9..2512d26f1 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/GetAllTheme.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/GetAllTheme.java @@ -43,7 +43,7 @@ import net.sourceforge.plantuml.json.JsonArray; import net.sourceforge.plantuml.log.Logme; import net.sourceforge.plantuml.text.StringLocated; import net.sourceforge.plantuml.theme.ThemeUtils; -import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; @@ -62,7 +62,7 @@ public class GetAllTheme extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterExceptionLocated { + Map named) throws EaterException { final JsonArray result = new JsonArray(); try { for (String theme : ThemeUtils.getAllThemeNames()) { diff --git a/src/net/sourceforge/plantuml/tim/stdlib/GetJsonKey.java b/src/net/sourceforge/plantuml/tim/stdlib/GetJsonKey.java index 3067496d0..6e7df046c 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/GetJsonKey.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/GetJsonKey.java @@ -42,7 +42,7 @@ import net.sourceforge.plantuml.json.JsonArray; import net.sourceforge.plantuml.json.JsonObject; import net.sourceforge.plantuml.json.JsonValue; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; @@ -61,10 +61,10 @@ public class GetJsonKey extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterExceptionLocated { + Map named) throws EaterException { final TValue data = values.get(0); if (data.isJson() == false) - throw EaterExceptionLocated.unlocated("Not JSON data", location); + throw new EaterException("Not JSON data", location); final JsonValue json = data.toJson(); if (json.isObject()) { @@ -87,7 +87,7 @@ public class GetJsonKey extends SimpleReturnFunction { return TValue.fromJson(result); } - throw EaterExceptionLocated.unlocated("Bad JSON type", location); + throw new EaterException("Bad JSON type", location); } diff --git a/src/net/sourceforge/plantuml/tim/stdlib/GetJsonType.java b/src/net/sourceforge/plantuml/tim/stdlib/GetJsonType.java index b27b68f90..0c09b9e84 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/GetJsonType.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/GetJsonType.java @@ -40,7 +40,7 @@ import java.util.Set; import net.sourceforge.plantuml.json.JsonValue; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; @@ -59,7 +59,7 @@ public class GetJsonType extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterExceptionLocated { + Map named) throws EaterException { final TValue data = values.get(0); if (data.isString()) return TValue.fromString("string"); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/GetVariableValue.java b/src/net/sourceforge/plantuml/tim/stdlib/GetVariableValue.java index f7ffb4555..b99e3478a 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/GetVariableValue.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/GetVariableValue.java @@ -39,7 +39,7 @@ import java.util.Map; import java.util.Set; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; @@ -58,7 +58,7 @@ public class GetVariableValue extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterExceptionLocated { + Map named) throws EaterException { final String name = values.get(0).toString(); final TValue variable = memory.getVariable(name); if (variable == null) diff --git a/src/net/sourceforge/plantuml/tim/stdlib/GetVersion.java b/src/net/sourceforge/plantuml/tim/stdlib/GetVersion.java index b6d5e61c2..df0218cea 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/GetVersion.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/GetVersion.java @@ -39,7 +39,7 @@ import java.util.Map; import java.util.Set; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; @@ -59,7 +59,7 @@ public class GetVersion extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterExceptionLocated { + Map named) throws EaterException { return TValue.fromString(Version.versionString()); } } diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Getenv.java b/src/net/sourceforge/plantuml/tim/stdlib/Getenv.java index 28a10472f..4c93f23f5 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Getenv.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/Getenv.java @@ -40,7 +40,7 @@ import java.util.Set; import net.sourceforge.plantuml.security.SecurityUtils; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; @@ -59,7 +59,7 @@ public class Getenv extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterExceptionLocated { + Map named) throws EaterException { // ::comment when __CORE__ final String value = getenv(values.get(0).toString()); if (value == null) diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Hex2dec.java b/src/net/sourceforge/plantuml/tim/stdlib/Hex2dec.java index f7c45b0ef..964a6cfb0 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Hex2dec.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/Hex2dec.java @@ -39,7 +39,7 @@ import java.util.Map; import java.util.Set; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; @@ -58,7 +58,7 @@ public class Hex2dec extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterExceptionLocated { + Map named) throws EaterException { try { return TValue.fromInt(Integer.parseInt(values.get(0).toString(), 16)); } catch (Throwable t) { diff --git a/src/net/sourceforge/plantuml/tim/stdlib/HslColor.java b/src/net/sourceforge/plantuml/tim/stdlib/HslColor.java index 34496e629..2113908d2 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/HslColor.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/HslColor.java @@ -42,7 +42,7 @@ import java.util.Set; import net.sourceforge.plantuml.klimt.color.HColors; import net.sourceforge.plantuml.klimt.color.HSLColor; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; @@ -61,7 +61,7 @@ public class HslColor extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterExceptionLocated { + Map named) throws EaterException { final int h = values.get(0).toInt(); final int s = values.get(1).toInt(); final int l = values.get(2).toInt(); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/IntVal.java b/src/net/sourceforge/plantuml/tim/stdlib/IntVal.java index 2b54cc99b..bda216b4c 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/IntVal.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/IntVal.java @@ -39,7 +39,7 @@ import java.util.Map; import java.util.Set; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; @@ -59,7 +59,7 @@ public class IntVal extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterExceptionLocated { + Map named) throws EaterException { final String s = values.get(0).toString(); try { return TValue.fromInt(Integer.parseInt(s)); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/InvokeProcedure.java b/src/net/sourceforge/plantuml/tim/stdlib/InvokeProcedure.java index 6328e88f6..4eab28dde 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/InvokeProcedure.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/InvokeProcedure.java @@ -39,7 +39,7 @@ import java.util.Map; import java.util.Set; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunction; import net.sourceforge.plantuml.tim.TFunctionSignature; @@ -64,13 +64,13 @@ public class InvokeProcedure implements TFunction { @Override public void executeProcedureInternal(TContext context, TMemory memory, StringLocated location, List args, - Map named) throws EaterExceptionLocated { + Map named) throws EaterException { final String fname = args.get(0).toString(); final List sublist = args.subList(1, args.size()); final TFunctionSignature signature = new TFunctionSignature(fname, sublist.size()); final TFunction func = context.getFunctionSmart(signature); if (func == null) - throw EaterExceptionLocated.located("Cannot find void function " + fname, location); + throw new EaterException("Cannot find void function " + fname, location); func.executeProcedureInternal(context, memory, location, sublist, named); } diff --git a/src/net/sourceforge/plantuml/tim/stdlib/IsDark.java b/src/net/sourceforge/plantuml/tim/stdlib/IsDark.java index f481264d2..cf9449122 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/IsDark.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/IsDark.java @@ -42,7 +42,7 @@ import net.sourceforge.plantuml.klimt.color.HColor; import net.sourceforge.plantuml.klimt.color.HColorSet; import net.sourceforge.plantuml.klimt.color.NoSuchColorException; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; @@ -62,13 +62,13 @@ public class IsDark extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterExceptionLocated { + Map named) throws EaterException { final String colorString = values.get(0).toString(); try { final HColor color = HColorSet.instance().getColorLEGACY(colorString); return TValue.fromBoolean(color.isDark()); } catch (NoSuchColorException e) { - throw EaterExceptionLocated.located("No such color", location); + throw new EaterException("No such color", location); } } } diff --git a/src/net/sourceforge/plantuml/tim/stdlib/IsLight.java b/src/net/sourceforge/plantuml/tim/stdlib/IsLight.java index 1528ea8fe..b717e419a 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/IsLight.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/IsLight.java @@ -42,7 +42,7 @@ import net.sourceforge.plantuml.klimt.color.HColor; import net.sourceforge.plantuml.klimt.color.HColorSet; import net.sourceforge.plantuml.klimt.color.NoSuchColorException; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; @@ -62,13 +62,13 @@ public class IsLight extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterExceptionLocated { + Map named) throws EaterException { final String colorString = values.get(0).toString(); try { final HColor color = HColorSet.instance().getColorLEGACY(colorString); return TValue.fromBoolean(!color.isDark()); } catch (NoSuchColorException e) { - throw EaterExceptionLocated.located("No such color", location); + throw new EaterException("No such color", location); } } } diff --git a/src/net/sourceforge/plantuml/tim/stdlib/JsonKeyExists.java b/src/net/sourceforge/plantuml/tim/stdlib/JsonKeyExists.java index bc22ce9a7..35238cc5b 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/JsonKeyExists.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/JsonKeyExists.java @@ -41,7 +41,7 @@ import java.util.Set; import net.sourceforge.plantuml.json.JsonObject; import net.sourceforge.plantuml.json.JsonValue; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; @@ -60,7 +60,7 @@ public class JsonKeyExists extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterExceptionLocated { + Map named) throws EaterException { final TValue arg0 = values.get(0); if (arg0.isJson() == false) return TValue.fromBoolean(false); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Lighten.java b/src/net/sourceforge/plantuml/tim/stdlib/Lighten.java index 41d9a31d2..e309859b3 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Lighten.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/Lighten.java @@ -42,7 +42,7 @@ import net.sourceforge.plantuml.klimt.color.HColor; import net.sourceforge.plantuml.klimt.color.HColorSet; import net.sourceforge.plantuml.klimt.color.NoSuchColorException; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; @@ -62,7 +62,7 @@ public class Lighten extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterExceptionLocated { + Map named) throws EaterException { final String colorString = values.get(0).toString(); final int ratio = values.get(1).toInt(); try { @@ -70,7 +70,7 @@ public class Lighten extends SimpleReturnFunction { color = color.lighten(ratio); return TValue.fromString(color.asString()); } catch (NoSuchColorException e) { - throw EaterExceptionLocated.located("No such color", location); + throw new EaterException("No such color", location); } } } diff --git a/src/net/sourceforge/plantuml/tim/stdlib/LoadJson.java b/src/net/sourceforge/plantuml/tim/stdlib/LoadJson.java index 40e5746c6..5f8e30b00 100755 --- a/src/net/sourceforge/plantuml/tim/stdlib/LoadJson.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/LoadJson.java @@ -50,7 +50,7 @@ import net.sourceforge.plantuml.log.Logme; import net.sourceforge.plantuml.security.SFile; import net.sourceforge.plantuml.security.SURL; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; @@ -108,7 +108,7 @@ public class LoadJson extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterExceptionLocated { + Map named) throws EaterException { final String path = values.get(0).toString(); try { String data = loadStringData(path, getCharset(values)); @@ -119,12 +119,10 @@ public class LoadJson extends SimpleReturnFunction { return TValue.fromJson(jsonValue); } catch (ParseException pe) { Logme.error(pe); - throw EaterExceptionLocated - .unlocated("JSON parse issue in source " + path + " on location " + pe.getLocation(), location); + throw new EaterException("JSON parse issue in source " + path + " on location " + pe.getLocation(), location); } catch (UnsupportedEncodingException e) { Logme.error(e); - throw EaterExceptionLocated.unlocated("JSON encoding issue in source " + path + ": " + e.getMessage(), - location); + throw new EaterException("JSON encoding issue in source " + path + ": " + e.getMessage(), location); } } @@ -164,7 +162,7 @@ public class LoadJson extends SimpleReturnFunction { * @throws EaterException if something went wrong on reading data */ private String loadStringData(String path, String charset) - throws EaterExceptionLocated, UnsupportedEncodingException { + throws EaterException, UnsupportedEncodingException { byte[] byteData = null; if (path.startsWith("http://") || path.startsWith("https://")) { diff --git a/src/net/sourceforge/plantuml/tim/stdlib/LogicalAnd.java b/src/net/sourceforge/plantuml/tim/stdlib/LogicalAnd.java index 1bea47ee2..ede165c22 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/LogicalAnd.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/LogicalAnd.java @@ -39,7 +39,7 @@ import java.util.Map; import java.util.Set; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; @@ -58,7 +58,7 @@ public class LogicalAnd extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterExceptionLocated { + Map named) throws EaterException { for (TValue v : values) if (v.toBoolean() == false) return TValue.fromBoolean(false); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/LogicalNand.java b/src/net/sourceforge/plantuml/tim/stdlib/LogicalNand.java index 52345b792..0740118e5 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/LogicalNand.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/LogicalNand.java @@ -39,7 +39,7 @@ import java.util.Map; import java.util.Set; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; @@ -58,7 +58,7 @@ public class LogicalNand extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterExceptionLocated { + Map named) throws EaterException { for (TValue v : values) if (v.toBoolean() == false) return TValue.fromBoolean(!false); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/LogicalNor.java b/src/net/sourceforge/plantuml/tim/stdlib/LogicalNor.java index fe59542cf..d0fcb1e14 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/LogicalNor.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/LogicalNor.java @@ -39,7 +39,7 @@ import java.util.Map; import java.util.Set; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; @@ -58,7 +58,7 @@ public class LogicalNor extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterExceptionLocated { + Map named) throws EaterException { for (TValue v : values) if (v.toBoolean() == true) return TValue.fromBoolean(!true); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/LogicalNot.java b/src/net/sourceforge/plantuml/tim/stdlib/LogicalNot.java index 0dbd650f5..071620862 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/LogicalNot.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/LogicalNot.java @@ -39,7 +39,7 @@ import java.util.Map; import java.util.Set; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; @@ -58,7 +58,7 @@ public class LogicalNot extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterExceptionLocated { + Map named) throws EaterException { final boolean arg = values.get(0).toBoolean(); return TValue.fromBoolean(!arg); } diff --git a/src/net/sourceforge/plantuml/tim/stdlib/LogicalNxor.java b/src/net/sourceforge/plantuml/tim/stdlib/LogicalNxor.java index 3abd60263..8403263c7 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/LogicalNxor.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/LogicalNxor.java @@ -39,7 +39,7 @@ import java.util.Map; import java.util.Set; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; @@ -58,7 +58,7 @@ public class LogicalNxor extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterExceptionLocated { + Map named) throws EaterException { int cpt = 0; for (TValue v : values) if (v.toBoolean() == true) diff --git a/src/net/sourceforge/plantuml/tim/stdlib/LogicalOr.java b/src/net/sourceforge/plantuml/tim/stdlib/LogicalOr.java index 0d2e5ded2..de58b384a 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/LogicalOr.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/LogicalOr.java @@ -39,7 +39,7 @@ import java.util.Map; import java.util.Set; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; @@ -58,7 +58,7 @@ public class LogicalOr extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterExceptionLocated { + Map named) throws EaterException { for (TValue v : values) if (v.toBoolean() == true) return TValue.fromBoolean(true); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/LogicalXor.java b/src/net/sourceforge/plantuml/tim/stdlib/LogicalXor.java index 9b9a66cbb..3a5e24eab 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/LogicalXor.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/LogicalXor.java @@ -39,7 +39,7 @@ import java.util.Map; import java.util.Set; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; @@ -58,7 +58,7 @@ public class LogicalXor extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterExceptionLocated { + Map named) throws EaterException { int cpt = 0; for (TValue v : values) if (v.toBoolean() == true) diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Now.java b/src/net/sourceforge/plantuml/tim/stdlib/Now.java index f24f75093..de2c7bb71 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Now.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/Now.java @@ -39,7 +39,7 @@ import java.util.Map; import java.util.Set; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; @@ -58,7 +58,7 @@ public class Now extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterExceptionLocated { + Map named) throws EaterException { final long now = System.currentTimeMillis() / 1000L; return TValue.fromInt((int) now); } diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Ord.java b/src/net/sourceforge/plantuml/tim/stdlib/Ord.java index 1c509686a..9b1c87d5d 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Ord.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/Ord.java @@ -39,7 +39,7 @@ import java.util.Map; import java.util.Set; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; @@ -58,7 +58,7 @@ public class Ord extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterExceptionLocated { + Map named) throws EaterException { try { final int codePoint = values.get(0).toString().codePointAt(0); return TValue.fromInt(codePoint); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/RandomFunction.java b/src/net/sourceforge/plantuml/tim/stdlib/RandomFunction.java index f2c8c885f..1b4de5ac9 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/RandomFunction.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/RandomFunction.java @@ -40,7 +40,7 @@ import java.util.Random; import java.util.Set; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; @@ -61,7 +61,7 @@ public class RandomFunction extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterExceptionLocated { + Map named) throws EaterException { switch (values.size()) { case 0: return TValue.fromInt(random.nextInt(2)); @@ -77,7 +77,7 @@ public class RandomFunction extends SimpleReturnFunction { default: assert false; // Should not append because of canCover() - throw EaterExceptionLocated.located("Error on Random: Too many argument", location); + throw new EaterException("Error on Random: Too many argument", location); } } } diff --git a/src/net/sourceforge/plantuml/tim/stdlib/RetrieveProcedure.java b/src/net/sourceforge/plantuml/tim/stdlib/RetrieveProcedure.java index 5e5590ddf..a9b51e5f3 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/RetrieveProcedure.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/RetrieveProcedure.java @@ -40,7 +40,7 @@ import java.util.Map; import java.util.Set; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunction; import net.sourceforge.plantuml.tim.TFunctionSignature; @@ -60,7 +60,7 @@ public class RetrieveProcedure extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterExceptionLocated { + Map named) throws EaterException { final String fname = values.get(0).toString(); final List args = values.subList(1, values.size()); final TFunctionSignature signature = new TFunctionSignature(fname, args.size()); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/ReverseColor.java b/src/net/sourceforge/plantuml/tim/stdlib/ReverseColor.java index e19fe4a30..a46c9695f 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/ReverseColor.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/ReverseColor.java @@ -42,7 +42,7 @@ import net.sourceforge.plantuml.klimt.color.HColor; import net.sourceforge.plantuml.klimt.color.HColorSet; import net.sourceforge.plantuml.klimt.color.NoSuchColorException; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; @@ -61,14 +61,14 @@ public class ReverseColor extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterExceptionLocated { + Map named) throws EaterException { final String colorString = values.get(0).toString(); try { HColor color = HColorSet.instance().getColorLEGACY(colorString); color = color.reverse(); return TValue.fromString(color.asString()); } catch (NoSuchColorException e) { - throw EaterExceptionLocated.located("No such color", location); + throw new EaterException("No such color", location); } } } diff --git a/src/net/sourceforge/plantuml/tim/stdlib/ReverseHsluvColor.java b/src/net/sourceforge/plantuml/tim/stdlib/ReverseHsluvColor.java index 75a60e8ac..8fd8422e3 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/ReverseHsluvColor.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/ReverseHsluvColor.java @@ -42,7 +42,7 @@ import net.sourceforge.plantuml.klimt.color.HColor; import net.sourceforge.plantuml.klimt.color.HColorSet; import net.sourceforge.plantuml.klimt.color.NoSuchColorException; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; @@ -61,14 +61,14 @@ public class ReverseHsluvColor extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterExceptionLocated { + Map named) throws EaterException { final String colorString = values.get(0).toString(); try { HColor color = HColorSet.instance().getColorLEGACY(colorString); color = color.reverseHsluv(); return TValue.fromString(color.asString()); } catch (NoSuchColorException e) { - throw EaterExceptionLocated.located("No such color", location); + throw new EaterException("No such color", location); } } } diff --git a/src/net/sourceforge/plantuml/tim/stdlib/SetVariableValue.java b/src/net/sourceforge/plantuml/tim/stdlib/SetVariableValue.java index fcc12260c..631037c45 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/SetVariableValue.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/SetVariableValue.java @@ -39,7 +39,7 @@ import java.util.Map; import java.util.Set; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; @@ -59,7 +59,7 @@ public class SetVariableValue extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterExceptionLocated { + Map named) throws EaterException { // if (memory instanceof TMemoryLocal) { // memory = ((TMemoryLocal) memory).getGlobalForInternalUseOnly(); // } diff --git a/src/net/sourceforge/plantuml/tim/stdlib/SimpleReturnFunction.java b/src/net/sourceforge/plantuml/tim/stdlib/SimpleReturnFunction.java index 5276d495e..c649a86a4 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/SimpleReturnFunction.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/SimpleReturnFunction.java @@ -38,7 +38,7 @@ import java.util.List; import java.util.Map; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunction; import net.sourceforge.plantuml.tim.TFunctionType; @@ -53,7 +53,7 @@ public abstract class SimpleReturnFunction implements TFunction { @Override final public void executeProcedureInternal(TContext context, TMemory memory, StringLocated location, - List args, Map named) throws EaterExceptionLocated { + List args, Map named) throws EaterException { throw new UnsupportedOperationException(); } diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Size.java b/src/net/sourceforge/plantuml/tim/stdlib/Size.java index 82a72c5ab..b2e176504 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Size.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/Size.java @@ -42,7 +42,7 @@ import net.sourceforge.plantuml.json.JsonArray; import net.sourceforge.plantuml.json.JsonObject; import net.sourceforge.plantuml.json.JsonValue; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; @@ -61,7 +61,7 @@ public class Size extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterExceptionLocated { + Map named) throws EaterException { final TValue value = values.get(0); if (value.isNumber()) return TValue.fromInt(0); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/SplitStr.java b/src/net/sourceforge/plantuml/tim/stdlib/SplitStr.java index f3e17784a..536ee9ba0 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/SplitStr.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/SplitStr.java @@ -41,7 +41,7 @@ import java.util.StringTokenizer; import net.sourceforge.plantuml.json.JsonArray; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; @@ -60,7 +60,7 @@ public class SplitStr extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterExceptionLocated { + Map named) throws EaterException { final JsonArray result = new JsonArray(); final String str = values.get(0).toString(); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Strlen.java b/src/net/sourceforge/plantuml/tim/stdlib/Strlen.java index f97aad0de..2a91bd05d 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Strlen.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/Strlen.java @@ -39,7 +39,7 @@ import java.util.Map; import java.util.Set; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; @@ -58,7 +58,7 @@ public class Strlen extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterExceptionLocated { + Map named) throws EaterException { return TValue.fromInt(values.get(0).toString().length()); } } diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Strpos.java b/src/net/sourceforge/plantuml/tim/stdlib/Strpos.java index b27796e0e..2f7c32c7c 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Strpos.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/Strpos.java @@ -39,7 +39,7 @@ import java.util.Map; import java.util.Set; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; @@ -58,7 +58,7 @@ public class Strpos extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterExceptionLocated { + Map named) throws EaterException { final String full = values.get(0).toString(); final String searched = values.get(1).toString(); return TValue.fromInt(full.indexOf(searched)); diff --git a/src/net/sourceforge/plantuml/tim/stdlib/Substr.java b/src/net/sourceforge/plantuml/tim/stdlib/Substr.java index 7f06da48f..76e7751f9 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/Substr.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/Substr.java @@ -39,7 +39,7 @@ import java.util.Map; import java.util.Set; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; @@ -58,7 +58,7 @@ public class Substr extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterExceptionLocated { + Map named) throws EaterException { final String full = values.get(0).toString(); final int pos = values.get(1).toInt(); if (pos >= full.length()) diff --git a/src/net/sourceforge/plantuml/tim/stdlib/VariableExists.java b/src/net/sourceforge/plantuml/tim/stdlib/VariableExists.java index 2e024b025..db3c39f1b 100644 --- a/src/net/sourceforge/plantuml/tim/stdlib/VariableExists.java +++ b/src/net/sourceforge/plantuml/tim/stdlib/VariableExists.java @@ -39,7 +39,7 @@ import java.util.Map; import java.util.Set; import net.sourceforge.plantuml.text.StringLocated; -import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.TContext; import net.sourceforge.plantuml.tim.TFunctionSignature; import net.sourceforge.plantuml.tim.TMemory; @@ -58,7 +58,7 @@ public class VariableExists extends SimpleReturnFunction { @Override public TValue executeReturnFunction(TContext context, TMemory memory, StringLocated location, List values, - Map named) throws EaterExceptionLocated { + Map named) throws EaterException { final String name = values.get(0).toString(); return TValue.fromBoolean(memory.getVariable(name) != null); } diff --git a/src/net/sourceforge/plantuml/version/Version.java b/src/net/sourceforge/plantuml/version/Version.java index fd32fba24..61bcf7971 100644 --- a/src/net/sourceforge/plantuml/version/Version.java +++ b/src/net/sourceforge/plantuml/version/Version.java @@ -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.2024.4beta4"; + private static final String version = "1.2024.4beta5"; public static String versionString() { return version; diff --git a/test/net/sourceforge/plantuml/tim/TimTestUtils.java b/test/net/sourceforge/plantuml/tim/TimTestUtils.java index 724e227be..c71b7d8a3 100644 --- a/test/net/sourceforge/plantuml/tim/TimTestUtils.java +++ b/test/net/sourceforge/plantuml/tim/TimTestUtils.java @@ -14,27 +14,27 @@ import net.sourceforge.plantuml.json.JsonValue; public class TimTestUtils { // Tfunc: () -> (String) - public static void assertTimExpectedOutput(TFunction func, String expected) throws EaterExceptionLocated { + public static void assertTimExpectedOutput(TFunction func, String expected) throws EaterException { TValue tValue = func.executeReturnFunction(null, null, null, null, null); assertEquals(expected, tValue.toString()); } // Tfunc: (Integer) -> (String) - public static void assertTimExpectedOutputFromInput(TFunction func, Integer input, String expected) throws EaterExceptionLocated { + public static void assertTimExpectedOutputFromInput(TFunction func, Integer input, String expected) throws EaterException { List values = Collections.singletonList(TValue.fromInt(input)); TValue tValue = func.executeReturnFunction(null, null, null, values, null); assertEquals(expected, tValue.toString()); } // Tfunc: (String) -> (String) - public static void assertTimExpectedOutputFromInput(TFunction func, String input, String expected) throws EaterExceptionLocated { + public static void assertTimExpectedOutputFromInput(TFunction func, String input, String expected) throws EaterException { List values = Collections.singletonList(TValue.fromString(input)); TValue tValue = func.executeReturnFunction(null, null, null, values, null); assertEquals(expected, tValue.toString()); } // Tfunc: (JsonValue) -> (String) - public static void assertTimExpectedOutputFromInput(TFunction func, JsonValue input, String expected) throws EaterExceptionLocated { + public static void assertTimExpectedOutputFromInput(TFunction func, JsonValue input, String expected) throws EaterException { List values = Collections.singletonList(TValue.fromJson(input)); TValue tValue = func.executeReturnFunction(null, null, null, values, null); assertEquals(expected, tValue.toString()); diff --git a/test/net/sourceforge/plantuml/tim/stdlib/AlwaysFalseTest.java b/test/net/sourceforge/plantuml/tim/stdlib/AlwaysFalseTest.java index 595781c47..1ff9e68ff 100644 --- a/test/net/sourceforge/plantuml/tim/stdlib/AlwaysFalseTest.java +++ b/test/net/sourceforge/plantuml/tim/stdlib/AlwaysFalseTest.java @@ -9,7 +9,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.CsvSource; -import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.TFunction; /** @@ -22,7 +22,7 @@ class AlwaysFalseTest { final String cutName = "AlwaysFalse"; @Test - void Test_without_Param() throws EaterExceptionLocated { + void Test_without_Param() throws EaterException { assertTimExpectedOutput(cut, "0"); } @@ -32,7 +32,7 @@ class AlwaysFalseTest { " 1 , 0 ", " 'a' , 0 ", }) - void Test_with_String(String input, String expected) throws EaterExceptionLocated { + void Test_with_String(String input, String expected) throws EaterException { assertTimExpectedOutputFromInput(cut, input, expected); } @@ -42,7 +42,7 @@ class AlwaysFalseTest { " 1 , 0 ", " 123 , 0 ", }) - void Test_with_Integer(Integer input, String expected) throws EaterExceptionLocated { + void Test_with_Integer(Integer input, String expected) throws EaterException { assertTimExpectedOutputFromInput(cut, input, expected); } } diff --git a/test/net/sourceforge/plantuml/tim/stdlib/AlwaysTrueTest.java b/test/net/sourceforge/plantuml/tim/stdlib/AlwaysTrueTest.java index cb9de4910..d1e910b84 100644 --- a/test/net/sourceforge/plantuml/tim/stdlib/AlwaysTrueTest.java +++ b/test/net/sourceforge/plantuml/tim/stdlib/AlwaysTrueTest.java @@ -9,7 +9,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.CsvSource; -import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.TFunction; /** @@ -22,7 +22,7 @@ class AlwaysTrueTest { final String cutName = "AlwaysTrue"; @Test - void Test_without_Param() throws EaterExceptionLocated { + void Test_without_Param() throws EaterException { assertTimExpectedOutput(cut, "1"); } @@ -32,7 +32,7 @@ class AlwaysTrueTest { " 1 , 1 ", " 'a' , 1 ", }) - void Test_with_String(String input, String expected) throws EaterExceptionLocated { + void Test_with_String(String input, String expected) throws EaterException { assertTimExpectedOutputFromInput(cut, input, expected); } @@ -42,7 +42,7 @@ class AlwaysTrueTest { " 1 , 1 ", " 123 , 1 ", }) - void Test_with_Integer(Integer input, String expected) throws EaterExceptionLocated { + void Test_with_Integer(Integer input, String expected) throws EaterException { assertTimExpectedOutputFromInput(cut, input, expected); } } diff --git a/test/net/sourceforge/plantuml/tim/stdlib/ChrTest.java b/test/net/sourceforge/plantuml/tim/stdlib/ChrTest.java index 0294507fc..58cba9f04 100644 --- a/test/net/sourceforge/plantuml/tim/stdlib/ChrTest.java +++ b/test/net/sourceforge/plantuml/tim/stdlib/ChrTest.java @@ -7,7 +7,7 @@ import org.junit.jupiter.api.IndicativeSentencesGeneration; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.CsvSource; -import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.TFunction; /** @@ -22,7 +22,6 @@ class ChrTest { * Tests chr according to a list of input / expected output * * @throws EaterException should not - * @throws EaterExceptionLocated should not */ @ParameterizedTest(name = "[{index}] " + cutName + "({0}) = ''{1}''") @CsvSource(nullValues = "null", value = { @@ -37,7 +36,7 @@ class ChrTest { " 128512 , 😀 ", " 128512 , \uD83D\uDE00 ", }) - void Test_with_Integer(Integer input, String expected) throws EaterExceptionLocated { + void Test_with_Integer(Integer input, String expected) throws EaterException { assertTimExpectedOutputFromInput(cut, input, expected); } } \ No newline at end of file diff --git a/test/net/sourceforge/plantuml/tim/stdlib/Dec2hexTest.java b/test/net/sourceforge/plantuml/tim/stdlib/Dec2hexTest.java index 1603adbe6..ff05ebff7 100644 --- a/test/net/sourceforge/plantuml/tim/stdlib/Dec2hexTest.java +++ b/test/net/sourceforge/plantuml/tim/stdlib/Dec2hexTest.java @@ -9,7 +9,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.CsvSource; -import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.TFunction; /** @@ -22,7 +22,7 @@ class Dec2hexTest { final String cutName = "Dec2hex"; @Test - void Test_without_Param() throws EaterExceptionLocated { + void Test_without_Param() throws EaterException { assertTimExpectedOutput(cut, ""); } @@ -36,7 +36,7 @@ class Dec2hexTest { " 255 , 0 ", " 65535 , 0 ", }) - void Test_with_String(String input, String expected) throws EaterExceptionLocated { + void Test_with_String(String input, String expected) throws EaterException { assertTimExpectedOutputFromInput(cut, input, expected); } @@ -50,7 +50,7 @@ class Dec2hexTest { " 255 , ff ", " 65535 , ffff ", }) - void Test_with_Integer(Integer input, String expected) throws EaterExceptionLocated { + void Test_with_Integer(Integer input, String expected) throws EaterException { assertTimExpectedOutputFromInput(cut, input, expected); } } diff --git a/test/net/sourceforge/plantuml/tim/stdlib/FeatureTest.java b/test/net/sourceforge/plantuml/tim/stdlib/FeatureTest.java index f8a8603aa..d5ea79e3f 100644 --- a/test/net/sourceforge/plantuml/tim/stdlib/FeatureTest.java +++ b/test/net/sourceforge/plantuml/tim/stdlib/FeatureTest.java @@ -12,7 +12,7 @@ import org.junit.jupiter.params.converter.ConvertWith; import org.junit.jupiter.params.provider.CsvSource; import net.sourceforge.plantuml.json.JsonValue; -import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.TFunction; import test.utils.JunitUtils.StringJsonConverter; @@ -27,7 +27,7 @@ class FeatureTest { @Disabled @Test - void Test_without_Param() throws EaterExceptionLocated { + void Test_without_Param() throws EaterException { assertTimExpectedOutput(cut, "0"); } @@ -42,7 +42,7 @@ class FeatureTest { " abc , 0", }) - void Test_with_String(String input, String expected) throws EaterExceptionLocated { + void Test_with_String(String input, String expected) throws EaterException { assertTimExpectedOutputFromInput(cut, input, expected); } @@ -51,7 +51,7 @@ class FeatureTest { " 0, 0", " 10, 0", }) - void Test_with_Integer(Integer input, String expected) throws EaterExceptionLocated { + void Test_with_Integer(Integer input, String expected) throws EaterException { assertTimExpectedOutputFromInput(cut, input, expected); } @@ -61,7 +61,7 @@ class FeatureTest { " \"theme\", 1", " 0, 0", }) - void Test_with_Json(@ConvertWith(StringJsonConverter.class) JsonValue input, String expected) throws EaterExceptionLocated { + void Test_with_Json(@ConvertWith(StringJsonConverter.class) JsonValue input, String expected) throws EaterException { assertTimExpectedOutputFromInput(cut, input, expected); } } diff --git a/test/net/sourceforge/plantuml/tim/stdlib/GetAllStdlibTest.java b/test/net/sourceforge/plantuml/tim/stdlib/GetAllStdlibTest.java index 16e3f8eed..e22ebbc20 100644 --- a/test/net/sourceforge/plantuml/tim/stdlib/GetAllStdlibTest.java +++ b/test/net/sourceforge/plantuml/tim/stdlib/GetAllStdlibTest.java @@ -10,7 +10,7 @@ import org.junit.jupiter.api.DisplayNameGenerator.ReplaceUnderscores; import org.junit.jupiter.api.IndicativeSentencesGeneration; import org.junit.jupiter.api.Test; -import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.TFunction; import net.sourceforge.plantuml.tim.expression.TValue; @@ -24,14 +24,14 @@ class GetAllStdlibTest { final String cutName = "GetAllStdlib"; @Test - void Test_without_Param() throws EaterExceptionLocated { + void Test_without_Param() throws EaterException { final List empty = new ArrayList<>(); final TValue tValue = cut.executeReturnFunction(null, null, null, empty, null); assertThat(tValue.toString()).contains("archimate", "aws", "tupadr3"); } @Test - void Test_with_one_argument() throws EaterExceptionLocated { + void Test_with_one_argument() throws EaterException { final TValue tValue = cut.executeReturnFunction(null, null, null, Arrays.asList(TValue.fromInt(0)), null); assertThat(tValue.toString()).contains("archimate", "https://github.com/plantuml-stdlib/Archimate-PlantUML"); } diff --git a/test/net/sourceforge/plantuml/tim/stdlib/GetAllThemeTest.java b/test/net/sourceforge/plantuml/tim/stdlib/GetAllThemeTest.java index 9201c2d99..0c6d65ae8 100644 --- a/test/net/sourceforge/plantuml/tim/stdlib/GetAllThemeTest.java +++ b/test/net/sourceforge/plantuml/tim/stdlib/GetAllThemeTest.java @@ -9,7 +9,7 @@ import org.junit.jupiter.api.DisplayNameGenerator.ReplaceUnderscores; import org.junit.jupiter.api.IndicativeSentencesGeneration; import org.junit.jupiter.api.Test; -import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.TFunction; import net.sourceforge.plantuml.tim.expression.TValue; @@ -23,7 +23,7 @@ class GetAllThemeTest { final String cutName = "GetAllTheme"; @Test - void Test_without_Param() throws EaterExceptionLocated { + void Test_without_Param() throws EaterException { final List empty = new ArrayList<>(); final TValue tValue = cut.executeReturnFunction(null, null, null, empty, null); assertThat(tValue.toString()).contains("_none_", "amiga", "vibrant"); diff --git a/test/net/sourceforge/plantuml/tim/stdlib/GetJsonKeyTest.java b/test/net/sourceforge/plantuml/tim/stdlib/GetJsonKeyTest.java index 2f19ed62e..269a3aaf3 100644 --- a/test/net/sourceforge/plantuml/tim/stdlib/GetJsonKeyTest.java +++ b/test/net/sourceforge/plantuml/tim/stdlib/GetJsonKeyTest.java @@ -12,7 +12,7 @@ import org.junit.jupiter.params.converter.ConvertWith; import org.junit.jupiter.params.provider.CsvSource; import net.sourceforge.plantuml.json.JsonValue; -import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.TFunction; import test.utils.JunitUtils.StringJsonConverter; @@ -27,7 +27,7 @@ class GetJsonKeyTest { @Disabled @Test - void Test_without_Param() throws EaterExceptionLocated { + void Test_without_Param() throws EaterException { assertTimExpectedOutput(cut, "0"); } @@ -38,7 +38,7 @@ class GetJsonKeyTest { " a, Not JSON data", " -1, Not JSON data", }) - void Test_with_String(String input, String expected) throws EaterExceptionLocated { + void Test_with_String(String input, String expected) throws EaterException { assertTimExpectedOutputFromInput(cut, input, expected); } @@ -48,7 +48,7 @@ class GetJsonKeyTest { " 0, Not JSON data", " -1, Not JSON data", }) - void Test_with_Integer(Integer input, String expected) throws EaterExceptionLocated { + void Test_with_Integer(Integer input, String expected) throws EaterException { assertTimExpectedOutputFromInput(cut, input, expected); } @@ -66,7 +66,7 @@ class GetJsonKeyTest { // - https://json-schema.org/understanding-json-schema/reference/array.html " '[3, \"different\", { \"types\" : \"of values\" }]', [\"types\"]", }) - void Test_with_Json(@ConvertWith(StringJsonConverter.class) JsonValue input, String expected) throws EaterExceptionLocated { + void Test_with_Json(@ConvertWith(StringJsonConverter.class) JsonValue input, String expected) throws EaterException { assertTimExpectedOutputFromInput(cut, input, expected); } } diff --git a/test/net/sourceforge/plantuml/tim/stdlib/GetJsonTypeTest.java b/test/net/sourceforge/plantuml/tim/stdlib/GetJsonTypeTest.java index 80f5b90eb..6422fd8de 100644 --- a/test/net/sourceforge/plantuml/tim/stdlib/GetJsonTypeTest.java +++ b/test/net/sourceforge/plantuml/tim/stdlib/GetJsonTypeTest.java @@ -12,7 +12,7 @@ import org.junit.jupiter.params.converter.ConvertWith; import org.junit.jupiter.params.provider.CsvSource; import net.sourceforge.plantuml.json.JsonValue; -import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.TFunction; import test.utils.JunitUtils.StringJsonConverter; @@ -27,7 +27,7 @@ class GetJsonTypeTest { @Disabled @Test - void Test_without_Param() throws EaterExceptionLocated { + void Test_without_Param() throws EaterException { assertTimExpectedOutput(cut, "0"); } @@ -37,7 +37,7 @@ class GetJsonTypeTest { " a, string", " -1, string", }) - void Test_with_String(String input, String expected) throws EaterExceptionLocated { + void Test_with_String(String input, String expected) throws EaterException { assertTimExpectedOutputFromInput(cut, input, expected); } @@ -46,7 +46,7 @@ class GetJsonTypeTest { " 0, number", " -1, number", }) - void Test_with_Integer(Integer input, String expected) throws EaterExceptionLocated { + void Test_with_Integer(Integer input, String expected) throws EaterException { assertTimExpectedOutputFromInput(cut, input, expected); } @@ -66,7 +66,7 @@ class GetJsonTypeTest { " null , json ", " '{\"a\":[1, 2], \"b\":\"abc\", \"b\":true}' , object", }) - void Test_with_Json(@ConvertWith(StringJsonConverter.class) JsonValue input, String expected) throws EaterExceptionLocated { + void Test_with_Json(@ConvertWith(StringJsonConverter.class) JsonValue input, String expected) throws EaterException { assertTimExpectedOutputFromInput(cut, input, expected); } } diff --git a/test/net/sourceforge/plantuml/tim/stdlib/GetenvTest.java b/test/net/sourceforge/plantuml/tim/stdlib/GetenvTest.java index 4bbfc443c..883fa0090 100644 --- a/test/net/sourceforge/plantuml/tim/stdlib/GetenvTest.java +++ b/test/net/sourceforge/plantuml/tim/stdlib/GetenvTest.java @@ -8,7 +8,7 @@ import java.util.List; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; -import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.expression.TValue; /** @@ -20,7 +20,6 @@ class GetenvTest { * Tests getenv should not publish plantuml.security.* environment variables. * * @throws EaterException should not - * @throws EaterExceptionLocated should not */ @ParameterizedTest @ValueSource(strings = { @@ -28,7 +27,7 @@ class GetenvTest { "plantuml.SECURITY.blabla", "plantuml.security.credentials.path", }) - void executeReturnFunctionSecurityTest(String name) throws EaterExceptionLocated { + void executeReturnFunctionSecurityTest(String name) throws EaterException { System.setProperty("plantuml.security.blabla", "example"); Getenv cut = new Getenv(); @@ -41,14 +40,13 @@ class GetenvTest { * Tests getenv still returns 'good' variables. * * @throws EaterException should not - * @throws EaterExceptionLocated should not */ @ParameterizedTest @ValueSource(strings = { "path.separator", "line.separator", }) - void executeReturnFunctionTest(String name) throws EaterExceptionLocated { + void executeReturnFunctionTest(String name) throws EaterException { Getenv cut = new Getenv(); List values = Collections.singletonList(TValue.fromString(name)); diff --git a/test/net/sourceforge/plantuml/tim/stdlib/Hex2decTest.java b/test/net/sourceforge/plantuml/tim/stdlib/Hex2decTest.java index e11e52469..08a33c4c7 100644 --- a/test/net/sourceforge/plantuml/tim/stdlib/Hex2decTest.java +++ b/test/net/sourceforge/plantuml/tim/stdlib/Hex2decTest.java @@ -9,7 +9,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.CsvSource; -import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.TFunction; /** @@ -22,7 +22,7 @@ class Hex2decTest { final String cutName = "Hex2dec"; @Test - void Test_without_Param() throws EaterExceptionLocated { + void Test_without_Param() throws EaterException { assertTimExpectedOutput(cut, "0"); } @@ -42,7 +42,7 @@ class Hex2decTest { " -1 , -1 ", " -a , -10 ", }) - void Test_with_String(String input, String expected) throws EaterExceptionLocated { + void Test_with_String(String input, String expected) throws EaterException { assertTimExpectedOutputFromInput(cut, input, expected); } @@ -53,7 +53,7 @@ class Hex2decTest { " 10 , 16 ", " -1 , -1 ", }) - void Test_with_Integer(Integer input, String expected) throws EaterExceptionLocated { + void Test_with_Integer(Integer input, String expected) throws EaterException { assertTimExpectedOutputFromInput(cut, input, expected); } } diff --git a/test/net/sourceforge/plantuml/tim/stdlib/LowerTest.java b/test/net/sourceforge/plantuml/tim/stdlib/LowerTest.java index 57910d42f..1488eb641 100644 --- a/test/net/sourceforge/plantuml/tim/stdlib/LowerTest.java +++ b/test/net/sourceforge/plantuml/tim/stdlib/LowerTest.java @@ -12,7 +12,7 @@ import org.junit.jupiter.params.converter.ConvertWith; import org.junit.jupiter.params.provider.CsvSource; import net.sourceforge.plantuml.json.JsonValue; -import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.TFunction; import test.utils.JunitUtils.StringJsonConverter; @@ -28,7 +28,7 @@ class LowerTest { // TODO: Manage Lower function without param. (today: we observe `Function not found %lower`) @Disabled @Test - void Test_without_Param() throws EaterExceptionLocated { + void Test_without_Param() throws EaterException { assertTimExpectedOutput(cut, ""); } @@ -43,7 +43,7 @@ class LowerTest { " É , é ", " 😀 , 😀 ", }) - void Test_with_String(String input, String expected) throws EaterExceptionLocated { + void Test_with_String(String input, String expected) throws EaterException { assertTimExpectedOutputFromInput(cut, input, expected); } @@ -54,7 +54,7 @@ class LowerTest { " 10 , 10 ", " -1 , -1 ", }) - void Test_with_Integer(Integer input, String expected) throws EaterExceptionLocated { + void Test_with_Integer(Integer input, String expected) throws EaterException { assertTimExpectedOutputFromInput(cut, input, expected); } @@ -69,7 +69,7 @@ class LowerTest { // TODO: See JSON management of TRUE/FALSE //" TRUE , true ", }) - void Test_with_Json(@ConvertWith(StringJsonConverter.class) JsonValue input, String expected) throws EaterExceptionLocated { + void Test_with_Json(@ConvertWith(StringJsonConverter.class) JsonValue input, String expected) throws EaterException { assertTimExpectedOutputFromInput(cut, input, expected); } } diff --git a/test/net/sourceforge/plantuml/tim/stdlib/OrdTest.java b/test/net/sourceforge/plantuml/tim/stdlib/OrdTest.java index 9ae869b52..ae2cfcd14 100644 --- a/test/net/sourceforge/plantuml/tim/stdlib/OrdTest.java +++ b/test/net/sourceforge/plantuml/tim/stdlib/OrdTest.java @@ -7,7 +7,7 @@ import org.junit.jupiter.api.IndicativeSentencesGeneration; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.CsvSource; -import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.TFunction; /** @@ -22,7 +22,6 @@ class OrdTest { * Tests ord according to a list of input / expected output * * @throws EaterException should not - * @throws EaterExceptionLocated should not */ @ParameterizedTest(name = "[{index}] " + cutName + "(''{0}'') = {1}") @CsvSource(nullValues = "null", value = { @@ -40,7 +39,7 @@ class OrdTest { " 😀 , 128512 ", " \uD83D\uDE00 , 128512 ", }) - void Test_with_String(String input, String expected) throws EaterExceptionLocated { + void Test_with_String(String input, String expected) throws EaterException { assertTimExpectedOutputFromInput(cut, input, expected); } } \ No newline at end of file diff --git a/test/net/sourceforge/plantuml/tim/stdlib/RandomFuntionTest.java b/test/net/sourceforge/plantuml/tim/stdlib/RandomFuntionTest.java index 226ddde52..f7b61cfdf 100644 --- a/test/net/sourceforge/plantuml/tim/stdlib/RandomFuntionTest.java +++ b/test/net/sourceforge/plantuml/tim/stdlib/RandomFuntionTest.java @@ -10,7 +10,7 @@ import org.junit.jupiter.api.DisplayNameGenerator.ReplaceUnderscores; import org.junit.jupiter.api.IndicativeSentencesGeneration; import org.junit.jupiter.api.RepeatedTest; -import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.TFunction; import net.sourceforge.plantuml.tim.expression.TValue; @@ -25,27 +25,27 @@ class RandomFunctionTest { final String repetitionLabel = "[{currentRepetition}/{totalRepetitions}] "; @RepeatedTest(value = 10, name = repetitionLabel + cutName + "()") - void test_with_no_argument() throws EaterExceptionLocated { + void test_with_no_argument() throws EaterException { final List empty = new ArrayList<>(); final TValue tValue = cut.executeReturnFunction(null, null, null, empty, null); assertThat(tValue.toInt()).isIn(0, 1); } @RepeatedTest(value = 10, name = repetitionLabel + cutName + "(7)") - void test_with_one_argument() throws EaterExceptionLocated { + void test_with_one_argument() throws EaterException { final TValue tValue = cut.executeReturnFunction(null, null, null, Arrays.asList(TValue.fromInt(7)), null); assertThat(tValue.toInt()).isBetween(0, 7 - 1); } @RepeatedTest(value = 10, name = repetitionLabel + cutName + "(0, 7)") - void test_with_two_argument_first_zero() throws EaterExceptionLocated { + void test_with_two_argument_first_zero() throws EaterException { final TValue tValue = cut.executeReturnFunction(null, null, null, Arrays.asList(TValue.fromInt(0), TValue.fromInt(7)), null); assertThat(tValue.toInt()).isBetween(0, 7 - 1); } @RepeatedTest(value = 10, name = repetitionLabel + cutName + "(3, 7)") - void test_with_two_argument() throws EaterExceptionLocated { + void test_with_two_argument() throws EaterException { final TValue tValue = cut.executeReturnFunction(null, null, null, Arrays.asList(TValue.fromInt(3), TValue.fromInt(7)), null); assertThat(tValue.toInt()).isBetween(3, 7 - 1); diff --git a/test/net/sourceforge/plantuml/tim/stdlib/SizeTest.java b/test/net/sourceforge/plantuml/tim/stdlib/SizeTest.java index a8c3c5218..1763537ba 100644 --- a/test/net/sourceforge/plantuml/tim/stdlib/SizeTest.java +++ b/test/net/sourceforge/plantuml/tim/stdlib/SizeTest.java @@ -12,7 +12,7 @@ import org.junit.jupiter.params.converter.ConvertWith; import org.junit.jupiter.params.provider.CsvSource; import net.sourceforge.plantuml.json.JsonValue; -import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.TFunction; import test.utils.JunitUtils.StringJsonConverter; @@ -28,7 +28,7 @@ class SizeTest { // TODO: Manage `Size` function without param. (today: we observe `Function not found`) @Disabled @Test - void Test_without_Param() throws EaterExceptionLocated { + void Test_without_Param() throws EaterException { assertTimExpectedOutput(cut, "0"); } @@ -47,7 +47,7 @@ class SizeTest { // " 😀 , 1 ", // " \uD83D\uDE00 , 1", }) - void Test_with_String(String input, String expected) throws EaterExceptionLocated { + void Test_with_String(String input, String expected) throws EaterException { assertTimExpectedOutputFromInput(cut, input, expected); } @@ -57,7 +57,7 @@ class SizeTest { " 1 , 0 ", " 10 , 0 ", }) - void Test_with_Integer(Integer input, String expected) throws EaterExceptionLocated { + void Test_with_Integer(Integer input, String expected) throws EaterException { assertTimExpectedOutputFromInput(cut, input, expected); } @@ -74,7 +74,7 @@ class SizeTest { " 1, 0 ", " null, 0 ", }) - void Test_with_Json(@ConvertWith(StringJsonConverter.class) JsonValue input, String expected) throws EaterExceptionLocated { + void Test_with_Json(@ConvertWith(StringJsonConverter.class) JsonValue input, String expected) throws EaterException { assertTimExpectedOutputFromInput(cut, input, expected); } } diff --git a/test/net/sourceforge/plantuml/tim/stdlib/UpperTest.java b/test/net/sourceforge/plantuml/tim/stdlib/UpperTest.java index 8a78cbb96..5db56f0e9 100644 --- a/test/net/sourceforge/plantuml/tim/stdlib/UpperTest.java +++ b/test/net/sourceforge/plantuml/tim/stdlib/UpperTest.java @@ -12,7 +12,7 @@ import org.junit.jupiter.params.converter.ConvertWith; import org.junit.jupiter.params.provider.CsvSource; import net.sourceforge.plantuml.json.JsonValue; -import net.sourceforge.plantuml.tim.EaterExceptionLocated; +import net.sourceforge.plantuml.tim.EaterException; import net.sourceforge.plantuml.tim.TFunction; import test.utils.JunitUtils.StringJsonConverter; @@ -28,7 +28,7 @@ class UpperTest { // TODO: Manage Upper function without param. (today: we observe `Function not found %upper`) @Disabled @Test - void Test_without_Param() throws EaterExceptionLocated { + void Test_without_Param() throws EaterException { assertTimExpectedOutput(cut, ""); } @@ -43,7 +43,7 @@ class UpperTest { " é , É ", " 😀 , 😀 ", }) - void Test_with_String(String input, String expected) throws EaterExceptionLocated { + void Test_with_String(String input, String expected) throws EaterException { assertTimExpectedOutputFromInput(cut, input, expected); } @@ -54,7 +54,7 @@ class UpperTest { " 10 , 10 ", " -1 , -1 ", }) - void Test_with_Integer(Integer input, String expected) throws EaterExceptionLocated { + void Test_with_Integer(Integer input, String expected) throws EaterException { assertTimExpectedOutputFromInput(cut, input, expected); } @@ -65,7 +65,7 @@ class UpperTest { " '{\"a\":[1, 2], \"b\":\"abc\", \"b\":true}' , '{\"A\":[1,2],\"B\":\"ABC\",\"B\":TRUE}'", " true , TRUE ", }) - void Test_with_Json(@ConvertWith(StringJsonConverter.class) JsonValue input, String expected) throws EaterExceptionLocated { + void Test_with_Json(@ConvertWith(StringJsonConverter.class) JsonValue input, String expected) throws EaterException { assertTimExpectedOutputFromInput(cut, input, expected); } } From f385bc0dbaff0b8e28c05c8709f6f7c943ee67ec Mon Sep 17 00:00:00 2001 From: Arnaud Roques Date: Sat, 24 Feb 2024 12:03:21 +0100 Subject: [PATCH 90/95] chore: use Collections.emptyList() instead of new ArrayList() --- .../net/sourceforge/plantuml/tim/stdlib/GetAllStdlibTest.java | 4 ++-- test/net/sourceforge/plantuml/tim/stdlib/GetAllThemeTest.java | 3 ++- .../sourceforge/plantuml/tim/stdlib/RandomFuntionTest.java | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/test/net/sourceforge/plantuml/tim/stdlib/GetAllStdlibTest.java b/test/net/sourceforge/plantuml/tim/stdlib/GetAllStdlibTest.java index e22ebbc20..ab8c23fd3 100644 --- a/test/net/sourceforge/plantuml/tim/stdlib/GetAllStdlibTest.java +++ b/test/net/sourceforge/plantuml/tim/stdlib/GetAllStdlibTest.java @@ -2,8 +2,8 @@ package net.sourceforge.plantuml.tim.stdlib; import static org.assertj.core.api.Assertions.assertThat; -import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.List; import org.junit.jupiter.api.DisplayNameGenerator.ReplaceUnderscores; @@ -25,7 +25,7 @@ class GetAllStdlibTest { @Test void Test_without_Param() throws EaterException { - final List empty = new ArrayList<>(); + final List empty = Collections.emptyList(); final TValue tValue = cut.executeReturnFunction(null, null, null, empty, null); assertThat(tValue.toString()).contains("archimate", "aws", "tupadr3"); } diff --git a/test/net/sourceforge/plantuml/tim/stdlib/GetAllThemeTest.java b/test/net/sourceforge/plantuml/tim/stdlib/GetAllThemeTest.java index 0c6d65ae8..1f79076b4 100644 --- a/test/net/sourceforge/plantuml/tim/stdlib/GetAllThemeTest.java +++ b/test/net/sourceforge/plantuml/tim/stdlib/GetAllThemeTest.java @@ -3,6 +3,7 @@ package net.sourceforge.plantuml.tim.stdlib; import static org.assertj.core.api.Assertions.assertThat; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import org.junit.jupiter.api.DisplayNameGenerator.ReplaceUnderscores; @@ -24,7 +25,7 @@ class GetAllThemeTest { @Test void Test_without_Param() throws EaterException { - final List empty = new ArrayList<>(); + final List empty = Collections.emptyList(); final TValue tValue = cut.executeReturnFunction(null, null, null, empty, null); assertThat(tValue.toString()).contains("_none_", "amiga", "vibrant"); } diff --git a/test/net/sourceforge/plantuml/tim/stdlib/RandomFuntionTest.java b/test/net/sourceforge/plantuml/tim/stdlib/RandomFuntionTest.java index f7b61cfdf..fd8033793 100644 --- a/test/net/sourceforge/plantuml/tim/stdlib/RandomFuntionTest.java +++ b/test/net/sourceforge/plantuml/tim/stdlib/RandomFuntionTest.java @@ -4,6 +4,7 @@ import static org.assertj.core.api.Assertions.assertThat; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.List; import org.junit.jupiter.api.DisplayNameGenerator.ReplaceUnderscores; @@ -26,7 +27,7 @@ class RandomFunctionTest { @RepeatedTest(value = 10, name = repetitionLabel + cutName + "()") void test_with_no_argument() throws EaterException { - final List empty = new ArrayList<>(); + final List empty = Collections.emptyList(); final TValue tValue = cut.executeReturnFunction(null, null, null, empty, null); assertThat(tValue.toInt()).isIn(0, 1); } From 6c945e2508936d710789e4d6071ffb6122b953bc Mon Sep 17 00:00:00 2001 From: Arnaud Roques Date: Mon, 26 Feb 2024 22:50:31 +0100 Subject: [PATCH 91/95] fix: Activity Diagram: Style of multiline Box https://github.com/plantuml/plantuml/issues/1697 --- .../activitydiagram3/command/CommandActivityLong3.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandActivityLong3.java b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandActivityLong3.java index 397f6f977..530e1f43e 100644 --- a/src/net/sourceforge/plantuml/activitydiagram3/command/CommandActivityLong3.java +++ b/src/net/sourceforge/plantuml/activitydiagram3/command/CommandActivityLong3.java @@ -49,6 +49,7 @@ import net.sourceforge.plantuml.regex.IRegex; import net.sourceforge.plantuml.regex.RegexConcat; import net.sourceforge.plantuml.regex.RegexLeaf; import net.sourceforge.plantuml.regex.RegexResult; +import net.sourceforge.plantuml.stereo.Stereotype; import net.sourceforge.plantuml.utils.BlocLines; public class CommandActivityLong3 extends CommandMultilines3 { @@ -84,10 +85,16 @@ public class CommandActivityLong3 extends CommandMultilines3 { final Colors colors = color().getColor(line0, diagram.getSkinParam().getIHtmlColorSet()); final RegexResult lineLast = getPatternEnd2().matcher(lines.getLast().getString()); + final String end = lineLast.get("END", 0); + Stereotype stereotype = null; + String stereo = lineLast.get("END", 1); + if (stereo != null) + stereotype = Stereotype.build(stereo); + final BoxStyle style = BoxStyle.fromString(end); lines = lines.removeStartingAndEnding(line0.get("DATA", 0), end.length()); - return diagram.addActivity(lines.toDisplay(), style, null, colors, null); + return diagram.addActivity(lines.toDisplay(), style, null, colors, stereotype); } } From 2a49ef06da44f8465dfa59cea920347e076f14ea Mon Sep 17 00:00:00 2001 From: Arnaud Roques Date: Tue, 27 Feb 2024 19:42:44 +0100 Subject: [PATCH 92/95] fix negative values causing syntax error in robust "has" list https://forum.plantuml.net/18701/negative-values-causing-syntax-error-in-robust-has-list?show=18705 --- .../timingdiagram/command/CommandDefineStateShort.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/net/sourceforge/plantuml/timingdiagram/command/CommandDefineStateShort.java b/src/net/sourceforge/plantuml/timingdiagram/command/CommandDefineStateShort.java index 671074038..c18d064d3 100644 --- a/src/net/sourceforge/plantuml/timingdiagram/command/CommandDefineStateShort.java +++ b/src/net/sourceforge/plantuml/timingdiagram/command/CommandDefineStateShort.java @@ -59,8 +59,9 @@ public class CommandDefineStateShort extends SingleLineCommand2 { RegexLeaf.spaceOneOrMore(), // new RegexLeaf("has"), // RegexLeaf.spaceOneOrMore(), // - new RegexLeaf("STATE", "([%pLN_.@]+)"), // - new RegexLeaf("STATES", "((,([%pLN_.@]+))*)"), RegexLeaf.end()); + new RegexLeaf("STATE", "([-%pLN_.@]+)"), // + new RegexLeaf("STATES", "((,([-%pLN_.@]+))*)"), // + RegexLeaf.end()); } @Override From a0be1ed677c45b3f21ba7aebd8173789df1f6bd4 Mon Sep 17 00:00:00 2001 From: Arnaud Roques Date: Tue, 27 Feb 2024 20:39:02 +0100 Subject: [PATCH 93/95] feat: timing set background color of concise https://forum.plantuml.net/18682/timing-set-background-color-of-concise https://forum.plantuml.net/18676/supporting-markdown-syntax --- gradle.properties | 2 +- .../command/CommandCreateClassMultilines.java | 10 ++++++++-- .../mindmap/CommandMindMapDirection.java | 6 +++--- .../mindmap/CommandMindMapOrgmode.java | 2 +- .../CommandMindMapOrgmodeMultiline.java | 2 +- .../plantuml/timingdiagram/Player.java | 9 ++++++++- .../plantuml/timingdiagram/PlayerAnalog.java | 2 +- .../plantuml/timingdiagram/PlayerBinary.java | 2 +- .../plantuml/timingdiagram/PlayerClock.java | 2 +- .../timingdiagram/PlayerRobustConcise.java | 6 ++++-- .../plantuml/timingdiagram/TimingDiagram.java | 16 ++++++++++++++-- .../command/CommandRobustConcise.java | 19 +++++++++++++++++-- .../sourceforge/plantuml/version/Version.java | 2 +- 13 files changed, 61 insertions(+), 19 deletions(-) diff --git a/gradle.properties b/gradle.properties index ddbe9ba1d..4b0a74673 100644 --- a/gradle.properties +++ b/gradle.properties @@ -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.2024.4beta5 +version = 1.2024.4beta6 org.gradle.workers.max = 3 \ No newline at end of file diff --git a/src/net/sourceforge/plantuml/classdiagram/command/CommandCreateClassMultilines.java b/src/net/sourceforge/plantuml/classdiagram/command/CommandCreateClassMultilines.java index dc1719990..ac36c3685 100644 --- a/src/net/sourceforge/plantuml/classdiagram/command/CommandCreateClassMultilines.java +++ b/src/net/sourceforge/plantuml/classdiagram/command/CommandCreateClassMultilines.java @@ -127,10 +127,16 @@ public class CommandCreateClassMultilines extends CommandMultilines2"))) // + )), // new RegexOptional(new RegexConcat(RegexLeaf.spaceOneOrMore(), new RegexLeaf("IMPLEMENTS", - "(implements)[%s]+(" + CommandCreateClassMultilines.CODES + "|[%g]([^%g]+)[%g])"))), // + "(implements)[%s]+(" + CommandCreateClassMultilines.CODES + "|[%g]([^%g]+)[%g])"), + new RegexOptional(new RegexConcat(RegexLeaf.spaceZeroOrMore(), + new RegexLeaf("\\<(" + GenericRegexProducer.PATTERN + ")\\>"))) // + )), // RegexLeaf.spaceZeroOrMore(), // new RegexLeaf("\\{"), // RegexLeaf.spaceZeroOrMore(), // diff --git a/src/net/sourceforge/plantuml/mindmap/CommandMindMapDirection.java b/src/net/sourceforge/plantuml/mindmap/CommandMindMapDirection.java index 27f658495..d23e8f8ea 100644 --- a/src/net/sourceforge/plantuml/mindmap/CommandMindMapDirection.java +++ b/src/net/sourceforge/plantuml/mindmap/CommandMindMapDirection.java @@ -53,13 +53,13 @@ public class CommandMindMapDirection extends SingleLineCommand2 static IRegex getRegexConcat() { return RegexConcat.build(CommandMindMapDirection.class.getName(), RegexLeaf.start(), // - new RegexLeaf("[^*]*"), // + new RegexLeaf("[^*#]*"), // new RegexLeaf("\\b"), // new RegexLeaf("DIRECTION", "(left|right|top|bottom)"), // new RegexLeaf("\\b"), // - new RegexLeaf("[^*]*"), // + new RegexLeaf("[^*#]*"), // new RegexLeaf("(side|direction)"), // - new RegexLeaf("[^*]*"), // + new RegexLeaf("[^*#]*"), // RegexLeaf.end()); } diff --git a/src/net/sourceforge/plantuml/mindmap/CommandMindMapOrgmode.java b/src/net/sourceforge/plantuml/mindmap/CommandMindMapOrgmode.java index 8c53a6853..e46204474 100644 --- a/src/net/sourceforge/plantuml/mindmap/CommandMindMapOrgmode.java +++ b/src/net/sourceforge/plantuml/mindmap/CommandMindMapOrgmode.java @@ -55,7 +55,7 @@ public class CommandMindMapOrgmode extends SingleLineCommand2 { static IRegex getRegexConcat() { return RegexConcat.build(CommandMindMapOrgmode.class.getName(), RegexLeaf.start(), // - new RegexLeaf("TYPE", "([ \t]*\\*+)"), // + new RegexLeaf("TYPE", "([ \t]*[*#]+)"), // new RegexOptional(new RegexLeaf("BACKCOLOR", "\\[(#\\w+)\\]")), // new RegexLeaf("SHAPE", "(_)?"), // RegexLeaf.spaceOneOrMore(), // diff --git a/src/net/sourceforge/plantuml/mindmap/CommandMindMapOrgmodeMultiline.java b/src/net/sourceforge/plantuml/mindmap/CommandMindMapOrgmodeMultiline.java index 79fd1936a..7d03529bc 100644 --- a/src/net/sourceforge/plantuml/mindmap/CommandMindMapOrgmodeMultiline.java +++ b/src/net/sourceforge/plantuml/mindmap/CommandMindMapOrgmodeMultiline.java @@ -60,7 +60,7 @@ public class CommandMindMapOrgmodeMultiline extends CommandMultilines2 notes = new ArrayList<>(); public PlayerBinary(String code, ISkinParam skinParam, TimingRuler ruler, boolean compact, Stereotype stereotype) { - super(code, skinParam, ruler, compact, stereotype); + super(code, skinParam, ruler, compact, stereotype, null); this.suggestedHeight = 30; } diff --git a/src/net/sourceforge/plantuml/timingdiagram/PlayerClock.java b/src/net/sourceforge/plantuml/timingdiagram/PlayerClock.java index ac5a31880..134e67620 100644 --- a/src/net/sourceforge/plantuml/timingdiagram/PlayerClock.java +++ b/src/net/sourceforge/plantuml/timingdiagram/PlayerClock.java @@ -65,7 +65,7 @@ public class PlayerClock extends Player { public PlayerClock(String title, ISkinParam skinParam, TimingRuler ruler, int period, int pulse, int offset, boolean compact) { - super(title, skinParam, ruler, compact, null); + super(title, skinParam, ruler, compact, null, null); this.displayTitle = title.length() > 0; this.period = period; this.pulse = pulse; diff --git a/src/net/sourceforge/plantuml/timingdiagram/PlayerRobustConcise.java b/src/net/sourceforge/plantuml/timingdiagram/PlayerRobustConcise.java index 194e9dfe3..3f97badd1 100644 --- a/src/net/sourceforge/plantuml/timingdiagram/PlayerRobustConcise.java +++ b/src/net/sourceforge/plantuml/timingdiagram/PlayerRobustConcise.java @@ -43,6 +43,7 @@ import java.util.TreeSet; import net.sourceforge.plantuml.klimt.UTranslate; import net.sourceforge.plantuml.klimt.color.Colors; +import net.sourceforge.plantuml.klimt.color.HColor; import net.sourceforge.plantuml.klimt.creole.Display; import net.sourceforge.plantuml.klimt.drawing.UGraphic; import net.sourceforge.plantuml.klimt.font.StringBounder; @@ -50,6 +51,7 @@ import net.sourceforge.plantuml.klimt.geom.XDimension2D; import net.sourceforge.plantuml.klimt.shape.AbstractTextBlock; import net.sourceforge.plantuml.klimt.shape.TextBlock; import net.sourceforge.plantuml.klimt.shape.UDrawable; +import net.sourceforge.plantuml.klimt.shape.URectangle; import net.sourceforge.plantuml.skin.ArrowConfiguration; import net.sourceforge.plantuml.stereo.Stereotype; import net.sourceforge.plantuml.style.ISkinParam; @@ -77,8 +79,8 @@ public final class PlayerRobustConcise extends Player { private Colors initialColors; public PlayerRobustConcise(TimingStyle type, String full, ISkinParam skinParam, TimingRuler ruler, boolean compact, - Stereotype stereotype) { - super(full, skinParam, ruler, compact, stereotype); + Stereotype stereotype, HColor generalBackgroundColor) { + super(full, skinParam, ruler, compact, stereotype, generalBackgroundColor); this.type = type; this.suggestedHeight = 0; } diff --git a/src/net/sourceforge/plantuml/timingdiagram/TimingDiagram.java b/src/net/sourceforge/plantuml/timingdiagram/TimingDiagram.java index 03d10d127..4edc5cd04 100644 --- a/src/net/sourceforge/plantuml/timingdiagram/TimingDiagram.java +++ b/src/net/sourceforge/plantuml/timingdiagram/TimingDiagram.java @@ -55,6 +55,7 @@ import net.sourceforge.plantuml.klimt.UStroke; import net.sourceforge.plantuml.klimt.UTranslate; import net.sourceforge.plantuml.klimt.color.Colors; import net.sourceforge.plantuml.klimt.color.HColor; +import net.sourceforge.plantuml.klimt.color.HColors; import net.sourceforge.plantuml.klimt.creole.Display; import net.sourceforge.plantuml.klimt.drawing.UGraphic; import net.sourceforge.plantuml.klimt.font.StringBounder; @@ -62,6 +63,7 @@ import net.sourceforge.plantuml.klimt.geom.XDimension2D; import net.sourceforge.plantuml.klimt.shape.AbstractTextBlock; import net.sourceforge.plantuml.klimt.shape.TextBlock; import net.sourceforge.plantuml.klimt.shape.ULine; +import net.sourceforge.plantuml.klimt.shape.URectangle; import net.sourceforge.plantuml.skin.UmlDiagramType; import net.sourceforge.plantuml.stereo.Stereotype; import net.sourceforge.plantuml.style.PName; @@ -133,6 +135,15 @@ public class TimingDiagram extends UmlDiagram implements Clocks { ruler.ensureNotEmpty(); final StringBounder stringBounder = ug.getStringBounder(); final double part1MaxWidth = getPart1MaxWidth(stringBounder); + + for (Player player : players.values()) { + final UGraphic ugPlayer = ug.apply(getUTranslateForPlayer(player, stringBounder)); + final HColor generalBackgroundColor = player.getGeneralBackgroundColor(); + if (generalBackgroundColor != null) + ugPlayer.apply(generalBackgroundColor).apply(generalBackgroundColor.bg()) + .draw(URectangle.build(getWidthTotal(stringBounder), player.getFullHeight(stringBounder))); + } + final UTranslate widthPart1 = UTranslate.dx(part1MaxWidth); if (compactByDefault == false) drawBorder(ug); @@ -146,6 +157,7 @@ public class TimingDiagram extends UmlDiagram implements Clocks { for (Player player : players.values()) { final UGraphic ugPlayer = ug.apply(getUTranslateForPlayer(player, stringBounder)); final double caption = getHeightForCaptions(stringBounder); + if (first) { if (player.isCompact() == false) drawHorizontalSeparator(ugPlayer); @@ -279,9 +291,9 @@ public class TimingDiagram extends UmlDiagram implements Clocks { } public CommandExecutionResult createRobustConcise(String code, String full, TimingStyle type, boolean compact, - Stereotype stereotype) { + Stereotype stereotype, HColor backColor) { final Player player = new PlayerRobustConcise(type, full, getSkinParam(), ruler, compactByDefault || compact, - stereotype); + stereotype, backColor); players.put(code, player); lastPlayer = player; return CommandExecutionResult.ok(); diff --git a/src/net/sourceforge/plantuml/timingdiagram/command/CommandRobustConcise.java b/src/net/sourceforge/plantuml/timingdiagram/command/CommandRobustConcise.java index 51716350c..159ad26ff 100644 --- a/src/net/sourceforge/plantuml/timingdiagram/command/CommandRobustConcise.java +++ b/src/net/sourceforge/plantuml/timingdiagram/command/CommandRobustConcise.java @@ -37,10 +37,15 @@ package net.sourceforge.plantuml.timingdiagram.command; import net.sourceforge.plantuml.command.CommandExecutionResult; import net.sourceforge.plantuml.command.SingleLineCommand2; +import net.sourceforge.plantuml.klimt.color.ColorParser; +import net.sourceforge.plantuml.klimt.color.ColorType; +import net.sourceforge.plantuml.klimt.color.Colors; +import net.sourceforge.plantuml.klimt.color.NoSuchColorException; import net.sourceforge.plantuml.regex.IRegex; import net.sourceforge.plantuml.regex.RegexConcat; import net.sourceforge.plantuml.regex.RegexLeaf; import net.sourceforge.plantuml.regex.RegexOptional; +import net.sourceforge.plantuml.regex.RegexOr; import net.sourceforge.plantuml.regex.RegexResult; import net.sourceforge.plantuml.stereo.Stereotype; import net.sourceforge.plantuml.stereo.StereotypePattern; @@ -70,11 +75,18 @@ public class CommandRobustConcise extends SingleLineCommand2 { RegexLeaf.spaceOneOrMore())), // new RegexLeaf("CODE", "([%pLN_.@]+)"), // StereotypePattern.optional("STEREOTYPE2"), // + RegexLeaf.spaceZeroOrMore(), // + new RegexOr(color().getRegex()), // RegexLeaf.end()); } + private static ColorParser color() { + return ColorParser.simpleColor(ColorType.BACK); + } + @Override - final protected CommandExecutionResult executeArg(TimingDiagram diagram, LineLocation location, RegexResult arg) { + final protected CommandExecutionResult executeArg(TimingDiagram diagram, LineLocation location, RegexResult arg) + throws NoSuchColorException { final String compact = arg.get("COMPACT", 0); final String code = arg.get("CODE", 0); String full = arg.get("FULL", 0); @@ -88,7 +100,10 @@ public class CommandRobustConcise extends SingleLineCommand2 { stereotype = Stereotype.build(arg.get("STEREOTYPE2", 0)); final TimingStyle type = TimingStyle.valueOf(arg.get("TYPE", 0).toUpperCase()); - return diagram.createRobustConcise(code, full, type, compact != null, stereotype); + final Colors colors = color().getColor(arg, diagram.getSkinParam().getIHtmlColorSet()); + + return diagram.createRobustConcise(code, full, type, compact != null, stereotype, + colors.getColor(ColorType.BACK)); } } diff --git a/src/net/sourceforge/plantuml/version/Version.java b/src/net/sourceforge/plantuml/version/Version.java index 61bcf7971..700fba39c 100644 --- a/src/net/sourceforge/plantuml/version/Version.java +++ b/src/net/sourceforge/plantuml/version/Version.java @@ -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.2024.4beta5"; + private static final String version = "1.2024.4beta6"; public static String versionString() { return version; From d85f96256ecf622a581ee663d75e6dd501808f0e Mon Sep 17 00:00:00 2001 From: BOUDJENIBA Oussama <41930319+ouss1002@users.noreply.github.com> Date: Mon, 4 Mar 2024 09:58:29 +0100 Subject: [PATCH 94/95] Prevent IndexOutOfBoundsException in equation rendering by checking non-empty 'texsymbol' strings This commit introduces a check before accessing the first character of 'texsymbol' strings in equation rendering, preventing IndexOutOfBoundsException when custom functions names are used which can lead to an empty string. This change ensures that equations custom variables names ending with standard function strings are handled gracefully without errors --- src/net/sourceforge/plantuml/math/ASCIIMathTeXImg.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/net/sourceforge/plantuml/math/ASCIIMathTeXImg.java b/src/net/sourceforge/plantuml/math/ASCIIMathTeXImg.java index 6aec5694c..7a23f2667 100644 --- a/src/net/sourceforge/plantuml/math/ASCIIMathTeXImg.java +++ b/src/net/sourceforge/plantuml/math/ASCIIMathTeXImg.java @@ -602,7 +602,7 @@ public class ASCIIMathTeXImg { case CONST: str = AMremoveCharsAndBlanks(str, symbol.input.length()); String texsymbol = AMTgetTeXsymbol(symbol); - if (texsymbol.charAt(0) == '\\' || symbol.tag.equals("mo")) + if (texsymbol.isEmpty() || texsymbol.charAt(0) == '\\' || symbol.tag.equals("mo")) return new String[] { texsymbol, str }; else { return new String[] { "{" + texsymbol + "}", str }; @@ -676,7 +676,7 @@ public class ASCIIMathTeXImg { if (result[0] == null) return new String[] { "{" + AMTgetTeXsymbol(symbol) + "}", str }; if (symbol.hasFlag("func")) { // functions hack - st = "" + str.charAt(0); + st = "" + (str.isEmpty() ? "" : str.charAt(0)); if (st.equals("^") || st.equals("_") || st.equals("/") || st.equals("|") || st.equals(",") || (symbol.input.length() == 1 && symbol.input.matches("\\w") && !st.equals("("))) { return new String[] { "{" + AMTgetTeXsymbol(symbol) + "}", str }; From f82f1a9a76b138168f7ad4f8f9015a570def285d Mon Sep 17 00:00:00 2001 From: The-Lum <86879521+The-Lum@users.noreply.github.com> Date: Sun, 10 Mar 2024 17:09:12 +0000 Subject: [PATCH 95/95] fix: math two-dimensional matrices and add test Report of https://github.com/The-Lum/ASCIIMathTeXImg/commit/6f3bb01d That fixes #1706 Regards, Th. --- src/net/sourceforge/plantuml/math/ASCIIMathTeXImg.java | 4 ++-- test/net/sourceforge/plantuml/math/MathTest.java | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/net/sourceforge/plantuml/math/ASCIIMathTeXImg.java b/src/net/sourceforge/plantuml/math/ASCIIMathTeXImg.java index 7a23f2667..d4d32969b 100644 --- a/src/net/sourceforge/plantuml/math/ASCIIMathTeXImg.java +++ b/src/net/sourceforge/plantuml/math/ASCIIMathTeXImg.java @@ -905,8 +905,8 @@ public class ASCIIMathTeXImg { subarr = new ArrayList(Arrays.asList( newFrag.substring(pos.get(i) + 8, subpos.get(pos.get(i)).get(1)))); for (int j = 2; j < subpos.get(pos.get(i)).size(); j++) { - subarr.add(newFrag.substring(subpos.get(i).get(j - 1) + 1, - subpos.get(i).get(j))); + subarr.add(newFrag.substring(subpos.get(pos.get(i)).get(j - 1) + 1, + subpos.get(pos.get(i)).get(j))); } subarr.add(newFrag.substring( subpos.get(pos.get(i)).get(subpos.get(pos.get(i)).size() - 1) + 1, diff --git a/test/net/sourceforge/plantuml/math/MathTest.java b/test/net/sourceforge/plantuml/math/MathTest.java index d649d9c77..391ff41d6 100644 --- a/test/net/sourceforge/plantuml/math/MathTest.java +++ b/test/net/sourceforge/plantuml/math/MathTest.java @@ -17,6 +17,9 @@ class MathTest { " '[[a,b],[c,d]]', {\\left[\\begin{matrix}{a}&{b}\\\\{c}&{d}\\end{matrix}\\right]} ", " color(red)(x), {\\textcolor{red}{{x}}} ", " color(red)(t)=color(blue)(x), {\\textcolor{red}{{t}}}={\\textcolor{blue}{{x}}} ", + " f, {f} ", + " f_g, {{f}_{{g}}} ", + " '[[1,2,3],[4,5,6]]', {\\left[\\begin{matrix}{1}&{2}&{3}\\\\{4}&{5}&{6}\\end{matrix}\\right]} ", }) public void testMath(String input, String expected) { final String res = new ASCIIMathTeXImg().getTeX(input);