From aa76bcc372523bc3556620a56f4aa9ac8c0619ff Mon Sep 17 00:00:00 2001
From: Brian Carrier <carrier@sleuthkit.org>
Date: Wed, 26 Feb 2014 00:43:25 -0500
Subject: [PATCH] Moved SQLiteDBConnect and LocalDisk to better packages

---
 Core/src/org/sleuthkit/autopsy/casemodule/LocalDiskPanel.java | 1 +
 .../autopsy/{casemodule => coreutils}/LocalDisk.java          | 2 +-
 Core/src/org/sleuthkit/autopsy/coreutils/PlatformUtil.java    | 1 -
 .../src/org/sleuthkit/autopsy/recentactivity/Extract.java     | 1 -
 .../sleuthkit/autopsy/recentactivity}/SQLiteDBConnect.java    | 4 ++--
 .../src/org/sleuthkit/autopsy/recentactivity/Util.java        | 1 -
 6 files changed, 4 insertions(+), 6 deletions(-)
 rename Core/src/org/sleuthkit/autopsy/{casemodule => coreutils}/LocalDisk.java (97%)
 rename {Core/src/org/sleuthkit/autopsy/report => RecentActivity/src/org/sleuthkit/autopsy/recentactivity}/SQLiteDBConnect.java (98%)

diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/LocalDiskPanel.java b/Core/src/org/sleuthkit/autopsy/casemodule/LocalDiskPanel.java
index 5c61abbd1f..b85ec86e4f 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/LocalDiskPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/LocalDiskPanel.java
@@ -18,6 +18,7 @@
  */
 package org.sleuthkit.autopsy.casemodule;
 
+import org.sleuthkit.autopsy.coreutils.LocalDisk;
 import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Component;
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/LocalDisk.java b/Core/src/org/sleuthkit/autopsy/coreutils/LocalDisk.java
similarity index 97%
rename from Core/src/org/sleuthkit/autopsy/casemodule/LocalDisk.java
rename to Core/src/org/sleuthkit/autopsy/coreutils/LocalDisk.java
index 14853bcc12..c082250dea 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/LocalDisk.java
+++ b/Core/src/org/sleuthkit/autopsy/coreutils/LocalDisk.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.casemodule;
+package org.sleuthkit.autopsy.coreutils;
 
 /**
  * Representation of a PhysicalDisk or partition.
diff --git a/Core/src/org/sleuthkit/autopsy/coreutils/PlatformUtil.java b/Core/src/org/sleuthkit/autopsy/coreutils/PlatformUtil.java
index 40ced93327..1ccc4132a4 100644
--- a/Core/src/org/sleuthkit/autopsy/coreutils/PlatformUtil.java
+++ b/Core/src/org/sleuthkit/autopsy/coreutils/PlatformUtil.java
@@ -37,7 +37,6 @@ import org.hyperic.sigar.Sigar;
 import org.hyperic.sigar.ptql.ProcessFinder;
 import org.openide.modules.InstalledFileLocator;
 import org.openide.modules.Places;
-import org.sleuthkit.autopsy.casemodule.LocalDisk;
 import org.sleuthkit.datamodel.SleuthkitJNI;
 import org.sleuthkit.datamodel.TskCoreException;
 
diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Extract.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Extract.java
index 66a628f389..12b82bbc65 100644
--- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Extract.java
+++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Extract.java
@@ -30,7 +30,6 @@ import java.util.logging.Level;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.ingest.IngestModuleDataSource;
-import org.sleuthkit.autopsy.report.SQLiteDBConnect;
 import org.sleuthkit.datamodel.*;
 
 abstract class Extract extends IngestModuleDataSource{
diff --git a/Core/src/org/sleuthkit/autopsy/report/SQLiteDBConnect.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/SQLiteDBConnect.java
similarity index 98%
rename from Core/src/org/sleuthkit/autopsy/report/SQLiteDBConnect.java
rename to RecentActivity/src/org/sleuthkit/autopsy/recentactivity/SQLiteDBConnect.java
index 97142c840a..067145c5e6 100644
--- a/Core/src/org/sleuthkit/autopsy/report/SQLiteDBConnect.java
+++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/SQLiteDBConnect.java
@@ -20,7 +20,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.report;
+package org.sleuthkit.autopsy.recentactivity;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
@@ -32,7 +32,7 @@ import org.sleuthkit.autopsy.coreutils.Logger;
 /**
  * Database connection class & utilities *
  */
- public class SQLiteDBConnect {
+class SQLiteDBConnect {
 
     public String sDriver = "";
     public String sUrl = null;
diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Util.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Util.java
index c5346df9b1..c27d216ae8 100644
--- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Util.java
+++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Util.java
@@ -41,7 +41,6 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.casemodule.services.FileManager;
-import org.sleuthkit.autopsy.report.SQLiteDBConnect;
 import org.sleuthkit.datamodel.AbstractFile;
 import org.sleuthkit.datamodel.Content;
 import org.sleuthkit.datamodel.TskCoreException;