From 04924a69e95fe2da6aa061adb80ca766532fd0b3 Mon Sep 17 00:00:00 2001 From: Dave Griffith Date: Thu, 10 Feb 2005 23:54:31 +0300 Subject: [PATCH] (no message) --- .../InspectionGadgetsSVN.iml | 9 +++++++ .../InspectionGadgetsSVN.ipr | 2 +- plugins/InspectionGadgets/META-INF/plugin.xml | 6 +---- plugins/InspectionGadgets/build.xml | 5 ++-- .../com/siyeh/ig/BaseInspectionVisitor.java | 11 -------- .../com/siyeh/ig/InspectionGadgetsPlugin.java | 23 ----------------- .../confusing/NestedAssignmentInspection.java | 9 ++++--- .../EmptyCatchBlockInspection.java | 25 ++++--------------- .../UnnecessaryConstructorInspection.java | 9 +++++++ .../confusing/NestedAssignmentInspection.java | 13 +++++++--- 10 files changed, 43 insertions(+), 69 deletions(-) diff --git a/plugins/InspectionGadgets/InspectionGadgetsSVN.iml b/plugins/InspectionGadgets/InspectionGadgetsSVN.iml index 28a017346da5..0ac70f0557ab 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsSVN.iml +++ b/plugins/InspectionGadgets/InspectionGadgetsSVN.iml @@ -14,6 +14,15 @@ + + + + + + + + + diff --git a/plugins/InspectionGadgets/InspectionGadgetsSVN.ipr b/plugins/InspectionGadgets/InspectionGadgetsSVN.ipr index 12e1f157d046..f741bc6977be 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsSVN.ipr +++ b/plugins/InspectionGadgets/InspectionGadgetsSVN.ipr @@ -192,7 +192,7 @@ - + - \ No newline at end of file diff --git a/plugins/InspectionGadgets/build.xml b/plugins/InspectionGadgets/build.xml index 66855a60ebc8..180e9c151dba 100644 --- a/plugins/InspectionGadgets/build.xml +++ b/plugins/InspectionGadgets/build.xml @@ -3,7 +3,7 @@ - + @@ -17,6 +17,7 @@ + @@ -64,7 +65,7 @@ - + diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/BaseInspectionVisitor.java b/plugins/InspectionGadgets/src/com/siyeh/ig/BaseInspectionVisitor.java index d5cb8c567d35..b889af30c384 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/BaseInspectionVisitor.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/BaseInspectionVisitor.java @@ -5,7 +5,6 @@ import com.intellij.codeInspection.LocalQuickFix; import com.intellij.codeInspection.ProblemDescriptor; import com.intellij.codeInspection.ProblemHighlightType; import com.intellij.psi.*; -import com.siyeh.ig.dependency.DependencyMap; import java.util.ArrayList; import java.util.List; @@ -134,14 +133,4 @@ public abstract class BaseInspectionVisitor extends PsiRecursiveElementVisitor { } } - public DependencyMap fetchDependencyMap() - { - final DependencyMap dependencyMap = (DependencyMap) m_inspectionManager.getProject().getComponent(DependencyMap.class); - if(!m_onTheFly) - { - dependencyMap.waitForCompletion(); - } - return dependencyMap; - } - } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/InspectionGadgetsPlugin.java b/plugins/InspectionGadgets/src/com/siyeh/ig/InspectionGadgetsPlugin.java index 227bc585756f..70a4c19f644f 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/InspectionGadgetsPlugin.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/InspectionGadgetsPlugin.java @@ -14,7 +14,6 @@ import com.siyeh.ig.cloneable.CloneCallsSuperCloneInspection; import com.siyeh.ig.cloneable.CloneDeclaresCloneNotSupportedInspection; import com.siyeh.ig.cloneable.CloneableImplementsCloneInspection; import com.siyeh.ig.confusing.*; -import com.siyeh.ig.dependency.*; import com.siyeh.ig.encapsulation.*; import com.siyeh.ig.errorhandling.*; import com.siyeh.ig.finalization.FinalizeCallsSuperFinalizeInspection; @@ -31,9 +30,6 @@ import com.siyeh.ig.logging.NonStaticFinalLoggerInspection; import com.siyeh.ig.maturity.*; import com.siyeh.ig.methodmetrics.*; import com.siyeh.ig.naming.*; -import com.siyeh.ig.packaging.PackageEncapsulationInspection; -import com.siyeh.ig.packaging.PackageSizeInspection; -import com.siyeh.ig.packaging.PackageTangleInspection; import com.siyeh.ig.performance.*; import com.siyeh.ig.portability.*; import com.siyeh.ig.resources.IOResourceInspection; @@ -189,7 +185,6 @@ public class InspectionGadgetsPlugin implements ApplicationComponent, registerNamingInspections(); registerBugInspections(); registerCloneInspections(); - //registerDependencyInspections(); registerConfusingInspections(); registerAbstractionInspections(); registerClassLayoutInspections(); @@ -213,7 +208,6 @@ public class InspectionGadgetsPlugin implements ApplicationComponent, registerLoggingInspections(); registerSecurityInspections(); registerResourceManagementInspections(); - // registerPackagingInspections(); Collections.sort(m_inspectionClasses, new InspectionComparator()); } @@ -223,16 +217,6 @@ public class InspectionGadgetsPlugin implements ApplicationComponent, inspectionClasses.add(JDBCResourceInspection.class); } - private void registerDependencyInspections(){ - final List inspectionClasses = m_inspectionClasses; - inspectionClasses.add(LocalButterflyInspection.class); - inspectionClasses.add(LocalBreakableInspection.class); - inspectionClasses.add(LocalHubInspection.class); - inspectionClasses.add(GlobalButterflyInspection.class); - inspectionClasses.add(GlobalBreakableInspection.class); - inspectionClasses.add(GlobalHubInspection.class); - inspectionClasses.add(TangleInspection.class); - } private void registerLoggingInspections(){ final List inspectionClasses = m_inspectionClasses; @@ -241,13 +225,6 @@ public class InspectionGadgetsPlugin implements ApplicationComponent, inspectionClasses.add(NonStaticFinalLoggerInspection.class); } - private void registerPackagingInspections(){ - final List inspectionClasses = m_inspectionClasses; - inspectionClasses.add(PackageSizeInspection.class); - inspectionClasses.add(PackageEncapsulationInspection.class); - inspectionClasses.add(PackageTangleInspection.class); - } - private void registerSecurityInspections(){ final List inspectionClasses = m_inspectionClasses; inspectionClasses.add(DeserializableClassInSecureContextInspection.class); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/confusing/NestedAssignmentInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/confusing/NestedAssignmentInspection.java index b21d31b0abbf..28ecf5e1f39c 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/confusing/NestedAssignmentInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/confusing/NestedAssignmentInspection.java @@ -1,9 +1,7 @@ package com.siyeh.ig.confusing; import com.intellij.codeInspection.InspectionManager; -import com.intellij.psi.PsiAssignmentExpression; -import com.intellij.psi.PsiElement; -import com.intellij.psi.PsiExpressionStatement; +import com.intellij.psi.*; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; import com.siyeh.ig.ExpressionInspection; @@ -34,7 +32,10 @@ public class NestedAssignmentInspection extends ExpressionInspection { public void visitAssignmentExpression(PsiAssignmentExpression expression) { super.visitAssignmentExpression(expression); - if (expression.getParent() instanceof PsiExpressionStatement) { + final PsiElement parent = expression.getParent(); + final PsiElement grandparent = parent.getParent(); + if (parent instanceof PsiExpressionStatement || + grandparent instanceof PsiExpressionListStatement) { return; } registerError(expression); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/EmptyCatchBlockInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/EmptyCatchBlockInspection.java index d12b90e56636..3742774fa2e8 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/EmptyCatchBlockInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/EmptyCatchBlockInspection.java @@ -80,32 +80,17 @@ public class EmptyCatchBlockInspection extends StatementInspection { } } - final PsiCodeBlock[] catchBlocks = statement.getCatchBlocks(); - for (int i = 0; i < catchBlocks.length; i++) { - final PsiCodeBlock block = catchBlocks[i]; + final PsiCatchSection[] catchSections = statement.getCatchSections(); + for (int i = 0; i < catchSections.length; i++) { + final PsiCatchSection section = catchSections[i]; + final PsiCodeBlock block = section.getCatchBlock(); if (catchBlockIsEmpty(block)) { - final PsiElement catchToken = getCatchToken(statement, i); + final PsiElement catchToken = section.getFirstChild(); registerError(catchToken); } } } - private PsiElement getCatchToken(PsiTryStatement statement, int i) { - final PsiElement[] children = statement.getChildren(); - int catchNumber = 0; - for (int j = 0; j < children.length; j++) { - final PsiElement child = children[j]; - final String childText = child.getText(); - if ("catch".equals(childText)) { - if (catchNumber == i) { - return child; - } - catchNumber++; - } - } - return null; - } - private boolean catchBlockIsEmpty(PsiCodeBlock block) { if (m_includeComments) { final PsiElement[] children = block.getChildren(); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/verbose/UnnecessaryConstructorInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/verbose/UnnecessaryConstructorInspection.java index e9bd5b51c5e6..ce994008fecd 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/verbose/UnnecessaryConstructorInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/verbose/UnnecessaryConstructorInspection.java @@ -67,6 +67,15 @@ public class UnnecessaryConstructorInspection extends ClassInspection { if (parameterList.getParameters().length != 0) { return; } + final PsiReferenceList throwsList = constructor.getThrowsList(); + if(throwsList!=null) + { + final PsiJavaCodeReferenceElement[] elements = throwsList.getReferenceElements(); + if(elements.length!=0) + { + return; + } + } final PsiCodeBlock body = constructor.getBody(); if (body == null) { return; diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/confusing/NestedAssignmentInspection.java b/plugins/InspectionGadgets/test/com/siyeh/igtest/confusing/NestedAssignmentInspection.java index e48d2c2a49be..642e2de38f45 100644 --- a/plugins/InspectionGadgets/test/com/siyeh/igtest/confusing/NestedAssignmentInspection.java +++ b/plugins/InspectionGadgets/test/com/siyeh/igtest/confusing/NestedAssignmentInspection.java @@ -2,20 +2,27 @@ package com.siyeh.igtest.confusing; public class NestedAssignmentInspection { - public NestedAssignmentInspection() + public NestedAssignmentInspection() throws Exception { + super(); } public void foo() { final int[] baz = new int[3]; - final int i; - final int val = baz[i=2]; + int i; + int val = baz[i=2]; System.out.println("i = " + i); System.out.println("val = " + val); for(int j=0,k=0;j<1000;j += 1,k += 1) { } + barangus(i=2, val=3); + System.out.println("i = " + i); + System.out.println("val = " + val); + } + + private void barangus(int i, int val){ } }