You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by eb...@apache.org on 2014/04/23 14:42:41 UTC
svn commit: r1589392 - in /commons/proper/bcel/trunk/src:
main/java/org/apache/bcel/classfile/ main/java/org/apache/bcel/util/
test/java/org/apache/bcel/
Author: ebourg
Date: Wed Apr 23 12:42:41 2014
New Revision: 1589392
URL: http://svn.apache.org/r1589392
Log:
Replaced indexOf() with contains()
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Utility.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/ClassLoader.java
commons/proper/bcel/trunk/src/test/java/org/apache/bcel/AnnotationGenTestCase.java
commons/proper/bcel/trunk/src/test/java/org/apache/bcel/ElementValueGenTestCase.java
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Utility.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Utility.java?rev=1589392&r1=1589391&r2=1589392&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Utility.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/classfile/Utility.java Wed Apr 23 12:42:41 2014
@@ -678,7 +678,7 @@ public abstract class Utility {
StringBuilder buf = new StringBuilder("(");
String type;
int index;
- int var_index = (access.indexOf("static") >= 0) ? 0 : 1;
+ int var_index = access.contains("static") ? 0 : 1;
try { // Read all declarations between for `(' and `)'
if (signature.charAt(0) != '(') {
throw new ClassFormatException("Invalid method signature: " + signature);
@@ -736,7 +736,7 @@ public abstract class Utility {
public static String replace( String str, String old, String new_ ) {
int index, old_index;
try {
- if (str.indexOf(old) != -1) { // `old' found in str
+ if (str.contains(old)) { // `old' found in str
StringBuilder buf = new StringBuilder();
old_index = 0; // String start offset
// While we have something to replace
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/ClassLoader.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/ClassLoader.java?rev=1589392&r1=1589391&r2=1589392&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/ClassLoader.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/ClassLoader.java Wed Apr 23 12:42:41 2014
@@ -115,7 +115,7 @@ public class ClassLoader extends java.la
JavaClass clazz = null;
/* Third try: Special request?
*/
- if (class_name.indexOf("$$BCEL$$") >= 0) {
+ if (class_name.contains("$$BCEL$$")) {
clazz = createClass(class_name);
} else { // Fourth try: Load classes via repository
if ((clazz = repository.loadClass(class_name)) != null) {
Modified: commons/proper/bcel/trunk/src/test/java/org/apache/bcel/AnnotationGenTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/bcel/AnnotationGenTestCase.java?rev=1589392&r1=1589391&r2=1589392&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/bcel/AnnotationGenTestCase.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/bcel/AnnotationGenTestCase.java Wed Apr 23 12:42:41 2014
@@ -64,7 +64,7 @@ public class AnnotationGenTestCase exten
// Check it looks right
assertTrue(
"Should include string 'id=4' but says: " + nvGen.toString(),
- nvGen.toString().indexOf("id=4") != -1);
+ nvGen.toString().contains("id=4"));
ObjectType t = new ObjectType("SimpleAnnotation");
List<ElementValuePairGen> elements = new ArrayList<ElementValuePairGen>();
elements.add(nvGen);
@@ -89,7 +89,7 @@ public class AnnotationGenTestCase exten
// Check it looks right
assertTrue(
"Should include string 'id=4' but says: " + nvGen.toString(),
- nvGen.toString().indexOf("id=4") != -1);
+ nvGen.toString().contains("id=4"));
ObjectType t = new ObjectType("SimpleAnnotation");
List<ElementValuePairGen> elements = new ArrayList<ElementValuePairGen>();
elements.add(nvGen);
Modified: commons/proper/bcel/trunk/src/test/java/org/apache/bcel/ElementValueGenTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/bcel/ElementValueGenTestCase.java?rev=1589392&r1=1589391&r2=1589392&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/bcel/ElementValueGenTestCase.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/bcel/ElementValueGenTestCase.java Wed Apr 23 12:42:41 2014
@@ -205,8 +205,7 @@ public class ElementValueGenTestCase ext
ObjectType classType = new ObjectType("java.lang.Integer");
ClassElementValueGen evg = new ClassElementValueGen(classType, cp);
assertTrue("Unexpected value for contained class: '"
- + evg.getClassString() + "'", evg.getClassString().indexOf(
- "Integer") != -1);
+ + evg.getClassString() + "'", evg.getClassString().contains("Integer"));
checkSerialize(evg, cp);
}