From 336d8af50d2d81950a8340c0372aad2ea90d1045 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sat, 15 Jan 2022 19:15:12 -0500 Subject: [PATCH] [ci] Very minor code cleanup --- .../main/java/com/mycila/maven/plugin/license/Default.java | 4 ++-- .../java/com/mycila/maven/plugin/license/HeaderSection.java | 2 +- .../plugin/license/header/AdditionalHeaderDefinition.java | 4 ++-- .../com/mycila/maven/plugin/license/util/FileContent.java | 3 ++- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/license-maven-plugin/src/main/java/com/mycila/maven/plugin/license/Default.java b/license-maven-plugin/src/main/java/com/mycila/maven/plugin/license/Default.java index 33eab9913..ff59c041c 100755 --- a/license-maven-plugin/src/main/java/com/mycila/maven/plugin/license/Default.java +++ b/license-maven-plugin/src/main/java/com/mycila/maven/plugin/license/Default.java @@ -57,11 +57,11 @@ public final class Default { "**/.arch-ids", "**/.arch-ids/**", - //Bazaar + // Bazaar "**/.bzr", "**/.bzr/**", - //SurroundSCM + // SurroundSCM "**/.MySCMServerInfo", // Mac diff --git a/license-maven-plugin/src/main/java/com/mycila/maven/plugin/license/HeaderSection.java b/license-maven-plugin/src/main/java/com/mycila/maven/plugin/license/HeaderSection.java index f531aef87..3f2d24f55 100755 --- a/license-maven-plugin/src/main/java/com/mycila/maven/plugin/license/HeaderSection.java +++ b/license-maven-plugin/src/main/java/com/mycila/maven/plugin/license/HeaderSection.java @@ -47,7 +47,7 @@ public class HeaderSection { * Is the pattern needs to be applied on several header lines ? */ @Parameter(defaultValue = "false") - boolean multiLineMatch = false; + boolean multiLineMatch; public String getKey() { return key; diff --git a/license-maven-plugin/src/main/java/com/mycila/maven/plugin/license/header/AdditionalHeaderDefinition.java b/license-maven-plugin/src/main/java/com/mycila/maven/plugin/license/header/AdditionalHeaderDefinition.java index 53a9ee7ba..298f5c436 100755 --- a/license-maven-plugin/src/main/java/com/mycila/maven/plugin/license/header/AdditionalHeaderDefinition.java +++ b/license-maven-plugin/src/main/java/com/mycila/maven/plugin/license/header/AdditionalHeaderDefinition.java @@ -108,8 +108,8 @@ private FeedProperty(HeaderDefinition definition) { @Override public void execute(XMLTag xmlDocument) { String value = xmlDocument.getText(); - if ("".equals(value)) // value can't be null - { + // value can't be null + if ("".equals(value)) { value = xmlDocument.getCDATA(); } definition.setPropertyFromString(xmlDocument.getCurrentTagName(), value); diff --git a/license-maven-plugin/src/main/java/com/mycila/maven/plugin/license/util/FileContent.java b/license-maven-plugin/src/main/java/com/mycila/maven/plugin/license/util/FileContent.java index e39526da3..f5d93723b 100755 --- a/license-maven-plugin/src/main/java/com/mycila/maven/plugin/license/util/FileContent.java +++ b/license-maven-plugin/src/main/java/com/mycila/maven/plugin/license/util/FileContent.java @@ -59,8 +59,9 @@ public boolean endReached() { } public String nextLine() { - if (endReached()) + if (endReached()) { return null; + } int lf = fileContent.indexOf("\n", position); int eol = lf == -1 || lf == 0 ? fileContent.length() : fileContent.charAt(lf - 1) == '\r' ? lf - 1 : lf; String str = fileContent.substring(position, eol);