MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-89271 (RFE: SynchronizedMethod inspection warn about overridden methods)

Browse Source
This commit is contained in:
Bas Leijdekkers
2012-07-27 18:09:19 +02:00
parent 7e0cee5506
commit e0b3c8dca7
6 changed files with 80 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/InspectionGadgets/src/com/siyeh/InspectionGadgetsBundle.properties
+1
View File
@@ -1217,6 +1217,7 @@ object.notify.replace.quickfix=Replace with 'notifyAll()'
safe.lock.problem.descriptor=''{0}'' should be locked in front of a ''try'' block and unlocked in the corresponding ''finally'' block #loc
synchronized.method.problem.descriptor=Method ''{0}()'' declared <code>#ref</code> #loc
synchronized.method.include.option=Include native methods
synchronized.method.ignore.synchronized.super.option=Ignore overrides synchronized methods
synchronized.method.move.quickfix=Move synchronization into method
thread.run.replace.quickfix=Replace with 'start()'
volatile.field.problem.descriptor=Volatile field <code>#ref</code> of type ''{0}'' #loc
plugins/InspectionGadgets/src/com/siyeh/ig/threading/SynchronizedMethodInspection.java
+28 -24
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2003-2011 Dave Griffith, Bas Leijdekkers
* Copyright 2003-2012 Dave Griffith, Bas Leijdekkers
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
package com.siyeh.ig.threading;
import com.intellij.codeInspection.ProblemDescriptor;
import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel;
import com.intellij.codeInspection.ui.MultipleCheckboxOptionsPanel;
import com.intellij.openapi.project.Project;
import com.intellij.psi.*;
import com.intellij.psi.codeStyle.CodeStyleManager;
@@ -37,6 +37,8 @@ public class SynchronizedMethodInspection extends BaseInspection {
*/
public boolean m_includeNativeMethods = true;
@SuppressWarnings("PublicField")
public boolean ignoreSynchronizedSuperMethods = true;
@Override
@NotNull
@@ -69,13 +71,16 @@ public class SynchronizedMethodInspection extends BaseInspection {
@Override
public JComponent createOptionsPanel() {
return new SingleCheckboxOptionsPanel(InspectionGadgetsBundle.message(
"synchronized.method.include.option"),
this, "m_includeNativeMethods");
final MultipleCheckboxOptionsPanel panel = new MultipleCheckboxOptionsPanel(this);
panel.addCheckbox(InspectionGadgetsBundle.message("synchronized.method.include.option"), "m_includeNativeMethods");
panel.addCheckbox(InspectionGadgetsBundle.message("synchronized.method.ignore.synchronized.super.option"),
"ignoreSynchronizedSuperMethods");
return panel;
}
private static class SynchronizedMethodFix extends InspectionGadgetsFix {
@Override
@NotNull
public String getName() {
return InspectionGadgetsBundle.message(
@@ -86,11 +91,10 @@ public class SynchronizedMethodInspection extends BaseInspection {
public void doFix(Project project, ProblemDescriptor descriptor)
throws IncorrectOperationException {
final PsiElement nameElement = descriptor.getPsiElement();
final PsiModifierList modiferList =
(PsiModifierList)nameElement.getParent();
assert modiferList != null;
final PsiMethod method = (PsiMethod)modiferList.getParent();
modiferList.setModifierProperty(PsiModifier.SYNCHRONIZED, false);
final PsiModifierList modifierList = (PsiModifierList)nameElement.getParent();
assert modifierList != null;
final PsiMethod method = (PsiMethod)modifierList.getParent();
modifierList.setModifierProperty(PsiModifier.SYNCHRONIZED, false);
assert method != null;
final PsiCodeBlock body = method.getBody();
if (body == null) {
@@ -102,21 +106,15 @@ public class SynchronizedMethodInspection extends BaseInspection {
final PsiClass containingClass = method.getContainingClass();
assert containingClass != null;
final String className = containingClass.getName();
replacementText = "{ synchronized(" + className + ".class){" +
text.substring(1) + '}';
replacementText = "{ synchronized(" + className + ".class){" + text.substring(1) + '}';
}
else {
replacementText = "{ synchronized(this){" + text.substring(1) +
'}';
replacementText = "{ synchronized(this){" + text.substring(1) + '}';
}
final PsiElementFactory elementFactory =
JavaPsiFacade.getElementFactory(project);
final PsiCodeBlock block =
elementFactory.createCodeBlockFromText(replacementText,
null);
final PsiElementFactory elementFactory = JavaPsiFacade.getElementFactory(project);
final PsiCodeBlock block = elementFactory.createCodeBlockFromText(replacementText, null);
body.replace(block);
final CodeStyleManager codeStyleManager =
CodeStyleManager.getInstance(project);
final CodeStyleManager codeStyleManager = CodeStyleManager.getInstance(project);
codeStyleManager.reformat(method);
}
}
@@ -125,14 +123,20 @@ public class SynchronizedMethodInspection extends BaseInspection {
@Override
public void visitMethod(@NotNull PsiMethod method) {
//no call to super, so we don't drill into anonymous classes
if (!method.hasModifierProperty(PsiModifier.SYNCHRONIZED)) {
return;
}
if (!m_includeNativeMethods &&
method.hasModifierProperty(PsiModifier.NATIVE)) {
if (!m_includeNativeMethods && method.hasModifierProperty(PsiModifier.NATIVE)) {
return;
}
if (ignoreSynchronizedSuperMethods) {
final PsiMethod[] superMethods = method.findSuperMethods();
for (final PsiMethod superMethod : superMethods) {
if (superMethod.hasModifierProperty(PsiModifier.SYNCHRONIZED)) {
return;
}
}
}
registerModifierError(PsiModifier.SYNCHRONIZED, method, method);
}
}
plugins/InspectionGadgets/test/com/siyeh/igtest/threading/SynchronizedMethodInspection.java
-13
View File
@@ -1,13 +0,0 @@
package com.siyeh.igtest.threading;
public class SynchronizedMethodInspection {
public synchronized void fooBar() {
System.out.println("foo");
}
public static synchronized void bar() {
System.out.println("foo");
}
public synchronized native void fooBaz();
}
plugins/InspectionGadgets/test/com/siyeh/igtest/threading/synchronized_method/SynchronizedMethod.java
+21
View File
@@ -0,0 +1,21 @@
package com.siyeh.igtest.threading.synchronized_method;
public class SynchronizedMethod {
public synchronized void fooBar() {
System.out.println("foo");
}
public static synchronized void bar() {
System.out.println("foo");
}
public synchronized native void fooBaz();
static class X extends SynchronizedMethod {
@Override
public synchronized void fooBar() {
super.fooBar();
}
}
}
plugins/InspectionGadgets/test/com/siyeh/igtest/threading/synchronized_method/expected.xml
+17
View File
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<problems>
<problem>
<file>SynchronizedMethod.java</file>
<line>4</line>
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">'synchronized' method</problem_class>
<description>Method 'fooBar()' declared &lt;code&gt;synchronized&lt;/code&gt; #loc</description>
</problem>
<problem>
<file>SynchronizedMethod.java</file>
<line>8</line>
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">'synchronized' method</problem_class>
<description>Method 'bar()' declared &lt;code&gt;synchronized&lt;/code&gt; #loc</description>
</problem>
</problems>
plugins/InspectionGadgets/testsrc/com/siyeh/ig/threading/SynchronizedMethodInspectionTest.java
+13
View File
@@ -0,0 +1,13 @@
package com.siyeh.ig.threading;
import com.siyeh.ig.IGInspectionTestCase;
public class SynchronizedMethodInspectionTest extends IGInspectionTestCase {
public void test() throws Exception {
final SynchronizedMethodInspection tool = new SynchronizedMethodInspection();
tool.m_includeNativeMethods = false;
tool.ignoreSynchronizedSuperMethods = true;
doTest("com/siyeh/igtest/threading/synchronized_method", tool);
}
}