From c8fcdda668999857b8dac1822e20016b70167bf8 Mon Sep 17 00:00:00 2001 From: Andrey Turbanov Date: Tue, 29 Mar 2022 11:35:56 +0300 Subject: [PATCH] Simplify String operations (#776) --- .../src/main/java/org/jline/builtins/ScreenTerminal.java | 2 +- builtins/src/main/java/org/jline/builtins/TTop.java | 7 ++----- .../src/main/java/org/jline/style/InterpolationHelper.java | 2 +- terminal/src/main/java/org/jline/utils/Colors.java | 2 +- terminal/src/main/java/org/jline/utils/StyleResolver.java | 2 +- terminal/src/test/java/org/jline/utils/ScreenTerminal.java | 2 +- 6 files changed, 7 insertions(+), 10 deletions(-) diff --git a/builtins/src/main/java/org/jline/builtins/ScreenTerminal.java b/builtins/src/main/java/org/jline/builtins/ScreenTerminal.java index 96cc66050..bb920c155 100644 --- a/builtins/src/main/java/org/jline/builtins/ScreenTerminal.java +++ b/builtins/src/main/java/org/jline/builtins/ScreenTerminal.java @@ -1575,7 +1575,7 @@ private boolean vt100_write(int c) { vt100_parse_func <<= 8; vt100_parse_func += (char) c; } else if (msb == 0x30 && vt100_parse_state == State.Csi) { - vt100_parse_param += new String(new char[]{(char) c}); + vt100_parse_param += String.valueOf((char)c); } else { vt100_parse_func <<= 8; vt100_parse_func += (char) c; diff --git a/builtins/src/main/java/org/jline/builtins/TTop.java b/builtins/src/main/java/org/jline/builtins/TTop.java index 043542d17..9b1845ad1 100644 --- a/builtins/src/main/java/org/jline/builtins/TTop.java +++ b/builtins/src/main/java/org/jline/builtins/TTop.java @@ -391,7 +391,7 @@ private synchronized void display() throws IOException { long count = gc.getCollectionCount(); long time = gc.getCollectionTime(); sbc.append(gc.getName()).append(": ") - .append(Long.toString(count)).append(" col. / ") + .append(count).append(" col. / ") .append(String.format("%d", time / 1000)) .append(".") .append(String.format("%03d", time % 1000)) @@ -557,10 +557,7 @@ private static String padcut(String str, int nb) { } return sb.toString(); } else { - StringBuilder sb = new StringBuilder(nb); - sb.append(str, 0, nb - 3); - sb.append("..."); - return sb.toString(); + return str.substring(0, nb - 3) + "..."; } } private static String memory(long cur, long max) { diff --git a/style/src/main/java/org/jline/style/InterpolationHelper.java b/style/src/main/java/org/jline/style/InterpolationHelper.java index 24fd86a93..8825b34de 100644 --- a/style/src/main/java/org/jline/style/InterpolationHelper.java +++ b/style/src/main/java/org/jline/style/InterpolationHelper.java @@ -96,7 +96,7 @@ private static String doSubstVars(String val, // Append the leading characters, the substituted value of // the variable, and the trailing characters to get the new // value. - val = val.substring(0, startDelim) + substValue + val.substring(stopDelim + DELIM_STOP.length(), val.length()); + val = val.substring(0, startDelim) + substValue + val.substring(stopDelim + DELIM_STOP.length()); // Now perform substitution again, since there could still // be substitutions to make. diff --git a/terminal/src/main/java/org/jline/utils/Colors.java b/terminal/src/main/java/org/jline/utils/Colors.java index 460568431..764f45f85 100644 --- a/terminal/src/main/java/org/jline/utils/Colors.java +++ b/terminal/src/main/java/org/jline/utils/Colors.java @@ -534,7 +534,7 @@ private static double calculateH(double h) { H = 0; return H; } else { - throw new IllegalArgumentException("h outside assumed range 0..360: " + Double.toString(h)); + throw new IllegalArgumentException("h outside assumed range 0..360: " + h); } } diff --git a/terminal/src/main/java/org/jline/utils/StyleResolver.java b/terminal/src/main/java/org/jline/utils/StyleResolver.java index 7d834b9cf..36eee5f82 100644 --- a/terminal/src/main/java/org/jline/utils/StyleResolver.java +++ b/terminal/src/main/java/org/jline/utils/StyleResolver.java @@ -241,7 +241,7 @@ private AttributedStyle applyReference(final AttributedStyle style, final String if (spec.length() == 1) { log.warning("Invalid style-reference; missing discriminator: " + spec); } else { - String name = spec.substring(1, spec.length()); + String name = spec.substring(1); String resolvedSpec = source.apply(name); if (resolvedSpec != null) { return apply(style, resolvedSpec); diff --git a/terminal/src/test/java/org/jline/utils/ScreenTerminal.java b/terminal/src/test/java/org/jline/utils/ScreenTerminal.java index 75b061b62..da2da15c6 100644 --- a/terminal/src/test/java/org/jline/utils/ScreenTerminal.java +++ b/terminal/src/test/java/org/jline/utils/ScreenTerminal.java @@ -1572,7 +1572,7 @@ private boolean vt100_write(int c) { vt100_parse_func <<= 8; vt100_parse_func += (char) c; } else if (msb == 0x30 && vt100_parse_state == State.Csi) { - vt100_parse_param += new String(new char[]{(char) c}); + vt100_parse_param += String.valueOf((char)c); } else { vt100_parse_func <<= 8; vt100_parse_func += (char) c;