From b89ba9a83e3e4fe6699a569e196ad37f99e27bf5 Mon Sep 17 00:00:00 2001
From: jmillman <jmillman@basistech.com>
Date: Mon, 2 Nov 2015 16:10:04 -0500
Subject: [PATCH] minor cleanup of time related code

---
 .../autopsy/timeline/actions/ZoomOut.java     |  8 +++-----
 .../datamodel/FilteredEventsModel.java        |  6 +++---
 .../ui/countsview/CountsViewPane.java         | 20 ++++++++-----------
 .../timeline/utils/RangeDivisionInfo.java     |  1 -
 4 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/timeline/actions/ZoomOut.java b/Core/src/org/sleuthkit/autopsy/timeline/actions/ZoomOut.java
index 2924fcc6ec..19a6630c33 100644
--- a/Core/src/org/sleuthkit/autopsy/timeline/actions/ZoomOut.java
+++ b/Core/src/org/sleuthkit/autopsy/timeline/actions/ZoomOut.java
@@ -39,21 +39,19 @@ public class ZoomOut extends Action {
         super(Bundle.ZoomOut_action_text());
         setLongText(Bundle.ZoomOut_longText());
         setGraphic(new ImageView(MAGNIFIER_OUT));
-        setEventHandler(actionEvent -> {
-            controller.pushZoomOutTime();
-        });
+        setEventHandler(actionEvent -> controller.pushZoomOutTime());
 
         //disable action when the current time range already encompases the entire case.
         disabledProperty().bind(new BooleanBinding() {
             private final FilteredEventsModel eventsModel = controller.getEventsModel();
 
             {
-                bind(eventsModel.zoomParametersProperty());
+                bind(eventsModel.zoomParametersProperty(), eventsModel.timeRangeProperty());
             }
 
             @Override
             protected boolean computeValue() {
-                return eventsModel.zoomParametersProperty().getValue().getTimeRange().contains(eventsModel.getSpanningInterval());
+                return eventsModel.timeRangeProperty().get().contains(eventsModel.getSpanningInterval());
             }
         });
     }
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/datamodel/FilteredEventsModel.java b/Core/src/org/sleuthkit/autopsy/timeline/datamodel/FilteredEventsModel.java
index f34c46fc64..499b42a6be 100644
--- a/Core/src/org/sleuthkit/autopsy/timeline/datamodel/FilteredEventsModel.java
+++ b/Core/src/org/sleuthkit/autopsy/timeline/datamodel/FilteredEventsModel.java
@@ -23,6 +23,7 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.logging.Level;
 import javafx.beans.Observable;
@@ -31,7 +32,6 @@ import javafx.beans.property.ReadOnlyObjectWrapper;
 import javafx.collections.ListChangeListener;
 import javafx.collections.MapChangeListener;
 import javax.annotation.concurrent.GuardedBy;
-import org.joda.time.DateTimeZone;
 import org.joda.time.Interval;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.casemodule.events.BlackBoardArtifactTagAddedEvent;
