From 572ae96421e31de8c837fc7ef0f19344d37a2ef5 Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Fri, 29 Aug 2014 13:49:02 +0400 Subject: [PATCH] cleanup --- .../codeInsight/hint/actions/ShowSiblingsAction.java | 12 +++--------- .../navigation/ImplementationSearcher.java | 8 +++----- .../lang/properties/PropertiesFilesManager.java | 9 +++++++-- 3 files changed, 13 insertions(+), 16 deletions(-) diff --git a/java/java-impl/src/com/intellij/codeInsight/hint/actions/ShowSiblingsAction.java b/java/java-impl/src/com/intellij/codeInsight/hint/actions/ShowSiblingsAction.java index 8b839e522c24..f46ebb4005ba 100644 --- a/java/java-impl/src/com/intellij/codeInsight/hint/actions/ShowSiblingsAction.java +++ b/java/java-impl/src/com/intellij/codeInsight/hint/actions/ShowSiblingsAction.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 JetBrains s.r.o. + * Copyright 2000-2014 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. @@ -17,15 +17,11 @@ package com.intellij.codeInsight.hint.actions; import com.intellij.codeInsight.TargetElementUtilBase; import com.intellij.codeInsight.daemon.impl.PsiElementListNavigator; -import com.intellij.codeInsight.documentation.DocumentationManager; import com.intellij.ide.util.MethodCellRenderer; import com.intellij.ide.util.PsiClassListCellRenderer; -import com.intellij.openapi.actionSystem.*; -import com.intellij.openapi.diagnostic.Logger; +import com.intellij.openapi.actionSystem.CommonDataKeys; +import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.editor.Editor; -import com.intellij.openapi.fileEditor.FileEditor; -import com.intellij.openapi.fileEditor.FileEditorManager; -import com.intellij.openapi.fileEditor.TextEditor; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.popup.JBPopup; import com.intellij.psi.*; @@ -36,8 +32,6 @@ import com.intellij.util.Consumer; import org.jetbrains.annotations.Nullable; public class ShowSiblingsAction extends ShowImplementationsAction { - private static final Logger LOG = Logger.getInstance("#" + ShowSiblingsAction.class.getName()); - public ShowSiblingsAction() { super(); } diff --git a/platform/lang-impl/src/com/intellij/codeInsight/navigation/ImplementationSearcher.java b/platform/lang-impl/src/com/intellij/codeInsight/navigation/ImplementationSearcher.java index 504ec1b13c41..a3fbbc62dd85 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/navigation/ImplementationSearcher.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/navigation/ImplementationSearcher.java @@ -125,13 +125,12 @@ public class ImplementationSearcher { public static class FirstImplementationsSearcher extends ImplementationSearcher { @Override protected PsiElement[] searchDefinitions(final PsiElement element, final Editor editor) { - final PsiElement[][] result = new PsiElement[1][]; - if (canShowPopupWithOneItem(element)) { return new PsiElement[]{element}; } final PsiElementProcessor.CollectElementsWithLimit collectProcessor = new PsiElementProcessor.CollectElementsWithLimit(2, new THashSet()); + final PsiElement[][] result = new PsiElement[1][]; if (!ProgressManager.getInstance().runProcessWithProgressSynchronously(new Runnable() { @Override public void run() { @@ -139,8 +138,7 @@ public class ImplementationSearcher { DefinitionsScopedSearch.search(element, getSearchScope(element, editor)).forEach(new PsiElementProcessorAdapter(collectProcessor){ @Override public boolean processInReadAction(PsiElement element) { - if (!accept(element)) return true; - return super.processInReadAction(element); + return !accept(element) || super.processInReadAction(element); } }); result[0] = collectProcessor.toArray(); @@ -165,7 +163,7 @@ public class ImplementationSearcher { } } - public static abstract class BackgroundableImplementationSearcher extends ImplementationSearcher { + public abstract static class BackgroundableImplementationSearcher extends ImplementationSearcher { @Override protected PsiElement[] searchDefinitions(final PsiElement element, Editor editor) { final CommonProcessors.CollectProcessor processor = new CommonProcessors.CollectProcessor() { diff --git a/plugins/properties/src/com/intellij/lang/properties/PropertiesFilesManager.java b/plugins/properties/src/com/intellij/lang/properties/PropertiesFilesManager.java index 60d337681a31..5477c137021e 100644 --- a/plugins/properties/src/com/intellij/lang/properties/PropertiesFilesManager.java +++ b/plugins/properties/src/com/intellij/lang/properties/PropertiesFilesManager.java @@ -20,7 +20,7 @@ import com.intellij.openapi.components.AbstractProjectComponent; import com.intellij.openapi.fileEditor.FileDocumentManager; import com.intellij.openapi.project.DumbService; import com.intellij.openapi.project.Project; -import com.intellij.openapi.vfs.VfsUtil; +import com.intellij.openapi.vfs.VfsUtilCore; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.vfs.encoding.EncodingManager; import com.intellij.psi.search.FileTypeIndex; @@ -44,20 +44,24 @@ public class PropertiesFilesManager extends AbstractProjectComponent { super(project); } + @Override public void projectOpened() { final PropertyChangeListener myListener = new PropertyChangeListener() { + @Override public void propertyChange(final PropertyChangeEvent evt) { String propertyName = evt.getPropertyName(); if (EncodingManager.PROP_NATIVE2ASCII_SWITCH.equals(propertyName) || EncodingManager.PROP_PROPERTIES_FILES_ENCODING.equals(propertyName) ) { DumbService.getInstance(myProject).smartInvokeLater(new Runnable(){ + @Override public void run() { ApplicationManager.getApplication().runWriteAction(new Runnable(){ + @Override public void run() { Collection filesToRefresh = FileBasedIndex.getInstance() .getContainingFiles(FileTypeIndex.NAME, PropertiesFileType.INSTANCE, GlobalSearchScope.allScope(myProject)); - VirtualFile[] virtualFiles = VfsUtil.toVirtualFileArray(filesToRefresh); + VirtualFile[] virtualFiles = VfsUtilCore.toVirtualFileArray(filesToRefresh); FileDocumentManager.getInstance().saveAllDocuments(); //force to re-detect encoding @@ -75,6 +79,7 @@ public class PropertiesFilesManager extends AbstractProjectComponent { EncodingManager.getInstance().addPropertyChangeListener(myListener,myProject); } + @Override @NotNull public String getComponentName() { return "PropertiesFileManager";