(commons-compress) branch master updated: Use Java 5's String#contains(CharSequence)

[ggregory]

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

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-compress.git


The following commit(s) were added to refs/heads/master by this push:
     new c04471e5c Use Java 5's String#contains(CharSequence)
c04471e5c is described below

commit c04471e5c39a2ee058e66e261216e97142bfcd7d
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Fri Mar 22 09:34:20 2024 -0400

    Use Java 5's String#contains(CharSequence)
---
 .../apache/commons/compress/harmony/pack200/NewAttributeBands.java    | 4 ++--
 .../apache/commons/compress/harmony/unpack200/AttributeLayout.java    | 4 ++--
 .../apache/commons/compress/harmony/unpack200/NewAttributeBands.java  | 4 ++--
 .../compress/harmony/unpack200/bytecode/ClassFileEntryTest.java       | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git 
a/src/main/java/org/apache/commons/compress/harmony/pack200/NewAttributeBands.java
 
b/src/main/java/org/apache/commons/compress/harmony/pack200/NewAttributeBands.java
index 00be20c2e..262b3ea19 100644
--- 
a/src/main/java/org/apache/commons/compress/harmony/pack200/NewAttributeBands.java
+++ 
b/src/main/java/org/apache/commons/compress/harmony/pack200/NewAttributeBands.java
@@ -558,8 +558,8 @@ public class NewAttributeBands extends BandSet {
         if (layoutElement.indexOf('P') >= 0) {
             return Codec.BCI5;
         }
-        if (layoutElement.indexOf('S') >= 0 && layoutElement.indexOf("KS") < 0 
//$NON-NLS-1$
-                && layoutElement.indexOf("RS") < 0) { //$NON-NLS-1$
+        if (layoutElement.indexOf('S') >= 0 && !layoutElement.contains("KS") 
//$NON-NLS-1$
+                && !layoutElement.contains("RS")) { //$NON-NLS-1$
             return Codec.SIGNED5;
         }
         if (layoutElement.indexOf('B') >= 0) {
diff --git 
a/src/main/java/org/apache/commons/compress/harmony/unpack200/AttributeLayout.java
 
b/src/main/java/org/apache/commons/compress/harmony/unpack200/AttributeLayout.java
index 4e93859bf..72c675f4e 100644
--- 
a/src/main/java/org/apache/commons/compress/harmony/unpack200/AttributeLayout.java
+++ 
b/src/main/java/org/apache/commons/compress/harmony/unpack200/AttributeLayout.java
@@ -302,8 +302,8 @@ public class AttributeLayout implements IMatcher {
         if (layout.indexOf('P') >= 0) {
             return Codec.BCI5;
         }
-        if (layout.indexOf('S') >= 0 && layout.indexOf("KS") < 0 //$NON-NLS-1$
-                && layout.indexOf("RS") < 0) { //$NON-NLS-1$
+        if (layout.indexOf('S') >= 0 && !layout.contains("KS") //$NON-NLS-1$
+                && !layout.contains("RS")) { //$NON-NLS-1$
             return Codec.SIGNED5;
         }
         if (layout.indexOf('B') >= 0) {
diff --git 
a/src/main/java/org/apache/commons/compress/harmony/unpack200/NewAttributeBands.java
 
b/src/main/java/org/apache/commons/compress/harmony/unpack200/NewAttributeBands.java
index cc0a339dc..3fd5abb11 100644
--- 
a/src/main/java/org/apache/commons/compress/harmony/unpack200/NewAttributeBands.java
+++ 
b/src/main/java/org/apache/commons/compress/harmony/unpack200/NewAttributeBands.java
@@ -609,8 +609,8 @@ public class NewAttributeBands extends BandSet {
         if (layoutElement.indexOf('P') >= 0) {
             return Codec.BCI5;
         }
-        if (layoutElement.indexOf('S') >= 0 && layoutElement.indexOf("KS") < 0 
//$NON-NLS-1$
-                && layoutElement.indexOf("RS") < 0) { //$NON-NLS-1$
+        if (layoutElement.indexOf('S') >= 0 && !layoutElement.contains("KS") 
//$NON-NLS-1$
+                && !layoutElement.contains("RS")) { //$NON-NLS-1$
             return Codec.SIGNED5;
         }
         if (layoutElement.indexOf('B') >= 0) {
diff --git 
a/src/test/java/org/apache/commons/compress/harmony/unpack200/bytecode/ClassFileEntryTest.java
 
b/src/test/java/org/apache/commons/compress/harmony/unpack200/bytecode/ClassFileEntryTest.java
index dcc2db6ec..58b3b89db 100644
--- 
a/src/test/java/org/apache/commons/compress/harmony/unpack200/bytecode/ClassFileEntryTest.java
+++ 
b/src/test/java/org/apache/commons/compress/harmony/unpack200/bytecode/ClassFileEntryTest.java
@@ -27,7 +27,7 @@ public class ClassFileEntryTest {
     private void checkEquality(final Object equal1, final Object equal2, final 
String toString, final Object unequal) {
         assertEquals(equal1, equal2);
         assertEquals(equal1.hashCode(), equal2.hashCode());
-        assertTrue(equal1.toString().indexOf(toString) >= 0);
+        assertTrue(equal1.toString().contains(toString));
         assertNotEquals(equal1, unequal);
         assertNotEquals(equal2, unequal);
         assertNotEquals(unequal, equal1);