diff options
Diffstat (limited to 'ajde')
| -rw-r--r-- | ajde/src/org/aspectj/ajde/ui/StructureViewProperties.java | 3 | ||||
| -rw-r--r-- | ajde/src/org/aspectj/ajde/ui/internal/TreeStructureViewBuilder.java | 8 |
2 files changed, 7 insertions, 4 deletions
diff --git a/ajde/src/org/aspectj/ajde/ui/StructureViewProperties.java b/ajde/src/org/aspectj/ajde/ui/StructureViewProperties.java index 1fa0c00b8..230108d62 100644 --- a/ajde/src/org/aspectj/ajde/ui/StructureViewProperties.java +++ b/ajde/src/org/aspectj/ajde/ui/StructureViewProperties.java @@ -236,7 +236,8 @@ public class StructureViewProperties { public static final Granularity FILE = new Granularity("file"); public static final Granularity TYPE = new Granularity("type"); public static final Granularity MEMBER = new Granularity("member"); - public static final Granularity[] ALL = { PACKAGE, FILE, TYPE, MEMBER }; + public static final Granularity DECLARED_ELEMENTS = new Granularity("declared body elements"); + public static final Granularity[] ALL = { PACKAGE, FILE, TYPE, MEMBER, DECLARED_ELEMENTS }; private final String name; diff --git a/ajde/src/org/aspectj/ajde/ui/internal/TreeStructureViewBuilder.java b/ajde/src/org/aspectj/ajde/ui/internal/TreeStructureViewBuilder.java index 41a9a0bdc..5d4308951 100644 --- a/ajde/src/org/aspectj/ajde/ui/internal/TreeStructureViewBuilder.java +++ b/ajde/src/org/aspectj/ajde/ui/internal/TreeStructureViewBuilder.java @@ -150,9 +150,11 @@ public class TreeStructureViewBuilder { } private boolean acceptGranularity(ProgramElementNode.Kind kind, StructureViewProperties.Granularity granularity) { - if (kind == ProgramElementNode.Kind.CODE) return false; - - if (granularity == StructureViewProperties.Granularity.MEMBER) { + + if (granularity == StructureViewProperties.Granularity.DECLARED_ELEMENTS) { + return true; + } else if (granularity == StructureViewProperties.Granularity.MEMBER && + (kind == ProgramElementNode.Kind.CODE)) { return true; } else if (granularity == StructureViewProperties.Granularity.TYPE && (kind == ProgramElementNode.Kind.PROJECT |