@@ -153,7 +153,7 @@ public final class FilteredEventsModel {
                 if (zoomParams.getTypeZoomLevel().equals(requestedTypeZoom.get()) == false
                         || zoomParams.getDescriptionLOD().equals(requestedLOD.get()) == false
                         || zoomParams.getFilter().equals(requestedFilter.get()) == false
-                        || zoomParams.getTimeRange().equals(requestedTimeRange.get()) == false) {
+                        || Objects.equals(zoomParams.getTimeRange(), requestedTimeRange.get()) == false) {
 
                     requestedTypeZoom.set(zoomParams.getTypeZoomLevel());
                     requestedFilter.set(zoomParams.getFilter());
@@ -294,7 +294,7 @@ public final class FilteredEventsModel {
      *         repository, ignoring any filters or requested ranges
      */
     public Interval getSpanningInterval() {
-        return new Interval(getMinTime() * 1000, 1000 + getMaxTime() * 1000, DateTimeZone.UTC);
+        return new Interval(getMinTime() * 1000, 1000 + getMaxTime() * 1000);
     }
 
     /**
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/ui/countsview/CountsViewPane.java b/Core/src/org/sleuthkit/autopsy/timeline/ui/countsview/CountsViewPane.java
index e4178474a7..f33e4e53fe 100644
--- a/Core/src/org/sleuthkit/autopsy/timeline/ui/countsview/CountsViewPane.java
+++ b/Core/src/org/sleuthkit/autopsy/timeline/ui/countsview/CountsViewPane.java
@@ -93,12 +93,10 @@ import org.sleuthkit.autopsy.timeline.utils.RangeDivisionInfo;
  */
 public class CountsViewPane extends AbstractVisualizationPane<String, Number, Node, EventCountsChart> {
 
+    private static final Logger LOGGER = Logger.getLogger(CountsViewPane.class.getName());
     private static final Effect SELECTED_NODE_EFFECT = new Lighting();
 
-    private static final Logger LOGGER = Logger.getLogger(CountsViewPane.class.getName());
-
     private final NumberAxis countAxis = new NumberAxis();
-
     private final CategoryAxis dateAxis = new CategoryAxis(FXCollections.<String>observableArrayList());
 
     private final SimpleObjectProperty<ScaleType> scale = new SimpleObjectProperty<>(ScaleType.LOGARITHMIC);
@@ -166,16 +164,15 @@ public class CountsViewPane extends AbstractVisualizationPane<String, Number, No
                 DateTime start = timeRange.getStart();
                 while (timeRange.contains(start)) {
 
-                    final String dateString = start.toString(rangeInfo.getTickFormatter());
+                    final String startString = start.toString(rangeInfo.getTickFormatter());
                     DateTime end = start.plus(rangeInfo.getPeriodSize().getPeriod());
                     final Interval interval = new Interval(start, end);
+                    //increment for next iteration
+                    start = end;
 
                     //query for current range
                     Map<EventType, Long> eventCounts = filteredEvents.getEventCounts(interval);
 
-                    //increment for next iteration
-                    start = end;
-
                     int dateMax = 0; //used in max tracking
 
                     //for each type add data to graph
@@ -190,7 +187,7 @@ public class CountsViewPane extends AbstractVisualizationPane<String, Number, No
                             final double adjustedCount = count == 0 ? 0 : scale.get().adjust(count);
 
                             dateMax += adjustedCount;
-                            final XYChart.Data<String, Number> xyData = new BarChart.Data<>(dateString, adjustedCount);
+                            final XYChart.Data<String, Number> xyData = new BarChart.Data<>(startString, adjustedCount);
 
                             xyData.nodeProperty().addListener((Observable o) -> {
                                 final Node node = xyData.getNode();
@@ -202,9 +199,8 @@ public class CountsViewPane extends AbstractVisualizationPane<String, Number, No
                                             NbBundle.getMessage(this.getClass(), "CountsViewPane.tooltip.text",
                                                     count,
                                                     et.getDisplayName(),
-                                                    dateString,
-                                                    interval.getEnd().toString(
-                                                            rangeInfo.getTickFormatter())));
+                                                    startString,
+                                                    interval.getEnd().toString(rangeInfo.getTickFormatter())));
                                     tooltip.setGraphic(new ImageView(et.getFXImage()));
                                     Tooltip.install(node, tooltip);
 
@@ -219,7 +215,7 @@ public class CountsViewPane extends AbstractVisualizationPane<String, Number, No
                                         }
                                     });
 
-                                    node.addEventHandler(MouseEvent.MOUSE_CLICKED, new BarClickHandler(node, dateString, interval, et));
+                                    node.addEventHandler(MouseEvent.MOUSE_CLICKED, new BarClickHandler(node, startString, interval, et));
                                 }
                             });
 
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/utils/RangeDivisionInfo.java b/Core/src/org/sleuthkit/autopsy/timeline/utils/RangeDivisionInfo.java
index 99bb93f5bb..71d6d32558 100644
--- a/Core/src/org/sleuthkit/autopsy/timeline/utils/RangeDivisionInfo.java
+++ b/Core/src/org/sleuthkit/autopsy/timeline/utils/RangeDivisionInfo.java
@@ -82,7 +82,6 @@ public class RangeDivisionInfo {
     }
 
     private RangeDivisionInfo(Interval timeRange, int periodsInRange, TimeUnits periodSize, DateTimeFormatter tickformatter, long lowerBound, long upperBound) {
-        super();
         this.numberOfBlocks = periodsInRange;
         this.blockSize = periodSize;
         this.tickFormatter = tickformatter;