aboutsummaryrefslogtreecommitdiffstats
path: root/org.aspectj.ajdt.core
diff options
context:
space:
mode:
authoraclement <aclement>2010-07-08 20:48:32 +0000
committeraclement <aclement>2010-07-08 20:48:32 +0000
commit346c44fdbfe801bb481af0041bf3d00ba4a999e7 (patch)
tree15b29362c61307774399925d013a0917b98ad9c0 /org.aspectj.ajdt.core
parent9c7c7a283552645bd2b431f846fdc8faa5384c52 (diff)
downloadaspectj-346c44fdbfe801bb481af0041bf3d00ba4a999e7.tar.gz
aspectj-346c44fdbfe801bb481af0041bf3d00ba4a999e7.zip
generics
Diffstat (limited to 'org.aspectj.ajdt.core')
-rw-r--r--org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java2
-rw-r--r--org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AsmHierarchyBuilder.java18
2 files changed, 10 insertions, 10 deletions
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java
index 257485643..220b1f354 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java
@@ -287,7 +287,7 @@ public class AjBuildManager implements IOutputClassFileNameProvider, IBinarySour
// System.err.println("XXXX start inc ");
AsmManager.setLastActiveStructureModel(state.getStructureModel());
binarySourcesForTheNextCompile = state.getBinaryFilesToCompile(true);
- Set files = state.getFilesToCompile(true);
+ Set<File> files = state.getFilesToCompile(true);
if (buildConfig.isEmacsSymMode() || buildConfig.isGenerateModelMode()) {
if (AsmManager.attemptIncrementalModelRepairs) {
state.getStructureModel().resetDeltaProcessing();
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AsmHierarchyBuilder.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AsmHierarchyBuilder.java
index bb31c6ce2..6a5884dbc 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AsmHierarchyBuilder.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AsmHierarchyBuilder.java
@@ -301,8 +301,8 @@ public class AsmHierarchyBuilder extends ASTVisitor {
if (typeDeclaration.annotations != null) {
for (int i = 0; i < typeDeclaration.annotations.length; i++) {
Annotation annotation = typeDeclaration.annotations[i];
- if (Arrays.equals(annotation.type.getTypeBindingPublic(scope).signature(), "Lorg/aspectj/lang/annotation/Aspect;"
- .toCharArray())) {
+ if (Arrays.equals(annotation.type.getTypeBindingPublic(scope).signature(),
+ "Lorg/aspectj/lang/annotation/Aspect;".toCharArray())) {
kind = IProgramElement.Kind.ASPECT;
if (!(typeDeclaration instanceof AspectDeclaration)) {
isAnnotationStyleAspect = true;
@@ -397,8 +397,8 @@ public class AsmHierarchyBuilder extends ASTVisitor {
if (memberTypeDeclaration.annotations != null) {
for (int i = 0; i < memberTypeDeclaration.annotations.length; i++) {
Annotation annotation = memberTypeDeclaration.annotations[i];
- if (Arrays.equals(annotation.type.getTypeBindingPublic(scope).signature(), "Lorg/aspectj/lang/annotation/Aspect;"
- .toCharArray())) {
+ if (Arrays.equals(annotation.type.getTypeBindingPublic(scope).signature(),
+ "Lorg/aspectj/lang/annotation/Aspect;".toCharArray())) {
kind = IProgramElement.Kind.ASPECT;
if (!(memberTypeDeclaration instanceof AspectDeclaration)) {
isAnnotationStyleAspect = true;
@@ -457,8 +457,8 @@ public class AsmHierarchyBuilder extends ASTVisitor {
if (memberTypeDeclaration.annotations != null) {
for (int i = 0; i < memberTypeDeclaration.annotations.length; i++) {
Annotation annotation = memberTypeDeclaration.annotations[i];
- if (Arrays.equals(annotation.type.getTypeBindingPublic(scope).signature(), "Lorg/aspectj/lang/annotation/Aspect;"
- .toCharArray())) {
+ if (Arrays.equals(annotation.type.getTypeBindingPublic(scope).signature(),
+ "Lorg/aspectj/lang/annotation/Aspect;".toCharArray())) {
kind = IProgramElement.Kind.ASPECT;
if (!(memberTypeDeclaration instanceof AspectDeclaration)) {
isAnnotationStyleAspect = true;
@@ -540,7 +540,7 @@ public class AsmHierarchyBuilder extends ASTVisitor {
Declare decl = dDeclaration.declareDecl;
if (decl instanceof DeclareParents) {
TypePatternList tpl = ((DeclareParents) decl).getParents();
- List parents = new ArrayList();
+ List<String> parents = new ArrayList<String>();
for (int i = 0; i < tpl.size(); i++) {
parents.add(tpl.get(i).getExactType().getName().replaceAll("\\$", "."));
}
@@ -738,7 +738,7 @@ public class AsmHierarchyBuilder extends ASTVisitor {
// } catch (NullPointerException npe) {
// memberName = "<undefined>";
// }
- //
+ //
// peNode.setBytecodeName(memberName);
// peNode.setBytecodeSignature(memberBytecodeSignature);
// }
@@ -796,7 +796,7 @@ public class AsmHierarchyBuilder extends ASTVisitor {
private ProgramElement getImportReferencesRoot() {
IProgramElement element = (IProgramElement) stack.peek();
- boolean hasPackageDeclaration = ((IProgramElement) element.getChildren().get(0)).getKind().isPackageDeclaration();
+ boolean hasPackageDeclaration = (element.getChildren().get(0)).getKind().isPackageDeclaration();
return (ProgramElement) element.getChildren().get(hasPackageDeclaration ? 1 : 0);
}