From 05ba3e62e515213124fdbeafdd67b95704568835 Mon Sep 17 00:00:00 2001
From: irengrig <Irina.Chernushina@jetbrains.com>
Date: Wed, 23 Jun 2010 13:31:56 +0400
Subject: [PATCH] Git: git log tree: NPE. highlighting by structure to work

---
 .../git4idea/history/browser/GitTreeController.java   | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/plugins/git4idea/src/git4idea/history/browser/GitTreeController.java b/plugins/git4idea/src/git4idea/history/browser/GitTreeController.java
index d02161a6b546..ca445b195bed 100644
--- a/plugins/git4idea/src/git4idea/history/browser/GitTreeController.java
+++ b/plugins/git4idea/src/git4idea/history/browser/GitTreeController.java
@@ -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);