From 2301b3677678e86673ebd0cbe7bb9740ebfba84a Mon Sep 17 00:00:00 2001 From: Andrey Turbanov Date: Sat, 26 Feb 2022 14:17:56 +0300 Subject: [PATCH] Cleanup redundant type casts, due to too weak variable type declaration --- .../ajde/internal/LstBuildConfigManager.java | 4 ++-- .../org/aspectj/ajde/ui/BuildConfigModel.java | 4 ++-- .../ui/internal/TreeStructureViewBuilder.java | 3 +-- .../builder/EmacsStructureModelManager.java | 14 +++++------- .../eclipse/jdt/core/dom/AjASTConverter.java | 8 +++---- .../aspectj/weaver/CrosscuttingMembers.java | 22 +++++-------------- .../weaver/patterns/AnnotationPointcut.java | 3 +-- .../weaver/tools/StandardPointcutParser.java | 3 +-- .../cflowstack/ThreadCounterImpl11.java | 3 +-- .../org/aspectj/tools/ant/taskdefs/Ajc2.java | 8 +++---- .../aspectj/tools/ant/taskdefs/AjcTask.java | 3 +-- .../org/aspectj/weaver/bcel/BcelShadow.java | 3 +-- .../org/aspectj/weaver/bcel/BcelWeaver.java | 3 +-- .../org/aspectj/weaver/bcel/LazyClassGen.java | 5 ++--- .../loadtime/definition/SimpleAOPParser.java | 3 +-- ...5ReflectionBasedReferenceTypeDelegate.java | 3 +-- .../aspectj/weaver/tools/WeavingAdaptor.java | 3 +-- 17 files changed, 35 insertions(+), 60 deletions(-) diff --git a/ajde/src/main/java/org/aspectj/ajde/internal/LstBuildConfigManager.java b/ajde/src/main/java/org/aspectj/ajde/internal/LstBuildConfigManager.java index 5a90fe77b..e775810c3 100644 --- a/ajde/src/main/java/org/aspectj/ajde/internal/LstBuildConfigManager.java +++ b/ajde/src/main/java/org/aspectj/ajde/internal/LstBuildConfigManager.java @@ -276,8 +276,8 @@ public class LstBuildConfigManager implements BuildConfigManager { } private void notifyConfigChanged() { - for (Object element : listeners) { - ((BuildConfigListener) element).currConfigChanged(currConfigFilePath); + for (BuildConfigListener element : listeners) { + element.currConfigChanged(currConfigFilePath); } } diff --git a/ajde/src/main/java/org/aspectj/ajde/ui/BuildConfigModel.java b/ajde/src/main/java/org/aspectj/ajde/ui/BuildConfigModel.java index 31b64fb2a..eadda2389 100644 --- a/ajde/src/main/java/org/aspectj/ajde/ui/BuildConfigModel.java +++ b/ajde/src/main/java/org/aspectj/ajde/ui/BuildConfigModel.java @@ -112,8 +112,8 @@ public class BuildConfigModel { } if (node != null && node.getChildren() != null) { - for (Object element : node.getChildren()) { - BuildConfigNode foundNode = findNodeForSourceLineHelper((BuildConfigNode) element, sourceFilePath, lineNumber); + for (BuildConfigNode element : node.getChildren()) { + BuildConfigNode foundNode = findNodeForSourceLineHelper(element, sourceFilePath, lineNumber); if (foundNode != null) return foundNode; } diff --git a/ajde/src/main/java/org/aspectj/ajde/ui/internal/TreeStructureViewBuilder.java b/ajde/src/main/java/org/aspectj/ajde/ui/internal/TreeStructureViewBuilder.java index 6def17bd6..8348681c6 100644 --- a/ajde/src/main/java/org/aspectj/ajde/ui/internal/TreeStructureViewBuilder.java +++ b/ajde/src/main/java/org/aspectj/ajde/ui/internal/TreeStructureViewBuilder.java @@ -125,8 +125,7 @@ public class TreeStructureViewBuilder { } } if (node.getChildren() != null) { - for (Object element : node.getChildren()) { - IProgramElement IProgramElement = (IProgramElement)element; + for (IProgramElement IProgramElement : node.getChildren()) { if (acceptNode(IProgramElement, properties)) { children.add(createViewNode(IProgramElement, properties)); } diff --git a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/EmacsStructureModelManager.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/EmacsStructureModelManager.java index aba047974..ed0b9aa69 100644 --- a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/EmacsStructureModelManager.java +++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/EmacsStructureModelManager.java @@ -95,11 +95,10 @@ public class EmacsStructureModelManager { private void printDecls(IProgramElement node) { print("("); - for (Object nodeObject : node.getChildren()) { + for (IProgramElement child : node.getChildren()) { // this ignores relations on the compile unit // throw new RuntimeException("unimplemented"); // if (nodeObject instanceof IProgramElement) { - IProgramElement child = (IProgramElement) nodeObject; printDecl(child, true); // } // else if (nodeObject instanceof LinkNode) { @@ -179,13 +178,10 @@ public class EmacsStructureModelManager { if (it3.hasNext()) { while (it3.hasNext()) { // this ignores relations on the compile unit - Object nodeObject = it3.next(); - if (nodeObject instanceof IProgramElement) { - IProgramElement currNode = (IProgramElement) nodeObject; - if (// !currNode.isStmntKind() && - !currNode.getKind().equals("")) { - printDecl(currNode, true); - } + IProgramElement currNode = it3.next(); + if (// !currNode.isStmntKind() && + !currNode.getKind().equals("")) { + printDecl(currNode, true); } } } diff --git a/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AjASTConverter.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AjASTConverter.java index c38fbd96e..bc4904bd7 100644 --- a/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AjASTConverter.java +++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AjASTConverter.java @@ -658,10 +658,10 @@ public class AjASTConverter extends ASTConverter { } else if (declare instanceof DeclareParents) { DeclareParents dp = (DeclareParents) declare; declareDeclaration = new org.aspectj.org.eclipse.jdt.core.dom.DeclareParentsDeclaration(this.ast, dp.isExtends()); - org.aspectj.org.eclipse.jdt.core.dom.PatternNode pNode = convert(dp.getChild()); + AbstractTypePattern pNode = convert(dp.getChild()); if (pNode instanceof AbstractTypePattern) { ((DeclareParentsDeclaration) declareDeclaration) - .setChildTypePattern((AbstractTypePattern) pNode); + .setChildTypePattern(pNode); } TypePattern[] weaverTypePatterns = dp.getParents().getTypePatterns(); List typePatterns = ((DeclareParentsDeclaration) declareDeclaration).parentTypePatterns(); @@ -680,10 +680,10 @@ public class AjASTConverter extends ASTConverter { declareDeclaration = new DeclareSoftDeclaration(this.ast); DeclareSoft ds = (DeclareSoft) declare; ((DeclareSoftDeclaration) declareDeclaration).setPointcut(convert(ds.getPointcut())); - org.aspectj.org.eclipse.jdt.core.dom.PatternNode pNode = convert(ds.getException()); + AbstractTypePattern pNode = convert(ds.getException()); if (pNode instanceof AbstractTypePattern) { ((DeclareSoftDeclaration) declareDeclaration) - .setTypePattern((AbstractTypePattern) pNode); + .setTypePattern(pNode); } } diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/CrosscuttingMembers.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/CrosscuttingMembers.java index 98480f661..6bfd8a897 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/CrosscuttingMembers.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/CrosscuttingMembers.java @@ -343,25 +343,15 @@ public class CrosscuttingMembers { Set theseTypeMungers = new HashSet<>(); Set otherTypeMungers = new HashSet<>(); if (!careAboutShadowMungers) { - for (Object o : typeMungers) { - if (o instanceof ConcreteTypeMunger) { - ConcreteTypeMunger typeMunger = (ConcreteTypeMunger) o; - if (!typeMunger.existsToSupportShadowMunging()) { - theseTypeMungers.add(typeMunger); - } - } else { - theseTypeMungers.add(o); + for (ConcreteTypeMunger typeMunger : typeMungers) { + if (!typeMunger.existsToSupportShadowMunging()) { + theseTypeMungers.add(typeMunger); } } - for (Object o : other.typeMungers) { - if (o instanceof ConcreteTypeMunger) { - ConcreteTypeMunger typeMunger = (ConcreteTypeMunger) o; - if (!typeMunger.existsToSupportShadowMunging()) { - otherTypeMungers.add(typeMunger); - } - } else { - otherTypeMungers.add(o); + for (ConcreteTypeMunger typeMunger : other.typeMungers) { + if (!typeMunger.existsToSupportShadowMunging()) { + otherTypeMungers.add(typeMunger); } } } else { diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AnnotationPointcut.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AnnotationPointcut.java index 5f7cd1553..6742e9091 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AnnotationPointcut.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AnnotationPointcut.java @@ -140,8 +140,7 @@ public class AnnotationPointcut extends NameBindingPointcut { if (kind == Shadow.FieldGet || kind == Shadow.FieldSet) { // FIXME asc should include supers with getInterTypeMungersIncludingSupers ? List mungers = rMember.getDeclaringType().resolve(shadow.getIWorld()).getInterTypeMungers(); - for (Object munger : mungers) { - ConcreteTypeMunger typeMunger = (ConcreteTypeMunger) munger; + for (ConcreteTypeMunger typeMunger : mungers) { if (typeMunger.getMunger() instanceof NewFieldTypeMunger) { ResolvedMember fakerm = typeMunger.getSignature(); if (fakerm.equals(member)) { diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/StandardPointcutParser.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/StandardPointcutParser.java index 9565230dd..5c4c5423a 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/StandardPointcutParser.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/StandardPointcutParser.java @@ -148,8 +148,7 @@ public class StandardPointcutParser { */ private StandardPointcutParser(Set supportedPointcutKinds, World world) { supportedPrimitives = supportedPointcutKinds; - for (Object supportedPointcutKind : supportedPointcutKinds) { - PointcutPrimitive element = (PointcutPrimitive) supportedPointcutKind; + for (PointcutPrimitive element : supportedPointcutKinds) { if ((element == PointcutPrimitive.IF) || (element == PointcutPrimitive.CFLOW) || (element == PointcutPrimitive.CFLOW_BELOW)) { throw new UnsupportedOperationException("Cannot handle if, cflow, and cflowbelow primitives"); diff --git a/runtime/src/main/java/org/aspectj/runtime/internal/cflowstack/ThreadCounterImpl11.java b/runtime/src/main/java/org/aspectj/runtime/internal/cflowstack/ThreadCounterImpl11.java index b040dfd19..6f6a51bd9 100644 --- a/runtime/src/main/java/org/aspectj/runtime/internal/cflowstack/ThreadCounterImpl11.java +++ b/runtime/src/main/java/org/aspectj/runtime/internal/cflowstack/ThreadCounterImpl11.java @@ -48,8 +48,7 @@ public class ThreadCounterImpl11 implements ThreadCounter { Thread t = (Thread)e.nextElement(); if (!t.isAlive()) dead_stacks.add(t); } - for (Object dead_stack : dead_stacks) { - Thread t = (Thread) dead_stack; + for (Thread t : dead_stacks) { counters.remove(t); } change_count = 0; diff --git a/taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/Ajc2.java b/taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/Ajc2.java index 87f2f4423..9215efb23 100644 --- a/taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/Ajc2.java +++ b/taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/Ajc2.java @@ -414,8 +414,8 @@ public class Ajc2 extends Javac { List newIncludes = new ArrayList<>(); List newArguments = new ArrayList<>(); if (argfiles != null) { - for (Object o : argfiles) { - File argfile = ((Argfile) o).getFile(); + for (Argfile o : argfiles) { + File argfile = o.getFile(); expandArgfile(argfile, newIncludes, newArguments); } } @@ -442,8 +442,8 @@ public class Ajc2 extends Javac { } // Add the new included files - for (Object newInclude : newIncludes) { - newFiles.add((File) newInclude); + for (File newInclude : newIncludes) { + newFiles.add(newInclude); } // This is the same behavior found in Javac diff --git a/taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/AjcTask.java b/taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/AjcTask.java index aa9bd33a4..e49580dbe 100644 --- a/taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/AjcTask.java +++ b/taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/AjcTask.java @@ -1570,8 +1570,7 @@ public class AjcTask extends MatchingTask { } } if (0 < adapterFiles.size()) { - for (Object adapterFile : adapterFiles) { - File file = (File) adapterFile; + for (File file : adapterFiles) { if (file.canRead() && FileUtil.hasSourceSuffix(file)) { list.add(file.getAbsolutePath()); } diff --git a/weaver/src/main/java/org/aspectj/weaver/bcel/BcelShadow.java b/weaver/src/main/java/org/aspectj/weaver/bcel/BcelShadow.java index 9640fe118..d814903c9 100644 --- a/weaver/src/main/java/org/aspectj/weaver/bcel/BcelShadow.java +++ b/weaver/src/main/java/org/aspectj/weaver/bcel/BcelShadow.java @@ -1510,8 +1510,7 @@ public class BcelShadow extends Shadow { if (foundMember == null) { // check the ITD'd dooberries List mungers = relevantType.resolve(world).getInterTypeMungers(); - for (Object munger : mungers) { - ConcreteTypeMunger typeMunger = (ConcreteTypeMunger) munger; + for (ConcreteTypeMunger typeMunger : mungers) { if (typeMunger.getMunger() instanceof NewMethodTypeMunger || typeMunger.getMunger() instanceof NewConstructorTypeMunger) { ResolvedMember fakerm = typeMunger.getSignature(); diff --git a/weaver/src/main/java/org/aspectj/weaver/bcel/BcelWeaver.java b/weaver/src/main/java/org/aspectj/weaver/bcel/BcelWeaver.java index 53f71df56..ccea81f49 100644 --- a/weaver/src/main/java/org/aspectj/weaver/bcel/BcelWeaver.java +++ b/weaver/src/main/java/org/aspectj/weaver/bcel/BcelWeaver.java @@ -1257,8 +1257,7 @@ public class BcelWeaver { List l = world.getCrosscuttingMembersSet().getShadowMungers(); Set alreadyWarnedLocations = new HashSet<>(); - for (Object o : l) { - ShadowMunger element = (ShadowMunger) o; + for (ShadowMunger element : l) { // This will stop us incorrectly reporting deow checkers: if (element instanceof BcelAdvice) { BcelAdvice ba = (BcelAdvice) element; diff --git a/weaver/src/main/java/org/aspectj/weaver/bcel/LazyClassGen.java b/weaver/src/main/java/org/aspectj/weaver/bcel/LazyClassGen.java index 9155b4ba0..3feadca38 100644 --- a/weaver/src/main/java/org/aspectj/weaver/bcel/LazyClassGen.java +++ b/weaver/src/main/java/org/aspectj/weaver/bcel/LazyClassGen.java @@ -165,9 +165,8 @@ public final class LazyClassGen { } void addInlinedSourceFileInfo(String fullpath, int highestLineNumber) { - Object o = inlinedFiles.get(fullpath); - if (o != null) { - InlinedSourceFileInfo info = (InlinedSourceFileInfo) o; + InlinedSourceFileInfo info = inlinedFiles.get(fullpath); + if (info != null) { if (info.highestLineNumber < highestLineNumber) { info.highestLineNumber = highestLineNumber; } diff --git a/weaver/src/main/java/org/aspectj/weaver/loadtime/definition/SimpleAOPParser.java b/weaver/src/main/java/org/aspectj/weaver/loadtime/definition/SimpleAOPParser.java index 223d2c432..5aaec2e70 100644 --- a/weaver/src/main/java/org/aspectj/weaver/loadtime/definition/SimpleAOPParser.java +++ b/weaver/src/main/java/org/aspectj/weaver/loadtime/definition/SimpleAOPParser.java @@ -254,8 +254,7 @@ public class SimpleAOPParser { throws Exception { sap.startElement(xml.getName(), xml.getAttributes()); Iterable childrens = xml.getChildrens(); - for (Object children : childrens) { - LightXMLParser child = (LightXMLParser) children; + for (LightXMLParser child : childrens) { traverse(sap, child); } sap.endElement(xml.getName()); diff --git a/weaver/src/main/java/org/aspectj/weaver/reflect/Java15ReflectionBasedReferenceTypeDelegate.java b/weaver/src/main/java/org/aspectj/weaver/reflect/Java15ReflectionBasedReferenceTypeDelegate.java index 485aa0a76..c574e9196 100644 --- a/weaver/src/main/java/org/aspectj/weaver/reflect/Java15ReflectionBasedReferenceTypeDelegate.java +++ b/weaver/src/main/java/org/aspectj/weaver/reflect/Java15ReflectionBasedReferenceTypeDelegate.java @@ -269,8 +269,7 @@ public class Java15ReflectionBasedReferenceTypeDelegate extends ReflectionBasedR parser = new InternalUseOnlyPointcutParser(classLoaderReference.getClassLoader()); } Set additionalPointcutHandlers = world.getRegisteredPointcutHandlers(); - for (Object additionalPointcutHandler : additionalPointcutHandlers) { - PointcutDesignatorHandler handler = (PointcutDesignatorHandler) additionalPointcutHandler; + for (PointcutDesignatorHandler handler : additionalPointcutHandlers) { parser.registerPointcutDesignatorHandler(handler); } diff --git a/weaver/src/main/java/org/aspectj/weaver/tools/WeavingAdaptor.java b/weaver/src/main/java/org/aspectj/weaver/tools/WeavingAdaptor.java index f64fc87d5..3ce3eef6e 100644 --- a/weaver/src/main/java/org/aspectj/weaver/tools/WeavingAdaptor.java +++ b/weaver/src/main/java/org/aspectj/weaver/tools/WeavingAdaptor.java @@ -568,8 +568,7 @@ public class WeavingAdaptor implements IMessageContext { private void registerAspectLibraries(List aspectPath) { // System.err.println("? WeavingAdaptor.registerAspectLibraries(" + aspectPath + ")"); - for (Object o : aspectPath) { - String libName = (String) o; + for (String libName : aspectPath) { addAspectLibrary(libName); } -- 2.39.5