diff options
| author | aclement <aclement> | 2007-02-27 13:30:51 +0000 |
|---|---|---|
| committer | aclement <aclement> | 2007-02-27 13:30:51 +0000 |
| commit | 907dc1b73d052f9a0f95498b6ed5a92e0517cf65 (patch) | |
| tree | 5eeae114b248cf1098e0fbd2e600620f9a3bd251 | |
| parent | b39189a3136651450226b37a0f29fa1260837d7f (diff) | |
| download | aspectj-907dc1b73d052f9a0f95498b6ed5a92e0517cf65.tar.gz aspectj-907dc1b73d052f9a0f95498b6ed5a92e0517cf65.zip | |
optimization: if forcing a public type public, dont consider it a change!
| -rw-r--r-- | weaver/src/org/aspectj/weaver/bcel/BcelTypeMunger.java | 3 | ||||
| -rw-r--r-- | weaver/src/org/aspectj/weaver/bcel/LazyClassGen.java | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/weaver/src/org/aspectj/weaver/bcel/BcelTypeMunger.java b/weaver/src/org/aspectj/weaver/bcel/BcelTypeMunger.java index 0a392cc26..016bf8a68 100644 --- a/weaver/src/org/aspectj/weaver/bcel/BcelTypeMunger.java +++ b/weaver/src/org/aspectj/weaver/bcel/BcelTypeMunger.java @@ -520,8 +520,7 @@ public class BcelTypeMunger extends ConcreteTypeMunger { return true; //throw new BCException("no match for " + member + " in " + gen); } else if (member.getKind() == Member.STATIC_INITIALIZATION) { - gen.forcePublic(); - return true; + return gen.forcePublic(); } else { throw new RuntimeException("unimplemented"); } diff --git a/weaver/src/org/aspectj/weaver/bcel/LazyClassGen.java b/weaver/src/org/aspectj/weaver/bcel/LazyClassGen.java index 6f6743f47..8f414f848 100644 --- a/weaver/src/org/aspectj/weaver/bcel/LazyClassGen.java +++ b/weaver/src/org/aspectj/weaver/bcel/LazyClassGen.java @@ -1321,8 +1321,10 @@ public final class LazyClassGen { } - public void forcePublic() { + public boolean forcePublic() { + if (myGen.isPublic()) return false; myGen.setAccessFlags(Utility.makePublic(myGen.getAccessFlags())); + return true; } |