diff options
| author | mkersten <mkersten> | 2003-08-16 08:51:11 +0000 |
|---|---|---|
| committer | mkersten <mkersten> | 2003-08-16 08:51:11 +0000 |
| commit | 3a495aad88865d64d3e8ee005241e7edbe5a7a82 (patch) | |
| tree | cdf50cf9c24640170898a00ec11e95b8c539253c /asm | |
| parent | eb12f56518d08c54fc17047749a5d2d66b3c4181 (diff) | |
| download | aspectj-3a495aad88865d64d3e8ee005241e7edbe5a7a82.tar.gz aspectj-3a495aad88865d64d3e8ee005241e7edbe5a7a82.zip | |
Fixed AJDT bug with truncation of labels (there was a weird substring call in AdviceActionDelegate). Fixed ASM/AJDT modifiers bug. Fixed ASM static initializers bug (we may want to change the way they show up, i.e. Added imports to ASM containment hierarchy. Fixed numerous AJBrwoser, JBuilder and NetBeans bugs.
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/src/org/aspectj/asm/IProgramElement.java | 2 | ||||
| -rw-r--r-- | asm/src/org/aspectj/asm/internal/ProgramElement.java | 12 |
2 files changed, 8 insertions, 6 deletions
diff --git a/asm/src/org/aspectj/asm/IProgramElement.java b/asm/src/org/aspectj/asm/IProgramElement.java index d15d944ab..944675e2b 100644 --- a/asm/src/org/aspectj/asm/IProgramElement.java +++ b/asm/src/org/aspectj/asm/IProgramElement.java @@ -179,6 +179,7 @@ public interface IProgramElement extends Serializable { public static final Kind FILE_JAVA = new Kind("java source file"); public static final Kind FILE_ASPECTJ = new Kind("aspect source file"); public static final Kind FILE_LST = new Kind("build configuration file"); + public static final Kind IMPORT_REFERENCE = new Kind("import reference"); public static final Kind CLASS = new Kind("class"); public static final Kind INTERFACE = new Kind("interface"); public static final Kind ASPECT = new Kind("aspect"); @@ -212,6 +213,7 @@ public interface IProgramElement extends Serializable { FILE_LST, CLASS, INTERFACE, + IMPORT_REFERENCE, ASPECT, INITIALIZER, INTER_TYPE_FIELD, diff --git a/asm/src/org/aspectj/asm/internal/ProgramElement.java b/asm/src/org/aspectj/asm/internal/ProgramElement.java index 8e7743e8b..fb89d06c3 100644 --- a/asm/src/org/aspectj/asm/internal/ProgramElement.java +++ b/asm/src/org/aspectj/asm/internal/ProgramElement.java @@ -218,12 +218,12 @@ public class ProgramElement implements IProgramElement { private static List genModifiers(int modifiers) { List modifiersList = new ArrayList(); if ((modifiers & AccStatic) != 0) modifiersList.add(IProgramElement.Modifiers.STATIC); - if ((modifiers & AccFinal) != 0) modifiersList.add(IProgramElement.Modifiers.STATIC); - if ((modifiers & AccSynchronized) != 0) modifiersList.add(IProgramElement.Modifiers.STATIC); - if ((modifiers & AccVolatile) != 0) modifiersList.add(IProgramElement.Modifiers.STATIC); - if ((modifiers & AccTransient) != 0) modifiersList.add(IProgramElement.Modifiers.STATIC); - if ((modifiers & AccNative) != 0) modifiersList.add(IProgramElement.Modifiers.STATIC); - if ((modifiers & AccAbstract) != 0) modifiersList.add(IProgramElement.Modifiers.STATIC); + if ((modifiers & AccFinal) != 0) modifiersList.add(IProgramElement.Modifiers.FINAL); + if ((modifiers & AccSynchronized) != 0) modifiersList.add(IProgramElement.Modifiers.SYNCHRONIZED); + if ((modifiers & AccVolatile) != 0) modifiersList.add(IProgramElement.Modifiers.VOLATILE); + if ((modifiers & AccTransient) != 0) modifiersList.add(IProgramElement.Modifiers.TRANSIENT); + if ((modifiers & AccNative) != 0) modifiersList.add(IProgramElement.Modifiers.NATIVE); + if ((modifiers & AccAbstract) != 0) modifiersList.add(IProgramElement.Modifiers.ABSTRACT); return modifiersList; } |