cleanup comments and imports

This commit is contained in:
millmanorama 2019-01-09 13:39:24 +01:00
parent 2c4a7fa6ff
commit eb714b9449
7 changed files with 47 additions and 31 deletions

View File

@ -81,9 +81,7 @@ import org.sleuthkit.autopsy.timeline.events.ViewInTimelineRequestedEvent;
import org.sleuthkit.autopsy.timeline.ui.detailview.datamodel.DetailViewEvent; import org.sleuthkit.autopsy.timeline.ui.detailview.datamodel.DetailViewEvent;
import org.sleuthkit.autopsy.timeline.ui.filtering.datamodel.DefaultFilterState; import org.sleuthkit.autopsy.timeline.ui.filtering.datamodel.DefaultFilterState;
import org.sleuthkit.autopsy.timeline.ui.filtering.datamodel.DescriptionFilterState; import org.sleuthkit.autopsy.timeline.ui.filtering.datamodel.DescriptionFilterState;
import org.sleuthkit.autopsy.timeline.ui.filtering.datamodel.FilterState;
import org.sleuthkit.autopsy.timeline.ui.filtering.datamodel.RootFilterState; import org.sleuthkit.autopsy.timeline.ui.filtering.datamodel.RootFilterState;
import org.sleuthkit.autopsy.timeline.ui.filtering.datamodel.UIFilter;
import org.sleuthkit.autopsy.timeline.utils.IntervalUtils; import org.sleuthkit.autopsy.timeline.utils.IntervalUtils;
import org.sleuthkit.autopsy.timeline.zooming.TimeUnits; import org.sleuthkit.autopsy.timeline.zooming.TimeUnits;
import org.sleuthkit.autopsy.timeline.zooming.ZoomState; import org.sleuthkit.autopsy.timeline.zooming.ZoomState;

View File

@ -60,7 +60,6 @@ import org.sleuthkit.autopsy.timeline.ui.AbstractTimelineChart;
import org.sleuthkit.autopsy.timeline.ui.detailview.datamodel.DetailViewEvent; import org.sleuthkit.autopsy.timeline.ui.detailview.datamodel.DetailViewEvent;
import org.sleuthkit.autopsy.timeline.ui.detailview.datamodel.DetailsViewModel; import org.sleuthkit.autopsy.timeline.ui.detailview.datamodel.DetailsViewModel;
import org.sleuthkit.autopsy.timeline.ui.detailview.datamodel.EventStripe; import org.sleuthkit.autopsy.timeline.ui.detailview.datamodel.EventStripe;
import org.sleuthkit.autopsy.timeline.ui.filtering.datamodel.UIFilter;
import org.sleuthkit.autopsy.timeline.utils.MappedList; import org.sleuthkit.autopsy.timeline.utils.MappedList;
import org.sleuthkit.autopsy.timeline.zooming.ZoomState; import org.sleuthkit.autopsy.timeline.zooming.ZoomState;
import org.sleuthkit.datamodel.DescriptionLoD; import org.sleuthkit.datamodel.DescriptionLoD;

View File

