summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
authorAndrew John Hughes <gnu_andrew@member.fsf.org>2008-05-07 20:18:01 +0000
committerAndrew John Hughes <gnu_andrew@member.fsf.org>2008-05-07 20:18:01 +0000
commit12e81a8ae1a7b68d5616a781f2c4f8915c3b3469 (patch)
treebd4c73ba22e1b30df5dbedff47b685fe57912a02 /java
parentb45fa805fdac0a49b3e3ddf9e4c545c828c7c744 (diff)
downloadclasspath-12e81a8ae1a7b68d5616a781f2c4f8915c3b3469.tar.gz
2008-05-07 Andrew John Hughes <gnu_andrew@member.fsf.org>
Add generics to these classes. * gnu/java/util/regex/RETokenOneOf.java: Use an ArrayList and a Deque instead of a Vector and a Stack to remove unnecessary synchronisation. * gnu/java/util/regex/RETokenRepeated.java: Replace custom FindMatchControlStack class with a generic Deque. * java/util/regex/Pattern.java: Use a generic ArrayList instance.
Diffstat (limited to 'java')
-rw-r--r--java/util/regex/Pattern.java6
1 files changed, 2 insertions, 4 deletions
diff --git a/java/util/regex/Pattern.java b/java/util/regex/Pattern.java
index 217ce0862..35ec0b89e 100644
--- a/java/util/regex/Pattern.java
+++ b/java/util/regex/Pattern.java
@@ -191,7 +191,7 @@ public final class Pattern implements Serializable
public String[] split (CharSequence input, int limit)
{
Matcher matcher = new Matcher(this, input);
- ArrayList list = new ArrayList();
+ ArrayList<String> list = new ArrayList<String>();
int empties = 0;
int count = 0;
int start = 0;
@@ -251,9 +251,7 @@ public final class Pattern implements Serializable
list.add(t);
}
- String[] output = new String [list.size()];
- list.toArray(output);
- return output;
+ return list.toArray(new String[list.size()]);
}
public String pattern ()