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 2018/08/26 10:27:52 UTC

[3/5] groovy git commit: Trivial refactoring: 'indexOf()' expression is replaceable with 'contains()'

Trivial refactoring: 'indexOf()' expression is replaceable with 'contains()'


Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/a862f2cf
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/a862f2cf
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/a862f2cf

Branch: refs/heads/GROOVY_2_5_X
Commit: a862f2cff7e258ef295de7c967cde29a13440cc1
Parents: f396eb9
Author: Daniel Sun <su...@apache.org>
Authored: Sun Aug 26 17:46:20 2018 +0800
Committer: Daniel Sun <su...@apache.org>
Committed: Sun Aug 26 18:05:43 2018 +0800

----------------------------------------------------------------------
 .../groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovy.java   | 2 +-
 .../src/main/java/org/apache/groovy/json/internal/Sys.java         | 2 +-
 .../src/main/java/org/codehaus/groovy/tools/xml/DomToGroovy.java   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/groovy/blob/a862f2cf/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovy.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovy.java b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovy.java
index 65ea13e..15825f5 100644
--- a/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovy.java
+++ b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovy.java
@@ -369,7 +369,7 @@ public class Groovy extends Java {
 
         while ((line = in.readLine()) != null) {
             line = getProject().replaceProperties(line);
-            if (line.indexOf("--") >= 0) {
+            if (line.contains("--")) {
                 txt.append("\n");
             }
         }

http://git-wip-us.apache.org/repos/asf/groovy/blob/a862f2cf/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/Sys.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/Sys.java b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/Sys.java
index 6c7dac5..876ea3c 100644
--- a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/Sys.java
+++ b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/Sys.java
@@ -31,7 +31,7 @@ class Sys {
     static {
         BigDecimal v = new BigDecimal("-1");
         String sversion = System.getProperty("java.version");
-        if (sversion.indexOf("_") != -1) {
+        if (sversion.contains("_")) {
             final String[] split = sversion.split("_");
             try {
                 String ver = split[0];

http://git-wip-us.apache.org/repos/asf/groovy/blob/a862f2cf/subprojects/groovy-xml/src/main/java/org/codehaus/groovy/tools/xml/DomToGroovy.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-xml/src/main/java/org/codehaus/groovy/tools/xml/DomToGroovy.java b/subprojects/groovy-xml/src/main/java/org/codehaus/groovy/tools/xml/DomToGroovy.java
index 4411ae9..10f42c4 100644
--- a/subprojects/groovy-xml/src/main/java/org/codehaus/groovy/tools/xml/DomToGroovy.java
+++ b/subprojects/groovy-xml/src/main/java/org/codehaus/groovy/tools/xml/DomToGroovy.java
@@ -204,7 +204,7 @@ public class DomToGroovy {
     }
 
     protected void printQuoted(String text) {
-        if (text.indexOf("\n") != -1) {
+        if (text.contains("\n")) {
             print("'''");
             print(text);
             print("'''");