You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by su...@apache.org on 2025/09/19 22:36:53 UTC

(groovy) branch GROOVY_5_0_X updated (76a5335af4 -> e8f98a6d3a)

This is an automated email from the ASF dual-hosted git repository.

sunlan pushed a change to branch GROOVY_5_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git


    from 76a5335af4 add trait tests
     new 062b7a8baf Trivial refactor: use `String.repeat()` instead
     new e8f98a6d3a Fix javadoc

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../java/org/codehaus/groovy/control/messages/SimpleMessage.java  | 2 +-
 src/main/java/org/codehaus/groovy/runtime/NullObject.java         | 2 +-
 .../org/apache/groovy/groovysh/jline/GroovyPosixCommands.java     | 8 ++------
 3 files changed, 4 insertions(+), 8 deletions(-)


(groovy) 02/02: Fix javadoc

Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

sunlan pushed a commit to branch GROOVY_5_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git

commit e8f98a6d3a13c8aaf0d20c4d1a68f0c4e07c1787
Author: Daniel Sun <su...@apache.org>
AuthorDate: Sat Sep 20 00:11:51 2025 +0900

    Fix javadoc
    
    (cherry picked from commit 50375ec125e7c3d2d40edb1de0763b1fbbf9b292)
---
 src/main/java/org/codehaus/groovy/control/messages/SimpleMessage.java | 2 +-
 src/main/java/org/codehaus/groovy/runtime/NullObject.java             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/codehaus/groovy/control/messages/SimpleMessage.java b/src/main/java/org/codehaus/groovy/control/messages/SimpleMessage.java
index 2c537bc5c8..429d71cf02 100644
--- a/src/main/java/org/codehaus/groovy/control/messages/SimpleMessage.java
+++ b/src/main/java/org/codehaus/groovy/control/messages/SimpleMessage.java
@@ -29,7 +29,7 @@ import java.io.PrintWriter;
  */
 public class SimpleMessage extends Message {
 
-    /** used when {@link message} is an I18N identifier */
+    /** used when {@link #message} is an I18N identifier */
     protected Object data;
     protected String message;
     protected ProcessingUnit owner;
diff --git a/src/main/java/org/codehaus/groovy/runtime/NullObject.java b/src/main/java/org/codehaus/groovy/runtime/NullObject.java
index ef7ee6e485..b366c44a29 100644
--- a/src/main/java/org/codehaus/groovy/runtime/NullObject.java
+++ b/src/main/java/org/codehaus/groovy/runtime/NullObject.java
@@ -156,7 +156,7 @@ public class NullObject extends GroovyObjectSupport {
     }
 
     /**
-     * Fallback for {@code null+null}. The {@link plus(String)} variant catches
+     * Fallback for {@code null+null}. The {@link #plus(String)} variant catches
      * the case of adding a non-null String to null.
      *
      * @return never


(groovy) 01/02: Trivial refactor: use `String.repeat()` instead

Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

sunlan pushed a commit to branch GROOVY_5_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git

commit 062b7a8baf57ea5bd5fa85231e00a07c24352904
Author: Daniel Sun <su...@apache.org>
AuthorDate: Fri Sep 19 23:56:45 2025 +0900

    Trivial refactor: use `String.repeat()` instead
    
    (cherry picked from commit 187fb905eace4496af34218e6cbe5deec4bb354b)
---
 .../org/apache/groovy/groovysh/jline/GroovyPosixCommands.java     | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/jline/GroovyPosixCommands.java b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/jline/GroovyPosixCommands.java
index dcf69ffeaf..84ce50145c 100644
--- a/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/jline/GroovyPosixCommands.java
+++ b/subprojects/groovy-groovysh/src/main/groovy/org/apache/groovy/groovysh/jline/GroovyPosixCommands.java
@@ -523,9 +523,7 @@ public class GroovyPosixCommands extends PosixCommands {
                 if (username.length() > 8) {
                     username = new StringBuilder(username.substring(0, 8));
                 } else {
-                    for (int i = username.length(); i < 8; i++) {
-                        username.append(" ");
-                    }
+                    username.append(" ".repeat(Math.max(0, 8 - username.length())));
                 }
                 StringBuilder group;
                 if (attributes.containsKey("group")) {
@@ -536,9 +534,7 @@ public class GroovyPosixCommands extends PosixCommands {
                 if (group.length() > 8) {
                     group = new StringBuilder(group.substring(0, 8));
                 } else {
-                    for (int i = group.length(); i < 8; i++) {
-                        group.append(" ");
-                    }
+                    group.append(" ".repeat(Math.max(0, 8 - group.length())));
                 }
                 Number length = (Number) attributes.get("size");
                 if (length == null) {