remove advanced from image paths

This commit is contained in:
jmillman 2014-08-25 14:48:15 -04:00
parent 5f56a3c70d
commit b3183fadde
11 changed files with 20 additions and 20 deletions

View File

@ -42,6 +42,9 @@ import org.openide.windows.Mode;
import org.openide.windows.TopComponent; import org.openide.windows.TopComponent;
import static org.openide.windows.TopComponent.PROP_UNDOCKING_DISABLED; import static org.openide.windows.TopComponent.PROP_UNDOCKING_DISABLED;
import org.openide.windows.WindowManager; 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.Back;
import org.sleuthkit.autopsy.timeline.actions.Forward; import org.sleuthkit.autopsy.timeline.actions.Forward;
import org.sleuthkit.autopsy.timeline.ui.StatusBar; import org.sleuthkit.autopsy.timeline.ui.StatusBar;
@ -51,9 +54,6 @@ import org.sleuthkit.autopsy.timeline.ui.VisualizationPanel;
import org.sleuthkit.autopsy.timeline.ui.detailview.tree.NavPanel; import org.sleuthkit.autopsy.timeline.ui.detailview.tree.NavPanel;
import org.sleuthkit.autopsy.timeline.ui.filtering.FilterSetPanel; import org.sleuthkit.autopsy.timeline.ui.filtering.FilterSetPanel;
import org.sleuthkit.autopsy.timeline.zooming.ZoomSettingsPane; 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. * TopComponent for the advanced timeline module.
@ -68,8 +68,8 @@ import org.sleuthkit.autopsy.coreutils.Logger;
@TopComponent.Registration(mode = "timeline", openAtStartup = false) @TopComponent.Registration(mode = "timeline", openAtStartup = false)
@Messages({ @Messages({
"CTL_TimeLineTopComponentAction=TimeLineTopComponent", "CTL_TimeLineTopComponentAction=TimeLineTopComponent",
"CTL_TimeLineTopComponent=TimeLine Window", "CTL_TimeLineTopComponent=Timeline Window",
"HINT_TimeLineTopComponent=This is a TimeLine window" "HINT_TimeLineTopComponent=This is a Timeline window"
}) })
public final class TimeLineTopComponent extends TopComponent implements ExplorerManager.Provider, TimeLineUI { public final class TimeLineTopComponent extends TopComponent implements ExplorerManager.Provider, TimeLineUI {
@ -136,11 +136,11 @@ public final class TimeLineTopComponent extends TopComponent implements Explorer
filterTab.setClosable(false); filterTab.setClosable(false);
filterTab.setContent(filtersPanel); 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.setClosable(false);
eventsTab.setContent(navPanel); 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); tabPane.getTabs().addAll(filterTab, eventsTab);
VBox.setVgrow(tabPane, Priority.ALWAYS); VBox.setVgrow(tabPane, Priority.ALWAYS);

View File

@ -31,7 +31,7 @@ import org.sleuthkit.autopsy.timeline.TimeLineController;
*/ */
public class Back extends AbstractAction { 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; private final TimeLineController controller;

View File

@ -31,7 +31,7 @@ import org.sleuthkit.autopsy.timeline.TimeLineController;
*/ */
public class Forward extends AbstractAction { 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; private final TimeLineController controller;

View File

@ -36,10 +36,10 @@ import javafx.stage.DirectoryChooser;
import javafx.util.Pair; import javafx.util.Pair;
import javax.imageio.ImageIO; import javax.imageio.ImageIO;
import org.controlsfx.control.action.AbstractAction; 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.casemodule.Case;
import org.sleuthkit.autopsy.coreutils.Logger; import org.sleuthkit.autopsy.coreutils.Logger;
import org.sleuthkit.autopsy.timeline.TimeLineController;
import org.sleuthkit.autopsy.timeline.zooming.ZoomParams;
import org.sleuthkit.datamodel.TskCoreException; import org.sleuthkit.datamodel.TskCoreException;
/** /**
@ -118,7 +118,7 @@ public class SaveSnapshot extends AbstractAction {
} }
//copy css //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")); Files.copy(resource, Paths.get(outFolder.getPath(), "index.css"));
} catch (IOException ex) { } catch (IOException ex) {
LOGGER.log(Level.WARNING, "failed to copy css file", ex); LOGGER.log(Level.WARNING, "failed to copy css file", ex);

View File

@ -93,7 +93,7 @@ public enum BaseTypes implements EventType {
private BaseTypes(String displayName, String iconBase) { private BaseTypes(String displayName, String iconBase) {
this.displayName = displayName; this.displayName = displayName;
this.iconBase = iconBase; 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 @Override

View File

@ -94,7 +94,7 @@ public interface EventType {
public List<? extends EventType> getSubTypes(); public List<? extends EventType> getSubTypes();
/* return the name of the icon file for this type, it will be resolved in /* 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 getIconBase();
public String getDisplayName(); public String getDisplayName();

View File

@ -72,7 +72,7 @@ public enum FileSystemTypes implements EventType {
private FileSystemTypes(String displayName, String iconBase) { private FileSystemTypes(String displayName, String iconBase) {
this.displayName = displayName; this.displayName = displayName;
this.iconBase = iconBase; 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 @Override

View File

@ -232,7 +232,7 @@ public enum MiscTypes implements EventType, ArtifactEventType {
this.shortExtractor = shortExtractor; this.shortExtractor = shortExtractor;
this.medExtractor = medExtractor; this.medExtractor = medExtractor;
this.longExtractor = longExtractor; 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 @Override

View File

@ -160,7 +160,7 @@ public enum WebTypes implements EventType, ArtifactEventType {
this.shortExtractor = shortExtractor; this.shortExtractor = shortExtractor;
this.medExtractor = medExtractor; this.medExtractor = medExtractor;
this.longExtractor = longExtractor; 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 @Override

View File

@ -49,13 +49,13 @@ class EventNode extends DisplayableItemNode {
EventNode(TimeLineEvent eventById, AbstractFile file, BlackboardArtifact artifact) { EventNode(TimeLineEvent eventById, AbstractFile file, BlackboardArtifact artifact) {
super(Children.LEAF, Lookups.fixed(eventById, file, artifact)); super(Children.LEAF, Lookups.fixed(eventById, file, artifact));
this.e = eventById; 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) { EventNode(TimeLineEvent eventById, AbstractFile file) {
super(Children.LEAF, Lookups.fixed(eventById, file)); super(Children.LEAF, Lookups.fixed(eventById, file));
this.e = eventById; this.e = eventById;
this.setIconBaseWithExtension("org/sleuthkit/autopsy/advancedtimeline/images/" + e.getType().getIconBase()); this.setIconBaseWithExtension("org/sleuthkit/autopsy/timeline/images/" + e.getType().getIconBase());
} }
@Override @Override

View File

@ -235,7 +235,7 @@ public class EventDetailChart extends XYChart<DateTime, AggregateEvent> implemen
chartContextMenu = ActionUtils.createContextMenu(Arrays.asList(new AbstractAction("Place Marker") { 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 @Override