From 7e0d7ff1f62c96d3b4dc636d2bc9d3bda9a53c40 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Sun, 22 Oct 2023 15:36:34 -0700 Subject: [PATCH 01/33] Updated extensions --- lib/bld/bld-wrapper.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/bld/bld-wrapper.properties b/lib/bld/bld-wrapper.properties index 2045bdf..72efcf4 100644 --- a/lib/bld/bld-wrapper.properties +++ b/lib/bld/bld-wrapper.properties @@ -1,8 +1,8 @@ bld.downloadExtensionJavadoc=false bld.downloadExtensionSources=true -bld.extension-pmd=com.uwyn.rife2:bld-pmd:0.9.2 -bld.extension-jacoco=com.uwyn.rife2:bld-jacoco-report:0.9.0 -bld.extension-tests=com.uwyn.rife2:bld-tests-badge:1.4.1 -bld.repositories=RIFE2_SNAPSHOTS,MAVEN_CENTRAL,RIFE2_RELEASES +bld.extension-pmd=com.uwyn.rife2:bld-pmd:0.9.3 +bld.extension-jacoco=com.uwyn.rife2:bld-jacoco-report:0.9.1 +bld.extension-tests=com.uwyn.rife2:bld-tests-badge:1.4.5 +bld.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES bld.downloadLocation= bld.version=1.7.5 From 8b391830b2cb120655808de8df3762b2c28316bf Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Sun, 22 Oct 2023 15:36:50 -0700 Subject: [PATCH 02/33] Version 1.1.4 --- src/bld/java/rife/render/TemplateRenderersBuild.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bld/java/rife/render/TemplateRenderersBuild.java b/src/bld/java/rife/render/TemplateRenderersBuild.java index 294f7e9..fc73353 100644 --- a/src/bld/java/rife/render/TemplateRenderersBuild.java +++ b/src/bld/java/rife/render/TemplateRenderersBuild.java @@ -24,7 +24,7 @@ public class TemplateRenderersBuild extends Project { public TemplateRenderersBuild() { pkg = "rife.render"; name = "rife2-template-renderers"; - version = version(1, 1, 3); + version = version(1, 1, 4); javaRelease = 17; downloadSources = true; From dd614a27de9daba3cbbc6b0d2e787df2832f77eb Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Sun, 22 Oct 2023 15:53:31 -0700 Subject: [PATCH 03/33] Added rife2 repository badge --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 1f2c881..bf10d41 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,7 @@ [![Java](https://img.shields.io/badge/java-17%2B-blue)](https://www.oracle.com/java/technologies/javase/jdk17-archive-downloads.html) [![bld](https://img.shields.io/badge/1.7.3-FA9052?label=bld&labelColor=2392FF)](https://rife2.com/bld) [![GitHub release (latest by date)](https://img.shields.io/github/v/release/rife2/rife2-template-renderers)](https://github.com/rife2/rife2-template-renderers/releases/latest) +[![Release](https://flat.badgen.net/maven/v/metadata-url/repo.rife2.com/releases/com/uwyn/rife2/rife2-renderers/maven-metadata.xml?color=blue)](https://repo.rife2.com/#/releases/com/uwyn/rife2/rife2-renderers) [![Maven Central](https://img.shields.io/maven-central/v/com.uwyn.rife2/rife2-renderers)](https://central.sonatype.com/artifact/com.uwyn.rife2/rife2-renderers/1.1.0) [![Nexus Snapshot](https://img.shields.io/nexus/s/com.uwyn.rife2/rife2-renderers?server=https%3A%2F%2Fs01.oss.sonatype.org%2F)](https://s01.oss.sonatype.org/content/repositories/snapshots/com/uwyn/rife2/rife2-renderers/) [![GitHub CI](https://github.com/rife2/rife2-template-renderers/actions/workflows/bld.yml/badge.svg)](https://github.com/rife2/rife2-template-renderers/actions/workflows/bld.yml) From 4cedb3ab622f96dcdf2441f0a73183d8843d4b35 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Wed, 31 Jan 2024 01:04:38 -0800 Subject: [PATCH 04/33] Updated copyright --- .idea/copyright/Apache_License.xml | 2 +- .idea/intellij-javadocs-4.0.1.xml | 204 ++++++++++++++++++ .idea/libraries/bld.xml | 7 +- .idea/misc.xml | 7 + .../rife/render/TemplateRenderersBuild.java | 24 ++- src/main/java/rife/render/Abbreviate.java | 2 +- src/main/java/rife/render/BeatTime.java | 2 +- src/main/java/rife/render/Capitalize.java | 2 +- src/main/java/rife/render/DateIso.java | 2 +- src/main/java/rife/render/DateTimeIso.java | 2 +- .../java/rife/render/DateTimeRfc2822.java | 2 +- src/main/java/rife/render/EncodeBase64.java | 2 +- src/main/java/rife/render/EncodeHtml.java | 2 +- .../java/rife/render/EncodeHtmlEntities.java | 2 +- src/main/java/rife/render/EncodeJs.java | 2 +- src/main/java/rife/render/EncodeJson.java | 2 +- src/main/java/rife/render/EncodeUnicode.java | 2 +- src/main/java/rife/render/EncodeUrl.java | 2 +- src/main/java/rife/render/EncodeXml.java | 2 +- .../java/rife/render/FormatCreditCard.java | 2 +- src/main/java/rife/render/Lowercase.java | 2 +- src/main/java/rife/render/Mask.java | 2 +- src/main/java/rife/render/Normalize.java | 2 +- src/main/java/rife/render/QrCode.java | 2 +- src/main/java/rife/render/Rot13.java | 2 +- src/main/java/rife/render/ShortenUrl.java | 2 +- src/main/java/rife/render/SwapCase.java | 2 +- src/main/java/rife/render/TimeIso.java | 2 +- src/main/java/rife/render/Trim.java | 2 +- src/main/java/rife/render/Uncapitalize.java | 2 +- src/main/java/rife/render/Uppercase.java | 2 +- src/main/java/rife/render/Uptime.java | 2 +- src/main/java/rife/render/Year.java | 2 +- .../rife/render/DisableOnCiCondition.java | 2 +- src/test/java/rife/render/DisabledOnCi.java | 2 +- src/test/java/rife/render/TestCase.java | 2 +- src/test/java/rife/render/TestDateTime.java | 2 +- src/test/java/rife/render/TestEncode.java | 2 +- src/test/java/rife/render/TestFormat.java | 2 +- .../java/rife/render/TestRenderUtils.java | 2 +- src/test/java/rife/render/ValueBean.java | 2 +- 41 files changed, 273 insertions(+), 43 deletions(-) create mode 100644 .idea/intellij-javadocs-4.0.1.xml diff --git a/.idea/copyright/Apache_License.xml b/.idea/copyright/Apache_License.xml index 606a6ad..a780185 100644 --- a/.idea/copyright/Apache_License.xml +++ b/.idea/copyright/Apache_License.xml @@ -1,6 +1,6 @@ - \ No newline at end of file diff --git a/.idea/intellij-javadocs-4.0.1.xml b/.idea/intellij-javadocs-4.0.1.xml new file mode 100644 index 0000000..0e6ccfe --- /dev/null +++ b/.idea/intellij-javadocs-4.0.1.xml @@ -0,0 +1,204 @@ + + + + + UPDATE + false + true + + TYPE + FIELD + METHOD + + + DEFAULT + PROTECTED + PUBLIC + + + + + + ^.*(public|protected|private)*.+interface\s+\w+.* + /**\n + * The interface ${name}.\n +<#if element.typeParameters?has_content> * \n +</#if> +<#list element.typeParameters as typeParameter> + * @param <${typeParameter.name}> the type parameter\n +</#list> + */ + + + ^.*(public|protected|private)*.+enum\s+\w+.* + /**\n + * The enum ${name}.\n + */ + + + ^.*(public|protected|private)*.+class\s+\w+.* + /**\n + * The type ${name}.\n +<#if element.typeParameters?has_content> * \n +</#if> +<#list element.typeParameters as typeParameter> + * @param <${typeParameter.name}> the type parameter\n +</#list> + */ + + + .+ + /**\n + * The type ${name}.\n + */ + + + + + .+ + /**\n + * Instantiates a new ${name}.\n +<#if element.parameterList.parameters?has_content> + *\n +</#if> +<#list element.parameterList.parameters as parameter> + * @param ${parameter.name} the ${paramNames[parameter.name]}\n +</#list> +<#if element.throwsList.referenceElements?has_content> + *\n +</#if> +<#list element.throwsList.referenceElements as exception> + * @throws ${exception.referenceName} the ${exceptionNames[exception.referenceName]}\n +</#list> + */ + + + + + ^.*(public|protected|private)*\s*.*(\w(\s*<.+>)*)+\s+get\w+\s*\(.*\).+ + /**\n + * Gets ${partName}.\n +<#if element.typeParameters?has_content> * \n +</#if> +<#list element.typeParameters as typeParameter> + * @param <${typeParameter.name}> the type parameter\n +</#list> +<#if element.parameterList.parameters?has_content> + *\n +</#if> +<#list element.parameterList.parameters as parameter> + * @param ${parameter.name} the ${paramNames[parameter.name]}\n +</#list> +<#if isNotVoid> + *\n + * @return the ${partName}\n +</#if> +<#if element.throwsList.referenceElements?has_content> + *\n +</#if> +<#list element.throwsList.referenceElements as exception> + * @throws ${exception.referenceName} the ${exceptionNames[exception.referenceName]}\n +</#list> + */ + + + ^.*(public|protected|private)*\s*.*(void|\w(\s*<.+>)*)+\s+set\w+\s*\(.*\).+ + /**\n + * Sets ${partName}.\n +<#if element.typeParameters?has_content> * \n +</#if> +<#list element.typeParameters as typeParameter> + * @param <${typeParameter.name}> the type parameter\n +</#list> +<#if element.parameterList.parameters?has_content> + *\n +</#if> +<#list element.parameterList.parameters as parameter> + * @param ${parameter.name} the ${paramNames[parameter.name]}\n +</#list> +<#if isNotVoid> + *\n + * @return the ${partName}\n +</#if> +<#if element.throwsList.referenceElements?has_content> + *\n +</#if> +<#list element.throwsList.referenceElements as exception> + * @throws ${exception.referenceName} the ${exceptionNames[exception.referenceName]}\n +</#list> + */ + + + ^.*((public\s+static)|(static\s+public))\s+void\s+main\s*\(\s*String\s*(\[\s*\]|\.\.\.)\s+\w+\s*\).+ + /**\n + * The entry point of application.\n + + <#if element.parameterList.parameters?has_content> + *\n +</#if> + * @param ${element.parameterList.parameters[0].name} the input arguments\n +<#if element.throwsList.referenceElements?has_content> + *\n +</#if> +<#list element.throwsList.referenceElements as exception> + * @throws ${exception.referenceName} the ${exceptionNames[exception.referenceName]}\n +</#list> + */ + + + .+ + /**\n + * ${name}<#if isNotVoid> ${return}</#if>.\n +<#if element.typeParameters?has_content> * \n +</#if> +<#list element.typeParameters as typeParameter> + * @param <${typeParameter.name}> the type parameter\n +</#list> +<#if element.parameterList.parameters?has_content> + *\n +</#if> +<#list element.parameterList.parameters as parameter> + * @param ${parameter.name} the ${paramNames[parameter.name]}\n +</#list> +<#if isNotVoid> + *\n + * @return the ${return}\n +</#if> +<#if element.throwsList.referenceElements?has_content> + *\n +</#if> +<#list element.throwsList.referenceElements as exception> + * @throws ${exception.referenceName} the ${exceptionNames[exception.referenceName]}\n +</#list> + */ + + + + + ^.*(public|protected|private)*.+static.*(\w\s\w)+.+ + /**\n + * The constant ${element.getName()}.\n + */ + + + ^.*(public|protected|private)*.*(\w\s\w)+.+ + /**\n + <#if element.parent.isInterface()> + * The constant ${element.getName()}.\n +<#else> + * The ${name}.\n +</#if> */ + + + .+ + /**\n + <#if element.parent.isEnum()> + *${name} ${typeName}.\n +<#else> + * The ${name}.\n +</#if>*/ + + + + + \ No newline at end of file diff --git a/.idea/libraries/bld.xml b/.idea/libraries/bld.xml index cf75013..bff4f62 100644 --- a/.idea/libraries/bld.xml +++ b/.idea/libraries/bld.xml @@ -2,11 +2,12 @@ - + - + + @@ -14,4 +15,4 @@ - \ No newline at end of file + diff --git a/.idea/misc.xml b/.idea/misc.xml index 4f85ffa..b018d04 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,3 +1,4 @@ + @@ -7,6 +8,12 @@