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

Git: git log tree: NPE. highlighting by structure to work

Browse Source
This commit is contained in:
irengrig
2010-06-23 13:31:56 +04:00
parent ec1e38352f
commit 05ba3e62e5
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/history/browser/GitTreeController.java
+3 -8
View File
@@ -253,14 +253,9 @@ class GitTreeController implements ManageGitTreeView {
final Portion highlighted;
// we can ignore extra commit loaded for the same date (boundary), it's easier
// commits refer to highlighted stuff, so everything will be correct
if (myTravelDate == null) {
// todo rewrite when dates are introduced
highlighted = loadPortion(myHighlightingHolder.getStartingPoints(), myFilterHolder.getCurrentPoint().getFirst(),
null, Collections.<ChangesFilter.Filter>emptyList(), -1);
} else {
highlighted = loadPortion(myHighlightingHolder.getStartingPoints(), myFilterHolder.getCurrentPoint().getFirst(),
myTravelDate, Collections.<ChangesFilter.Filter>emptyList(), -1);
}
final Date point = myFilterHolder.getCurrentPoint() == null ? null : myFilterHolder.getCurrentPoint().getFirst();
// todo rewrite when dates are introduced
highlighted = loadPortion(myHighlightingHolder.getStartingPoints(), point, myTravelDate, Collections.<ChangesFilter.Filter>emptyList(), -1);
final Collection<ChangesFilter.Filter> filters = myHighlightingHolder.getFilters();
final List<ChangesFilter.MemoryFilter> combined = ChangesFilter.combineFilters(filters);