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

cleanup

Browse Source
This commit is contained in:
Alexey Kudravtsev
2017-05-16 14:13:53 +03:00
parent f6700b7e42
commit f1bbf359c7
2 changed files with 44 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionResultsView.java
+18 -28
View File
@@ -78,8 +78,6 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import javax.swing.event.TreeSelectionEvent;
import javax.swing.event.TreeSelectionListener;
import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.tree.DefaultTreeModel;
import javax.swing.tree.TreeNode;
@@ -132,7 +130,6 @@ public class InspectionResultsView extends JPanel implements Disposable, Occuren
private InspectionTreeLoadingProgressAware myLoadingProgressPreview;
private final ExcludedInspectionTreeNodesManager myExcludedInspectionTreeNodesManager;
private final FactoryMap<String, Set<Object>> mySuppressedNodes = new FactoryMap<String, Set<Object>>() {
@Nullable
@Override
protected Set<Object> create(String key) {
return new THashSet<>();
@@ -276,7 +273,7 @@ public class InspectionResultsView extends JPanel implements Disposable, Occuren
}
}
public void profileChanged() {
void profileChanged() {
myTree.revalidate();
myTree.repaint();
syncRightPanel();
@@ -286,14 +283,11 @@ public class InspectionResultsView extends JPanel implements Disposable, Occuren
if (ApplicationManager.getApplication().isUnitTestMode()) {
return;
}
myTree.getSelectionModel().addTreeSelectionListener(new TreeSelectionListener() {
@Override
public void valueChanged(TreeSelectionEvent e) {
if (myTree.isUnderQueueUpdate()) return;
syncRightPanel();
if (isAutoScrollMode()) {
OpenSourceUtil.openSourcesFrom(DataManager.getInstance().getDataContext(InspectionResultsView.this), false);
}
myTree.getSelectionModel().addTreeSelectionListener(e -> {
if (myTree.isUnderQueueUpdate()) return;
syncRightPanel();
if (isAutoScrollMode()) {
OpenSourceUtil.openSourcesFrom(DataManager.getInstance().getDataContext(this), false);
}
});
@@ -378,7 +372,7 @@ public class InspectionResultsView extends JPanel implements Disposable, Occuren
add(westPanel, BorderLayout.WEST);
}
@SuppressWarnings({"NonStaticInitializer"})
@SuppressWarnings("NonStaticInitializer")
private JComponent createRightActionsToolbar() {
DefaultActionGroup specialGroup = new DefaultActionGroup();
specialGroup.add(myGlobalInspectionContext.getUIOptions().createGroupBySeverityAction(this));
@@ -489,7 +483,7 @@ public class InspectionResultsView extends JPanel implements Disposable, Occuren
syncRightPanel();
}
public void openRightPanelIfNeed() {
void openRightPanelIfNeed() {
if (mySplitter.getSecondComponent() == null) {
syncRightPanel();
}
@@ -652,10 +646,10 @@ public class InspectionResultsView extends JPanel implements Disposable, Occuren
myPreviewEditor.getComponent().setBorder(IdeBorderFactory.createEmptyBorder());
return Pair.create(myPreviewEditor.getComponent(), myPreviewEditor);
}
else if (selectedEntity == null) {
if (selectedEntity == null) {
return Pair.create(new InspectionNodeInfo(myTree, myProject), null);
}
else if (selectedEntity.isValid()) {
if (selectedEntity.isValid()) {
return Pair.create(InspectionResultsViewUtil.getPreviewIsNotAvailable(selectedEntity), null);
}
return Pair.create(InspectionResultsViewUtil.getInvalidEntityLabel(selectedEntity), null);
@@ -693,7 +687,7 @@ public class InspectionResultsView extends JPanel implements Disposable, Occuren
@NotNull
public Set<SuppressIntentionAction> getSuppressActions(InspectionToolWrapper wrapper) {
return mySuppressActions.computeIfAbsent(wrapper.getShortName(), (w) -> {
return mySuppressActions.computeIfAbsent(wrapper.getShortName(), __ -> {
final SuppressIntentionAction[] actions = InspectionManagerEx.getSuppressActions(wrapper);
return actions == null ? Collections.emptySet() : ContainerUtil.newLinkedHashSet(actions);
});
@@ -717,29 +711,24 @@ public class InspectionResultsView extends JPanel implements Disposable, Occuren
return myInspectionProfile;
}
public void addProblemDescriptors(InspectionToolWrapper wrapper, RefEntity refElement, CommonProblemDescriptor[] descriptors) {
void addProblemDescriptors(InspectionToolWrapper wrapper, RefEntity refElement, CommonProblemDescriptor[] descriptors) {
myTreeUpdater.submit((Runnable)() -> ReadAction.run(() -> {
if (!isDisposed()) {
ApplicationManager.getApplication().assertReadAccessAllowed();
synchronized (myTreeStructureUpdateLock) {
final InspectionNode toolNode;
final AnalysisUIOptions uiOptions = myGlobalInspectionContext.getUIOptions();
final InspectionToolPresentation presentation = myGlobalInspectionContext.getPresentation(wrapper);
if (presentation.getToolNode() == null) {
addTool(wrapper, HighlightDisplayLevel.find(presentation.getSeverity((RefElement)refElement)),
uiOptions.GROUP_BY_SEVERITY, isSingleInspectionRun());
}
toolNode = presentation.getToolNode();
final InspectionNode toolNode = presentation.getToolNode();
LOG.assertTrue(toolNode != null);
final Map<RefEntity, CommonProblemDescriptor[]> problems = new HashMap<>();
problems.put(refElement, descriptors);
final Map<String, Set<RefEntity>> contents = new HashMap<>();
final String groupName = refElement.getRefManager().getGroupName((RefElement)refElement);
Set<RefEntity> content = contents.get(groupName);
if (content == null) {
content = new HashSet<>();
contents.put(groupName, content);
}
Set<RefEntity> content = contents.computeIfAbsent(groupName, __ -> new HashSet<>());
content.add(refElement);
getProvider().appendToolNodeContent(myGlobalInspectionContext,
@@ -1007,7 +996,7 @@ public class InspectionResultsView extends JPanel implements Disposable, Occuren
return null;
}
public void resetTree() {
void resetTree() {
try {
myTree.setQueueUpdate(true);
final TreePath[] selectionPath = myTree.getSelectionPaths();
@@ -1015,7 +1004,8 @@ public class InspectionResultsView extends JPanel implements Disposable, Occuren
((DefaultTreeModel)myTree.getModel()).reload();
TreeUtil.restoreExpandedPaths(myTree, expandedPaths);
myTree.setSelectionPaths(selectionPath);
} finally {
}
finally {
myTree.setQueueUpdate(false);
}
}
@@ -1165,7 +1155,7 @@ public class InspectionResultsView extends JPanel implements Disposable, Occuren
}
private class RerunAction extends AnAction {
public RerunAction(JComponent comp) {
RerunAction(JComponent comp) {
super(InspectionsBundle.message("inspection.action.rerun"), InspectionsBundle.message("inspection.action.rerun"),
AllIcons.Actions.Rerun);
registerCustomShortcutSet(CommonShortcuts.getRerun(), comp);
platform/util/src/com/intellij/util/containers/FactoryMap.java
+26 -17
View File
@@ -25,8 +25,6 @@ import org.jetbrains.annotations.Nullable;
import java.util.*;
import static com.intellij.util.ObjectUtils.NULL;
/**
* @author peter
*/
@@ -34,6 +32,7 @@ public abstract class FactoryMap<K,V> implements Map<K, V> {
private static final RecursionGuard ourGuard = RecursionManager.createGuard("factoryMap");
protected Map<K, V> myMap;
@NotNull
protected Map<K, V> createMap() {
return new THashMap<K, V>();
}
@@ -51,37 +50,47 @@ public abstract class FactoryMap<K,V> implements Map<K, V> {
@Override
public V get(Object key) {
final Map<K, V> map = getMap();
V value = map.get(getKey(key));
K k = notNull(key);
V value = map.get(k);
if (value == null) {
RecursionGuard.StackStamp stamp = ourGuard.markStack();
value = create((K)key);
if (stamp.mayCacheNow()) {
map.put((K)getKey(key), value == null ? (V)NULL : value);
V v = notNull(value);
map.put(k, v);
}
}
return value == NULL ? null : value;
return value == FAKE_NULL() ? null : value;
}
private static <K> K getKey(final K key) {
return key == null ? (K)NULL : key;
private static <T> T FAKE_NULL() {
//noinspection unchecked
return (T)ObjectUtils.NULL;
}
private static <T> T notNull(final Object key) {
//noinspection unchecked
return key == null ? FactoryMap.<T>FAKE_NULL() : (T)key;
}
@Override
public final boolean containsKey(Object key) {
return myMap != null && myMap.containsKey(getKey(key));
return myMap != null && myMap.containsKey(notNull(key));
}
@Override
public V put(K key, V value) {
V v = getMap().put(getKey(key), value == null ? (V)NULL : value);
return v == NULL ? null : v;
K k = notNull(key);
V v = notNull(value);
v = getMap().put(k, v);
return v == FAKE_NULL() ? null : v;
}
@Override
public V remove(Object key) {
if (myMap == null) return null;
V v = myMap.remove(key);
return v == NULL ? null : v;
return v == FAKE_NULL() ? null : v;
}
@NotNull
@@ -89,22 +98,22 @@ public abstract class FactoryMap<K,V> implements Map<K, V> {
public Set<K> keySet() {
if (myMap == null) return Collections.emptySet();
final Set<K> ts = myMap.keySet();
//noinspection SuspiciousMethodCalls
if (ts.contains(NULL)) {
K nullKey = FAKE_NULL();
if (ts.contains(nullKey)) {
final HashSet<K> hashSet = new HashSet<K>(ts);
//noinspection SuspiciousMethodCalls
hashSet.remove(NULL);
hashSet.remove(nullKey);
hashSet.add(null);
return hashSet;
}
return ts;
}
@NotNull
public Collection<V> notNullValues() {
if (myMap == null) return Collections.emptyList();
final Collection<V> values = ContainerUtil.newArrayList(myMap.values());
for (Iterator<V> iterator = values.iterator(); iterator.hasNext();) {
if (iterator.next() == NULL) {
if (iterator.next() == FAKE_NULL()) {
iterator.remove();
}
}
@@ -113,7 +122,7 @@ public abstract class FactoryMap<K,V> implements Map<K, V> {
public boolean removeValue(Object value) {
if (myMap == null) return false;
Object t = ObjectUtils.notNull(value, NULL);
Object t = ObjectUtils.notNull(value, FAKE_NULL());
//noinspection SuspiciousMethodCalls
return myMap.values().remove(t);
}