@ -24,8 +24,6 @@ import org.controlsfx.control.action.Action;
import org.openide.util.NbBundle; import org.openide.util.NbBundle;
import org.sleuthkit.autopsy.timeline.ui.filtering.datamodel.DescriptionFilter; import org.sleuthkit.autopsy.timeline.ui.filtering.datamodel.DescriptionFilter;
import org.sleuthkit.autopsy.timeline.ui.filtering.datamodel.DescriptionFilterState; import org.sleuthkit.autopsy.timeline.ui.filtering.datamodel.DescriptionFilterState;
import org.sleuthkit.autopsy.timeline.ui.filtering.datamodel.FilterState;
import org.sleuthkit.autopsy.timeline.ui.filtering.datamodel.UIFilter;
import org.sleuthkit.datamodel.DescriptionLoD; import org.sleuthkit.datamodel.DescriptionLoD;
/** /**

View File

@ -1,7 +1,20 @@
/* /*
* To change this license header, choose License Headers in Project Properties. * Autopsy Forensic Browser
* To change this template file, choose Tools | Templates *
* and open the template in the editor. * Copyright 2018 Basis Technology Corp.
* Contact: carrier <at> sleuthkit <dot> org
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/ */
package org.sleuthkit.autopsy.timeline.ui.filtering.datamodel; package org.sleuthkit.autopsy.timeline.ui.filtering.datamodel;
@ -13,8 +26,7 @@ import javafx.beans.property.BooleanProperty;
import javafx.beans.property.SimpleBooleanProperty; import javafx.beans.property.SimpleBooleanProperty;
/** /**
* * A FilterState implementation for DescriptionFilters
*
*/ */
public class DescriptionFilterState implements FilterState<DescriptionFilter> { public class DescriptionFilterState implements FilterState<DescriptionFilter> {
@ -33,46 +45,57 @@ public class DescriptionFilterState implements FilterState<DescriptionFilter> {
private final SimpleBooleanProperty disabled = new SimpleBooleanProperty(false); private final SimpleBooleanProperty disabled = new SimpleBooleanProperty(false);
private final BooleanBinding activeProp = Bindings.and(selected, disabled.not()); private final BooleanBinding activeProp = Bindings.and(selected, disabled.not());
@Override
public BooleanProperty selectedProperty() { public BooleanProperty selectedProperty() {
return selected; return selected;
} }
@Override
public BooleanProperty disabledProperty() { public BooleanProperty disabledProperty() {
return disabled; return disabled;
} }
@Override
public void setSelected(Boolean act) { public void setSelected(Boolean act) {
selected.set(act); selected.set(act);
} }
@Override
public boolean isSelected() { public boolean isSelected() {
return selected.get(); return selected.get();
} }
@Override
public void setDisabled(Boolean act) { public void setDisabled(Boolean act) {
disabled.set(act); disabled.set(act);
} }
@Override
public boolean isDisabled() { public boolean isDisabled() {
return disabledProperty().get(); return disabledProperty().get();
} }
@Override
public boolean isActive() { public boolean isActive() {
return activeProperty().get(); return activeProperty().get();
} }
@Override
public BooleanExpression activeProperty() { public BooleanExpression activeProperty() {
return activeProp; return activeProp;
} }
@Override
public String getDisplayName() { public String getDisplayName() {
return filter.getDescription(); return filter.getDescription();
} }
@Override
public DescriptionFilter getFilter() { public DescriptionFilter getFilter() {
return filter; return filter;
} }
@Override
public DescriptionFilter getActiveFilter() { public DescriptionFilter getActiveFilter() {
return isActive() ? getFilter() : null; return isActive() ? getFilter() : null;
} }

View File

@ -20,7 +20,6 @@ package org.sleuthkit.autopsy.timeline.ui.filtering.datamodel;
import javafx.beans.binding.BooleanExpression; import javafx.beans.binding.BooleanExpression;
import javafx.beans.property.ReadOnlyBooleanProperty; import javafx.beans.property.ReadOnlyBooleanProperty;
import org.sleuthkit.datamodel.timeline.TimelineFilter;
/** /**
* The state of a filter: selected, disabled, active, etc. * The state of a filter: selected, disabled, active, etc.

View File

@ -19,7 +19,6 @@
package org.sleuthkit.autopsy.timeline.ui.filtering.datamodel; package org.sleuthkit.autopsy.timeline.ui.filtering.datamodel;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import java.util.function.Predicate;
import javafx.beans.property.ReadOnlyBooleanProperty; import javafx.beans.property.ReadOnlyBooleanProperty;
import javafx.beans.property.ReadOnlyBooleanWrapper; import javafx.beans.property.ReadOnlyBooleanWrapper;
import javafx.collections.FXCollections; import javafx.collections.FXCollections;

View File

@ -22,7 +22,7 @@ import java.util.function.Predicate;
import org.sleuthkit.datamodel.timeline.TimelineEvent; import org.sleuthkit.datamodel.timeline.TimelineEvent;
/** /**
* * A Filter over TimelineEvents that is applied in the UI, not the DB. *
*/ */
public interface UIFilter extends Predicate<TimelineEvent> { public interface UIFilter extends Predicate<TimelineEvent> {