This commit is contained in:
Roman Shevchenko
2012-11-23 18:05:25 +01:00
parent edff99391d
commit 6f9be01024
8 changed files with 21 additions and 21 deletions
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2009 JetBrains s.r.o.
* Copyright 2000-2012 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.
@@ -106,7 +106,7 @@ public class VisibleTreeState{
}
private static State getState(InspectionConfigTreeNode node) {
Descriptor descriptor = node.getDesriptor();
Descriptor descriptor = node.getDescriptor();
final State expandedNode;
if (descriptor != null) {
expandedNode = new State(descriptor);
@@ -35,7 +35,7 @@ public class InspectionConfigTreeNode extends CheckedTreeNode {
@NotNull
@Override
protected Boolean compute() {
Descriptor descriptor = getDesriptor();
Descriptor descriptor = getDescriptor();
if (descriptor != null) return descriptor.getInspectionProfile().isProperSetting(descriptor.getTool().getShortName());
for (int i = 0; i < getChildCount(); i++) {
InspectionConfigTreeNode node = (InspectionConfigTreeNode)getChildAt(i);
@@ -64,7 +64,7 @@ public class InspectionConfigTreeNode extends CheckedTreeNode {
}
@Nullable
public Descriptor getDesriptor() {
public Descriptor getDescriptor() {
if (userObject instanceof String) return null;
return (Descriptor)userObject;
}
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2009 JetBrains s.r.o.
* Copyright 2000-2012 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.
@@ -43,8 +43,8 @@ public class InspectionsConfigTreeComparator implements Comparator<InspectionCon
return getDisplayTextToSort(s1).compareToIgnoreCase(getDisplayTextToSort(s2));
}
final Descriptor descriptor1 = o1.getDesriptor();
final Descriptor descriptor2 = o2.getDesriptor();
final Descriptor descriptor1 = o1.getDescriptor();
final Descriptor descriptor2 = o2.getDescriptor();
if (descriptor1 != null && descriptor2 != null) {
s1 = descriptor1.getText();
s2 = descriptor2.getText();
@@ -64,7 +64,7 @@ abstract class InspectionsConfigTreeRenderer extends CheckboxTree.CheckboxTreeCe
style = SimpleTextAttributes.STYLE_BOLD;
}
else {
final Descriptor descriptor = node.getDesriptor();
final Descriptor descriptor = node.getDescriptor();
final String scopeName = node.getScopeName();
if (scopeName != null) {
if (node.isByDefault()) {
@@ -206,7 +206,7 @@ public class SingleInspectionProfilePanel extends JPanel {
final TreePath selectionPath = myTree.getSelectionPath();
if (selectionPath != null) {
InspectionConfigTreeNode node = (InspectionConfigTreeNode)selectionPath.getLastPathComponent();
final Descriptor descriptor = node.getDesriptor();
final Descriptor descriptor = node.getDescriptor();
if (descriptor != null) {
final boolean properSetting = mySelectedProfile.isProperSetting(descriptor.getKey().toString());
if (node.isProperSetting() != properSetting) {
@@ -424,7 +424,7 @@ public class SingleInspectionProfilePanel extends JPanel {
private static InspectionConfigTreeNode findNodeByKey(String name, InspectionConfigTreeNode root) {
for (int i = 0; i < root.getChildCount(); i++) {
final InspectionConfigTreeNode child = (InspectionConfigTreeNode)root.getChildAt(i);
final Descriptor descriptor = child.getDesriptor();
final Descriptor descriptor = child.getDescriptor();
if (descriptor != null) {
if (descriptor.getKey().toString().equals(name)) {
return child;
@@ -506,7 +506,7 @@ public class SingleInspectionProfilePanel extends JPanel {
new TreeSpeedSearch(myTree, new Convertor<TreePath, String>() {
public String convert(TreePath o) {
final InspectionConfigTreeNode node = (InspectionConfigTreeNode)o.getLastPathComponent();
final Descriptor descriptor = node.getDesriptor();
final Descriptor descriptor = node.getDescriptor();
return descriptor != null ? InspectionsConfigTreeComparator.getDisplayTextToSort(descriptor.getText()) : InspectionsConfigTreeComparator
.getDisplayTextToSort(node.getGroupName());
}
@@ -584,7 +584,7 @@ public class SingleInspectionProfilePanel extends JPanel {
}
private void toggleToolNode(final InspectionConfigTreeNode toolNode) {
final Descriptor descriptor = toolNode.getDesriptor();
final Descriptor descriptor = toolNode.getDescriptor();
if (descriptor!= null) {
final HighlightDisplayKey key = descriptor.getKey();
final String toolShortName = key.toString();
@@ -720,7 +720,7 @@ public class SingleInspectionProfilePanel extends JPanel {
private void updateOptionsAndDescriptionPanel(TreePath path) {
if (path == null) return;
final InspectionConfigTreeNode node = (InspectionConfigTreeNode)path.getLastPathComponent();
final Descriptor descriptor = node.getDesriptor();
final Descriptor descriptor = node.getDescriptor();
if (descriptor != null) {
final String description = descriptor.loadDescription();
@@ -1096,7 +1096,7 @@ public class SingleInspectionProfilePanel extends JPanel {
private void updateErrorLevel(final InspectionConfigTreeNode child,
final boolean showOptionsAndDescriptorPanels, final HighlightDisplayLevel level) {
final HighlightDisplayKey key = child.getDesriptor().getKey();
final HighlightDisplayKey key = child.getDescriptor().getKey();
mySelectedProfile.setErrorLevel(key, level, child.isInspectionNode() || child.isByDefault() ? -1 : child.getParent().getIndex(child));
child.dropCache();
if (showOptionsAndDescriptorPanels) {
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2009 JetBrains s.r.o.
* Copyright 2000-2012 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.
@@ -86,7 +86,7 @@ public abstract class AddScopeAction extends AnAction {
final NamedScope chosenScope = NamedScopesHolder.getScope(project, availableScopes.get(idx));
for (InspectionConfigTreeNode node : nodes) {
final Descriptor descriptor = node.getDesriptor();
final Descriptor descriptor = node.getDescriptor();
if (node.getScopeName() != null || descriptor == null) continue;
final InspectionProfileEntry tool = descriptor.getTool(); //copy
final ScopeToolState scopeToolState = getSelectedProfile().addScope(tool, chosenScope,
@@ -108,7 +108,7 @@ public abstract class AddScopeAction extends AnAction {
private static void collect(List<Descriptor> descriptors,
List<InspectionConfigTreeNode> nodes,
InspectionConfigTreeNode node) {
final Descriptor descriptor = node.getDesriptor();
final Descriptor descriptor = node.getDescriptor();
if (descriptor != null) {
if (node.getScopeName() == null) {
descriptors.add(descriptor);
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2009 JetBrains s.r.o.
* Copyright 2000-2012 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.
@@ -64,7 +64,7 @@ public abstract class DeleteScopeAction extends AnAction {
InspectionConfigTreeNode parent = null;
final InspectionConfigTreeNode[] nodes = myTree.getSelectedNodes(InspectionConfigTreeNode.class, null);
for (InspectionConfigTreeNode node : nodes) {
final Descriptor descriptor = node.getDesriptor();
final Descriptor descriptor = node.getDescriptor();
LOG.assertTrue(descriptor != null);
parent = (InspectionConfigTreeNode)node.getParent();
final HighlightDisplayKey key = descriptor.getKey();
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2009 JetBrains s.r.o.
* Copyright 2000-2012 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.
@@ -65,7 +65,7 @@ public abstract class MoveScopeAction extends AnAction {
public void actionPerformed(AnActionEvent e) {
final InspectionConfigTreeNode[] nodes = myTree.getSelectedNodes(InspectionConfigTreeNode.class, null);
final InspectionConfigTreeNode node = nodes[0];
final Descriptor descriptor = node.getDesriptor();
final Descriptor descriptor = node.getDescriptor();
final TreeNode parent = node.getParent();
final int index = parent.getIndex(node);
getSelectedProfile().moveScope(descriptor.getKey().toString(), index, myDir);