diff options
| author | Andy Clement <aclement@gopivotal.com> | 2014-04-01 08:10:34 -0700 |
|---|---|---|
| committer | Andy Clement <aclement@gopivotal.com> | 2014-04-01 08:10:34 -0700 |
| commit | f1f350f2bbc39241e67d5e350017f93d50468c6c (patch) | |
| tree | 2ed63b4daea67cab9c8cab7c624d3704f023e2ca /org.aspectj.matcher | |
| parent | bbc514a031fe0f9814b29d0199b5caef72e7cab0 (diff) | |
| download | aspectj-f1f350f2bbc39241e67d5e350017f93d50468c6c.tar.gz aspectj-f1f350f2bbc39241e67d5e350017f93d50468c6c.zip | |
ASM 5.0.1 plus polish/formatting
Diffstat (limited to 'org.aspectj.matcher')
| -rw-r--r-- | org.aspectj.matcher/src/org/aspectj/weaver/UnresolvedType.java | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/UnresolvedType.java b/org.aspectj.matcher/src/org/aspectj/weaver/UnresolvedType.java index 14d00e5b1..b5d085c3e 100644 --- a/org.aspectj.matcher/src/org/aspectj/weaver/UnresolvedType.java +++ b/org.aspectj.matcher/src/org/aspectj/weaver/UnresolvedType.java @@ -259,7 +259,6 @@ public class UnresolvedType implements Traceable, TypeVariableDeclaringElement { } public static UnresolvedType forGenericType(String name, TypeVariable[] tvbs, String genericSig) { - // TODO asc generics needs a declared sig String sig = nameToSignature(name); UnresolvedType ret = UnresolvedType.forSignature(sig); ret.typeKind = TypeKind.GENERIC; @@ -921,8 +920,9 @@ public class UnresolvedType implements Traceable, TypeVariableDeclaringElement { public String getPackageName() { if (packageName == null) { String name = getName(); - if (name.indexOf("<") != -1) { - name = name.substring(0, name.indexOf("<")); + int angly = name.indexOf('<'); + if (angly != -1) { + name = name.substring(0, angly); } int index = name.lastIndexOf('.'); if (index == -1) { @@ -934,8 +934,6 @@ public class UnresolvedType implements Traceable, TypeVariableDeclaringElement { return packageName; } - // TODO these move to a TypeUtils class - public static void writeArray(UnresolvedType[] types, CompressingDataOutputStream stream) throws IOException { int len = types.length; stream.writeShort(len); |