This commit is contained in:
Maxim Shafirov
2012-04-19 15:41:40 +04:00
parent 0d7cc22ae6
commit 859f1f3a3f
36 changed files with 10 additions and 244 deletions
@@ -29,10 +29,6 @@ import java.awt.event.KeyEvent;
super(IdeBundle.message("button.add"));
}
public void setButton(AbstractButton button) {
super.setButton(button);
}
public void setPanel(BreakpointPanel panel) {
super.setPanel(panel);
getPanel().getTable().registerKeyboardAction(this, KeyStroke.getKeyStroke(KeyEvent.VK_INSERT, 0), JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
@@ -16,13 +16,12 @@
package com.intellij.debugger.ui.breakpoints.actions;
import com.intellij.debugger.ui.breakpoints.BreakpointPanel;
import com.intellij.ide.IdeBundle;
import com.intellij.openapi.actionSystem.*;
import com.intellij.openapi.fileEditor.FileEditorManager;
import com.intellij.openapi.fileEditor.OpenFileDescriptor;
import com.intellij.openapi.project.Project;
import com.intellij.ide.IdeBundle;
import javax.swing.*;
import java.awt.event.ActionEvent;
/**
@@ -47,9 +46,6 @@ public class GotoSourceAction extends BreakpointPanelAction {
FileEditorManager.getInstance(myProject).openTextEditor(editSourceDescriptor, true);
}
}
public void setButton(AbstractButton button) {
super.setButton(button);
}
public void setPanel(BreakpointPanel panel) {
super.setPanel(panel);
@@ -15,8 +15,8 @@
*/
package com.intellij.debugger.ui.breakpoints.actions;
import com.intellij.debugger.DebuggerManagerEx;
import com.intellij.debugger.DebuggerBundle;
import com.intellij.debugger.DebuggerManagerEx;
import com.intellij.debugger.ui.breakpoints.AnyExceptionBreakpoint;
import com.intellij.debugger.ui.breakpoints.Breakpoint;
import com.intellij.debugger.ui.breakpoints.BreakpointManager;
@@ -39,9 +39,6 @@ public class RemoveAction extends BreakpointPanelAction {
myProject = project;
}
public void setButton(AbstractButton button) {
super.setButton(button);
}
public void setPanel(BreakpointPanel panel) {
super.setPanel(panel);
@@ -15,8 +15,8 @@
*/
package com.intellij.debugger.ui.breakpoints.actions;
import com.intellij.debugger.ui.breakpoints.BreakpointPanel;
import com.intellij.debugger.DebuggerBundle;
import com.intellij.debugger.ui.breakpoints.BreakpointPanel;
import javax.swing.*;
import java.awt.event.ActionEvent;
@@ -30,9 +30,6 @@ public class SwitchViewAction extends BreakpointPanelAction {
super(DebuggerBundle.message("button.switch.view"));
}
public void setButton(AbstractButton button) {
super.setButton(button);
}
public void actionPerformed(ActionEvent e) {
getPanel().switchViews();
@@ -15,12 +15,11 @@
*/
package com.intellij.debugger.ui.breakpoints.actions;
import com.intellij.ide.IdeBundle;
import com.intellij.openapi.fileEditor.FileEditorManager;
import com.intellij.openapi.fileEditor.OpenFileDescriptor;
import com.intellij.openapi.project.Project;
import com.intellij.ide.IdeBundle;
import javax.swing.*;
import java.awt.event.ActionEvent;
/**
@@ -35,9 +34,6 @@ public class ViewSourceAction extends BreakpointPanelAction {
myProject = project;
}
public void setButton(AbstractButton button) {
super.setButton(button);
}
public void actionPerformed(ActionEvent e) {
OpenFileDescriptor editSourceDescriptor = getPanel().createEditSourceDescriptor(myProject);
@@ -1,82 +0,0 @@
/*
* Copyright 2000-2011 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.intellij.framework.addSupport;
import com.intellij.facet.*;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.module.ModuleType;
import com.intellij.openapi.roots.ModifiableModelsProvider;
import com.intellij.openapi.roots.ModifiableRootModel;
import com.intellij.openapi.roots.ui.configuration.FacetsProvider;
import org.jetbrains.annotations.NotNull;
import javax.swing.*;
/**
* @author nik
*/
public abstract class FacetBasedFrameworkSupportInModuleProvider<F extends Facet> extends FrameworkSupportInModuleProvider {
private static final Logger LOG = Logger.getInstance("#com.intellij.framework.addSupport.FacetBasedFrameworkSupportInModuleProvider");
private final FacetType<F, ?> myFacetType;
protected FacetBasedFrameworkSupportInModuleProvider(FacetType<F, ?> facetType) {
myFacetType = facetType;
}
public boolean isEnabledForModuleType(@NotNull final ModuleType moduleType) {
return myFacetType.isSuitableModuleType(moduleType);
}
@Override
public boolean isSupportAlreadyAdded(@NotNull Module module, @NotNull FacetsProvider facetsProvider) {
return !FacetManager.getInstance(module).getFacetsByType(myFacetType.getId()).isEmpty();
}
protected class FacetBasedFrameworkSupportInModuleConfigurable extends FrameworkSupportInModuleConfigurable {
@Override
public JComponent createComponent() {
return null;
}
@Override
public void addSupport(@NotNull Module module,
@NotNull ModifiableRootModel rootModel,
@NotNull ModifiableModelsProvider modifiableModelsProvider) {
FacetManager facetManager = FacetManager.getInstance(module);
ModifiableFacetModel model = facetManager.createModifiableModel();
Facet underlyingFacet = null;
FacetTypeId<?> underlyingFacetType = myFacetType.getUnderlyingFacetType();
if (underlyingFacetType != null) {
underlyingFacet = model.getFacetByType(underlyingFacetType);
LOG.assertTrue(underlyingFacet != null, underlyingFacetType);
}
F facet = facetManager.createFacet(myFacetType, myFacetType.getDefaultFacetName(), underlyingFacet);
setupConfiguration(facet, rootModel);
model.addFacet(facet);
model.commit();
onFacetCreated(facet, rootModel);
}
protected void setupConfiguration(final F facet, final ModifiableRootModel rootModel) {
}
protected void onFacetCreated(final F facet, final ModifiableRootModel rootModel) {
}
}
}
@@ -393,10 +393,6 @@ public class ProjectNameWithTypeStep extends ProjectNameStep {
return !myWizardContext.isCreatingNewProject() || super.validate();
}
public void disposeUIResources() {
super.disposeUIResources();
}
private static class PermanentSingleSelectionModel extends DefaultListSelectionModel {
public PermanentSingleSelectionModel() {
super.setSelectionMode(SINGLE_SELECTION);
@@ -429,4 +425,4 @@ public class ProjectNameWithTypeStep extends ProjectNameStep {
myInternalPanel.add(component, new GridBagConstraints(0, 2, 1, 1, 1.0, 1.0, GridBagConstraints.CENTER, GridBagConstraints.BOTH,
new Insets(10, 0, 0, 0), 0, 0));
}
}
}
@@ -397,13 +397,7 @@ public class ConfigurationErrorsComponent extends JPanel implements Disposable,
myList = list;
myText = new JTextPane() {
@Override
public void setCursor(Cursor cursor) {
super.setCursor(cursor);
//onCursorChanged(cursor);
}
};
myText = new JTextPane();
myButtonsPanel = new JPanel(new BorderLayout());
myButtonsPanel.setBorder(BorderFactory.createEmptyBorder(5, 3, 5, 3));
@@ -60,10 +60,6 @@ public class ExplicitTypeCanBeDiamondInspection extends BaseJavaLocalInspectionT
@Override
public PsiElementVisitor buildVisitor(@NotNull final ProblemsHolder holder, boolean isOnTheFly) {
return new JavaElementVisitor() {
@Override
public void visitReferenceExpression(PsiReferenceExpression expression) {
}
@Override
public void visitNewExpression(PsiNewExpression expression) {
if (PsiDiamondTypeUtil.canCollapseToDiamond(expression, expression, null)) {
@@ -170,9 +170,5 @@ public class PossibleHeapPollutionVarargsInspection extends BaseJavaLocalInspect
}
protected abstract void registerProblem(PsiMethod method, PsiIdentifier nameIdentifier);
@Override
public void visitReferenceExpression(PsiReferenceExpression expression) {
}
}
}
@@ -70,9 +70,6 @@ public class DataFlowInspection extends BaseLocalInspectionTool {
@NotNull
public PsiElementVisitor buildVisitor(@NotNull final ProblemsHolder holder, boolean isOnTheFly) {
return new JavaElementVisitor() {
@Override public void visitReferenceExpression(PsiReferenceExpression expression) {}
@Override public void visitField(PsiField field) {
if (isNullLiteralExpression(field.getInitializer()) && NullableNotNullManager.isNotNull(field)) {
holder.registerProblem(field.getInitializer(), InspectionsBundle.message("dataflow.message.initializing.field.with.null"));
@@ -29,7 +29,6 @@ import com.intellij.codeInspection.dataFlow.DfaInstructionState;
import com.intellij.codeInspection.dataFlow.DfaMemoryState;
import com.intellij.codeInspection.dataFlow.InstructionVisitor;
import com.intellij.openapi.progress.ProgressManager;
import org.jetbrains.annotations.NonNls;
import java.util.ArrayList;
@@ -71,9 +70,4 @@ public abstract class Instruction {
public int getIndex() {
return myIndex;
}
@NonNls
public String toString() {
return super.toString();
}
}
@@ -62,8 +62,6 @@ public class DefUseInspection extends BaseLocalInspectionTool {
@NotNull
public PsiElementVisitor buildVisitor(@NotNull final ProblemsHolder holder, final boolean isOnTheFly) {
return new JavaElementVisitor() {
@Override public void visitReferenceExpression(PsiReferenceExpression expression) {}
@Override public void visitMethod(PsiMethod method) {
checkCodeBlock(method.getBody(), holder, isOnTheFly);
}
@@ -44,9 +44,6 @@ public class DuplicateThrowsInspection extends BaseLocalInspectionTool {
@NotNull
public PsiElementVisitor buildVisitor(@NotNull final ProblemsHolder holder, boolean isOnTheFly) {
return new JavaElementVisitor() {
@Override public void visitReferenceExpression(PsiReferenceExpression expression) {
}
@Override public void visitMethod(PsiMethod method) {
PsiReferenceList throwsList = method.getThrowsList();
PsiJavaCodeReferenceElement[] refs = throwsList.getReferenceElements();
@@ -95,10 +95,6 @@ public class EqualsAndHashcode extends BaseJavaLocalInspectionTool {
(LocalQuickFix[])null);
}
}
@Override public void visitReferenceExpression(PsiReferenceExpression expression) {
//do nothing
}
};
}
@@ -60,10 +60,6 @@ public class UndesirableClassUsageInspection extends InternalInspection {
public PsiElementVisitor buildVisitor(@NotNull final ProblemsHolder holder, boolean isOnTheFly) {
if (!ApplicationManagerEx.getApplicationEx().isInternal()) return new JavaElementVisitor() {};
return new JavaElementVisitor() {
@Override
public void visitReferenceExpression(PsiReferenceExpression expression) {
}
@Override
public void visitNewExpression(PsiNewExpression expression) {
PsiJavaCodeReferenceElement ref = expression.getClassReference();
@@ -67,9 +67,6 @@ public class NullableStuffInspection extends BaseLocalInspectionTool {
@NotNull
public PsiElementVisitor buildVisitor(@NotNull final ProblemsHolder holder, boolean isOnTheFly) {
return new JavaElementVisitor() {
@Override public void visitReferenceExpression(PsiReferenceExpression expression) {
}
@Override public void visitMethod(PsiMethod method) {
if (!PsiUtil.isLanguageLevel5OrHigher(method)) return;
checkNullableStuffForMethod(method, holder);
@@ -117,10 +117,6 @@ public class SuspiciousNameCombinationInspection extends BaseLocalInspectionTool
public MyVisitor(final ProblemsHolder problemsHolder) {
myProblemsHolder = problemsHolder;
}
@Override public void visitReferenceExpression(PsiReferenceExpression expression) {
}
@Override public void visitVariable(PsiVariable variable) {
if (variable.hasInitializer()) {
PsiExpression expr = variable.getInitializer();
@@ -50,9 +50,6 @@ public class TestOnlyInspection extends BaseJavaLocalInspectionTool {
@Override public void visitCallExpression(PsiCallExpression e) {
validate(e, h);
}
@Override public void visitReferenceExpression(PsiReferenceExpression expression) {
}
};
}
@@ -108,4 +105,4 @@ public class TestOnlyInspection extends BaseJavaLocalInspectionTool {
String message = InspectionsBundle.message("inspection.test.only.problems.test.only.method.call");
h.registerProblem(e, message, ProblemHighlightType.GENERIC_ERROR_OR_WARNING);
}
}
}
@@ -17,12 +17,7 @@ package com.intellij.cyclicDependencies.ui;
import com.intellij.analysis.AnalysisScopeBundle;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.packageDependencies.ui.PackageDependenciesNode;
import com.intellij.psi.PsiFile;
import javax.swing.*;
import java.util.Set;
/**
* User: anna
@@ -33,26 +28,6 @@ public class CycleNode extends PackageDependenciesNode{
super(project);
}
public void fillFiles(Set<PsiFile> set, boolean recursively) {
super.fillFiles(set, recursively);
}
public void addFile(VirtualFile file, boolean isMarked) {
super.addFile(file, isMarked);
}
public Icon getOpenIcon() {
return super.getOpenIcon();
}
public Icon getClosedIcon() {
return super.getClosedIcon();
}
public int getWeight() {
return super.getWeight();
}
public String toString() {
return AnalysisScopeBundle.message("cyclic.dependencies.tree.cycle.node.text");
}
@@ -94,10 +94,6 @@ public class ClassesScopeTreeStructureExpander implements ScopeTreeStructureExpa
@Override public void visitField(PsiField field) {
classNode.add(new FieldNode(field));
}
@Override public void visitReferenceExpression(PsiReferenceExpression expression) {
}
});
}
}
@@ -961,14 +961,6 @@ public class InheritanceToDelegationProcessor extends BaseRefactoringProcessor {
myInstanceVisitor = instanceScanner;
}
@Override public void visitTypeElement(PsiTypeElement type) {
super.visitTypeElement (type);
}
@Override public void visitReferenceElement(PsiJavaCodeReferenceElement element) {
super.visitReferenceElement (element);
}
protected void visitClassMemberReferenceElement(PsiMember classMember, PsiJavaCodeReferenceElement classMemberReference) {
if ("super".equals(classMemberReference.getText()) && classMemberReference.getParent() instanceof PsiMethodCallExpression) {
return;
@@ -75,9 +75,6 @@ public class InlineParameterExpressionProcessor extends BaseRefactoringProcessor
return InlineParameterHandler.REFACTORING_NAME;
}
@Override
protected void refreshElements(PsiElement[] elements) {
}
@NotNull
@Override
@@ -945,7 +945,7 @@ public class RefactoringUtil {
return false;
}
public static interface ImplicitConstructorUsageVisitor {
public interface ImplicitConstructorUsageVisitor {
void visitConstructor(PsiMethod constructor, PsiMethod baseConstructor);
void visitClassWithoutConstructors(PsiClass aClass);
@@ -44,10 +44,6 @@ public class SegmentedOutputStream extends OutputStream implements PacketProcess
flush();
}
public synchronized void write(byte[] b, int off, int len) throws IOException {
super.write(b, off, len);
}
public synchronized void flush() throws IOException {
myPrintStream.flush();
}
@@ -22,11 +22,6 @@ import com.intellij.JavaTestUtil;
*/
public class JavaReflectionCompletionTest extends LightFixtureCompletionTestCase {
@Override
protected void setUp() throws Exception {
super.setUp();
}
@Override
protected String getBasePath() {
return JavaTestUtil.getRelativeJavaTestDataPath() + "/codeInsight/completion/reflection/";
@@ -47,12 +47,6 @@ public class LightAdvHighlightingJdk7Test extends LightDaemonAnalyzerTestCase {
doTest(BASE_PATH + "/" + getTestName(false) + ".java", checkWarnings, checkInfos);
}
@Override
protected void setUp() throws Exception {
super.setUp();
}
@Override
protected LocalInspectionTool[] configureLocalInspectionTools() {
return new LocalInspectionTool[]{
@@ -8,7 +8,6 @@ import com.intellij.codeInspection.defUse.DefUseInspection;
import com.intellij.psi.JavaElementVisitor;
import com.intellij.psi.PsiElementVisitor;
import com.intellij.psi.PsiLiteralExpression;
import com.intellij.psi.PsiReferenceExpression;
import org.jetbrains.annotations.Nls;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
@@ -53,9 +52,6 @@ public class EmptyIntentionInspectionQuickFixTest extends LightQuickFixTestCase{
@NotNull
public PsiElementVisitor buildVisitor(@NotNull final ProblemsHolder holder, boolean isOnTheFly) {
return new JavaElementVisitor() {
@Override public void visitReferenceExpression(PsiReferenceExpression expression) {
}
@Override public void visitLiteralExpression(PsiLiteralExpression expression) {
final String s = (String)expression.getValue();
if (s.contains("a")) holder.registerProblem(expression, "Look ma! This String contains 'a'");
@@ -67,10 +67,6 @@ public class RemoveRedundantUncheckedSuppressionTest extends LightQuickFixTestCa
boolean isOnTheFly,
@NotNull LocalInspectionToolSession session) {
return new JavaElementVisitor() {
@Override
public void visitReferenceExpression(PsiReferenceExpression expression) {
}
@Override
public void visitClass(PsiClass aClass) {
checkMember(aClass, inspection, holder);
@@ -105,4 +101,4 @@ public class RemoveRedundantUncheckedSuppressionTest extends LightQuickFixTestCa
return "/codeInsight/daemonCodeAnalyzer/quickFix/redundantUncheckedVarargs";
}
}
}
@@ -86,9 +86,6 @@ public abstract class BaseJavaLocalInspectionTool extends LocalInspectionTool i
@NotNull
public PsiElementVisitor buildVisitor(@NotNull final ProblemsHolder holder, final boolean isOnTheFly) {
return new JavaElementVisitor() {
@Override public void visitReferenceExpression(PsiReferenceExpression expression) {
}
@Override public void visitMethod(PsiMethod method) {
addDescriptors(checkMethod(method, holder.getManager(), isOnTheFly));
}
@@ -71,9 +71,6 @@ public class ClassHasNoToStringMethodInspection extends AbstractToStringInspecti
@Override
public PsiElementVisitor buildVisitor(@NotNull final ProblemsHolder holder, boolean isOnTheFly) {
return new JavaElementVisitor() {
public void visitReferenceExpression(PsiReferenceExpression expression) {
}
@Override
public void visitClass(PsiClass clazz) {
if (log.isDebugEnabled()) log.debug("checkClass: clazz=" + clazz);
@@ -56,9 +56,6 @@ public class FieldNotUsedInToStringInspection extends AbstractToStringInspection
@Override
public PsiElementVisitor buildVisitor(@NotNull final ProblemsHolder holder, boolean isOnTheFly) {
return new JavaElementVisitor() {
public void visitReferenceExpression(PsiReferenceExpression expression) {
}
@Override
public void visitClass(PsiClass clazz) {
checkFields(holder, clazz);
@@ -39,9 +39,6 @@ public class ConvertAnnotationInspection extends BaseJavaLocalInspectionTool {
@NotNull
public PsiElementVisitor buildVisitor(@NotNull final ProblemsHolder holder, final boolean isOnTheFly) {
return new JavaElementVisitor() {
@Override public void visitReferenceExpression(final PsiReferenceExpression expression) {
}
@Override public void visitAnnotation(final PsiAnnotation annotation) {
final @NonNls String qualifiedName = annotation.getQualifiedName();
if (qualifiedName != null && qualifiedName.startsWith("org.testng.annotations")) {
@@ -64,9 +64,6 @@ public class ConvertJavadocInspection extends BaseJavaLocalInspectionTool {
@NotNull
public PsiElementVisitor buildVisitor(@NotNull final ProblemsHolder holder, final boolean isOnTheFly) {
return new JavaElementVisitor() {
@Override public void visitReferenceExpression(final PsiReferenceExpression expression) {
}
@Override public void visitDocTag(final PsiDocTag tag) {
if (tag.getName().startsWith(TESTNG_PREFIX)) {
holder.registerProblem(tag, DISPLAY_NAME, new ConvertJavadocQuickfix());
@@ -65,9 +65,6 @@ public class ConvertOldAnnotationInspection extends BaseJavaLocalInspectionTool
@NotNull
public PsiElementVisitor buildVisitor(@NotNull final ProblemsHolder holder, final boolean isOnTheFly) {
return new JavaElementVisitor() {
@Override public void visitReferenceExpression(final PsiReferenceExpression expression) {
}
@Override public void visitAnnotation(final PsiAnnotation annotation) {
final String qualifiedName = annotation.getQualifiedName();
if (Comparing.strEqual(qualifiedName, "org.testng.annotations.Configuration")) {
@@ -132,4 +129,4 @@ public class ConvertOldAnnotationInspection extends BaseJavaLocalInspectionTool
}
}
}
}
@@ -56,9 +56,6 @@ public class BoundFieldAssignmentInspection extends BaseJavaLocalInspectionTool
@NotNull
public PsiElementVisitor buildVisitor(@NotNull final ProblemsHolder holder, boolean isOnTheFly) {
return new JavaElementVisitor() {
@Override public void visitReferenceExpression(PsiReferenceExpression expression) {
}
@Override
public void visitAssignmentExpression(PsiAssignmentExpression expression) {
if (expression.getLExpression() instanceof PsiReferenceExpression) {