From b3183faddec62d64bca7fae2d3bb1a00608c1f6a Mon Sep 17 00:00:00 2001
From: jmillman <jmillman@basistech.com>
Date: Mon, 25 Aug 2014 14:48:15 -0400
Subject: [PATCH] remove advanced from image paths
---
.../autopsy/timeline/TimeLineTopComponent.java | 14 +++++++-------
.../sleuthkit/autopsy/timeline/actions/Back.java | 2 +-
.../autopsy/timeline/actions/Forward.java | 2 +-
.../autopsy/timeline/actions/SaveSnapshot.java | 6 +++---
.../autopsy/timeline/events/type/BaseTypes.java | 2 +-
.../autopsy/timeline/events/type/EventType.java | 2 +-
.../timeline/events/type/FileSystemTypes.java | 2 +-
.../autopsy/timeline/events/type/MiscTypes.java | 2 +-
.../autopsy/timeline/events/type/WebTypes.java | 2 +-
.../autopsy/timeline/explorernodes/EventNode.java | 4 ++--
.../timeline/ui/detailview/EventDetailChart.java | 2 +-
11 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/Timeline/src/org/sleuthkit/autopsy/timeline/TimeLineTopComponent.java b/Timeline/src/org/sleuthkit/autopsy/timeline/TimeLineTopComponent.java
index 17a595e580..f326576862 100644
--- a/Timeline/src/org/sleuthkit/autopsy/timeline/TimeLineTopComponent.java
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/TimeLineTopComponent.java
@@ -42,6 +42,9 @@
import org.openide.windows.TopComponent;
import static org.openide.windows.TopComponent.PROP_UNDOCKING_DISABLED;
import org.openide.windows.WindowManager;
+import org.sleuthkit.autopsy.corecomponents.DataContentPanel;
+import org.sleuthkit.autopsy.corecomponents.DataResultPanel;
+import org.sleuthkit.autopsy.coreutils.Logger;
import org.sleuthkit.autopsy.timeline.actions.Back;
import org.sleuthkit.autopsy.timeline.actions.Forward;
import org.sleuthkit.autopsy.timeline.ui.StatusBar;
@@ -51,9 +54,6 @@
import org.sleuthkit.autopsy.timeline.ui.detailview.tree.NavPanel;
import org.sleuthkit.autopsy.timeline.ui.filtering.FilterSetPanel;
import org.sleuthkit.autopsy.timeline.zooming.ZoomSettingsPane;
-import org.sleuthkit.autopsy.corecomponents.DataContentPanel;
-import org.sleuthkit.autopsy.corecomponents.DataResultPanel;
-import org.sleuthkit.autopsy.coreutils.Logger;
/**
* TopComponent for the advanced timeline module.
@@ -68,8 +68,8 @@
@TopComponent.Registration(mode = "timeline", openAtStartup = false)
@Messages({
"CTL_TimeLineTopComponentAction=TimeLineTopComponent",
- "CTL_TimeLineTopComponent=TimeLine Window",
- "HINT_TimeLineTopComponent=This is a TimeLine window"
+ "CTL_TimeLineTopComponent=Timeline Window",
+ "HINT_TimeLineTopComponent=This is a Timeline window"
})
public final class TimeLineTopComponent extends TopComponent implements ExplorerManager.Provider, TimeLineUI {
@@ -136,11 +136,11 @@ synchronized private void customizeComponents() {
filterTab.setClosable(false);
filterTab.setContent(filtersPanel);
- filterTab.setGraphic(new ImageView("org/sleuthkit/autopsy/advancedtimeline/images/funnel.png"));
+ filterTab.setGraphic(new ImageView("org/sleuthkit/autopsy/timeline/images/funnel.png"));
eventsTab.setClosable(false);
eventsTab.setContent(navPanel);
- eventsTab.setGraphic(new ImageView("org/sleuthkit/autopsy/advancedtimeline/images/timeline_marker.png"));
+ eventsTab.setGraphic(new ImageView("org/sleuthkit/autopsy/timeline/images/timeline_marker.png"));
tabPane.getTabs().addAll(filterTab, eventsTab);
VBox.setVgrow(tabPane, Priority.ALWAYS);
diff --git a/Timeline/src/org/sleuthkit/autopsy/timeline/actions/Back.java b/Timeline/src/org/sleuthkit/autopsy/timeline/actions/Back.java
index 1249b70f16..b25c79b55c 100644
--- a/Timeline/src/org/sleuthkit/autopsy/timeline/actions/Back.java
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/actions/Back.java
@@ -31,7 +31,7 @@
*/
public class Back extends AbstractAction {
- private static final Image BACK_IMAGE = new Image("/org/sleuthkit/autopsy/advancedtimeline/images/arrow-180.png", 16, 16, true, true, true);
+ private static final Image BACK_IMAGE = new Image("/org/sleuthkit/autopsy/timeline/images/arrow-180.png", 16, 16, true, true, true);
private final TimeLineController controller;
diff --git a/Timeline/src/org/sleuthkit/autopsy/timeline/actions/Forward.java b/Timeline/src/org/sleuthkit/autopsy/timeline/actions/Forward.java
index 639a466852..d68a3e4734 100644
--- a/Timeline/src/org/sleuthkit/autopsy/timeline/actions/Forward.java
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/actions/Forward.java
@@ -31,7 +31,7 @@
*/
public class Forward extends AbstractAction {
- private static final Image BACK_IMAGE = new Image("/org/sleuthkit/autopsy/advancedtimeline/images/arrow.png", 16, 16, true, true, true);
+ private static final Image BACK_IMAGE = new Image("/org/sleuthkit/autopsy/timeline/images/arrow.png", 16, 16, true, true, true);
private final TimeLineController controller;
diff --git a/Timeline/src/org/sleuthkit/autopsy/timeline/actions/SaveSnapshot.java b/Timeline/src/org/sleuthkit/autopsy/timeline/actions/SaveSnapshot.java
index ddc7ab7014..0be925b4eb 100644
--- a/Timeline/src/org/sleuthkit/autopsy/timeline/actions/SaveSnapshot.java
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/actions/SaveSnapshot.java
@@ -36,10 +36,10 @@
import javafx.util.Pair;
import javax.imageio.ImageIO;
import org.controlsfx.control.action.AbstractAction;
-import org.sleuthkit.autopsy.timeline.TimeLineController;
-import org.sleuthkit.autopsy.timeline.zooming.ZoomParams;
import org.sleuthkit.autopsy.casemodule.Case;
import org.sleuthkit.autopsy.coreutils.Logger;
+import org.sleuthkit.autopsy.timeline.TimeLineController;
+import org.sleuthkit.autopsy.timeline.zooming.ZoomParams;
import org.sleuthkit.datamodel.TskCoreException;
/**
@@ -118,7 +118,7 @@ public void handle(ActionEvent event) {
}
//copy css
- try (InputStream resource = this.getClass().getResourceAsStream("/org/sleuthkit/autopsy/advancedtimeline/index.css")) {
+ try (InputStream resource = this.getClass().getResourceAsStream("/org/sleuthkit/autopsy/timeline/index.css")) {
Files.copy(resource, Paths.get(outFolder.getPath(), "index.css"));
} catch (IOException ex) {
LOGGER.log(Level.WARNING, "failed to copy css file", ex);
diff --git a/Timeline/src/org/sleuthkit/autopsy/timeline/events/type/BaseTypes.java b/Timeline/src/org/sleuthkit/autopsy/timeline/events/type/BaseTypes.java
index 6ae47bcd4c..ff7fc925ff 100644
--- a/Timeline/src/org/sleuthkit/autopsy/timeline/events/type/BaseTypes.java
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/events/type/BaseTypes.java
@@ -93,7 +93,7 @@ public String getDisplayName() {
private BaseTypes(String displayName, String iconBase) {
this.displayName = displayName;
this.iconBase = iconBase;
- this.image = new Image("org/sleuthkit/autopsy/advancedtimeline/images/" + iconBase, true);
+ this.image = new Image("org/sleuthkit/autopsy/timeline/images/" + iconBase, true);
}
@Override
diff --git a/Timeline/src/org/sleuthkit/autopsy/timeline/events/type/EventType.java b/Timeline/src/org/sleuthkit/autopsy/timeline/events/type/EventType.java
index 0507a4f572..fbbc95e0ec 100644
--- a/Timeline/src/org/sleuthkit/autopsy/timeline/events/type/EventType.java
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/events/type/EventType.java
@@ -94,7 +94,7 @@ default List<? extends EventType> getSiblingTypes() {
public List<? extends EventType> getSubTypes();
/* return the name of the icon file for this type, it will be resolved in
- * the org/sleuthkit/autopsy/advancedtimeline/images */
+ * the org/sleuthkit/autopsy/timeline/images */
public String getIconBase();
public String getDisplayName();
diff --git a/Timeline/src/org/sleuthkit/autopsy/timeline/events/type/FileSystemTypes.java b/Timeline/src/org/sleuthkit/autopsy/timeline/events/type/FileSystemTypes.java
index dfb573e382..771b692023 100644
--- a/Timeline/src/org/sleuthkit/autopsy/timeline/events/type/FileSystemTypes.java
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/events/type/FileSystemTypes.java
@@ -72,7 +72,7 @@ public List<? extends EventType> getSubTypes() {
private FileSystemTypes(String displayName, String iconBase) {
this.displayName = displayName;
this.iconBase = iconBase;
- this.image = new Image("org/sleuthkit/autopsy/advancedtimeline/images/" + iconBase, true);
+ this.image = new Image("org/sleuthkit/autopsy/timeline/images/" + iconBase, true);
}
@Override
diff --git a/Timeline/src/org/sleuthkit/autopsy/timeline/events/type/MiscTypes.java b/Timeline/src/org/sleuthkit/autopsy/timeline/events/type/MiscTypes.java
index aa6b07aa55..1d44a25161 100644
--- a/Timeline/src/org/sleuthkit/autopsy/timeline/events/type/MiscTypes.java
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/events/type/MiscTypes.java
@@ -232,7 +232,7 @@ private MiscTypes(String displayName, String iconBase, BlackboardArtifact.ARTIFA
this.shortExtractor = shortExtractor;
this.medExtractor = medExtractor;
this.longExtractor = longExtractor;
- this.image = new Image("org/sleuthkit/autopsy/advancedtimeline/images/" + iconBase, true);
+ this.image = new Image("org/sleuthkit/autopsy/timeline/images/" + iconBase, true);
}
@Override
diff --git a/Timeline/src/org/sleuthkit/autopsy/timeline/events/type/WebTypes.java b/Timeline/src/org/sleuthkit/autopsy/timeline/events/type/WebTypes.java
index 853d37ec9c..6309320994 100644
--- a/Timeline/src/org/sleuthkit/autopsy/timeline/events/type/WebTypes.java
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/events/type/WebTypes.java
@@ -160,7 +160,7 @@ private WebTypes(String displayName, String iconBase, BlackboardArtifact.ARTIFAC
this.shortExtractor = shortExtractor;
this.medExtractor = medExtractor;
this.longExtractor = longExtractor;
- this.image = new Image("org/sleuthkit/autopsy/advancedtimeline/images/" + iconBase, true);
+ this.image = new Image("org/sleuthkit/autopsy/timeline/images/" + iconBase, true);
}
@Override
diff --git a/Timeline/src/org/sleuthkit/autopsy/timeline/explorernodes/EventNode.java b/Timeline/src/org/sleuthkit/autopsy/timeline/explorernodes/EventNode.java
index 11a760e464..5e44cb9d79 100644
--- a/Timeline/src/org/sleuthkit/autopsy/timeline/explorernodes/EventNode.java
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/explorernodes/EventNode.java
@@ -49,13 +49,13 @@ class EventNode extends DisplayableItemNode {
EventNode(TimeLineEvent eventById, AbstractFile file, BlackboardArtifact artifact) {
super(Children.LEAF, Lookups.fixed(eventById, file, artifact));
this.e = eventById;
- this.setIconBaseWithExtension("org/sleuthkit/autopsy/advancedtimeline/images/" + e.getType().getIconBase());
+ this.setIconBaseWithExtension("org/sleuthkit/autopsy/timeline/images/" + e.getType().getIconBase());
}
EventNode(TimeLineEvent eventById, AbstractFile file) {
super(Children.LEAF, Lookups.fixed(eventById, file));
this.e = eventById;
- this.setIconBaseWithExtension("org/sleuthkit/autopsy/advancedtimeline/images/" + e.getType().getIconBase());
+ this.setIconBaseWithExtension("org/sleuthkit/autopsy/timeline/images/" + e.getType().getIconBase());
}
@Override
diff --git a/Timeline/src/org/sleuthkit/autopsy/timeline/ui/detailview/EventDetailChart.java b/Timeline/src/org/sleuthkit/autopsy/timeline/ui/detailview/EventDetailChart.java
index a999094d60..5f0c8e7584 100644
--- a/Timeline/src/org/sleuthkit/autopsy/timeline/ui/detailview/EventDetailChart.java
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/ui/detailview/EventDetailChart.java
@@ -235,7 +235,7 @@ public class EventDetailChart extends XYChart<DateTime, AggregateEvent> implemen
chartContextMenu = ActionUtils.createContextMenu(Arrays.asList(new AbstractAction("Place Marker") {
{
- setGraphic(new ImageView(new Image("/org/sleuthkit/autopsy/advancedtimeline/images/marker.png", 16, 16, true, true, true)));
+ setGraphic(new ImageView(new Image("/org/sleuthkit/autopsy/timeline/images/marker.png", 16, 16, true, true, true)));
}
@Override
--
GitLab