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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Yann Cébron
2014-05-24 16:09:31 +02:00
parent 80e37290e3 5ffae2a89d
commit dccc79d407
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-indexing-impl/src/com/intellij/psi/impl/file/impl/JavaFileManagerImpl.java
+3 -6
View File
@@ -87,10 +87,7 @@ public class JavaFileManagerImpl implements JavaFileManager, Disposable {
final Collection<PsiClass> classes = JavaFullClassNameIndex.getInstance().get(qName.hashCode(), myManager.getProject(), scope);
if (classes.isEmpty()) return PsiClass.EMPTY_ARRAY;
List<PsiClass> result = new ArrayList<PsiClass>(classes.size());
int count = 0;
PsiClass aClass = null;
for (PsiClass found : classes) {
aClass = found;
for (PsiClass aClass : classes) {
final String qualifiedName = aClass.getQualifiedName();
if (qualifiedName == null || !qualifiedName.equals(qName)) continue;
@@ -104,11 +101,11 @@ public class JavaFileManagerImpl implements JavaFileManager, Disposable {
if (!hasAcceptablePackage(vFile)) continue;
result.add(aClass);
count++;
}
int count = result.size();
if (count == 0) return PsiClass.EMPTY_ARRAY;
if (count == 1) return new PsiClass[] {aClass};
if (count == 1) return new PsiClass[] {result.get(0)};
ContainerUtil.quickSort(result, new Comparator<PsiClass>() {
@Override
platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogRefresherImpl.java
+3 -1
View File
@@ -113,7 +113,9 @@ public class VcsLogRefresherImpl implements VcsLogRefresher {
@Override
public void refresh(@NotNull Collection<VirtualFile> rootsToRefresh) {
mySingleTaskController.request(new RefreshRequest(rootsToRefresh));
if (!rootsToRefresh.isEmpty()) {
mySingleTaskController.request(new RefreshRequest(rootsToRefresh));
}
}
@NotNull
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/VcsLogUiImpl.java
+2 -1
View File
@@ -319,7 +319,8 @@ public class VcsLogUiImpl implements VcsLogUi, Disposable {
setModel(newModel, myDataPack, previouslySelected);
myMainFrame.updateDataPack(myDataPack);
setLongEdgeVisibility(myUiProperties.areLongEdgesVisible());
setBek(myUiProperties.isBek());
myDataPack.getGraphFacade().performAction(new BekGraphAction(myUiProperties.isBek() ?
PermanentGraph.SortType.Bek : PermanentGraph.SortType.Normal));
fireFilterChangeEvent();
repaintUI();
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/VcsLogGraphTable.java
+5 -5
View File
@@ -21,7 +21,6 @@ import com.intellij.vcs.log.VcsLogHighlighter;
import com.intellij.vcs.log.data.DataPack;
import com.intellij.vcs.log.data.VcsLogDataHolder;
import com.intellij.vcs.log.graph.*;
import com.intellij.vcs.log.ui.render.GraphCommitCell;
import com.intellij.vcs.log.printer.idea.PositionUtil;
import com.intellij.vcs.log.ui.VcsLogUiImpl;
import com.intellij.vcs.log.ui.render.GraphCommitCell;
@@ -33,7 +32,6 @@ import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
import javax.swing.table.DefaultTableModel;
import javax.swing.table.TableCellRenderer;
import javax.swing.table.TableColumn;
import javax.swing.table.TableModel;
@@ -169,9 +167,11 @@ public class VcsLogGraphTable extends JBTable implements TypeSafeDataProvider, C
}
public void jumpToRow(int rowIndex) {
scrollRectToVisible(getCellRect(rowIndex, 0, false));
setRowSelectionInterval(rowIndex, rowIndex);
scrollRectToVisible(getCellRect(rowIndex, 0, false));
if (rowIndex >= 0 && rowIndex <= getRowCount() - 1) {
scrollRectToVisible(getCellRect(rowIndex, 0, false));
setRowSelectionInterval(rowIndex, rowIndex);
scrollRectToVisible(getCellRect(rowIndex, 0, false));
}
}
@Override