From cd8c14cc6013ba7a531a428d92a0202db764160e Mon Sep 17 00:00:00 2001 From: Richard Cordovano Date: Tue, 15 Sep 2015 16:04:40 -0400 Subject: [PATCH 1/2] Convert incorrect imports of java.utils.logging.Logger --- .../sleuthkit/autopsy/corecomponents/AboutWindowPanel.java | 2 +- .../sleuthkit/autopsy/corecomponents/OfflineHelpAction.java | 2 +- .../sleuthkit/autopsy/corecomponents/OnlineHelpAction.java | 2 +- Core/src/org/sleuthkit/autopsy/coreutils/Logger.java | 6 +++--- Core/src/org/sleuthkit/autopsy/timeline/db/EventDB.java | 2 +- .../autopsy/imagegallery/datamodel/CategoryManager.java | 2 +- .../autopsy/imagegallery/datamodel/DrawableDB.java | 2 +- .../imagegallery/datamodel/grouping/GroupManager.java | 2 +- .../src/org/sleuthkit/autopsy/imagegallery/gui/Toolbar.java | 2 +- .../imagegallery/gui/drawableviews/MetaDataPane.java | 2 +- .../org/sleuthkit/autopsy/thunderbirdparser/MboxParser.java | 2 +- .../org/sleuthkit/autopsy/thunderbirdparser/PstParser.java | 2 +- 12 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/AboutWindowPanel.java b/Core/src/org/sleuthkit/autopsy/corecomponents/AboutWindowPanel.java index abba7ce94b..640cc45409 100644 --- a/Core/src/org/sleuthkit/autopsy/corecomponents/AboutWindowPanel.java +++ b/Core/src/org/sleuthkit/autopsy/corecomponents/AboutWindowPanel.java @@ -26,7 +26,7 @@ import java.net.URL; import java.text.MessageFormat; import java.util.Locale; import java.util.logging.Level; -import java.util.logging.Logger; +import org.sleuthkit.autopsy.coreutils.Logger; import javax.swing.Icon; import javax.swing.ImageIcon; import javax.swing.JPanel; diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/OfflineHelpAction.java b/Core/src/org/sleuthkit/autopsy/corecomponents/OfflineHelpAction.java index 2ab921907f..e06d61d778 100644 --- a/Core/src/org/sleuthkit/autopsy/corecomponents/OfflineHelpAction.java +++ b/Core/src/org/sleuthkit/autopsy/corecomponents/OfflineHelpAction.java @@ -33,7 +33,7 @@ import org.openide.awt.HtmlBrowser; import org.openide.util.NbBundle; import org.openide.util.NbBundle.Messages; import java.util.logging.Level; -import java.util.logging.Logger; +import org.sleuthkit.autopsy.coreutils.Logger; /** * Implements a hyperlink to the Offline Documentation. diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/OnlineHelpAction.java b/Core/src/org/sleuthkit/autopsy/corecomponents/OnlineHelpAction.java index d9190fa51b..aa23919d22 100644 --- a/Core/src/org/sleuthkit/autopsy/corecomponents/OnlineHelpAction.java +++ b/Core/src/org/sleuthkit/autopsy/corecomponents/OnlineHelpAction.java @@ -35,7 +35,7 @@ import org.openide.util.NbBundle; import org.openide.util.NbBundle.Messages; import java.util.logging.Level; -import java.util.logging.Logger; +import org.sleuthkit.autopsy.coreutils.Logger; /** * Implements a hyperlink to the Online Documentation. diff --git a/Core/src/org/sleuthkit/autopsy/coreutils/Logger.java b/Core/src/org/sleuthkit/autopsy/coreutils/Logger.java index 38db7309e5..f7a376b467 100644 --- a/Core/src/org/sleuthkit/autopsy/coreutils/Logger.java +++ b/Core/src/org/sleuthkit/autopsy/coreutils/Logger.java @@ -151,9 +151,9 @@ public final class Logger extends java.util.logging.Logger { private Logger(String name, String resourceBundleName) { super(name, resourceBundleName); - if (Version.getBuildType() == Version.Type.DEVELOPMENT) { - super.addHandler(console); - } +// if (Version.getBuildType() == Version.Type.DEVELOPMENT) { +// super.addHandler(console); +// } synchronized (fileHandlerLock) { super.setUseParentHandlers(false); super.addHandler(userFriendlyLogFile); diff --git a/Core/src/org/sleuthkit/autopsy/timeline/db/EventDB.java b/Core/src/org/sleuthkit/autopsy/timeline/db/EventDB.java index 08ab2956b1..2c6ec00145 100644 --- a/Core/src/org/sleuthkit/autopsy/timeline/db/EventDB.java +++ b/Core/src/org/sleuthkit/autopsy/timeline/db/EventDB.java @@ -103,7 +103,7 @@ public class EventDB { } } - private static final java.util.logging.Logger LOGGER = Logger.getLogger(EventDB.class.getName()); + private static final org.sleuthkit.autopsy.coreutils.Logger LOGGER = Logger.getLogger(EventDB.class.getName()); static { //make sure sqlite driver is loaded, possibly redundant diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/CategoryManager.java b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/CategoryManager.java index 5f277a9267..8972e192b0 100644 --- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/CategoryManager.java +++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/CategoryManager.java @@ -52,7 +52,7 @@ import org.sleuthkit.datamodel.TskCoreException; */ public class CategoryManager { - private static final java.util.logging.Logger LOGGER = Logger.getLogger(CategoryManager.class.getName()); + private static final org.sleuthkit.autopsy.coreutils.Logger LOGGER = Logger.getLogger(CategoryManager.class.getName()); private final ImageGalleryController controller; diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/DrawableDB.java b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/DrawableDB.java index 6b74fbbed3..4aaf90735d 100644 --- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/DrawableDB.java +++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/DrawableDB.java @@ -72,7 +72,7 @@ import org.sqlite.SQLiteJDBCLoader; */ public final class DrawableDB { - private static final java.util.logging.Logger LOGGER = Logger.getLogger(DrawableDB.class.getName()); + private static final org.sleuthkit.autopsy.coreutils.Logger LOGGER = Logger.getLogger(DrawableDB.class.getName()); //column name constants////////////////////// private static final String ANALYZED = "analyzed"; diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/grouping/GroupManager.java b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/grouping/GroupManager.java index 1d7bc39a7d..0a804118f8 100644 --- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/grouping/GroupManager.java +++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/grouping/GroupManager.java @@ -34,7 +34,7 @@ import java.util.TreeSet; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.logging.Level; -import java.util.logging.Logger; +import org.sleuthkit.autopsy.coreutils.Logger; import java.util.stream.Collectors; import java.util.stream.Stream; import javafx.application.Platform; diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/Toolbar.java b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/Toolbar.java index 8f1f4466a2..a30238eb58 100644 --- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/Toolbar.java +++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/Toolbar.java @@ -20,7 +20,7 @@ package org.sleuthkit.autopsy.imagegallery.gui; import java.util.List; import java.util.logging.Level; -import java.util.logging.Logger; +import org.sleuthkit.autopsy.coreutils.Logger; import java.util.stream.Collectors; import java.util.stream.Stream; import javafx.application.Platform; diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/MetaDataPane.java b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/MetaDataPane.java index 1b2b4cbb05..f0a828f644 100644 --- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/MetaDataPane.java +++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/MetaDataPane.java @@ -27,7 +27,7 @@ import java.util.Objects; import static java.util.Objects.isNull; import static java.util.Objects.nonNull; import java.util.Optional; -import java.util.logging.Logger; +import org.sleuthkit.autopsy.coreutils.Logger; import java.util.stream.Collectors; import javafx.application.Platform; import javafx.beans.property.SimpleObjectProperty; diff --git a/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/MboxParser.java b/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/MboxParser.java index 8cf867f291..968f902e66 100755 --- a/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/MboxParser.java +++ b/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/MboxParser.java @@ -36,7 +36,7 @@ import java.util.ArrayList; import java.util.List; import java.util.UUID; import java.util.logging.Level; -import java.util.logging.Logger; +import org.sleuthkit.autopsy.coreutils.Logger; import org.apache.james.mime4j.dom.BinaryBody; import org.apache.james.mime4j.dom.Body; import org.apache.james.mime4j.dom.Entity; diff --git a/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/PstParser.java b/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/PstParser.java index 43008b5d05..5cd6ab8b78 100755 --- a/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/PstParser.java +++ b/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/PstParser.java @@ -31,7 +31,7 @@ import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.List; import java.util.logging.Level; -import java.util.logging.Logger; +import org.sleuthkit.autopsy.coreutils.Logger; import org.openide.util.NbBundle; import org.sleuthkit.autopsy.ingest.IngestMonitor; import org.sleuthkit.autopsy.ingest.IngestServices; From 021467e4c47c5e5fbc229e158d68abdd46365735 Mon Sep 17 00:00:00 2001 From: Richard Cordovano Date: Tue, 15 Sep 2015 17:21:28 -0400 Subject: [PATCH 2/2] Add code from mysteriously unmerged commit --- .../modules/embeddedfileextractor/SevenZipExtractor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Core/src/org/sleuthkit/autopsy/modules/embeddedfileextractor/SevenZipExtractor.java b/Core/src/org/sleuthkit/autopsy/modules/embeddedfileextractor/SevenZipExtractor.java index 6ffa1df07e..ffcdc5b34b 100644 --- a/Core/src/org/sleuthkit/autopsy/modules/embeddedfileextractor/SevenZipExtractor.java +++ b/Core/src/org/sleuthkit/autopsy/modules/embeddedfileextractor/SevenZipExtractor.java @@ -459,7 +459,7 @@ class SevenZipExtractor { } } - final String uniqueExtractedName = uniqueArchiveFileName + File.separator + (item.getItemIndex() / 1000) + File.separator + item.getItemIndex() + new File(pathInArchive).getName(); + final String uniqueExtractedName = uniqueArchiveFileName + File.separator + (item.getItemIndex() / 1000) + File.separator + item.getItemIndex() + "_" + new File(pathInArchive).getName(); //final String localRelPath = unpackDir + File.separator + localFileRelPath; final String localRelPath = moduleDirRelative + File.separator + uniqueExtractedName;