Recent Activity commit

Signed-off-by: Alexander Ebadirad <aebadirad@42six.com>

DataModel/nbproject/genfiles.properties

@@ -3,6 +3,6 @@ build.xml.script.CRC32=3bd58878
 build.xml.stylesheet.CRC32=a56c6a5b@1.42.2
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=d5d42932
+nbproject/build-impl.xml.data.CRC32=68292042
 nbproject/build-impl.xml.script.CRC32=b0a13adb
-nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.47.1
+nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.46.1

DataModel/nbproject/project.properties

@@ -1,4 +1,3 @@
-file.reference.sqlite-jdbc-3.6.20.jar=release/modules/ext/sqlite-jdbc-3.6.20.jar
 file.reference.Tsk_DataModel.jar=release/modules/ext/Tsk_DataModel.jar
 javac.source=1.6
 javac.compilerargs=-Xlint -Xlint:-serial

DataModel/nbproject/project.xml

@@ -59,16 +59,15 @@
             <public-packages>
                 <package>org.sleuthkit.autopsy.datamodel</package>
                 <package>org.sleuthkit.datamodel</package>
-                <package>org.sqlite</package>
             </public-packages>
-            <class-path-extension>
-                <runtime-relative-path>ext/sqlite-jdbc-3.6.20.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/sqlite-jdbc-3.6.20.jar</binary-origin>
-            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/Tsk_DataModel.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/Tsk_DataModel.jar</binary-origin>
             </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/sqlite-jdbc-3.7.2.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/sqlite-jdbc-3.7.2.jar</binary-origin>
+            </class-path-extension>
         </data>
     </configuration>
 </project>

DataModel/src/org/sleuthkit/autopsy/datamodel/KeyValueThing.java

@@ -1,22 +1,3 @@
-/*
- * Autopsy Forensic Browser
- *
- * Copyright 2011 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.datamodel;
 
 import java.util.Map;
@@ -27,7 +8,7 @@ public class KeyValueThing {
     String name;
 
     /**
-     * 
+     *
      * @param map must iterate it keys and values in a consistent order
      * (use of LinkedHashMap is recommended)
      * @param id an arbitrary id representing the type of the thing
@@ -38,6 +19,12 @@ public KeyValueThing(String name, Map<String, Object> map, int id) {
         this.id = id;
     }
 
+    public KeyValueThing(String name,  int id) {
+        this.name = name;
+        this.map = null;
+        this.id = id;
+    }
+
     public int getId() {
         return id;
     }
@@ -49,4 +36,9 @@ public Map<String, Object> getMap() {
     public String getName() {
         return name;
     }
+
+    public void addMap(Map<String,Object> inMap)
+    {
+       this.map = inMap;
+    }
 }

Ingest/src/org/sleuthkit/autopsy/ingest/Bundle.properties

@@ -4,7 +4,4 @@ HINT_IngestTopComponent=Ingest window
 OpenIDE-Module-Name=Ingest
 IngestTopComponent.topLable.text=Image ingest services
 IngestTopComponent.startButton.text=Start
-IngestTopComponent.messageFrame.title=Ingest Messages
 IngestTopComponent.refreshFreqLabel.text=Refresh frequency
-IngestTopComponent.refreshFrequencyLabel.text=Refresh Frequency
-IngestTopComponent.ingestProgressLabel.text=File Ingest Progress